diff --git a/asm/non_matchings/code/z_bgcheck/func_800417A0.s b/asm/non_matchings/code/z_bgcheck/func_800417A0.s deleted file mode 100644 index bf934fe42f..0000000000 --- a/asm/non_matchings/code/z_bgcheck/func_800417A0.s +++ /dev/null @@ -1,58 +0,0 @@ -glabel func_800417A0 -/* AB8940 800417A0 8C820010 */ lw $v0, 0x10($a0) -/* AB8944 800417A4 3C088016 */ lui $t0, %hi(gSegments) # $t0, 0x8016 -/* AB8948 800417A8 25086FA8 */ addiu $t0, %lo(gSegments) # addiu $t0, $t0, 0x6fa8 -/* AB894C 800417AC 00027100 */ sll $t6, $v0, 4 -/* AB8950 800417B0 000E7F02 */ srl $t7, $t6, 0x1c -/* AB8954 800417B4 000FC080 */ sll $t8, $t7, 2 -/* AB8958 800417B8 8C830018 */ lw $v1, 0x18($a0) -/* AB895C 800417BC 0118C821 */ addu $t9, $t0, $t8 -/* AB8960 800417C0 8F2B0000 */ lw $t3, ($t9) -/* AB8964 800417C4 3C0900FF */ lui $t1, (0x00FFFFFF >> 16) # lui $t1, 0xff -/* AB8968 800417C8 3529FFFF */ ori $t1, (0x00FFFFFF & 0xFFFF) # ori $t1, $t1, 0xffff -/* AB896C 800417CC 00496024 */ and $t4, $v0, $t1 -/* AB8970 800417D0 00037900 */ sll $t7, $v1, 4 -/* AB8974 800417D4 3C0A8000 */ lui $t2, 0x8000 -/* AB8978 800417D8 000FC702 */ srl $t8, $t7, 0x1c -/* AB897C 800417DC 016C6821 */ addu $t5, $t3, $t4 -/* AB8980 800417E0 01AA7021 */ addu $t6, $t5, $t2 -/* AB8984 800417E4 0018C880 */ sll $t9, $t8, 2 -/* AB8988 800417E8 8C85001C */ lw $a1, 0x1c($a0) -/* AB898C 800417EC AC8E0010 */ sw $t6, 0x10($a0) -/* AB8990 800417F0 01195821 */ addu $t3, $t0, $t9 -/* AB8994 800417F4 8D6C0000 */ lw $t4, ($t3) -/* AB8998 800417F8 00696824 */ and $t5, $v1, $t1 -/* AB899C 800417FC 0005C100 */ sll $t8, $a1, 4 -/* AB89A0 80041800 0018CF02 */ srl $t9, $t8, 0x1c -/* AB89A4 80041804 018D7021 */ addu $t6, $t4, $t5 -/* AB89A8 80041808 01CA7821 */ addu $t7, $t6, $t2 -/* AB89AC 8004180C 00195880 */ sll $t3, $t9, 2 -/* AB89B0 80041810 8C860020 */ lw $a2, 0x20($a0) -/* AB89B4 80041814 AC8F0018 */ sw $t7, 0x18($a0) -/* AB89B8 80041818 010B6021 */ addu $t4, $t0, $t3 -/* AB89BC 8004181C 8D8D0000 */ lw $t5, ($t4) -/* AB89C0 80041820 00A97024 */ and $t6, $a1, $t1 -/* AB89C4 80041824 0006C900 */ sll $t9, $a2, 4 -/* AB89C8 80041828 00195F02 */ srl $t3, $t9, 0x1c -/* AB89CC 8004182C 01AE7821 */ addu $t7, $t5, $t6 -/* AB89D0 80041830 01EAC021 */ addu $t8, $t7, $t2 -/* AB89D4 80041834 000B6080 */ sll $t4, $t3, 2 -/* AB89D8 80041838 8C870028 */ lw $a3, 0x28($a0) -/* AB89DC 8004183C AC98001C */ sw $t8, 0x1c($a0) -/* AB89E0 80041840 010C6821 */ addu $t5, $t0, $t4 -/* AB89E4 80041844 8DAE0000 */ lw $t6, ($t5) -/* AB89E8 80041848 00C97824 */ and $t7, $a2, $t1 -/* AB89EC 8004184C 00075900 */ sll $t3, $a3, 4 -/* AB89F0 80041850 000B6702 */ srl $t4, $t3, 0x1c -/* AB89F4 80041854 01CFC021 */ addu $t8, $t6, $t7 -/* AB89F8 80041858 030AC821 */ addu $t9, $t8, $t2 -/* AB89FC 8004185C 000C6880 */ sll $t5, $t4, 2 -/* AB8A00 80041860 AC990020 */ sw $t9, 0x20($a0) -/* AB8A04 80041864 010D7021 */ addu $t6, $t0, $t5 -/* AB8A08 80041868 8DCF0000 */ lw $t7, ($t6) -/* AB8A0C 8004186C 00E9C024 */ and $t8, $a3, $t1 -/* AB8A10 80041870 01F8C821 */ addu $t9, $t7, $t8 -/* AB8A14 80041874 032A5821 */ addu $t3, $t9, $t2 -/* AB8A18 80041878 03E00008 */ jr $ra -/* AB8A1C 8004187C AC8B0028 */ sw $t3, 0x28($a0) - diff --git a/asm/non_matchings/code/z_bgcheck/func_800418D0.s b/asm/non_matchings/code/z_bgcheck/func_800418D0.s deleted file mode 100644 index dabbb43cec..0000000000 --- a/asm/non_matchings/code/z_bgcheck/func_800418D0.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_800418D0 -/* AB8A70 800418D0 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* AB8A74 800418D4 AFB30024 */ sw $s3, 0x24($sp) -/* AB8A78 800418D8 AFB60030 */ sw $s6, 0x30($sp) -/* AB8A7C 800418DC AFB5002C */ sw $s5, 0x2c($sp) -/* AB8A80 800418E0 AFB40028 */ sw $s4, 0x28($sp) -/* AB8A84 800418E4 AFB20020 */ sw $s2, 0x20($sp) -/* AB8A88 800418E8 AFB1001C */ sw $s1, 0x1c($sp) -/* AB8A8C 800418EC 24930050 */ addiu $s3, $a0, 0x50 -/* AB8A90 800418F0 00A0A025 */ move $s4, $a1 -/* AB8A94 800418F4 AFBF0034 */ sw $ra, 0x34($sp) -/* AB8A98 800418F8 AFB00018 */ sw $s0, 0x18($sp) -/* AB8A9C 800418FC 02609025 */ move $s2, $s3 -/* AB8AA0 80041900 00008825 */ move $s1, $zero -/* AB8AA4 80041904 24150064 */ li $s5, 100 -/* AB8AA8 80041908 24160032 */ li $s6, 50 -.L8004190C: -/* AB8AAC 8004190C 9642138C */ lhu $v0, 0x138c($s2) -/* AB8AB0 80041910 304E0001 */ andi $t6, $v0, 1 -/* AB8AB4 80041914 11C0000B */ beqz $t6, .L80041944 -/* AB8AB8 80041918 304F0002 */ andi $t7, $v0, 2 -/* AB8ABC 8004191C 55E0000A */ bnezl $t7, .L80041948 -/* AB8AC0 80041920 26310001 */ addiu $s1, $s1, 1 -/* AB8AC4 80041924 02350019 */ multu $s1, $s5 -/* AB8AC8 80041928 02802025 */ move $a0, $s4 -/* AB8ACC 8004192C 0000C012 */ mflo $t8 -/* AB8AD0 80041930 02788021 */ addu $s0, $s3, $t8 -/* AB8AD4 80041934 0C00B591 */ jal Actor_SetObjectDependency -/* AB8AD8 80041938 8E050004 */ lw $a1, 4($s0) -/* AB8ADC 8004193C 0C0105E8 */ jal func_800417A0 -/* AB8AE0 80041940 8E040008 */ lw $a0, 8($s0) -.L80041944: -/* AB8AE4 80041944 26310001 */ addiu $s1, $s1, 1 -.L80041948: -/* AB8AE8 80041948 1636FFF0 */ bne $s1, $s6, .L8004190C -/* AB8AEC 8004194C 26520002 */ addiu $s2, $s2, 2 -/* AB8AF0 80041950 8FBF0034 */ lw $ra, 0x34($sp) -/* AB8AF4 80041954 8FB00018 */ lw $s0, 0x18($sp) -/* AB8AF8 80041958 8FB1001C */ lw $s1, 0x1c($sp) -/* AB8AFC 8004195C 8FB20020 */ lw $s2, 0x20($sp) -/* AB8B00 80041960 8FB30024 */ lw $s3, 0x24($sp) -/* AB8B04 80041964 8FB40028 */ lw $s4, 0x28($sp) -/* AB8B08 80041968 8FB5002C */ lw $s5, 0x2c($sp) -/* AB8B0C 8004196C 8FB60030 */ lw $s6, 0x30($sp) -/* AB8B10 80041970 03E00008 */ jr $ra -/* AB8B14 80041974 27BD0038 */ addiu $sp, $sp, 0x38 - diff --git a/asm/non_matchings/code/z_camera/func_800511E0.s b/asm/non_matchings/code/z_camera/func_800511E0.s deleted file mode 100644 index 48aaaf037c..0000000000 --- a/asm/non_matchings/code/z_camera/func_800511E0.s +++ /dev/null @@ -1,19 +0,0 @@ -.rdata -glabel D_801393FC - .asciz "chau!chau!\n" - .balign 4 - -.text -glabel func_800511E0 -/* AC8380 800511E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AC8384 800511E4 AFA40018 */ sw $a0, 0x18($sp) -/* AC8388 800511E8 AFBF0014 */ sw $ra, 0x14($sp) -/* AC838C 800511EC 3C048014 */ lui $a0, %hi(D_801393FC) # $a0, 0x8014 -/* AC8390 800511F0 0C00084C */ jal osSyncPrintf -/* AC8394 800511F4 248493FC */ addiu $a0, %lo(D_801393FC) # addiu $a0, $a0, -0x6c04 -/* AC8398 800511F8 0C011CE8 */ jal func_800473A0 -/* AC839C 800511FC 8FA40018 */ lw $a0, 0x18($sp) -/* AC83A0 80051200 8FBF0014 */ lw $ra, 0x14($sp) -/* AC83A4 80051204 27BD0018 */ addiu $sp, $sp, 0x18 -/* AC83A8 80051208 03E00008 */ jr $ra -/* AC83AC 8005120C 00000000 */ nop diff --git a/asm/non_matchings/code/z_camera/func_80057B98.s b/asm/non_matchings/code/z_camera/func_80057B98.s deleted file mode 100644 index c9daf6b78e..0000000000 --- a/asm/non_matchings/code/z_camera/func_80057B98.s +++ /dev/null @@ -1,48 +0,0 @@ -.rdata -glabel D_80139754 - .asciz "../z_camera.c" - .balign 4 - -glabel D_80139764 - .asciz "\x1B[34mcamera: create --- allocate %d byte\x1B[m\n" - .balign 4 - -glabel D_80139794 - .asciz "\x1B[41;37mcamera: create: not enough memory\n\x1B[m" - .balign 4 - -.text -glabel func_80057B98 -/* ACED38 80057B98 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* ACED3C 80057B9C AFA50024 */ sw $a1, 0x24($sp) -/* ACED40 80057BA0 AFBF0014 */ sw $ra, 0x14($sp) -/* ACED44 80057BA4 AFA40020 */ sw $a0, 0x20($sp) -/* ACED48 80057BA8 AFA60028 */ sw $a2, 0x28($sp) -/* ACED4C 80057BAC 3C058014 */ lui $a1, %hi(D_80139754) # $a1, 0x8014 -/* ACED50 80057BB0 24A59754 */ addiu $a1, %lo(D_80139754) # addiu $a1, $a1, -0x68ac -/* ACED54 80057BB4 2406249A */ li $a2, 9370 -/* ACED58 80057BB8 0C01EBB8 */ jal ZeldaArena_MallocDebug -/* ACED5C 80057BBC 2404016C */ li $a0, 364 -/* ACED60 80057BC0 1040000C */ beqz $v0, .L80057BF4 -/* ACED64 80057BC4 AFA2001C */ sw $v0, 0x1c($sp) -/* ACED68 80057BC8 3C048014 */ lui $a0, %hi(D_80139764) # $a0, 0x8014 -/* ACED6C 80057BCC 24849764 */ addiu $a0, %lo(D_80139764) # addiu $a0, $a0, -0x689c -/* ACED70 80057BD0 0C00084C */ jal osSyncPrintf -/* ACED74 80057BD4 240505B0 */ li $a1, 1456 -/* ACED78 80057BD8 8FA4001C */ lw $a0, 0x1c($sp) -/* ACED7C 80057BDC 8FA50020 */ lw $a1, 0x20($sp) -/* ACED80 80057BE0 8FA60024 */ lw $a2, 0x24($sp) -/* ACED84 80057BE4 0C015F1B */ jal func_80057C6C -/* ACED88 80057BE8 8FA70028 */ lw $a3, 0x28($sp) -/* ACED8C 80057BEC 10000005 */ b .L80057C04 -/* ACED90 80057BF0 8FBF0014 */ lw $ra, 0x14($sp) -.L80057BF4: -/* ACED94 80057BF4 3C048014 */ lui $a0, %hi(D_80139794) # $a0, 0x8014 -/* ACED98 80057BF8 0C00084C */ jal osSyncPrintf -/* ACED9C 80057BFC 24849794 */ addiu $a0, %lo(D_80139794) # addiu $a0, $a0, -0x686c -/* ACEDA0 80057C00 8FBF0014 */ lw $ra, 0x14($sp) -.L80057C04: -/* ACEDA4 80057C04 8FA2001C */ lw $v0, 0x1c($sp) -/* ACEDA8 80057C08 27BD0020 */ addiu $sp, $sp, 0x20 -/* ACEDAC 80057C0C 03E00008 */ jr $ra -/* ACEDB0 80057C10 00000000 */ nop diff --git a/asm/non_matchings/code/z_camera/func_80057C14.s b/asm/non_matchings/code/z_camera/func_80057C14.s deleted file mode 100644 index 50c467dc86..0000000000 --- a/asm/non_matchings/code/z_camera/func_80057C14.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_801397C4 - .asciz "\x1B[34mcamera: destroy ---\x1B[m\n" - .balign 4 - -glabel D_801397E4 - .asciz "../z_camera.c" - .balign 4 - -glabel D_801397F4 - .asciz "\x1B[43;30mcamera: destroy: already cleared\n\x1B[m" - .balign 4 - -.text -glabel func_80057C14 -/* ACEDB4 80057C14 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* ACEDB8 80057C18 AFBF0014 */ sw $ra, 0x14($sp) -/* ACEDBC 80057C1C 1080000C */ beqz $a0, .L80057C50 -/* ACEDC0 80057C20 00803825 */ move $a3, $a0 -/* ACEDC4 80057C24 3C048014 */ lui $a0, %hi(D_801397C4) # $a0, 0x8014 -/* ACEDC8 80057C28 248497C4 */ addiu $a0, %lo(D_801397C4) # addiu $a0, $a0, -0x683c -/* ACEDCC 80057C2C 0C00084C */ jal osSyncPrintf -/* ACEDD0 80057C30 AFA70018 */ sw $a3, 0x18($sp) -/* ACEDD4 80057C34 3C058014 */ lui $a1, %hi(D_801397E4) # $a1, 0x8014 -/* ACEDD8 80057C38 8FA40018 */ lw $a0, 0x18($sp) -/* ACEDDC 80057C3C 24A597E4 */ addiu $a1, %lo(D_801397E4) # addiu $a1, $a1, -0x681c -/* ACEDE0 80057C40 0C01EC35 */ jal ZeldaArena_FreeDebug -/* ACEDE4 80057C44 240624AF */ li $a2, 9391 -/* ACEDE8 80057C48 10000005 */ b .L80057C60 -/* ACEDEC 80057C4C 8FBF0014 */ lw $ra, 0x14($sp) -.L80057C50: -/* ACEDF0 80057C50 3C048014 */ lui $a0, %hi(D_801397F4) # $a0, 0x8014 -/* ACEDF4 80057C54 0C00084C */ jal osSyncPrintf -/* ACEDF8 80057C58 248497F4 */ addiu $a0, %lo(D_801397F4) # addiu $a0, $a0, -0x680c -/* ACEDFC 80057C5C 8FBF0014 */ lw $ra, 0x14($sp) -.L80057C60: -/* ACEE00 80057C60 27BD0018 */ addiu $sp, $sp, 0x18 -/* ACEE04 80057C64 03E00008 */ jr $ra -/* ACEE08 80057C68 00000000 */ nop diff --git a/asm/non_matchings/code/z_camera/func_80058D34.s b/asm/non_matchings/code/z_camera/func_80058D34.s deleted file mode 100644 index 17a41090e3..0000000000 --- a/asm/non_matchings/code/z_camera/func_80058D34.s +++ /dev/null @@ -1,108 +0,0 @@ -.rdata -glabel D_801399CC - .asciz "attention sound URGENCY\n" - .balign 4 - -glabel D_801399E8 - .asciz "attention sound NORMAL\n" - .balign 4 - -glabel D_80139A00 - .asciz "camera: force change SET to %s!\n" - .balign 4 - -.text -glabel func_80058D34 -/* ACFED4 80058D34 3C0E8012 */ lui $t6, %hi(D_8011D394) # $t6, 0x8012 -/* ACFED8 80058D38 8DCED394 */ lw $t6, %lo(D_8011D394)($t6) -/* ACFEDC 80058D3C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* ACFEE0 80058D40 AFBF0014 */ sw $ra, 0x14($sp) -/* ACFEE4 80058D44 AFA40020 */ sw $a0, 0x20($sp) -/* ACFEE8 80058D48 15C0004B */ bnez $t6, .L80058E78 -/* ACFEEC 80058D4C 00003025 */ move $a2, $zero -/* ACFEF0 80058D50 8C98008C */ lw $t8, 0x8c($a0) -/* ACFEF4 80058D54 3C088016 */ lui $t0, %hi(D_8015BD7C) # $t0, 0x8016 -/* ACFEF8 80058D58 871907A0 */ lh $t9, 0x7a0($t8) -/* ACFEFC 80058D5C 57200047 */ bnezl $t9, .L80058E7C -/* ACFF00 80058D60 8FBF0014 */ lw $ra, 0x14($sp) -/* ACFF04 80058D64 8D08BD7C */ lw $t0, %lo(D_8015BD7C)($t0) -/* ACFF08 80058D68 2401FFF7 */ li $at, -9 -/* ACFF0C 80058D6C 3C048014 */ lui $a0, %hi(D_801399CC) # $a0, 0x8014 -/* ACFF10 80058D70 95020050 */ lhu $v0, 0x50($t0) -/* ACFF14 80058D74 248499CC */ addiu $a0, %lo(D_801399CC) # addiu $a0, $a0, -0x6634 -/* ACFF18 80058D78 00414827 */ nor $t1, $v0, $at -/* ACFF1C 80058D7C 5520000A */ bnezl $t1, .L80058DA8 -/* ACFF20 80058D80 2401FFFB */ li $at, -5 -/* ACFF24 80058D84 0C00084C */ jal osSyncPrintf -/* ACFF28 80058D88 AFA0001C */ sw $zero, 0x1c($sp) -/* ACFF2C 80058D8C 0C01E221 */ jal func_80078884 -/* ACFF30 80058D90 24044837 */ li $a0, 18487 -/* ACFF34 80058D94 3C0A8016 */ lui $t2, %hi(D_8015BD7C) # $t2, 0x8016 -/* ACFF38 80058D98 8D4ABD7C */ lw $t2, %lo(D_8015BD7C)($t2) -/* ACFF3C 80058D9C 8FA6001C */ lw $a2, 0x1c($sp) -/* ACFF40 80058DA0 95420050 */ lhu $v0, 0x50($t2) -/* ACFF44 80058DA4 2401FFFB */ li $at, -5 -.L80058DA8: -/* ACFF48 80058DA8 00415827 */ nor $t3, $v0, $at -/* ACFF4C 80058DAC 1560000A */ bnez $t3, .L80058DD8 -/* ACFF50 80058DB0 3C048014 */ lui $a0, %hi(D_801399E8) # $a0, 0x8014 -/* ACFF54 80058DB4 248499E8 */ addiu $a0, %lo(D_801399E8) # addiu $a0, $a0, -0x6618 -/* ACFF58 80058DB8 0C00084C */ jal osSyncPrintf -/* ACFF5C 80058DBC AFA6001C */ sw $a2, 0x1c($sp) -/* ACFF60 80058DC0 0C01E221 */ jal func_80078884 -/* ACFF64 80058DC4 2404480C */ li $a0, 18444 -/* ACFF68 80058DC8 3C0C8016 */ lui $t4, %hi(D_8015BD7C) # $t4, 0x8016 -/* ACFF6C 80058DCC 8D8CBD7C */ lw $t4, %lo(D_8015BD7C)($t4) -/* ACFF70 80058DD0 8FA6001C */ lw $a2, 0x1c($sp) -/* ACFF74 80058DD4 95820050 */ lhu $v0, 0x50($t4) -.L80058DD8: -/* ACFF78 80058DD8 2401FFFE */ li $at, -2 -/* ACFF7C 80058DDC 00416827 */ nor $t5, $v0, $at -/* ACFF80 80058DE0 15A00002 */ bnez $t5, .L80058DEC -/* ACFF84 80058DE4 2401FFFD */ li $at, -3 -/* ACFF88 80058DE8 24060001 */ li $a2, 1 -.L80058DEC: -/* ACFF8C 80058DEC 00417027 */ nor $t6, $v0, $at -/* ACFF90 80058DF0 15C00002 */ bnez $t6, .L80058DFC -/* ACFF94 80058DF4 3C038012 */ lui $v1, %hi(D_8011D398) # $v1, 0x8012 -/* ACFF98 80058DF8 2406FFFF */ li $a2, -1 -.L80058DFC: -/* ACFF9C 80058DFC 10C0001E */ beqz $a2, .L80058E78 -/* ACFFA0 80058E00 2463D398 */ addiu $v1, %lo(D_8011D398) # addiu $v1, $v1, -0x2c68 -/* ACFFA4 80058E04 8C6F0000 */ lw $t7, ($v1) -/* ACFFA8 80058E08 24010006 */ li $at, 6 -/* ACFFAC 80058E0C 3C058012 */ lui $a1, %hi(D_8011DAFC) -/* ACFFB0 80058E10 01E6C021 */ addu $t8, $t7, $a2 -/* ACFFB4 80058E14 0301001A */ div $zero, $t8, $at -/* ACFFB8 80058E18 0000C810 */ mfhi $t9 -/* ACFFBC 80058E1C 00194840 */ sll $t1, $t9, 1 -/* ACFFC0 80058E20 AC790000 */ sw $t9, ($v1) -/* ACFFC4 80058E24 00A92821 */ addu $a1, $a1, $t1 -/* ACFFC8 80058E28 84A5DAFC */ lh $a1, %lo(D_8011DAFC)($a1) -/* ACFFCC 80058E2C 0C0169DF */ jal func_8005A77C -/* ACFFD0 80058E30 8FA40020 */ lw $a0, 0x20($sp) -/* ACFFD4 80058E34 3C038012 */ lui $v1, %hi(D_8011D398) # $v1, 0x8012 -/* ACFFD8 80058E38 1840000F */ blez $v0, .L80058E78 -/* ACFFDC 80058E3C 2463D398 */ addiu $v1, %lo(D_8011D398) # addiu $v1, $v1, -0x2c68 -/* ACFFE0 80058E40 8C6A0000 */ lw $t2, ($v1) -/* ACFFE4 80058E44 3C0C8012 */ lui $t4, %hi(D_8011DAFC) -/* ACFFE8 80058E48 3C0E8012 */ lui $t6, %hi(D_80119F8C) # $t6, 0x8012 -/* ACFFEC 80058E4C 000A5840 */ sll $t3, $t2, 1 -/* ACFFF0 80058E50 018B6021 */ addu $t4, $t4, $t3 -/* ACFFF4 80058E54 858CDAFC */ lh $t4, %lo(D_8011DAFC)($t4) -/* ACFFF8 80058E58 25CE9F8C */ addiu $t6, %lo(D_80119F8C) # addiu $t6, $t6, -0x6074 -/* ACFFFC 80058E5C 3C048014 */ lui $a0, %hi(D_80139A00) # $a0, 0x8014 -/* AD0000 80058E60 000C6880 */ sll $t5, $t4, 2 -/* AD0004 80058E64 01AC6823 */ subu $t5, $t5, $t4 -/* AD0008 80058E68 000D6880 */ sll $t5, $t5, 2 -/* AD000C 80058E6C 01AE2821 */ addu $a1, $t5, $t6 -/* AD0010 80058E70 0C00084C */ jal osSyncPrintf -/* AD0014 80058E74 24849A00 */ addiu $a0, %lo(D_80139A00) # addiu $a0, $a0, -0x6600 -.L80058E78: -/* AD0018 80058E78 8FBF0014 */ lw $ra, 0x14($sp) -.L80058E7C: -/* AD001C 80058E7C 27BD0020 */ addiu $sp, $sp, 0x20 -/* AD0020 80058E80 24020001 */ li $v0, 1 -/* AD0024 80058E84 03E00008 */ jr $ra -/* AD0028 80058E88 00000000 */ nop - diff --git a/asm/non_matchings/code/z_fbdemo_triforce/TransitionTriforce_Draw.s b/asm/non_matchings/code/z_fbdemo_triforce/TransitionTriforce_Draw.s deleted file mode 100644 index afca81dd2d..0000000000 --- a/asm/non_matchings/code/z_fbdemo_triforce/TransitionTriforce_Draw.s +++ /dev/null @@ -1,220 +0,0 @@ -.rdata -glabel D_80143070 - .asciz "rate=%f tx=%f ty=%f rotate=%f\n" - .balign 4 - -.text -glabel TransitionTriforce_Draw -/* B297A4 800B2604 27BDFF68 */ addiu $sp, $sp, -0x98 -/* B297A8 800B2608 AFBF002C */ sw $ra, 0x2c($sp) -/* B297AC 800B260C AFA40098 */ sw $a0, 0x98($sp) -/* B297B0 800B2610 AFA5009C */ sw $a1, 0x9c($sp) -/* B297B4 800B2614 8C820058 */ lw $v0, 0x58($a0) -/* B297B8 800B2618 3C0143B4 */ li $at, 0x43B40000 # 0.000000 -/* B297BC 800B261C 44812000 */ mtc1 $at, $f4 -/* B297C0 800B2620 C4820004 */ lwc1 $f2, 4($a0) -/* B297C4 800B2624 0002C080 */ sll $t8, $v0, 2 -/* B297C8 800B2628 0302C023 */ subu $t8, $t8, $v0 -/* B297CC 800B262C 0018C180 */ sll $t8, $t8, 6 -/* B297D0 800B2630 3C013F20 */ li $at, 0x3F200000 # 0.000000 -/* B297D4 800B2634 46041382 */ mul.s $f14, $f2, $f4 -/* B297D8 800B2638 44813000 */ mtc1 $at, $f6 -/* B297DC 800B263C 0098C821 */ addu $t9, $a0, $t8 -/* B297E0 800B2640 8CA30000 */ lw $v1, ($a1) -/* B297E4 800B2644 27280060 */ addiu $t0, $t9, 0x60 -/* B297E8 800B2648 AFA80090 */ sw $t0, 0x90($sp) -/* B297EC 800B264C 38490001 */ xori $t1, $v0, 1 -/* B297F0 800B2650 46061302 */ mul.s $f12, $f2, $f6 -/* B297F4 800B2654 AC890058 */ sw $t1, 0x58($a0) -/* B297F8 800B2658 44805000 */ mtc1 $zero, $f10 -/* B297FC 800B265C 46001221 */ cvt.d.s $f8, $f2 -/* B29800 800B2660 46007421 */ cvt.d.s $f16, $f14 -/* B29804 800B2664 44074000 */ mfc1 $a3, $f8 -/* B29808 800B2668 46005021 */ cvt.d.s $f0, $f10 -/* B2980C 800B266C 44064800 */ mfc1 $a2, $f9 -/* B29810 800B2670 3C048014 */ lui $a0, %hi(D_80143070) -/* B29814 800B2674 24843070 */ addiu $a0, %lo(D_80143070) # addiu $a0, $a0, 0x3070 -/* B29818 800B2678 F7A00010 */ sdc1 $f0, 0x10($sp) -/* B2981C 800B267C F7A00018 */ sdc1 $f0, 0x18($sp) -/* B29820 800B2680 F7B00020 */ sdc1 $f16, 0x20($sp) -/* B29824 800B2684 E7AE0080 */ swc1 $f14, 0x80($sp) -/* B29828 800B2688 E7AC008C */ swc1 $f12, 0x8c($sp) -/* B2982C 800B268C 0C00084C */ jal osSyncPrintf -/* B29830 800B2690 AFA30094 */ sw $v1, 0x94($sp) -/* B29834 800B2694 C7AC008C */ lwc1 $f12, 0x8c($sp) -/* B29838 800B2698 8FA40090 */ lw $a0, 0x90($sp) -/* B2983C 800B269C 3C073F80 */ li $a3, 0x3F800000 # 0.000000 -/* B29840 800B26A0 44056000 */ mfc1 $a1, $f12 -/* B29844 800B26A4 44066000 */ mfc1 $a2, $f12 -/* B29848 800B26A8 0C040078 */ jal guScale -/* B2984C 800B26AC 00000000 */ nop -/* B29850 800B26B0 44800000 */ mtc1 $zero, $f0 -/* B29854 800B26B4 8FA40090 */ lw $a0, 0x90($sp) -/* B29858 800B26B8 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B2985C 800B26BC 44819000 */ mtc1 $at, $f18 -/* B29860 800B26C0 24840040 */ addiu $a0, $a0, 0x40 -/* B29864 800B26C4 44060000 */ mfc1 $a2, $f0 -/* B29868 800B26C8 44070000 */ mfc1 $a3, $f0 -/* B2986C 800B26CC AFA40034 */ sw $a0, 0x34($sp) -/* B29870 800B26D0 8FA50080 */ lw $a1, 0x80($sp) -/* B29874 800B26D4 0C040FE9 */ jal guRotate -/* B29878 800B26D8 E7B20010 */ swc1 $f18, 0x10($sp) -/* B2987C 800B26DC 44800000 */ mtc1 $zero, $f0 -/* B29880 800B26E0 8FA40090 */ lw $a0, 0x90($sp) -/* B29884 800B26E4 44050000 */ mfc1 $a1, $f0 -/* B29888 800B26E8 24840080 */ addiu $a0, $a0, 0x80 -/* B2988C 800B26EC 44060000 */ mfc1 $a2, $f0 -/* B29890 800B26F0 44070000 */ mfc1 $a3, $f0 -/* B29894 800B26F4 0C041708 */ jal guTranslate -/* B29898 800B26F8 AFA40030 */ sw $a0, 0x30($sp) -/* B2989C 800B26FC 8FA20094 */ lw $v0, 0x94($sp) -/* B298A0 800B2700 8FA40030 */ lw $a0, 0x30($sp) -/* B298A4 800B2704 3C0AE700 */ lui $t2, 0xe700 -/* B298A8 800B2708 AC4A0000 */ sw $t2, ($v0) -/* B298AC 800B270C AC400004 */ sw $zero, 4($v0) -/* B298B0 800B2710 24430008 */ addiu $v1, $v0, 8 -/* B298B4 800B2714 00601025 */ move $v0, $v1 -/* B298B8 800B2718 3C0C8013 */ lui $t4, %hi(D_8012B030) # $t4, 0x8013 -/* B298BC 800B271C 258CB030 */ addiu $t4, %lo(D_8012B030) # addiu $t4, $t4, -0x4fd0 -/* B298C0 800B2720 3C0BDE00 */ lui $t3, 0xde00 -/* B298C4 800B2724 AC4B0000 */ sw $t3, ($v0) -/* B298C8 800B2728 AC4C0004 */ sw $t4, 4($v0) -/* B298CC 800B272C 8FA60098 */ lw $a2, 0x98($sp) -/* B298D0 800B2730 24630008 */ addiu $v1, $v1, 8 -/* B298D4 800B2734 00601025 */ move $v0, $v1 -/* B298D8 800B2738 3C0DFA00 */ lui $t5, 0xfa00 -/* B298DC 800B273C AC4D0000 */ sw $t5, ($v0) -/* B298E0 800B2740 8CCE0000 */ lw $t6, ($a2) -/* B298E4 800B2744 24630008 */ addiu $v1, $v1, 8 -/* B298E8 800B2748 3C18FCFF */ lui $t8, (0xFCFFFFFF >> 16) # lui $t8, 0xfcff -/* B298EC 800B274C AC4E0004 */ sw $t6, 4($v0) -/* B298F0 800B2750 00601025 */ move $v0, $v1 -/* B298F4 800B2754 3C19FFFD */ lui $t9, (0xFFFDF6FB >> 16) # lui $t9, 0xfffd -/* B298F8 800B2758 3739F6FB */ ori $t9, (0xFFFDF6FB & 0xFFFF) # ori $t9, $t9, 0xf6fb -/* B298FC 800B275C 3718FFFF */ ori $t8, (0xFCFFFFFF & 0xFFFF) # ori $t8, $t8, 0xffff -/* B29900 800B2760 AC580000 */ sw $t8, ($v0) -/* B29904 800B2764 AC590004 */ sw $t9, 4($v0) -/* B29908 800B2768 24630008 */ addiu $v1, $v1, 8 -/* B2990C 800B276C 00601025 */ move $v0, $v1 -/* B29910 800B2770 3C08DA38 */ lui $t0, (0xDA380007 >> 16) # lui $t0, 0xda38 -/* B29914 800B2774 35080007 */ ori $t0, (0xDA380007 & 0xFFFF) # ori $t0, $t0, 7 -/* B29918 800B2778 24C90018 */ addiu $t1, $a2, 0x18 -/* B2991C 800B277C AC490004 */ sw $t1, 4($v0) -/* B29920 800B2780 AC480000 */ sw $t0, ($v0) -/* B29924 800B2784 24630008 */ addiu $v1, $v1, 8 -/* B29928 800B2788 3C0FDA38 */ lui $t7, (0xDA380003 >> 16) # lui $t7, 0xda38 -/* B2992C 800B278C 35EF0003 */ ori $t7, (0xDA380003 & 0xFFFF) # ori $t7, $t7, 3 -/* B29930 800B2790 00601025 */ move $v0, $v1 -/* B29934 800B2794 AC4F0000 */ sw $t7, ($v0) -/* B29938 800B2798 8FAA0090 */ lw $t2, 0x90($sp) -/* B2993C 800B279C 24630008 */ addiu $v1, $v1, 8 -/* B29940 800B27A0 3C05DA38 */ lui $a1, (0xDA380001 >> 16) # lui $a1, 0xda38 -/* B29944 800B27A4 AC4A0004 */ sw $t2, 4($v0) -/* B29948 800B27A8 00601025 */ move $v0, $v1 -/* B2994C 800B27AC 34A50001 */ ori $a1, (0xDA380001 & 0xFFFF) # ori $a1, $a1, 1 -/* B29950 800B27B0 AC450000 */ sw $a1, ($v0) -/* B29954 800B27B4 8FAB0034 */ lw $t3, 0x34($sp) -/* B29958 800B27B8 24630008 */ addiu $v1, $v1, 8 -/* B2995C 800B27BC 3C0D8013 */ lui $t5, %hi(D_8012B060) # $t5, 0x8013 -/* B29960 800B27C0 AC4B0004 */ sw $t3, 4($v0) -/* B29964 800B27C4 00601025 */ move $v0, $v1 -/* B29968 800B27C8 AC450000 */ sw $a1, ($v0) -/* B2996C 800B27CC 24630008 */ addiu $v1, $v1, 8 -/* B29970 800B27D0 AC440004 */ sw $a0, 4($v0) -/* B29974 800B27D4 00601025 */ move $v0, $v1 -/* B29978 800B27D8 3C0C0100 */ lui $t4, (0x0100A014 >> 16) # lui $t4, 0x100 -/* B2997C 800B27DC 358CA014 */ ori $t4, (0x0100A014 & 0xFFFF) # ori $t4, $t4, 0xa014 -/* B29980 800B27E0 25ADB060 */ addiu $t5, %lo(D_8012B060) # addiu $t5, $t5, -0x4fa0 -/* B29984 800B27E4 AC4D0004 */ sw $t5, 4($v0) -/* B29988 800B27E8 AC4C0000 */ sw $t4, ($v0) -/* B2998C 800B27EC 24630008 */ addiu $v1, $v1, 8 -/* B29990 800B27F0 AFA30094 */ sw $v1, 0x94($sp) -/* B29994 800B27F4 0C02CA51 */ jal TransitionTriforce_IsDone -/* B29998 800B27F8 00C02025 */ move $a0, $a2 -/* B2999C 800B27FC 14400038 */ bnez $v0, .L800B28E0 -/* B299A0 800B2800 8FA30094 */ lw $v1, 0x94($sp) -/* B299A4 800B2804 8FAE0098 */ lw $t6, 0x98($sp) -/* B299A8 800B2808 24010001 */ li $at, 1 -/* B299AC 800B280C 3C180600 */ lui $t8, (0x0600080A >> 16) # lui $t8, 0x600 -/* B299B0 800B2810 8DC20010 */ lw $v0, 0x10($t6) -/* B299B4 800B2814 3C190008 */ lui $t9, (0x00080206 >> 16) # lui $t9, 8 -/* B299B8 800B2818 37390206 */ ori $t9, (0x00080206 & 0xFFFF) # ori $t9, $t9, 0x206 -/* B299BC 800B281C 10410006 */ beq $v0, $at, .L800B2838 -/* B299C0 800B2820 3718080A */ ori $t8, (0x0600080A & 0xFFFF) # ori $t8, $t8, 0x80a -/* B299C4 800B2824 24010002 */ li $at, 2 -/* B299C8 800B2828 1041000E */ beq $v0, $at, .L800B2864 -/* B299CC 800B282C 3C090606 */ lui $t1, (0x0606080A >> 16) # lui $t1, 0x606 -/* B299D0 800B2830 1000003A */ b .L800B291C -/* B299D4 800B2834 00601025 */ move $v0, $v1 -.L800B2838: -/* B299D8 800B2838 00601025 */ move $v0, $v1 -/* B299DC 800B283C AC580000 */ sw $t8, ($v0) -/* B299E0 800B2840 AC590004 */ sw $t9, 4($v0) -/* B299E4 800B2844 24630008 */ addiu $v1, $v1, 8 -/* B299E8 800B2848 00601025 */ move $v0, $v1 -/* B299EC 800B284C 3C08050A */ lui $t0, (0x050A0604 >> 16) # lui $t0, 0x50a -/* B299F0 800B2850 35080604 */ ori $t0, (0x050A0604 & 0xFFFF) # ori $t0, $t0, 0x604 -/* B299F4 800B2854 AC480000 */ sw $t0, ($v0) -/* B299F8 800B2858 AC400004 */ sw $zero, 4($v0) -/* B299FC 800B285C 1000002E */ b .L800B2918 -/* B29A00 800B2860 24630008 */ addiu $v1, $v1, 8 -.L800B2864: -/* B29A04 800B2864 00601025 */ move $v0, $v1 -/* B29A08 800B2868 3529080A */ ori $t1, (0x0606080A & 0xFFFF) # ori $t1, $t1, 0x80a -/* B29A0C 800B286C 240F040C */ li $t7, 1036 -/* B29A10 800B2870 AC4F0004 */ sw $t7, 4($v0) -/* B29A14 800B2874 AC490000 */ sw $t1, ($v0) -/* B29A18 800B2878 24630008 */ addiu $v1, $v1, 8 -/* B29A1C 800B287C 00601025 */ move $v0, $v1 -/* B29A20 800B2880 3C0A0600 */ lui $t2, (0x06000C0E >> 16) # lui $t2, 0x600 -/* B29A24 800B2884 3C0B0002 */ lui $t3, (0x0002000E >> 16) # lui $t3, 2 -/* B29A28 800B2888 356B000E */ ori $t3, (0x0002000E & 0xFFFF) # ori $t3, $t3, 0xe -/* B29A2C 800B288C 354A0C0E */ ori $t2, (0x06000C0E & 0xFFFF) # ori $t2, $t2, 0xc0e -/* B29A30 800B2890 AC4A0000 */ sw $t2, ($v0) -/* B29A34 800B2894 AC4B0004 */ sw $t3, 4($v0) -/* B29A38 800B2898 24630008 */ addiu $v1, $v1, 8 -/* B29A3C 800B289C 00601025 */ move $v0, $v1 -/* B29A40 800B28A0 3C0C0602 */ lui $t4, (0x06020E10 >> 16) # lui $t4, 0x602 -/* B29A44 800B28A4 3C0D0002 */ lui $t5, (0x00021012 >> 16) # lui $t5, 2 -/* B29A48 800B28A8 35AD1012 */ ori $t5, (0x00021012 & 0xFFFF) # ori $t5, $t5, 0x1012 -/* B29A4C 800B28AC 358C0E10 */ ori $t4, (0x06020E10 & 0xFFFF) # ori $t4, $t4, 0xe10 -/* B29A50 800B28B0 AC4C0000 */ sw $t4, ($v0) -/* B29A54 800B28B4 AC4D0004 */ sw $t5, 4($v0) -/* B29A58 800B28B8 24630008 */ addiu $v1, $v1, 8 -/* B29A5C 800B28BC 00601025 */ move $v0, $v1 -/* B29A60 800B28C0 3C0E0602 */ lui $t6, (0x06021204 >> 16) # lui $t6, 0x602 -/* B29A64 800B28C4 3C180004 */ lui $t8, (0x0004120C >> 16) # lui $t8, 4 -/* B29A68 800B28C8 3718120C */ ori $t8, (0x0004120C & 0xFFFF) # ori $t8, $t8, 0x120c -/* B29A6C 800B28CC 35CE1204 */ ori $t6, (0x06021204 & 0xFFFF) # ori $t6, $t6, 0x1204 -/* B29A70 800B28D0 AC4E0000 */ sw $t6, ($v0) -/* B29A74 800B28D4 AC580004 */ sw $t8, 4($v0) -/* B29A78 800B28D8 1000000F */ b .L800B2918 -/* B29A7C 800B28DC 24630008 */ addiu $v1, $v1, 8 -.L800B28E0: -/* B29A80 800B28E0 8FB90098 */ lw $t9, 0x98($sp) -/* B29A84 800B28E4 24010001 */ li $at, 1 -/* B29A88 800B28E8 8F220010 */ lw $v0, 0x10($t9) -/* B29A8C 800B28EC 1041000A */ beq $v0, $at, .L800B2918 -/* B29A90 800B28F0 24010002 */ li $at, 2 -/* B29A94 800B28F4 14410008 */ bne $v0, $at, .L800B2918 -/* B29A98 800B28F8 3C08070C */ lui $t0, (0x070C0E10 >> 16) # lui $t0, 0x70c -/* B29A9C 800B28FC 00601025 */ move $v0, $v1 -/* B29AA0 800B2900 3C09000C */ lui $t1, (0x000C1012 >> 16) # lui $t1, 0xc -/* B29AA4 800B2904 35291012 */ ori $t1, (0x000C1012 & 0xFFFF) # ori $t1, $t1, 0x1012 -/* B29AA8 800B2908 35080E10 */ ori $t0, (0x070C0E10 & 0xFFFF) # ori $t0, $t0, 0xe10 -/* B29AAC 800B290C AC480000 */ sw $t0, ($v0) -/* B29AB0 800B2910 AC490004 */ sw $t1, 4($v0) -/* B29AB4 800B2914 24630008 */ addiu $v1, $v1, 8 -.L800B2918: -/* B29AB8 800B2918 00601025 */ move $v0, $v1 -.L800B291C: -/* B29ABC 800B291C 3C0FE700 */ lui $t7, 0xe700 -/* B29AC0 800B2920 AC4F0000 */ sw $t7, ($v0) -/* B29AC4 800B2924 AC400004 */ sw $zero, 4($v0) -/* B29AC8 800B2928 8FAA009C */ lw $t2, 0x9c($sp) -/* B29ACC 800B292C 24630008 */ addiu $v1, $v1, 8 -/* B29AD0 800B2930 AD430000 */ sw $v1, ($t2) -/* B29AD4 800B2934 8FBF002C */ lw $ra, 0x2c($sp) -/* B29AD8 800B2938 27BD0098 */ addiu $sp, $sp, 0x98 -/* B29ADC 800B293C 03E00008 */ jr $ra -/* B29AE0 800B2940 00000000 */ nop \ No newline at end of file diff --git a/asm/non_matchings/code/z_fbdemo_triforce/TransitionTriforce_IsDone.s b/asm/non_matchings/code/z_fbdemo_triforce/TransitionTriforce_IsDone.s deleted file mode 100644 index 24b9621069..0000000000 --- a/asm/non_matchings/code/z_fbdemo_triforce/TransitionTriforce_IsDone.s +++ /dev/null @@ -1,48 +0,0 @@ -.late_rodata -glabel D_8014309C - .float 0.03 - -.text -glabel TransitionTriforce_IsDone -/* B29AE4 800B2944 8C82000C */ lw $v0, 0xc($a0) -/* B29AE8 800B2948 24010001 */ li $at, 1 -/* B29AEC 800B294C 10410002 */ beq $v0, $at, .L800B2958 -/* B29AF0 800B2950 24010002 */ li $at, 2 -/* B29AF4 800B2954 1441000B */ bne $v0, $at, .L800B2984 -.L800B2958: -/* B29AF8 800B2958 3C018014 */ lui $at, %hi(D_8014309C) -/* B29AFC 800B295C C424309C */ lwc1 $f4, %lo(D_8014309C)($at) -/* B29B00 800B2960 C4860004 */ lwc1 $f6, 4($a0) -/* B29B04 800B2964 00001025 */ move $v0, $zero -/* B29B08 800B2968 4604303E */ c.le.s $f6, $f4 -/* B29B0C 800B296C 00000000 */ nop -/* B29B10 800B2970 45000002 */ bc1f .L800B297C -/* B29B14 800B2974 00000000 */ nop -/* B29B18 800B2978 24020001 */ li $v0, 1 -.L800B297C: -/* B29B1C 800B297C 03E00008 */ jr $ra -/* B29B20 800B2980 00000000 */ nop - -.L800B2984: -/* B29B24 800B2984 24010003 */ li $at, 3 -/* B29B28 800B2988 10410002 */ beq $v0, $at, .L800B2994 -/* B29B2C 800B298C 24010004 */ li $at, 4 -/* B29B30 800B2990 1441000B */ bne $v0, $at, .L800B29C0 -.L800B2994: -/* B29B34 800B2994 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B29B38 800B2998 44815000 */ mtc1 $at, $f10 -/* B29B3C 800B299C C4880004 */ lwc1 $f8, 4($a0) -/* B29B40 800B29A0 00001025 */ move $v0, $zero -/* B29B44 800B29A4 4608503E */ c.le.s $f10, $f8 -/* B29B48 800B29A8 00000000 */ nop -/* B29B4C 800B29AC 45000002 */ bc1f .L800B29B8 -/* B29B50 800B29B0 00000000 */ nop -/* B29B54 800B29B4 24020001 */ li $v0, 1 -.L800B29B8: -/* B29B58 800B29B8 03E00008 */ jr $ra -/* B29B5C 800B29BC 00000000 */ nop - -.L800B29C0: -/* B29B60 800B29C0 00001025 */ move $v0, $zero -/* B29B64 800B29C4 03E00008 */ jr $ra -/* B29B68 800B29C8 00000000 */ nop diff --git a/asm/non_matchings/code/z_fbdemo_wipe1/TransitionWipe1_Move.s b/asm/non_matchings/code/z_fbdemo_wipe1/TransitionWipe1_Move.s deleted file mode 100644 index 6feb2890e4..0000000000 --- a/asm/non_matchings/code/z_fbdemo_wipe1/TransitionWipe1_Move.s +++ /dev/null @@ -1,63 +0,0 @@ -glabel TransitionWipe1_Move -/* B29C58 800B2AB8 908E0008 */ lbu $t6, 8($a0) -/* B29C5C 800B2ABC 3C028016 */ lui $v0, %hi(gSaveContext+0x1419) -/* B29C60 800B2AC0 11C0001B */ beqz $t6, .L800B2B30 -/* B29C64 800B2AC4 00000000 */ nop -/* B29C68 800B2AC8 3C028016 */ lui $v0, %hi(gSaveContext+0x1419) # $v0, 0x8016 -/* B29C6C 800B2ACC 9042FA79 */ lbu $v0, %lo(gSaveContext+0x1419)($v0) -/* B29C70 800B2AD0 948F000E */ lhu $t7, 0xe($a0) -/* B29C74 800B2AD4 240A0264 */ li $t2, 612 -/* B29C78 800B2AD8 0002C080 */ sll $t8, $v0, 2 -/* B29C7C 800B2ADC 0302C023 */ subu $t8, $t8, $v0 -/* B29C80 800B2AE0 0305001A */ div $zero, $t8, $a1 -/* B29C84 800B2AE4 14A00002 */ bnez $a1, .L800B2AF0 -/* B29C88 800B2AE8 00000000 */ nop -/* B29C8C 800B2AEC 0007000D */ break 7 -.L800B2AF0: -/* B29C90 800B2AF0 2401FFFF */ li $at, -1 -/* B29C94 800B2AF4 14A10004 */ bne $a1, $at, .L800B2B08 -/* B29C98 800B2AF8 3C018000 */ lui $at, 0x8000 -/* B29C9C 800B2AFC 17010002 */ bne $t8, $at, .L800B2B08 -/* B29CA0 800B2B00 00000000 */ nop -/* B29CA4 800B2B04 0006000D */ break 6 -.L800B2B08: -/* B29CA8 800B2B08 0000C812 */ mflo $t9 -/* B29CAC 800B2B0C 01F94021 */ addu $t0, $t7, $t9 -/* B29CB0 800B2B10 3109FFFF */ andi $t1, $t0, 0xffff -/* B29CB4 800B2B14 29210264 */ slti $at, $t1, 0x264 -/* B29CB8 800B2B18 1420001D */ bnez $at, .L800B2B90 -/* B29CBC 800B2B1C A488000E */ sh $t0, 0xe($a0) -/* B29CC0 800B2B20 240B0001 */ li $t3, 1 -/* B29CC4 800B2B24 A48A000E */ sh $t2, 0xe($a0) -/* B29CC8 800B2B28 03E00008 */ jr $ra -/* B29CCC 800B2B2C A08B000A */ sb $t3, 0xa($a0) -.L800B2B30: -/* B29CD0 800B2B30 9042FA79 */ lbu $v0, %lo(gSaveContext+0x1419)($v0) -/* B29CD4 800B2B34 948C000E */ lhu $t4, 0xe($a0) -/* B29CD8 800B2B38 2419014D */ li $t9, 333 -/* B29CDC 800B2B3C 00026880 */ sll $t5, $v0, 2 -/* B29CE0 800B2B40 01A26823 */ subu $t5, $t5, $v0 -/* B29CE4 800B2B44 01A5001A */ div $zero, $t5, $a1 -/* B29CE8 800B2B48 14A00002 */ bnez $a1, .L800B2B54 -/* B29CEC 800B2B4C 00000000 */ nop -/* B29CF0 800B2B50 0007000D */ break 7 -.L800B2B54: -/* B29CF4 800B2B54 2401FFFF */ li $at, -1 -/* B29CF8 800B2B58 14A10004 */ bne $a1, $at, .L800B2B6C -/* B29CFC 800B2B5C 3C018000 */ lui $at, 0x8000 -/* B29D00 800B2B60 15A10002 */ bne $t5, $at, .L800B2B6C -/* B29D04 800B2B64 00000000 */ nop -/* B29D08 800B2B68 0006000D */ break 6 -.L800B2B6C: -/* B29D0C 800B2B6C 00007012 */ mflo $t6 -/* B29D10 800B2B70 018EC023 */ subu $t8, $t4, $t6 -/* B29D14 800B2B74 330FFFFF */ andi $t7, $t8, 0xffff -/* B29D18 800B2B78 29E1014E */ slti $at, $t7, 0x14e -/* B29D1C 800B2B7C 10200004 */ beqz $at, .L800B2B90 -/* B29D20 800B2B80 A498000E */ sh $t8, 0xe($a0) -/* B29D24 800B2B84 24080001 */ li $t0, 1 -/* B29D28 800B2B88 A499000E */ sh $t9, 0xe($a0) -/* B29D2C 800B2B8C A088000A */ sb $t0, 0xa($a0) -.L800B2B90: -/* B29D30 800B2B90 03E00008 */ jr $ra -/* B29D34 800B2B94 00000000 */ nop \ No newline at end of file diff --git a/asm/non_matchings/code/z_rcp/Gfx_BranchTexScroll.s b/asm/non_matchings/code/z_rcp/Gfx_BranchTexScroll.s deleted file mode 100644 index 7885189604..0000000000 --- a/asm/non_matchings/code/z_rcp/Gfx_BranchTexScroll.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel Gfx_BranchTexScroll -/* B0BF58 80094DB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B0BF5C 80094DBC AFBF0014 */ sw $ra, 0x14($sp) -/* B0BF60 80094DC0 AFA5001C */ sw $a1, 0x1c($sp) -/* B0BF64 80094DC4 AFA60020 */ sw $a2, 0x20($sp) -/* B0BF68 80094DC8 AFA70024 */ sw $a3, 0x24($sp) -/* B0BF6C 80094DCC 0C031B0F */ jal Graph_DlistAlloc -/* B0BF70 80094DD0 24050018 */ li $a1, 24 -/* B0BF74 80094DD4 8FA4001C */ lw $a0, 0x1c($sp) -/* B0BF78 80094DD8 8FA50020 */ lw $a1, 0x20($sp) -/* B0BF7C 80094DDC 3C01F200 */ lui $at, 0xf200 -/* B0BF80 80094DE0 308F0FFF */ andi $t7, $a0, 0xfff -/* B0BF84 80094DE4 000FC300 */ sll $t8, $t7, 0xc -/* B0BF88 80094DE8 0301C825 */ or $t9, $t8, $at -/* B0BF8C 80094DEC 30A80FFF */ andi $t0, $a1, 0xfff -/* B0BF90 80094DF0 3C0EE800 */ lui $t6, 0xe800 -/* B0BF94 80094DF4 03284825 */ or $t1, $t9, $t0 -/* B0BF98 80094DF8 AC4E0000 */ sw $t6, ($v0) -/* B0BF9C 80094DFC AC400004 */ sw $zero, 4($v0) -/* B0BFA0 80094E00 AC490008 */ sw $t1, 8($v0) -/* B0BFA4 80094E04 8FAA0024 */ lw $t2, 0x24($sp) -/* B0BFA8 80094E08 8FB80028 */ lw $t8, 0x28($sp) -/* B0BFAC 80094E0C AC400014 */ sw $zero, 0x14($v0) -/* B0BFB0 80094E10 254BFFFF */ addiu $t3, $t2, -1 -/* B0BFB4 80094E14 000B6080 */ sll $t4, $t3, 2 -/* B0BFB8 80094E18 2719FFFF */ addiu $t9, $t8, -1 -/* B0BFBC 80094E1C 00194080 */ sll $t0, $t9, 2 -/* B0BFC0 80094E20 01846821 */ addu $t5, $t4, $a0 -/* B0BFC4 80094E24 31AE0FFF */ andi $t6, $t5, 0xfff -/* B0BFC8 80094E28 00A84821 */ addu $t1, $a1, $t0 -/* B0BFCC 80094E2C 312A0FFF */ andi $t2, $t1, 0xfff -/* B0BFD0 80094E30 000E7B00 */ sll $t7, $t6, 0xc -/* B0BFD4 80094E34 01EA5825 */ or $t3, $t7, $t2 -/* B0BFD8 80094E38 3C0CDF00 */ lui $t4, 0xdf00 -/* B0BFDC 80094E3C AC4B000C */ sw $t3, 0xc($v0) -/* B0BFE0 80094E40 AC4C0010 */ sw $t4, 0x10($v0) -/* B0BFE4 80094E44 8FBF0014 */ lw $ra, 0x14($sp) -/* B0BFE8 80094E48 27BD0018 */ addiu $sp, $sp, 0x18 -/* B0BFEC 80094E4C 03E00008 */ jr $ra -/* B0BFF0 80094E50 00000000 */ nop - diff --git a/data/code_800B2400.data.s b/data/code_800B2400.data.s deleted file mode 100644 index 6fc06374b4..0000000000 --- a/data/code_800B2400.data.s +++ /dev/null @@ -1,14 +0,0 @@ -.include "macro.inc" - -# assembler directives -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers - -.section .data - -glabel D_8012B030 - .incbin "baserom.z64", 0xBA21D0, 0x30 - -glabel D_8012B060 - .incbin "baserom.z64", 0xBA2200, 0xA30 diff --git a/data/code_800B2400.rodata.s b/data/code_800B2400.rodata.s deleted file mode 100644 index 08c6b3851a..0000000000 --- a/data/code_800B2400.rodata.s +++ /dev/null @@ -1,26 +0,0 @@ -.include "macro.inc" - -# assembler directives -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -.align 4 - -glabel D_80143070 - .asciz "rate=%f tx=%f ty=%f rotate=%f\n" - .balign 4 - -glabel D_80143090 - .float 0.03 - -glabel D_80143094 - .float 0.015 - -glabel D_80143098 - .float 0.03 - -glabel D_8014309C - .float 0.03 diff --git a/data/code_800B29D0.data.s b/data/code_800B29D0.data.s deleted file mode 100644 index 3ffa645c07..0000000000 --- a/data/code_800B29D0.data.s +++ /dev/null @@ -1,11 +0,0 @@ -.include "macro.inc" - -# assembler directives -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers - -.section .data - -glabel D_8012BA90 - .incbin "baserom.z64", 0xBA2C30, 0x110 diff --git a/data/code_800B29D0.rodata.s b/data/code_800B29D0.rodata.s deleted file mode 100644 index 0f845e4a92..0000000000 --- a/data/code_800B29D0.rodata.s +++ /dev/null @@ -1,13 +0,0 @@ -.include "macro.inc" - -# assembler directives -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -.align 4 - -glabel D_801430A0 - .float 0.56 diff --git a/data/code_800B2E30.data.s b/data/code_800B2E30.data.s deleted file mode 100644 index 5b830767e9..0000000000 --- a/data/code_800B2E30.data.s +++ /dev/null @@ -1,26 +0,0 @@ -.include "macro.inc" - -# assembler directives -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers - -.section .data - -glabel D_8012BBA0 - .incbin "baserom.z64", 0xBA2D40, 0x8 - -glabel D_8012BBA8 - .incbin "baserom.z64", 0xBA2D48, 0x400 - -glabel D_8012BFA8 - .incbin "baserom.z64", 0xBA3148, 0x400 - -glabel D_8012C3A8 - .incbin "baserom.z64", 0xBA3548, 0x400 - -glabel D_8012C7A8 - .incbin "baserom.z64", 0xBA3948, 0x620 - -glabel D_8012CDC8 - .incbin "baserom.z64", 0xBA3F68, 0xD8 diff --git a/data/code_800B2E30.rodata.s b/data/code_800B2E30.rodata.s deleted file mode 100644 index 103f10d305..0000000000 --- a/data/code_800B2E30.rodata.s +++ /dev/null @@ -1,13 +0,0 @@ -.include "macro.inc" - -# assembler directives -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -.align 4 - -glabel D_801430B0 - .float 14.8 diff --git a/data/code_800B34E0.data.s b/data/code_800B34E0.data.s deleted file mode 100644 index a2389e56bc..0000000000 --- a/data/code_800B34E0.data.s +++ /dev/null @@ -1,11 +0,0 @@ -.include "macro.inc" - -# assembler directives -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers - -.section .data - -glabel D_8012CEA0 - .incbin "baserom.z64", 0xBA4040, 0x30 diff --git a/data/code_800B34E0.rodata.s b/data/code_800B34E0.rodata.s deleted file mode 100644 index 46b503e94d..0000000000 --- a/data/code_800B34E0.rodata.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -# assembler directives -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -.align 4 - -glabel D_801430C0 - .asciz "\x1b[41;37m0除算! ZCommonGet fade_speed に0がはいってる\x1B[m" - # EUC-JP: 0除算! ZCommonGet fade_speed に0がはいってる | Divide by zero! Zero is entered in ZCommonGetfade_speed - .balign 4 diff --git a/data/z_fbdemo.data.s b/data/z_fbdemo.data.s deleted file mode 100644 index 59d6f1404c..0000000000 --- a/data/z_fbdemo.data.s +++ /dev/null @@ -1,14 +0,0 @@ -.include "macro.inc" - -# assembler directives -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers - -.section .data - -glabel D_8012AFB0 - .incbin "baserom.z64", 0xBA2150, 0x50 - -glabel D_8012B000 - .incbin "baserom.z64", 0xBA21A0, 0x30