diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/EnFr_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/EnFr_Destroy.s deleted file mode 100644 index 4240c937d8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/EnFr_Destroy.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel EnFr_Destroy -/* 0059C 80A1AF3C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 005A0 80A1AF40 AFA40018 */ sw $a0, 0x0018($sp) -/* 005A4 80A1AF44 8FAE0018 */ lw $t6, 0x0018($sp) -/* 005A8 80A1AF48 AFBF0014 */ sw $ra, 0x0014($sp) -/* 005AC 80A1AF4C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 005B0 80A1AF50 24A507A8 */ addiu $a1, $a1, 0x07A8 ## $a1 = 000007A8 -/* 005B4 80A1AF54 0C01E9F1 */ jal LightContext_RemoveLight - -/* 005B8 80A1AF58 8DC60358 */ lw $a2, 0x0358($t6) ## 00000358 -/* 005BC 80A1AF5C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 005C0 80A1AF60 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 005C4 80A1AF64 03E00008 */ jr $ra -/* 005C8 80A1AF68 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/EnFr_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/EnFr_Init.s deleted file mode 100644 index bcdf597c1d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/EnFr_Init.s +++ /dev/null @@ -1,153 +0,0 @@ -.rdata -glabel D_80A1D110 - .asciz "\x1b[41;37m" - .balign 4 - -glabel D_80A1D11C - .asciz "%s[%d] : 引数が間違っている！！(%d)\n" - .balign 4 - -glabel D_80A1D144 - .asciz "../z_en_fr.c" - .balign 4 - -glabel D_80A1D154 - .asciz "\x1b[m" - .balign 4 - -glabel D_80A1D158 - .asciz "0" - .balign 4 - -glabel D_80A1D15C - .asciz "../z_en_fr.c" - .balign 4 - -glabel D_80A1D16C - .asciz "\x1b[41;37m" - .balign 4 - -glabel D_80A1D178 - .asciz "%s[%d] : バンクが無いよ！！\n" - .balign 4 - -glabel D_80A1D198 - .asciz "../z_en_fr.c" - .balign 4 - -glabel D_80A1D1A8 - .asciz "\x1b[m" - .balign 4 - -glabel D_80A1D1AC - .asciz "0" - .balign 4 - -glabel D_80A1D1B0 - .asciz "../z_en_fr.c" - .balign 4 - -.text -glabel EnFr_Init -/* 00114 80A1AAB4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00118 80A1AAB8 AFBF001C */ sw $ra, 0x001C($sp) -/* 0011C 80A1AABC AFB00018 */ sw $s0, 0x0018($sp) -/* 00120 80A1AAC0 AFA50024 */ sw $a1, 0x0024($sp) -/* 00124 80A1AAC4 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 00128 80A1AAC8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0012C 80A1AACC 3C0E80A2 */ lui $t6, %hi(func_80A1CB58) ## $t6 = 80A20000 -/* 00130 80A1AAD0 14400015 */ bne $v0, $zero, .L80A1AB28 -/* 00134 80A1AAD4 28410006 */ slti $at, $v0, 0x0006 -/* 00138 80A1AAD8 8C8F0004 */ lw $t7, 0x0004($a0) ## 00000004 -/* 0013C 80A1AADC 2401FFEE */ addiu $at, $zero, 0xFFEE ## $at = FFFFFFEE -/* 00140 80A1AAE0 25CECB58 */ addiu $t6, $t6, %lo(func_80A1CB58) ## $t6 = 80A1CB58 -/* 00144 80A1AAE4 01E1C024 */ and $t8, $t7, $at -/* 00148 80A1AAE8 AC980004 */ sw $t8, 0x0004($a0) ## 00000004 -/* 0014C 80A1AAEC AC80012C */ sw $zero, 0x012C($a0) ## 0000012C -/* 00150 80A1AAF0 AC800134 */ sw $zero, 0x0134($a0) ## 00000134 -/* 00154 80A1AAF4 AC8E0130 */ sw $t6, 0x0130($a0) ## 00000130 -/* 00158 80A1AAF8 AC980004 */ sw $t8, 0x0004($a0) ## 00000004 -/* 0015C 80A1AAFC 8FA40024 */ lw $a0, 0x0024($sp) -/* 00160 80A1AB00 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00164 80A1AB04 24070006 */ addiu $a3, $zero, 0x0006 ## $a3 = 00000006 -/* 00168 80A1AB08 0C00CDD2 */ jal Actor_ChangeCategory - -/* 0016C 80A1AB0C 24851C24 */ addiu $a1, $a0, 0x1C24 ## $a1 = 00001C24 -/* 00170 80A1AB10 3C0A80A2 */ lui $t2, %hi(func_80A1BCB4) ## $t2 = 80A20000 -/* 00174 80A1AB14 240940AC */ addiu $t1, $zero, 0x40AC ## $t1 = 000040AC -/* 00178 80A1AB18 254ABCB4 */ addiu $t2, $t2, %lo(func_80A1BCB4) ## $t2 = 80A1BCB4 -/* 0017C 80A1AB1C A609010E */ sh $t1, 0x010E($s0) ## 0000010E -/* 00180 80A1AB20 10000035 */ beq $zero, $zero, .L80A1ABF8 -/* 00184 80A1AB24 AE0A0354 */ sw $t2, 0x0354($s0) ## 00000354 -.L80A1AB28: -/* 00188 80A1AB28 10200003 */ beq $at, $zero, .L80A1AB38 -/* 0018C 80A1AB2C 3C0480A2 */ lui $a0, %hi(D_80A1D110) ## $a0 = 80A20000 -/* 00190 80A1AB30 04430014 */ bgezl $v0, .L80A1AB84 -/* 00194 80A1AB34 8FA40024 */ lw $a0, 0x0024($sp) -.L80A1AB38: -/* 00198 80A1AB38 0C00084C */ jal osSyncPrintf - -/* 0019C 80A1AB3C 2484D110 */ addiu $a0, $a0, %lo(D_80A1D110) ## $a0 = 80A1D110 -/* 001A0 80A1AB40 3C0480A2 */ lui $a0, %hi(D_80A1D11C) ## $a0 = 80A20000 -/* 001A4 80A1AB44 3C0580A2 */ lui $a1, %hi(D_80A1D144) ## $a1 = 80A20000 -/* 001A8 80A1AB48 24A5D144 */ addiu $a1, $a1, %lo(D_80A1D144) ## $a1 = 80A1D144 -/* 001AC 80A1AB4C 2484D11C */ addiu $a0, $a0, %lo(D_80A1D11C) ## $a0 = 80A1D11C -/* 001B0 80A1AB50 24060172 */ addiu $a2, $zero, 0x0172 ## $a2 = 00000172 -/* 001B4 80A1AB54 0C00084C */ jal osSyncPrintf - -/* 001B8 80A1AB58 8607001C */ lh $a3, 0x001C($s0) ## 0000001C -/* 001BC 80A1AB5C 3C0480A2 */ lui $a0, %hi(D_80A1D154) ## $a0 = 80A20000 -/* 001C0 80A1AB60 0C00084C */ jal osSyncPrintf - -/* 001C4 80A1AB64 2484D154 */ addiu $a0, $a0, %lo(D_80A1D154) ## $a0 = 80A1D154 -/* 001C8 80A1AB68 3C0480A2 */ lui $a0, %hi(D_80A1D158) ## $a0 = 80A20000 -/* 001CC 80A1AB6C 3C0580A2 */ lui $a1, %hi(D_80A1D15C) ## $a1 = 80A20000 -/* 001D0 80A1AB70 24A5D15C */ addiu $a1, $a1, %lo(D_80A1D15C) ## $a1 = 80A1D15C -/* 001D4 80A1AB74 2484D158 */ addiu $a0, $a0, %lo(D_80A1D158) ## $a0 = 80A1D158 -/* 001D8 80A1AB78 0C0007FC */ jal __assert - -/* 001DC 80A1AB7C 24060174 */ addiu $a2, $zero, 0x0174 ## $a2 = 00000174 -/* 001E0 80A1AB80 8FA40024 */ lw $a0, 0x0024($sp) -.L80A1AB84: -/* 001E4 80A1AB84 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 001E8 80A1AB88 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 001EC 80A1AB8C 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 001F0 80A1AB90 0C02604B */ jal Object_GetIndex - ## ObjectIndex -/* 001F4 80A1AB94 00812021 */ addu $a0, $a0, $at -/* 001F8 80A1AB98 A202036A */ sb $v0, 0x036A($s0) ## 0000036A -/* 001FC 80A1AB9C 820B036A */ lb $t3, 0x036A($s0) ## 0000036A -/* 00200 80A1ABA0 05630016 */ bgezl $t3, .L80A1ABFC -/* 00204 80A1ABA4 8FBF001C */ lw $ra, 0x001C($sp) -/* 00208 80A1ABA8 0C00B55C */ jal Actor_Kill - -/* 0020C 80A1ABAC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00210 80A1ABB0 3C0480A2 */ lui $a0, %hi(D_80A1D16C) ## $a0 = 80A20000 -/* 00214 80A1ABB4 0C00084C */ jal osSyncPrintf - -/* 00218 80A1ABB8 2484D16C */ addiu $a0, $a0, %lo(D_80A1D16C) ## $a0 = 80A1D16C -/* 0021C 80A1ABBC 3C0480A2 */ lui $a0, %hi(D_80A1D178) ## $a0 = 80A20000 -/* 00220 80A1ABC0 3C0580A2 */ lui $a1, %hi(D_80A1D198) ## $a1 = 80A20000 -/* 00224 80A1ABC4 24A5D198 */ addiu $a1, $a1, %lo(D_80A1D198) ## $a1 = 80A1D198 -/* 00228 80A1ABC8 2484D178 */ addiu $a0, $a0, %lo(D_80A1D178) ## $a0 = 80A1D178 -/* 0022C 80A1ABCC 0C00084C */ jal osSyncPrintf - -/* 00230 80A1ABD0 2406017C */ addiu $a2, $zero, 0x017C ## $a2 = 0000017C -/* 00234 80A1ABD4 3C0480A2 */ lui $a0, %hi(D_80A1D1A8) ## $a0 = 80A20000 -/* 00238 80A1ABD8 0C00084C */ jal osSyncPrintf - -/* 0023C 80A1ABDC 2484D1A8 */ addiu $a0, $a0, %lo(D_80A1D1A8) ## $a0 = 80A1D1A8 -/* 00240 80A1ABE0 3C0480A2 */ lui $a0, %hi(D_80A1D1AC) ## $a0 = 80A20000 -/* 00244 80A1ABE4 3C0580A2 */ lui $a1, %hi(D_80A1D1B0) ## $a1 = 80A20000 -/* 00248 80A1ABE8 24A5D1B0 */ addiu $a1, $a1, %lo(D_80A1D1B0) ## $a1 = 80A1D1B0 -/* 0024C 80A1ABEC 2484D1AC */ addiu $a0, $a0, %lo(D_80A1D1AC) ## $a0 = 80A1D1AC -/* 00250 80A1ABF0 0C0007FC */ jal __assert - -/* 00254 80A1ABF4 2406017E */ addiu $a2, $zero, 0x017E ## $a2 = 0000017E -.L80A1ABF8: -/* 00258 80A1ABF8 8FBF001C */ lw $ra, 0x001C($sp) -.L80A1ABFC: -/* 0025C 80A1ABFC 8FB00018 */ lw $s0, 0x0018($sp) -/* 00260 80A1AC00 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00264 80A1AC04 03E00008 */ jr $ra -/* 00268 80A1AC08 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/EnFr_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/EnFr_Update.s index 79431da972..c87518dcc9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/EnFr_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/EnFr_Update.s @@ -26,10 +26,10 @@ glabel EnFr_Update /* 002E4 80A1AC84 01C17824 */ and $t7, $t6, $at /* 002E8 80A1AC88 2442FFFF */ addiu $v0, $v0, 0xFFFF ## $v0 = FFFFFFFF /* 002EC 80A1AC8C 0002C080 */ sll $t8, $v0, 2 -/* 002F0 80A1AC90 3C0180A2 */ lui $at, %hi(D_80A1CFF4) ## $at = 80A20000 +/* 002F0 80A1AC90 3C0180A2 */ lui $at, %hi(sEnFrPointers + 0x4) ## $at = 80A20000 /* 002F4 80A1AC94 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 /* 002F8 80A1AC98 00380821 */ addu $at, $at, $t8 -/* 002FC 80A1AC9C AC30CFF4 */ sw $s0, %lo(D_80A1CFF4)($at) +/* 002FC 80A1AC9C AC30CFF4 */ sw $s0, %lo(sEnFrPointers + 0x4)($at) /* 00300 80A1ACA0 AFA2003C */ sw $v0, 0x003C($sp) /* 00304 80A1ACA4 24A5D0BC */ addiu $a1, $a1, %lo(D_80A1D0BC) ## $a1 = 80A1D0BC /* 00308 80A1ACA8 0C01E037 */ jal Actor_ProcessInitChain @@ -96,15 +96,15 @@ glabel EnFr_Update /* 003F0 80A1AD90 8FA40030 */ lw $a0, 0x0030($sp) /* 003F4 80A1AD94 8FAA003C */ lw $t2, 0x003C($sp) -/* 003F8 80A1AD98 3C0B80A2 */ lui $t3, %hi(D_80A1D018) ## $t3 = 80A20000 -/* 003FC 80A1AD9C 3C0D80A2 */ lui $t5, %hi(D_80A1D008) ## $t5 = 80A20000 +/* 003F8 80A1AD98 3C0B80A2 */ lui $t3, %hi(sFrogToSongIndex) ## $t3 = 80A20000 +/* 003FC 80A1AD9C 3C0D80A2 */ lui $t5, %hi(sSongIndex) ## $t5 = 80A20000 /* 00400 80A1ADA0 016A5821 */ addu $t3, $t3, $t2 -/* 00404 80A1ADA4 916BD018 */ lbu $t3, %lo(D_80A1D018)($t3) +/* 00404 80A1ADA4 916BD018 */ lbu $t3, %lo(sFrogToSongIndex)($t3) /* 00408 80A1ADA8 3C0E8016 */ lui $t6, %hi(gSaveContext+0xeee) /* 0040C 80A1ADAC 95CEF54E */ lhu $t6, %lo(gSaveContext+0xeee)($t6) /* 00410 80A1ADB0 000B6040 */ sll $t4, $t3, 1 /* 00414 80A1ADB4 01AC6821 */ addu $t5, $t5, $t4 -/* 00418 80A1ADB8 95ADD008 */ lhu $t5, %lo(D_80A1D008)($t5) +/* 00418 80A1ADB8 95ADD008 */ lhu $t5, %lo(sSongIndex)($t5) /* 0041C 80A1ADBC 3C014316 */ lui $at, 0x4316 ## $at = 43160000 /* 00420 80A1ADC0 01AE7824 */ and $t7, $t5, $t6 /* 00424 80A1ADC4 51E00006 */ beql $t7, $zero, .L80A1ADE0 @@ -147,11 +147,11 @@ glabel EnFr_Update /* 004A4 80A1AE44 46040180 */ add.s $f6, $f0, $f4 /* 004A8 80A1AE48 AE0E038C */ sw $t6, 0x038C($s0) ## 0000038C /* 004AC 80A1AE4C 8E0E002C */ lw $t6, 0x002C($s0) ## 0000002C -/* 004B0 80A1AE50 3C0B80A2 */ lui $t3, %hi(func_80A1B19C) ## $t3 = 80A20000 +/* 004B0 80A1AE50 3C0B80A2 */ lui $t3, %hi(EnFr_DecrementBlinkTimerUpdate) ## $t3 = 80A20000 /* 004B4 80A1AE54 4600320D */ trunc.w.s $f8, $f6 -/* 004B8 80A1AE58 3C0F80A2 */ lui $t7, %hi(func_80A1B22C) ## $t7 = 80A20000 -/* 004BC 80A1AE5C 256BB19C */ addiu $t3, $t3, %lo(func_80A1B19C) ## $t3 = 80A1B19C -/* 004C0 80A1AE60 25EFB22C */ addiu $t7, $t7, %lo(func_80A1B22C) ## $t7 = 80A1B22C +/* 004B8 80A1AE58 3C0F80A2 */ lui $t7, %hi(EnFr_SetupJumpingOutOfWater) ## $t7 = 80A20000 +/* 004BC 80A1AE5C 256BB19C */ addiu $t3, $t3, %lo(EnFr_DecrementBlinkTimerUpdate) ## $t3 = 80A1B19C +/* 004C0 80A1AE60 25EFB22C */ addiu $t7, $t7, %lo(EnFr_SetupJumpingOutOfWater) ## $t7 = 80A1B22C /* 004C4 80A1AE64 44084000 */ mfc1 $t0, $f8 /* 004C8 80A1AE68 24180007 */ addiu $t8, $zero, 0x0007 ## $t8 = 00000007 /* 004CC 80A1AE6C AE0B0374 */ sw $t3, 0x0374($s0) ## 00000374 @@ -170,13 +170,13 @@ glabel EnFr_Update /* 00500 80A1AEA0 AE0003A4 */ sw $zero, 0x03A4($s0) ## 000003A4 /* 00504 80A1AEA4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00508 80A1AEA8 AE0D0390 */ sw $t5, 0x0390($s0) ## 00000390 -/* 0050C 80A1AEAC 0C286A68 */ jal func_80A1A9A0 +/* 0050C 80A1AEAC 0C286A68 */ jal EnFr_OrientUnderwater /* 00510 80A1AEB0 AE0E0394 */ sw $t6, 0x0394($s0) ## 00000394 -/* 00514 80A1AEB4 0C286B03 */ jal func_80A1AC0C +/* 00514 80A1AEB4 0C286B03 */ jal EnFr_DrawIdle /* 00518 80A1AEB8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0051C 80A1AEBC 3C1980A2 */ lui $t9, %hi(func_80A1BB34) ## $t9 = 80A20000 +/* 0051C 80A1AEBC 3C1980A2 */ lui $t9, %hi(EnFr_UpdateActive) ## $t9 = 80A20000 /* 00520 80A1AEC0 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 00524 80A1AEC4 2739BB34 */ addiu $t9, $t9, %lo(func_80A1BB34) ## $t9 = 80A1BB34 +/* 00524 80A1AEC4 2739BB34 */ addiu $t9, $t9, %lo(EnFr_UpdateActive) ## $t9 = 80A1BB34 /* 00528 80A1AEC8 44816000 */ mtc1 $at, $f12 ## $f12 = 255.00 /* 0052C 80A1AECC AE190130 */ sw $t9, 0x0130($s0) ## 00000130 /* 00530 80A1AED0 0C00CFBE */ jal Rand_ZeroFloat diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1A9A0.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1A9A0.s deleted file mode 100644 index 7387a94df2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1A9A0.s +++ /dev/null @@ -1,75 +0,0 @@ -.late_rodata -glabel D_80A1D288 - .word 0x4622F983 - -.text -glabel func_80A1A9A0 -/* 00000 80A1A9A0 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 00004 80A1A9A4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00008 80A1A9A8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0000C 80A1A9AC E7A20030 */ swc1 $f2, 0x0030($sp) -/* 00010 80A1A9B0 E7A2002C */ swc1 $f2, 0x002C($sp) -/* 00014 80A1A9B4 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 00018 80A1A9B8 2403000C */ addiu $v1, $zero, 0x000C ## $v1 = 0000000C -/* 0001C 80A1A9BC 3C0280A2 */ lui $v0, %hi(D_80A1D068) ## $v0 = 80A20000 -/* 00020 80A1A9C0 01C30019 */ multu $t6, $v1 -/* 00024 80A1A9C4 2442D068 */ addiu $v0, $v0, %lo(D_80A1D068) ## $v0 = 80A1D068 -/* 00028 80A1A9C8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0002C 80A1A9CC 00007812 */ mflo $t7 -/* 00030 80A1A9D0 004FC021 */ addu $t8, $v0, $t7 -/* 00034 80A1A9D4 C7000000 */ lwc1 $f0, 0x0000($t8) ## 00000000 -/* 00038 80A1A9D8 E4800398 */ swc1 $f0, 0x0398($a0) ## 00000398 -/* 0003C 80A1A9DC E7A00034 */ swc1 $f0, 0x0034($sp) -/* 00040 80A1A9E0 8499001C */ lh $t9, 0x001C($a0) ## 0000001C -/* 00044 80A1A9E4 03230019 */ multu $t9, $v1 -/* 00048 80A1A9E8 00004012 */ mflo $t0 -/* 0004C 80A1A9EC 00484821 */ addu $t1, $v0, $t0 -/* 00050 80A1A9F0 C52C0004 */ lwc1 $f12, 0x0004($t1) ## 00000004 -/* 00054 80A1A9F4 0C034348 */ jal Matrix_RotateY -/* 00058 80A1A9F8 AFA40038 */ sw $a0, 0x0038($sp) -/* 0005C 80A1A9FC 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFF4 -/* 00060 80A1AA00 0C0346BD */ jal Matrix_MultVec3f -/* 00064 80A1AA04 27A50020 */ addiu $a1, $sp, 0x0020 ## $a1 = FFFFFFE8 -/* 00068 80A1AA08 8FA60038 */ lw $a2, 0x0038($sp) -/* 0006C 80A1AA0C C7A60020 */ lwc1 $f6, 0x0020($sp) -/* 00070 80A1AA10 3C0C80A2 */ lui $t4, %hi(D_80A1D068) ## $t4 = 80A20000 -/* 00074 80A1AA14 C4C4038C */ lwc1 $f4, 0x038C($a2) ## 0000038C -/* 00078 80A1AA18 C4CA0394 */ lwc1 $f10, 0x0394($a2) ## 00000394 -/* 0007C 80A1AA1C 84CA001C */ lh $t2, 0x001C($a2) ## 0000001C -/* 00080 80A1AA20 46062200 */ add.s $f8, $f4, $f6 -/* 00084 80A1AA24 258CD068 */ addiu $t4, $t4, %lo(D_80A1D068) ## $t4 = 80A1D068 -/* 00088 80A1AA28 000A5880 */ sll $t3, $t2, 2 -/* 0008C 80A1AA2C 016A5823 */ subu $t3, $t3, $t2 -/* 00090 80A1AA30 E4C80024 */ swc1 $f8, 0x0024($a2) ## 00000024 -/* 00094 80A1AA34 C7B00028 */ lwc1 $f16, 0x0028($sp) -/* 00098 80A1AA38 000B5880 */ sll $t3, $t3, 2 -/* 0009C 80A1AA3C 016C1021 */ addu $v0, $t3, $t4 -/* 000A0 80A1AA40 46105480 */ add.s $f18, $f10, $f16 -/* 000A4 80A1AA44 C4C60390 */ lwc1 $f6, 0x0390($a2) ## 00000390 -/* 000A8 80A1AA48 3C0180A2 */ lui $at, %hi(D_80A1D288) ## $at = 80A20000 -/* 000AC 80A1AA4C 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 000B0 80A1AA50 E4D2002C */ swc1 $f18, 0x002C($a2) ## 0000002C -/* 000B4 80A1AA54 C4440008 */ lwc1 $f4, 0x0008($v0) ## 00000008 -/* 000B8 80A1AA58 46062200 */ add.s $f8, $f4, $f6 -/* 000BC 80A1AA5C E4C80028 */ swc1 $f8, 0x0028($a2) ## 00000028 -/* 000C0 80A1AA60 C430D288 */ lwc1 $f16, %lo(D_80A1D288)($at) -/* 000C4 80A1AA64 C44A0004 */ lwc1 $f10, 0x0004($v0) ## 00000004 -/* 000C8 80A1AA68 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 000CC 80A1AA6C E4C20068 */ swc1 $f2, 0x0068($a2) ## 00000068 -/* 000D0 80A1AA70 46105482 */ mul.s $f18, $f10, $f16 -/* 000D4 80A1AA74 E4C20060 */ swc1 $f2, 0x0060($a2) ## 00000060 -/* 000D8 80A1AA78 E4C2006C */ swc1 $f2, 0x006C($a2) ## 0000006C -/* 000DC 80A1AA7C 4600910D */ trunc.w.s $f4, $f18 -/* 000E0 80A1AA80 44032000 */ mfc1 $v1, $f4 -/* 000E4 80A1AA84 00000000 */ nop -/* 000E8 80A1AA88 00031C00 */ sll $v1, $v1, 16 -/* 000EC 80A1AA8C 00031C03 */ sra $v1, $v1, 16 -/* 000F0 80A1AA90 00611821 */ addu $v1, $v1, $at -/* 000F4 80A1AA94 00031C00 */ sll $v1, $v1, 16 -/* 000F8 80A1AA98 00031C03 */ sra $v1, $v1, 16 -/* 000FC 80A1AA9C A4C300B6 */ sh $v1, 0x00B6($a2) ## 000000B6 -/* 00100 80A1AAA0 A4C30032 */ sh $v1, 0x0032($a2) ## 00000032 -/* 00104 80A1AAA4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00108 80A1AAA8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 0010C 80A1AAAC 03E00008 */ jr $ra -/* 00110 80A1AAB0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1AC0C.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1AC0C.s deleted file mode 100644 index 62c8d83d02..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1AC0C.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_80A1AC0C -/* 0026C 80A1AC0C 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 00270 80A1AC10 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00274 80A1AC14 3C0F80A2 */ lui $t7, %hi(func_80A1CD24) ## $t7 = 80A20000 -/* 00278 80A1AC18 11C10003 */ beq $t6, $at, .L80A1AC28 -/* 0027C 80A1AC1C 25EFCD24 */ addiu $t7, $t7, %lo(func_80A1CD24) ## $t7 = 80A1CD24 -/* 00280 80A1AC20 03E00008 */ jr $ra -/* 00284 80A1AC24 AC800134 */ sw $zero, 0x0134($a0) ## 00000134 -.L80A1AC28: -/* 00288 80A1AC28 AC8F0134 */ sw $t7, 0x0134($a0) ## 00000134 -/* 0028C 80A1AC2C 03E00008 */ jr $ra -/* 00290 80A1AC30 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1AC34.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1AC34.s deleted file mode 100644 index 17f140e8b2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1AC34.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_80A1AC34 -/* 00294 80A1AC34 3C0E80A2 */ lui $t6, %hi(func_80A1CD24) ## $t6 = 80A20000 -/* 00298 80A1AC38 25CECD24 */ addiu $t6, $t6, %lo(func_80A1CD24) ## $t6 = 80A1CD24 -/* 0029C 80A1AC3C 03E00008 */ jr $ra -/* 002A0 80A1AC40 AC8E0134 */ sw $t6, 0x0134($a0) ## 00000134 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1AF6C.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1AF6C.s deleted file mode 100644 index bdf5f80771..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1AF6C.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_80A1AF6C -/* 005CC 80A1AF6C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 005D0 80A1AF70 AFB00020 */ sw $s0, 0x0020($sp) -/* 005D4 80A1AF74 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 005D8 80A1AF78 AFBF0024 */ sw $ra, 0x0024($sp) -/* 005DC 80A1AF7C AFA50034 */ sw $a1, 0x0034($sp) -/* 005E0 80A1AF80 8E07002C */ lw $a3, 0x002C($s0) ## 0000002C -/* 005E4 80A1AF84 8E060024 */ lw $a2, 0x0024($s0) ## 00000024 -/* 005E8 80A1AF88 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 005EC 80A1AF8C 27AF0028 */ addiu $t7, $sp, 0x0028 ## $t7 = FFFFFFF8 -/* 005F0 80A1AF90 27B8002C */ addiu $t8, $sp, 0x002C ## $t8 = FFFFFFFC -/* 005F4 80A1AF94 AFB80014 */ sw $t8, 0x0014($sp) -/* 005F8 80A1AF98 AFAF0010 */ sw $t7, 0x0010($sp) -/* 005FC 80A1AF9C 0C010891 */ jal WaterBox_GetSurfaceImpl -/* 00600 80A1AFA0 24A507C0 */ addiu $a1, $a1, 0x07C0 ## $a1 = 000007C0 -/* 00604 80A1AFA4 5040000E */ beql $v0, $zero, .L80A1AFE0 -/* 00608 80A1AFA8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0060C 80A1AFAC 9219037A */ lbu $t9, 0x037A($s0) ## 0000037A -/* 00610 80A1AFB0 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 00614 80A1AFB4 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 00618 80A1AFB8 A219037B */ sb $t9, 0x037B($s0) ## 0000037B -/* 0061C 80A1AFBC C7A40028 */ lwc1 $f4, 0x0028($sp) -/* 00620 80A1AFC0 4604303E */ c.le.s $f6, $f4 -/* 00624 80A1AFC4 00000000 */ nop -/* 00628 80A1AFC8 45020004 */ bc1fl .L80A1AFDC -/* 0062C 80A1AFCC A200037A */ sb $zero, 0x037A($s0) ## 0000037A -/* 00630 80A1AFD0 10000002 */ beq $zero, $zero, .L80A1AFDC -/* 00634 80A1AFD4 A208037A */ sb $t0, 0x037A($s0) ## 0000037A -/* 00638 80A1AFD8 A200037A */ sb $zero, 0x037A($s0) ## 0000037A -.L80A1AFDC: -/* 0063C 80A1AFDC 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A1AFE0: -/* 00640 80A1AFE0 8FB00020 */ lw $s0, 0x0020($sp) -/* 00644 80A1AFE4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00648 80A1AFE8 03E00008 */ jr $ra -/* 0064C 80A1AFEC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1AFF0.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1AFF0.s deleted file mode 100644 index f889ff1aa4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1AFF0.s +++ /dev/null @@ -1,48 +0,0 @@ -glabel func_80A1AFF0 -/* 00650 80A1AFF0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00654 80A1AFF4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00658 80A1AFF8 AFB00020 */ sw $s0, 0x0020($sp) -/* 0065C 80A1AFFC AFA5003C */ sw $a1, 0x003C($sp) -/* 00660 80A1B000 908F037A */ lbu $t7, 0x037A($a0) ## 0000037A -/* 00664 80A1B004 908E037B */ lbu $t6, 0x037B($a0) ## 0000037B -/* 00668 80A1B008 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0066C 80A1B00C 51CF001F */ beql $t6, $t7, .L80A1B08C -/* 00670 80A1B010 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00674 80A1B014 C4840024 */ lwc1 $f4, 0x0024($a0) ## 00000024 -/* 00678 80A1B018 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 0067C 80A1B01C 44814000 */ mtc1 $at, $f8 ## $f8 = 10.00 -/* 00680 80A1B020 E7A4002C */ swc1 $f4, 0x002C($sp) -/* 00684 80A1B024 C4860028 */ lwc1 $f6, 0x0028($a0) ## 00000028 -/* 00688 80A1B028 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 0068C 80A1B02C 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 00690 80A1B030 46083281 */ sub.s $f10, $f6, $f8 -/* 00694 80A1B034 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00698 80A1B038 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0069C 80A1B03C E7AA0030 */ swc1 $f10, 0x0030($sp) -/* 006A0 80A1B040 C490002C */ lwc1 $f16, 0x002C($a0) ## 0000002C -/* 006A4 80A1B044 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 006A8 80A1B048 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFF4 -/* 006AC 80A1B04C AFB90014 */ sw $t9, 0x0014($sp) -/* 006B0 80A1B050 AFB80010 */ sw $t8, 0x0010($sp) -/* 006B4 80A1B054 0C00A527 */ jal EffectSsGSplash_Spawn -/* 006B8 80A1B058 E7B00034 */ swc1 $f16, 0x0034($sp) -/* 006BC 80A1B05C 9208037A */ lbu $t0, 0x037A($s0) ## 0000037A -/* 006C0 80A1B060 240528C5 */ addiu $a1, $zero, 0x28C5 ## $a1 = 000028C5 -/* 006C4 80A1B064 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 006C8 80A1B068 15000005 */ bne $t0, $zero, .L80A1B080 -/* 006CC 80A1B06C 00000000 */ nop -/* 006D0 80A1B070 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 006D4 80A1B074 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 006D8 80A1B078 10000004 */ beq $zero, $zero, .L80A1B08C -/* 006DC 80A1B07C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A1B080: -/* 006E0 80A1B080 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 006E4 80A1B084 24052817 */ addiu $a1, $zero, 0x2817 ## $a1 = 00002817 -/* 006E8 80A1B088 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A1B08C: -/* 006EC 80A1B08C 8FB00020 */ lw $s0, 0x0020($sp) -/* 006F0 80A1B090 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 006F4 80A1B094 03E00008 */ jr $ra -/* 006F8 80A1B098 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B09C.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B09C.s deleted file mode 100644 index 6e45728e40..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B09C.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80A1B09C -/* 006FC 80A1B09C C4840028 */ lwc1 $f4, 0x0028($a0) ## 00000028 -/* 00700 80A1B0A0 C4860390 */ lwc1 $f6, 0x0390($a0) ## 00000390 -/* 00704 80A1B0A4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00708 80A1B0A8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0070C 80A1B0AC 46062201 */ sub.s $f8, $f4, $f6 -/* 00710 80A1B0B0 E4A80000 */ swc1 $f8, 0x0000($a1) ## 00000000 -/* 00714 80A1B0B4 C48A0060 */ lwc1 $f10, 0x0060($a0) ## 00000060 -/* 00718 80A1B0B8 4600503C */ c.lt.s $f10, $f0 -/* 0071C 80A1B0BC 00000000 */ nop -/* 00720 80A1B0C0 4500000B */ bc1f .L80A1B0F0 -/* 00724 80A1B0C4 00000000 */ nop -/* 00728 80A1B0C8 C4B00000 */ lwc1 $f16, 0x0000($a1) ## 00000000 -/* 0072C 80A1B0CC 4600803E */ c.le.s $f16, $f0 -/* 00730 80A1B0D0 00000000 */ nop -/* 00734 80A1B0D4 45000006 */ bc1f .L80A1B0F0 -/* 00738 80A1B0D8 00000000 */ nop -/* 0073C 80A1B0DC C4920390 */ lwc1 $f18, 0x0390($a0) ## 00000390 -/* 00740 80A1B0E0 E4800060 */ swc1 $f0, 0x0060($a0) ## 00000060 -/* 00744 80A1B0E4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00748 80A1B0E8 03E00008 */ jr $ra -/* 0074C 80A1B0EC E4920028 */ swc1 $f18, 0x0028($a0) ## 00000028 -.L80A1B0F0: -/* 00750 80A1B0F0 03E00008 */ jr $ra -/* 00754 80A1B0F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B0F8.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B0F8.s deleted file mode 100644 index 044c576cce..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B0F8.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80A1B0F8 -/* 00758 80A1B0F8 C4840024 */ lwc1 $f4, 0x0024($a0) ## 00000024 -/* 0075C 80A1B0FC C4A60024 */ lwc1 $f6, 0x0024($a1) ## 00000024 -/* 00760 80A1B100 C488002C */ lwc1 $f8, 0x002C($a0) ## 0000002C -/* 00764 80A1B104 C4AA002C */ lwc1 $f10, 0x002C($a1) ## 0000002C -/* 00768 80A1B108 46062001 */ sub.s $f0, $f4, $f6 -/* 0076C 80A1B10C 3C014461 */ lui $at, 0x4461 ## $at = 44610000 -/* 00770 80A1B110 C4900028 */ lwc1 $f16, 0x0028($a0) ## 00000028 -/* 00774 80A1B114 460A4081 */ sub.s $f2, $f8, $f10 -/* 00778 80A1B118 46000102 */ mul.s $f4, $f0, $f0 -/* 0077C 80A1B11C 44815000 */ mtc1 $at, $f10 ## $f10 = 900.00 -/* 00780 80A1B120 C4B20028 */ lwc1 $f18, 0x0028($a1) ## 00000028 -/* 00784 80A1B124 46021182 */ mul.s $f6, $f2, $f2 -/* 00788 80A1B128 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0078C 80A1B12C 46128301 */ sub.s $f12, $f16, $f18 -/* 00790 80A1B130 46062200 */ add.s $f8, $f4, $f6 -/* 00794 80A1B134 460A403E */ c.le.s $f8, $f10 -/* 00798 80A1B138 00000000 */ nop -/* 0079C 80A1B13C 45000002 */ bc1f .L80A1B148 -/* 007A0 80A1B140 00000000 */ nop -/* 007A4 80A1B144 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A1B148: -/* 007A8 80A1B148 10400008 */ beq $v0, $zero, .L80A1B16C -/* 007AC 80A1B14C 00000000 */ nop -/* 007B0 80A1B150 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 007B4 80A1B154 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 007B8 80A1B158 460C803E */ c.le.s $f16, $f12 -/* 007BC 80A1B15C 00000000 */ nop -/* 007C0 80A1B160 45000002 */ bc1f .L80A1B16C -/* 007C4 80A1B164 00000000 */ nop -/* 007C8 80A1B168 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A1B16C: -/* 007CC 80A1B16C 03E00008 */ jr $ra -/* 007D0 80A1B170 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B174.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B174.s deleted file mode 100644 index b26ef517c4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B174.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_80A1B174 -/* 007D4 80A1B174 8C820370 */ lw $v0, 0x0370($a0) ## 00000370 -/* 007D8 80A1B178 3C0F80A2 */ lui $t7, %hi(func_80A1B19C) ## $t7 = 80A20000 -/* 007DC 80A1B17C 25EFB19C */ addiu $t7, $t7, %lo(func_80A1B19C) ## $t7 = 80A1B19C -/* 007E0 80A1B180 10400003 */ beq $v0, $zero, .L80A1B190 -/* 007E4 80A1B184 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 007E8 80A1B188 03E00008 */ jr $ra -/* 007EC 80A1B18C AC8E0370 */ sw $t6, 0x0370($a0) ## 00000370 -.L80A1B190: -/* 007F0 80A1B190 AC8F0374 */ sw $t7, 0x0374($a0) ## 00000374 -/* 007F4 80A1B194 03E00008 */ jr $ra -/* 007F8 80A1B198 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B19C.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B19C.s deleted file mode 100644 index 78d8369fc6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B19C.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_80A1B19C -/* 007FC 80A1B19C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00800 80A1B1A0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00804 80A1B1A4 8C820370 */ lw $v0, 0x0370($a0) ## 00000370 -/* 00808 80A1B1A8 10400003 */ beq $v0, $zero, .L80A1B1B8 -/* 0080C 80A1B1AC 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 00810 80A1B1B0 1000001A */ beq $zero, $zero, .L80A1B21C -/* 00814 80A1B1B4 AC8E0370 */ sw $t6, 0x0370($a0) ## 00000370 -.L80A1B1B8: -/* 00818 80A1B1B8 908F0378 */ lbu $t7, 0x0378($a0) ## 00000378 -/* 0081C 80A1B1BC 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 00820 80A1B1C0 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 00824 80A1B1C4 11E00013 */ beq $t7, $zero, .L80A1B214 -/* 00828 80A1B1C8 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 0082C 80A1B1CC A0800378 */ sb $zero, 0x0378($a0) ## 00000378 -/* 00830 80A1B1D0 44816000 */ mtc1 $at, $f12 ## $f12 = 60.00 -/* 00834 80A1B1D4 0C00CFBE */ jal Rand_ZeroFloat - -/* 00838 80A1B1D8 AFA40018 */ sw $a0, 0x0018($sp) -/* 0083C 80A1B1DC 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00840 80A1B1E0 44812000 */ mtc1 $at, $f4 ## $f4 = 20.00 -/* 00844 80A1B1E4 8FA40018 */ lw $a0, 0x0018($sp) -/* 00848 80A1B1E8 3C0A80A2 */ lui $t2, %hi(func_80A1B174) ## $t2 = 80A20000 -/* 0084C 80A1B1EC 46040180 */ add.s $f6, $f0, $f4 -/* 00850 80A1B1F0 254AB174 */ addiu $t2, $t2, %lo(func_80A1B174) ## $t2 = 80A1B174 -/* 00854 80A1B1F4 AC8A0374 */ sw $t2, 0x0374($a0) ## 00000374 -/* 00858 80A1B1F8 4600320D */ trunc.w.s $f8, $f6 -/* 0085C 80A1B1FC 44194000 */ mfc1 $t9, $f8 -/* 00860 80A1B200 00000000 */ nop -/* 00864 80A1B204 00194400 */ sll $t0, $t9, 16 -/* 00868 80A1B208 00084C03 */ sra $t1, $t0, 16 -/* 0086C 80A1B20C 10000003 */ beq $zero, $zero, .L80A1B21C -/* 00870 80A1B210 AC890370 */ sw $t1, 0x0370($a0) ## 00000370 -.L80A1B214: -/* 00874 80A1B214 A08B0378 */ sb $t3, 0x0378($a0) ## 00000378 -/* 00878 80A1B218 AC8C0370 */ sw $t4, 0x0370($a0) ## 00000370 -.L80A1B21C: -/* 0087C 80A1B21C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00880 80A1B220 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00884 80A1B224 03E00008 */ jr $ra -/* 00888 80A1B228 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B22C.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B22C.s deleted file mode 100644 index 791c872397..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B22C.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_80A1B22C -/* 0088C 80A1B22C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00890 80A1B230 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00894 80A1B234 AFA40028 */ sw $a0, 0x0028($sp) -/* 00898 80A1B238 AFA5002C */ sw $a1, 0x002C($sp) -/* 0089C 80A1B23C 8498001C */ lh $t8, 0x001C($a0) ## 0000001C -/* 008A0 80A1B240 3C1980A2 */ lui $t9, %hi(D_80A1D0C3) ## $t9 = 80A20000 -/* 008A4 80A1B244 3C0E80A2 */ lui $t6, %hi(D_80A1CFF0) ## $t6 = 80A20000 -/* 008A8 80A1B248 0338C821 */ addu $t9, $t9, $t8 -/* 008AC 80A1B24C 9339D0C3 */ lbu $t9, %lo(D_80A1D0C3)($t9) -/* 008B0 80A1B250 91CECFF0 */ lbu $t6, %lo(D_80A1CFF0)($t6) -/* 008B4 80A1B254 3C040600 */ lui $a0, %hi(D_060007BC) ## $a0 = 06000000 -/* 008B8 80A1B258 55D90018 */ bnel $t6, $t9, .L80A1B2BC -/* 008BC 80A1B25C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 008C0 80A1B260 0C028800 */ jal Animation_GetLastFrame - -/* 008C4 80A1B264 248407BC */ addiu $a0, $a0, %lo(D_060007BC) ## $a0 = 060007BC -/* 008C8 80A1B268 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 008CC 80A1B26C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 008D0 80A1B270 8FA40028 */ lw $a0, 0x0028($sp) -/* 008D4 80A1B274 468021A0 */ cvt.s.w $f6, $f4 -/* 008D8 80A1B278 3C050600 */ lui $a1, %hi(D_060007BC) ## $a1 = 06000000 -/* 008DC 80A1B27C 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 008E0 80A1B280 44070000 */ mfc1 $a3, $f0 -/* 008E4 80A1B284 AFA80014 */ sw $t0, 0x0014($sp) -/* 008E8 80A1B288 24A507BC */ addiu $a1, $a1, %lo(D_060007BC) ## $a1 = 060007BC -/* 008EC 80A1B28C E7A60010 */ swc1 $f6, 0x0010($sp) -/* 008F0 80A1B290 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 008F4 80A1B294 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 008F8 80A1B298 0C029468 */ jal Animation_Change - -/* 008FC 80A1B29C E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00900 80A1B2A0 0C286B0D */ jal func_80A1AC34 -/* 00904 80A1B2A4 8FA40028 */ lw $a0, 0x0028($sp) -/* 00908 80A1B2A8 8FAA0028 */ lw $t2, 0x0028($sp) -/* 0090C 80A1B2AC 3C0980A2 */ lui $t1, %hi(func_80A1B2C8) ## $t1 = 80A20000 -/* 00910 80A1B2B0 2529B2C8 */ addiu $t1, $t1, %lo(func_80A1B2C8) ## $t1 = 80A1B2C8 -/* 00914 80A1B2B4 AD490354 */ sw $t1, 0x0354($t2) ## 00000354 -/* 00918 80A1B2B8 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A1B2BC: -/* 0091C 80A1B2BC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00920 80A1B2C0 03E00008 */ jr $ra -/* 00924 80A1B2C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B2C8.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B2C8.s deleted file mode 100644 index 96bc7c3d53..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B2C8.s +++ /dev/null @@ -1,116 +0,0 @@ -.late_rodata -glabel D_80A1D294 - .float 3.14159274101 - -.text -glabel func_80A1B2C8 -/* 00928 80A1B2C8 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 0092C 80A1B2CC AFBF0024 */ sw $ra, 0x0024($sp) -/* 00930 80A1B2D0 AFB00020 */ sw $s0, 0x0020($sp) -/* 00934 80A1B2D4 F7B40018 */ sdc1 $f20, 0x0018($sp) -/* 00938 80A1B2D8 AFA5004C */ sw $a1, 0x004C($sp) -/* 0093C 80A1B2DC 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 00940 80A1B2E0 44812000 */ mtc1 $at, $f4 ## $f4 = 6.00 -/* 00944 80A1B2E4 C4800164 */ lwc1 $f0, 0x0164($a0) ## 00000164 -/* 00948 80A1B2E8 3C0280A2 */ lui $v0, %hi(D_80A1CFF0) ## $v0 = 80A20000 -/* 0094C 80A1B2EC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00950 80A1B2F0 46002032 */ c.eq.s $f4, $f0 -/* 00954 80A1B2F4 2442CFF0 */ addiu $v0, $v0, %lo(D_80A1CFF0) ## $v0 = 80A1CFF0 -/* 00958 80A1B2F8 45020008 */ bc1fl .L80A1B31C -/* 0095C 80A1B2FC 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 00960 80A1B300 904E0000 */ lbu $t6, 0x0000($v0) ## 80A1CFF0 -/* 00964 80A1B304 4480A000 */ mtc1 $zero, $f20 ## $f20 = 0.00 -/* 00968 80A1B308 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 0096C 80A1B30C A04F0000 */ sb $t7, 0x0000($v0) ## 80A1CFF0 -/* 00970 80A1B310 1000000F */ beq $zero, $zero, .L80A1B350 -/* 00974 80A1B314 E4940168 */ swc1 $f20, 0x0168($a0) ## 00000168 -/* 00978 80A1B318 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -.L80A1B31C: -/* 0097C 80A1B31C 44813000 */ mtc1 $at, $f6 ## $f6 = 3.00 -/* 00980 80A1B320 00000000 */ nop -/* 00984 80A1B324 46003032 */ c.eq.s $f6, $f0 -/* 00988 80A1B328 00000000 */ nop -/* 0098C 80A1B32C 45000008 */ bc1f .L80A1B350 -/* 00990 80A1B330 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00994 80A1B334 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 -/* 00998 80A1B338 3C01423C */ lui $at, 0x423C ## $at = 423C0000 -/* 0099C 80A1B33C 4480A000 */ mtc1 $zero, $f20 ## $f20 = 0.00 -/* 009A0 80A1B340 44815000 */ mtc1 $at, $f10 ## $f10 = 47.00 -/* 009A4 80A1B344 E608006C */ swc1 $f8, 0x006C($s0) ## 0000006C -/* 009A8 80A1B348 E6140068 */ swc1 $f20, 0x0068($s0) ## 00000068 -/* 009AC 80A1B34C E60A0060 */ swc1 $f10, 0x0060($s0) ## 00000060 -.L80A1B350: -/* 009B0 80A1B350 4480A000 */ mtc1 $zero, $f20 ## $f20 = 0.00 -/* 009B4 80A1B354 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 009B8 80A1B358 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 009BC 80A1B35C E7B40040 */ swc1 $f20, 0x0040($sp) -/* 009C0 80A1B360 E7B4003C */ swc1 $f20, 0x003C($sp) -/* 009C4 80A1B364 C6100398 */ lwc1 $f16, 0x0398($s0) ## 00000398 -/* 009C8 80A1B368 E7B00044 */ swc1 $f16, 0x0044($sp) -/* 009CC 80A1B36C 86180032 */ lh $t8, 0x0032($s0) ## 00000032 -/* 009D0 80A1B370 0301C821 */ addu $t9, $t8, $at -/* 009D4 80A1B374 44999000 */ mtc1 $t9, $f18 ## $f18 = 0.00 -/* 009D8 80A1B378 3C014700 */ lui $at, 0x4700 ## $at = 47000000 -/* 009DC 80A1B37C 44813000 */ mtc1 $at, $f6 ## $f6 = 32768.00 -/* 009E0 80A1B380 46809120 */ cvt.s.w $f4, $f18 -/* 009E4 80A1B384 3C0180A2 */ lui $at, %hi(D_80A1D294) ## $at = 80A20000 -/* 009E8 80A1B388 C42AD294 */ lwc1 $f10, %lo(D_80A1D294)($at) -/* 009EC 80A1B38C 46062203 */ div.s $f8, $f4, $f6 -/* 009F0 80A1B390 460A4302 */ mul.s $f12, $f8, $f10 -/* 009F4 80A1B394 0C034348 */ jal Matrix_RotateY -/* 009F8 80A1B398 00000000 */ nop -/* 009FC 80A1B39C 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFF4 -/* 00A00 80A1B3A0 0C0346BD */ jal Matrix_MultVec3f -/* 00A04 80A1B3A4 27A50030 */ addiu $a1, $sp, 0x0030 ## $a1 = FFFFFFE8 -/* 00A08 80A1B3A8 C610038C */ lwc1 $f16, 0x038C($s0) ## 0000038C -/* 00A0C 80A1B3AC C7B20030 */ lwc1 $f18, 0x0030($sp) -/* 00A10 80A1B3B0 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 00A14 80A1B3B4 C6060394 */ lwc1 $f6, 0x0394($s0) ## 00000394 -/* 00A18 80A1B3B8 46128100 */ add.s $f4, $f16, $f18 -/* 00A1C 80A1B3BC 44819000 */ mtc1 $at, $f18 ## $f18 = 3.00 -/* 00A20 80A1B3C0 C6100164 */ lwc1 $f16, 0x0164($s0) ## 00000164 -/* 00A24 80A1B3C4 E6040024 */ swc1 $f4, 0x0024($s0) ## 00000024 -/* 00A28 80A1B3C8 C7A80038 */ lwc1 $f8, 0x0038($sp) -/* 00A2C 80A1B3CC 4610903E */ c.le.s $f18, $f16 -/* 00A30 80A1B3D0 46083280 */ add.s $f10, $f6, $f8 -/* 00A34 80A1B3D4 45000006 */ bc1f .L80A1B3F0 -/* 00A38 80A1B3D8 E60A002C */ swc1 $f10, 0x002C($s0) ## 0000002C -/* 00A3C 80A1B3DC 4405A000 */ mfc1 $a1, $f20 -/* 00A40 80A1B3E0 26040398 */ addiu $a0, $s0, 0x0398 ## $a0 = 00000398 -/* 00A44 80A1B3E4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00A48 80A1B3E8 0C01E107 */ jal Math_ApproachF - -/* 00A4C 80A1B3EC 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -.L80A1B3F0: -/* 00A50 80A1B3F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A54 80A1B3F4 0C286C27 */ jal func_80A1B09C -/* 00A58 80A1B3F8 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFEC -/* 00A5C 80A1B3FC 10400005 */ beq $v0, $zero, .L80A1B414 -/* 00A60 80A1B400 3C0880A2 */ lui $t0, %hi(func_80A1B464) ## $t0 = 80A20000 -/* 00A64 80A1B404 2508B464 */ addiu $t0, $t0, %lo(func_80A1B464) ## $t0 = 80A1B464 -/* 00A68 80A1B408 E614006C */ swc1 $f20, 0x006C($s0) ## 0000006C -/* 00A6C 80A1B40C AE080354 */ sw $t0, 0x0354($s0) ## 00000354 -/* 00A70 80A1B410 E614039C */ swc1 $f20, 0x039C($s0) ## 0000039C -.L80A1B414: -/* 00A74 80A1B414 C6040060 */ lwc1 $f4, 0x0060($s0) ## 00000060 -/* 00A78 80A1B418 4614203E */ c.le.s $f4, $f20 -/* 00A7C 80A1B41C 00000000 */ nop -/* 00A80 80A1B420 4500000B */ bc1f .L80A1B450 -/* 00A84 80A1B424 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 00A88 80A1B428 44814000 */ mtc1 $at, $f8 ## $f8 = 40.00 -/* 00A8C 80A1B42C C7A60034 */ lwc1 $f6, 0x0034($sp) -/* 00A90 80A1B430 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00A94 80A1B434 4608303C */ c.lt.s $f6, $f8 -/* 00A98 80A1B438 00000000 */ nop -/* 00A9C 80A1B43C 45020005 */ bc1fl .L80A1B454 -/* 00AA0 80A1B440 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00AA4 80A1B444 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 -/* 00AA8 80A1B448 00000000 */ nop -/* 00AAC 80A1B44C E60A0168 */ swc1 $f10, 0x0168($s0) ## 00000168 -.L80A1B450: -/* 00AB0 80A1B450 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A1B454: -/* 00AB4 80A1B454 D7B40018 */ ldc1 $f20, 0x0018($sp) -/* 00AB8 80A1B458 8FB00020 */ lw $s0, 0x0020($sp) -/* 00ABC 80A1B45C 03E00008 */ jr $ra -/* 00AC0 80A1B460 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B464.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B464.s deleted file mode 100644 index 18e806eee3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B464.s +++ /dev/null @@ -1,54 +0,0 @@ -glabel func_80A1B464 -/* 00AC4 80A1B464 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00AC8 80A1B468 AFB00028 */ sw $s0, 0x0028($sp) -/* 00ACC 80A1B46C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00AD0 80A1B470 AFBF002C */ sw $ra, 0x002C($sp) -/* 00AD4 80A1B474 AFA50034 */ sw $a1, 0x0034($sp) -/* 00AD8 80A1B478 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 00ADC 80A1B47C 240E0064 */ addiu $t6, $zero, 0x0064 ## $t6 = 00000064 -/* 00AE0 80A1B480 AFAE0010 */ sw $t6, 0x0010($sp) -/* 00AE4 80A1B484 248400B6 */ addiu $a0, $a0, 0x00B6 ## $a0 = 000000B6 -/* 00AE8 80A1B488 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 00AEC 80A1B48C 0C01E1A7 */ jal Math_SmoothStepToS - -/* 00AF0 80A1B490 24072710 */ addiu $a3, $zero, 0x2710 ## $a3 = 00002710 -/* 00AF4 80A1B494 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6 -/* 00AF8 80A1B498 1440001D */ bne $v0, $zero, .L80A1B510 -/* 00AFC 80A1B49C A60F0032 */ sh $t7, 0x0032($s0) ## 00000032 -/* 00B00 80A1B4A0 C604015C */ lwc1 $f4, 0x015C($s0) ## 0000015C -/* 00B04 80A1B4A4 C6060164 */ lwc1 $f6, 0x0164($s0) ## 00000164 -/* 00B08 80A1B4A8 3C0280A2 */ lui $v0, %hi(D_80A1CFF0) ## $v0 = 80A20000 -/* 00B0C 80A1B4AC 3C0880A2 */ lui $t0, %hi(func_80A1B524) ## $t0 = 80A20000 -/* 00B10 80A1B4B0 46062032 */ c.eq.s $f4, $f6 -/* 00B14 80A1B4B4 2442CFF0 */ addiu $v0, $v0, %lo(D_80A1CFF0) ## $v0 = 80A1CFF0 -/* 00B18 80A1B4B8 2508B524 */ addiu $t0, $t0, %lo(func_80A1B524) ## $t0 = 80A1B524 -/* 00B1C 80A1B4BC 45020015 */ bc1fl .L80A1B514 -/* 00B20 80A1B4C0 8FBF002C */ lw $ra, 0x002C($sp) -/* 00B24 80A1B4C4 90580000 */ lbu $t8, 0x0000($v0) ## 80A1CFF0 -/* 00B28 80A1B4C8 3C040600 */ lui $a0, %hi(D_06001534) ## $a0 = 06000000 -/* 00B2C 80A1B4CC 24841534 */ addiu $a0, $a0, %lo(D_06001534) ## $a0 = 06001534 -/* 00B30 80A1B4D0 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 00B34 80A1B4D4 A0590000 */ sb $t9, 0x0000($v0) ## 80A1CFF0 -/* 00B38 80A1B4D8 0C028800 */ jal Animation_GetLastFrame - -/* 00B3C 80A1B4DC AE080354 */ sw $t0, 0x0354($s0) ## 00000354 -/* 00B40 80A1B4E0 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 -/* 00B44 80A1B4E4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00B48 80A1B4E8 3C050600 */ lui $a1, %hi(D_06001534) ## $a1 = 06000000 -/* 00B4C 80A1B4EC 468042A0 */ cvt.s.w $f10, $f8 -/* 00B50 80A1B4F0 44070000 */ mfc1 $a3, $f0 -/* 00B54 80A1B4F4 24A51534 */ addiu $a1, $a1, %lo(D_06001534) ## $a1 = 06001534 -/* 00B58 80A1B4F8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00B5C 80A1B4FC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00B60 80A1B500 AFA00014 */ sw $zero, 0x0014($sp) -/* 00B64 80A1B504 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 00B68 80A1B508 0C029468 */ jal Animation_Change - -/* 00B6C 80A1B50C E7A00018 */ swc1 $f0, 0x0018($sp) -.L80A1B510: -/* 00B70 80A1B510 8FBF002C */ lw $ra, 0x002C($sp) -.L80A1B514: -/* 00B74 80A1B514 8FB00028 */ lw $s0, 0x0028($sp) -/* 00B78 80A1B518 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00B7C 80A1B51C 03E00008 */ jr $ra -/* 00B80 80A1B520 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B524.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B524.s deleted file mode 100644 index f4734fbd63..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B524.s +++ /dev/null @@ -1,82 +0,0 @@ -.late_rodata -glabel D_80A1D298 - .word 0x4622F983 - -.text -glabel func_80A1B524 -/* 00B84 80A1B524 3C0E80A2 */ lui $t6, %hi(D_80A1CFF0) ## $t6 = 80A20000 -/* 00B88 80A1B528 91CECFF0 */ lbu $t6, %lo(D_80A1CFF0)($t6) -/* 00B8C 80A1B52C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00B90 80A1B530 AFB00028 */ sw $s0, 0x0028($sp) -/* 00B94 80A1B534 2402000C */ addiu $v0, $zero, 0x000C ## $v0 = 0000000C -/* 00B98 80A1B538 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00B9C 80A1B53C AFBF002C */ sw $ra, 0x002C($sp) -/* 00BA0 80A1B540 144E0022 */ bne $v0, $t6, .L80A1B5CC -/* 00BA4 80A1B544 AFA50034 */ sw $a1, 0x0034($sp) -/* 00BA8 80A1B548 848F001C */ lh $t7, 0x001C($a0) ## 0000001C -/* 00BAC 80A1B54C 3C0180A2 */ lui $at, %hi(D_80A1D06C) ## $at = 80A20000 -/* 00BB0 80A1B550 01E20019 */ multu $t7, $v0 -/* 00BB4 80A1B554 0000C012 */ mflo $t8 -/* 00BB8 80A1B558 00380821 */ addu $at, $at, $t8 -/* 00BBC 80A1B55C C424D06C */ lwc1 $f4, %lo(D_80A1D06C)($at) -/* 00BC0 80A1B560 3C0180A2 */ lui $at, %hi(D_80A1D298) ## $at = 80A20000 -/* 00BC4 80A1B564 C426D298 */ lwc1 $f6, %lo(D_80A1D298)($at) -/* 00BC8 80A1B568 46062202 */ mul.s $f8, $f4, $f6 -/* 00BCC 80A1B56C 4600428D */ trunc.w.s $f10, $f8 -/* 00BD0 80A1B570 44085000 */ mfc1 $t0, $f10 -/* 00BD4 80A1B574 00000000 */ nop -/* 00BD8 80A1B578 A4880032 */ sh $t0, 0x0032($a0) ## 00000032 -/* 00BDC 80A1B57C 3C040600 */ lui $a0, %hi(D_060007BC) ## $a0 = 06000000 -/* 00BE0 80A1B580 0C028800 */ jal Animation_GetLastFrame - -/* 00BE4 80A1B584 248407BC */ addiu $a0, $a0, %lo(D_060007BC) ## $a0 = 060007BC -/* 00BE8 80A1B588 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 -/* 00BEC 80A1B58C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00BF0 80A1B590 3C050600 */ lui $a1, %hi(D_060007BC) ## $a1 = 06000000 -/* 00BF4 80A1B594 468084A0 */ cvt.s.w $f18, $f16 -/* 00BF8 80A1B598 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 00BFC 80A1B59C 44070000 */ mfc1 $a3, $f0 -/* 00C00 80A1B5A0 AFA90014 */ sw $t1, 0x0014($sp) -/* 00C04 80A1B5A4 24A507BC */ addiu $a1, $a1, %lo(D_060007BC) ## $a1 = 060007BC -/* 00C08 80A1B5A8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00C0C 80A1B5AC E7B20010 */ swc1 $f18, 0x0010($sp) -/* 00C10 80A1B5B0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00C14 80A1B5B4 0C029468 */ jal Animation_Change - -/* 00C18 80A1B5B8 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00C1C 80A1B5BC 3C0A80A2 */ lui $t2, %hi(func_80A1B778) ## $t2 = 80A20000 -/* 00C20 80A1B5C0 254AB778 */ addiu $t2, $t2, %lo(func_80A1B778) ## $t2 = 80A1B778 -/* 00C24 80A1B5C4 10000017 */ beq $zero, $zero, .L80A1B624 -/* 00C28 80A1B5C8 AE0A0354 */ sw $t2, 0x0354($s0) ## 00000354 -.L80A1B5CC: -/* 00C2C 80A1B5CC 920B0379 */ lbu $t3, 0x0379($s0) ## 00000379 -/* 00C30 80A1B5D0 3C040600 */ lui $a0, %hi(D_060007BC) ## $a0 = 06000000 -/* 00C34 80A1B5D4 51600014 */ beql $t3, $zero, .L80A1B628 -/* 00C38 80A1B5D8 8FBF002C */ lw $ra, 0x002C($sp) -/* 00C3C 80A1B5DC 0C028800 */ jal Animation_GetLastFrame - -/* 00C40 80A1B5E0 248407BC */ addiu $a0, $a0, %lo(D_060007BC) ## $a0 = 060007BC -/* 00C44 80A1B5E4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00C48 80A1B5E8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00C4C 80A1B5EC 3C050600 */ lui $a1, %hi(D_060007BC) ## $a1 = 06000000 -/* 00C50 80A1B5F0 468021A0 */ cvt.s.w $f6, $f4 -/* 00C54 80A1B5F4 240C0002 */ addiu $t4, $zero, 0x0002 ## $t4 = 00000002 -/* 00C58 80A1B5F8 44070000 */ mfc1 $a3, $f0 -/* 00C5C 80A1B5FC AFAC0014 */ sw $t4, 0x0014($sp) -/* 00C60 80A1B600 24A507BC */ addiu $a1, $a1, %lo(D_060007BC) ## $a1 = 060007BC -/* 00C64 80A1B604 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00C68 80A1B608 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00C6C 80A1B60C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00C70 80A1B610 0C029468 */ jal Animation_Change - -/* 00C74 80A1B614 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00C78 80A1B618 3C0D80A2 */ lui $t5, %hi(func_80A1B638) ## $t5 = 80A20000 -/* 00C7C 80A1B61C 25ADB638 */ addiu $t5, $t5, %lo(func_80A1B638) ## $t5 = 80A1B638 -/* 00C80 80A1B620 AE0D0354 */ sw $t5, 0x0354($s0) ## 00000354 -.L80A1B624: -/* 00C84 80A1B624 8FBF002C */ lw $ra, 0x002C($sp) -.L80A1B628: -/* 00C88 80A1B628 8FB00028 */ lw $s0, 0x0028($sp) -/* 00C8C 80A1B62C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00C90 80A1B630 03E00008 */ jr $ra -/* 00C94 80A1B634 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B638.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B638.s deleted file mode 100644 index bbb4d65014..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B638.s +++ /dev/null @@ -1,90 +0,0 @@ -glabel func_80A1B638 -/* 00C98 80A1B638 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00C9C 80A1B63C AFBF002C */ sw $ra, 0x002C($sp) -/* 00CA0 80A1B640 AFB00028 */ sw $s0, 0x0028($sp) -/* 00CA4 80A1B644 AFA50044 */ sw $a1, 0x0044($sp) -/* 00CA8 80A1B648 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 00CAC 80A1B64C 44812000 */ mtc1 $at, $f4 ## $f4 = 6.00 -/* 00CB0 80A1B650 C4800164 */ lwc1 $f0, 0x0164($a0) ## 00000164 -/* 00CB4 80A1B654 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00CB8 80A1B658 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 00CBC 80A1B65C 46002032 */ c.eq.s $f4, $f0 -/* 00CC0 80A1B660 00000000 */ nop -/* 00CC4 80A1B664 45020005 */ bc1fl .L80A1B67C -/* 00CC8 80A1B668 44814000 */ mtc1 $at, $f8 ## $f8 = 3.00 -/* 00CCC 80A1B66C 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 00CD0 80A1B670 10000012 */ beq $zero, $zero, .L80A1B6BC -/* 00CD4 80A1B674 E4860168 */ swc1 $f6, 0x0168($a0) ## 00000168 -/* 00CD8 80A1B678 44814000 */ mtc1 $at, $f8 ## $f8 = 3.00 -.L80A1B67C: -/* 00CDC 80A1B67C 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00CE0 80A1B680 46004032 */ c.eq.s $f8, $f0 -/* 00CE4 80A1B684 00000000 */ nop -/* 00CE8 80A1B688 4502000D */ bc1fl .L80A1B6C0 -/* 00CEC 80A1B68C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00CF0 80A1B690 44815000 */ mtc1 $at, $f10 ## $f10 = -10.00 -/* 00CF4 80A1B694 920E0383 */ lbu $t6, 0x0383($s0) ## 00000383 -/* 00CF8 80A1B698 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 -/* 00CFC 80A1B69C 44818000 */ mtc1 $at, $f16 ## $f16 = 25.00 -/* 00D00 80A1B6A0 E60A006C */ swc1 $f10, 0x006C($s0) ## 0000006C -/* 00D04 80A1B6A4 11C00005 */ beq $t6, $zero, .L80A1B6BC -/* 00D08 80A1B6A8 E6100060 */ swc1 $f16, 0x0060($s0) ## 00000060 -/* 00D0C 80A1B6AC A2000383 */ sb $zero, 0x0383($s0) ## 00000383 -/* 00D10 80A1B6B0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D14 80A1B6B4 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00D18 80A1B6B8 24053826 */ addiu $a1, $zero, 0x3826 ## $a1 = 00003826 -.L80A1B6BC: -/* 00D1C 80A1B6BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A1B6C0: -/* 00D20 80A1B6C0 0C286C27 */ jal func_80A1B09C -/* 00D24 80A1B6C4 27A5003C */ addiu $a1, $sp, 0x003C ## $a1 = FFFFFFFC -/* 00D28 80A1B6C8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00D2C 80A1B6CC 10400015 */ beq $v0, $zero, .L80A1B724 -/* 00D30 80A1B6D0 3C040600 */ lui $a0, %hi(D_060011C0) ## $a0 = 06000000 -/* 00D34 80A1B6D4 A2000379 */ sb $zero, 0x0379($s0) ## 00000379 -/* 00D38 80A1B6D8 E600006C */ swc1 $f0, 0x006C($s0) ## 0000006C -/* 00D3C 80A1B6DC 0C028800 */ jal Animation_GetLastFrame - -/* 00D40 80A1B6E0 248411C0 */ addiu $a0, $a0, %lo(D_060011C0) ## $a0 = 060011C0 -/* 00D44 80A1B6E4 44829000 */ mtc1 $v0, $f18 ## $f18 = 0.00 -/* 00D48 80A1B6E8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00D4C 80A1B6EC 3C050600 */ lui $a1, %hi(D_060011C0) ## $a1 = 06000000 -/* 00D50 80A1B6F0 46809120 */ cvt.s.w $f4, $f18 -/* 00D54 80A1B6F4 44070000 */ mfc1 $a3, $f0 -/* 00D58 80A1B6F8 24A511C0 */ addiu $a1, $a1, %lo(D_060011C0) ## $a1 = 060011C0 -/* 00D5C 80A1B6FC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00D60 80A1B700 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00D64 80A1B704 AFA00014 */ sw $zero, 0x0014($sp) -/* 00D68 80A1B708 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00D6C 80A1B70C 0C029468 */ jal Animation_Change - -/* 00D70 80A1B710 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00D74 80A1B714 3C0F80A2 */ lui $t7, %hi(func_80A1B524) ## $t7 = 80A20000 -/* 00D78 80A1B718 25EFB524 */ addiu $t7, $t7, %lo(func_80A1B524) ## $t7 = 80A1B524 -/* 00D7C 80A1B71C 10000011 */ beq $zero, $zero, .L80A1B764 -/* 00D80 80A1B720 AE0F0354 */ sw $t7, 0x0354($s0) ## 00000354 -.L80A1B724: -/* 00D84 80A1B724 C6060060 */ lwc1 $f6, 0x0060($s0) ## 00000060 -/* 00D88 80A1B728 C7A8003C */ lwc1 $f8, 0x003C($sp) -/* 00D8C 80A1B72C 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 00D90 80A1B730 4600303E */ c.le.s $f6, $f0 -/* 00D94 80A1B734 00000000 */ nop -/* 00D98 80A1B738 4502000B */ bc1fl .L80A1B768 -/* 00D9C 80A1B73C 8FBF002C */ lw $ra, 0x002C($sp) -/* 00DA0 80A1B740 44815000 */ mtc1 $at, $f10 ## $f10 = 40.00 -/* 00DA4 80A1B744 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00DA8 80A1B748 460A403C */ c.lt.s $f8, $f10 -/* 00DAC 80A1B74C 00000000 */ nop -/* 00DB0 80A1B750 45020005 */ bc1fl .L80A1B768 -/* 00DB4 80A1B754 8FBF002C */ lw $ra, 0x002C($sp) -/* 00DB8 80A1B758 44818000 */ mtc1 $at, $f16 ## $f16 = 1.00 -/* 00DBC 80A1B75C 00000000 */ nop -/* 00DC0 80A1B760 E6100168 */ swc1 $f16, 0x0168($s0) ## 00000168 -.L80A1B764: -/* 00DC4 80A1B764 8FBF002C */ lw $ra, 0x002C($sp) -.L80A1B768: -/* 00DC8 80A1B768 8FB00028 */ lw $s0, 0x0028($sp) -/* 00DCC 80A1B76C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00DD0 80A1B770 03E00008 */ jr $ra -/* 00DD4 80A1B774 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B778.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B778.s deleted file mode 100644 index 6e7d8f9a92..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B778.s +++ /dev/null @@ -1,94 +0,0 @@ -glabel func_80A1B778 -/* 00DD8 80A1B778 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00DDC 80A1B77C AFBF002C */ sw $ra, 0x002C($sp) -/* 00DE0 80A1B780 AFB00028 */ sw $s0, 0x0028($sp) -/* 00DE4 80A1B784 AFA5003C */ sw $a1, 0x003C($sp) -/* 00DE8 80A1B788 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 00DEC 80A1B78C 3C0180A2 */ lui $at, %hi(D_80A1D070) ## $at = 80A20000 -/* 00DF0 80A1B790 C4860390 */ lwc1 $f6, 0x0390($a0) ## 00000390 -/* 00DF4 80A1B794 000E7880 */ sll $t7, $t6, 2 -/* 00DF8 80A1B798 01EE7823 */ subu $t7, $t7, $t6 -/* 00DFC 80A1B79C 000F7880 */ sll $t7, $t7, 2 -/* 00E00 80A1B7A0 002F0821 */ addu $at, $at, $t7 -/* 00E04 80A1B7A4 C424D070 */ lwc1 $f4, %lo(D_80A1D070)($at) -/* 00E08 80A1B7A8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00E0C 80A1B7AC 24180064 */ addiu $t8, $zero, 0x0064 ## $t8 = 00000064 -/* 00E10 80A1B7B0 46062200 */ add.s $f8, $f4, $f6 -/* 00E14 80A1B7B4 248400B6 */ addiu $a0, $a0, 0x00B6 ## $a0 = 000000B6 -/* 00E18 80A1B7B8 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 00E1C 80A1B7BC 24072710 */ addiu $a3, $zero, 0x2710 ## $a3 = 00002710 -/* 00E20 80A1B7C0 E7A80034 */ swc1 $f8, 0x0034($sp) -/* 00E24 80A1B7C4 86050032 */ lh $a1, 0x0032($s0) ## 00000032 -/* 00E28 80A1B7C8 0C01E1A7 */ jal Math_SmoothStepToS - -/* 00E2C 80A1B7CC AFB80010 */ sw $t8, 0x0010($sp) -/* 00E30 80A1B7D0 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 00E34 80A1B7D4 44811000 */ mtc1 $at, $f2 ## $f2 = 6.00 -/* 00E38 80A1B7D8 C6000164 */ lwc1 $f0, 0x0164($s0) ## 00000164 -/* 00E3C 80A1B7DC 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 00E40 80A1B7E0 46001032 */ c.eq.s $f2, $f0 -/* 00E44 80A1B7E4 00000000 */ nop -/* 00E48 80A1B7E8 45020005 */ bc1fl .L80A1B800 -/* 00E4C 80A1B7EC 44815000 */ mtc1 $at, $f10 ## $f10 = 3.00 -/* 00E50 80A1B7F0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00E54 80A1B7F4 1000000D */ beq $zero, $zero, .L80A1B82C -/* 00E58 80A1B7F8 E6000168 */ swc1 $f0, 0x0168($s0) ## 00000168 -/* 00E5C 80A1B7FC 44815000 */ mtc1 $at, $f10 ## $f10 = 3.00 -.L80A1B800: -/* 00E60 80A1B800 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00E64 80A1B804 46005032 */ c.eq.s $f10, $f0 -/* 00E68 80A1B808 00000000 */ nop -/* 00E6C 80A1B80C 45020008 */ bc1fl .L80A1B830 -/* 00E70 80A1B810 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00E74 80A1B814 44818000 */ mtc1 $at, $f16 ## $f16 = -10.00 -/* 00E78 80A1B818 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 -/* 00E7C 80A1B81C 44819000 */ mtc1 $at, $f18 ## $f18 = 25.00 -/* 00E80 80A1B820 E6020068 */ swc1 $f2, 0x0068($s0) ## 00000068 -/* 00E84 80A1B824 E610006C */ swc1 $f16, 0x006C($s0) ## 0000006C -/* 00E88 80A1B828 E6120060 */ swc1 $f18, 0x0060($s0) ## 00000060 -.L80A1B82C: -/* 00E8C 80A1B82C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -.L80A1B830: -/* 00E90 80A1B830 C6040060 */ lwc1 $f4, 0x0060($s0) ## 00000060 -/* 00E94 80A1B834 C7A80034 */ lwc1 $f8, 0x0034($sp) -/* 00E98 80A1B838 4600203C */ c.lt.s $f4, $f0 -/* 00E9C 80A1B83C 00000000 */ nop -/* 00EA0 80A1B840 4502001F */ bc1fl .L80A1B8C0 -/* 00EA4 80A1B844 8FBF002C */ lw $ra, 0x002C($sp) -/* 00EA8 80A1B848 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 00EAC 80A1B84C 3C040600 */ lui $a0, %hi(D_06001534) ## $a0 = 06000000 -/* 00EB0 80A1B850 4608303C */ c.lt.s $f6, $f8 -/* 00EB4 80A1B854 00000000 */ nop -/* 00EB8 80A1B858 45020019 */ bc1fl .L80A1B8C0 -/* 00EBC 80A1B85C 8FBF002C */ lw $ra, 0x002C($sp) -/* 00EC0 80A1B860 0C028800 */ jal Animation_GetLastFrame - -/* 00EC4 80A1B864 24841534 */ addiu $a0, $a0, %lo(D_06001534) ## $a0 = 06001534 -/* 00EC8 80A1B868 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 -/* 00ECC 80A1B86C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00ED0 80A1B870 3C050600 */ lui $a1, %hi(D_06001534) ## $a1 = 06000000 -/* 00ED4 80A1B874 46805420 */ cvt.s.w $f16, $f10 -/* 00ED8 80A1B878 44070000 */ mfc1 $a3, $f0 -/* 00EDC 80A1B87C 24A51534 */ addiu $a1, $a1, %lo(D_06001534) ## $a1 = 06001534 -/* 00EE0 80A1B880 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00EE4 80A1B884 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00EE8 80A1B888 AFA00014 */ sw $zero, 0x0014($sp) -/* 00EEC 80A1B88C E7B00010 */ swc1 $f16, 0x0010($sp) -/* 00EF0 80A1B890 0C029468 */ jal Animation_Change - -/* 00EF4 80A1B894 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00EF8 80A1B898 3C1980A2 */ lui $t9, %hi(func_80A1B22C) ## $t9 = 80A20000 -/* 00EFC 80A1B89C 2739B22C */ addiu $t9, $t9, %lo(func_80A1B22C) ## $t9 = 80A1B22C -/* 00F00 80A1B8A0 AE190354 */ sw $t9, 0x0354($s0) ## 00000354 -/* 00F04 80A1B8A4 0C286B03 */ jal func_80A1AC0C -/* 00F08 80A1B8A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F0C 80A1B8AC 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 00F10 80A1B8B0 A208037C */ sb $t0, 0x037C($s0) ## 0000037C -/* 00F14 80A1B8B4 0C286A68 */ jal func_80A1A9A0 -/* 00F18 80A1B8B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F1C 80A1B8BC 8FBF002C */ lw $ra, 0x002C($sp) -.L80A1B8C0: -/* 00F20 80A1B8C0 8FB00028 */ lw $s0, 0x0028($sp) -/* 00F24 80A1B8C4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00F28 80A1B8C8 03E00008 */ jr $ra -/* 00F2C 80A1B8CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B8D0.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B8D0.s deleted file mode 100644 index 6c445fc628..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B8D0.s +++ /dev/null @@ -1,75 +0,0 @@ -glabel func_80A1B8D0 -/* 00F30 80A1B8D0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00F34 80A1B8D4 AFBF001C */ sw $ra, 0x001C($sp) -/* 00F38 80A1B8D8 AFB00018 */ sw $s0, 0x0018($sp) -/* 00F3C 80A1B8DC AFA50024 */ sw $a1, 0x0024($sp) -/* 00F40 80A1B8E0 9082037F */ lbu $v0, 0x037F($a0) ## 0000037F -/* 00F44 80A1B8E4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00F48 80A1B8E8 260403A0 */ addiu $a0, $s0, 0x03A0 ## $a0 = 000003A0 -/* 00F4C 80A1B8EC 10400006 */ beq $v0, $zero, .L80A1B908 -/* 00F50 80A1B8F0 3C0580A2 */ lui $a1, %hi(D_80A1D0CC) ## $a1 = 80A20000 -/* 00F54 80A1B8F4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00F58 80A1B8F8 1041001D */ beq $v0, $at, .L80A1B970 -/* 00F5C 80A1B8FC 260403A0 */ addiu $a0, $s0, 0x03A0 ## $a0 = 000003A0 -/* 00F60 80A1B900 10000031 */ beq $zero, $zero, .L80A1B9C8 -/* 00F64 80A1B904 8FBF001C */ lw $ra, 0x001C($sp) -.L80A1B908: -/* 00F68 80A1B908 920E037E */ lbu $t6, 0x037E($s0) ## 0000037E -/* 00F6C 80A1B90C 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 -/* 00F70 80A1B910 3C0741C8 */ lui $a3, 0x41C8 ## $a3 = 41C80000 -/* 00F74 80A1B914 000E7880 */ sll $t7, $t6, 2 -/* 00F78 80A1B918 00AF2821 */ addu $a1, $a1, $t7 -/* 00F7C 80A1B91C 0C01E107 */ jal Math_ApproachF - -/* 00F80 80A1B920 8CA5D0CC */ lw $a1, %lo(D_80A1D0CC)($a1) -/* 00F84 80A1B924 9202037E */ lbu $v0, 0x037E($s0) ## 0000037E -/* 00F88 80A1B928 3C0180A2 */ lui $at, %hi(D_80A1D0CC) ## $at = 80A20000 -/* 00F8C 80A1B92C C60403A0 */ lwc1 $f4, 0x03A0($s0) ## 000003A0 -/* 00F90 80A1B930 0002C080 */ sll $t8, $v0, 2 -/* 00F94 80A1B934 00380821 */ addu $at, $at, $t8 -/* 00F98 80A1B938 C420D0CC */ lwc1 $f0, %lo(D_80A1D0CC)($at) -/* 00F9C 80A1B93C 28410003 */ slti $at, $v0, 0x0003 -/* 00FA0 80A1B940 4604003E */ c.le.s $f0, $f4 -/* 00FA4 80A1B944 00000000 */ nop -/* 00FA8 80A1B948 4502001F */ bc1fl .L80A1B9C8 -/* 00FAC 80A1B94C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00FB0 80A1B950 10200004 */ beq $at, $zero, .L80A1B964 -/* 00FB4 80A1B954 E60003A0 */ swc1 $f0, 0x03A0($s0) ## 000003A0 -/* 00FB8 80A1B958 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 00FBC 80A1B95C 10000019 */ beq $zero, $zero, .L80A1B9C4 -/* 00FC0 80A1B960 A219037F */ sb $t9, 0x037F($s0) ## 0000037F -.L80A1B964: -/* 00FC4 80A1B964 A2000379 */ sb $zero, 0x0379($s0) ## 00000379 -/* 00FC8 80A1B968 10000016 */ beq $zero, $zero, .L80A1B9C4 -/* 00FCC 80A1B96C A200037D */ sb $zero, 0x037D($s0) ## 0000037D -.L80A1B970: -/* 00FD0 80A1B970 3C054316 */ lui $a1, 0x4316 ## $a1 = 43160000 -/* 00FD4 80A1B974 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 -/* 00FD8 80A1B978 0C01E107 */ jal Math_ApproachF - -/* 00FDC 80A1B97C 3C0741C8 */ lui $a3, 0x41C8 ## $a3 = 41C80000 -/* 00FE0 80A1B980 3C014316 */ lui $at, 0x4316 ## $at = 43160000 -/* 00FE4 80A1B984 44810000 */ mtc1 $at, $f0 ## $f0 = 150.00 -/* 00FE8 80A1B988 C60603A0 */ lwc1 $f6, 0x03A0($s0) ## 000003A0 -/* 00FEC 80A1B98C 4600303E */ c.le.s $f6, $f0 -/* 00FF0 80A1B990 00000000 */ nop -/* 00FF4 80A1B994 4502000C */ bc1fl .L80A1B9C8 -/* 00FF8 80A1B998 8FBF001C */ lw $ra, 0x001C($sp) -/* 00FFC 80A1B99C 9208037E */ lbu $t0, 0x037E($s0) ## 0000037E -/* 01000 80A1B9A0 E60003A0 */ swc1 $f0, 0x03A0($s0) ## 000003A0 -/* 01004 80A1B9A4 240B0003 */ addiu $t3, $zero, 0x0003 ## $t3 = 00000003 -/* 01008 80A1B9A8 25090001 */ addiu $t1, $t0, 0x0001 ## $t1 = 00000001 -/* 0100C 80A1B9AC 312A00FF */ andi $t2, $t1, 0x00FF ## $t2 = 00000001 -/* 01010 80A1B9B0 29410004 */ slti $at, $t2, 0x0004 -/* 01014 80A1B9B4 14200002 */ bne $at, $zero, .L80A1B9C0 -/* 01018 80A1B9B8 A209037E */ sb $t1, 0x037E($s0) ## 0000037E -/* 0101C 80A1B9BC A20B037E */ sb $t3, 0x037E($s0) ## 0000037E -.L80A1B9C0: -/* 01020 80A1B9C0 A200037F */ sb $zero, 0x037F($s0) ## 0000037F -.L80A1B9C4: -/* 01024 80A1B9C4 8FBF001C */ lw $ra, 0x001C($sp) -.L80A1B9C8: -/* 01028 80A1B9C8 8FB00018 */ lw $s0, 0x0018($sp) -/* 0102C 80A1B9CC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01030 80A1B9D0 03E00008 */ jr $ra -/* 01034 80A1B9D4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B9D8.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B9D8.s deleted file mode 100644 index 1ec288c18c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B9D8.s +++ /dev/null @@ -1,92 +0,0 @@ -glabel func_80A1B9D8 -/* 01038 80A1B9D8 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 0103C 80A1B9DC AFBF001C */ sw $ra, 0x001C($sp) -/* 01040 80A1B9E0 AFB00018 */ sw $s0, 0x0018($sp) -/* 01044 80A1B9E4 AFA50044 */ sw $a1, 0x0044($sp) -/* 01048 80A1B9E8 848E00B6 */ lh $t6, 0x00B6($a0) ## 000000B6 -/* 0104C 80A1B9EC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01050 80A1B9F0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01054 80A1B9F4 A7AE003E */ sh $t6, 0x003E($sp) -/* 01058 80A1B9F8 848F03AA */ lh $t7, 0x03AA($a0) ## 000003AA -/* 0105C 80A1B9FC 8C86002C */ lw $a2, 0x002C($a0) ## 0000002C -/* 01060 80A1BA00 C48E0028 */ lwc1 $f14, 0x0028($a0) ## 00000028 -/* 01064 80A1BA04 25F81000 */ addiu $t8, $t7, 0x1000 ## $t8 = 00001000 -/* 01068 80A1BA08 A49803AA */ sh $t8, 0x03AA($a0) ## 000003AA -/* 0106C 80A1BA0C 0C034261 */ jal Matrix_Translate -/* 01070 80A1BA10 C48C0024 */ lwc1 $f12, 0x0024($a0) ## 00000024 -/* 01074 80A1BA14 86040030 */ lh $a0, 0x0030($s0) ## 00000030 -/* 01078 80A1BA18 86050032 */ lh $a1, 0x0032($s0) ## 00000032 -/* 0107C 80A1BA1C 86060034 */ lh $a2, 0x0034($s0) ## 00000034 -/* 01080 80A1BA20 0C034421 */ jal Matrix_RotateRPY -/* 01084 80A1BA24 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01088 80A1BA28 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 0108C 80A1BA2C 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 -/* 01090 80A1BA30 44812000 */ mtc1 $at, $f4 ## $f4 = 25.00 -/* 01094 80A1BA34 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFEC -/* 01098 80A1BA38 27A50020 */ addiu $a1, $sp, 0x0020 ## $a1 = FFFFFFE0 -/* 0109C 80A1BA3C E7A00030 */ swc1 $f0, 0x0030($sp) -/* 010A0 80A1BA40 E7A0002C */ swc1 $f0, 0x002C($sp) -/* 010A4 80A1BA44 0C0346BD */ jal Matrix_MultVec3f -/* 010A8 80A1BA48 E7A40034 */ swc1 $f4, 0x0034($sp) -/* 010AC 80A1BA4C 860403AA */ lh $a0, 0x03AA($s0) ## 000003AA -/* 010B0 80A1BA50 00042040 */ sll $a0, $a0, 1 -/* 010B4 80A1BA54 00042400 */ sll $a0, $a0, 16 -/* 010B8 80A1BA58 0C01DE1C */ jal Math_SinS - ## sins? -/* 010BC 80A1BA5C 00042403 */ sra $a0, $a0, 16 -/* 010C0 80A1BA60 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 010C4 80A1BA64 44813000 */ mtc1 $at, $f6 ## $f6 = 5.00 -/* 010C8 80A1BA68 87A4003E */ lh $a0, 0x003E($sp) -/* 010CC 80A1BA6C 46060202 */ mul.s $f8, $f0, $f6 -/* 010D0 80A1BA70 0C01DE1C */ jal Math_SinS - ## sins? -/* 010D4 80A1BA74 E7A80038 */ swc1 $f8, 0x0038($sp) -/* 010D8 80A1BA78 C7AA0038 */ lwc1 $f10, 0x0038($sp) -/* 010DC 80A1BA7C C7B20020 */ lwc1 $f18, 0x0020($sp) -/* 010E0 80A1BA80 860403AA */ lh $a0, 0x03AA($s0) ## 000003AA -/* 010E4 80A1BA84 460A0402 */ mul.s $f16, $f0, $f10 -/* 010E8 80A1BA88 46128100 */ add.s $f4, $f16, $f18 -/* 010EC 80A1BA8C 0C01DE0D */ jal Math_CosS - ## coss? -/* 010F0 80A1BA90 E60403AC */ swc1 $f4, 0x03AC($s0) ## 000003AC -/* 010F4 80A1BA94 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 010F8 80A1BA98 44814000 */ mtc1 $at, $f8 ## $f8 = 50.00 -/* 010FC 80A1BA9C C6060390 */ lwc1 $f6, 0x0390($s0) ## 00000390 -/* 01100 80A1BAA0 46000400 */ add.s $f16, $f0, $f0 -/* 01104 80A1BAA4 46083280 */ add.s $f10, $f6, $f8 -/* 01108 80A1BAA8 460A8480 */ add.s $f18, $f16, $f10 -/* 0110C 80A1BAAC E61203B0 */ swc1 $f18, 0x03B0($s0) ## 000003B0 -/* 01110 80A1BAB0 0C01DE0D */ jal Math_CosS - ## coss? -/* 01114 80A1BAB4 87A4003E */ lh $a0, 0x003E($sp) -/* 01118 80A1BAB8 C7A40038 */ lwc1 $f4, 0x0038($sp) -/* 0111C 80A1BABC C7A80028 */ lwc1 $f8, 0x0028($sp) -/* 01120 80A1BAC0 C60C03AC */ lwc1 $f12, 0x03AC($s0) ## 000003AC -/* 01124 80A1BAC4 46040182 */ mul.s $f6, $f0, $f4 -/* 01128 80A1BAC8 C60E03B0 */ lwc1 $f14, 0x03B0($s0) ## 000003B0 -/* 0112C 80A1BACC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01130 80A1BAD0 46083400 */ add.s $f16, $f6, $f8 -/* 01134 80A1BAD4 E61003B4 */ swc1 $f16, 0x03B4($s0) ## 000003B4 -/* 01138 80A1BAD8 0C034261 */ jal Matrix_Translate -/* 0113C 80A1BADC 8E0603B4 */ lw $a2, 0x03B4($s0) ## 000003B4 -/* 01140 80A1BAE0 86040030 */ lh $a0, 0x0030($s0) ## 00000030 -/* 01144 80A1BAE4 86050032 */ lh $a1, 0x0032($s0) ## 00000032 -/* 01148 80A1BAE8 86060034 */ lh $a2, 0x0034($s0) ## 00000034 -/* 0114C 80A1BAEC 0C034421 */ jal Matrix_RotateRPY -/* 01150 80A1BAF0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01154 80A1BAF4 3C01C170 */ lui $at, 0xC170 ## $at = C1700000 -/* 01158 80A1BAF8 44819000 */ mtc1 $at, $f18 ## $f18 = -15.00 -/* 0115C 80A1BAFC 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 01160 80A1BB00 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 01164 80A1BB04 44812000 */ mtc1 $at, $f4 ## $f4 = 20.00 -/* 01168 80A1BB08 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFEC -/* 0116C 80A1BB0C 260503B8 */ addiu $a1, $s0, 0x03B8 ## $a1 = 000003B8 -/* 01170 80A1BB10 E7B20030 */ swc1 $f18, 0x0030($sp) -/* 01174 80A1BB14 E7AA002C */ swc1 $f10, 0x002C($sp) -/* 01178 80A1BB18 0C0346BD */ jal Matrix_MultVec3f -/* 0117C 80A1BB1C E7A40034 */ swc1 $f4, 0x0034($sp) -/* 01180 80A1BB20 8FBF001C */ lw $ra, 0x001C($sp) -/* 01184 80A1BB24 8FB00018 */ lw $s0, 0x0018($sp) -/* 01188 80A1BB28 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 0118C 80A1BB2C 03E00008 */ jr $ra -/* 01190 80A1BB30 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BB34.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BB34.s deleted file mode 100644 index e32305d58c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BB34.s +++ /dev/null @@ -1,69 +0,0 @@ -.late_rodata -glabel D_80A1D29C - .word 0x38D1B717 - -.text -glabel func_80A1BB34 -/* 01194 80A1BB34 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01198 80A1BB38 AFBF001C */ sw $ra, 0x001C($sp) -/* 0119C 80A1BB3C AFB10018 */ sw $s1, 0x0018($sp) -/* 011A0 80A1BB40 AFB00014 */ sw $s0, 0x0014($sp) -/* 011A4 80A1BB44 8C8E036C */ lw $t6, 0x036C($a0) ## 0000036C -/* 011A8 80A1BB48 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 011AC 80A1BB4C 3C0180A2 */ lui $at, %hi(D_80A1D29C) ## $at = 80A20000 -/* 011B0 80A1BB50 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 011B4 80A1BB54 AC8F036C */ sw $t7, 0x036C($a0) ## 0000036C -/* 011B8 80A1BB58 C426D29C */ lwc1 $f6, %lo(D_80A1D29C)($at) -/* 011BC 80A1BB5C C60403A0 */ lwc1 $f4, 0x03A0($s0) ## 000003A0 -/* 011C0 80A1BB60 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 011C4 80A1BB64 46062202 */ mul.s $f8, $f4, $f6 -/* 011C8 80A1BB68 44054000 */ mfc1 $a1, $f8 -/* 011CC 80A1BB6C 0C00B58B */ jal Actor_SetScale - -/* 011D0 80A1BB70 00000000 */ nop -/* 011D4 80A1BB74 9218037D */ lbu $t8, 0x037D($s0) ## 0000037D -/* 011D8 80A1BB78 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 011DC 80A1BB7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 011E0 80A1BB80 13000005 */ beq $t8, $zero, .L80A1BB98 -/* 011E4 80A1BB84 00000000 */ nop -/* 011E8 80A1BB88 0C286E34 */ jal func_80A1B8D0 -/* 011EC 80A1BB8C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 011F0 80A1BB90 1000001C */ beq $zero, $zero, .L80A1BC04 -/* 011F4 80A1BB94 8FBF001C */ lw $ra, 0x001C($sp) -.L80A1BB98: -/* 011F8 80A1BB98 0C00B56E */ jal Actor_SetFocus - -/* 011FC 80A1BB9C 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 -/* 01200 80A1BBA0 8E190374 */ lw $t9, 0x0374($s0) ## 00000374 -/* 01204 80A1BBA4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01208 80A1BBA8 0320F809 */ jalr $ra, $t9 -/* 0120C 80A1BBAC 00000000 */ nop -/* 01210 80A1BBB0 8E190354 */ lw $t9, 0x0354($s0) ## 00000354 -/* 01214 80A1BBB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01218 80A1BBB8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0121C 80A1BBBC 0320F809 */ jalr $ra, $t9 -/* 01220 80A1BBC0 00000000 */ nop -/* 01224 80A1BBC4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01228 80A1BBC8 0C286BDB */ jal func_80A1AF6C -/* 0122C 80A1BBCC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01230 80A1BBD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01234 80A1BBD4 0C286BFC */ jal func_80A1AFF0 -/* 01238 80A1BBD8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0123C 80A1BBDC 0C02927F */ jal SkelAnime_Update - -/* 01240 80A1BBE0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 01244 80A1BBE4 0C02927F */ jal SkelAnime_Update - -/* 01248 80A1BBE8 260402B0 */ addiu $a0, $s0, 0x02B0 ## $a0 = 000002B0 -/* 0124C 80A1BBEC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01250 80A1BBF0 0C286E76 */ jal func_80A1B9D8 -/* 01254 80A1BBF4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01258 80A1BBF8 0C00B638 */ jal Actor_MoveForward - -/* 0125C 80A1BBFC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01260 80A1BC00 8FBF001C */ lw $ra, 0x001C($sp) -.L80A1BC04: -/* 01264 80A1BC04 8FB00014 */ lw $s0, 0x0014($sp) -/* 01268 80A1BC08 8FB10018 */ lw $s1, 0x0018($sp) -/* 0126C 80A1BC0C 03E00008 */ jr $ra -/* 01270 80A1BC10 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BC14.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BC14.s deleted file mode 100644 index c9080787dd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BC14.s +++ /dev/null @@ -1,45 +0,0 @@ -glabel func_80A1BC14 -/* 01274 80A1BC14 00057080 */ sll $t6, $a1, 2 -/* 01278 80A1BC18 3C0280A2 */ lui $v0, %hi(D_80A1CFF4) ## $v0 = 80A20000 -/* 0127C 80A1BC1C 004E1021 */ addu $v0, $v0, $t6 -/* 01280 80A1BC20 8C42CFF4 */ lw $v0, %lo(D_80A1CFF4)($v0) -/* 01284 80A1BC24 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01288 80A1BC28 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0128C 80A1BC2C 5040001D */ beql $v0, $zero, .L80A1BCA4 -/* 01290 80A1BC30 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 01294 80A1BC34 904F0379 */ lbu $t7, 0x0379($v0) ## 00000379 -/* 01298 80A1BC38 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 0129C 80A1BC3C 55E00019 */ bnel $t7, $zero, .L80A1BCA4 -/* 012A0 80A1BC40 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 012A4 80A1BC44 9058037E */ lbu $t8, 0x037E($v0) ## 0000037E -/* 012A8 80A1BC48 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 012AC 80A1BC4C 3C0380A2 */ lui $v1, %hi(D_80A1D0DC) ## $v1 = 80A20000 -/* 012B0 80A1BC50 17010005 */ bne $t8, $at, .L80A1BC68 -/* 012B4 80A1BC54 00651821 */ addu $v1, $v1, $a1 -/* 012B8 80A1BC58 3C0380A2 */ lui $v1, %hi(D_80A1D0E4) ## $v1 = 80A20000 -/* 012BC 80A1BC5C 00651821 */ addu $v1, $v1, $a1 -/* 012C0 80A1BC60 10000002 */ beq $zero, $zero, .L80A1BC6C -/* 012C4 80A1BC64 9063D0E4 */ lbu $v1, %lo(D_80A1D0E4)($v1) -.L80A1BC68: -/* 012C8 80A1BC68 9063D0DC */ lbu $v1, %lo(D_80A1D0DC)($v1) -.L80A1BC6C: -/* 012CC 80A1BC6C 90990382 */ lbu $t9, 0x0382($a0) ## 00000382 -/* 012D0 80A1BC70 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 012D4 80A1BC74 244400E4 */ addiu $a0, $v0, 0x00E4 ## $a0 = 000000E4 -/* 012D8 80A1BC78 17210003 */ bne $t9, $at, .L80A1BC88 -/* 012DC 80A1BC7C 240528B1 */ addiu $a1, $zero, 0x28B1 ## $a1 = 000028B1 -/* 012E0 80A1BC80 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 012E4 80A1BC84 A0480383 */ sb $t0, 0x0383($v0) ## 00000383 -.L80A1BC88: -/* 012E8 80A1BC88 00033600 */ sll $a2, $v1, 24 -/* 012EC 80A1BC8C A0490379 */ sb $t1, 0x0379($v0) ## 00000379 -/* 012F0 80A1BC90 0C03D2FD */ jal func_800F4BF4 -/* 012F4 80A1BC94 00063603 */ sra $a2, $a2, 24 -/* 012F8 80A1BC98 10000002 */ beq $zero, $zero, .L80A1BCA4 -/* 012FC 80A1BC9C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 01300 80A1BCA0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A1BCA4: -/* 01304 80A1BCA4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01308 80A1BCA8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0130C 80A1BCAC 03E00008 */ jr $ra -/* 01310 80A1BCB0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BCB4.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BCB4.s deleted file mode 100644 index 630e9cba9a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BCB4.s +++ /dev/null @@ -1,60 +0,0 @@ -glabel func_80A1BCB4 -/* 01314 80A1BCB4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01318 80A1BCB8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0131C 80A1BCBC AFB10020 */ sw $s1, 0x0020($sp) -/* 01320 80A1BCC0 AFB0001C */ sw $s0, 0x001C($sp) -/* 01324 80A1BCC4 8CB01C44 */ lw $s0, 0x1C44($a1) ## 00001C44 -/* 01328 80A1BCC8 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 0132C 80A1BCCC 3C180001 */ lui $t8, 0x0001 ## $t8 = 00010000 -/* 01330 80A1BCD0 8E0E0680 */ lw $t6, 0x0680($s0) ## 00000680 -/* 01334 80A1BCD4 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 01338 80A1BCD8 0305C021 */ addu $t8, $t8, $a1 -/* 0133C 80A1BCDC 000E7980 */ sll $t7, $t6, 6 -/* 01340 80A1BCE0 05E10021 */ bgez $t7, .L80A1BD68 -/* 01344 80A1BCE4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01348 80A1BCE8 971804C6 */ lhu $t8, 0x04C6($t8) ## 000104C6 -/* 0134C 80A1BCEC 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 01350 80A1BCF0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01354 80A1BCF4 17010004 */ bne $t8, $at, .L80A1BD08 -/* 01358 80A1BCF8 2406FF9D */ addiu $a2, $zero, 0xFF9D ## $a2 = FFFFFF9D -/* 0135C 80A1BCFC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01360 80A1BD00 00250821 */ addu $at, $at, $a1 -/* 01364 80A1BD04 A42004C6 */ sh $zero, 0x04C6($at) ## 000104C6 -.L80A1BD08: -/* 01368 80A1BD08 2405100E */ addiu $a1, $zero, 0x100E ## $a1 = 0000100E -/* 0136C 80A1BD0C AFA00010 */ sw $zero, 0x0010($sp) -/* 01370 80A1BD10 0C02003E */ jal func_800800F8 -/* 01374 80A1BD14 AFA70028 */ sw $a3, 0x0028($sp) -/* 01378 80A1BD18 8FA70028 */ lw $a3, 0x0028($sp) -/* 0137C 80A1BD1C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01380 80A1BD20 00310821 */ addu $at, $at, $s1 -/* 01384 80A1BD24 24190037 */ addiu $t9, $zero, 0x0037 ## $t9 = 00000037 -/* 01388 80A1BD28 A03903DC */ sb $t9, 0x03DC($at) ## 000103DC -/* 0138C 80A1BD2C C4E40024 */ lwc1 $f4, 0x0024($a3) ## 00000024 -/* 01390 80A1BD30 3C0880A2 */ lui $t0, %hi(func_80A1BD94) ## $t0 = 80A20000 -/* 01394 80A1BD34 2508BD94 */ addiu $t0, $t0, %lo(func_80A1BD94) ## $t0 = 80A1BD94 -/* 01398 80A1BD38 E6040024 */ swc1 $f4, 0x0024($s0) ## 00000024 -/* 0139C 80A1BD3C C4E60028 */ lwc1 $f6, 0x0028($a3) ## 00000028 -/* 013A0 80A1BD40 E6060028 */ swc1 $f6, 0x0028($s0) ## 00000028 -/* 013A4 80A1BD44 C4E8002C */ lwc1 $f8, 0x002C($a3) ## 0000002C -/* 013A8 80A1BD48 E608002C */ swc1 $f8, 0x002C($s0) ## 0000002C -/* 013AC 80A1BD4C 84E30032 */ lh $v1, 0x0032($a3) ## 00000032 -/* 013B0 80A1BD50 A60300B6 */ sh $v1, 0x00B6($s0) ## 000000B6 -/* 013B4 80A1BD54 A6030032 */ sh $v1, 0x0032($s0) ## 00000032 -/* 013B8 80A1BD58 A603083C */ sh $v1, 0x083C($s0) ## 0000083C -/* 013BC 80A1BD5C ACE00388 */ sw $zero, 0x0388($a3) ## 00000388 -/* 013C0 80A1BD60 10000007 */ beq $zero, $zero, .L80A1BD80 -/* 013C4 80A1BD64 ACE80354 */ sw $t0, 0x0354($a3) ## 00000354 -.L80A1BD68: -/* 013C8 80A1BD68 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 013CC 80A1BD6C 0C286C3E */ jal func_80A1B0F8 -/* 013D0 80A1BD70 AFA70028 */ sw $a3, 0x0028($sp) -/* 013D4 80A1BD74 10400002 */ beq $v0, $zero, .L80A1BD80 -/* 013D8 80A1BD78 8FA70028 */ lw $a3, 0x0028($sp) -/* 013DC 80A1BD7C AE0706A8 */ sw $a3, 0x06A8($s0) ## 000006A8 -.L80A1BD80: -/* 013E0 80A1BD80 8FBF0024 */ lw $ra, 0x0024($sp) -/* 013E4 80A1BD84 8FB0001C */ lw $s0, 0x001C($sp) -/* 013E8 80A1BD88 8FB10020 */ lw $s1, 0x0020($sp) -/* 013EC 80A1BD8C 03E00008 */ jr $ra -/* 013F0 80A1BD90 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BD94.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BD94.s deleted file mode 100644 index 67f4b14d7f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BD94.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_80A1BD94 -/* 013F4 80A1BD94 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 013F8 80A1BD98 00451021 */ addu $v0, $v0, $a1 -/* 013FC 80A1BD9C 904203DC */ lbu $v0, 0x03DC($v0) ## 000103DC -/* 01400 80A1BDA0 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 01404 80A1BDA4 240E0037 */ addiu $t6, $zero, 0x0037 ## $t6 = 00000037 -/* 01408 80A1BDA8 1441000A */ bne $v0, $at, .L80A1BDD4 -/* 0140C 80A1BDAC 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 01410 80A1BDB0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01414 80A1BDB4 00250821 */ addu $at, $at, $a1 -/* 01418 80A1BDB8 A02E03DC */ sb $t6, 0x03DC($at) ## 000103DC -/* 0141C 80A1BDBC 3C0180A2 */ lui $at, %hi(D_80A1CFF0) ## $at = 80A20000 -/* 01420 80A1BDC0 3C1880A2 */ lui $t8, %hi(func_80A1BDFC) ## $t8 = 80A20000 -/* 01424 80A1BDC4 A02FCFF0 */ sb $t7, %lo(D_80A1CFF0)($at) -/* 01428 80A1BDC8 2718BDFC */ addiu $t8, $t8, %lo(func_80A1BDFC) ## $t8 = 80A1BDFC -/* 0142C 80A1BDCC 03E00008 */ jr $ra -/* 01430 80A1BDD0 AC980354 */ sw $t8, 0x0354($a0) ## 00000354 -.L80A1BDD4: -/* 01434 80A1BDD4 24010037 */ addiu $at, $zero, 0x0037 ## $at = 00000037 -/* 01438 80A1BDD8 14410006 */ bne $v0, $at, .L80A1BDF4 -/* 0143C 80A1BDDC 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 01440 80A1BDE0 3C0180A2 */ lui $at, %hi(D_80A1CFF0) ## $at = 80A20000 -/* 01444 80A1BDE4 3C0880A2 */ lui $t0, %hi(func_80A1BDFC) ## $t0 = 80A20000 -/* 01448 80A1BDE8 A039CFF0 */ sb $t9, %lo(D_80A1CFF0)($at) -/* 0144C 80A1BDEC 2508BDFC */ addiu $t0, $t0, %lo(func_80A1BDFC) ## $t0 = 80A1BDFC -/* 01450 80A1BDF0 AC880354 */ sw $t0, 0x0354($a0) ## 00000354 -.L80A1BDF4: -/* 01454 80A1BDF4 03E00008 */ jr $ra -/* 01458 80A1BDF8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BDFC.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BDFC.s deleted file mode 100644 index eab99815e9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BDFC.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_80A1BDFC -/* 0145C 80A1BDFC 3C0E80A2 */ lui $t6, %hi(D_80A1CFF0) ## $t6 = 80A20000 -/* 01460 80A1BE00 91CECFF0 */ lbu $t6, %lo(D_80A1CFF0)($t6) -/* 01464 80A1BE04 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01468 80A1BE08 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 0146C 80A1BE0C AFBF0014 */ sw $ra, 0x0014($sp) -/* 01470 80A1BE10 15C1001D */ bne $t6, $at, .L80A1BE88 -/* 01474 80A1BE14 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 01478 80A1BE18 3C028016 */ lui $v0, %hi(gSaveContext+0xeee) -/* 0147C 80A1BE1C 9442F54E */ lhu $v0, %lo(gSaveContext+0xeee)($v0) -/* 01480 80A1BE20 3C0D80A2 */ lui $t5, %hi(func_80A1BE98) ## $t5 = 80A20000 -/* 01484 80A1BE24 25ADBE98 */ addiu $t5, $t5, %lo(func_80A1BE98) ## $t5 = 80A1BE98 -/* 01488 80A1BE28 304F0002 */ andi $t7, $v0, 0x0002 ## $t7 = 00000000 -/* 0148C 80A1BE2C 11E00014 */ beq $t7, $zero, .L80A1BE80 -/* 01490 80A1BE30 30580004 */ andi $t8, $v0, 0x0004 ## $t8 = 00000000 -/* 01494 80A1BE34 13000012 */ beq $t8, $zero, .L80A1BE80 -/* 01498 80A1BE38 30590010 */ andi $t9, $v0, 0x0010 ## $t9 = 00000000 -/* 0149C 80A1BE3C 13200010 */ beq $t9, $zero, .L80A1BE80 -/* 014A0 80A1BE40 30480008 */ andi $t0, $v0, 0x0008 ## $t0 = 00000000 -/* 014A4 80A1BE44 1100000E */ beq $t0, $zero, .L80A1BE80 -/* 014A8 80A1BE48 30490020 */ andi $t1, $v0, 0x0020 ## $t1 = 00000000 -/* 014AC 80A1BE4C 1120000C */ beq $t1, $zero, .L80A1BE80 -/* 014B0 80A1BE50 304A0040 */ andi $t2, $v0, 0x0040 ## $t2 = 00000000 -/* 014B4 80A1BE54 1140000A */ beq $t2, $zero, .L80A1BE80 -/* 014B8 80A1BE58 3C0B80A2 */ lui $t3, %hi(func_80A1C1E4) ## $t3 = 80A20000 -/* 014BC 80A1BE5C 256BC1E4 */ addiu $t3, $t3, %lo(func_80A1C1E4) ## $t3 = 80A1C1E4 -/* 014C0 80A1BE60 240C0006 */ addiu $t4, $zero, 0x0006 ## $t4 = 00000006 -/* 014C4 80A1BE64 AC8B0354 */ sw $t3, 0x0354($a0) ## 00000354 -/* 014C8 80A1BE68 A08C0382 */ sb $t4, 0x0382($a0) ## 00000382 -/* 014CC 80A1BE6C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 014D0 80A1BE70 0C042DA0 */ jal func_8010B680 -/* 014D4 80A1BE74 240540AB */ addiu $a1, $zero, 0x40AB ## $a1 = 000040AB -/* 014D8 80A1BE78 10000004 */ beq $zero, $zero, .L80A1BE8C -/* 014DC 80A1BE7C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A1BE80: -/* 014E0 80A1BE80 A0C00382 */ sb $zero, 0x0382($a2) ## 00000382 -/* 014E4 80A1BE84 ACCD0354 */ sw $t5, 0x0354($a2) ## 00000354 -.L80A1BE88: -/* 014E8 80A1BE88 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A1BE8C: -/* 014EC 80A1BE8C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 014F0 80A1BE90 03E00008 */ jr $ra -/* 014F4 80A1BE94 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BE98.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BE98.s deleted file mode 100644 index 6501f39b4f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BE98.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_80A1BE98 -/* 014F8 80A1BE98 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 014FC 80A1BE9C AFA40018 */ sw $a0, 0x0018($sp) -/* 01500 80A1BEA0 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 01504 80A1BEA4 3C0580A2 */ lui $a1, %hi(D_80A1D004) ## $a1 = 80A20000 -/* 01508 80A1BEA8 3C0480A2 */ lui $a0, %hi(func_80A1B524) ## $a0 = 80A20000 -/* 0150C 80A1BEAC 3C0280A2 */ lui $v0, %hi(D_80A1CFF0) ## $v0 = 80A20000 -/* 01510 80A1BEB0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01514 80A1BEB4 2442CFF0 */ addiu $v0, $v0, %lo(D_80A1CFF0) ## $v0 = 80A1CFF0 -/* 01518 80A1BEB8 2484B524 */ addiu $a0, $a0, %lo(func_80A1B524) ## $a0 = 80A1B524 -/* 0151C 80A1BEBC 24A5D004 */ addiu $a1, $a1, %lo(D_80A1D004) ## $a1 = 80A1D004 -/* 01520 80A1BEC0 8C430004 */ lw $v1, 0x0004($v0) ## 80A1CFF4 -.L80A1BEC4: -/* 01524 80A1BEC4 24420004 */ addiu $v0, $v0, 0x0004 ## $v0 = 80A1CFF4 -/* 01528 80A1BEC8 5060000E */ beql $v1, $zero, .L80A1BF04 -/* 0152C 80A1BECC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01530 80A1BED0 8C6E0354 */ lw $t6, 0x0354($v1) ## 00000354 -/* 01534 80A1BED4 548E000B */ bnel $a0, $t6, .L80A1BF04 -/* 01538 80A1BED8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0153C 80A1BEDC 5445FFF9 */ bnel $v0, $a1, .L80A1BEC4 -/* 01540 80A1BEE0 8C430004 */ lw $v1, 0x0004($v0) ## 80A1CFF8 -/* 01544 80A1BEE4 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 01548 80A1BEE8 0C042F56 */ jal func_8010BD58 -/* 0154C 80A1BEEC 24050030 */ addiu $a1, $zero, 0x0030 ## $a1 = 00000030 -/* 01550 80A1BEF0 8FB80018 */ lw $t8, 0x0018($sp) -/* 01554 80A1BEF4 3C0F80A2 */ lui $t7, %hi(func_80A1BF10) ## $t7 = 80A20000 -/* 01558 80A1BEF8 25EFBF10 */ addiu $t7, $t7, %lo(func_80A1BF10) ## $t7 = 80A1BF10 -/* 0155C 80A1BEFC AF0F0354 */ sw $t7, 0x0354($t8) ## 00000354 -/* 01560 80A1BF00 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A1BF04: -/* 01564 80A1BF04 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01568 80A1BF08 03E00008 */ jr $ra -/* 0156C 80A1BF0C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BF10.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BF10.s deleted file mode 100644 index 9cad7647f9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BF10.s +++ /dev/null @@ -1,121 +0,0 @@ -.late_rodata -glabel jtbl_80A1D2A0 -.word L80A1BFAC -.word L80A1C02C -.word L80A1C02C -.word L80A1BF9C -.word L80A1BF6C -.word L80A1BF60 -.word L80A1BF58 -.word L80A1BF78 -.word L80A1BF84 -.word L80A1BF90 -glabel jtbl_80A1D2C8 -.word L80A1BFD0 -.word L80A1BFE4 -.word L80A1BFF8 -.word L80A1C00C -.word L80A1C020 - -.text -glabel func_80A1BF10 -/* 01570 80A1BF10 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01574 80A1BF14 AFBF001C */ sw $ra, 0x001C($sp) -/* 01578 80A1BF18 AFB00018 */ sw $s0, 0x0018($sp) -/* 0157C 80A1BF1C 240E0007 */ addiu $t6, $zero, 0x0007 ## $t6 = 00000007 -/* 01580 80A1BF20 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01584 80A1BF24 A08E0382 */ sb $t6, 0x0382($a0) ## 00000382 -/* 01588 80A1BF28 00A11021 */ addu $v0, $a1, $at -/* 0158C 80A1BF2C 944F04C6 */ lhu $t7, 0x04C6($v0) ## 000004C6 -/* 01590 80A1BF30 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01594 80A1BF34 25F8FFFF */ addiu $t8, $t7, 0xFFFF ## $t8 = FFFFFFFF -/* 01598 80A1BF38 2F01000A */ sltiu $at, $t8, 0x000A -/* 0159C 80A1BF3C 1020003B */ beq $at, $zero, .L80A1C02C -/* 015A0 80A1BF40 0018C080 */ sll $t8, $t8, 2 -/* 015A4 80A1BF44 3C0180A2 */ lui $at, %hi(jtbl_80A1D2A0) ## $at = 80A20000 -/* 015A8 80A1BF48 00380821 */ addu $at, $at, $t8 -/* 015AC 80A1BF4C 8C38D2A0 */ lw $t8, %lo(jtbl_80A1D2A0)($at) -/* 015B0 80A1BF50 03000008 */ jr $t8 -/* 015B4 80A1BF54 00000000 */ nop -glabel L80A1BF58 -/* 015B8 80A1BF58 10000034 */ beq $zero, $zero, .L80A1C02C -/* 015BC 80A1BF5C A2000382 */ sb $zero, 0x0382($s0) ## 00000382 -glabel L80A1BF60 -/* 015C0 80A1BF60 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 015C4 80A1BF64 10000031 */ beq $zero, $zero, .L80A1C02C -/* 015C8 80A1BF68 A2190382 */ sb $t9, 0x0382($s0) ## 00000382 -glabel L80A1BF6C -/* 015CC 80A1BF6C 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 015D0 80A1BF70 1000002E */ beq $zero, $zero, .L80A1C02C -/* 015D4 80A1BF74 A2080382 */ sb $t0, 0x0382($s0) ## 00000382 -glabel L80A1BF78 -/* 015D8 80A1BF78 24090003 */ addiu $t1, $zero, 0x0003 ## $t1 = 00000003 -/* 015DC 80A1BF7C 1000002B */ beq $zero, $zero, .L80A1C02C -/* 015E0 80A1BF80 A2090382 */ sb $t1, 0x0382($s0) ## 00000382 -glabel L80A1BF84 -/* 015E4 80A1BF84 240A0004 */ addiu $t2, $zero, 0x0004 ## $t2 = 00000004 -/* 015E8 80A1BF88 10000028 */ beq $zero, $zero, .L80A1C02C -/* 015EC 80A1BF8C A20A0382 */ sb $t2, 0x0382($s0) ## 00000382 -glabel L80A1BF90 -/* 015F0 80A1BF90 240B0005 */ addiu $t3, $zero, 0x0005 ## $t3 = 00000005 -/* 015F4 80A1BF94 10000025 */ beq $zero, $zero, .L80A1C02C -/* 015F8 80A1BF98 A20B0382 */ sb $t3, 0x0382($s0) ## 00000382 -glabel L80A1BF9C -/* 015FC 80A1BF9C 0C287149 */ jal func_80A1C524 -/* 01600 80A1BFA0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01604 80A1BFA4 10000022 */ beq $zero, $zero, .L80A1C030 -/* 01608 80A1BFA8 920D0382 */ lbu $t5, 0x0382($s0) ## 00000382 -glabel L80A1BFAC -/* 0160C 80A1BFAC 904C04E8 */ lbu $t4, 0x04E8($v0) ## 000004E8 -/* 01610 80A1BFB0 2D810005 */ sltiu $at, $t4, 0x0005 -/* 01614 80A1BFB4 1020001D */ beq $at, $zero, .L80A1C02C -/* 01618 80A1BFB8 000C6080 */ sll $t4, $t4, 2 -/* 0161C 80A1BFBC 3C0180A2 */ lui $at, %hi(jtbl_80A1D2C8) ## $at = 80A20000 -/* 01620 80A1BFC0 002C0821 */ addu $at, $at, $t4 -/* 01624 80A1BFC4 8C2CD2C8 */ lw $t4, %lo(jtbl_80A1D2C8)($at) -/* 01628 80A1BFC8 01800008 */ jr $t4 -/* 0162C 80A1BFCC 00000000 */ nop -glabel L80A1BFD0 -/* 01630 80A1BFD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01634 80A1BFD4 0C286F05 */ jal func_80A1BC14 -/* 01638 80A1BFD8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0163C 80A1BFDC 10000014 */ beq $zero, $zero, .L80A1C030 -/* 01640 80A1BFE0 920D0382 */ lbu $t5, 0x0382($s0) ## 00000382 -glabel L80A1BFE4 -/* 01644 80A1BFE4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01648 80A1BFE8 0C286F05 */ jal func_80A1BC14 -/* 0164C 80A1BFEC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01650 80A1BFF0 1000000F */ beq $zero, $zero, .L80A1C030 -/* 01654 80A1BFF4 920D0382 */ lbu $t5, 0x0382($s0) ## 00000382 -glabel L80A1BFF8 -/* 01658 80A1BFF8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0165C 80A1BFFC 0C286F05 */ jal func_80A1BC14 -/* 01660 80A1C000 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 01664 80A1C004 1000000A */ beq $zero, $zero, .L80A1C030 -/* 01668 80A1C008 920D0382 */ lbu $t5, 0x0382($s0) ## 00000382 -glabel L80A1C00C -/* 0166C 80A1C00C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01670 80A1C010 0C286F05 */ jal func_80A1BC14 -/* 01674 80A1C014 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 01678 80A1C018 10000005 */ beq $zero, $zero, .L80A1C030 -/* 0167C 80A1C01C 920D0382 */ lbu $t5, 0x0382($s0) ## 00000382 -glabel L80A1C020 -/* 01680 80A1C020 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01684 80A1C024 0C286F05 */ jal func_80A1BC14 -/* 01688 80A1C028 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -glabel L80A1C02C -.L80A1C02C: -/* 0168C 80A1C02C 920D0382 */ lbu $t5, 0x0382($s0) ## 00000382 -.L80A1C030: -/* 01690 80A1C030 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 01694 80A1C034 3C0E80A2 */ lui $t6, %hi(func_80A1C05C) ## $t6 = 80A20000 -/* 01698 80A1C038 11A10003 */ beq $t5, $at, .L80A1C048 -/* 0169C 80A1C03C 25CEC05C */ addiu $t6, $t6, %lo(func_80A1C05C) ## $t6 = 80A1C05C -/* 016A0 80A1C040 AE00036C */ sw $zero, 0x036C($s0) ## 0000036C -/* 016A4 80A1C044 AE0E0354 */ sw $t6, 0x0354($s0) ## 00000354 -.L80A1C048: -/* 016A8 80A1C048 8FBF001C */ lw $ra, 0x001C($sp) -/* 016AC 80A1C04C 8FB00018 */ lw $s0, 0x0018($sp) -/* 016B0 80A1C050 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 016B4 80A1C054 03E00008 */ jr $ra -/* 016B8 80A1C058 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C05C.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C05C.s deleted file mode 100644 index 796cdd37ac..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C05C.s +++ /dev/null @@ -1,84 +0,0 @@ -glabel func_80A1C05C -/* 016BC 80A1C05C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 016C0 80A1C060 AFBF0014 */ sw $ra, 0x0014($sp) -/* 016C4 80A1C064 8C82036C */ lw $v0, 0x036C($a0) ## 0000036C -/* 016C8 80A1C068 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 016CC 80A1C06C 28410030 */ slti $at, $v0, 0x0030 -/* 016D0 80A1C070 1020000A */ beq $at, $zero, .L80A1C09C -/* 016D4 80A1C074 304E0003 */ andi $t6, $v0, 0x0003 ## $t6 = 00000000 -/* 016D8 80A1C078 15C00040 */ bne $t6, $zero, .L80A1C17C -/* 016DC 80A1C07C 00027883 */ sra $t7, $v0, 2 -/* 016E0 80A1C080 31F80007 */ andi $t8, $t7, 0x0007 ## $t8 = 00000000 -/* 016E4 80A1C084 3C0580A2 */ lui $a1, %hi(D_80A1D0EC) ## $a1 = 80A20000 -/* 016E8 80A1C088 00B82821 */ addu $a1, $a1, $t8 -/* 016EC 80A1C08C 0C286F05 */ jal func_80A1BC14 -/* 016F0 80A1C090 90A5D0EC */ lbu $a1, %lo(D_80A1D0EC)($a1) -/* 016F4 80A1C094 1000003A */ beq $zero, $zero, .L80A1C180 -/* 016F8 80A1C098 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A1C09C: -/* 016FC 80A1C09C 90E20382 */ lbu $v0, 0x0382($a3) ## 00000382 -/* 01700 80A1C0A0 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 01704 80A1C0A4 3C0980A2 */ lui $t1, %hi(D_80A1D008) ## $t1 = 80A20000 -/* 01708 80A1C0A8 14410008 */ bne $v0, $at, .L80A1C0CC -/* 0170C 80A1C0AC 00024040 */ sll $t0, $v0, 1 -/* 01710 80A1C0B0 241940AA */ addiu $t9, $zero, 0x40AA ## $t9 = 000040AA -/* 01714 80A1C0B4 A4F9010E */ sh $t9, 0x010E($a3) ## 0000010E -/* 01718 80A1C0B8 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 0171C 80A1C0BC 0C2871C6 */ jal func_80A1C718 -/* 01720 80A1C0C0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01724 80A1C0C4 1000002E */ beq $zero, $zero, .L80A1C180 -/* 01728 80A1C0C8 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A1C0CC: -/* 0172C 80A1C0CC 01284821 */ addu $t1, $t1, $t0 -/* 01730 80A1C0D0 3C0A8016 */ lui $t2, %hi(gSaveContext+0xeee) -/* 01734 80A1C0D4 954AF54E */ lhu $t2, %lo(gSaveContext+0xeee)($t2) -/* 01738 80A1C0D8 9529D008 */ lhu $t1, %lo(D_80A1D008)($t1) -/* 0173C 80A1C0DC 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 01740 80A1C0E0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01744 80A1C0E4 012A5824 */ and $t3, $t1, $t2 -/* 01748 80A1C0E8 15600022 */ bne $t3, $zero, .L80A1C174 -/* 0174C 80A1C0EC 240940A9 */ addiu $t1, $zero, 0x40A9 ## $t1 = 000040A9 -/* 01750 80A1C0F0 00026080 */ sll $t4, $v0, 2 -/* 01754 80A1C0F4 3C0D80A2 */ lui $t5, %hi(D_80A1D020) ## $t5 = 80A20000 -/* 01758 80A1C0F8 01AC6821 */ addu $t5, $t5, $t4 -/* 0175C 80A1C0FC 8DADD020 */ lw $t5, %lo(D_80A1D020)($t5) -/* 01760 80A1C100 3C0680A2 */ lui $a2, %hi(D_80A1CFF4) ## $a2 = 80A20000 -/* 01764 80A1C104 24044802 */ addiu $a0, $zero, 0x4802 ## $a0 = 00004802 -/* 01768 80A1C108 000D7080 */ sll $t6, $t5, 2 -/* 0176C 80A1C10C 00CE3021 */ addu $a2, $a2, $t6 -/* 01770 80A1C110 8CC6CFF4 */ lw $a2, %lo(D_80A1CFF4)($a2) -/* 01774 80A1C114 AFA70020 */ sw $a3, 0x0020($sp) -/* 01778 80A1C118 0C01E221 */ jal func_80078884 -/* 0177C 80A1C11C AFA6001C */ sw $a2, 0x001C($sp) -/* 01780 80A1C120 8FA6001C */ lw $a2, 0x001C($sp) -/* 01784 80A1C124 3C0F80A2 */ lui $t7, %hi(func_80A1B524) ## $t7 = 80A20000 -/* 01788 80A1C128 25EFB524 */ addiu $t7, $t7, %lo(func_80A1B524) ## $t7 = 80A1B524 -/* 0178C 80A1C12C 8CD80354 */ lw $t8, 0x0354($a2) ## 00000354 -/* 01790 80A1C130 8FA70020 */ lw $a3, 0x0020($sp) -/* 01794 80A1C134 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 01798 80A1C138 15F8000C */ bne $t7, $t8, .L80A1C16C -/* 0179C 80A1C13C 24080030 */ addiu $t0, $zero, 0x0030 ## $t0 = 00000030 -/* 017A0 80A1C140 A0C20379 */ sb $v0, 0x0379($a2) ## 00000379 -/* 017A4 80A1C144 A0C2037D */ sb $v0, 0x037D($a2) ## 0000037D -/* 017A8 80A1C148 AFA70020 */ sw $a3, 0x0020($sp) -/* 017AC 80A1C14C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 017B0 80A1C150 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 017B4 80A1C154 240528CC */ addiu $a1, $zero, 0x28CC ## $a1 = 000028CC -/* 017B8 80A1C158 8FA70020 */ lw $a3, 0x0020($sp) -/* 017BC 80A1C15C 3C1980A2 */ lui $t9, %hi(func_80A1C18C) ## $t9 = 80A20000 -/* 017C0 80A1C160 2739C18C */ addiu $t9, $t9, %lo(func_80A1C18C) ## $t9 = 80A1C18C -/* 017C4 80A1C164 10000005 */ beq $zero, $zero, .L80A1C17C -/* 017C8 80A1C168 ACF90354 */ sw $t9, 0x0354($a3) ## 00000354 -.L80A1C16C: -/* 017CC 80A1C16C 10000003 */ beq $zero, $zero, .L80A1C17C -/* 017D0 80A1C170 ACE8036C */ sw $t0, 0x036C($a3) ## 0000036C -.L80A1C174: -/* 017D4 80A1C174 0C2871C6 */ jal func_80A1C718 -/* 017D8 80A1C178 A4E9010E */ sh $t1, 0x010E($a3) ## 0000010E -.L80A1C17C: -/* 017DC 80A1C17C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A1C180: -/* 017E0 80A1C180 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 017E4 80A1C184 03E00008 */ jr $ra -/* 017E8 80A1C188 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C18C.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C18C.s deleted file mode 100644 index c5fc11350b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C18C.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80A1C18C -/* 017EC 80A1C18C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 017F0 80A1C190 AFBF0014 */ sw $ra, 0x0014($sp) -/* 017F4 80A1C194 908E0382 */ lbu $t6, 0x0382($a0) ## 00000382 -/* 017F8 80A1C198 3C1880A2 */ lui $t8, %hi(D_80A1D020) ## $t8 = 80A20000 -/* 017FC 80A1C19C 3C0280A2 */ lui $v0, %hi(D_80A1CFF4) ## $v0 = 80A20000 -/* 01800 80A1C1A0 000E7880 */ sll $t7, $t6, 2 -/* 01804 80A1C1A4 030FC021 */ addu $t8, $t8, $t7 -/* 01808 80A1C1A8 8F18D020 */ lw $t8, %lo(D_80A1D020)($t8) -/* 0180C 80A1C1AC 240940A9 */ addiu $t1, $zero, 0x40A9 ## $t1 = 000040A9 -/* 01810 80A1C1B0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01814 80A1C1B4 0018C880 */ sll $t9, $t8, 2 -/* 01818 80A1C1B8 00591021 */ addu $v0, $v0, $t9 -/* 0181C 80A1C1BC 8C42CFF4 */ lw $v0, %lo(D_80A1CFF4)($v0) -/* 01820 80A1C1C0 9048037D */ lbu $t0, 0x037D($v0) ## 80A2037D -/* 01824 80A1C1C4 55000004 */ bnel $t0, $zero, .L80A1C1D8 -/* 01828 80A1C1C8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0182C 80A1C1CC 0C2871C6 */ jal func_80A1C718 -/* 01830 80A1C1D0 A489010E */ sh $t1, 0x010E($a0) ## 0000010E -/* 01834 80A1C1D4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A1C1D8: -/* 01838 80A1C1D8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0183C 80A1C1DC 03E00008 */ jr $ra -/* 01840 80A1C1E0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C1E4.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C1E4.s deleted file mode 100644 index 57127d1b4e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C1E4.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_80A1C1E4 -/* 01844 80A1C1E4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01848 80A1C1E8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0184C 80A1C1EC AFA40018 */ sw $a0, 0x0018($sp) -/* 01850 80A1C1F0 AFA5001C */ sw $a1, 0x001C($sp) -/* 01854 80A1C1F4 0C042F6F */ jal func_8010BDBC -/* 01858 80A1C1F8 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 0185C 80A1C1FC 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 01860 80A1C200 5441000E */ bnel $v0, $at, .L80A1C23C -/* 01864 80A1C204 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01868 80A1C208 0C041AF2 */ jal func_80106BC8 -/* 0186C 80A1C20C 8FA4001C */ lw $a0, 0x001C($sp) -/* 01870 80A1C210 5040000A */ beql $v0, $zero, .L80A1C23C -/* 01874 80A1C214 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01878 80A1C218 0C041B33 */ jal func_80106CCC -/* 0187C 80A1C21C 8FA4001C */ lw $a0, 0x001C($sp) -/* 01880 80A1C220 8FA20018 */ lw $v0, 0x0018($sp) -/* 01884 80A1C224 3C0F80A2 */ lui $t7, %hi(func_80A1C400) ## $t7 = 80A20000 -/* 01888 80A1C228 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 0188C 80A1C22C 25EFC400 */ addiu $t7, $t7, %lo(func_80A1C400) ## $t7 = 80A1C400 -/* 01890 80A1C230 A44E0386 */ sh $t6, 0x0386($v0) ## 00000386 -/* 01894 80A1C234 AC4F0354 */ sw $t7, 0x0354($v0) ## 00000354 -/* 01898 80A1C238 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A1C23C: -/* 0189C 80A1C23C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 018A0 80A1C240 03E00008 */ jr $ra -/* 018A4 80A1C244 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C248.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C248.s deleted file mode 100644 index 57e44ec9ce..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C248.s +++ /dev/null @@ -1,89 +0,0 @@ -.late_rodata -glabel jtbl_80A1D2DC -.word L80A1C274 -.word L80A1C280 -.word L80A1C288 -.word L80A1C294 -.word L80A1C2A0 - -.text -glabel func_80A1C248 -/* 018A8 80A1C248 27BDFFF8 */ addiu $sp, $sp, 0xFFF8 ## $sp = FFFFFFF8 -/* 018AC 80A1C24C AFA40008 */ sw $a0, 0x0008($sp) -/* 018B0 80A1C250 308400FF */ andi $a0, $a0, 0x00FF ## $a0 = 00000000 -/* 018B4 80A1C254 2C810005 */ sltiu $at, $a0, 0x0005 -/* 018B8 80A1C258 10200013 */ beq $at, $zero, .L80A1C2A8 -/* 018BC 80A1C25C 00047080 */ sll $t6, $a0, 2 -/* 018C0 80A1C260 3C0180A2 */ lui $at, %hi(jtbl_80A1D2DC) ## $at = 80A20000 -/* 018C4 80A1C264 002E0821 */ addu $at, $at, $t6 -/* 018C8 80A1C268 8C2ED2DC */ lw $t6, %lo(jtbl_80A1D2DC)($at) -/* 018CC 80A1C26C 01C00008 */ jr $t6 -/* 018D0 80A1C270 00000000 */ nop -glabel L80A1C274 -/* 018D4 80A1C274 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 018D8 80A1C278 1000000B */ beq $zero, $zero, .L80A1C2A8 -/* 018DC 80A1C27C AFA20000 */ sw $v0, 0x0000($sp) -glabel L80A1C280 -/* 018E0 80A1C280 10000009 */ beq $zero, $zero, .L80A1C2A8 -/* 018E4 80A1C284 AFA00000 */ sw $zero, 0x0000($sp) -glabel L80A1C288 -/* 018E8 80A1C288 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 -/* 018EC 80A1C28C 10000006 */ beq $zero, $zero, .L80A1C2A8 -/* 018F0 80A1C290 AFA20000 */ sw $v0, 0x0000($sp) -glabel L80A1C294 -/* 018F4 80A1C294 24020003 */ addiu $v0, $zero, 0x0003 ## $v0 = 00000003 -/* 018F8 80A1C298 10000003 */ beq $zero, $zero, .L80A1C2A8 -/* 018FC 80A1C29C AFA20000 */ sw $v0, 0x0000($sp) -glabel L80A1C2A0 -/* 01900 80A1C2A0 24020004 */ addiu $v0, $zero, 0x0004 ## $v0 = 00000004 -/* 01904 80A1C2A4 AFA20000 */ sw $v0, 0x0000($sp) -.L80A1C2A8: -/* 01908 80A1C2A8 8FA20000 */ lw $v0, 0x0000($sp) -/* 0190C 80A1C2AC 3C0480A2 */ lui $a0, %hi(D_80A1CFF4) ## $a0 = 80A20000 -/* 01910 80A1C2B0 8C84CFF4 */ lw $a0, %lo(D_80A1CFF4)($a0) -/* 01914 80A1C2B4 14400004 */ bne $v0, $zero, .L80A1C2C8 -/* 01918 80A1C2B8 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 0191C 80A1C2BC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01920 80A1C2C0 10000003 */ beq $zero, $zero, .L80A1C2D0 -/* 01924 80A1C2C4 A08603A8 */ sb $a2, 0x03A8($a0) ## 80A203A8 -.L80A1C2C8: -/* 01928 80A1C2C8 A08003A8 */ sb $zero, 0x03A8($a0) ## 80A203A8 -/* 0192C 80A1C2CC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -.L80A1C2D0: -/* 01930 80A1C2D0 3C1880A2 */ lui $t8, %hi(D_80A1CFF0) ## $t8 = 80A20000 -/* 01934 80A1C2D4 2718CFF0 */ addiu $t8, $t8, %lo(D_80A1CFF0) ## $t8 = 80A1CFF0 -/* 01938 80A1C2D8 00037880 */ sll $t7, $v1, 2 -/* 0193C 80A1C2DC 01F82821 */ addu $a1, $t7, $t8 -/* 01940 80A1C2E0 14620003 */ bne $v1, $v0, .L80A1C2F0 -/* 01944 80A1C2E4 8CA40004 */ lw $a0, 0x0004($a1) ## 00000004 -/* 01948 80A1C2E8 10000002 */ beq $zero, $zero, .L80A1C2F4 -/* 0194C 80A1C2EC A08603A8 */ sb $a2, 0x03A8($a0) ## 80A203A8 -.L80A1C2F0: -/* 01950 80A1C2F0 A08003A8 */ sb $zero, 0x03A8($a0) ## 80A203A8 -.L80A1C2F4: -/* 01954 80A1C2F4 24790001 */ addiu $t9, $v1, 0x0001 ## $t9 = 00000002 -/* 01958 80A1C2F8 17220003 */ bne $t9, $v0, .L80A1C308 -/* 0195C 80A1C2FC 8CA40008 */ lw $a0, 0x0008($a1) ## 00000008 -/* 01960 80A1C300 10000002 */ beq $zero, $zero, .L80A1C30C -/* 01964 80A1C304 A08603A8 */ sb $a2, 0x03A8($a0) ## 80A203A8 -.L80A1C308: -/* 01968 80A1C308 A08003A8 */ sb $zero, 0x03A8($a0) ## 80A203A8 -.L80A1C30C: -/* 0196C 80A1C30C 24680002 */ addiu $t0, $v1, 0x0002 ## $t0 = 00000003 -/* 01970 80A1C310 15020003 */ bne $t0, $v0, .L80A1C320 -/* 01974 80A1C314 8CA4000C */ lw $a0, 0x000C($a1) ## 0000000C -/* 01978 80A1C318 10000002 */ beq $zero, $zero, .L80A1C324 -/* 0197C 80A1C31C A08603A8 */ sb $a2, 0x03A8($a0) ## 80A203A8 -.L80A1C320: -/* 01980 80A1C320 A08003A8 */ sb $zero, 0x03A8($a0) ## 80A203A8 -.L80A1C324: -/* 01984 80A1C324 24690003 */ addiu $t1, $v1, 0x0003 ## $t1 = 00000004 -/* 01988 80A1C328 15220003 */ bne $t1, $v0, .L80A1C338 -/* 0198C 80A1C32C 8CA40010 */ lw $a0, 0x0010($a1) ## 00000010 -/* 01990 80A1C330 10000002 */ beq $zero, $zero, .L80A1C33C -/* 01994 80A1C334 A08603A8 */ sb $a2, 0x03A8($a0) ## 80A203A8 -.L80A1C338: -/* 01998 80A1C338 A08003A8 */ sb $zero, 0x03A8($a0) ## 80A203A8 -.L80A1C33C: -/* 0199C 80A1C33C 03E00008 */ jr $ra -/* 019A0 80A1C340 27BD0008 */ addiu $sp, $sp, 0x0008 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C344.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C344.s deleted file mode 100644 index 8c70fbfe04..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C344.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80A1C344 -/* 019A4 80A1C344 3C0380A2 */ lui $v1, %hi(D_80A1CFF4) ## $v1 = 80A20000 -/* 019A8 80A1C348 8C63CFF4 */ lw $v1, %lo(D_80A1CFF4)($v1) -/* 019AC 80A1C34C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 019B0 80A1C350 3C0F80A2 */ lui $t7, %hi(D_80A1CFF0) ## $t7 = 80A20000 -/* 019B4 80A1C354 25EFCFF0 */ addiu $t7, $t7, %lo(D_80A1CFF0) ## $t7 = 80A1CFF0 -/* 019B8 80A1C358 00027080 */ sll $t6, $v0, 2 -/* 019BC 80A1C35C 01CF2021 */ addu $a0, $t6, $t7 -/* 019C0 80A1C360 A06003A8 */ sb $zero, 0x03A8($v1) ## 80A203A8 -/* 019C4 80A1C364 8C830004 */ lw $v1, 0x0004($a0) ## 00000004 -/* 019C8 80A1C368 A06003A8 */ sb $zero, 0x03A8($v1) ## 80A203A8 -/* 019CC 80A1C36C 8C830008 */ lw $v1, 0x0008($a0) ## 00000008 -/* 019D0 80A1C370 A06003A8 */ sb $zero, 0x03A8($v1) ## 80A203A8 -/* 019D4 80A1C374 8C83000C */ lw $v1, 0x000C($a0) ## 0000000C -/* 019D8 80A1C378 A06003A8 */ sb $zero, 0x03A8($v1) ## 80A203A8 -/* 019DC 80A1C37C 8C830010 */ lw $v1, 0x0010($a0) ## 00000010 -/* 019E0 80A1C380 03E00008 */ jr $ra -/* 019E4 80A1C384 A06003A8 */ sb $zero, 0x03A8($v1) ## 80A203A8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C388.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C388.s deleted file mode 100644 index 210552e6ad..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C388.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80A1C388 -/* 019E8 80A1C388 3C0E8016 */ lui $t6, %hi(gSaveContext+0xeee) -/* 019EC 80A1C38C 95CEF54E */ lhu $t6, %lo(gSaveContext+0xeee)($t6) -/* 019F0 80A1C390 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 019F4 80A1C394 AFA40018 */ sw $a0, 0x0018($sp) -/* 019F8 80A1C398 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 019FC 80A1C39C 308400FF */ andi $a0, $a0, 0x00FF ## $a0 = 00000000 -/* 01A00 80A1C3A0 15E00006 */ bne $t7, $zero, .L80A1C3BC -/* 01A04 80A1C3A4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01A08 80A1C3A8 3C188013 */ lui $t8, %hi(D_80131854) -/* 01A0C 80A1C3AC 8F181854 */ lw $t8, %lo(D_80131854)($t8) -/* 01A10 80A1C3B0 0098C821 */ addu $t9, $a0, $t8 -/* 01A14 80A1C3B4 1000000E */ beq $zero, $zero, .L80A1C3F0 -/* 01A18 80A1C3B8 93220000 */ lbu $v0, 0x0000($t9) ## 00000000 -.L80A1C3BC: -/* 01A1C 80A1C3BC 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 01A20 80A1C3C0 44816000 */ mtc1 $at, $f12 ## $f12 = 60.00 -/* 01A24 80A1C3C4 0C00CFBE */ jal Rand_ZeroFloat - -/* 01A28 80A1C3C8 00000000 */ nop -/* 01A2C 80A1C3CC 4600010D */ trunc.w.s $f4, $f0 -/* 01A30 80A1C3D0 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 01A34 80A1C3D4 3C0280A2 */ lui $v0, %hi(D_80A1D0F4) ## $v0 = 80A20000 -/* 01A38 80A1C3D8 44092000 */ mfc1 $t1, $f4 -/* 01A3C 80A1C3DC 00000000 */ nop -/* 01A40 80A1C3E0 0121001A */ div $zero, $t1, $at -/* 01A44 80A1C3E4 00005010 */ mfhi $t2 -/* 01A48 80A1C3E8 004A1021 */ addu $v0, $v0, $t2 -/* 01A4C 80A1C3EC 9042D0F4 */ lbu $v0, %lo(D_80A1D0F4)($v0) -.L80A1C3F0: -/* 01A50 80A1C3F0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01A54 80A1C3F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01A58 80A1C3F8 03E00008 */ jr $ra -/* 01A5C 80A1C3FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C400.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C400.s deleted file mode 100644 index 4b06cb62e5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C400.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_80A1C400 -/* 01A60 80A1C400 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01A64 80A1C404 AFBF001C */ sw $ra, 0x001C($sp) -/* 01A68 80A1C408 AFB00018 */ sw $s0, 0x0018($sp) -/* 01A6C 80A1C40C 84820386 */ lh $v0, 0x0386($a0) ## 00000386 -/* 01A70 80A1C410 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01A74 80A1C414 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 01A78 80A1C418 10400004 */ beq $v0, $zero, .L80A1C42C -/* 01A7C 80A1C41C 240F0028 */ addiu $t7, $zero, 0x0028 ## $t7 = 00000028 -/* 01A80 80A1C420 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 01A84 80A1C424 1000000E */ beq $zero, $zero, .L80A1C460 -/* 01A88 80A1C428 A48E0386 */ sh $t6, 0x0386($a0) ## 00000386 -.L80A1C42C: -/* 01A8C 80A1C42C A60F0386 */ sh $t7, 0x0386($s0) ## 00000386 -/* 01A90 80A1C430 A2000380 */ sb $zero, 0x0380($s0) ## 00000380 -/* 01A94 80A1C434 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 01A98 80A1C438 0C042F56 */ jal func_8010BD58 -/* 01A9C 80A1C43C 2405002F */ addiu $a1, $zero, 0x002F ## $a1 = 0000002F -/* 01AA0 80A1C440 0C2870E2 */ jal func_80A1C388 -/* 01AA4 80A1C444 92040380 */ lbu $a0, 0x0380($s0) ## 00000380 -/* 01AA8 80A1C448 A2020381 */ sb $v0, 0x0381($s0) ## 00000381 -/* 01AAC 80A1C44C 0C287092 */ jal func_80A1C248 -/* 01AB0 80A1C450 304400FF */ andi $a0, $v0, 0x00FF ## $a0 = 00000000 -/* 01AB4 80A1C454 3C1880A2 */ lui $t8, %hi(func_80A1C580) ## $t8 = 80A20000 -/* 01AB8 80A1C458 2718C580 */ addiu $t8, $t8, %lo(func_80A1C580) ## $t8 = 80A1C580 -/* 01ABC 80A1C45C AE180354 */ sw $t8, 0x0354($s0) ## 00000354 -.L80A1C460: -/* 01AC0 80A1C460 8FBF001C */ lw $ra, 0x001C($sp) -/* 01AC4 80A1C464 8FB00018 */ lw $s0, 0x0018($sp) -/* 01AC8 80A1C468 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01ACC 80A1C46C 03E00008 */ jr $ra -/* 01AD0 80A1C470 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C474.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C474.s deleted file mode 100644 index bf45f65cdd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C474.s +++ /dev/null @@ -1,48 +0,0 @@ -glabel func_80A1C474 -/* 01AD4 80A1C474 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01AD8 80A1C478 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01ADC 80A1C47C 3C0F0001 */ lui $t7, 0x0001 ## $t7 = 00010000 -/* 01AE0 80A1C480 01E57821 */ addu $t7, $t7, $a1 -/* 01AE4 80A1C484 91EF04E8 */ lbu $t7, 0x04E8($t7) ## 000104E8 -/* 01AE8 80A1C488 908E0381 */ lbu $t6, 0x0381($a0) ## 00000381 -/* 01AEC 80A1C48C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 01AF0 80A1C490 55CF0020 */ bnel $t6, $t7, .L80A1C514 -/* 01AF4 80A1C494 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 01AF8 80A1C498 90980380 */ lbu $t8, 0x0380($a0) ## 00000380 -/* 01AFC 80A1C49C 2408000D */ addiu $t0, $zero, 0x000D ## $t0 = 0000000D -/* 01B00 80A1C4A0 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 01B04 80A1C4A4 A0990380 */ sb $t9, 0x0380($a0) ## 00000380 -/* 01B08 80A1C4A8 332400FF */ andi $a0, $t9, 0x00FF ## $a0 = 00000001 -/* 01B0C 80A1C4AC 2881000E */ slti $at, $a0, 0x000E -/* 01B10 80A1C4B0 14200004 */ bne $at, $zero, .L80A1C4C4 -/* 01B14 80A1C4B4 00801025 */ or $v0, $a0, $zero ## $v0 = 00000001 -/* 01B18 80A1C4B8 A0C80380 */ sb $t0, 0x0380($a2) ## 00000380 -/* 01B1C 80A1C4BC 10000015 */ beq $zero, $zero, .L80A1C514 -/* 01B20 80A1C4C0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A1C4C4: -/* 01B24 80A1C4C4 28410004 */ slti $at, $v0, 0x0004 -/* 01B28 80A1C4C8 10200003 */ beq $at, $zero, .L80A1C4D8 -/* 01B2C 80A1C4CC 24030004 */ addiu $v1, $zero, 0x0004 ## $v1 = 00000004 -/* 01B30 80A1C4D0 10000001 */ beq $zero, $zero, .L80A1C4D8 -/* 01B34 80A1C4D4 304300FF */ andi $v1, $v0, 0x00FF ## $v1 = 00000001 -.L80A1C4D8: -/* 01B38 80A1C4D8 A3A3001F */ sb $v1, 0x001F($sp) -/* 01B3C 80A1C4DC 0C2870E2 */ jal func_80A1C388 -/* 01B40 80A1C4E0 AFA60020 */ sw $a2, 0x0020($sp) -/* 01B44 80A1C4E4 8FA60020 */ lw $a2, 0x0020($sp) -/* 01B48 80A1C4E8 304400FF */ andi $a0, $v0, 0x00FF ## $a0 = 00000000 -/* 01B4C 80A1C4EC 0C287092 */ jal func_80A1C248 -/* 01B50 80A1C4F0 A0C20381 */ sb $v0, 0x0381($a2) ## 00000381 -/* 01B54 80A1C4F4 93A3001F */ lbu $v1, 0x001F($sp) -/* 01B58 80A1C4F8 3C0A80A2 */ lui $t2, %hi(D_80A1D0B0) ## $t2 = 80A20000 -/* 01B5C 80A1C4FC 8FA60020 */ lw $a2, 0x0020($sp) -/* 01B60 80A1C500 00034840 */ sll $t1, $v1, 1 -/* 01B64 80A1C504 01495021 */ addu $t2, $t2, $t1 -/* 01B68 80A1C508 854AD0B0 */ lh $t2, %lo(D_80A1D0B0)($t2) -/* 01B6C 80A1C50C A4CA0386 */ sh $t2, 0x0386($a2) ## 00000386 -/* 01B70 80A1C510 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A1C514: -/* 01B74 80A1C514 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01B78 80A1C518 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01B7C 80A1C51C 03E00008 */ jr $ra -/* 01B80 80A1C520 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C524.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C524.s deleted file mode 100644 index f1c470ad57..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C524.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80A1C524 -/* 01B84 80A1C524 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01B88 80A1C528 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01B8C 80A1C52C AFA40018 */ sw $a0, 0x0018($sp) -/* 01B90 80A1C530 0C041B33 */ jal func_80106CCC -/* 01B94 80A1C534 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01B98 80A1C538 8FAE0018 */ lw $t6, 0x0018($sp) -/* 01B9C 80A1C53C 24044827 */ addiu $a0, $zero, 0x4827 ## $a0 = 00004827 -/* 01BA0 80A1C540 0C01E221 */ jal func_80078884 -/* 01BA4 80A1C544 ADC00388 */ sw $zero, 0x0388($t6) ## 00000388 -/* 01BA8 80A1C548 0C03B616 */ jal func_800ED858 -/* 01BAC 80A1C54C 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 -/* 01BB0 80A1C550 240F000C */ addiu $t7, $zero, 0x000C ## $t7 = 0000000C -/* 01BB4 80A1C554 3C0180A2 */ lui $at, %hi(D_80A1CFF0) ## $at = 80A20000 -/* 01BB8 80A1C558 0C2870D1 */ jal func_80A1C344 -/* 01BBC 80A1C55C A02FCFF0 */ sb $t7, %lo(D_80A1CFF0)($at) -/* 01BC0 80A1C560 8FB90018 */ lw $t9, 0x0018($sp) -/* 01BC4 80A1C564 3C1880A2 */ lui $t8, %hi(func_80A1C944) ## $t8 = 80A20000 -/* 01BC8 80A1C568 2718C944 */ addiu $t8, $t8, %lo(func_80A1C944) ## $t8 = 80A1C944 -/* 01BCC 80A1C56C AF380354 */ sw $t8, 0x0354($t9) ## 00000354 -/* 01BD0 80A1C570 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01BD4 80A1C574 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01BD8 80A1C578 03E00008 */ jr $ra -/* 01BDC 80A1C57C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C580.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C580.s deleted file mode 100644 index bf0ec01c37..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C580.s +++ /dev/null @@ -1,126 +0,0 @@ -.late_rodata -glabel jtbl_80A1D2F0 -.word L80A1C680 -.word L80A1C694 -.word L80A1C6A8 -.word L80A1C6BC -.word L80A1C6D0 - -.text -glabel func_80A1C580 -/* 01BE0 80A1C580 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01BE4 80A1C584 AFBF001C */ sw $ra, 0x001C($sp) -/* 01BE8 80A1C588 AFB00018 */ sw $s0, 0x0018($sp) -/* 01BEC 80A1C58C AFA50024 */ sw $a1, 0x0024($sp) -/* 01BF0 80A1C590 84820386 */ lh $v0, 0x0386($a0) ## 00000386 -/* 01BF4 80A1C594 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01BF8 80A1C598 3C0380A2 */ lui $v1, %hi(D_80A1CFF0) ## $v1 = 80A20000 -/* 01BFC 80A1C59C 14400005 */ bne $v0, $zero, .L80A1C5B4 -/* 01C00 80A1C5A0 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 01C04 80A1C5A4 0C287149 */ jal func_80A1C524 -/* 01C08 80A1C5A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01C0C 80A1C5AC 10000056 */ beq $zero, $zero, .L80A1C708 -/* 01C10 80A1C5B0 8FBF001C */ lw $ra, 0x001C($sp) -.L80A1C5B4: -/* 01C14 80A1C5B4 A60E0386 */ sh $t6, 0x0386($s0) ## 00000386 -/* 01C18 80A1C5B8 8FA70024 */ lw $a3, 0x0024($sp) -/* 01C1C 80A1C5BC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01C20 80A1C5C0 3C0680A2 */ lui $a2, %hi(D_80A1D004) ## $a2 = 80A20000 -/* 01C24 80A1C5C4 00E13821 */ addu $a3, $a3, $at -/* 01C28 80A1C5C8 90E803DC */ lbu $t0, 0x03DC($a3) ## 000003DC -/* 01C2C 80A1C5CC 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 01C30 80A1C5D0 24C6D004 */ addiu $a2, $a2, %lo(D_80A1D004) ## $a2 = 80A1D004 -/* 01C34 80A1C5D4 1501001A */ bne $t0, $at, .L80A1C640 -/* 01C38 80A1C5D8 2463CFF0 */ addiu $v1, $v1, %lo(D_80A1CFF0) ## $v1 = FFFFCFF0 -/* 01C3C 80A1C5DC 3C0580A2 */ lui $a1, %hi(func_80A1B524) ## $a1 = 80A20000 -/* 01C40 80A1C5E0 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 -/* 01C44 80A1C5E4 24A5B524 */ addiu $a1, $a1, %lo(func_80A1B524) ## $a1 = 80A1B524 -/* 01C48 80A1C5E8 8C620004 */ lw $v0, 0x0004($v1) ## FFFFCFF4 -.L80A1C5EC: -/* 01C4C 80A1C5EC 24630004 */ addiu $v1, $v1, 0x0004 ## $v1 = FFFFCFF4 -/* 01C50 80A1C5F0 50400005 */ beql $v0, $zero, .L80A1C608 -/* 01C54 80A1C5F4 24840001 */ addiu $a0, $a0, 0x0001 ## $a0 = 00000001 -/* 01C58 80A1C5F8 8C4F0354 */ lw $t7, 0x0354($v0) ## 00000354 -/* 01C5C 80A1C5FC 10AF0002 */ beq $a1, $t7, .L80A1C608 -/* 01C60 80A1C600 00000000 */ nop -/* 01C64 80A1C604 24840001 */ addiu $a0, $a0, 0x0001 ## $a0 = 00000002 -.L80A1C608: -/* 01C68 80A1C608 5466FFF8 */ bnel $v1, $a2, .L80A1C5EC -/* 01C6C 80A1C60C 8C620004 */ lw $v0, 0x0004($v1) ## FFFFCFF8 -/* 01C70 80A1C610 1480000B */ bne $a0, $zero, .L80A1C640 -/* 01C74 80A1C614 8FB80024 */ lw $t8, 0x0024($sp) -/* 01C78 80A1C618 97190020 */ lhu $t9, 0x0020($t8) ## 00000020 -/* 01C7C 80A1C61C 2401BFFF */ addiu $at, $zero, 0xBFFF ## $at = FFFFBFFF -/* 01C80 80A1C620 03214827 */ nor $t1, $t9, $at -/* 01C84 80A1C624 55200007 */ bnel $t1, $zero, .L80A1C644 -/* 01C88 80A1C628 24010033 */ addiu $at, $zero, 0x0033 ## $at = 00000033 -/* 01C8C 80A1C62C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01C90 80A1C630 0C287149 */ jal func_80A1C524 -/* 01C94 80A1C634 03002825 */ or $a1, $t8, $zero ## $a1 = 00000000 -/* 01C98 80A1C638 10000033 */ beq $zero, $zero, .L80A1C708 -/* 01C9C 80A1C63C 8FBF001C */ lw $ra, 0x001C($sp) -.L80A1C640: -/* 01CA0 80A1C640 24010033 */ addiu $at, $zero, 0x0033 ## $at = 00000033 -.L80A1C644: -/* 01CA4 80A1C644 1501002F */ bne $t0, $at, .L80A1C704 -/* 01CA8 80A1C648 8FAB0024 */ lw $t3, 0x0024($sp) -/* 01CAC 80A1C64C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01CB0 80A1C650 002B0821 */ addu $at, $at, $t3 -/* 01CB4 80A1C654 240A0031 */ addiu $t2, $zero, 0x0031 ## $t2 = 00000031 -/* 01CB8 80A1C658 A02A03DC */ sb $t2, 0x03DC($at) ## 000103DC -/* 01CBC 80A1C65C 90EC04E8 */ lbu $t4, 0x04E8($a3) ## 000004E8 -/* 01CC0 80A1C660 2D810005 */ sltiu $at, $t4, 0x0005 -/* 01CC4 80A1C664 1020001D */ beq $at, $zero, .L80A1C6DC -/* 01CC8 80A1C668 000C6080 */ sll $t4, $t4, 2 -/* 01CCC 80A1C66C 3C0180A2 */ lui $at, %hi(jtbl_80A1D2F0) ## $at = 80A20000 -/* 01CD0 80A1C670 002C0821 */ addu $at, $at, $t4 -/* 01CD4 80A1C674 8C2CD2F0 */ lw $t4, %lo(jtbl_80A1D2F0)($at) -/* 01CD8 80A1C678 01800008 */ jr $t4 -/* 01CDC 80A1C67C 00000000 */ nop -glabel L80A1C680 -/* 01CE0 80A1C680 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01CE4 80A1C684 0C286F05 */ jal func_80A1BC14 -/* 01CE8 80A1C688 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 01CEC 80A1C68C 10000014 */ beq $zero, $zero, .L80A1C6E0 -/* 01CF0 80A1C690 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -glabel L80A1C694 -/* 01CF4 80A1C694 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01CF8 80A1C698 0C286F05 */ jal func_80A1BC14 -/* 01CFC 80A1C69C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01D00 80A1C6A0 1000000F */ beq $zero, $zero, .L80A1C6E0 -/* 01D04 80A1C6A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -glabel L80A1C6A8 -/* 01D08 80A1C6A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01D0C 80A1C6AC 0C286F05 */ jal func_80A1BC14 -/* 01D10 80A1C6B0 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 01D14 80A1C6B4 1000000A */ beq $zero, $zero, .L80A1C6E0 -/* 01D18 80A1C6B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -glabel L80A1C6BC -/* 01D1C 80A1C6BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01D20 80A1C6C0 0C286F05 */ jal func_80A1BC14 -/* 01D24 80A1C6C4 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 01D28 80A1C6C8 10000005 */ beq $zero, $zero, .L80A1C6E0 -/* 01D2C 80A1C6CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -glabel L80A1C6D0 -/* 01D30 80A1C6D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01D34 80A1C6D4 0C286F05 */ jal func_80A1BC14 -/* 01D38 80A1C6D8 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -.L80A1C6DC: -/* 01D3C 80A1C6DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A1C6E0: -/* 01D40 80A1C6E0 0C28711D */ jal func_80A1C474 -/* 01D44 80A1C6E4 8FA50024 */ lw $a1, 0x0024($sp) -/* 01D48 80A1C6E8 10400006 */ beq $v0, $zero, .L80A1C704 -/* 01D4C 80A1C6EC 240D40AC */ addiu $t5, $zero, 0x40AC ## $t5 = 000040AC -/* 01D50 80A1C6F0 A60D010E */ sh $t5, 0x010E($s0) ## 0000010E -/* 01D54 80A1C6F4 8FA50024 */ lw $a1, 0x0024($sp) -/* 01D58 80A1C6F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01D5C 80A1C6FC 0C2871C6 */ jal func_80A1C718 -/* 01D60 80A1C700 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -.L80A1C704: -/* 01D64 80A1C704 8FBF001C */ lw $ra, 0x001C($sp) -.L80A1C708: -/* 01D68 80A1C708 8FB00018 */ lw $s0, 0x0018($sp) -/* 01D6C 80A1C70C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01D70 80A1C710 03E00008 */ jr $ra -/* 01D74 80A1C714 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C718.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C718.s deleted file mode 100644 index cdf8b717be..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C718.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_80A1C718 -/* 01D78 80A1C718 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01D7C 80A1C71C AFBF0014 */ sw $ra, 0x0014($sp) -/* 01D80 80A1C720 AFA40018 */ sw $a0, 0x0018($sp) -/* 01D84 80A1C724 AFA5001C */ sw $a1, 0x001C($sp) -/* 01D88 80A1C728 0C2870D1 */ jal func_80A1C344 -/* 01D8C 80A1C72C AFA60020 */ sw $a2, 0x0020($sp) -/* 01D90 80A1C730 93AE0023 */ lbu $t6, 0x0023($sp) -/* 01D94 80A1C734 11C00005 */ beq $t6, $zero, .L80A1C74C -/* 01D98 80A1C738 00000000 */ nop -/* 01D9C 80A1C73C 0C01E221 */ jal func_80078884 -/* 01DA0 80A1C740 24044807 */ addiu $a0, $zero, 0x4807 ## $a0 = 00004807 -/* 01DA4 80A1C744 10000003 */ beq $zero, $zero, .L80A1C754 -/* 01DA8 80A1C748 00000000 */ nop -.L80A1C74C: -/* 01DAC 80A1C74C 0C01E221 */ jal func_80078884 -/* 01DB0 80A1C750 24044802 */ addiu $a0, $zero, 0x4802 ## $a0 = 00004802 -.L80A1C754: -/* 01DB4 80A1C754 0C03B616 */ jal func_800ED858 -/* 01DB8 80A1C758 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 -/* 01DBC 80A1C75C 8FB8001C */ lw $t8, 0x001C($sp) -/* 01DC0 80A1C760 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01DC4 80A1C764 240F0037 */ addiu $t7, $zero, 0x0037 ## $t7 = 00000037 -/* 01DC8 80A1C768 00380821 */ addu $at, $at, $t8 -/* 01DCC 80A1C76C A02F03DC */ sb $t7, 0x03DC($at) ## 000103DC -/* 01DD0 80A1C770 8FA80018 */ lw $t0, 0x0018($sp) -/* 01DD4 80A1C774 3C1980A2 */ lui $t9, %hi(func_80A1C790) ## $t9 = 80A20000 -/* 01DD8 80A1C778 2739C790 */ addiu $t9, $t9, %lo(func_80A1C790) ## $t9 = 80A1C790 -/* 01DDC 80A1C77C AD190354 */ sw $t9, 0x0354($t0) ## 00000354 -/* 01DE0 80A1C780 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01DE4 80A1C784 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01DE8 80A1C788 03E00008 */ jr $ra -/* 01DEC 80A1C78C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C790.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C790.s deleted file mode 100644 index 9d0ac04e1a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C790.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80A1C790 -/* 01DF0 80A1C790 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01DF4 80A1C794 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 01DF8 80A1C798 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01DFC 80A1C79C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01E00 80A1C7A0 94C5010E */ lhu $a1, 0x010E($a2) ## 0000010E -/* 01E04 80A1C7A4 0C042DA0 */ jal func_8010B680 -/* 01E08 80A1C7A8 AFA60018 */ sw $a2, 0x0018($sp) -/* 01E0C 80A1C7AC 8FA60018 */ lw $a2, 0x0018($sp) -/* 01E10 80A1C7B0 3C0E80A2 */ lui $t6, %hi(func_80A1C7CC) ## $t6 = 80A20000 -/* 01E14 80A1C7B4 25CEC7CC */ addiu $t6, $t6, %lo(func_80A1C7CC) ## $t6 = 80A1C7CC -/* 01E18 80A1C7B8 ACCE0354 */ sw $t6, 0x0354($a2) ## 00000354 -/* 01E1C 80A1C7BC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01E20 80A1C7C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01E24 80A1C7C4 03E00008 */ jr $ra -/* 01E28 80A1C7C8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C7CC.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C7CC.s deleted file mode 100644 index b723797e80..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C7CC.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_80A1C7CC -/* 01E2C 80A1C7CC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01E30 80A1C7D0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01E34 80A1C7D4 AFA40018 */ sw $a0, 0x0018($sp) -/* 01E38 80A1C7D8 AFA5001C */ sw $a1, 0x001C($sp) -/* 01E3C 80A1C7DC 0C042F6F */ jal func_8010BDBC -/* 01E40 80A1C7E0 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 01E44 80A1C7E4 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 01E48 80A1C7E8 5441000E */ bnel $v0, $at, .L80A1C824 -/* 01E4C 80A1C7EC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01E50 80A1C7F0 0C041AF2 */ jal func_80106BC8 -/* 01E54 80A1C7F4 8FA4001C */ lw $a0, 0x001C($sp) -/* 01E58 80A1C7F8 10400009 */ beq $v0, $zero, .L80A1C820 -/* 01E5C 80A1C7FC 8FAF0018 */ lw $t7, 0x0018($sp) -/* 01E60 80A1C800 240E0064 */ addiu $t6, $zero, 0x0064 ## $t6 = 00000064 -/* 01E64 80A1C804 A5EE0386 */ sh $t6, 0x0386($t7) ## 00000386 -/* 01E68 80A1C808 0C041B33 */ jal func_80106CCC -/* 01E6C 80A1C80C 8FA4001C */ lw $a0, 0x001C($sp) -/* 01E70 80A1C810 8FB90018 */ lw $t9, 0x0018($sp) -/* 01E74 80A1C814 3C1880A2 */ lui $t8, %hi(func_80A1C830) ## $t8 = 80A20000 -/* 01E78 80A1C818 2718C830 */ addiu $t8, $t8, %lo(func_80A1C830) ## $t8 = 80A1C830 -/* 01E7C 80A1C81C AF380354 */ sw $t8, 0x0354($t9) ## 00000354 -.L80A1C820: -/* 01E80 80A1C820 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A1C824: -/* 01E84 80A1C824 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01E88 80A1C828 03E00008 */ jr $ra -/* 01E8C 80A1C82C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C830.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C830.s deleted file mode 100644 index 12f6f44af8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C830.s +++ /dev/null @@ -1,76 +0,0 @@ -glabel func_80A1C830 -/* 01E90 80A1C830 240E000C */ addiu $t6, $zero, 0x000C ## $t6 = 0000000C -/* 01E94 80A1C834 3C0180A2 */ lui $at, %hi(D_80A1CFF0) ## $at = 80A20000 -/* 01E98 80A1C838 AFA50004 */ sw $a1, 0x0004($sp) -/* 01E9C 80A1C83C A02ECFF0 */ sb $t6, %lo(D_80A1CFF0)($at) -/* 01EA0 80A1C840 90820382 */ lbu $v0, 0x0382($a0) ## 00000382 -/* 01EA4 80A1C844 3C0F80A2 */ lui $t7, %hi(func_80A1C944) ## $t7 = 80A20000 -/* 01EA8 80A1C848 25EFC944 */ addiu $t7, $t7, %lo(func_80A1C944) ## $t7 = 80A1C944 -/* 01EAC 80A1C84C AC8F0354 */ sw $t7, 0x0354($a0) ## 00000354 -/* 01EB0 80A1C850 AC800388 */ sw $zero, 0x0388($a0) ## 00000388 -/* 01EB4 80A1C854 04400014 */ bltz $v0, .L80A1C8A8 -/* 01EB8 80A1C858 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -/* 01EBC 80A1C85C 28610005 */ slti $at, $v1, 0x0005 -/* 01EC0 80A1C860 10200011 */ beq $at, $zero, .L80A1C8A8 -/* 01EC4 80A1C864 3C068016 */ lui $a2, %hi(gSaveContext) -/* 01EC8 80A1C868 0002C040 */ sll $t8, $v0, 1 -/* 01ECC 80A1C86C 3C0380A2 */ lui $v1, %hi(D_80A1D008) ## $v1 = 80A20000 -/* 01ED0 80A1C870 24C6E660 */ addiu $a2, %lo(gSaveContext) -/* 01ED4 80A1C874 00781821 */ addu $v1, $v1, $t8 -/* 01ED8 80A1C878 9463D008 */ lhu $v1, %lo(D_80A1D008)($v1) -/* 01EDC 80A1C87C 94C50EEE */ lhu $a1, 0x0EEE($a2) ## 8015F54E -/* 01EE0 80A1C880 24090055 */ addiu $t1, $zero, 0x0055 ## $t1 = 00000055 -/* 01EE4 80A1C884 0065C824 */ and $t9, $v1, $a1 -/* 01EE8 80A1C888 17200004 */ bne $t9, $zero, .L80A1C89C -/* 01EEC 80A1C88C 00A34025 */ or $t0, $a1, $v1 ## $t0 = 80A20000 -/* 01EF0 80A1C890 A4C80EEE */ sh $t0, 0x0EEE($a2) ## 8015F54E -/* 01EF4 80A1C894 03E00008 */ jr $ra -/* 01EF8 80A1C898 AC890388 */ sw $t1, 0x0388($a0) ## 00000388 -.L80A1C89C: -/* 01EFC 80A1C89C 240A004D */ addiu $t2, $zero, 0x004D ## $t2 = 0000004D -/* 01F00 80A1C8A0 03E00008 */ jr $ra -/* 01F04 80A1C8A4 AC8A0388 */ sw $t2, 0x0388($a0) ## 00000388 -.L80A1C8A8: -/* 01F08 80A1C8A8 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 01F0C 80A1C8AC 14610011 */ bne $v1, $at, .L80A1C8F4 -/* 01F10 80A1C8B0 3C068016 */ lui $a2, %hi(gSaveContext) -/* 01F14 80A1C8B4 00025840 */ sll $t3, $v0, 1 -/* 01F18 80A1C8B8 3C0380A2 */ lui $v1, %hi(D_80A1D008) ## $v1 = 80A20000 -/* 01F1C 80A1C8BC 24C6E660 */ addiu $a2, %lo(gSaveContext) -/* 01F20 80A1C8C0 006B1821 */ addu $v1, $v1, $t3 -/* 01F24 80A1C8C4 9463D008 */ lhu $v1, %lo(D_80A1D008)($v1) -/* 01F28 80A1C8C8 94C50EEE */ lhu $a1, 0x0EEE($a2) ## 8015F54E -/* 01F2C 80A1C8CC 240E003E */ addiu $t6, $zero, 0x003E ## $t6 = 0000003E -/* 01F30 80A1C8D0 00656024 */ and $t4, $v1, $a1 -/* 01F34 80A1C8D4 15800004 */ bne $t4, $zero, .L80A1C8E8 -/* 01F38 80A1C8D8 00A36825 */ or $t5, $a1, $v1 ## $t5 = 80A20000 -/* 01F3C 80A1C8DC A4CD0EEE */ sh $t5, 0x0EEE($a2) ## 8015F54E -/* 01F40 80A1C8E0 03E00008 */ jr $ra -/* 01F44 80A1C8E4 AC8E0388 */ sw $t6, 0x0388($a0) ## 00000388 -.L80A1C8E8: -/* 01F48 80A1C8E8 240F004D */ addiu $t7, $zero, 0x004D ## $t7 = 0000004D -/* 01F4C 80A1C8EC 03E00008 */ jr $ra -/* 01F50 80A1C8F0 AC8F0388 */ sw $t7, 0x0388($a0) ## 00000388 -.L80A1C8F4: -/* 01F54 80A1C8F4 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 01F58 80A1C8F8 14610010 */ bne $v1, $at, .L80A1C93C -/* 01F5C 80A1C8FC 3C068016 */ lui $a2, %hi(gSaveContext) -/* 01F60 80A1C900 0002C040 */ sll $t8, $v0, 1 -/* 01F64 80A1C904 3C0380A2 */ lui $v1, %hi(D_80A1D008) ## $v1 = 80A20000 -/* 01F68 80A1C908 24C6E660 */ addiu $a2, %lo(gSaveContext) -/* 01F6C 80A1C90C 00781821 */ addu $v1, $v1, $t8 -/* 01F70 80A1C910 9463D008 */ lhu $v1, %lo(D_80A1D008)($v1) -/* 01F74 80A1C914 94C50EEE */ lhu $a1, 0x0EEE($a2) ## 8015F54E -/* 01F78 80A1C918 2409003E */ addiu $t1, $zero, 0x003E ## $t1 = 0000003E -/* 01F7C 80A1C91C 0065C824 */ and $t9, $v1, $a1 -/* 01F80 80A1C920 17200004 */ bne $t9, $zero, .L80A1C934 -/* 01F84 80A1C924 00A34025 */ or $t0, $a1, $v1 ## $t0 = 80A20000 -/* 01F88 80A1C928 A4C80EEE */ sh $t0, 0x0EEE($a2) ## 8015F54E -/* 01F8C 80A1C92C 03E00008 */ jr $ra -/* 01F90 80A1C930 AC890388 */ sw $t1, 0x0388($a0) ## 00000388 -.L80A1C934: -/* 01F94 80A1C934 240A0055 */ addiu $t2, $zero, 0x0055 ## $t2 = 00000055 -/* 01F98 80A1C938 AC8A0388 */ sw $t2, 0x0388($a0) ## 00000388 -.L80A1C93C: -/* 01F9C 80A1C93C 03E00008 */ jr $ra -/* 01FA0 80A1C940 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C944.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C944.s deleted file mode 100644 index 02b5329e66..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C944.s +++ /dev/null @@ -1,140 +0,0 @@ -.rdata -glabel D_80A1D1C0 - .asciz "\x1b[41;37m" - .balign 4 - -glabel D_80A1D1CC - .asciz "%s[%d]カエルがいない！？\n" - .balign 4 - -glabel D_80A1D1E8 - .asciz "../z_en_fr.c" - .balign 4 - -glabel D_80A1D1F8 - .asciz "\x1b[m" - .balign 4 - -glabel D_80A1D1FC - .asciz "\x1b[41;37m" - .balign 4 - -glabel D_80A1D208 - .asciz "%s[%d]カエルがいない！？\n" - .balign 4 - -glabel D_80A1D224 - .asciz "../z_en_fr.c" - .balign 4 - -glabel D_80A1D234 - .asciz "\x1b[m" - .balign 4 - -.text -glabel func_80A1C944 -/* 01FA4 80A1C944 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01FA8 80A1C948 AFBF001C */ sw $ra, 0x001C($sp) -/* 01FAC 80A1C94C AFA50024 */ sw $a1, 0x0024($sp) -/* 01FB0 80A1C950 8C8203A4 */ lw $v0, 0x03A4($a0) ## 000003A4 -/* 01FB4 80A1C954 3C0580A2 */ lui $a1, %hi(D_80A1D004) ## $a1 = 80A20000 -/* 01FB8 80A1C958 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 01FBC 80A1C95C 10400003 */ beq $v0, $zero, .L80A1C96C -/* 01FC0 80A1C960 24A5D004 */ addiu $a1, $a1, %lo(D_80A1D004) ## $a1 = 80A1D004 -/* 01FC4 80A1C964 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A -/* 01FC8 80A1C968 A44E0110 */ sh $t6, 0x0110($v0) ## 00000110 -.L80A1C96C: -/* 01FCC 80A1C96C 3C0280A2 */ lui $v0, %hi(D_80A1CFF0) ## $v0 = 80A20000 -/* 01FD0 80A1C970 2442CFF0 */ addiu $v0, $v0, %lo(D_80A1CFF0) ## $v0 = 80A1CFF0 -/* 01FD4 80A1C974 24040001 */ addiu $a0, $zero, 0x0001 ## $a0 = 00000001 -/* 01FD8 80A1C978 8C430004 */ lw $v1, 0x0004($v0) ## 80A1CFF4 -.L80A1C97C: -/* 01FDC 80A1C97C 24420004 */ addiu $v0, $v0, 0x0004 ## $v0 = 80A1CFF4 -/* 01FE0 80A1C980 0045082B */ sltu $at, $v0, $a1 -/* 01FE4 80A1C984 54600010 */ bnel $v1, $zero, .L80A1C9C8 -/* 01FE8 80A1C988 906F037C */ lbu $t7, 0x037C($v1) ## 0000037C -/* 01FEC 80A1C98C 3C0480A2 */ lui $a0, %hi(D_80A1D1C0) ## $a0 = 80A20000 -/* 01FF0 80A1C990 0C00084C */ jal osSyncPrintf - -/* 01FF4 80A1C994 2484D1C0 */ addiu $a0, $a0, %lo(D_80A1D1C0) ## $a0 = 80A1D1C0 -/* 01FF8 80A1C998 3C0480A2 */ lui $a0, %hi(D_80A1D1CC) ## $a0 = 80A20000 -/* 01FFC 80A1C99C 3C0580A2 */ lui $a1, %hi(D_80A1D1E8) ## $a1 = 80A20000 -/* 02000 80A1C9A0 24A5D1E8 */ addiu $a1, $a1, %lo(D_80A1D1E8) ## $a1 = 80A1D1E8 -/* 02004 80A1C9A4 2484D1CC */ addiu $a0, $a0, %lo(D_80A1D1CC) ## $a0 = 80A1D1CC -/* 02008 80A1C9A8 0C00084C */ jal osSyncPrintf - -/* 0200C 80A1C9AC 24060644 */ addiu $a2, $zero, 0x0644 ## $a2 = 00000644 -/* 02010 80A1C9B0 3C0480A2 */ lui $a0, %hi(D_80A1D1F8) ## $a0 = 80A20000 -/* 02014 80A1C9B4 0C00084C */ jal osSyncPrintf - -/* 02018 80A1C9B8 2484D1F8 */ addiu $a0, $a0, %lo(D_80A1D1F8) ## $a0 = 80A1D1F8 -/* 0201C 80A1C9BC 10000038 */ beq $zero, $zero, .L80A1CAA0 -/* 02020 80A1C9C0 8FBF001C */ lw $ra, 0x001C($sp) -/* 02024 80A1C9C4 906F037C */ lbu $t7, 0x037C($v1) ## 0000037C -.L80A1C9C8: -/* 02028 80A1C9C8 548F0035 */ bnel $a0, $t7, .L80A1CAA0 -/* 0202C 80A1C9CC 8FBF001C */ lw $ra, 0x001C($sp) -/* 02030 80A1C9D0 5420FFEA */ bnel $at, $zero, .L80A1C97C -/* 02034 80A1C9D4 8C430004 */ lw $v1, 0x0004($v0) ## 00000004 -/* 02038 80A1C9D8 3C0280A2 */ lui $v0, %hi(D_80A1CFF0) ## $v0 = 80A20000 -/* 0203C 80A1C9DC 3C0480A2 */ lui $a0, %hi(D_80A1D004) ## $a0 = 80A20000 -/* 02040 80A1C9E0 2484D004 */ addiu $a0, $a0, %lo(D_80A1D004) ## $a0 = 80A1D004 -/* 02044 80A1C9E4 2442CFF0 */ addiu $v0, $v0, %lo(D_80A1CFF0) ## $v0 = 80A1CFF0 -.L80A1C9E8: -/* 02048 80A1C9E8 8C430004 */ lw $v1, 0x0004($v0) ## 80A1CFF4 -/* 0204C 80A1C9EC 24420004 */ addiu $v0, $v0, 0x0004 ## $v0 = 80A1CFF4 -/* 02050 80A1C9F0 1460000F */ bne $v1, $zero, .L80A1CA30 -/* 02054 80A1C9F4 00000000 */ nop -/* 02058 80A1C9F8 3C0480A2 */ lui $a0, %hi(D_80A1D1FC) ## $a0 = 80A20000 -/* 0205C 80A1C9FC 0C00084C */ jal osSyncPrintf - -/* 02060 80A1CA00 2484D1FC */ addiu $a0, $a0, %lo(D_80A1D1FC) ## $a0 = 80A1D1FC -/* 02064 80A1CA04 3C0480A2 */ lui $a0, %hi(D_80A1D208) ## $a0 = 80A20000 -/* 02068 80A1CA08 3C0580A2 */ lui $a1, %hi(D_80A1D224) ## $a1 = 80A20000 -/* 0206C 80A1CA0C 24A5D224 */ addiu $a1, $a1, %lo(D_80A1D224) ## $a1 = 80A1D224 -/* 02070 80A1CA10 2484D208 */ addiu $a0, $a0, %lo(D_80A1D208) ## $a0 = 80A1D208 -/* 02074 80A1CA14 0C00084C */ jal osSyncPrintf - -/* 02078 80A1CA18 24060652 */ addiu $a2, $zero, 0x0652 ## $a2 = 00000652 -/* 0207C 80A1CA1C 3C0480A2 */ lui $a0, %hi(D_80A1D234) ## $a0 = 80A20000 -/* 02080 80A1CA20 0C00084C */ jal osSyncPrintf - -/* 02084 80A1CA24 2484D234 */ addiu $a0, $a0, %lo(D_80A1D234) ## $a0 = 80A1D234 -/* 02088 80A1CA28 1000001D */ beq $zero, $zero, .L80A1CAA0 -/* 0208C 80A1CA2C 8FBF001C */ lw $ra, 0x001C($sp) -.L80A1CA30: -/* 02090 80A1CA30 1444FFED */ bne $v0, $a0, .L80A1C9E8 -/* 02094 80A1CA34 A060037C */ sb $zero, 0x037C($v1) ## 0000037C -/* 02098 80A1CA38 8FB90024 */ lw $t9, 0x0024($sp) -/* 0209C 80A1CA3C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 020A0 80A1CA40 24180004 */ addiu $t8, $zero, 0x0004 ## $t8 = 00000004 -/* 020A4 80A1CA44 00390821 */ addu $at, $at, $t9 -/* 020A8 80A1CA48 A43804C6 */ sh $t8, 0x04C6($at) ## 000104C6 -/* 020AC 80A1CA4C AFA60020 */ sw $a2, 0x0020($sp) -/* 020B0 80A1CA50 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 020B4 80A1CA54 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 020B8 80A1CA58 240528E3 */ addiu $a1, $zero, 0x28E3 ## $a1 = 000028E3 -/* 020BC 80A1CA5C 8FA40020 */ lw $a0, 0x0020($sp) -/* 020C0 80A1CA60 3C0980A2 */ lui $t1, %hi(func_80A1CAAC) ## $t1 = 80A20000 -/* 020C4 80A1CA64 3C0880A2 */ lui $t0, %hi(func_80A1BCB4) ## $t0 = 80A20000 -/* 020C8 80A1CA68 8C860388 */ lw $a2, 0x0388($a0) ## 00000388 -/* 020CC 80A1CA6C 2529CAAC */ addiu $t1, $t1, %lo(func_80A1CAAC) ## $t1 = 80A1CAAC -/* 020D0 80A1CA70 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 020D4 80A1CA74 14C00004 */ bne $a2, $zero, .L80A1CA88 -/* 020D8 80A1CA78 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 020DC 80A1CA7C 2508BCB4 */ addiu $t0, $t0, %lo(func_80A1BCB4) ## $t0 = 80A1BCB4 -/* 020E0 80A1CA80 10000006 */ beq $zero, $zero, .L80A1CA9C -/* 020E4 80A1CA84 AC880354 */ sw $t0, 0x0354($a0) ## 00000354 -.L80A1CA88: -/* 020E8 80A1CA88 44812000 */ mtc1 $at, $f4 ## $f4 = 100.00 -/* 020EC 80A1CA8C AC890354 */ sw $t1, 0x0354($a0) ## 00000354 -/* 020F0 80A1CA90 8FA50024 */ lw $a1, 0x0024($sp) -/* 020F4 80A1CA94 0C00BD0D */ jal func_8002F434 -/* 020F8 80A1CA98 E7A40010 */ swc1 $f4, 0x0010($sp) -.L80A1CA9C: -/* 020FC 80A1CA9C 8FBF001C */ lw $ra, 0x001C($sp) -.L80A1CAA0: -/* 02100 80A1CAA0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02104 80A1CAA4 03E00008 */ jr $ra -/* 02108 80A1CAA8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CAAC.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CAAC.s deleted file mode 100644 index 413a9647bf..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CAAC.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80A1CAAC -/* 0210C 80A1CAAC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02110 80A1CAB0 AFBF001C */ sw $ra, 0x001C($sp) -/* 02114 80A1CAB4 AFA50024 */ sw $a1, 0x0024($sp) -/* 02118 80A1CAB8 0C00BD04 */ jal Actor_HasParent -/* 0211C 80A1CABC AFA40020 */ sw $a0, 0x0020($sp) -/* 02120 80A1CAC0 10400006 */ beq $v0, $zero, .L80A1CADC -/* 02124 80A1CAC4 8FA40020 */ lw $a0, 0x0020($sp) -/* 02128 80A1CAC8 3C0E80A2 */ lui $t6, %hi(func_80A1CB08) ## $t6 = 80A20000 -/* 0212C 80A1CACC 25CECB08 */ addiu $t6, $t6, %lo(func_80A1CB08) ## $t6 = 80A1CB08 -/* 02130 80A1CAD0 AC800118 */ sw $zero, 0x0118($a0) ## 00000118 -/* 02134 80A1CAD4 10000008 */ beq $zero, $zero, .L80A1CAF8 -/* 02138 80A1CAD8 AC8E0354 */ sw $t6, 0x0354($a0) ## 00000354 -.L80A1CADC: -/* 0213C 80A1CADC 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 02140 80A1CAE0 44812000 */ mtc1 $at, $f4 ## $f4 = 100.00 -/* 02144 80A1CAE4 8C860388 */ lw $a2, 0x0388($a0) ## 00000388 -/* 02148 80A1CAE8 8FA50024 */ lw $a1, 0x0024($sp) -/* 0214C 80A1CAEC 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 02150 80A1CAF0 0C00BD0D */ jal func_8002F434 -/* 02154 80A1CAF4 E7A40010 */ swc1 $f4, 0x0010($sp) -.L80A1CAF8: -/* 02158 80A1CAF8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0215C 80A1CAFC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02160 80A1CB00 03E00008 */ jr $ra -/* 02164 80A1CB04 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CB08.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CB08.s deleted file mode 100644 index 19b67fea5f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CB08.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80A1CB08 -/* 02168 80A1CB08 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0216C 80A1CB0C AFBF0014 */ sw $ra, 0x0014($sp) -/* 02170 80A1CB10 AFA40018 */ sw $a0, 0x0018($sp) -/* 02174 80A1CB14 AFA5001C */ sw $a1, 0x001C($sp) -/* 02178 80A1CB18 0C042F6F */ jal func_8010BDBC -/* 0217C 80A1CB1C 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 02180 80A1CB20 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 02184 80A1CB24 54410009 */ bnel $v0, $at, .L80A1CB4C -/* 02188 80A1CB28 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0218C 80A1CB2C 0C041AF2 */ jal func_80106BC8 -/* 02190 80A1CB30 8FA4001C */ lw $a0, 0x001C($sp) -/* 02194 80A1CB34 10400004 */ beq $v0, $zero, .L80A1CB48 -/* 02198 80A1CB38 8FAF0018 */ lw $t7, 0x0018($sp) -/* 0219C 80A1CB3C 3C0E80A2 */ lui $t6, %hi(func_80A1BCB4) ## $t6 = 80A20000 -/* 021A0 80A1CB40 25CEBCB4 */ addiu $t6, $t6, %lo(func_80A1BCB4) ## $t6 = 80A1BCB4 -/* 021A4 80A1CB44 ADEE0354 */ sw $t6, 0x0354($t7) ## 00000354 -.L80A1CB48: -/* 021A8 80A1CB48 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A1CB4C: -/* 021AC 80A1CB4C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 021B0 80A1CB50 03E00008 */ jr $ra -/* 021B4 80A1CB54 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CB58.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CB58.s deleted file mode 100644 index 20c4f0d35f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CB58.s +++ /dev/null @@ -1,46 +0,0 @@ -glabel func_80A1CB58 -/* 021B8 80A1CB58 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* 021BC 80A1CB5C 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* 021C0 80A1CB60 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 021C4 80A1CB64 AFBF0044 */ sw $ra, 0x0044($sp) -/* 021C8 80A1CB68 AFA5004C */ sw $a1, 0x004C($sp) -/* 021CC 80A1CB6C 85CF12D4 */ lh $t7, 0x12D4($t6) ## 801612D4 -/* 021D0 80A1CB70 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 021D4 80A1CB74 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF -/* 021D8 80A1CB78 11E00018 */ beq $t7, $zero, .L80A1CBDC -/* 021DC 80A1CB7C 240900FF */ addiu $t1, $zero, 0x00FF ## $t1 = 000000FF -/* 021E0 80A1CB80 84980032 */ lh $t8, 0x0032($a0) ## 00000032 -/* 021E4 80A1CB84 C48C0024 */ lwc1 $f12, 0x0024($a0) ## 00000024 -/* 021E8 80A1CB88 C48E0028 */ lwc1 $f14, 0x0028($a0) ## 00000028 -/* 021EC 80A1CB8C 8C86002C */ lw $a2, 0x002C($a0) ## 0000002C -/* 021F0 80A1CB90 84870030 */ lh $a3, 0x0030($a0) ## 00000030 -/* 021F4 80A1CB94 AFB80010 */ sw $t8, 0x0010($sp) -/* 021F8 80A1CB98 84990034 */ lh $t9, 0x0034($a0) ## 00000034 -/* 021FC 80A1CB9C 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 02200 80A1CBA0 240A0004 */ addiu $t2, $zero, 0x0004 ## $t2 = 00000004 -/* 02204 80A1CBA4 AFAA0034 */ sw $t2, 0x0034($sp) -/* 02208 80A1CBA8 AFA90030 */ sw $t1, 0x0030($sp) -/* 0220C 80A1CBAC AFA0002C */ sw $zero, 0x002C($sp) -/* 02210 80A1CBB0 AFA00028 */ sw $zero, 0x0028($sp) -/* 02214 80A1CBB4 AFA80024 */ sw $t0, 0x0024($sp) -/* 02218 80A1CBB8 AFB90014 */ sw $t9, 0x0014($sp) -/* 0221C 80A1CBBC E7A00018 */ swc1 $f0, 0x0018($sp) -/* 02220 80A1CBC0 E7A0001C */ swc1 $f0, 0x001C($sp) -/* 02224 80A1CBC4 E7A00020 */ swc1 $f0, 0x0020($sp) -/* 02228 80A1CBC8 8CAC0000 */ lw $t4, 0x0000($a1) ## 00000000 -/* 0222C 80A1CBCC AFA40048 */ sw $a0, 0x0048($sp) -/* 02230 80A1CBD0 0C018FA7 */ jal DebugDisplay_AddObject - -/* 02234 80A1CBD4 AFAC0038 */ sw $t4, 0x0038($sp) -/* 02238 80A1CBD8 8FA40048 */ lw $a0, 0x0048($sp) -.L80A1CBDC: -/* 0223C 80A1CBDC 8C8D036C */ lw $t5, 0x036C($a0) ## 0000036C -/* 02240 80A1CBE0 8C990354 */ lw $t9, 0x0354($a0) ## 00000354 -/* 02244 80A1CBE4 25AE0001 */ addiu $t6, $t5, 0x0001 ## $t6 = 00000001 -/* 02248 80A1CBE8 AC8E036C */ sw $t6, 0x036C($a0) ## 0000036C -/* 0224C 80A1CBEC 0320F809 */ jalr $ra, $t9 -/* 02250 80A1CBF0 8FA5004C */ lw $a1, 0x004C($sp) -/* 02254 80A1CBF4 8FBF0044 */ lw $ra, 0x0044($sp) -/* 02258 80A1CBF8 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 0225C 80A1CBFC 03E00008 */ jr $ra -/* 02260 80A1CC00 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CC04.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CC04.s deleted file mode 100644 index 2dd9c099fc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CC04.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_80A1CC04 -/* 02264 80A1CC04 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 02268 80A1CC08 AFA40000 */ sw $a0, 0x0000($sp) -/* 0226C 80A1CC0C 10A10004 */ beq $a1, $at, .L80A1CC20 -/* 02270 80A1CC10 AFA7000C */ sw $a3, 0x000C($sp) -/* 02274 80A1CC14 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 02278 80A1CC18 14A10002 */ bne $a1, $at, .L80A1CC24 -/* 0227C 80A1CC1C 00000000 */ nop -.L80A1CC20: -/* 02280 80A1CC20 ACC00000 */ sw $zero, 0x0000($a2) ## 00000000 -.L80A1CC24: -/* 02284 80A1CC24 03E00008 */ jr $ra -/* 02288 80A1CC28 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CC2C.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CC2C.s deleted file mode 100644 index c047c97e44..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CC2C.s +++ /dev/null @@ -1,79 +0,0 @@ -.rdata -glabel D_80A1D238 - .asciz "../z_en_fr.c" - .balign 4 - -glabel D_80A1D248 - .asciz "../z_en_fr.c" - .balign 4 - -glabel D_80A1D258 - .asciz "../z_en_fr.c" - .balign 4 - -.text -glabel func_80A1CC2C -/* 0228C 80A1CC2C 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 02290 80A1CC30 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 02294 80A1CC34 AFBF001C */ sw $ra, 0x001C($sp) -/* 02298 80A1CC38 AFB00018 */ sw $s0, 0x0018($sp) -/* 0229C 80A1CC3C AFA40048 */ sw $a0, 0x0048($sp) -/* 022A0 80A1CC40 AFA60050 */ sw $a2, 0x0050($sp) -/* 022A4 80A1CC44 10A10004 */ beq $a1, $at, .L80A1CC58 -/* 022A8 80A1CC48 AFA70054 */ sw $a3, 0x0054($sp) -/* 022AC 80A1CC4C 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 022B0 80A1CC50 54A10030 */ bnel $a1, $at, .L80A1CD14 -/* 022B4 80A1CC54 8FBF001C */ lw $ra, 0x001C($sp) -.L80A1CC58: -/* 022B8 80A1CC58 8FAE0048 */ lw $t6, 0x0048($sp) -/* 022BC 80A1CC5C 3C0680A2 */ lui $a2, %hi(D_80A1D238) ## $a2 = 80A20000 -/* 022C0 80A1CC60 24C6D238 */ addiu $a2, $a2, %lo(D_80A1D238) ## $a2 = 80A1D238 -/* 022C4 80A1CC64 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 022C8 80A1CC68 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 -/* 022CC 80A1CC6C 240706C7 */ addiu $a3, $zero, 0x06C7 ## $a3 = 000006C7 -/* 022D0 80A1CC70 0C031AB1 */ jal Graph_OpenDisps -/* 022D4 80A1CC74 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 022D8 80A1CC78 0C034213 */ jal Matrix_Push -/* 022DC 80A1CC7C 00000000 */ nop -/* 022E0 80A1CC80 8FA40048 */ lw $a0, 0x0048($sp) -/* 022E4 80A1CC84 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 022E8 80A1CC88 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 -/* 022EC 80A1CC8C 0C0347F5 */ jal func_800D1FD4 -/* 022F0 80A1CC90 00812021 */ addu $a0, $a0, $at -/* 022F4 80A1CC94 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 022F8 80A1CC98 3C18DA38 */ lui $t8, 0xDA38 ## $t8 = DA380000 -/* 022FC 80A1CC9C 37180003 */ ori $t8, $t8, 0x0003 ## $t8 = DA380003 -/* 02300 80A1CCA0 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 02304 80A1CCA4 AE0F02C0 */ sw $t7, 0x02C0($s0) ## 000002C0 -/* 02308 80A1CCA8 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 0230C 80A1CCAC 8FB90048 */ lw $t9, 0x0048($sp) -/* 02310 80A1CCB0 3C0580A2 */ lui $a1, %hi(D_80A1D248) ## $a1 = 80A20000 -/* 02314 80A1CCB4 24A5D248 */ addiu $a1, $a1, %lo(D_80A1D248) ## $a1 = 80A1D248 -/* 02318 80A1CCB8 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 -/* 0231C 80A1CCBC 240606CA */ addiu $a2, $zero, 0x06CA ## $a2 = 000006CA -/* 02320 80A1CCC0 0C0346A2 */ jal Matrix_NewMtx -/* 02324 80A1CCC4 AFA2002C */ sw $v0, 0x002C($sp) -/* 02328 80A1CCC8 8FA3002C */ lw $v1, 0x002C($sp) -/* 0232C 80A1CCCC 3C09DE00 */ lui $t1, 0xDE00 ## $t1 = DE000000 -/* 02330 80A1CCD0 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 02334 80A1CCD4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 02338 80A1CCD8 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 -/* 0233C 80A1CCDC AE0802C0 */ sw $t0, 0x02C0($s0) ## 000002C0 -/* 02340 80A1CCE0 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 02344 80A1CCE4 8FAA0050 */ lw $t2, 0x0050($sp) -/* 02348 80A1CCE8 8D4B0000 */ lw $t3, 0x0000($t2) ## 00000000 -/* 0234C 80A1CCEC 0C034221 */ jal Matrix_Pull -/* 02350 80A1CCF0 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 02354 80A1CCF4 8FAC0048 */ lw $t4, 0x0048($sp) -/* 02358 80A1CCF8 3C0680A2 */ lui $a2, %hi(D_80A1D258) ## $a2 = 80A20000 -/* 0235C 80A1CCFC 24C6D258 */ addiu $a2, $a2, %lo(D_80A1D258) ## $a2 = 80A1D258 -/* 02360 80A1CD00 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 -/* 02364 80A1CD04 240706CD */ addiu $a3, $zero, 0x06CD ## $a3 = 000006CD -/* 02368 80A1CD08 0C031AD5 */ jal Graph_CloseDisps -/* 0236C 80A1CD0C 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 02370 80A1CD10 8FBF001C */ lw $ra, 0x001C($sp) -.L80A1CD14: -/* 02374 80A1CD14 8FB00018 */ lw $s0, 0x0018($sp) -/* 02378 80A1CD18 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 0237C 80A1CD1C 03E00008 */ jr $ra -/* 02380 80A1CD20 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CD24.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CD24.s deleted file mode 100644 index 73101460ae..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CD24.s +++ /dev/null @@ -1,199 +0,0 @@ -.rdata -glabel D_80A1D268 - .asciz "../z_en_fr.c" - .balign 4 - -glabel D_80A1D278 - .asciz "../z_en_fr.c" - .balign 4 - -.late_rodata -glabel D_80A1D304 - .word 0x3C75C28F, 0x00000000, 0x00000000 - -.text -glabel func_80A1CD24 -/* 02384 80A1CD24 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 02388 80A1CD28 AFBF002C */ sw $ra, 0x002C($sp) -/* 0238C 80A1CD2C AFB00028 */ sw $s0, 0x0028($sp) -/* 02390 80A1CD30 AFA5006C */ sw $a1, 0x006C($sp) -/* 02394 80A1CD34 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 02398 80A1CD38 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0239C 80A1CD3C 3C0680A2 */ lui $a2, %hi(D_80A1D268) ## $a2 = 80A20000 -/* 023A0 80A1CD40 25CFFFFF */ addiu $t7, $t6, 0xFFFF ## $t7 = FFFFFFFF -/* 023A4 80A1CD44 A7AF005E */ sh $t7, 0x005E($sp) -/* 023A8 80A1CD48 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 023AC 80A1CD4C 24C6D268 */ addiu $a2, $a2, %lo(D_80A1D268) ## $a2 = 80A1D268 -/* 023B0 80A1CD50 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE0 -/* 023B4 80A1CD54 240706DA */ addiu $a3, $zero, 0x06DA ## $a3 = 000006DA -/* 023B8 80A1CD58 0C031AB1 */ jal Graph_OpenDisps -/* 023BC 80A1CD5C AFA50058 */ sw $a1, 0x0058($sp) -/* 023C0 80A1CD60 8FB9006C */ lw $t9, 0x006C($sp) -/* 023C4 80A1CD64 0C024F46 */ jal func_80093D18 -/* 023C8 80A1CD68 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 -/* 023CC 80A1CD6C 920A03A8 */ lbu $t2, 0x03A8($s0) ## 000003A8 -/* 023D0 80A1CD70 8FA80058 */ lw $t0, 0x0058($sp) -/* 023D4 80A1CD74 3C0CE700 */ lui $t4, 0xE700 ## $t4 = E7000000 -/* 023D8 80A1CD78 11400003 */ beq $t2, $zero, .L80A1CD88 -/* 023DC 80A1CD7C 3C0EFB00 */ lui $t6, 0xFB00 ## $t6 = FB000000 -/* 023E0 80A1CD80 10000002 */ beq $zero, $zero, .L80A1CD8C -/* 023E4 80A1CD84 2409005F */ addiu $t1, $zero, 0x005F ## $t1 = 0000005F -.L80A1CD88: -/* 023E8 80A1CD88 2409FFFF */ addiu $t1, $zero, 0xFFFF ## $t1 = FFFFFFFF -.L80A1CD8C: -/* 023EC 80A1CD8C 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 023F0 80A1CD90 240FFFFF */ addiu $t7, $zero, 0xFFFF ## $t7 = FFFFFFFF -/* 023F4 80A1CD94 2604035C */ addiu $a0, $s0, 0x035C ## $a0 = 0000035C -/* 023F8 80A1CD98 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 023FC 80A1CD9C AD0B02C0 */ sw $t3, 0x02C0($t0) ## 000002C0 -/* 02400 80A1CDA0 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 02404 80A1CDA4 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 02408 80A1CDA8 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 0240C 80A1CDAC 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF -/* 02410 80A1CDB0 240B00FF */ addiu $t3, $zero, 0x00FF ## $t3 = 000000FF -/* 02414 80A1CDB4 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 02418 80A1CDB8 AD0D02C0 */ sw $t5, 0x02C0($t0) ## 000002C0 -/* 0241C 80A1CDBC AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 02420 80A1CDC0 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 02424 80A1CDC4 C61003C0 */ lwc1 $f16, 0x03C0($s0) ## 000003C0 -/* 02428 80A1CDC8 C60803BC */ lwc1 $f8, 0x03BC($s0) ## 000003BC -/* 0242C 80A1CDCC C60403B8 */ lwc1 $f4, 0x03B8($s0) ## 000003B8 -/* 02430 80A1CDD0 4600848D */ trunc.w.s $f18, $f16 -/* 02434 80A1CDD4 240D00FF */ addiu $t5, $zero, 0x00FF ## $t5 = 000000FF -/* 02438 80A1CDD8 AFAD0018 */ sw $t5, 0x0018($sp) -/* 0243C 80A1CDDC 4600428D */ trunc.w.s $f10, $f8 -/* 02440 80A1CDE0 44079000 */ mfc1 $a3, $f18 -/* 02444 80A1CDE4 AFA80058 */ sw $t0, 0x0058($sp) -/* 02448 80A1CDE8 4600218D */ trunc.w.s $f6, $f4 -/* 0244C 80A1CDEC 44065000 */ mfc1 $a2, $f10 -/* 02450 80A1CDF0 00073C00 */ sll $a3, $a3, 16 -/* 02454 80A1CDF4 00073C03 */ sra $a3, $a3, 16 -/* 02458 80A1CDF8 44053000 */ mfc1 $a1, $f6 -/* 0245C 80A1CDFC 00063400 */ sll $a2, $a2, 16 -/* 02460 80A1CE00 00063403 */ sra $a2, $a2, 16 -/* 02464 80A1CE04 00052C00 */ sll $a1, $a1, 16 -/* 02468 80A1CE08 00052C03 */ sra $a1, $a1, 16 -/* 0246C 80A1CE0C AFA9001C */ sw $t1, 0x001C($sp) -/* 02470 80A1CE10 AFAC0014 */ sw $t4, 0x0014($sp) -/* 02474 80A1CE14 0C01E763 */ jal Lights_PointNoGlowSetInfo - -/* 02478 80A1CE18 AFAB0010 */ sw $t3, 0x0010($sp) -/* 0247C 80A1CE1C 8FA80058 */ lw $t0, 0x0058($sp) -/* 02480 80A1CE20 3C0FFB00 */ lui $t7, 0xFB00 ## $t7 = FB000000 -/* 02484 80A1CE24 3C0A80A2 */ lui $t2, %hi(D_80A1D054) ## $t2 = 80A20000 -/* 02488 80A1CE28 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 0248C 80A1CE2C 254AD054 */ addiu $t2, $t2, %lo(D_80A1D054) ## $t2 = 80A1D054 -/* 02490 80A1CE30 3C0580A2 */ lui $a1, %hi(D_80A1D0FC) ## $a1 = 80A20000 -/* 02494 80A1CE34 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 02498 80A1CE38 AD0E02C0 */ sw $t6, 0x02C0($t0) ## 000002C0 -/* 0249C 80A1CE3C AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 024A0 80A1CE40 87B8005E */ lh $t8, 0x005E($sp) -/* 024A4 80A1CE44 24A5D0FC */ addiu $a1, $a1, %lo(D_80A1D0FC) ## $a1 = 80A1D0FC -/* 024A8 80A1CE48 3C078016 */ lui $a3, %hi(gSegments) -/* 024AC 80A1CE4C 0018C880 */ sll $t9, $t8, 2 -/* 024B0 80A1CE50 032A1821 */ addu $v1, $t9, $t2 -/* 024B4 80A1CE54 906C0002 */ lbu $t4, 0x0002($v1) ## 00000002 -/* 024B8 80A1CE58 906F0000 */ lbu $t7, 0x0000($v1) ## 00000000 -/* 024BC 80A1CE5C 906B0001 */ lbu $t3, 0x0001($v1) ## 00000001 -/* 024C0 80A1CE60 000C6A00 */ sll $t5, $t4, 8 -/* 024C4 80A1CE64 000FC600 */ sll $t8, $t7, 24 -/* 024C8 80A1CE68 01B8C825 */ or $t9, $t5, $t8 ## $t9 = 00000000 -/* 024CC 80A1CE6C 000B6400 */ sll $t4, $t3, 16 -/* 024D0 80A1CE70 032C7025 */ or $t6, $t9, $t4 ## $t6 = 00000000 -/* 024D4 80A1CE74 35CF00FF */ ori $t7, $t6, 0x00FF ## $t7 = 000000FF -/* 024D8 80A1CE78 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 024DC 80A1CE7C 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 024E0 80A1CE80 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 -/* 024E4 80A1CE84 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 -/* 024E8 80A1CE88 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 024EC 80A1CE8C AD0D02C0 */ sw $t5, 0x02C0($t0) ## 000002C0 -/* 024F0 80A1CE90 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 024F4 80A1CE94 920A0378 */ lbu $t2, 0x0378($s0) ## 00000378 -/* 024F8 80A1CE98 24E76FA8 */ addiu $a3, %lo(gSegments) -/* 024FC 80A1CE9C 3C0600FF */ lui $a2, 0x00FF ## $a2 = 00FF0000 -/* 02500 80A1CEA0 000A5880 */ sll $t3, $t2, 2 -/* 02504 80A1CEA4 00ABC821 */ addu $t9, $a1, $t3 -/* 02508 80A1CEA8 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 -/* 0250C 80A1CEAC 34C6FFFF */ ori $a2, $a2, 0xFFFF ## $a2 = 00FFFFFF -/* 02510 80A1CEB0 3C098000 */ lui $t1, 0x8000 ## $t1 = 80000000 -/* 02514 80A1CEB4 00047100 */ sll $t6, $a0, 4 -/* 02518 80A1CEB8 000E7F02 */ srl $t7, $t6, 28 -/* 0251C 80A1CEBC 000F6880 */ sll $t5, $t7, 2 -/* 02520 80A1CEC0 00EDC021 */ addu $t8, $a3, $t5 -/* 02524 80A1CEC4 8F0A0000 */ lw $t2, 0x0000($t8) ## DB060020 -/* 02528 80A1CEC8 00866024 */ and $t4, $a0, $a2 -/* 0252C 80A1CECC 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 02530 80A1CED0 018A5821 */ addu $t3, $t4, $t2 -/* 02534 80A1CED4 0169C821 */ addu $t9, $t3, $t1 -/* 02538 80A1CED8 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 0253C 80A1CEDC 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 02540 80A1CEE0 35EF0024 */ ori $t7, $t7, 0x0024 ## $t7 = DB060024 -/* 02544 80A1CEE4 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 02548 80A1CEE8 AD0E02C0 */ sw $t6, 0x02C0($t0) ## 000002C0 -/* 0254C 80A1CEEC AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 02550 80A1CEF0 920D0378 */ lbu $t5, 0x0378($s0) ## 00000378 -/* 02554 80A1CEF4 000DC080 */ sll $t8, $t5, 2 -/* 02558 80A1CEF8 00B86021 */ addu $t4, $a1, $t8 -/* 0255C 80A1CEFC 8D840000 */ lw $a0, 0x0000($t4) ## 00000000 -/* 02560 80A1CF00 00045900 */ sll $t3, $a0, 4 -/* 02564 80A1CF04 000BCF02 */ srl $t9, $t3, 28 -/* 02568 80A1CF08 00197080 */ sll $t6, $t9, 2 -/* 0256C 80A1CF0C 00EE7821 */ addu $t7, $a3, $t6 -/* 02570 80A1CF10 8DED0000 */ lw $t5, 0x0000($t7) ## DB060024 -/* 02574 80A1CF14 00865024 */ and $t2, $a0, $a2 -/* 02578 80A1CF18 3C1980A2 */ lui $t9, %hi(func_80A1CC2C) ## $t9 = 80A20000 -/* 0257C 80A1CF1C 014DC021 */ addu $t8, $t2, $t5 -/* 02580 80A1CF20 03096021 */ addu $t4, $t8, $t1 -/* 02584 80A1CF24 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 02588 80A1CF28 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E -/* 0258C 80A1CF2C 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C -/* 02590 80A1CF30 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 02594 80A1CF34 3C0B80A2 */ lui $t3, %hi(func_80A1CC04) ## $t3 = 80A20000 -/* 02598 80A1CF38 256BCC04 */ addiu $t3, $t3, %lo(func_80A1CC04) ## $t3 = 80A1CC04 -/* 0259C 80A1CF3C 2739CC2C */ addiu $t9, $t9, %lo(func_80A1CC2C) ## $t9 = 80A1CC2C -/* 025A0 80A1CF40 AFB90014 */ sw $t9, 0x0014($sp) -/* 025A4 80A1CF44 AFAB0010 */ sw $t3, 0x0010($sp) -/* 025A8 80A1CF48 AFB00018 */ sw $s0, 0x0018($sp) -/* 025AC 80A1CF4C 0C0286B2 */ jal SkelAnime_DrawFlexOpa -/* 025B0 80A1CF50 8FA4006C */ lw $a0, 0x006C($sp) -/* 025B4 80A1CF54 920E03A8 */ lbu $t6, 0x03A8($s0) ## 000003A8 -/* 025B8 80A1CF58 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 025BC 80A1CF5C 51C00018 */ beql $t6, $zero, .L80A1CFC0 -/* 025C0 80A1CF60 8FAF006C */ lw $t7, 0x006C($sp) -/* 025C4 80A1CF64 C60C03AC */ lwc1 $f12, 0x03AC($s0) ## 000003AC -/* 025C8 80A1CF68 C60E03B0 */ lwc1 $f14, 0x03B0($s0) ## 000003B0 -/* 025CC 80A1CF6C 0C034261 */ jal Matrix_Translate -/* 025D0 80A1CF70 8E0603B4 */ lw $a2, 0x03B4($s0) ## 000003B4 -/* 025D4 80A1CF74 3C0180A2 */ lui $at, %hi(D_80A1D304) ## $at = 80A20000 -/* 025D8 80A1CF78 C42CD304 */ lwc1 $f12, %lo(D_80A1D304)($at) -/* 025DC 80A1CF7C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 025E0 80A1CF80 44066000 */ mfc1 $a2, $f12 -/* 025E4 80A1CF84 0C0342A3 */ jal Matrix_Scale -/* 025E8 80A1CF88 46006386 */ mov.s $f14, $f12 -/* 025EC 80A1CF8C 860400B4 */ lh $a0, 0x00B4($s0) ## 000000B4 -/* 025F0 80A1CF90 860500B6 */ lh $a1, 0x00B6($s0) ## 000000B6 -/* 025F4 80A1CF94 860600B8 */ lh $a2, 0x00B8($s0) ## 000000B8 -/* 025F8 80A1CF98 0C034421 */ jal Matrix_RotateRPY -/* 025FC 80A1CF9C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 02600 80A1CFA0 8E0502B4 */ lw $a1, 0x02B4($s0) ## 000002B4 -/* 02604 80A1CFA4 8E0602D0 */ lw $a2, 0x02D0($s0) ## 000002D0 -/* 02608 80A1CFA8 AFA00014 */ sw $zero, 0x0014($sp) -/* 0260C 80A1CFAC AFA00010 */ sw $zero, 0x0010($sp) -/* 02610 80A1CFB0 8FA4006C */ lw $a0, 0x006C($sp) -/* 02614 80A1CFB4 0C028572 */ jal SkelAnime_DrawOpa - -/* 02618 80A1CFB8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0261C 80A1CFBC 8FAF006C */ lw $t7, 0x006C($sp) -.L80A1CFC0: -/* 02620 80A1CFC0 3C0680A2 */ lui $a2, %hi(D_80A1D278) ## $a2 = 80A20000 -/* 02624 80A1CFC4 24C6D278 */ addiu $a2, $a2, %lo(D_80A1D278) ## $a2 = 80A1D278 -/* 02628 80A1CFC8 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE0 -/* 0262C 80A1CFCC 24070718 */ addiu $a3, $zero, 0x0718 ## $a3 = 00000718 -/* 02630 80A1CFD0 0C031AD5 */ jal Graph_CloseDisps -/* 02634 80A1CFD4 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 -/* 02638 80A1CFD8 8FBF002C */ lw $ra, 0x002C($sp) -/* 0263C 80A1CFDC 8FB00028 */ lw $s0, 0x0028($sp) -/* 02640 80A1CFE0 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 02644 80A1CFE4 03E00008 */ jr $ra -/* 02648 80A1CFE8 00000000 */ nop -/* 0264C 80A1CFEC 00000000 */ nop diff --git a/data/code_800EC960.data.s b/data/code_800EC960.data.s index 8b594008db..0b75da2457 100644 --- a/data/code_800EC960.data.s +++ b/data/code_800EC960.data.s @@ -252,7 +252,7 @@ glabel D_80131840 glabel D_80131844 .incbin "baserom.z64", 0xBA89E4, 0x10 -glabel D_80131854 +glabel gFrogsSongPtr .word D_80131844 glabel D_80131858 diff --git a/data/overlays/actors/z_en_fr.data.s b/data/overlays/actors/z_en_fr.data.s deleted file mode 100644 index bb1b72b971..0000000000 --- a/data/overlays/actors/z_en_fr.data.s +++ /dev/null @@ -1,56 +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 purpose registers - -.section .data - -.balign 16 - -glabel D_80A1CFF0 - .word 0x00000000 -glabel D_80A1CFF4 - .word 0x00000000, 0x00000000, 0x00000000, 0x00000000 -glabel D_80A1D004 - .word 0x00000000 -glabel D_80A1D008 - .word 0x00020004, 0x00100008, 0x00200040, 0x00010000 -glabel D_80A1D018 - .word 0x02030400, 0x01000000 -glabel D_80A1D020 - .word 0x00000003, 0x00000004, 0x00000000, 0x00000001, 0x00000002 -glabel En_Fr_InitVars - .word 0x00ED0400, 0x02000019, 0x00E60000, 0x000003C4 -.word EnFr_Init -.word EnFr_Destroy -.word EnFr_Update -.word 0x00000000 -glabel D_80A1D054 - .word 0xC8AA00FF, 0x00AAC8FF, 0xD27864FF, 0x7882E6FF, 0xBEBEBEFF -glabel D_80A1D068 - .word 0x00000000 -glabel D_80A1D06C - .word 0x00000000 -glabel D_80A1D070 - .word 0x00000000, 0x42A00000, 0xBF96CBE4, 0xC2A00000, 0x42A00000, 0xBFC90FDB, 0xC2A00000, 0x42A00000, 0xBF490FDB, 0xC2A00000, 0x42A00000, 0x402FEDE0, 0xC2A00000, 0x42A00000, 0x3FC90FDB, 0xC2A00000 -glabel D_80A1D0B0 - .word 0x00280014, 0x000F000C, 0x000C0000 -glabel D_80A1D0BC - .byte 0x80, 0x1F, 0x00, 0x02, 0x30, 0x4C, 0x00 -glabel D_80A1D0C3 - .byte 0x1E, 0x05, 0x01, 0x07, 0x03, 0x09, 0x00, 0x00, 0x00 -glabel D_80A1D0CC - .word 0x43340000, 0x43520000, 0x43700000, 0x43870000 -glabel D_80A1D0DC - .word 0x0502090B, 0x0E000000 -glabel D_80A1D0E4 - .word 0xF9F6FDFF, 0x02000000 -glabel D_80A1D0EC - .word 0x01000203, 0x04010002 -glabel D_80A1D0F4 - .word 0x00010203, 0x04000000 -glabel D_80A1D0FC - .word 0x060059A0, 0x06005BA0, 0x00000000, 0x00000000, 0x00000000 - diff --git a/include/variables.h b/include/variables.h index 1b6cbfc58e..645062121d 100644 --- a/include/variables.h +++ b/include/variables.h @@ -614,6 +614,7 @@ extern u8 D_80130594[4][7]; //extern ? D_80131100; //extern ? D_8013170C; //extern ? D_80131840; +extern u8* gFrogsSongPtr; // D_80131854: pointer to a u8 array of the notes you need to play for the frogs //extern ? D_80131858; //extern ? D_8013185C; //extern ? D_80131860; diff --git a/include/z64.h b/include/z64.h index 376595be47..bafea1aae3 100644 --- a/include/z64.h +++ b/include/z64.h @@ -336,7 +336,8 @@ typedef struct { /* 0xE3F6 */ char unk_E3F6[0x16]; /* 0xE40C */ u16 unk_E40C; /* 0xE40E */ s16 unk_E40E; - /* 0xE410 */ char unk_E410[0x08]; + /* 0xE410 */ u8 unk_E410; + /* 0xE411 */ char unk_E411[0x07]; } MessageContext; // size = 0xE418 typedef struct { diff --git a/spec b/spec index 6cf2ecbfda..2257416f30 100644 --- a/spec +++ b/spec @@ -2262,8 +2262,11 @@ endseg beginseg name "ovl_En_Fr" include "build/src/overlays/actors/ovl_En_Fr/z_en_fr.o" - include "build/data/overlays/actors/z_en_fr.data.o" +#ifdef NON_MATCHING + include "build/src/overlays/actors/ovl_En_Fr/ovl_En_Fr_reloc.o" +#else include "build/data/overlays/actors/z_en_fr.reloc.o" +#endif endseg beginseg diff --git a/src/overlays/actors/ovl_En_Fr/z_en_fr.c b/src/overlays/actors/ovl_En_Fr/z_en_fr.c index 4253a7a947..55d15145e8 100644 --- a/src/overlays/actors/ovl_En_Fr/z_en_fr.c +++ b/src/overlays/actors/ovl_En_Fr/z_en_fr.c @@ -1,4 +1,5 @@ #include "z_en_fr.h" +#include "vt.h" #define FLAGS 0x02000019 @@ -7,15 +8,125 @@ void EnFr_Init(Actor* thisx, GlobalContext* globalCtx); void EnFr_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnFr_Update(Actor* thisx, GlobalContext* globalCtx); +void EnFr_UpdateIdle(Actor* thisx, GlobalContext* globalCtx); +void EnFr_UpdateActive(Actor* thisx, GlobalContext* globalCtx); +void EnFr_Draw(Actor* thisx, GlobalContext* globalCtx); -extern UNK_TYPE D_05002470; -extern UNK_TYPE D_050036F0; -extern UNK_TYPE D_060007BC; -extern UNK_TYPE D_060011C0; -extern UNK_TYPE D_06001534; -extern UNK_TYPE D_0600B498; +// Animation Functions +void EnFr_SetupJumpingOutOfWater(EnFr* this, GlobalContext* globalCtx); +void EnFr_JumpingOutOfWater(EnFr* this, GlobalContext* globalCtx); +void EnFr_OrientOnLogSpot(EnFr* this, GlobalContext* globalCtx); +void EnFr_ChooseJumpFromLogSpot(EnFr* this, GlobalContext* globalCtx); +void EnFr_JumpingUp(EnFr* this, GlobalContext* globalCtx); +void EnFr_JumpingBackIntoWater(EnFr* this, GlobalContext* globalCtx); +void EnFr_DecrementBlinkTimerUpdate(EnFr* this); + +// Activation +void EnFr_Idle(EnFr* this, GlobalContext* globalCtx); +void EnFr_Activate(EnFr* this, GlobalContext* globalCtx); +void EnFr_ActivateCheckFrogSong(EnFr* this, GlobalContext* globalCtx); + +// Listening for Child Songs +void func_80A1BE98(EnFr* this, GlobalContext* globalCtx); +void EnFr_ListeningToOcarinaNotes(EnFr* this, GlobalContext* globalCtx); +void EnFr_ChildSong(EnFr* this, GlobalContext* globalCtx); +void EnFr_ChildSongFirstTime(EnFr* this, GlobalContext* globalCtx); + +// Frog Song for HP Functions +void EnFr_TalkBeforeFrogSong(EnFr* this, GlobalContext* globalCtx); +void EnFr_SetupFrogSong(EnFr* this, GlobalContext* globalCtx); +void EnFr_ContinueFrogSong(EnFr* this, GlobalContext* globalCtx); +void EnFr_OcarinaMistake(EnFr* this, GlobalContext* globalCtx); + +// Reward Functions +void EnFr_SetupReward(EnFr* this, GlobalContext* globalCtx, u8 unkCondition); +void EnFr_PrintTextBox(EnFr* this, GlobalContext* globalCtx); +void EnFr_TalkBeforeReward(EnFr* this, GlobalContext* globalCtx); +void EnFr_SetReward(EnFr* this, GlobalContext* globalCtx); + +// Deactivate +void EnFr_Deactivate(EnFr* this, GlobalContext* globalCtx); +void EnFr_GiveReward(EnFr* this, GlobalContext* globalCtx); +void EnFr_SetIdle(EnFr* this, GlobalContext* globalCtx); + +extern FlexSkeletonHeader D_0600B498; // Frog +extern AnimationHeader D_06001534; // Frog +extern SkeletonHeader D_050036F0; // Butterfly +extern AnimationHeader D_05002470; // Butterfly +extern AnimationHeader D_060007BC; // Frog Jumping +extern AnimationHeader D_060011C0; // Frog Landing /* +Frogs params WIP docs + +Represents 6 Actor Instances for frogs: + - 1 Prop actor instance set to where Link plays Ocarina, manages 5 frogs + - 5 NPC actor instances for the frogs themselves + +0: Prop Actor Instance (located where link detects ocarina, interacts with Link) +1: Frog 0 (Yellow) +2: Frog 1 (Blue) +3: Frog 2 (Red) +4: Frog 3 (Purple) +5: Frog 4 (White) + +Note that because of the Prop Actor, actor.params is 1 shifted from frogIndex +Therefore, frogIndex = actor.params - 1 + + +sEnFrPointers.flags = 1 + - Activate frogs, frogs will jump out of the water + +sEnFrPointers.flags = 1 to 11: + - Counter: Frogs will sequentially jump out based on counter: + - 1: Frog 1 (Blue) + - 3: frog 3 (Purple) + - 5: frog 0 (Yellow) + - 7: frog 2 (Red) + - 9: frog 4 (White) + - Will proceed when counter reachers 11 + +sEnFrPointers.flags = 12 + - Deactivate frogs, frogs will jump back into the water +*/ + +typedef struct { + u8 flags; + EnFr* frogs[5]; +} EnFrPointers; + +typedef struct { + f32 xzDist; + f32 yaw; + f32 yDist; +} LogSpotToFromWater; + +EnFrPointers sEnFrPointers = { + 0x00, + { + NULL, + NULL, + NULL, + NULL, + NULL, + }, +}; + +// Flags for gSaveContext.eventChkInf[13] +u16 sSongIndex[] = { + 0x0002, 0x0004, 0x0010, 0x0008, 0x0020, 0x0040, 0x0001, 0x0000, +}; + +// Frog to Index for Song Flag (sSongIndex) Mapping +u8 sFrogToSongIndex[] = { + FROG_SARIA, FROG_SUNS, FROG_SOT, FROG_ZL, FROG_EPONA, +}; + +// Song to Frog Index Mapping +static s32 sSongToFrog[] = { + FROG_PURPLE, FROG_WHITE, FROG_YELLOW, FROG_BLUE, FROG_RED, +}; + const ActorInit En_Fr_InitVars = { ACTOR_EN_FR, ACTORCAT_NPC, @@ -27,99 +138,962 @@ const ActorInit En_Fr_InitVars = { (ActorFunc)EnFr_Update, NULL, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1A9A0.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fr/EnFr_Init.s") +static Color_RGBA8 sEnFrColor[] = { + { 200, 170, 0, 255 }, { 0, 170, 200, 255 }, { 210, 120, 100, 255 }, { 120, 130, 230, 255 }, { 190, 190, 190, 255 }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1AC0C.s") +// Jumping back into water frog animation +// sLogSpotToFromWater[frog].xzDist is magnitude of xz distance frog travels +// sLogSpotToFromWater[frog].yaw is rot around y-axis of jumping back into water +// sLogSpotToFromWater[frog].yDist is change in y distance frog travels +static LogSpotToFromWater sLogSpotToFromWater[] = { + { 0.0f, 0.0f, 0.0f }, // Prop (Where link pulls ocarina) + { 80.0f, -0.375f * M_PI, -80.0f }, // FROG_YELLOW + { 80.0f, -0.5f * M_PI, -80.0f }, // FROG_BLUE + { 80.0f, -0.25f * M_PI, -80.0f }, // FROG_RED + { 80.0f, 0.875f * M_PI, -80.0f }, // FROG_PURPLE + { 80.0f, 0.5f * M_PI, -80.0f }, // FROG_WHITE +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1AC34.s") +// Timer values for the frog choir song +static s16 sTimerFrogSong[] = { + 40, 20, 15, 12, 12, +}; +// static InitChainEntry sInitChain[] +InitChainEntry D_80A1D0BC[] = { + ICHAIN_U8(targetMode, 2, ICHAIN_CONTINUE), + ICHAIN_F32(targetArrowOffset, 30, ICHAIN_STOP), +}; + +// Counter to Coordinate Frog jumping out of water one at a time +// Used as part of sEnFrPointers.flags +static u8 sTimerJumpingOutOfWater[] = { + 5, 1, 7, 3, 9, +}; + +// targetScale (default = 150.0) Actor scale target for Math_ApproachF +// Used as a frog grows from hearing a new child song +static f32 sGrowingScale[] = { + 180.0f, + 210.0f, + 240.0f, + 270.0f, +}; + +static u8 sPitchSmallFrog[] = { + 5, // C-Down Ocarina + 2, // A Button Ocarina + 9, // C-Right Ocarina + 11, // C-Left Ocarina + 14, // C Up Ocarina +}; + +static s8 sPitchLargeFrog[] = { + -7, // C-Down Ocarina + -10, // A Button Ocarina + -3, // C-Right Ocarina + -1, // C-Left Ocarina + 2, // C Up Ocarina +}; + +static u8 sJumpOrder[] = { + FROG_BLUE, FROG_YELLOW, FROG_RED, FROG_PURPLE, FROG_WHITE, FROG_BLUE, FROG_YELLOW, FROG_RED, +}; + +// probably can be replaced with a message context enum at a later time +// A, CDOWN, CRIGHT, CLEFT, CUP +static u8 sOcarinaNotes[] = { + 0, 1, 2, 3, 4, +}; + +void EnFr_OrientUnderwater(EnFr* this) { + Vec3f vec1; + Vec3f vec2; + + vec1.x = vec1.y = 0.0f; + vec1.z = this->xzDistToLogSpot = sLogSpotToFromWater[this->actor.params].xzDist; + Matrix_RotateY(sLogSpotToFromWater[this->actor.params].yaw, MTXMODE_NEW); + Matrix_MultVec3f(&vec1, &vec2); + this->actor.world.pos.x = this->posLogSpot.x + vec2.x; + this->actor.world.pos.z = this->posLogSpot.z + vec2.z; + this->actor.world.pos.y = sLogSpotToFromWater[this->actor.params].yDist + this->posLogSpot.y; + this->actor.world.rot.y = this->actor.shape.rot.y = + (s16)(sLogSpotToFromWater[this->actor.params].yaw * ((f32)0x8000 / M_PI)) + 0x8000; + this->actor.speedXZ = 0.0f; + this->actor.velocity.y = 0.0f; + this->actor.gravity = 0.0f; +} + +void EnFr_Init(Actor* thisx, GlobalContext* globalCtx) { + EnFr* this = THIS; + + if (this->actor.params == 0) { + this->actor.destroy = NULL; + this->actor.draw = NULL; + this->actor.update = EnFr_UpdateIdle; + this->actor.flags = this->actor.flags &= ~0x11; + Actor_ChangeCategory(globalCtx, &globalCtx->actorCtx, &this->actor, ACTORCAT_PROP); + this->actor.textId = 0x40AC; + this->actionFunc = EnFr_Idle; + } else { + if ((this->actor.params >= 6) || (this->actor.params < 0)) { + osSyncPrintf(VT_COL(RED, WHITE)); + // Translation: The argument is wrong!! + osSyncPrintf("%s[%d] : 引数が間違っている！！(%d)\n", "../z_en_fr.c", 370, this->actor.params); + osSyncPrintf(VT_RST); + __assert("0", "../z_en_fr.c", 372); + } + + this->objBankIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_GAMEPLAY_FIELD_KEEP); + if (this->objBankIndex < 0) { + Actor_Kill(&this->actor); + osSyncPrintf(VT_COL(RED, WHITE)); + // Translation: There is no bank!! + osSyncPrintf("%s[%d] : バンクが無いよ！！\n", "../z_en_fr.c", 380); + osSyncPrintf(VT_RST); + __assert("0", "../z_en_fr.c", 382); + } + } +} + +// Draw only the purple frog when ocarina is not pulled out on the log spot +void EnFr_DrawIdle(EnFr* this) { + this->actor.draw = (this->actor.params - 1) != FROG_PURPLE ? NULL : EnFr_Draw; +} + +void EnFr_DrawActive(EnFr* this) { + this->actor.draw = EnFr_Draw; +} + +// Down to regalloc +#ifdef NON_MATCHING +void EnFr_Update(Actor* thisx, GlobalContext* globalCtx) { + EnFr* this = THIS; + LightInfo* lightInfo; + s32 frogIndex; + s16 randomNumber; + + if (Object_IsLoaded(&globalCtx->objectCtx, this->objBankIndex)) { + this->actor.flags &= ~0x10; + frogIndex = this->actor.params - 1; + sEnFrPointers.frogs[frogIndex] = this; + Actor_ProcessInitChain(&this->actor, D_80A1D0BC); + // frog + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600B498, &D_06001534, this->jointTable, this->morphTable, + 24); + // butterfly + SkelAnime_Init(globalCtx, &this->skelAnimeButterfly, &D_050036F0, &D_05002470, this->jointTableButterfly, + this->morphTableButterfly, 8); + // When playing the frogs song for the HP, + // the frog with the next note and the butterfly + // turns on its lightsource + lightInfo = &this->lightInfo; + this->lightNode = LightContext_InsertLight(globalCtx, &globalCtx->lightCtx, lightInfo); + Lights_PointNoGlowSetInfo(lightInfo, this->actor.home.pos.x, this->actor.home.pos.y, this->actor.home.pos.z, + 255, 255, 255, -1); + // Check to see if the song for a particular frog has been played. + // If it has, the frog is larger. If not, the frog is smaller + this->scale = gSaveContext.eventChkInf[13] & sSongIndex[sFrogToSongIndex[frogIndex]] ? 270.0f : 150.0f; + // When the frogs are not active (link doesn't have his ocarina out), + // Then shrink the frogs down by a factor of 10,000 + Actor_SetScale(&this->actor, this->scale * 0.0001f); + this->actor.minVelocityY = -9999.0f; + Actor_SetFocus(&this->actor, 10.0f); + this->eyeTexIndex = 1; + this->blinkTimer = (s16)(Rand_ZeroFloat(60.0f) + 20.0f); + this->blinkFunc = EnFr_DecrementBlinkTimerUpdate; + + // regalloc issues here + this->isBelowWaterSurfaceCurrent = false; + this->isBelowWaterSurfacePrevious = false; + this->isJumpingUp = false; + this->actionFunc = EnFr_SetupJumpingOutOfWater; + this->posLogSpot = this->actor.world.pos; + this->isDeactivating = false; + this->growingScaleIndex = 0; + this->isActive = false; + this->isJumpingToFrogSong = false; + this->songIndex = FROG_NO_SONG; + this->unusedButterflyActor = NULL; + EnFr_OrientUnderwater(this); + EnFr_DrawIdle(this); + this->actor.update = EnFr_UpdateActive; + this->isButterflyDrawn = false; + this->xyAngleButterfly = 0x1000 * (s16)Rand_ZeroFloat(255.0f); + this->posButterflyLight.x = this->posButterfly.x = this->posLogSpot.x; + this->posButterflyLight.y = this->posButterfly.y = this->posLogSpot.y + 50.0f; + this->posButterflyLight.z = this->posButterfly.z = this->posLogSpot.z; + this->actor.flags &= ~1; + } +} +#else #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fr/EnFr_Update.s") +#endif -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fr/EnFr_Destroy.s") +void EnFr_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnFr* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1AF6C.s") + LightContext_RemoveLight(globalCtx, &globalCtx->lightCtx, this->lightNode); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1AFF0.s") +void EnFr_IsDivingIntoWater(EnFr* this, GlobalContext* globalCtx) { + WaterBox* waterBox; + f32 waterSurface; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B09C.s") + if (WaterBox_GetSurfaceImpl(globalCtx, &globalCtx->colCtx, this->actor.world.pos.x, this->actor.world.pos.z, + &waterSurface, &waterBox)) { + this->isBelowWaterSurfacePrevious = this->isBelowWaterSurfaceCurrent; + this->isBelowWaterSurfaceCurrent = this->actor.world.pos.y <= waterSurface ? true : false; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B0F8.s") +void EnFr_DivingIntoWater(EnFr* this, GlobalContext* globalCtx) { + Vec3f vec; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B174.s") + // Jumping into or out of water + if (this->isBelowWaterSurfaceCurrent != this->isBelowWaterSurfacePrevious) { + vec.x = this->actor.world.pos.x; + vec.y = this->actor.world.pos.y - 10.0f; + vec.z = this->actor.world.pos.z; + EffectSsGSplash_Spawn(globalCtx, &vec, NULL, NULL, 1, 1); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B19C.s") + if (this->isBelowWaterSurfaceCurrent == false) { + Audio_PlayActorSound2(&this->actor, NA_SE_EV_DIVE_INTO_WATER_L); + } else { + Audio_PlayActorSound2(&this->actor, NA_SE_EV_BOMB_DROP_WATER); + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B22C.s") +s32 EnFr_IsBelowLogSpot(EnFr* this, f32* yDistToLogSpot) { + yDistToLogSpot[0] = this->actor.world.pos.y - this->posLogSpot.y; + if ((this->actor.velocity.y < 0.0f) && (yDistToLogSpot[0] <= 0.0f)) { + this->actor.velocity.y = 0.0f; + this->actor.world.pos.y = this->posLogSpot.y; + return true; + } else { + return false; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B2C8.s") +s32 EnFr_IsAboveAndWithin30DistXZ(Player* player, EnFr* this) { + f32 xDistToPlayer = player->actor.world.pos.x - this->actor.world.pos.x; + f32 zDistToPlayer = player->actor.world.pos.z - this->actor.world.pos.z; + f32 yDistToPlayer = player->actor.world.pos.y - this->actor.world.pos.y; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B464.s") + return ((SQ(xDistToPlayer) + SQ(zDistToPlayer)) <= SQ(30.0f)) && (yDistToPlayer >= 0.0f); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B524.s") +void EnFr_DecrementBlinkTimer(EnFr* this) { + if (this->blinkTimer != 0) { + this->blinkTimer--; + } else { + this->blinkFunc = EnFr_DecrementBlinkTimerUpdate; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B638.s") +void EnFr_DecrementBlinkTimerUpdate(EnFr* this) { + if (this->blinkTimer != 0) { + this->blinkTimer--; + } else if (this->eyeTexIndex) { + this->eyeTexIndex = 0; + this->blinkTimer = (s16)(Rand_ZeroFloat(60.0f) + 20.0f); + this->blinkFunc = EnFr_DecrementBlinkTimer; + } else { + this->eyeTexIndex = 1; + this->blinkTimer = 1; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B778.s") +void EnFr_SetupJumpingOutOfWater(EnFr* this, GlobalContext* globalCtx) { + if (sEnFrPointers.flags == sTimerJumpingOutOfWater[this->actor.params - 1]) { + Animation_Change(&this->skelAnime, &D_060007BC, 1.0f, 0.0f, Animation_GetLastFrame(&D_060007BC), 2, 0.0f); + EnFr_DrawActive(this); + this->actionFunc = EnFr_JumpingOutOfWater; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B8D0.s") +void EnFr_JumpingOutOfWater(EnFr* this, GlobalContext* globalCtx) { + Vec3f vec1; + Vec3f vec2; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B9D8.s") + if (this->skelAnime.curFrame == 6.0f) { + sEnFrPointers.flags++; + this->skelAnime.playSpeed = 0.0f; + } else if (this->skelAnime.curFrame == 3.0f) { + this->actor.gravity = -10.0f; + this->actor.speedXZ = 0.0f; + this->actor.velocity.y = 47.0f; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BB34.s") + vec1.x = vec1.y = 0.0f; + vec1.z = this->xzDistToLogSpot; + Matrix_RotateY(((this->actor.world.rot.y + 0x8000) / (f32)0x8000) * M_PI, MTXMODE_NEW); + Matrix_MultVec3f(&vec1, &vec2); + this->actor.world.pos.x = this->posLogSpot.x + vec2.x; + this->actor.world.pos.z = this->posLogSpot.z + vec2.z; + if (this->skelAnime.curFrame >= 3.0f) { + Math_ApproachF(&this->xzDistToLogSpot, 0.0f, 1.0f, 10.0f); + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BC14.s") + if (EnFr_IsBelowLogSpot(this, &vec2.y)) { + this->actor.gravity = 0.0f; + this->actionFunc = EnFr_OrientOnLogSpot; + this->unusedFloat = 0.0f; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BCB4.s") + if ((this->actor.velocity.y <= 0.0f) && (vec2.y < 40.0f)) { + this->skelAnime.playSpeed = 1.0f; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BD94.s") +void EnFr_OrientOnLogSpot(EnFr* this, GlobalContext* globalCtx) { + s16 rotYRemaining = Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 2, 10000, 100); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BDFC.s") + this->actor.world.rot.y = this->actor.shape.rot.y; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BE98.s") + if ((rotYRemaining == 0) && (this->skelAnime.curFrame == this->skelAnime.endFrame)) { + sEnFrPointers.flags++; + this->actionFunc = EnFr_ChooseJumpFromLogSpot; + Animation_Change(&this->skelAnime, &D_06001534, 1.0f, 0.0f, Animation_GetLastFrame(&D_06001534), 0, 0.0f); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1BF10.s") +void EnFr_ChooseJumpFromLogSpot(EnFr* this, GlobalContext* globalCtx) { + if (sEnFrPointers.flags == 12) { + this->actor.world.rot.y = ((f32)0x8000 / M_PI) * sLogSpotToFromWater[this->actor.params].yaw; + Animation_Change(&this->skelAnime, &D_060007BC, 1.0f, 0.0f, Animation_GetLastFrame(&D_060007BC), 2, 0.0f); + this->actionFunc = EnFr_JumpingBackIntoWater; + } else if (this->isJumpingUp) { + Animation_Change(&this->skelAnime, &D_060007BC, 1.0f, 0.0f, Animation_GetLastFrame(&D_060007BC), 2, 0.0f); + this->actionFunc = EnFr_JumpingUp; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C05C.s") +void EnFr_JumpingUp(EnFr* this, GlobalContext* globalCtx) { + f32 yDistToLogSpot; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C18C.s") + if (this->skelAnime.curFrame == 6.0f) { + this->skelAnime.playSpeed = 0.0f; + } else if (this->skelAnime.curFrame == 3.0f) { + this->actor.gravity = -10.0f; + this->actor.velocity.y = 25.0f; + if (this->isJumpingToFrogSong) { + this->isJumpingToFrogSong = false; + Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_M_EAT); + } + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C1E4.s") + if (EnFr_IsBelowLogSpot(this, &yDistToLogSpot)) { + this->isJumpingUp = false; + this->actor.gravity = 0.0f; + Animation_Change(&this->skelAnime, &D_060011C0, 1.0f, 0.0f, Animation_GetLastFrame(&D_060011C0), 0, 0.0f); + this->actionFunc = EnFr_ChooseJumpFromLogSpot; + } else if ((this->actor.velocity.y <= 0.0f) && (yDistToLogSpot < 40.0f)) { + this->skelAnime.playSpeed = 1.0f; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C248.s") +void EnFr_JumpingBackIntoWater(EnFr* this, GlobalContext* globalCtx) { + f32 yUnderwater = sLogSpotToFromWater[this->actor.params].yDist + this->posLogSpot.y; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C344.s") + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.world.rot.y, 2, 10000, 100); + if (this->skelAnime.curFrame == 6.0f) { + this->skelAnime.playSpeed = 0.0f; + } else if (this->skelAnime.curFrame == 3.0f) { + this->actor.speedXZ = 6.0f; + this->actor.gravity = -10.0f; + this->actor.velocity.y = 25.0f; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C388.s") + // Final Spot Reached + if ((this->actor.velocity.y < 0.0f) && (this->actor.world.pos.y < yUnderwater)) { + Animation_Change(&this->skelAnime, &D_06001534, 1.0f, 0.0f, Animation_GetLastFrame(&D_06001534), 0, 0.0f); + this->actionFunc = EnFr_SetupJumpingOutOfWater; + EnFr_DrawIdle(this); + this->isDeactivating = true; + EnFr_OrientUnderwater(this); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C400.s") +void EnFr_SetScaleActive(EnFr* this, GlobalContext* globalCtx) { + switch (this->isGrowing) { + case false: + Math_ApproachF(&this->scale, sGrowingScale[this->growingScaleIndex], 2.0f, 25.0f); + if (this->scale >= sGrowingScale[this->growingScaleIndex]) { + this->scale = sGrowingScale[this->growingScaleIndex]; + if (this->growingScaleIndex < 3) { + this->isGrowing = true; + } else { + this->isJumpingUp = false; + this->isActive = false; + } + } + break; + case true: + Math_ApproachF(&this->scale, 150.0f, 2.0f, 25.0f); + if (this->scale <= 150.0f) { + this->scale = 150.0f; + this->growingScaleIndex++; + if (this->growingScaleIndex >= 4) { + this->growingScaleIndex = 3; + } + this->isGrowing = false; + } + break; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C474.s") +void EnFr_ButterflyPath(EnFr* this, GlobalContext* globalCtx) { + s16 rotY = this->actor.shape.rot.y; + f32 sin; + Vec3f vec1; + Vec3f vec2; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C524.s") + this->xyAngleButterfly += 0x1000; + Matrix_Translate(this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, MTXMODE_NEW); + Matrix_RotateRPY(this->actor.world.rot.x, this->actor.world.rot.y, this->actor.world.rot.z, MTXMODE_APPLY); + vec1.x = vec1.y = 0.0f; + vec1.z = 25.0f; + Matrix_MultVec3f(&vec1, &vec2); + sin = Math_SinS(this->xyAngleButterfly * 2) * 5.0f; + this->posButterfly.x = (Math_SinS(rotY) * sin) + vec2.x; + this->posButterfly.y = (2.0f * Math_CosS(this->xyAngleButterfly)) + (this->posLogSpot.y + 50.0f); + this->posButterfly.z = (Math_CosS(rotY) * sin) + vec2.z; + Matrix_Translate(this->posButterfly.x, this->posButterfly.y, this->posButterfly.z, MTXMODE_NEW); + Matrix_RotateRPY(this->actor.world.rot.x, this->actor.world.rot.y, this->actor.world.rot.z, MTXMODE_APPLY); + vec1.x = 0.0f; + vec1.y = -15.0f; + vec1.z = 20.0f; + Matrix_MultVec3f(&vec1, &this->posButterflyLight); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C580.s") +void EnFr_UpdateActive(Actor* thisx, GlobalContext* globalCtx) { + EnFr* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C718.s") + this->jumpCounter++; + Actor_SetScale(&this->actor, this->scale * 0.0001f); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C790.s") + if (this->isActive) { + EnFr_SetScaleActive(this, globalCtx); + } else { + Actor_SetFocus(&this->actor, 10.0f); + this->blinkFunc(this); + this->actionFunc(this, globalCtx); + EnFr_IsDivingIntoWater(this, globalCtx); + EnFr_DivingIntoWater(this, globalCtx); + SkelAnime_Update(&this->skelAnime); + SkelAnime_Update(&this->skelAnimeButterfly); + EnFr_ButterflyPath(this, globalCtx); + Actor_MoveForward(&this->actor); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C7CC.s") +s32 EnFr_SetupJumpingUp(EnFr* this, s32 frogIndex) { + EnFr* frog = sEnFrPointers.frogs[frogIndex]; + u8 audioPitch; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C830.s") + if (frog != NULL && frog->isJumpingUp == false) { + audioPitch = frog->growingScaleIndex == 3 ? sPitchLargeFrog[frogIndex] : sPitchSmallFrog[frogIndex]; + if (this->songIndex == FROG_CHOIR_SONG) { + frog->isJumpingToFrogSong = true; + } + frog->isJumpingUp = true; + func_800F4BF4(&frog->actor.projectedPos, NA_SE_EV_FROG_JUMP, (s8)audioPitch); + return true; + } else { + return false; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1C944.s") +void EnFr_Idle(EnFr* this, GlobalContext* globalCtx) { + Player* player = PLAYER; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CAAC.s") + if (player->stateFlags2 & 0x2000000) { + if (globalCtx->msgCtx.unk_E3EE == 4) { + globalCtx->msgCtx.unk_E3EE = 0; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CB08.s") + func_800800F8(globalCtx, 0x100E, ~0x62, &this->actor, 0); + globalCtx->msgCtx.msgMode = 0x37; + player->actor.world.pos.x = this->actor.world.pos.x; // x = 990.0f + player->actor.world.pos.y = this->actor.world.pos.y; // y = 205.0f + player->actor.world.pos.z = this->actor.world.pos.z; // z = -1220.0f + player->currentYaw = player->actor.world.rot.y = player->actor.shape.rot.y = this->actor.world.rot.y; + this->reward = GI_NONE; + this->actionFunc = EnFr_Activate; + } else if (EnFr_IsAboveAndWithin30DistXZ(player, this)) { + player->unk_6A8 = &this->actor; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CB58.s") +void EnFr_Activate(EnFr* this, GlobalContext* globalCtx) { + if (globalCtx->msgCtx.msgMode == 0xC) { + globalCtx->msgCtx.msgMode = 0x37; + sEnFrPointers.flags = 1; + this->actionFunc = EnFr_ActivateCheckFrogSong; + } else if (globalCtx->msgCtx.msgMode == 0x37) { // Goes to Frogs 2 Song + sEnFrPointers.flags = 1; + this->actionFunc = EnFr_ActivateCheckFrogSong; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CC04.s") +void EnFr_ActivateCheckFrogSong(EnFr* this, GlobalContext* globalCtx) { + if (sEnFrPointers.flags == 11) { + // Check if all 6 child songs have been played for the frogs + if ((gSaveContext.eventChkInf[13] & 0x2) // ZL + && (gSaveContext.eventChkInf[13] & 0x4) // Epona + && (gSaveContext.eventChkInf[13] & 0x10) // Saria + && (gSaveContext.eventChkInf[13] & 0x8) // Suns + && (gSaveContext.eventChkInf[13] & 0x20) // SoT + && (gSaveContext.eventChkInf[13] & 0x40)) { // SoS + this->actionFunc = EnFr_TalkBeforeFrogSong; + this->songIndex = FROG_CHOIR_SONG; + func_8010B680(globalCtx, 0x40AB, &this->actor); + } else { + this->songIndex = FROG_ZL; + this->actionFunc = func_80A1BE98; + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CC2C.s") +void func_80A1BE98(EnFr* this, GlobalContext* globalCtx) { + EnFr* frog; + s32 frogIndex; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CD24.s") + for (frogIndex = 0; frogIndex < ARRAY_COUNT(sEnFrPointers.frogs); frogIndex++) { + frog = sEnFrPointers.frogs[frogIndex]; + if (frog != NULL && frog->actionFunc == EnFr_ChooseJumpFromLogSpot) { + continue; + } else { + return; + } + } + + func_8010BD58(globalCtx, 0x30); + this->actionFunc = EnFr_ListeningToOcarinaNotes; +} + +void EnFr_ListeningToOcarinaNotes(EnFr* this, GlobalContext* globalCtx) { + this->songIndex = FROG_NO_SONG; + switch (globalCtx->msgCtx.unk_E3EE) { // Ocarina Song played + case 7: + this->songIndex = FROG_ZL; + break; + case 6: + this->songIndex = FROG_EPONA; + break; + case 5: + this->songIndex = FROG_SARIA; + break; + case 8: + this->songIndex = FROG_SUNS; + break; + case 9: + this->songIndex = FROG_SOT; + break; + case 10: + this->songIndex = FROG_STORMS; + break; + case 4: + EnFr_OcarinaMistake(this, globalCtx); + break; + case 1: // Ocarina note played, but no song played + switch (globalCtx->msgCtx.unk_E410) { // Jumping frogs in open ocarina based on ocarina note played + case 0: + EnFr_SetupJumpingUp(this, FROG_BLUE); + break; + case 1: + EnFr_SetupJumpingUp(this, FROG_YELLOW); + break; + case 2: + EnFr_SetupJumpingUp(this, FROG_RED); + break; + case 3: + EnFr_SetupJumpingUp(this, FROG_PURPLE); + break; + case 4: + EnFr_SetupJumpingUp(this, FROG_WHITE); + break; + } + } + if (this->songIndex != FROG_NO_SONG) { + this->jumpCounter = 0; + this->actionFunc = EnFr_ChildSong; + } +} + +void EnFr_ChildSong(EnFr* this, GlobalContext* globalCtx) { + EnFr* frog; + u8 songIndex; + + if (this->jumpCounter < 48) { + if (this->jumpCounter % 4 == 0) { + EnFr_SetupJumpingUp(this, sJumpOrder[(this->jumpCounter >> 2) & 7]); + } + } else { + songIndex = this->songIndex; + if (songIndex == FROG_STORMS) { + this->actor.textId = 0x40AA; + EnFr_SetupReward(this, globalCtx, false); + } else if (!(gSaveContext.eventChkInf[13] & sSongIndex[songIndex])) { + frog = sEnFrPointers.frogs[sSongToFrog[songIndex]]; + func_80078884(NA_SE_SY_CORRECT_CHIME); + if (frog->actionFunc == EnFr_ChooseJumpFromLogSpot) { + frog->isJumpingUp = true; + frog->isActive = true; + Audio_PlayActorSound2(&frog->actor, NA_SE_EV_FROG_GROW_UP); + this->actionFunc = EnFr_ChildSongFirstTime; + } else { + this->jumpCounter = 48; + } + } else { + this->actor.textId = 0x40A9; + EnFr_SetupReward(this, globalCtx, true); + } + } +} + +void EnFr_ChildSongFirstTime(EnFr* this, GlobalContext* globalCtx) { + EnFr* frog = sEnFrPointers.frogs[sSongToFrog[this->songIndex]]; + if (frog->isActive == false) { + this->actor.textId = 0x40A9; + EnFr_SetupReward(this, globalCtx, true); + } +} + +void EnFr_TalkBeforeFrogSong(EnFr* this, GlobalContext* globalCtx) { + if ((func_8010BDBC(&globalCtx->msgCtx) == 5) && (func_80106BC8(globalCtx))) { + func_80106CCC(globalCtx); + this->frogSongTimer = 2; + this->actionFunc = EnFr_SetupFrogSong; + } +} + +void EnFr_CheckOcarinaInputFrogSong(u8 ocarinaNote) { + EnFr* frog; + s32 frogIndexButterfly; + s32 frogIndex; + + switch (ocarinaNote) { + case 0: + frogIndexButterfly = FROG_BLUE; + break; + case 1: + frogIndexButterfly = FROG_YELLOW; + break; + case 2: + frogIndexButterfly = FROG_RED; + break; + case 3: + frogIndexButterfly = FROG_PURPLE; + break; + case 4: + frogIndexButterfly = FROG_WHITE; + } + // Turn on or off butterfly above frog + for (frogIndex = 0; frogIndex < ARRAY_COUNT(sEnFrPointers.frogs); frogIndex++) { + frog = sEnFrPointers.frogs[frogIndex]; + frog->isButterflyDrawn = frogIndex == frogIndexButterfly ? true : false; + } +} + +void EnFr_DeactivateButterfly() { + s32 frogIndex; + EnFr* frog; + + for (frogIndex = 0; frogIndex < ARRAY_COUNT(sEnFrPointers.frogs); frogIndex++) { + frog = sEnFrPointers.frogs[frogIndex]; + frog->isButterflyDrawn = false; + } +} + +u8 EnFr_GetNextNoteFrogSong(u8 ocarinaNoteIndex) { + if (!(gSaveContext.eventChkInf[13] & 1)) { + return gFrogsSongPtr[ocarinaNoteIndex]; + } else { + return sOcarinaNotes[(s32)Rand_ZeroFloat(60.0f) % 5]; + } +} + +void EnFr_SetupFrogSong(EnFr* this, GlobalContext* globalCtx) { + if (this->frogSongTimer != 0) { + this->frogSongTimer--; + } else { + this->frogSongTimer = 40; + this->ocarinaNoteIndex = 0; + func_8010BD58(globalCtx, 0x2F); + this->ocarinaNote = EnFr_GetNextNoteFrogSong(this->ocarinaNoteIndex); + EnFr_CheckOcarinaInputFrogSong(this->ocarinaNote); + this->actionFunc = EnFr_ContinueFrogSong; + } +} + +s32 EnFr_IsFrogSongComplete(EnFr* this, GlobalContext* globalCtx) { + u8 index; + u8 ocarinaNote; + MessageContext* msgCtx = &globalCtx->msgCtx; + u8 ocarinaNoteIndex; + + if (this->ocarinaNote == (*msgCtx).unk_E410) { // required to match, possibly an array? + this->ocarinaNoteIndex++; + ocarinaNoteIndex = this->ocarinaNoteIndex; + if (1) {} + if (ocarinaNoteIndex >= 14) { // Frog Song is completed + this->ocarinaNoteIndex = 13; + return true; + } + // The first four notes have more frames to receive an input + index = ocarinaNoteIndex < 4 ? (s32)ocarinaNoteIndex : 4; + ocarinaNote = EnFr_GetNextNoteFrogSong(ocarinaNoteIndex); + this->ocarinaNote = ocarinaNote; + EnFr_CheckOcarinaInputFrogSong(ocarinaNote); + this->frogSongTimer = sTimerFrogSong[index]; + } + return false; +} + +void EnFr_OcarinaMistake(EnFr* this, GlobalContext* globalCtx) { + func_80106CCC(globalCtx); + this->reward = GI_NONE; + func_80078884(NA_SE_SY_OCARINA_ERROR); + func_800ED858(0); + sEnFrPointers.flags = 12; + EnFr_DeactivateButterfly(); + this->actionFunc = EnFr_Deactivate; +} + +void EnFr_ContinueFrogSong(EnFr* this, GlobalContext* globalCtx) { + s32 counter; + EnFr* frog; + s32 i; + + if (this->frogSongTimer == 0) { + EnFr_OcarinaMistake(this, globalCtx); + } else { + this->frogSongTimer--; + if (globalCtx->msgCtx.msgMode == 0x32) { + counter = 0; + for (i = 0; i < ARRAY_COUNT(sEnFrPointers.frogs); i++) { + frog = sEnFrPointers.frogs[i]; + if (frog != NULL && frog->actionFunc == EnFr_ChooseJumpFromLogSpot) { + continue; + } else { + counter++; + } + } + if (counter == 0 && CHECK_BTN_ALL(globalCtx->state.input[0].press.button, BTN_B)) { + EnFr_OcarinaMistake(this, globalCtx); + return; + } + } + + if (globalCtx->msgCtx.msgMode == 0x33) { + globalCtx->msgCtx.msgMode = 0x31; + switch (globalCtx->msgCtx.unk_E410) { + case 0: + EnFr_SetupJumpingUp(this, FROG_BLUE); + break; + case 1: + EnFr_SetupJumpingUp(this, FROG_YELLOW); + break; + case 2: + EnFr_SetupJumpingUp(this, FROG_RED); + break; + case 3: + EnFr_SetupJumpingUp(this, FROG_PURPLE); + break; + case 4: + EnFr_SetupJumpingUp(this, FROG_WHITE); + } + if (EnFr_IsFrogSongComplete(this, globalCtx)) { + this->actor.textId = 0x40AC; + EnFr_SetupReward(this, globalCtx, false); + } + } + } +} + +void EnFr_SetupReward(EnFr* this, GlobalContext* globalCtx, u8 unkCondition) { + EnFr_DeactivateButterfly(); + if (unkCondition) { + func_80078884(NA_SE_SY_TRE_BOX_APPEAR); + } else { + func_80078884(NA_SE_SY_CORRECT_CHIME); + } + + func_800ED858(0); + globalCtx->msgCtx.msgMode = 0x37; + this->actionFunc = EnFr_PrintTextBox; +} + +void EnFr_PrintTextBox(EnFr* this, GlobalContext* globalCtx) { + func_8010B680(globalCtx, this->actor.textId, &this->actor); + this->actionFunc = EnFr_TalkBeforeReward; +} + +void EnFr_TalkBeforeReward(EnFr* this, GlobalContext* globalCtx) { + if ((func_8010BDBC(&globalCtx->msgCtx) == 5) && func_80106BC8(globalCtx)) { + this->frogSongTimer = 100; + func_80106CCC(globalCtx); + this->actionFunc = EnFr_SetReward; + } +} + +void EnFr_SetReward(EnFr* this, GlobalContext* globalCtx) { + u16 songIndex; + + sEnFrPointers.flags = 12; + songIndex = this->songIndex; + this->actionFunc = EnFr_Deactivate; + this->reward = GI_NONE; + if ((songIndex >= FROG_ZL) && (songIndex <= FROG_SOT)) { + if (!(gSaveContext.eventChkInf[13] & sSongIndex[songIndex])) { + gSaveContext.eventChkInf[13] |= sSongIndex[songIndex]; + this->reward = GI_RUPEE_PURPLE; + } else { + this->reward = GI_RUPEE_BLUE; + } + } else if (songIndex == FROG_STORMS) { + if (!(gSaveContext.eventChkInf[13] & sSongIndex[songIndex])) { + gSaveContext.eventChkInf[13] |= sSongIndex[songIndex]; + this->reward = GI_HEART_PIECE; + } else { + this->reward = GI_RUPEE_BLUE; + } + } else if (songIndex == FROG_CHOIR_SONG) { + if (!(gSaveContext.eventChkInf[13] & sSongIndex[songIndex])) { + gSaveContext.eventChkInf[13] |= sSongIndex[songIndex]; + this->reward = GI_HEART_PIECE; + } else { + this->reward = GI_RUPEE_PURPLE; + } + } +} + +void EnFr_Deactivate(EnFr* this, GlobalContext* globalCtx) { + EnFr* frogLoop1; + EnFr* frogLoop2; + s32 frogIndex; + + // Originally was going to have separate butterfly actor + // Changed to include butterfly as part of frog actor + // This unused code would have frozen the butterfly actor above frog + if (this->unusedButterflyActor != NULL) { + this->unusedButterflyActor->freezeTimer = 10; + } + + for (frogIndex = 0; frogIndex < ARRAY_COUNT(sEnFrPointers.frogs); frogIndex++) { + frogLoop1 = sEnFrPointers.frogs[frogIndex]; + if (frogLoop1 == NULL) { + osSyncPrintf(VT_COL(RED, WHITE)); + // Translation: There are no frogs!? + osSyncPrintf("%s[%d]カエルがいない！？\n", "../z_en_fr.c", 1604); + osSyncPrintf(VT_RST); + return; + } else if (frogLoop1->isDeactivating != true) { + return; + } + } + + for (frogIndex = 0; frogIndex < ARRAY_COUNT(sEnFrPointers.frogs); frogIndex++) { + frogLoop2 = sEnFrPointers.frogs[frogIndex]; + if (frogLoop2 == NULL) { + osSyncPrintf(VT_COL(RED, WHITE)); + // Translation: There are no frogs!? + osSyncPrintf("%s[%d]カエルがいない！？\n", "../z_en_fr.c", 1618); + osSyncPrintf(VT_RST); + return; + } + frogLoop2->isDeactivating = false; + } + + globalCtx->msgCtx.unk_E3EE = 4; + Audio_PlayActorSound2(&this->actor, NA_SE_EV_FROG_CRY_0); + if (this->reward == GI_NONE) { + this->actionFunc = EnFr_Idle; + } else { + this->actionFunc = EnFr_GiveReward; + func_8002F434(&this->actor, globalCtx, this->reward, 30.0f, 100.0f); + } +} + +void EnFr_GiveReward(EnFr* this, GlobalContext* globalCtx) { + if (Actor_HasParent(&this->actor, globalCtx)) { + this->actor.parent = NULL; + this->actionFunc = EnFr_SetIdle; + } else { + func_8002F434(&this->actor, globalCtx, this->reward, 30.0f, 100.0f); + } +} + +void EnFr_SetIdle(EnFr* this, GlobalContext* globalCtx) { + if ((func_8010BDBC(&globalCtx->msgCtx) == 6) && (func_80106BC8(globalCtx))) { + this->actionFunc = EnFr_Idle; + } +} + +void EnFr_UpdateIdle(Actor* thisx, GlobalContext* globalCtx) { + EnFr* this = THIS; + + if (BREG(0)) { + DebugDisplay_AddObject(this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, + this->actor.world.rot.x, this->actor.world.rot.y, this->actor.world.rot.z, 1.0f, 1.0f, + 1.0f, 255, 0, 0, 255, 4, globalCtx->state.gfxCtx); + } + this->jumpCounter++; + this->actionFunc(this, globalCtx); +} + +s32 EnFr_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { + if ((limbIndex == 7) || (limbIndex == 8)) { + *dList = NULL; + } + return 0; +} + +void EnFr_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) { + EnFr* this = THIS; + + if ((limbIndex == 7) || (limbIndex == 8)) { + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_fr.c", 1735); + Matrix_Push(); + func_800D1FD4(&globalCtx->mf_11DA0); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_fr.c", 1738), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_OPA_DISP++, *dList); + Matrix_Pull(); + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_fr.c", 1741); + } +} + +void EnFr_Draw(Actor* thisx, GlobalContext* globalCtx) { + static u64* eyeTextures[] = { 0x060059A0, 0x06005BA0 }; + s16 lightRadius; + EnFr* this = THIS; + s16 frogIndex = this->actor.params - 1; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_fr.c", 1754); + func_80093D18(globalCtx->state.gfxCtx); + // For the frogs 2 HP, the frog with the next note and the butterfly lights up + lightRadius = this->isButterflyDrawn ? 95 : -1; + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, 255, 255, 255, 255); + Lights_PointNoGlowSetInfo(&this->lightInfo, this->posButterflyLight.x, this->posButterflyLight.y, + this->posButterflyLight.z, 255, 255, 255, lightRadius); + gDPSetEnvColor(POLY_OPA_DISP++, sEnFrColor[frogIndex].r, sEnFrColor[frogIndex].g, sEnFrColor[frogIndex].b, 255); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTextures[this->eyeTexIndex])); + gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(eyeTextures[this->eyeTexIndex])); + SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, + EnFr_OverrideLimbDraw, EnFr_PostLimbDraw, this); + if (this->isButterflyDrawn) { + Matrix_Translate(this->posButterfly.x, this->posButterfly.y, this->posButterfly.z, MTXMODE_NEW); + Matrix_Scale(0.015f, 0.015f, 0.015f, MTXMODE_APPLY); + Matrix_RotateRPY(this->actor.shape.rot.x, this->actor.shape.rot.y, this->actor.shape.rot.z, MTXMODE_APPLY); + SkelAnime_DrawOpa(globalCtx, this->skelAnimeButterfly.skeleton, this->skelAnimeButterfly.jointTable, NULL, NULL, + NULL); + } + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_fr.c", 1816); +} diff --git a/src/overlays/actors/ovl_En_Fr/z_en_fr.h b/src/overlays/actors/ovl_En_Fr/z_en_fr.h index 1eb0b2bda9..774a60c756 100644 --- a/src/overlays/actors/ovl_En_Fr/z_en_fr.h +++ b/src/overlays/actors/ovl_En_Fr/z_en_fr.h @@ -6,9 +6,67 @@ struct EnFr; +typedef void (*EnFrActionFunc)(struct EnFr*, GlobalContext*); +typedef void (*EnFrBlinkFunc)(struct EnFr*); + +typedef enum { + /* 00 */ FROG_YELLOW, // Middle + /* 01 */ FROG_BLUE, // Front Left + /* 02 */ FROG_RED, // Front Right + /* 03 */ FROG_PURPLE, // Back Left + /* 04 */ FROG_WHITE // Back Right +} FrogType; + +typedef enum { + /* 00 */ FROG_ZL, + /* 01 */ FROG_EPONA, + /* 02 */ FROG_SARIA, + /* 03 */ FROG_SUNS, + /* 04 */ FROG_SOT, + /* 05 */ FROG_STORMS, + /* 06 */ FROG_CHOIR_SONG, + /* 07 */ FROG_NO_SONG +} FrogSongType; + typedef struct EnFr { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x278]; + /* 0x014C */ SkelAnime skelAnime; // Frog Skeleton + /* 0x0190 */ Vec3s jointTable[24]; + /* 0x0220 */ Vec3s morphTable[24]; + /* 0x02B0 */ SkelAnime skelAnimeButterfly; // Butterfly Skeleton above Frog during Frog Song + /* 0x02F4 */ Vec3s jointTableButterfly[8]; + /* 0x0324 */ Vec3s morphTableButterfly[8]; + /* 0x0354 */ EnFrActionFunc actionFunc; + /* 0x0358 */ LightNode* lightNode; // Frogs light up during the Frog Song, specifically the frog with the next note. + /* 0x035C */ LightInfo lightInfo; + /* 0x036A */ s8 objBankIndex; + /* 0x036C */ s32 jumpCounter; // cyclic clock used to time celebratory frog jumps every 4 frames when child song is played. + /* 0x0370 */ s32 blinkTimer; // blinking timer + /* 0x0374 */ EnFrBlinkFunc blinkFunc; // unique case of using a function pointer for blinking + /* 0x0378 */ u8 eyeTexIndex; // index for blinking graphics + /* 0x0379 */ u8 isJumpingUp; // Conditional for jumping up from the log back onto the log + /* 0x037A */ u8 isBelowWaterSurfaceCurrent; // Used for diving effects + /* 0x037B */ u8 isBelowWaterSurfacePrevious; + /* 0x037C */ u8 isDeactivating; // Related to debugging (osSyncPrintf) + /* 0x037D */ u8 isActive; // Each Frog grows when their specific song is played. + /* 0x037E */ u8 growingScaleIndex; // Target Scale Level 0-3 while growing (3 highest smooth) + /* 0x037F */ u8 isGrowing; // While growing, the frog will switch between its larger size and its original size every frame + /* 0x0380 */ u8 ocarinaNoteIndex; // Related to unk_381 + /* 0x0381 */ u8 ocarinaNote; // Ocarina Note to Play for Frogs 2. Related to globalCtx->msgCtx.unk_E410 + /* 0x0382 */ u8 songIndex; // Song index 1-7 (6 songs + custom HP Song): 5 = sos, 6 = all songs + /* 0x0383 */ u8 isJumpingToFrogSong; // Conditional: + /* 0x0384 */ char unk_384[0x02]; + /* 0x0386 */ s16 frogSongTimer; // timer #2 for frogs 2 HP + /* 0x0388 */ s32 reward; // Prize for completing a song + /* 0x038C */ Vec3f posLogSpot; // Where the frog goes when activated + /* 0x0398 */ f32 xzDistToLogSpot; // z position or axis + /* 0x039C */ f32 unusedFloat; // Unused float, only set to zero. + /* 0x03A0 */ f32 scale; //scale + /* 0x03A4 */ Actor* unusedButterflyActor; // unused pointer to Actor. Likely intended for butterfly + /* 0x03A8 */ u8 isButterflyDrawn; // isButterflyDrawn + /* 0x03AA */ s16 xyAngleButterfly; // Butterfly Travels along random angles in the x-y plane + /* 0x03AC */ Vec3f posButterfly; // Position/Coordinates of the Butterfly + /* 0x03B8 */ Vec3f posButterflyLight; // Used in Lights_PointNoGlowSetInfo() } EnFr; // size = 0x03C4 extern const ActorInit En_Fr_InitVars; diff --git a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c index fdd7e6eb57..ceb9cb4c62 100644 --- a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c +++ b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c @@ -99,7 +99,7 @@ void func_80A8F320(EnKakasi* this, GlobalContext* globalCtx, s16 arg) { s16 phi_v0; s16 currentFrame; - phi_v0 = globalCtx->msgCtx.unk_E410[0]; + phi_v0 = globalCtx->msgCtx.unk_E410; if (arg != 0) { if (this->unk_19C[3] == 0) { this->unk_19C[3] = (s16)Rand_ZeroFloat(10.99f) + 30; diff --git a/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c b/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c index 407e1a8b0e..0c93f4b66f 100644 --- a/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c +++ b/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c @@ -102,7 +102,7 @@ void func_80A90EBC(EnKakasi3* this, GlobalContext* globalCtx, s32 arg) { s16 currentFrame; s16 phi_v0; - phi_v0 = globalCtx->msgCtx.unk_E410[0]; + phi_v0 = globalCtx->msgCtx.unk_E410; if (arg != 0) { if (this->unk_19C[3] == 0) { this->unk_19C[3] = (s16)Rand_ZeroFloat(10.99f) + 30;