From 8e7ca2d497d41c00871de43b00bdf6e2380c70b1 Mon Sep 17 00:00:00 2001 From: Lucas Shaw <49287729+shawlucas@users.noreply.github.com> Date: Sun, 10 May 2020 16:44:04 -0700 Subject: [PATCH] 35/37 Functions Decompiled in ovl_En_Heishi2 (#117) * started * did more work * did some more * Update * Merged master * EnHeishi2_Update OK * func_80A549E8 OK * func_80A54954 OK * EnHeishi2_Draw OK * Removed unused asm * func_80A543A0 OK * func_80A53638 OK. Fixed type of func_8008F08C * done for rn, will work on it later * func_80A53850 OK * func_80A53F30 OK * func_80A53D0C OK * Made cylinderInit in En_Ma3 static * Made suggested changes. Removed return from functions by adding else * Made suggested changes. Removed a.out file that accidentally got added * Made suggested changes * moved #include from header to c file * fixed formatting * added line break * Made suggested changes * ran format * Fixed unk_2F2 --- .../actors/ovl_En_Heishi2/EnHeishi2_Destroy.s | 20 - .../actors/ovl_En_Heishi2/EnHeishi2_Draw.s | 137 --- .../actors/ovl_En_Heishi2/EnHeishi2_Init.s | 248 ----- .../actors/ovl_En_Heishi2/EnHeishi2_Update.s | 93 -- .../actors/ovl_En_Heishi2/func_80A531CC.s | 4 - .../actors/ovl_En_Heishi2/func_80A531D8.s | 4 - .../actors/ovl_En_Heishi2/func_80A531E4.s | 40 - .../actors/ovl_En_Heishi2/func_80A53278.s | 158 ---- .../actors/ovl_En_Heishi2/func_80A5344C.s | 68 -- .../actors/ovl_En_Heishi2/func_80A53538.s | 37 - .../actors/ovl_En_Heishi2/func_80A535BC.s | 34 - .../actors/ovl_En_Heishi2/func_80A53638.s | 77 -- .../actors/ovl_En_Heishi2/func_80A5372C.s | 91 -- .../actors/ovl_En_Heishi2/func_80A53850.s | 50 - .../actors/ovl_En_Heishi2/func_80A53908.s | 40 - .../actors/ovl_En_Heishi2/func_80A5399C.s | 94 -- .../actors/ovl_En_Heishi2/func_80A53AD4.s | 88 -- .../actors/ovl_En_Heishi2/func_80A53C0C.s | 37 - .../actors/ovl_En_Heishi2/func_80A53C90.s | 34 - .../actors/ovl_En_Heishi2/func_80A53D0C.s | 75 -- .../actors/ovl_En_Heishi2/func_80A53DF8.s | 92 -- .../actors/ovl_En_Heishi2/func_80A53F30.s | 73 -- .../actors/ovl_En_Heishi2/func_80A54038.s | 38 - .../actors/ovl_En_Heishi2/func_80A540C0.s | 87 -- .../actors/ovl_En_Heishi2/func_80A541FC.s | 36 - .../actors/ovl_En_Heishi2/func_80A5427C.s | 46 - .../actors/ovl_En_Heishi2/func_80A54320.s | 35 - .../actors/ovl_En_Heishi2/func_80A543A0.s | 78 -- .../actors/ovl_En_Heishi2/func_80A544AC.s | 48 - .../actors/ovl_En_Heishi2/func_80A546DC.s | 37 - .../actors/ovl_En_Heishi2/func_80A54954.s | 40 - .../actors/ovl_En_Heishi2/func_80A549E8.s | 41 - .../actors/ovl_En_Heishi2/func_80A54BC0.s | 32 - .../actors/ovl_En_Heishi2/func_80A54C34.s | 16 - .../actors/ovl_En_Heishi2/func_80A54C6C.s | 63 -- data/overlays/actors/z_en_heishi2.data.s | 18 - include/functions.h | 2 +- spec | 1 - src/code/z_player_lib.c | 3 +- .../ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c | 29 +- .../ovl_Bg_Gate_Shutter/z_bg_gate_shutter.h | 6 +- .../actors/ovl_En_Heishi2/z_en_heishi2.c | 868 +++++++++++++++++- .../actors/ovl_En_Heishi2/z_en_heishi2.h | 41 +- src/overlays/actors/ovl_En_Ma3/z_en_ma3.c | 4 +- undefined_syms.txt | 7 + 45 files changed, 899 insertions(+), 2271 deletions(-) delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Destroy.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Draw.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Init.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Update.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A531CC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A531D8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A531E4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53278.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5344C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53538.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A535BC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53638.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5372C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53850.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53908.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5399C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53AD4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53C0C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53C90.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53D0C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53DF8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53F30.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54038.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A540C0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A541FC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5427C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54320.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A543A0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A544AC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A546DC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54954.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A549E8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54BC0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54C34.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54C6C.s delete mode 100644 data/overlays/actors/z_en_heishi2.data.s diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Destroy.s deleted file mode 100644 index 4c00cc7963..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Destroy.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel EnHeishi2_Destroy -/* 002EC 80A5318C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 002F0 80A53190 AFBF0014 */ sw $ra, 0x0014($sp) -/* 002F4 80A53194 848E03D8 */ lh $t6, 0x03D8($a0) ## 000003D8 -/* 002F8 80A53198 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 002FC 80A5319C 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 00300 80A531A0 15C00004 */ bne $t6, $zero, .L80A531B4 -/* 00304 80A531A4 24C50398 */ addiu $a1, $a2, 0x0398 ## $a1 = 00000398 -/* 00308 80A531A8 848F03DA */ lh $t7, 0x03DA($a0) ## 000003DA -/* 0030C 80A531AC 51E00004 */ beql $t7, $zero, .L80A531C0 -/* 00310 80A531B0 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A531B4: -/* 00314 80A531B4 0C0170EB */ jal Collider_DestroyCylinder - -/* 00318 80A531B8 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 0031C 80A531BC 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A531C0: -/* 00320 80A531C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00324 80A531C4 03E00008 */ jr $ra -/* 00328 80A531C8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Draw.s deleted file mode 100644 index 1fa792e220..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Draw.s +++ /dev/null @@ -1,137 +0,0 @@ -.rdata -glabel D_80A55294 - .asciz "../z_en_heishi2.c" - .balign 4 - -glabel D_80A552A8 - .asciz "../z_en_heishi2.c" - .balign 4 - -glabel D_80A552BC - .asciz "../z_en_heishi2.c" - .balign 4 - -.late_rodata -glabel D_80A552FC - .word 0xC40E8000 -glabel D_80A55300 - .word 0x3F9C61AA, 0x00000000, 0x00000000, 0x00000000 - -.text -glabel EnHeishi2_Draw -/* 01E8C 80A54D2C 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 01E90 80A54D30 AFB10024 */ sw $s1, 0x0024($sp) -/* 01E94 80A54D34 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 01E98 80A54D38 AFBF002C */ sw $ra, 0x002C($sp) -/* 01E9C 80A54D3C AFB20028 */ sw $s2, 0x0028($sp) -/* 01EA0 80A54D40 AFB00020 */ sw $s0, 0x0020($sp) -/* 01EA4 80A54D44 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 01EA8 80A54D48 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 -/* 01EAC 80A54D4C 3C0680A5 */ lui $a2, %hi(D_80A55294) ## $a2 = 80A50000 -/* 01EB0 80A54D50 24C65294 */ addiu $a2, $a2, %lo(D_80A55294) ## $a2 = 80A55294 -/* 01EB4 80A54D54 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE0 -/* 01EB8 80A54D58 24070700 */ addiu $a3, $zero, 0x0700 ## $a3 = 00000700 -/* 01EBC 80A54D5C 0C031AB1 */ jal Graph_OpenDisps -/* 01EC0 80A54D60 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 01EC4 80A54D64 0C024F46 */ jal func_80093D18 -/* 01EC8 80A54D68 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 01ECC 80A54D6C 3C0E80A5 */ lui $t6, %hi(func_80A54C34) ## $t6 = 80A50000 -/* 01ED0 80A54D70 25CE4C34 */ addiu $t6, $t6, %lo(func_80A54C34) ## $t6 = 80A54C34 -/* 01ED4 80A54D74 8E450150 */ lw $a1, 0x0150($s2) ## 00000150 -/* 01ED8 80A54D78 8E46016C */ lw $a2, 0x016C($s2) ## 0000016C -/* 01EDC 80A54D7C 3C0780A5 */ lui $a3, %hi(func_80A54BC0) ## $a3 = 80A50000 -/* 01EE0 80A54D80 24E74BC0 */ addiu $a3, $a3, %lo(func_80A54BC0) ## $a3 = 80A54BC0 -/* 01EE4 80A54D84 AFB20014 */ sw $s2, 0x0014($sp) -/* 01EE8 80A54D88 AFAE0010 */ sw $t6, 0x0010($sp) -/* 01EEC 80A54D8C 0C028572 */ jal SkelAnime_Draw - -/* 01EF0 80A54D90 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01EF4 80A54D94 864F02FE */ lh $t7, 0x02FE($s2) ## 000002FE -/* 01EF8 80A54D98 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 01EFC 80A54D9C 3C188016 */ lui $t8, %hi(gSaveContext+0xf06) -/* 01F00 80A54DA0 15E10046 */ bne $t7, $at, .L80A54EBC -/* 01F04 80A54DA4 00000000 */ nop -/* 01F08 80A54DA8 9718F566 */ lhu $t8, %lo(gSaveContext+0xf06)($t8) -/* 01F0C 80A54DAC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01F10 80A54DB0 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 01F14 80A54DB4 33190080 */ andi $t9, $t8, 0x0080 ## $t9 = 00000000 -/* 01F18 80A54DB8 13200040 */ beq $t9, $zero, .L80A54EBC -/* 01F1C 80A54DBC 02212021 */ addu $a0, $s1, $at -/* 01F20 80A54DC0 0C02604B */ jal Object_GetIndex - ## ObjectIndex -/* 01F24 80A54DC4 24050015 */ addiu $a1, $zero, 0x0015 ## $a1 = 00000015 -/* 01F28 80A54DC8 0440003C */ bltz $v0, .L80A54EBC -/* 01F2C 80A54DCC AFA2005C */ sw $v0, 0x005C($sp) -/* 01F30 80A54DD0 0C03423F */ jal Matrix_Put -/* 01F34 80A54DD4 26440330 */ addiu $a0, $s2, 0x0330 ## $a0 = 00000330 -/* 01F38 80A54DD8 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 -/* 01F3C 80A54DDC 3C0180A5 */ lui $at, %hi(D_80A552FC) ## $at = 80A50000 -/* 01F40 80A54DE0 C42C52FC */ lwc1 $f12, %lo(D_80A552FC)($at) -/* 01F44 80A54DE4 44067000 */ mfc1 $a2, $f14 -/* 01F48 80A54DE8 0C034261 */ jal Matrix_Translate -/* 01F4C 80A54DEC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01F50 80A54DF0 3C0180A5 */ lui $at, %hi(D_80A55300) ## $at = 80A50000 -/* 01F54 80A54DF4 C42C5300 */ lwc1 $f12, %lo(D_80A55300)($at) -/* 01F58 80A54DF8 0C0343B5 */ jal Matrix_RotateZ -/* 01F5C 80A54DFC 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 01F60 80A54E00 3C0580A5 */ lui $a1, %hi(D_80A552A8) ## $a1 = 80A50000 -/* 01F64 80A54E04 24A552A8 */ addiu $a1, $a1, %lo(D_80A552A8) ## $a1 = 80A552A8 -/* 01F68 80A54E08 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 01F6C 80A54E0C 0C0346A2 */ jal Matrix_NewMtx -/* 01F70 80A54E10 2406071C */ addiu $a2, $zero, 0x071C ## $a2 = 0000071C -/* 01F74 80A54E14 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 -/* 01F78 80A54E18 3C05DB06 */ lui $a1, 0xDB06 ## $a1 = DB060000 -/* 01F7C 80A54E1C 34A50018 */ ori $a1, $a1, 0x0018 ## $a1 = DB060018 -/* 01F80 80A54E20 24680008 */ addiu $t0, $v1, 0x0008 ## $t0 = 00000008 -/* 01F84 80A54E24 AE0802C0 */ sw $t0, 0x02C0($s0) ## 000002C0 -/* 01F88 80A54E28 AC650000 */ sw $a1, 0x0000($v1) ## 00000000 -/* 01F8C 80A54E2C 8FA9005C */ lw $t1, 0x005C($sp) -/* 01F90 80A54E30 24060044 */ addiu $a2, $zero, 0x0044 ## $a2 = 00000044 -/* 01F94 80A54E34 3C070001 */ lui $a3, 0x0001 ## $a3 = 00010000 -/* 01F98 80A54E38 01260019 */ multu $t1, $a2 -/* 01F9C 80A54E3C 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 01FA0 80A54E40 35EF0034 */ ori $t7, $t7, 0x0034 ## $t7 = DB060034 -/* 01FA4 80A54E44 2458FE40 */ addiu $t8, $v0, 0xFE40 ## $t8 = FFFFFE40 -/* 01FA8 80A54E48 3C090603 */ lui $t1, 0x0603 ## $t1 = 06030000 -/* 01FAC 80A54E4C 2529B060 */ addiu $t1, $t1, 0xB060 ## $t1 = 0602B060 -/* 01FB0 80A54E50 3C08DE00 */ lui $t0, 0xDE00 ## $t0 = DE000000 -/* 01FB4 80A54E54 00005012 */ mflo $t2 -/* 01FB8 80A54E58 022A5821 */ addu $t3, $s1, $t2 -/* 01FBC 80A54E5C 01676021 */ addu $t4, $t3, $a3 -/* 01FC0 80A54E60 8D8D17B4 */ lw $t5, 0x17B4($t4) ## 000017B4 -/* 01FC4 80A54E64 AC6D0004 */ sw $t5, 0x0004($v1) ## 00000004 -/* 01FC8 80A54E68 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 -/* 01FCC 80A54E6C 246E0008 */ addiu $t6, $v1, 0x0008 ## $t6 = 00000008 -/* 01FD0 80A54E70 AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 -/* 01FD4 80A54E74 AC780004 */ sw $t8, 0x0004($v1) ## 00000004 -/* 01FD8 80A54E78 AC6F0000 */ sw $t7, 0x0000($v1) ## 00000000 -/* 01FDC 80A54E7C 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 -/* 01FE0 80A54E80 24790008 */ addiu $t9, $v1, 0x0008 ## $t9 = 00000008 -/* 01FE4 80A54E84 AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 -/* 01FE8 80A54E88 AC690004 */ sw $t1, 0x0004($v1) ## 00000004 -/* 01FEC 80A54E8C AC680000 */ sw $t0, 0x0000($v1) ## 00000000 -/* 01FF0 80A54E90 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 -/* 01FF4 80A54E94 246A0008 */ addiu $t2, $v1, 0x0008 ## $t2 = 00000008 -/* 01FF8 80A54E98 AE0A02C0 */ sw $t2, 0x02C0($s0) ## 000002C0 -/* 01FFC 80A54E9C AC650000 */ sw $a1, 0x0000($v1) ## 00000000 -/* 02000 80A54EA0 824B001E */ lb $t3, 0x001E($s2) ## 0000001E -/* 02004 80A54EA4 01660019 */ multu $t3, $a2 -/* 02008 80A54EA8 00006012 */ mflo $t4 -/* 0200C 80A54EAC 022C6821 */ addu $t5, $s1, $t4 -/* 02010 80A54EB0 01A77021 */ addu $t6, $t5, $a3 -/* 02014 80A54EB4 8DCF17B4 */ lw $t7, 0x17B4($t6) ## 000017BC -/* 02018 80A54EB8 AC6F0004 */ sw $t7, 0x0004($v1) ## 00000004 -.L80A54EBC: -/* 0201C 80A54EBC 3C0680A5 */ lui $a2, %hi(D_80A552BC) ## $a2 = 80A50000 -/* 02020 80A54EC0 24C652BC */ addiu $a2, $a2, %lo(D_80A552BC) ## $a2 = 80A552BC -/* 02024 80A54EC4 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE0 -/* 02028 80A54EC8 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 0202C 80A54ECC 0C031AD5 */ jal Graph_CloseDisps -/* 02030 80A54ED0 2407072A */ addiu $a3, $zero, 0x072A ## $a3 = 0000072A -/* 02034 80A54ED4 8FBF002C */ lw $ra, 0x002C($sp) -/* 02038 80A54ED8 8FB00020 */ lw $s0, 0x0020($sp) -/* 0203C 80A54EDC 8FB10024 */ lw $s1, 0x0024($sp) -/* 02040 80A54EE0 8FB20028 */ lw $s2, 0x0028($sp) -/* 02044 80A54EE4 03E00008 */ jr $ra -/* 02048 80A54EE8 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 0204C 80A54EEC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Init.s deleted file mode 100644 index 1825d9be33..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Init.s +++ /dev/null @@ -1,248 +0,0 @@ -.rdata -glabel D_80A54F40 - .asciz "\n\n" - .balign 4 - -glabel D_80A54F44 - .asciz " ☆☆☆☆☆ いやー ついうっかり ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80A54F7C - .asciz "\n\n" - .balign 4 - -glabel D_80A54F80 - .asciz " ☆☆☆☆☆ 覗き穴奥兵士ふぃ〜 ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80A54FB4 - .asciz "\n\n" - .balign 4 - -glabel D_80A54FB8 - .asciz " ☆☆☆☆☆ 兵士２セット完了！ ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80A54FF0 - .asciz " ☆☆☆☆☆ 識別完了！ ☆☆☆☆☆ %d\n" - .balign 4 - -glabel D_80A55028 - .asciz " ☆☆☆☆☆ メッセージ完了！ ☆☆☆☆☆ %x\n\n" - .balign 4 - -.text -glabel EnHeishi2_Init -/* 00000 80A52EA0 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00004 80A52EA4 AFA50044 */ sw $a1, 0x0044($sp) -/* 00008 80A52EA8 AFBF002C */ sw $ra, 0x002C($sp) -/* 0000C 80A52EAC AFB00028 */ sw $s0, 0x0028($sp) -/* 00010 80A52EB0 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 -/* 00014 80A52EB4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00018 80A52EB8 0C00B58B */ jal Actor_SetScale - -/* 0001C 80A52EBC 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A -/* 00020 80A52EC0 860E001C */ lh $t6, 0x001C($s0) ## 0000001C -/* 00024 80A52EC4 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 00028 80A52EC8 A21800AE */ sb $t8, 0x00AE($s0) ## 000000AE -/* 0002C 80A52ECC 31CF00FF */ andi $t7, $t6, 0x00FF ## $t7 = 00000000 -/* 00030 80A52ED0 A60F02FE */ sh $t7, 0x02FE($s0) ## 000002FE -/* 00034 80A52ED4 860202FE */ lh $v0, 0x02FE($s0) ## 000002FE -/* 00038 80A52ED8 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 0003C 80A52EDC 8FA40044 */ lw $a0, 0x0044($sp) -/* 00040 80A52EE0 10410004 */ beq $v0, $at, .L80A52EF4 -/* 00044 80A52EE4 3C1980A5 */ lui $t9, %hi(func_80A54C6C) ## $t9 = 80A50000 -/* 00048 80A52EE8 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 0004C 80A52EEC 14410041 */ bne $v0, $at, .L80A52FF4 -/* 00050 80A52EF0 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -.L80A52EF4: -/* 00054 80A52EF4 8E080004 */ lw $t0, 0x0004($s0) ## 00000004 -/* 00058 80A52EF8 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 0005C 80A52EFC 27394C6C */ addiu $t9, $t9, %lo(func_80A54C6C) ## $t9 = 80A54C6C -/* 00060 80A52F00 01014824 */ and $t1, $t0, $at -/* 00064 80A52F04 AE190134 */ sw $t9, 0x0134($s0) ## 00000134 -/* 00068 80A52F08 AE090004 */ sw $t1, 0x0004($s0) ## 00000004 -/* 0006C 80A52F0C 24851C24 */ addiu $a1, $a0, 0x1C24 ## $a1 = 00001C24 -/* 00070 80A52F10 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00074 80A52F14 0C00CDD2 */ jal Actor_ChangeType - -/* 00078 80A52F18 24070006 */ addiu $a3, $zero, 0x0006 ## $a3 = 00000006 -/* 0007C 80A52F1C 860A02FE */ lh $t2, 0x02FE($s0) ## 000002FE -/* 00080 80A52F20 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 00084 80A52F24 3C0B80A5 */ lui $t3, %hi(func_80A531CC) ## $t3 = 80A50000 -/* 00088 80A52F28 15410004 */ bne $t2, $at, .L80A52F3C -/* 0008C 80A52F2C 3C0480A5 */ lui $a0, %hi(D_80A54F40) ## $a0 = 80A50000 -/* 00090 80A52F30 256B31CC */ addiu $t3, $t3, %lo(func_80A531CC) ## $t3 = 80A531CC -/* 00094 80A52F34 10000090 */ beq $zero, $zero, .L80A53178 -/* 00098 80A52F38 AE0B025C */ sw $t3, 0x025C($s0) ## 0000025C -.L80A52F3C: -/* 0009C 80A52F3C 0C00084C */ jal osSyncPrintf - -/* 000A0 80A52F40 24844F40 */ addiu $a0, $a0, %lo(D_80A54F40) ## $a0 = 80A54F40 -/* 000A4 80A52F44 3C0480A5 */ lui $a0, %hi(D_80A54F44) ## $a0 = 80A50000 -/* 000A8 80A52F48 0C00084C */ jal osSyncPrintf - -/* 000AC 80A52F4C 24844F44 */ addiu $a0, $a0, %lo(D_80A54F44) ## $a0 = 80A54F44 -/* 000B0 80A52F50 3C053CA3 */ lui $a1, 0x3CA3 ## $a1 = 3CA30000 -/* 000B4 80A52F54 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3CA3D70A -/* 000B8 80A52F58 0C00B58B */ jal Actor_SetScale - -/* 000BC 80A52F5C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000C0 80A52F60 3C0142B4 */ lui $at, 0x42B4 ## $at = 42B40000 -/* 000C4 80A52F64 44810000 */ mtc1 $at, $f0 ## $f0 = 90.00 -/* 000C8 80A52F68 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 000CC 80A52F6C 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 000D0 80A52F70 8E0D0024 */ lw $t5, 0x0024($s0) ## 00000024 -/* 000D4 80A52F74 44815000 */ mtc1 $at, $f10 ## $f10 = 60.00 -/* 000D8 80A52F78 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 000DC 80A52F7C C612002C */ lwc1 $f18, 0x002C($s0) ## 0000002C -/* 000E0 80A52F80 46002180 */ add.s $f6, $f4, $f0 -/* 000E4 80A52F84 240E7918 */ addiu $t6, $zero, 0x7918 ## $t6 = 00007918 -/* 000E8 80A52F88 A60E0032 */ sh $t6, 0x0032($s0) ## 00000032 -/* 000EC 80A52F8C 460A4401 */ sub.s $f16, $f8, $f10 -/* 000F0 80A52F90 AE0D0274 */ sw $t5, 0x0274($s0) ## 00000274 -/* 000F4 80A52F94 8E0D002C */ lw $t5, 0x002C($s0) ## 0000002C -/* 000F8 80A52F98 46009100 */ add.s $f4, $f18, $f0 -/* 000FC 80A52F9C 8E0C0028 */ lw $t4, 0x0028($s0) ## 00000028 -/* 00100 80A52FA0 860F0032 */ lh $t7, 0x0032($s0) ## 00000032 -/* 00104 80A52FA4 E6060024 */ swc1 $f6, 0x0024($s0) ## 00000024 -/* 00108 80A52FA8 E6100028 */ swc1 $f16, 0x0028($s0) ## 00000028 -/* 0010C 80A52FAC E604002C */ swc1 $f4, 0x002C($s0) ## 0000002C -/* 00110 80A52FB0 AE0D027C */ sw $t5, 0x027C($s0) ## 0000027C -/* 00114 80A52FB4 AE0C0278 */ sw $t4, 0x0278($s0) ## 00000278 -/* 00118 80A52FB8 A60F00B6 */ sh $t7, 0x00B6($s0) ## 000000B6 -/* 0011C 80A52FBC 8FA40044 */ lw $a0, 0x0044($sp) -/* 00120 80A52FC0 0C0170EB */ jal Collider_DestroyCylinder - -/* 00124 80A52FC4 26050398 */ addiu $a1, $s0, 0x0398 ## $a1 = 00000398 -/* 00128 80A52FC8 8FA40044 */ lw $a0, 0x0044($sp) -/* 0012C 80A52FCC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00130 80A52FD0 0C00B7D5 */ jal func_8002DF54 -/* 00134 80A52FD4 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 00138 80A52FD8 8E180004 */ lw $t8, 0x0004($s0) ## 00000004 -/* 0013C 80A52FDC 3C0880A5 */ lui $t0, %hi(func_80A544AC) ## $t0 = 80A50000 -/* 00140 80A52FE0 250844AC */ addiu $t0, $t0, %lo(func_80A544AC) ## $t0 = 80A544AC -/* 00144 80A52FE4 37190011 */ ori $t9, $t8, 0x0011 ## $t9 = 00000011 -/* 00148 80A52FE8 AE190004 */ sw $t9, 0x0004($s0) ## 00000004 -/* 0014C 80A52FEC 10000062 */ beq $zero, $zero, .L80A53178 -/* 00150 80A52FF0 AE08025C */ sw $t0, 0x025C($s0) ## 0000025C -.L80A52FF4: -/* 00154 80A52FF4 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 00158 80A52FF8 44813000 */ mtc1 $at, $f6 ## $f6 = 60.00 -/* 0015C 80A52FFC 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) -/* 00160 80A53000 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) -/* 00164 80A53004 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 00168 80A53008 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 0016C 80A5300C 0C00AC78 */ jal ActorShape_Init - -/* 00170 80A53010 E60602E0 */ swc1 $f6, 0x02E0($s0) ## 000002E0 -/* 00174 80A53014 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 00178 80A53018 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 0017C 80A5301C 26090190 */ addiu $t1, $s0, 0x0190 ## $t1 = 00000190 -/* 00180 80A53020 260A01F6 */ addiu $t2, $s0, 0x01F6 ## $t2 = 000001F6 -/* 00184 80A53024 240B0011 */ addiu $t3, $zero, 0x0011 ## $t3 = 00000011 -/* 00188 80A53028 AFAB0018 */ sw $t3, 0x0018($sp) -/* 0018C 80A5302C AFAA0014 */ sw $t2, 0x0014($sp) -/* 00190 80A53030 AFA90010 */ sw $t1, 0x0010($sp) -/* 00194 80A53034 24E75C30 */ addiu $a3, $a3, 0x5C30 ## $a3 = 06005C30 -/* 00198 80A53038 24C6BAC8 */ addiu $a2, $a2, 0xBAC8 ## $a2 = 0600BAC8 -/* 0019C 80A5303C 8FA40044 */ lw $a0, 0x0044($sp) -/* 001A0 80A53040 0C02915F */ jal SkelAnime_Init - -/* 001A4 80A53044 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 001A8 80A53048 26050398 */ addiu $a1, $s0, 0x0398 ## $a1 = 00000398 -/* 001AC 80A5304C AFA50030 */ sw $a1, 0x0030($sp) -/* 001B0 80A53050 0C0170D9 */ jal Collider_InitCylinder - -/* 001B4 80A53054 8FA40044 */ lw $a0, 0x0044($sp) -/* 001B8 80A53058 3C0780A5 */ lui $a3, %hi(D_80A54F10) ## $a3 = 80A50000 -/* 001BC 80A5305C 24E74F10 */ addiu $a3, $a3, %lo(D_80A54F10) ## $a3 = 80A54F10 -/* 001C0 80A53060 8FA40044 */ lw $a0, 0x0044($sp) -/* 001C4 80A53064 8FA50030 */ lw $a1, 0x0030($sp) -/* 001C8 80A53068 0C01712B */ jal Collider_SetCylinder - -/* 001CC 80A5306C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 001D0 80A53070 860202FE */ lh $v0, 0x02FE($s0) ## 000002FE -/* 001D4 80A53074 24030006 */ addiu $v1, $zero, 0x0006 ## $v1 = 00000006 -/* 001D8 80A53078 240C000F */ addiu $t4, $zero, 0x000F ## $t4 = 0000000F -/* 001DC 80A5307C 240D0046 */ addiu $t5, $zero, 0x0046 ## $t5 = 00000046 -/* 001E0 80A53080 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 001E4 80A53084 A60003DC */ sh $zero, 0x03DC($s0) ## 000003DC -/* 001E8 80A53088 A60C03D8 */ sh $t4, 0x03D8($s0) ## 000003D8 -/* 001EC 80A5308C A60D03DA */ sh $t5, 0x03DA($s0) ## 000003DA -/* 001F0 80A53090 10410008 */ beq $v0, $at, .L80A530B4 -/* 001F4 80A53094 A203001F */ sb $v1, 0x001F($s0) ## 0000001F -/* 001F8 80A53098 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 001FC 80A5309C 1041000C */ beq $v0, $at, .L80A530D0 -/* 00200 80A530A0 3C0F80A5 */ lui $t7, %hi(func_80A53908) ## $t7 = 80A50000 -/* 00204 80A530A4 10430010 */ beq $v0, $v1, .L80A530E8 -/* 00208 80A530A8 3C0480A5 */ lui $a0, %hi(D_80A54F7C) ## $a0 = 80A50000 -/* 0020C 80A530AC 1000001E */ beq $zero, $zero, .L80A53128 -/* 00210 80A530B0 8609001C */ lh $t1, 0x001C($s0) ## 0000001C -.L80A530B4: -/* 00214 80A530B4 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 00218 80A530B8 44814000 */ mtc1 $at, $f8 ## $f8 = -1.00 -/* 0021C 80A530BC 3C0E80A5 */ lui $t6, %hi(func_80A531E4) ## $t6 = 80A50000 -/* 00220 80A530C0 25CE31E4 */ addiu $t6, $t6, %lo(func_80A531E4) ## $t6 = 80A531E4 -/* 00224 80A530C4 AE0E025C */ sw $t6, 0x025C($s0) ## 0000025C -/* 00228 80A530C8 10000016 */ beq $zero, $zero, .L80A53124 -/* 0022C 80A530CC E608006C */ swc1 $f8, 0x006C($s0) ## 0000006C -.L80A530D0: -/* 00230 80A530D0 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 00234 80A530D4 44815000 */ mtc1 $at, $f10 ## $f10 = -1.00 -/* 00238 80A530D8 25EF3908 */ addiu $t7, $t7, %lo(func_80A53908) ## $t7 = 80A53908 -/* 0023C 80A530DC AE0F025C */ sw $t7, 0x025C($s0) ## 0000025C -/* 00240 80A530E0 10000010 */ beq $zero, $zero, .L80A53124 -/* 00244 80A530E4 E60A006C */ swc1 $f10, 0x006C($s0) ## 0000006C -.L80A530E8: -/* 00248 80A530E8 0C00084C */ jal osSyncPrintf - -/* 0024C 80A530EC 24844F7C */ addiu $a0, $a0, %lo(D_80A54F7C) ## $a0 = 80A54F7C -/* 00250 80A530F0 3C0480A5 */ lui $a0, %hi(D_80A54F80) ## $a0 = 80A50000 -/* 00254 80A530F4 0C00084C */ jal osSyncPrintf - -/* 00258 80A530F8 24844F80 */ addiu $a0, $a0, %lo(D_80A54F80) ## $a0 = 80A54F80 -/* 0025C 80A530FC 8FA40044 */ lw $a0, 0x0044($sp) -/* 00260 80A53100 0C0170EB */ jal Collider_DestroyCylinder - -/* 00264 80A53104 8FA50030 */ lw $a1, 0x0030($sp) -/* 00268 80A53108 8E180004 */ lw $t8, 0x0004($s0) ## 00000004 -/* 0026C 80A5310C 2401FFF6 */ addiu $at, $zero, 0xFFF6 ## $at = FFFFFFF6 -/* 00270 80A53110 3C0880A5 */ lui $t0, %hi(func_80A531D8) ## $t0 = 80A50000 -/* 00274 80A53114 250831D8 */ addiu $t0, $t0, %lo(func_80A531D8) ## $t0 = 80A531D8 -/* 00278 80A53118 0301C824 */ and $t9, $t8, $at -/* 0027C 80A5311C AE190004 */ sw $t9, 0x0004($s0) ## 00000004 -/* 00280 80A53120 AE08025C */ sw $t0, 0x025C($s0) ## 0000025C -.L80A53124: -/* 00284 80A53124 8609001C */ lh $t1, 0x001C($s0) ## 0000001C -.L80A53128: -/* 00288 80A53128 3C0480A5 */ lui $a0, %hi(D_80A54FB4) ## $a0 = 80A50000 -/* 0028C 80A5312C 24844FB4 */ addiu $a0, $a0, %lo(D_80A54FB4) ## $a0 = 80A54FB4 -/* 00290 80A53130 00095203 */ sra $t2, $t1, 8 -/* 00294 80A53134 314B00FF */ andi $t3, $t2, 0x00FF ## $t3 = 00000000 -/* 00298 80A53138 0C00084C */ jal osSyncPrintf - -/* 0029C 80A5313C A60B02F0 */ sh $t3, 0x02F0($s0) ## 000002F0 -/* 002A0 80A53140 3C0480A5 */ lui $a0, %hi(D_80A54FB8) ## $a0 = 80A50000 -/* 002A4 80A53144 24844FB8 */ addiu $a0, $a0, %lo(D_80A54FB8) ## $a0 = 80A54FB8 -/* 002A8 80A53148 0C00084C */ jal osSyncPrintf - -/* 002AC 80A5314C 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 002B0 80A53150 3C0480A5 */ lui $a0, %hi(D_80A54FF0) ## $a0 = 80A50000 -/* 002B4 80A53154 24844FF0 */ addiu $a0, $a0, %lo(D_80A54FF0) ## $a0 = 80A54FF0 -/* 002B8 80A53158 0C00084C */ jal osSyncPrintf - -/* 002BC 80A5315C 860502FE */ lh $a1, 0x02FE($s0) ## 000002FE -/* 002C0 80A53160 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 002C4 80A53164 3C0480A5 */ lui $a0, %hi(D_80A55028) ## $a0 = 80A50000 -/* 002C8 80A53168 24845028 */ addiu $a0, $a0, %lo(D_80A55028) ## $a0 = 80A55028 -/* 002CC 80A5316C 00052A03 */ sra $a1, $a1, 8 -/* 002D0 80A53170 0C00084C */ jal osSyncPrintf - -/* 002D4 80A53174 30A5000F */ andi $a1, $a1, 0x000F ## $a1 = 00000000 -.L80A53178: -/* 002D8 80A53178 8FBF002C */ lw $ra, 0x002C($sp) -/* 002DC 80A5317C 8FB00028 */ lw $s0, 0x0028($sp) -/* 002E0 80A53180 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 002E4 80A53184 03E00008 */ jr $ra -/* 002E8 80A53188 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Update.s deleted file mode 100644 index 7b5b220eb3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Update.s +++ /dev/null @@ -1,93 +0,0 @@ -glabel EnHeishi2_Update -/* 01BD8 80A54A78 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 01BDC 80A54A7C AFB00028 */ sw $s0, 0x0028($sp) -/* 01BE0 80A54A80 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01BE4 80A54A84 AFBF002C */ sw $ra, 0x002C($sp) -/* 01BE8 80A54A88 AFA5004C */ sw $a1, 0x004C($sp) -/* 01BEC 80A54A8C 0C00B56E */ jal Actor_SetHeight - -/* 01BF0 80A54A90 8E0502E0 */ lw $a1, 0x02E0($s0) ## 000002E0 -/* 01BF4 80A54A94 860202FE */ lh $v0, 0x02FE($s0) ## 000002FE -/* 01BF8 80A54A98 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01BFC 80A54A9C 10410002 */ beq $v0, $at, .L80A54AA8 -/* 01C00 80A54AA0 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 01C04 80A54AA4 14410011 */ bne $v0, $at, .L80A54AEC -.L80A54AA8: -/* 01C08 80A54AA8 3C01428C */ lui $at, 0x428C ## $at = 428C0000 -/* 01C0C 80A54AAC 44810000 */ mtc1 $at, $f0 ## $f0 = 70.00 -/* 01C10 80A54AB0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01C14 80A54AB4 44050000 */ mfc1 $a1, $f0 -/* 01C18 80A54AB8 0C00B56E */ jal Actor_SetHeight - -/* 01C1C 80A54ABC E600003C */ swc1 $f0, 0x003C($s0) ## 0000003C -/* 01C20 80A54AC0 8E0F0038 */ lw $t7, 0x0038($s0) ## 00000038 -/* 01C24 80A54AC4 8FA4004C */ lw $a0, 0x004C($sp) -/* 01C28 80A54AC8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01C2C 80A54ACC AFAF0010 */ sw $t7, 0x0010($sp) -/* 01C30 80A54AD0 8E0E003C */ lw $t6, 0x003C($s0) ## 0000003C -/* 01C34 80A54AD4 26060260 */ addiu $a2, $s0, 0x0260 ## $a2 = 00000260 -/* 01C38 80A54AD8 2607026C */ addiu $a3, $s0, 0x026C ## $a3 = 0000026C -/* 01C3C 80A54ADC AFAE0014 */ sw $t6, 0x0014($sp) -/* 01C40 80A54AE0 8E0F0040 */ lw $t7, 0x0040($s0) ## 00000040 -/* 01C44 80A54AE4 0C00E0A4 */ jal func_80038290 -/* 01C48 80A54AE8 AFAF0018 */ sw $t7, 0x0018($sp) -.L80A54AEC: -/* 01C4C 80A54AEC 861802FC */ lh $t8, 0x02FC($s0) ## 000002FC -/* 01C50 80A54AF0 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -/* 01C54 80A54AF4 02001025 */ or $v0, $s0, $zero ## $v0 = 00000000 -/* 01C58 80A54AF8 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 01C5C 80A54AFC A61902FC */ sh $t9, 0x02FC($s0) ## 000002FC -/* 01C60 80A54B00 2405000A */ addiu $a1, $zero, 0x000A ## $a1 = 0000000A -.L80A54B04: -/* 01C64 80A54B04 844402F2 */ lh $a0, 0x02F2($v0) ## 000002F2 -/* 01C68 80A54B08 24630002 */ addiu $v1, $v1, 0x0002 ## $v1 = 00000002 -/* 01C6C 80A54B0C 10800002 */ beq $a0, $zero, .L80A54B18 -/* 01C70 80A54B10 2488FFFF */ addiu $t0, $a0, 0xFFFF ## $t0 = FFFFFFFF -/* 01C74 80A54B14 A44802F2 */ sh $t0, 0x02F2($v0) ## 000002F2 -.L80A54B18: -/* 01C78 80A54B18 1465FFFA */ bne $v1, $a1, .L80A54B04 -/* 01C7C 80A54B1C 24420002 */ addiu $v0, $v0, 0x0002 ## $v0 = 00000002 -/* 01C80 80A54B20 8E19025C */ lw $t9, 0x025C($s0) ## 0000025C -/* 01C84 80A54B24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01C88 80A54B28 8FA5004C */ lw $a1, 0x004C($sp) -/* 01C8C 80A54B2C 0320F809 */ jalr $ra, $t9 -/* 01C90 80A54B30 00000000 */ nop -/* 01C94 80A54B34 0C00B638 */ jal Actor_MoveForward - -/* 01C98 80A54B38 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01C9C 80A54B3C 860202FE */ lh $v0, 0x02FE($s0) ## 000002FE -/* 01CA0 80A54B40 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 01CA4 80A54B44 10410019 */ beq $v0, $at, .L80A54BAC -/* 01CA8 80A54B48 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 01CAC 80A54B4C 10410017 */ beq $v0, $at, .L80A54BAC -/* 01CB0 80A54B50 8FA4004C */ lw $a0, 0x004C($sp) -/* 01CB4 80A54B54 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 01CB8 80A54B58 44810000 */ mtc1 $at, $f0 ## $f0 = 10.00 -/* 01CBC 80A54B5C 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 01CC0 80A54B60 44812000 */ mtc1 $at, $f4 ## $f4 = 30.00 -/* 01CC4 80A54B64 2409001D */ addiu $t1, $zero, 0x001D ## $t1 = 0000001D -/* 01CC8 80A54B68 44060000 */ mfc1 $a2, $f0 -/* 01CCC 80A54B6C 44070000 */ mfc1 $a3, $f0 -/* 01CD0 80A54B70 AFA90014 */ sw $t1, 0x0014($sp) -/* 01CD4 80A54B74 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01CD8 80A54B78 0C00B92D */ jal func_8002E4B4 -/* 01CDC 80A54B7C E7A40010 */ swc1 $f4, 0x0010($sp) -/* 01CE0 80A54B80 26060398 */ addiu $a2, $s0, 0x0398 ## $a2 = 00000398 -/* 01CE4 80A54B84 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000398 -/* 01CE8 80A54B88 AFA60034 */ sw $a2, 0x0034($sp) -/* 01CEC 80A54B8C 0C0189B7 */ jal Collider_CylinderUpdate - -/* 01CF0 80A54B90 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01CF4 80A54B94 8FA4004C */ lw $a0, 0x004C($sp) -/* 01CF8 80A54B98 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01CFC 80A54B9C 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 01D00 80A54BA0 8FA60034 */ lw $a2, 0x0034($sp) -/* 01D04 80A54BA4 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOT -/* 01D08 80A54BA8 00812821 */ addu $a1, $a0, $at -.L80A54BAC: -/* 01D0C 80A54BAC 8FBF002C */ lw $ra, 0x002C($sp) -/* 01D10 80A54BB0 8FB00028 */ lw $s0, 0x0028($sp) -/* 01D14 80A54BB4 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 01D18 80A54BB8 03E00008 */ jr $ra -/* 01D1C 80A54BBC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A531CC.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A531CC.s deleted file mode 100644 index 59256e3621..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A531CC.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_80A531CC -/* 0032C 80A531CC AFA40000 */ sw $a0, 0x0000($sp) -/* 00330 80A531D0 03E00008 */ jr $ra -/* 00334 80A531D4 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A531D8.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A531D8.s deleted file mode 100644 index 3fc6957e71..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A531D8.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_80A531D8 -/* 00338 80A531D8 AFA40000 */ sw $a0, 0x0000($sp) -/* 0033C 80A531DC 03E00008 */ jr $ra -/* 00340 80A531E0 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A531E4.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A531E4.s deleted file mode 100644 index 2ba34b0060..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A531E4.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_80A531E4 -/* 00344 80A531E4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00348 80A531E8 AFA40028 */ sw $a0, 0x0028($sp) -/* 0034C 80A531EC AFBF0024 */ sw $ra, 0x0024($sp) -/* 00350 80A531F0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00354 80A531F4 AFA5002C */ sw $a1, 0x002C($sp) -/* 00358 80A531F8 0C028800 */ jal SkelAnime_GetFrameCount - -/* 0035C 80A531FC 24845C30 */ addiu $a0, $a0, 0x5C30 ## $a0 = 06005C30 -/* 00360 80A53200 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00364 80A53204 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00368 80A53208 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 0036C 80A5320C 468021A0 */ cvt.s.w $f6, $f4 -/* 00370 80A53210 8FA40028 */ lw $a0, 0x0028($sp) -/* 00374 80A53214 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00378 80A53218 24A55C30 */ addiu $a1, $a1, 0x5C30 ## $a1 = 06005C30 -/* 0037C 80A5321C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00380 80A53220 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00384 80A53224 4600320D */ trunc.w.s $f8, $f6 -/* 00388 80A53228 AFA00014 */ sw $zero, 0x0014($sp) -/* 0038C 80A5322C E7B20018 */ swc1 $f18, 0x0018($sp) -/* 00390 80A53230 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00394 80A53234 440F4000 */ mfc1 $t7, $f8 -/* 00398 80A53238 00000000 */ nop -/* 0039C 80A5323C 000FC400 */ sll $t8, $t7, 16 -/* 003A0 80A53240 0018CC03 */ sra $t9, $t8, 16 -/* 003A4 80A53244 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 -/* 003A8 80A53248 00000000 */ nop -/* 003AC 80A5324C 46805420 */ cvt.s.w $f16, $f10 -/* 003B0 80A53250 0C029468 */ jal SkelAnime_ChangeAnim - -/* 003B4 80A53254 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 003B8 80A53258 8FA90028 */ lw $t1, 0x0028($sp) -/* 003BC 80A5325C 3C0880A5 */ lui $t0, %hi(func_80A53278) ## $t0 = 80A50000 -/* 003C0 80A53260 25083278 */ addiu $t0, $t0, %lo(func_80A53278) ## $t0 = 80A53278 -/* 003C4 80A53264 AD28025C */ sw $t0, 0x025C($t1) ## 0000025C -/* 003C8 80A53268 8FBF0024 */ lw $ra, 0x0024($sp) -/* 003CC 80A5326C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 003D0 80A53270 03E00008 */ jr $ra -/* 003D4 80A53274 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53278.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53278.s deleted file mode 100644 index 5eebe04744..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53278.s +++ /dev/null @@ -1,158 +0,0 @@ -.rdata -glabel D_80A55060 - .asciz " ☆☆☆☆☆ 全部の精霊石GET！ ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80A55094 - .asciz " ☆☆☆☆☆ 子供ははやくネロ！ ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80A550C8 - .asciz " ☆☆☆☆☆ なんでも通るよ ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80A550F8 - .asciz " ☆☆☆☆☆ １回目袖の下開始！ ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80A5512C - .asciz " ☆☆☆☆☆ ２回目袖の下開始！ ☆☆☆☆☆ \n" - .balign 4 - -glabel D_80A55160 - .asciz " ☆☆☆☆☆ それはとおらんよぉ ☆☆☆☆☆ \n" - .balign 4 - -.text -glabel func_80A53278 -/* 003D8 80A53278 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 003DC 80A5327C AFB00018 */ sw $s0, 0x0018($sp) -/* 003E0 80A53280 AFBF001C */ sw $ra, 0x001C($sp) -/* 003E4 80A53284 AFA50024 */ sw $a1, 0x0024($sp) -/* 003E8 80A53288 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 003EC 80A5328C A080030B */ sb $zero, 0x030B($a0) ## 0000030B -/* 003F0 80A53290 A480030E */ sh $zero, 0x030E($a0) ## 0000030E -/* 003F4 80A53294 8FA40024 */ lw $a0, 0x0024($sp) -/* 003F8 80A53298 0C01B0D8 */ jal Text_GetFaceReaction -/* 003FC 80A5329C 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 -/* 00400 80A532A0 1040000C */ beq $v0, $zero, .L80A532D4 -/* 00404 80A532A4 8FA40024 */ lw $a0, 0x0024($sp) -/* 00408 80A532A8 0C01B0D8 */ jal Text_GetFaceReaction -/* 0040C 80A532AC 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 -/* 00410 80A532B0 3C1880A5 */ lui $t8, %hi(func_80A5475C) ## $t8 = 80A50000 -/* 00414 80A532B4 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 00418 80A532B8 240F0006 */ addiu $t7, $zero, 0x0006 ## $t7 = 00000006 -/* 0041C 80A532BC 2718475C */ addiu $t8, $t8, %lo(func_80A5475C) ## $t8 = 80A5475C -/* 00420 80A532C0 A602010E */ sh $v0, 0x010E($s0) ## 0000010E -/* 00424 80A532C4 A20E030B */ sb $t6, 0x030B($s0) ## 0000030B -/* 00428 80A532C8 A60F0300 */ sh $t7, 0x0300($s0) ## 00000300 -/* 0042C 80A532CC 1000005A */ beq $zero, $zero, .L80A53438 -/* 00430 80A532D0 AE18025C */ sw $t8, 0x025C($s0) ## 0000025C -.L80A532D4: -/* 00434 80A532D4 3C028016 */ lui $v0, %hi(gSaveContext) -/* 00438 80A532D8 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 0043C 80A532DC 94590ED4 */ lhu $t9, 0x0ED4($v0) ## 8015F534 -/* 00440 80A532E0 33280200 */ andi $t0, $t9, 0x0200 ## $t0 = 00000000 -/* 00444 80A532E4 51000015 */ beql $t0, $zero, .L80A5333C -/* 00448 80A532E8 8C580010 */ lw $t8, 0x0010($v0) ## 8015E670 -/* 0044C 80A532EC 94490ED8 */ lhu $t1, 0x0ED8($v0) ## 8015F538 -/* 00450 80A532F0 312A0020 */ andi $t2, $t1, 0x0020 ## $t2 = 00000000 -/* 00454 80A532F4 51400011 */ beql $t2, $zero, .L80A5333C -/* 00458 80A532F8 8C580010 */ lw $t8, 0x0010($v0) ## 8015E670 -/* 0045C 80A532FC 944B0EDA */ lhu $t3, 0x0EDA($v0) ## 8015F53A -/* 00460 80A53300 3C0480A5 */ lui $a0, %hi(D_80A55060) ## $a0 = 80A50000 -/* 00464 80A53304 316C0080 */ andi $t4, $t3, 0x0080 ## $t4 = 00000000 -/* 00468 80A53308 5180000C */ beql $t4, $zero, .L80A5333C -/* 0046C 80A5330C 8C580010 */ lw $t8, 0x0010($v0) ## 8015E670 -/* 00470 80A53310 0C00084C */ jal osSyncPrintf - -/* 00474 80A53314 24845060 */ addiu $a0, $a0, %lo(D_80A55060) ## $a0 = 80A55060 -/* 00478 80A53318 3C0F80A5 */ lui $t7, %hi(func_80A5475C) ## $t7 = 80A50000 -/* 0047C 80A5331C 240D0006 */ addiu $t5, $zero, 0x0006 ## $t5 = 00000006 -/* 00480 80A53320 240E7006 */ addiu $t6, $zero, 0x7006 ## $t6 = 00007006 -/* 00484 80A53324 25EF475C */ addiu $t7, $t7, %lo(func_80A5475C) ## $t7 = 80A5475C -/* 00488 80A53328 A60D0300 */ sh $t5, 0x0300($s0) ## 00000300 -/* 0048C 80A5332C A60E010E */ sh $t6, 0x010E($s0) ## 0000010E -/* 00490 80A53330 10000041 */ beq $zero, $zero, .L80A53438 -/* 00494 80A53334 AE0F025C */ sw $t7, 0x025C($s0) ## 0000025C -/* 00498 80A53338 8C580010 */ lw $t8, 0x0010($v0) ## 00000010 -.L80A5333C: -/* 0049C 80A5333C 3C0480A5 */ lui $a0, %hi(D_80A55094) ## $a0 = 80A50000 -/* 004A0 80A53340 5300000C */ beql $t8, $zero, .L80A53374 -/* 004A4 80A53344 920A030C */ lbu $t2, 0x030C($s0) ## 0000030C -/* 004A8 80A53348 0C00084C */ jal osSyncPrintf - -/* 004AC 80A5334C 24845094 */ addiu $a0, $a0, %lo(D_80A55094) ## $a0 = 80A55094 -/* 004B0 80A53350 3C0980A5 */ lui $t1, %hi(func_80A5475C) ## $t1 = 80A50000 -/* 004B4 80A53354 24190006 */ addiu $t9, $zero, 0x0006 ## $t9 = 00000006 -/* 004B8 80A53358 24087002 */ addiu $t0, $zero, 0x7002 ## $t0 = 00007002 -/* 004BC 80A5335C 2529475C */ addiu $t1, $t1, %lo(func_80A5475C) ## $t1 = 80A5475C -/* 004C0 80A53360 A6190300 */ sh $t9, 0x0300($s0) ## 00000300 -/* 004C4 80A53364 A608010E */ sh $t0, 0x010E($s0) ## 0000010E -/* 004C8 80A53368 10000033 */ beq $zero, $zero, .L80A53438 -/* 004CC 80A5336C AE09025C */ sw $t1, 0x025C($s0) ## 0000025C -/* 004D0 80A53370 920A030C */ lbu $t2, 0x030C($s0) ## 0000030C -.L80A53374: -/* 004D4 80A53374 3C0480A5 */ lui $a0, %hi(D_80A550C8) ## $a0 = 80A50000 -/* 004D8 80A53378 5140000C */ beql $t2, $zero, .L80A533AC -/* 004DC 80A5337C 944E0ED6 */ lhu $t6, 0x0ED6($v0) ## 00000ED6 -/* 004E0 80A53380 0C00084C */ jal osSyncPrintf - -/* 004E4 80A53384 248450C8 */ addiu $a0, $a0, %lo(D_80A550C8) ## $a0 = 80A550C8 -/* 004E8 80A53388 3C0D80A5 */ lui $t5, %hi(func_80A5475C) ## $t5 = 80A50000 -/* 004EC 80A5338C 240B0006 */ addiu $t3, $zero, 0x0006 ## $t3 = 00000006 -/* 004F0 80A53390 240C7099 */ addiu $t4, $zero, 0x7099 ## $t4 = 00007099 -/* 004F4 80A53394 25AD475C */ addiu $t5, $t5, %lo(func_80A5475C) ## $t5 = 80A5475C -/* 004F8 80A53398 A60B0300 */ sh $t3, 0x0300($s0) ## 00000300 -/* 004FC 80A5339C A60C010E */ sh $t4, 0x010E($s0) ## 0000010E -/* 00500 80A533A0 10000025 */ beq $zero, $zero, .L80A53438 -/* 00504 80A533A4 AE0D025C */ sw $t5, 0x025C($s0) ## 0000025C -/* 00508 80A533A8 944E0ED6 */ lhu $t6, 0x0ED6($v0) ## 00000ED6 -.L80A533AC: -/* 0050C 80A533AC 3C0480A5 */ lui $a0, %hi(D_80A55160) ## $a0 = 80A50000 -/* 00510 80A533B0 31CF0004 */ andi $t7, $t6, 0x0004 ## $t7 = 00000000 -/* 00514 80A533B4 11E00017 */ beq $t7, $zero, .L80A53414 -/* 00518 80A533B8 00000000 */ nop -/* 0051C 80A533BC 8618030E */ lh $t8, 0x030E($s0) ## 0000030E -/* 00520 80A533C0 3C0480A5 */ lui $a0, %hi(D_80A5512C) ## $a0 = 80A50000 -/* 00524 80A533C4 17000009 */ bne $t8, $zero, .L80A533EC -/* 00528 80A533C8 00000000 */ nop -/* 0052C 80A533CC 3C0480A5 */ lui $a0, %hi(D_80A550F8) ## $a0 = 80A50000 -/* 00530 80A533D0 0C00084C */ jal osSyncPrintf - -/* 00534 80A533D4 248450F8 */ addiu $a0, $a0, %lo(D_80A550F8) ## $a0 = 80A550F8 -/* 00538 80A533D8 24197071 */ addiu $t9, $zero, 0x7071 ## $t9 = 00007071 -/* 0053C 80A533DC 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 00540 80A533E0 A619010E */ sh $t9, 0x010E($s0) ## 0000010E -/* 00544 80A533E4 10000005 */ beq $zero, $zero, .L80A533FC -/* 00548 80A533E8 A608030E */ sh $t0, 0x030E($s0) ## 0000030E -.L80A533EC: -/* 0054C 80A533EC 0C00084C */ jal osSyncPrintf - -/* 00550 80A533F0 2484512C */ addiu $a0, $a0, %lo(D_80A5512C) ## $a0 = 0000512C -/* 00554 80A533F4 24097072 */ addiu $t1, $zero, 0x7072 ## $t1 = 00007072 -/* 00558 80A533F8 A609010E */ sh $t1, 0x010E($s0) ## 0000010E -.L80A533FC: -/* 0055C 80A533FC 3C0B80A5 */ lui $t3, %hi(func_80A5475C) ## $t3 = 80A50000 -/* 00560 80A53400 240A0004 */ addiu $t2, $zero, 0x0004 ## $t2 = 00000004 -/* 00564 80A53404 256B475C */ addiu $t3, $t3, %lo(func_80A5475C) ## $t3 = 80A5475C -/* 00568 80A53408 A60A0300 */ sh $t2, 0x0300($s0) ## 00000300 -/* 0056C 80A5340C 1000000A */ beq $zero, $zero, .L80A53438 -/* 00570 80A53410 AE0B025C */ sw $t3, 0x025C($s0) ## 0000025C -.L80A53414: -/* 00574 80A53414 0C00084C */ jal osSyncPrintf - -/* 00578 80A53418 24845160 */ addiu $a0, $a0, %lo(D_80A55160) ## $a0 = 00005160 -/* 0057C 80A5341C 3C0E80A5 */ lui $t6, %hi(func_80A5475C) ## $t6 = 80A50000 -/* 00580 80A53420 240C0006 */ addiu $t4, $zero, 0x0006 ## $t4 = 00000006 -/* 00584 80A53424 240D7029 */ addiu $t5, $zero, 0x7029 ## $t5 = 00007029 -/* 00588 80A53428 25CE475C */ addiu $t6, $t6, %lo(func_80A5475C) ## $t6 = 80A5475C -/* 0058C 80A5342C A60C0300 */ sh $t4, 0x0300($s0) ## 00000300 -/* 00590 80A53430 A60D010E */ sh $t5, 0x010E($s0) ## 0000010E -/* 00594 80A53434 AE0E025C */ sw $t6, 0x025C($s0) ## 0000025C -.L80A53438: -/* 00598 80A53438 8FBF001C */ lw $ra, 0x001C($sp) -/* 0059C 80A5343C 8FB00018 */ lw $s0, 0x0018($sp) -/* 005A0 80A53440 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 005A4 80A53444 03E00008 */ jr $ra -/* 005A8 80A53448 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5344C.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5344C.s deleted file mode 100644 index 4e9fc320d9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5344C.s +++ /dev/null @@ -1,68 +0,0 @@ -glabel func_80A5344C -/* 005AC 80A5344C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 005B0 80A53450 AFB00018 */ sw $s0, 0x0018($sp) -/* 005B4 80A53454 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 005B8 80A53458 AFBF001C */ sw $ra, 0x001C($sp) -/* 005BC 80A5345C AFA50024 */ sw $a1, 0x0024($sp) -/* 005C0 80A53460 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 005C4 80A53464 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 005C8 80A53468 8FA40024 */ lw $a0, 0x0024($sp) -/* 005CC 80A5346C 0C042F6F */ jal func_8010BDBC -/* 005D0 80A53470 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 005D4 80A53474 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 005D8 80A53478 5441002B */ bnel $v0, $at, .L80A53528 -/* 005DC 80A5347C 8FBF001C */ lw $ra, 0x001C($sp) -/* 005E0 80A53480 0C041AF2 */ jal func_80106BC8 -/* 005E4 80A53484 8FA40024 */ lw $a0, 0x0024($sp) -/* 005E8 80A53488 10400026 */ beq $v0, $zero, .L80A53524 -/* 005EC 80A5348C 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 005F0 80A53490 A60E0300 */ sh $t6, 0x0300($s0) ## 00000300 -/* 005F4 80A53494 8FAF0024 */ lw $t7, 0x0024($sp) -/* 005F8 80A53498 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 005FC 80A5349C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00600 80A534A0 004F1021 */ addu $v0, $v0, $t7 -/* 00604 80A534A4 904204BD */ lbu $v0, 0x04BD($v0) ## 000104BD -/* 00608 80A534A8 3C188016 */ lui $t8, %hi(gSaveContext+0x34) -/* 0060C 80A534AC 10400005 */ beq $v0, $zero, .L80A534C4 -/* 00610 80A534B0 00000000 */ nop -/* 00614 80A534B4 10410014 */ beq $v0, $at, .L80A53508 -/* 00618 80A534B8 240B7096 */ addiu $t3, $zero, 0x7096 ## $t3 = 00007096 -/* 0061C 80A534BC 10000017 */ beq $zero, $zero, .L80A5351C -/* 00620 80A534C0 8FA40024 */ lw $a0, 0x0024($sp) -.L80A534C4: -/* 00624 80A534C4 8718E694 */ lh $t8, %lo(gSaveContext+0x34)($t8) -/* 00628 80A534C8 3C0A80A5 */ lui $t2, %hi(func_80A54954) ## $t2 = 80A50000 -/* 0062C 80A534CC 24097097 */ addiu $t1, $zero, 0x7097 ## $t1 = 00007097 -/* 00630 80A534D0 2B01000A */ slti $at, $t8, 0x000A -/* 00634 80A534D4 14200009 */ bne $at, $zero, .L80A534FC -/* 00638 80A534D8 254A4954 */ addiu $t2, $t2, %lo(func_80A54954) ## $t2 = 80A54954 -/* 0063C 80A534DC 0C021CC3 */ jal Rupees_ChangeBy -/* 00640 80A534E0 2404FFF6 */ addiu $a0, $zero, 0xFFF6 ## $a0 = FFFFFFF6 -/* 00644 80A534E4 3C0880A5 */ lui $t0, %hi(func_80A53538) ## $t0 = 80A50000 -/* 00648 80A534E8 24197098 */ addiu $t9, $zero, 0x7098 ## $t9 = 00007098 -/* 0064C 80A534EC 25083538 */ addiu $t0, $t0, %lo(func_80A53538) ## $t0 = 80A53538 -/* 00650 80A534F0 A619010E */ sh $t9, 0x010E($s0) ## 0000010E -/* 00654 80A534F4 10000008 */ beq $zero, $zero, .L80A53518 -/* 00658 80A534F8 AE08025C */ sw $t0, 0x025C($s0) ## 0000025C -.L80A534FC: -/* 0065C 80A534FC A609010E */ sh $t1, 0x010E($s0) ## 0000010E -/* 00660 80A53500 10000005 */ beq $zero, $zero, .L80A53518 -/* 00664 80A53504 AE0A025C */ sw $t2, 0x025C($s0) ## 0000025C -.L80A53508: -/* 00668 80A53508 3C0C80A5 */ lui $t4, %hi(func_80A54954) ## $t4 = 80A50000 -/* 0066C 80A5350C 258C4954 */ addiu $t4, $t4, %lo(func_80A54954) ## $t4 = 80A54954 -/* 00670 80A53510 A60B010E */ sh $t3, 0x010E($s0) ## 0000010E -/* 00674 80A53514 AE0C025C */ sw $t4, 0x025C($s0) ## 0000025C -.L80A53518: -/* 00678 80A53518 8FA40024 */ lw $a0, 0x0024($sp) -.L80A5351C: -/* 0067C 80A5351C 0C042DC8 */ jal func_8010B720 -/* 00680 80A53520 9605010E */ lhu $a1, 0x010E($s0) ## 0000010E -.L80A53524: -/* 00684 80A53524 8FBF001C */ lw $ra, 0x001C($sp) -.L80A53528: -/* 00688 80A53528 8FB00018 */ lw $s0, 0x0018($sp) -/* 0068C 80A5352C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00690 80A53530 03E00008 */ jr $ra -/* 00694 80A53534 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53538.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53538.s deleted file mode 100644 index c523bf600d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53538.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_80A53538 -/* 00698 80A53538 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0069C 80A5353C AFBF0014 */ sw $ra, 0x0014($sp) -/* 006A0 80A53540 AFA40018 */ sw $a0, 0x0018($sp) -/* 006A4 80A53544 AFA5001C */ sw $a1, 0x001C($sp) -/* 006A8 80A53548 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 006AC 80A5354C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 006B0 80A53550 8FA4001C */ lw $a0, 0x001C($sp) -/* 006B4 80A53554 0C042F6F */ jal func_8010BDBC -/* 006B8 80A53558 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 006BC 80A5355C 8FAE0018 */ lw $t6, 0x0018($sp) -/* 006C0 80A53560 85CF0300 */ lh $t7, 0x0300($t6) ## 00000300 -/* 006C4 80A53564 55E20012 */ bnel $t7, $v0, .L80A535B0 -/* 006C8 80A53568 8FBF0014 */ lw $ra, 0x0014($sp) -/* 006CC 80A5356C 0C041AF2 */ jal func_80106BC8 -/* 006D0 80A53570 8FA4001C */ lw $a0, 0x001C($sp) -/* 006D4 80A53574 1040000D */ beq $v0, $zero, .L80A535AC -/* 006D8 80A53578 8FA4001C */ lw $a0, 0x001C($sp) -/* 006DC 80A5357C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 006E0 80A53580 0C00B7D5 */ jal func_8002DF54 -/* 006E4 80A53584 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 006E8 80A53588 8FB9001C */ lw $t9, 0x001C($sp) -/* 006EC 80A5358C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 006F0 80A53590 24180037 */ addiu $t8, $zero, 0x0037 ## $t8 = 00000037 -/* 006F4 80A53594 00390821 */ addu $at, $at, $t9 -/* 006F8 80A53598 A03803DC */ sb $t8, 0x03DC($at) ## 000103DC -/* 006FC 80A5359C 8FA90018 */ lw $t1, 0x0018($sp) -/* 00700 80A535A0 3C0880A5 */ lui $t0, %hi(func_80A535BC) ## $t0 = 80A50000 -/* 00704 80A535A4 250835BC */ addiu $t0, $t0, %lo(func_80A535BC) ## $t0 = 80A535BC -/* 00708 80A535A8 AD28025C */ sw $t0, 0x025C($t1) ## 0000025C -.L80A535AC: -/* 0070C 80A535AC 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A535B0: -/* 00710 80A535B0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00714 80A535B4 03E00008 */ jr $ra -/* 00718 80A535B8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A535BC.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A535BC.s deleted file mode 100644 index 4c8425ccd8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A535BC.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80A535BC -/* 0071C 80A535BC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00720 80A535C0 AFA40028 */ sw $a0, 0x0028($sp) -/* 00724 80A535C4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00728 80A535C8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 0072C 80A535CC AFA5002C */ sw $a1, 0x002C($sp) -/* 00730 80A535D0 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00734 80A535D4 24845500 */ addiu $a0, $a0, 0x5500 ## $a0 = 06005500 -/* 00738 80A535D8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 0073C 80A535DC 8FA30028 */ lw $v1, 0x0028($sp) -/* 00740 80A535E0 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00744 80A535E4 46802020 */ cvt.s.w $f0, $f4 -/* 00748 80A535E8 44813000 */ mtc1 $at, $f6 ## $f6 = -10.00 -/* 0074C 80A535EC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00750 80A535F0 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00754 80A535F4 24A55500 */ addiu $a1, $a1, 0x5500 ## $a1 = 06005500 -/* 00758 80A535F8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0075C 80A535FC E46002EC */ swc1 $f0, 0x02EC($v1) ## 000002EC -/* 00760 80A53600 AFAE0014 */ sw $t6, 0x0014($sp) -/* 00764 80A53604 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00768 80A53608 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0076C 80A5360C 2464014C */ addiu $a0, $v1, 0x014C ## $a0 = 0000014C -/* 00770 80A53610 0C029468 */ jal SkelAnime_ChangeAnim - -/* 00774 80A53614 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 00778 80A53618 8FB80028 */ lw $t8, 0x0028($sp) -/* 0077C 80A5361C 3C0F80A5 */ lui $t7, %hi(func_80A53638) ## $t7 = 80A50000 -/* 00780 80A53620 25EF3638 */ addiu $t7, $t7, %lo(func_80A53638) ## $t7 = 80A53638 -/* 00784 80A53624 AF0F025C */ sw $t7, 0x025C($t8) ## 0000025C -/* 00788 80A53628 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0078C 80A5362C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00790 80A53630 03E00008 */ jr $ra -/* 00794 80A53634 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53638.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53638.s deleted file mode 100644 index cd0354fcd0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53638.s +++ /dev/null @@ -1,77 +0,0 @@ -.rdata -glabel D_80A55194 - .asciz "☆☆☆ きたきたきたぁ！ ☆☆☆ %x\n" - .balign 4 - -.text -glabel func_80A53638 -/* 00798 80A53638 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0079C 80A5363C AFBF001C */ sw $ra, 0x001C($sp) -/* 007A0 80A53640 AFB00018 */ sw $s0, 0x0018($sp) -/* 007A4 80A53644 C4840164 */ lwc1 $f4, 0x0164($a0) ## 00000164 -/* 007A8 80A53648 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 007AC 80A5364C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 007B0 80A53650 E7A40028 */ swc1 $f4, 0x0028($sp) -/* 007B4 80A53654 8CA21C6C */ lw $v0, 0x1C6C($a1) ## 00001C6C -/* 007B8 80A53658 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 007BC 80A5365C AFA20024 */ sw $v0, 0x0024($sp) -/* 007C0 80A53660 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -/* 007C4 80A53664 44814000 */ mtc1 $at, $f8 ## $f8 = 12.00 -/* 007C8 80A53668 C7A60028 */ lwc1 $f6, 0x0028($sp) -/* 007CC 80A5366C 8FA20024 */ lw $v0, 0x0024($sp) -/* 007D0 80A53670 4606403E */ c.le.s $f8, $f6 -/* 007D4 80A53674 00000000 */ nop -/* 007D8 80A53678 4502000C */ bc1fl .L80A536AC -/* 007DC 80A5367C C7AA0028 */ lwc1 $f10, 0x0028($sp) -/* 007E0 80A53680 920E0308 */ lbu $t6, 0x0308($s0) ## 00000308 -/* 007E4 80A53684 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 007E8 80A53688 24052823 */ addiu $a1, $zero, 0x2823 ## $a1 = 00002823 -/* 007EC 80A5368C 55C00007 */ bnel $t6, $zero, .L80A536AC -/* 007F0 80A53690 C7AA0028 */ lwc1 $f10, 0x0028($sp) -/* 007F4 80A53694 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 007F8 80A53698 AFA20024 */ sw $v0, 0x0024($sp) -/* 007FC 80A5369C 8FA20024 */ lw $v0, 0x0024($sp) -/* 00800 80A536A0 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 00804 80A536A4 A20F0308 */ sb $t7, 0x0308($s0) ## 00000308 -/* 00808 80A536A8 C7AA0028 */ lwc1 $f10, 0x0028($sp) -.L80A536AC: -/* 0080C 80A536AC C61002EC */ lwc1 $f16, 0x02EC($s0) ## 000002EC -/* 00810 80A536B0 3C0480A5 */ lui $a0, %hi(D_80A55194) ## $a0 = 80A50000 -/* 00814 80A536B4 24845194 */ addiu $a0, $a0, %lo(D_80A55194) ## $a0 = 80A55194 -/* 00818 80A536B8 460A803E */ c.le.s $f16, $f10 -/* 0081C 80A536BC 00000000 */ nop -/* 00820 80A536C0 45020016 */ bc1fl .L80A5371C -/* 00824 80A536C4 8FBF001C */ lw $ra, 0x001C($sp) -/* 00828 80A536C8 1040000E */ beq $v0, $zero, .L80A53704 -/* 0082C 80A536CC 240300F8 */ addiu $v1, $zero, 0x00F8 ## $v1 = 000000F8 -/* 00830 80A536D0 84580000 */ lh $t8, 0x0000($v0) ## 00000000 -.L80A536D4: -/* 00834 80A536D4 50780004 */ beql $v1, $t8, .L80A536E8 -/* 00838 80A536D8 AE020314 */ sw $v0, 0x0314($s0) ## 00000314 -/* 0083C 80A536DC 10000007 */ beq $zero, $zero, .L80A536FC -/* 00840 80A536E0 8C420124 */ lw $v0, 0x0124($v0) ## 00000124 -/* 00844 80A536E4 AE020314 */ sw $v0, 0x0314($s0) ## 00000314 -.L80A536E8: -/* 00848 80A536E8 24080000 */ addiu $t0, $zero, 0x0000 ## $t0 = 00000000 -/* 0084C 80A536EC 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 00850 80A536F0 AC49016C */ sw $t1, 0x016C($v0) ## 0000016C -/* 00854 80A536F4 10000003 */ beq $zero, $zero, .L80A53704 -/* 00858 80A536F8 AC480168 */ sw $t0, 0x0168($v0) ## 00000168 -.L80A536FC: -/* 0085C 80A536FC 5440FFF5 */ bnel $v0, $zero, .L80A536D4 -/* 00860 80A53700 84580000 */ lh $t8, 0x0000($v0) ## 00000000 -.L80A53704: -/* 00864 80A53704 0C00084C */ jal osSyncPrintf - -/* 00868 80A53708 8C450124 */ lw $a1, 0x0124($v0) ## 00000124 -/* 0086C 80A5370C 3C1980A5 */ lui $t9, %hi(func_80A5372C) ## $t9 = 80A50000 -/* 00870 80A53710 2739372C */ addiu $t9, $t9, %lo(func_80A5372C) ## $t9 = 80A5372C -/* 00874 80A53714 AE19025C */ sw $t9, 0x025C($s0) ## 0000025C -/* 00878 80A53718 8FBF001C */ lw $ra, 0x001C($sp) -.L80A5371C: -/* 0087C 80A5371C 8FB00018 */ lw $s0, 0x0018($sp) -/* 00880 80A53720 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00884 80A53724 03E00008 */ jr $ra -/* 00888 80A53728 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5372C.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5372C.s deleted file mode 100644 index e534ab83b2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5372C.s +++ /dev/null @@ -1,91 +0,0 @@ -.late_rodata -glabel D_80A552D0 - .word 0x446CC000 -glabel D_80A552D4 - .word 0x44956000 -glabel D_80A552D8 - .word 0x4527A000 -glabel D_80A552DC - .word 0x44918000 -glabel D_80A552E0 - .word 0x448F2000 -glabel D_80A552E4 - .word 0x453C6000 - -.text -glabel func_80A5372C -/* 0088C 80A5372C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00890 80A53730 AFB00028 */ sw $s0, 0x0028($sp) -/* 00894 80A53734 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00898 80A53738 AFBF002C */ sw $ra, 0x002C($sp) -/* 0089C 80A5373C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 008A0 80A53740 AFA50034 */ sw $a1, 0x0034($sp) -/* 008A4 80A53744 0C028800 */ jal SkelAnime_GetFrameCount - -/* 008A8 80A53748 24845C30 */ addiu $a0, $a0, 0x5C30 ## $a0 = 06005C30 -/* 008AC 80A5374C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 008B0 80A53750 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 008B4 80A53754 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 008B8 80A53758 468021A0 */ cvt.s.w $f6, $f4 -/* 008BC 80A5375C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 008C0 80A53760 24A55C30 */ addiu $a1, $a1, 0x5C30 ## $a1 = 06005C30 -/* 008C4 80A53764 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 008C8 80A53768 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 008CC 80A5376C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 008D0 80A53770 4600320D */ trunc.w.s $f8, $f6 -/* 008D4 80A53774 AFA00014 */ sw $zero, 0x0014($sp) -/* 008D8 80A53778 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 008DC 80A5377C 440F4000 */ mfc1 $t7, $f8 -/* 008E0 80A53780 00000000 */ nop -/* 008E4 80A53784 000FC400 */ sll $t8, $t7, 16 -/* 008E8 80A53788 0018CC03 */ sra $t9, $t8, 16 -/* 008EC 80A5378C 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 -/* 008F0 80A53790 00000000 */ nop -/* 008F4 80A53794 46805420 */ cvt.s.w $f16, $f10 -/* 008F8 80A53798 0C029468 */ jal SkelAnime_ChangeAnim - -/* 008FC 80A5379C E7B00010 */ swc1 $f16, 0x0010($sp) -/* 00900 80A537A0 240800C8 */ addiu $t0, $zero, 0x00C8 ## $t0 = 000000C8 -/* 00904 80A537A4 A60802F2 */ sh $t0, 0x02F2($s0) ## 000002F2 -/* 00908 80A537A8 0C03008C */ jal Gameplay_CreateSubCamera -/* 0090C 80A537AC 8FA40034 */ lw $a0, 0x0034($sp) -/* 00910 80A537B0 A6020310 */ sh $v0, 0x0310($s0) ## 00000310 -/* 00914 80A537B4 8FA40034 */ lw $a0, 0x0034($sp) -/* 00918 80A537B8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0091C 80A537BC 0C0300C5 */ jal Gameplay_ChangeCameraStatus -/* 00920 80A537C0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00924 80A537C4 8FA40034 */ lw $a0, 0x0034($sp) -/* 00928 80A537C8 86050310 */ lh $a1, 0x0310($s0) ## 00000310 -/* 0092C 80A537CC 0C0300C5 */ jal Gameplay_ChangeCameraStatus -/* 00930 80A537D0 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 00934 80A537D4 3C0180A5 */ lui $at, %hi(D_80A552D0) ## $at = 80A50000 -/* 00938 80A537D8 C42452D0 */ lwc1 $f4, %lo(D_80A552D0)($at) -/* 0093C 80A537DC 3C0180A5 */ lui $at, %hi(D_80A552D4) ## $at = 80A50000 -/* 00940 80A537E0 86050310 */ lh $a1, 0x0310($s0) ## 00000310 -/* 00944 80A537E4 E6040280 */ swc1 $f4, 0x0280($s0) ## 00000280 -/* 00948 80A537E8 C42652D4 */ lwc1 $f6, %lo(D_80A552D4)($at) -/* 0094C 80A537EC 3C0180A5 */ lui $at, %hi(D_80A552D8) ## $at = 80A50000 -/* 00950 80A537F0 26060280 */ addiu $a2, $s0, 0x0280 ## $a2 = 00000280 -/* 00954 80A537F4 E6060284 */ swc1 $f6, 0x0284($s0) ## 00000284 -/* 00958 80A537F8 C42852D8 */ lwc1 $f8, %lo(D_80A552D8)($at) -/* 0095C 80A537FC 3C0180A5 */ lui $at, %hi(D_80A552DC) ## $at = 80A50000 -/* 00960 80A53800 2607028C */ addiu $a3, $s0, 0x028C ## $a3 = 0000028C -/* 00964 80A53804 E6080288 */ swc1 $f8, 0x0288($s0) ## 00000288 -/* 00968 80A53808 C42A52DC */ lwc1 $f10, %lo(D_80A552DC)($at) -/* 0096C 80A5380C 3C0180A5 */ lui $at, %hi(D_80A552E0) ## $at = 80A50000 -/* 00970 80A53810 E60A028C */ swc1 $f10, 0x028C($s0) ## 0000028C -/* 00974 80A53814 C43052E0 */ lwc1 $f16, %lo(D_80A552E0)($at) -/* 00978 80A53818 3C0180A5 */ lui $at, %hi(D_80A552E4) ## $at = 80A50000 -/* 0097C 80A5381C E6100290 */ swc1 $f16, 0x0290($s0) ## 00000290 -/* 00980 80A53820 C43252E4 */ lwc1 $f18, %lo(D_80A552E4)($at) -/* 00984 80A53824 E6120294 */ swc1 $f18, 0x0294($s0) ## 00000294 -/* 00988 80A53828 0C030136 */ jal func_800C04D8 -/* 0098C 80A5382C 8FA40034 */ lw $a0, 0x0034($sp) -/* 00990 80A53830 3C0980A5 */ lui $t1, %hi(func_80A53850) ## $t1 = 80A50000 -/* 00994 80A53834 25293850 */ addiu $t1, $t1, %lo(func_80A53850) ## $t1 = 80A53850 -/* 00998 80A53838 AE09025C */ sw $t1, 0x025C($s0) ## 0000025C -/* 0099C 80A5383C 8FBF002C */ lw $ra, 0x002C($sp) -/* 009A0 80A53840 8FB00028 */ lw $s0, 0x0028($sp) -/* 009A4 80A53844 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 009A8 80A53848 03E00008 */ jr $ra -/* 009AC 80A5384C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53850.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53850.s deleted file mode 100644 index d0fe83201c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53850.s +++ /dev/null @@ -1,50 +0,0 @@ -glabel func_80A53850 -/* 009B0 80A53850 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 009B4 80A53854 AFB00014 */ sw $s0, 0x0014($sp) -/* 009B8 80A53858 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 009BC 80A5385C AFBF001C */ sw $ra, 0x001C($sp) -/* 009C0 80A53860 AFB10018 */ sw $s1, 0x0018($sp) -/* 009C4 80A53864 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 009C8 80A53868 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 009CC 80A5386C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 009D0 80A53870 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 009D4 80A53874 86050310 */ lh $a1, 0x0310($s0) ## 00000310 -/* 009D8 80A53878 26060280 */ addiu $a2, $s0, 0x0280 ## $a2 = 00000280 -/* 009DC 80A5387C 0C030136 */ jal func_800C04D8 -/* 009E0 80A53880 2607028C */ addiu $a3, $s0, 0x028C ## $a3 = 0000028C -/* 009E4 80A53884 860E02F2 */ lh $t6, 0x02F2($s0) ## 000002F2 -/* 009E8 80A53888 8E020314 */ lw $v0, 0x0314($s0) ## 00000314 -/* 009EC 80A5388C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 009F0 80A53890 11C00007 */ beq $t6, $zero, .L80A538B0 -/* 009F4 80A53894 00000000 */ nop -/* 009F8 80A53898 8C580168 */ lw $t8, 0x0168($v0) ## 00000168 -/* 009FC 80A5389C 8C59016C */ lw $t9, 0x016C($v0) ## 0000016C -/* 00A00 80A538A0 57000015 */ bnel $t8, $zero, .L80A538F8 -/* 00A04 80A538A4 8FBF001C */ lw $ra, 0x001C($sp) -/* 00A08 80A538A8 57200013 */ bnel $t9, $zero, .L80A538F8 -/* 00A0C 80A538AC 8FBF001C */ lw $ra, 0x001C($sp) -.L80A538B0: -/* 00A10 80A538B0 0C0300E1 */ jal Gameplay_ClearCamera -/* 00A14 80A538B4 86050310 */ lh $a1, 0x0310($s0) ## 00000310 -/* 00A18 80A538B8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00A1C 80A538BC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00A20 80A538C0 0C0300C5 */ jal Gameplay_ChangeCameraStatus -/* 00A24 80A538C4 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 00A28 80A538C8 0C041B33 */ jal func_80106CCC -/* 00A2C 80A538CC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00A30 80A538D0 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 00A34 80A538D4 A20F030C */ sb $t7, 0x030C($s0) ## 0000030C -/* 00A38 80A538D8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00A3C 80A538DC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00A40 80A538E0 0C00B7D5 */ jal func_8002DF54 -/* 00A44 80A538E4 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 00A48 80A538E8 3C0880A5 */ lui $t0, %hi(func_80A531E4) ## $t0 = 80A50000 -/* 00A4C 80A538EC 250831E4 */ addiu $t0, $t0, %lo(func_80A531E4) ## $t0 = 80A531E4 -/* 00A50 80A538F0 AE08025C */ sw $t0, 0x025C($s0) ## 0000025C -/* 00A54 80A538F4 8FBF001C */ lw $ra, 0x001C($sp) -.L80A538F8: -/* 00A58 80A538F8 8FB00014 */ lw $s0, 0x0014($sp) -/* 00A5C 80A538FC 8FB10018 */ lw $s1, 0x0018($sp) -/* 00A60 80A53900 03E00008 */ jr $ra -/* 00A64 80A53904 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53908.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53908.s deleted file mode 100644 index 346e03c0f9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53908.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_80A53908 -/* 00A68 80A53908 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00A6C 80A5390C AFA40028 */ sw $a0, 0x0028($sp) -/* 00A70 80A53910 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00A74 80A53914 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00A78 80A53918 AFA5002C */ sw $a1, 0x002C($sp) -/* 00A7C 80A5391C 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00A80 80A53920 24845C30 */ addiu $a0, $a0, 0x5C30 ## $a0 = 06005C30 -/* 00A84 80A53924 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00A88 80A53928 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00A8C 80A5392C 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 00A90 80A53930 468021A0 */ cvt.s.w $f6, $f4 -/* 00A94 80A53934 8FA40028 */ lw $a0, 0x0028($sp) -/* 00A98 80A53938 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00A9C 80A5393C 24A55C30 */ addiu $a1, $a1, 0x5C30 ## $a1 = 06005C30 -/* 00AA0 80A53940 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00AA4 80A53944 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00AA8 80A53948 4600320D */ trunc.w.s $f8, $f6 -/* 00AAC 80A5394C AFA00014 */ sw $zero, 0x0014($sp) -/* 00AB0 80A53950 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 00AB4 80A53954 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00AB8 80A53958 440F4000 */ mfc1 $t7, $f8 -/* 00ABC 80A5395C 00000000 */ nop -/* 00AC0 80A53960 000FC400 */ sll $t8, $t7, 16 -/* 00AC4 80A53964 0018CC03 */ sra $t9, $t8, 16 -/* 00AC8 80A53968 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 -/* 00ACC 80A5396C 00000000 */ nop -/* 00AD0 80A53970 46805420 */ cvt.s.w $f16, $f10 -/* 00AD4 80A53974 0C029468 */ jal SkelAnime_ChangeAnim - -/* 00AD8 80A53978 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 00ADC 80A5397C 8FA90028 */ lw $t1, 0x0028($sp) -/* 00AE0 80A53980 3C0880A5 */ lui $t0, %hi(func_80A5399C) ## $t0 = 80A50000 -/* 00AE4 80A53984 2508399C */ addiu $t0, $t0, %lo(func_80A5399C) ## $t0 = 80A5399C -/* 00AE8 80A53988 AD28025C */ sw $t0, 0x025C($t1) ## 0000025C -/* 00AEC 80A5398C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00AF0 80A53990 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00AF4 80A53994 03E00008 */ jr $ra -/* 00AF8 80A53998 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5399C.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5399C.s deleted file mode 100644 index 2897a3e3b5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5399C.s +++ /dev/null @@ -1,94 +0,0 @@ -.rdata -glabel D_80A551C0 - .asciz " ☆☆☆☆☆ とおしゃしねぇちゅーの ☆☆☆☆☆ \n" - .balign 4 - -.text -glabel func_80A5399C -/* 00AFC 80A5399C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00B00 80A539A0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00B04 80A539A4 AFA50024 */ sw $a1, 0x0024($sp) -/* 00B08 80A539A8 A080030B */ sb $zero, 0x030B($a0) ## 0000030B -/* 00B0C 80A539AC 3C028016 */ lui $v0, %hi(gSaveContext+0xf06) -/* 00B10 80A539B0 9442F566 */ lhu $v0, %lo(gSaveContext+0xf06)($v0) -/* 00B14 80A539B4 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00B18 80A539B8 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -/* 00B1C 80A539BC 304E0040 */ andi $t6, $v0, 0x0040 ## $t6 = 00000000 -/* 00B20 80A539C0 11C00039 */ beq $t6, $zero, .L80A53AA8 -/* 00B24 80A539C4 3C0480A5 */ lui $a0, %hi(D_80A551C0) ## $a0 = 80A50000 -/* 00B28 80A539C8 304F0080 */ andi $t7, $v0, 0x0080 ## $t7 = 00000000 -/* 00B2C 80A539CC 15E0001A */ bne $t7, $zero, .L80A53A38 -/* 00B30 80A539D0 240D2020 */ addiu $t5, $zero, 0x2020 ## $t5 = 00002020 -/* 00B34 80A539D4 8FA40024 */ lw $a0, 0x0024($sp) -/* 00B38 80A539D8 0C023C20 */ jal func_8008F080 -/* 00B3C 80A539DC AFA60020 */ sw $a2, 0x0020($sp) -/* 00B40 80A539E0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00B44 80A539E4 1441000E */ bne $v0, $at, .L80A53A20 -/* 00B48 80A539E8 8FA60020 */ lw $a2, 0x0020($sp) -/* 00B4C 80A539EC 90D80309 */ lbu $t8, 0x0309($a2) ## 00000309 -/* 00B50 80A539F0 24090004 */ addiu $t1, $zero, 0x0004 ## $t1 = 00000004 -/* 00B54 80A539F4 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 00B58 80A539F8 17000004 */ bne $t8, $zero, .L80A53A0C -/* 00B5C 80A539FC 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 00B60 80A53A00 2419200A */ addiu $t9, $zero, 0x200A ## $t9 = 0000200A -/* 00B64 80A53A04 10000003 */ beq $zero, $zero, .L80A53A14 -/* 00B68 80A53A08 A4D9010E */ sh $t9, 0x010E($a2) ## 0000010E -.L80A53A0C: -/* 00B6C 80A53A0C 2408200B */ addiu $t0, $zero, 0x200B ## $t0 = 0000200B -/* 00B70 80A53A10 A4C8010E */ sh $t0, 0x010E($a2) ## 0000010E -.L80A53A14: -/* 00B74 80A53A14 A4C90300 */ sh $t1, 0x0300($a2) ## 00000300 -/* 00B78 80A53A18 1000000B */ beq $zero, $zero, .L80A53A48 -/* 00B7C 80A53A1C A0CA030B */ sb $t2, 0x030B($a2) ## 0000030B -.L80A53A20: -/* 00B80 80A53A20 240B2016 */ addiu $t3, $zero, 0x2016 ## $t3 = 00002016 -/* 00B84 80A53A24 240C0006 */ addiu $t4, $zero, 0x0006 ## $t4 = 00000006 -/* 00B88 80A53A28 A4CB010E */ sh $t3, 0x010E($a2) ## 0000010E -/* 00B8C 80A53A2C A4CC0300 */ sh $t4, 0x0300($a2) ## 00000300 -/* 00B90 80A53A30 10000005 */ beq $zero, $zero, .L80A53A48 -/* 00B94 80A53A34 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -.L80A53A38: -/* 00B98 80A53A38 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 00B9C 80A53A3C A4CD010E */ sh $t5, 0x010E($a2) ## 0000010E -/* 00BA0 80A53A40 A4CE0300 */ sh $t6, 0x0300($a2) ## 00000300 -/* 00BA4 80A53A44 A4C0030E */ sh $zero, 0x030E($a2) ## 0000030E -.L80A53A48: -/* 00BA8 80A53A48 8FA40024 */ lw $a0, 0x0024($sp) -/* 00BAC 80A53A4C 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 -/* 00BB0 80A53A50 A7A3001E */ sh $v1, 0x001E($sp) -/* 00BB4 80A53A54 0C01B0D8 */ jal Text_GetFaceReaction -/* 00BB8 80A53A58 AFA60020 */ sw $a2, 0x0020($sp) -/* 00BBC 80A53A5C 87A3001E */ lh $v1, 0x001E($sp) -/* 00BC0 80A53A60 1040000D */ beq $v0, $zero, .L80A53A98 -/* 00BC4 80A53A64 8FA60020 */ lw $a2, 0x0020($sp) -/* 00BC8 80A53A68 1460000B */ bne $v1, $zero, .L80A53A98 -/* 00BCC 80A53A6C 8FA40024 */ lw $a0, 0x0024($sp) -/* 00BD0 80A53A70 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 -/* 00BD4 80A53A74 0C01B0D8 */ jal Text_GetFaceReaction -/* 00BD8 80A53A78 AFA60020 */ sw $a2, 0x0020($sp) -/* 00BDC 80A53A7C 8FA60020 */ lw $a2, 0x0020($sp) -/* 00BE0 80A53A80 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 00BE4 80A53A84 24180006 */ addiu $t8, $zero, 0x0006 ## $t8 = 00000006 -/* 00BE8 80A53A88 A4C2010E */ sh $v0, 0x010E($a2) ## 0000010E -/* 00BEC 80A53A8C A0CF030B */ sb $t7, 0x030B($a2) ## 0000030B -/* 00BF0 80A53A90 A4D80300 */ sh $t8, 0x0300($a2) ## 00000300 -/* 00BF4 80A53A94 A4C0030E */ sh $zero, 0x030E($a2) ## 0000030E -.L80A53A98: -/* 00BF8 80A53A98 3C1980A5 */ lui $t9, %hi(func_80A5475C) ## $t9 = 80A50000 -/* 00BFC 80A53A9C 2739475C */ addiu $t9, $t9, %lo(func_80A5475C) ## $t9 = 80A5475C -/* 00C00 80A53AA0 10000008 */ beq $zero, $zero, .L80A53AC4 -/* 00C04 80A53AA4 ACD9025C */ sw $t9, 0x025C($a2) ## 0000025C -.L80A53AA8: -/* 00C08 80A53AA8 248451C0 */ addiu $a0, $a0, %lo(D_80A551C0) ## $a0 = 000051C0 -/* 00C0C 80A53AAC 0C00084C */ jal osSyncPrintf - -/* 00C10 80A53AB0 AFA60020 */ sw $a2, 0x0020($sp) -/* 00C14 80A53AB4 8FA60020 */ lw $a2, 0x0020($sp) -/* 00C18 80A53AB8 3C0880A5 */ lui $t0, %hi(func_80A53AD4) ## $t0 = 80A50000 -/* 00C1C 80A53ABC 25083AD4 */ addiu $t0, $t0, %lo(func_80A53AD4) ## $t0 = 80A53AD4 -/* 00C20 80A53AC0 ACC8025C */ sw $t0, 0x025C($a2) ## 0000025C -.L80A53AC4: -/* 00C24 80A53AC4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00C28 80A53AC8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00C2C 80A53ACC 03E00008 */ jr $ra -/* 00C30 80A53AD0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53AD4.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53AD4.s deleted file mode 100644 index a670df39e2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53AD4.s +++ /dev/null @@ -1,88 +0,0 @@ -glabel func_80A53AD4 -/* 00C34 80A53AD4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00C38 80A53AD8 AFBF001C */ sw $ra, 0x001C($sp) -/* 00C3C 80A53ADC AFB00018 */ sw $s0, 0x0018($sp) -/* 00C40 80A53AE0 AFA5002C */ sw $a1, 0x002C($sp) -/* 00C44 80A53AE4 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 00C48 80A53AE8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00C4C 80A53AEC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00C50 80A53AF0 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00C54 80A53AF4 AFAF0024 */ sw $t7, 0x0024($sp) -/* 00C58 80A53AF8 8FA4002C */ lw $a0, 0x002C($sp) -/* 00C5C 80A53AFC 0C01B0D8 */ jal Text_GetFaceReaction -/* 00C60 80A53B00 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 -/* 00C64 80A53B04 10400006 */ beq $v0, $zero, .L80A53B20 -/* 00C68 80A53B08 2418200E */ addiu $t8, $zero, 0x200E ## $t8 = 0000200E -/* 00C6C 80A53B0C 8FA4002C */ lw $a0, 0x002C($sp) -/* 00C70 80A53B10 0C01B0D8 */ jal Text_GetFaceReaction -/* 00C74 80A53B14 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 -/* 00C78 80A53B18 10000002 */ beq $zero, $zero, .L80A53B24 -/* 00C7C 80A53B1C A602010E */ sh $v0, 0x010E($s0) ## 0000010E -.L80A53B20: -/* 00C80 80A53B20 A618010E */ sh $t8, 0x010E($s0) ## 0000010E -.L80A53B24: -/* 00C84 80A53B24 24190006 */ addiu $t9, $zero, 0x0006 ## $t9 = 00000006 -/* 00C88 80A53B28 A6190300 */ sh $t9, 0x0300($s0) ## 00000300 -/* 00C8C 80A53B2C 8FA5002C */ lw $a1, 0x002C($sp) -/* 00C90 80A53B30 0C00BC65 */ jal func_8002F194 -/* 00C94 80A53B34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C98 80A53B38 10400016 */ beq $v0, $zero, .L80A53B94 -/* 00C9C 80A53B3C 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 -/* 00CA0 80A53B40 0C00BCDA */ jal func_8002F368 -/* 00CA4 80A53B44 8FA4002C */ lw $a0, 0x002C($sp) -/* 00CA8 80A53B48 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00CAC 80A53B4C 1441000C */ bne $v0, $at, .L80A53B80 -/* 00CB0 80A53B50 00000000 */ nop -/* 00CB4 80A53B54 0C01E221 */ jal func_80078884 -/* 00CB8 80A53B58 24044802 */ addiu $a0, $zero, 0x4802 ## $a0 = 00004802 -/* 00CBC 80A53B5C 8FA90024 */ lw $t1, 0x0024($sp) -/* 00CC0 80A53B60 24082010 */ addiu $t0, $zero, 0x2010 ## $t0 = 00002010 -/* 00CC4 80A53B64 3C0B80A5 */ lui $t3, %hi(func_80A53C0C) ## $t3 = 80A50000 -/* 00CC8 80A53B68 240A0005 */ addiu $t2, $zero, 0x0005 ## $t2 = 00000005 -/* 00CCC 80A53B6C 256B3C0C */ addiu $t3, $t3, %lo(func_80A53C0C) ## $t3 = 80A53C0C -/* 00CD0 80A53B70 A528010E */ sh $t0, 0x010E($t1) ## 0000010E -/* 00CD4 80A53B74 A60A0300 */ sh $t2, 0x0300($s0) ## 00000300 -/* 00CD8 80A53B78 1000001F */ beq $zero, $zero, .L80A53BF8 -/* 00CDC 80A53B7C AE0B025C */ sw $t3, 0x025C($s0) ## 0000025C -.L80A53B80: -/* 00CE0 80A53B80 1040001D */ beq $v0, $zero, .L80A53BF8 -/* 00CE4 80A53B84 8FAD0024 */ lw $t5, 0x0024($sp) -/* 00CE8 80A53B88 240C200F */ addiu $t4, $zero, 0x200F ## $t4 = 0000200F -/* 00CEC 80A53B8C 1000001A */ beq $zero, $zero, .L80A53BF8 -/* 00CF0 80A53B90 A5AC010E */ sh $t4, 0x010E($t5) ## 0000010E -.L80A53B94: -/* 00CF4 80A53B94 860E008A */ lh $t6, 0x008A($s0) ## 0000008A -/* 00CF8 80A53B98 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6 -/* 00CFC 80A53B9C 44812000 */ mtc1 $at, $f4 ## $f4 = 0.00 -/* 00D00 80A53BA0 01CF1023 */ subu $v0, $t6, $t7 -/* 00D04 80A53BA4 00021400 */ sll $v0, $v0, 16 -/* 00D08 80A53BA8 00021403 */ sra $v0, $v0, 16 -/* 00D0C 80A53BAC 04400004 */ bltz $v0, .L80A53BC0 -/* 00D10 80A53BB0 00021823 */ subu $v1, $zero, $v0 -/* 00D14 80A53BB4 00021C00 */ sll $v1, $v0, 16 -/* 00D18 80A53BB8 10000003 */ beq $zero, $zero, .L80A53BC8 -/* 00D1C 80A53BBC 00031C03 */ sra $v1, $v1, 16 -.L80A53BC0: -/* 00D20 80A53BC0 00031C00 */ sll $v1, $v1, 16 -/* 00D24 80A53BC4 00031C03 */ sra $v1, $v1, 16 -.L80A53BC8: -/* 00D28 80A53BC8 C6060090 */ lwc1 $f6, 0x0090($s0) ## 00000090 -/* 00D2C 80A53BCC 28614300 */ slti $at, $v1, 0x4300 -/* 00D30 80A53BD0 4606203C */ c.lt.s $f4, $f6 -/* 00D34 80A53BD4 00000000 */ nop -/* 00D38 80A53BD8 45030008 */ bc1tl .L80A53BFC -/* 00D3C 80A53BDC 8FBF001C */ lw $ra, 0x001C($sp) -/* 00D40 80A53BE0 10200005 */ beq $at, $zero, .L80A53BF8 -/* 00D44 80A53BE4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D48 80A53BE8 8FA5002C */ lw $a1, 0x002C($sp) -/* 00D4C 80A53BEC 3C0642C8 */ lui $a2, 0x42C8 ## $a2 = 42C80000 -/* 00D50 80A53BF0 0C00BCA6 */ jal func_8002F298 -/* 00D54 80A53BF4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -.L80A53BF8: -/* 00D58 80A53BF8 8FBF001C */ lw $ra, 0x001C($sp) -.L80A53BFC: -/* 00D5C 80A53BFC 8FB00018 */ lw $s0, 0x0018($sp) -/* 00D60 80A53C00 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00D64 80A53C04 03E00008 */ jr $ra -/* 00D68 80A53C08 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53C0C.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53C0C.s deleted file mode 100644 index 1659c00975..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53C0C.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_80A53C0C -/* 00D6C 80A53C0C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00D70 80A53C10 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00D74 80A53C14 AFA40018 */ sw $a0, 0x0018($sp) -/* 00D78 80A53C18 AFA5001C */ sw $a1, 0x001C($sp) -/* 00D7C 80A53C1C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00D80 80A53C20 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00D84 80A53C24 8FA4001C */ lw $a0, 0x001C($sp) -/* 00D88 80A53C28 0C042F6F */ jal func_8010BDBC -/* 00D8C 80A53C2C 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 00D90 80A53C30 8FAE0018 */ lw $t6, 0x0018($sp) -/* 00D94 80A53C34 85CF0300 */ lh $t7, 0x0300($t6) ## 00000300 -/* 00D98 80A53C38 55E20012 */ bnel $t7, $v0, .L80A53C84 -/* 00D9C 80A53C3C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00DA0 80A53C40 0C041AF2 */ jal func_80106BC8 -/* 00DA4 80A53C44 8FA4001C */ lw $a0, 0x001C($sp) -/* 00DA8 80A53C48 1040000D */ beq $v0, $zero, .L80A53C80 -/* 00DAC 80A53C4C 8FA4001C */ lw $a0, 0x001C($sp) -/* 00DB0 80A53C50 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00DB4 80A53C54 0C00B7D5 */ jal func_8002DF54 -/* 00DB8 80A53C58 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 00DBC 80A53C5C 8FB9001C */ lw $t9, 0x001C($sp) -/* 00DC0 80A53C60 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00DC4 80A53C64 24180037 */ addiu $t8, $zero, 0x0037 ## $t8 = 00000037 -/* 00DC8 80A53C68 00390821 */ addu $at, $at, $t9 -/* 00DCC 80A53C6C A03803DC */ sb $t8, 0x03DC($at) ## 000103DC -/* 00DD0 80A53C70 8FA90018 */ lw $t1, 0x0018($sp) -/* 00DD4 80A53C74 3C0880A5 */ lui $t0, %hi(func_80A53C90) ## $t0 = 80A50000 -/* 00DD8 80A53C78 25083C90 */ addiu $t0, $t0, %lo(func_80A53C90) ## $t0 = 80A53C90 -/* 00DDC 80A53C7C AD28025C */ sw $t0, 0x025C($t1) ## 0000025C -.L80A53C80: -/* 00DE0 80A53C80 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A53C84: -/* 00DE4 80A53C84 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00DE8 80A53C88 03E00008 */ jr $ra -/* 00DEC 80A53C8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53C90.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53C90.s deleted file mode 100644 index 9587cd46ad..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53C90.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80A53C90 -/* 00DF0 80A53C90 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00DF4 80A53C94 AFA40028 */ sw $a0, 0x0028($sp) -/* 00DF8 80A53C98 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00DFC 80A53C9C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00E00 80A53CA0 AFA5002C */ sw $a1, 0x002C($sp) -/* 00E04 80A53CA4 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00E08 80A53CA8 24845500 */ addiu $a0, $a0, 0x5500 ## $a0 = 06005500 -/* 00E0C 80A53CAC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00E10 80A53CB0 8FA30028 */ lw $v1, 0x0028($sp) -/* 00E14 80A53CB4 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00E18 80A53CB8 46802020 */ cvt.s.w $f0, $f4 -/* 00E1C 80A53CBC 44813000 */ mtc1 $at, $f6 ## $f6 = -10.00 -/* 00E20 80A53CC0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00E24 80A53CC4 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00E28 80A53CC8 24A55500 */ addiu $a1, $a1, 0x5500 ## $a1 = 06005500 -/* 00E2C 80A53CCC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00E30 80A53CD0 E46002EC */ swc1 $f0, 0x02EC($v1) ## 000002EC -/* 00E34 80A53CD4 AFAE0014 */ sw $t6, 0x0014($sp) -/* 00E38 80A53CD8 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00E3C 80A53CDC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00E40 80A53CE0 2464014C */ addiu $a0, $v1, 0x014C ## $a0 = 0000014C -/* 00E44 80A53CE4 0C029468 */ jal SkelAnime_ChangeAnim - -/* 00E48 80A53CE8 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 00E4C 80A53CEC 8FB80028 */ lw $t8, 0x0028($sp) -/* 00E50 80A53CF0 3C0F80A5 */ lui $t7, %hi(func_80A53D0C) ## $t7 = 80A50000 -/* 00E54 80A53CF4 25EF3D0C */ addiu $t7, $t7, %lo(func_80A53D0C) ## $t7 = 80A53D0C -/* 00E58 80A53CF8 AF0F025C */ sw $t7, 0x025C($t8) ## 0000025C -/* 00E5C 80A53CFC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00E60 80A53D00 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00E64 80A53D04 03E00008 */ jr $ra -/* 00E68 80A53D08 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53D0C.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53D0C.s deleted file mode 100644 index a048a87e72..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53D0C.s +++ /dev/null @@ -1,75 +0,0 @@ -.rdata -glabel D_80A551F8 - .asciz "☆☆☆ きたきたきたぁ！ ☆☆☆ %x\n" - .balign 4 - -.text -glabel func_80A53D0C -/* 00E6C 80A53D0C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00E70 80A53D10 AFBF001C */ sw $ra, 0x001C($sp) -/* 00E74 80A53D14 AFB00018 */ sw $s0, 0x0018($sp) -/* 00E78 80A53D18 C4840164 */ lwc1 $f4, 0x0164($a0) ## 00000164 -/* 00E7C 80A53D1C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00E80 80A53D20 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00E84 80A53D24 E7A40028 */ swc1 $f4, 0x0028($sp) -/* 00E88 80A53D28 8CA21C6C */ lw $v0, 0x1C6C($a1) ## 00001C6C -/* 00E8C 80A53D2C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00E90 80A53D30 AFA20024 */ sw $v0, 0x0024($sp) -/* 00E94 80A53D34 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -/* 00E98 80A53D38 44814000 */ mtc1 $at, $f8 ## $f8 = 12.00 -/* 00E9C 80A53D3C C7A60028 */ lwc1 $f6, 0x0028($sp) -/* 00EA0 80A53D40 8FA20024 */ lw $v0, 0x0024($sp) -/* 00EA4 80A53D44 4606403E */ c.le.s $f8, $f6 -/* 00EA8 80A53D48 00000000 */ nop -/* 00EAC 80A53D4C 4502000C */ bc1fl .L80A53D80 -/* 00EB0 80A53D50 C7AA0028 */ lwc1 $f10, 0x0028($sp) -/* 00EB4 80A53D54 920E0308 */ lbu $t6, 0x0308($s0) ## 00000308 -/* 00EB8 80A53D58 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00EBC 80A53D5C 24052823 */ addiu $a1, $zero, 0x2823 ## $a1 = 00002823 -/* 00EC0 80A53D60 55C00007 */ bnel $t6, $zero, .L80A53D80 -/* 00EC4 80A53D64 C7AA0028 */ lwc1 $f10, 0x0028($sp) -/* 00EC8 80A53D68 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00ECC 80A53D6C AFA20024 */ sw $v0, 0x0024($sp) -/* 00ED0 80A53D70 8FA20024 */ lw $v0, 0x0024($sp) -/* 00ED4 80A53D74 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 00ED8 80A53D78 A20F0308 */ sb $t7, 0x0308($s0) ## 00000308 -/* 00EDC 80A53D7C C7AA0028 */ lwc1 $f10, 0x0028($sp) -.L80A53D80: -/* 00EE0 80A53D80 C61002EC */ lwc1 $f16, 0x02EC($s0) ## 000002EC -/* 00EE4 80A53D84 3C0480A5 */ lui $a0, %hi(D_80A551F8) ## $a0 = 80A50000 -/* 00EE8 80A53D88 248451F8 */ addiu $a0, $a0, %lo(D_80A551F8) ## $a0 = 80A551F8 -/* 00EEC 80A53D8C 460A803E */ c.le.s $f16, $f10 -/* 00EF0 80A53D90 00000000 */ nop -/* 00EF4 80A53D94 45020014 */ bc1fl .L80A53DE8 -/* 00EF8 80A53D98 8FBF001C */ lw $ra, 0x001C($sp) -/* 00EFC 80A53D9C 1040000C */ beq $v0, $zero, .L80A53DD0 -/* 00F00 80A53DA0 24030100 */ addiu $v1, $zero, 0x0100 ## $v1 = 00000100 -/* 00F04 80A53DA4 84580000 */ lh $t8, 0x0000($v0) ## 00000000 -.L80A53DA8: -/* 00F08 80A53DA8 50780004 */ beql $v1, $t8, .L80A53DBC -/* 00F0C 80A53DAC AE020314 */ sw $v0, 0x0314($s0) ## 00000314 -/* 00F10 80A53DB0 10000005 */ beq $zero, $zero, .L80A53DC8 -/* 00F14 80A53DB4 8C420124 */ lw $v0, 0x0124($v0) ## 00000124 -/* 00F18 80A53DB8 AE020314 */ sw $v0, 0x0314($s0) ## 00000314 -.L80A53DBC: -/* 00F1C 80A53DBC 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 00F20 80A53DC0 10000003 */ beq $zero, $zero, .L80A53DD0 -/* 00F24 80A53DC4 A4590168 */ sh $t9, 0x0168($v0) ## 00000168 -.L80A53DC8: -/* 00F28 80A53DC8 5440FFF7 */ bnel $v0, $zero, .L80A53DA8 -/* 00F2C 80A53DCC 84580000 */ lh $t8, 0x0000($v0) ## 00000000 -.L80A53DD0: -/* 00F30 80A53DD0 0C00084C */ jal osSyncPrintf - -/* 00F34 80A53DD4 8C450124 */ lw $a1, 0x0124($v0) ## 00000124 -/* 00F38 80A53DD8 3C0880A5 */ lui $t0, %hi(func_80A53DF8) ## $t0 = 80A50000 -/* 00F3C 80A53DDC 25083DF8 */ addiu $t0, $t0, %lo(func_80A53DF8) ## $t0 = 80A53DF8 -/* 00F40 80A53DE0 AE08025C */ sw $t0, 0x025C($s0) ## 0000025C -/* 00F44 80A53DE4 8FBF001C */ lw $ra, 0x001C($sp) -.L80A53DE8: -/* 00F48 80A53DE8 8FB00018 */ lw $s0, 0x0018($sp) -/* 00F4C 80A53DEC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00F50 80A53DF0 03E00008 */ jr $ra -/* 00F54 80A53DF4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53DF8.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53DF8.s deleted file mode 100644 index 654834895d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53DF8.s +++ /dev/null @@ -1,92 +0,0 @@ -.late_rodata -glabel D_80A552E8 - .word 0x440EC000 -glabel D_80A552EC - .word 0xC4B9E000 -glabel D_80A552F0 - .word 0x43D08000 -glabel D_80A552F4 - .word 0xC486E000 - -.text -glabel func_80A53DF8 -/* 00F58 80A53DF8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00F5C 80A53DFC AFB00028 */ sw $s0, 0x0028($sp) -/* 00F60 80A53E00 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00F64 80A53E04 AFBF002C */ sw $ra, 0x002C($sp) -/* 00F68 80A53E08 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00F6C 80A53E0C AFA50034 */ sw $a1, 0x0034($sp) -/* 00F70 80A53E10 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00F74 80A53E14 24845C30 */ addiu $a0, $a0, 0x5C30 ## $a0 = 06005C30 -/* 00F78 80A53E18 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00F7C 80A53E1C 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00F80 80A53E20 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00F84 80A53E24 468021A0 */ cvt.s.w $f6, $f4 -/* 00F88 80A53E28 24A55C30 */ addiu $a1, $a1, 0x5C30 ## $a1 = 06005C30 -/* 00F8C 80A53E2C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00F90 80A53E30 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00F94 80A53E34 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00F98 80A53E38 AFA00014 */ sw $zero, 0x0014($sp) -/* 00F9C 80A53E3C 4600320D */ trunc.w.s $f8, $f6 -/* 00FA0 80A53E40 44813000 */ mtc1 $at, $f6 ## $f6 = -10.00 -/* 00FA4 80A53E44 440F4000 */ mfc1 $t7, $f8 -/* 00FA8 80A53E48 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 00FAC 80A53E4C 000FC400 */ sll $t8, $t7, 16 -/* 00FB0 80A53E50 0018CC03 */ sra $t9, $t8, 16 -/* 00FB4 80A53E54 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 -/* 00FB8 80A53E58 00000000 */ nop -/* 00FBC 80A53E5C 46805120 */ cvt.s.w $f4, $f10 -/* 00FC0 80A53E60 0C029468 */ jal SkelAnime_ChangeAnim - -/* 00FC4 80A53E64 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00FC8 80A53E68 240800C8 */ addiu $t0, $zero, 0x00C8 ## $t0 = 000000C8 -/* 00FCC 80A53E6C A60802F2 */ sh $t0, 0x02F2($s0) ## 000002F2 -/* 00FD0 80A53E70 0C03008C */ jal Gameplay_CreateSubCamera -/* 00FD4 80A53E74 8FA40034 */ lw $a0, 0x0034($sp) -/* 00FD8 80A53E78 A6020310 */ sh $v0, 0x0310($s0) ## 00000310 -/* 00FDC 80A53E7C 8FA40034 */ lw $a0, 0x0034($sp) -/* 00FE0 80A53E80 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00FE4 80A53E84 0C0300C5 */ jal Gameplay_ChangeCameraStatus -/* 00FE8 80A53E88 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00FEC 80A53E8C 8FA40034 */ lw $a0, 0x0034($sp) -/* 00FF0 80A53E90 86050310 */ lh $a1, 0x0310($s0) ## 00000310 -/* 00FF4 80A53E94 0C0300C5 */ jal Gameplay_ChangeCameraStatus -/* 00FF8 80A53E98 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 00FFC 80A53E9C 3C01C28E */ lui $at, 0xC28E ## $at = C28E0000 -/* 01000 80A53EA0 44810000 */ mtc1 $at, $f0 ## $f0 = -71.00 -/* 01004 80A53EA4 3C0180A5 */ lui $at, %hi(D_80A552E8) ## $at = 80A50000 -/* 01008 80A53EA8 C42252E8 */ lwc1 $f2, %lo(D_80A552E8)($at) -/* 0100C 80A53EAC 3C0180A5 */ lui $at, %hi(D_80A552EC) ## $at = 80A50000 -/* 01010 80A53EB0 C42C52EC */ lwc1 $f12, %lo(D_80A552EC)($at) -/* 01014 80A53EB4 3C014335 */ lui $at, 0x4335 ## $at = 43350000 -/* 01018 80A53EB8 44817000 */ mtc1 $at, $f14 ## $f14 = 181.00 -/* 0101C 80A53EBC 3C0180A5 */ lui $at, %hi(D_80A552F0) ## $at = 80A50000 -/* 01020 80A53EC0 C43052F0 */ lwc1 $f16, %lo(D_80A552F0)($at) -/* 01024 80A53EC4 3C0180A5 */ lui $at, %hi(D_80A552F4) ## $at = 80A50000 -/* 01028 80A53EC8 C43252F4 */ lwc1 $f18, %lo(D_80A552F4)($at) -/* 0102C 80A53ECC E60002BC */ swc1 $f0, 0x02BC($s0) ## 000002BC -/* 01030 80A53ED0 E6000280 */ swc1 $f0, 0x0280($s0) ## 00000280 -/* 01034 80A53ED4 E60202C0 */ swc1 $f2, 0x02C0($s0) ## 000002C0 -/* 01038 80A53ED8 E6020284 */ swc1 $f2, 0x0284($s0) ## 00000284 -/* 0103C 80A53EDC E60C02C4 */ swc1 $f12, 0x02C4($s0) ## 000002C4 -/* 01040 80A53EE0 E60C0288 */ swc1 $f12, 0x0288($s0) ## 00000288 -/* 01044 80A53EE4 E60E0298 */ swc1 $f14, 0x0298($s0) ## 00000298 -/* 01048 80A53EE8 E60E028C */ swc1 $f14, 0x028C($s0) ## 0000028C -/* 0104C 80A53EEC E610029C */ swc1 $f16, 0x029C($s0) ## 0000029C -/* 01050 80A53EF0 E6100290 */ swc1 $f16, 0x0290($s0) ## 00000290 -/* 01054 80A53EF4 E61202A0 */ swc1 $f18, 0x02A0($s0) ## 000002A0 -/* 01058 80A53EF8 E6120294 */ swc1 $f18, 0x0294($s0) ## 00000294 -/* 0105C 80A53EFC 8FA40034 */ lw $a0, 0x0034($sp) -/* 01060 80A53F00 86050310 */ lh $a1, 0x0310($s0) ## 00000310 -/* 01064 80A53F04 26060280 */ addiu $a2, $s0, 0x0280 ## $a2 = 00000280 -/* 01068 80A53F08 0C030136 */ jal func_800C04D8 -/* 0106C 80A53F0C 2607028C */ addiu $a3, $s0, 0x028C ## $a3 = 0000028C -/* 01070 80A53F10 3C0980A5 */ lui $t1, %hi(func_80A53F30) ## $t1 = 80A50000 -/* 01074 80A53F14 25293F30 */ addiu $t1, $t1, %lo(func_80A53F30) ## $t1 = 80A53F30 -/* 01078 80A53F18 AE09025C */ sw $t1, 0x025C($s0) ## 0000025C -/* 0107C 80A53F1C 8FBF002C */ lw $ra, 0x002C($sp) -/* 01080 80A53F20 8FB00028 */ lw $s0, 0x0028($sp) -/* 01084 80A53F24 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01088 80A53F28 03E00008 */ jr $ra -/* 0108C 80A53F2C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53F30.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53F30.s deleted file mode 100644 index cd770612fb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53F30.s +++ /dev/null @@ -1,73 +0,0 @@ -glabel func_80A53F30 -/* 01090 80A53F30 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01094 80A53F34 AFB00014 */ sw $s0, 0x0014($sp) -/* 01098 80A53F38 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0109C 80A53F3C AFBF001C */ sw $ra, 0x001C($sp) -/* 010A0 80A53F40 AFB10018 */ sw $s1, 0x0018($sp) -/* 010A4 80A53F44 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 010A8 80A53F48 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 010AC 80A53F4C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 010B0 80A53F50 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 010B4 80A53F54 86050310 */ lh $a1, 0x0310($s0) ## 00000310 -/* 010B8 80A53F58 26060280 */ addiu $a2, $s0, 0x0280 ## $a2 = 00000280 -/* 010BC 80A53F5C 0C030136 */ jal func_800C04D8 -/* 010C0 80A53F60 2607028C */ addiu $a3, $s0, 0x028C ## $a3 = 0000028C -/* 010C4 80A53F64 860E02F2 */ lh $t6, 0x02F2($s0) ## 000002F2 -/* 010C8 80A53F68 8E020314 */ lw $v0, 0x0314($s0) ## 00000314 -/* 010CC 80A53F6C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 010D0 80A53F70 11C00004 */ beq $t6, $zero, .L80A53F84 -/* 010D4 80A53F74 00000000 */ nop -/* 010D8 80A53F78 844F0168 */ lh $t7, 0x0168($v0) ## 00000168 -/* 010DC 80A53F7C 55E0002A */ bnel $t7, $zero, .L80A54028 -/* 010E0 80A53F80 8FBF001C */ lw $ra, 0x001C($sp) -.L80A53F84: -/* 010E4 80A53F84 0C0300E1 */ jal Gameplay_ClearCamera -/* 010E8 80A53F88 86050310 */ lh $a1, 0x0310($s0) ## 00000310 -/* 010EC 80A53F8C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 010F0 80A53F90 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 010F4 80A53F94 0C0300C5 */ jal Gameplay_ChangeCameraStatus -/* 010F8 80A53F98 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 010FC 80A53F9C 9202030A */ lbu $v0, 0x030A($s0) ## 0000030A -/* 01100 80A53FA0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01104 80A53FA4 24092021 */ addiu $t1, $zero, 0x2021 ## $t1 = 00002021 -/* 01108 80A53FA8 10410015 */ beq $v0, $at, .L80A54000 -/* 0110C 80A53FAC 2404000F */ addiu $a0, $zero, 0x000F ## $a0 = 0000000F -/* 01110 80A53FB0 14400009 */ bne $v0, $zero, .L80A53FD8 -/* 01114 80A53FB4 24182015 */ addiu $t8, $zero, 0x2015 ## $t8 = 00002015 -/* 01118 80A53FB8 A618010E */ sh $t8, 0x010E($s0) ## 0000010E -/* 0111C 80A53FBC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01120 80A53FC0 0C042DC8 */ jal func_8010B720 -/* 01124 80A53FC4 3305FFFF */ andi $a1, $t8, 0xFFFF ## $a1 = 00002015 -/* 01128 80A53FC8 3C1980A5 */ lui $t9, %hi(func_80A54038) ## $t9 = 80A50000 -/* 0112C 80A53FCC 27394038 */ addiu $t9, $t9, %lo(func_80A54038) ## $t9 = 80A54038 -/* 01130 80A53FD0 10000014 */ beq $zero, $zero, .L80A54024 -/* 01134 80A53FD4 AE19025C */ sw $t9, 0x025C($s0) ## 0000025C -.L80A53FD8: -/* 01138 80A53FD8 0C041B33 */ jal func_80106CCC -/* 0113C 80A53FDC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01140 80A53FE0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01144 80A53FE4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01148 80A53FE8 0C00B7D5 */ jal func_8002DF54 -/* 0114C 80A53FEC 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 01150 80A53FF0 3C0880A5 */ lui $t0, %hi(func_80A53908) ## $t0 = 80A50000 -/* 01154 80A53FF4 25083908 */ addiu $t0, $t0, %lo(func_80A53908) ## $t0 = 80A53908 -/* 01158 80A53FF8 1000000A */ beq $zero, $zero, .L80A54024 -/* 0115C 80A53FFC AE08025C */ sw $t0, 0x025C($s0) ## 0000025C -.L80A54000: -/* 01160 80A54000 A600030E */ sh $zero, 0x030E($s0) ## 0000030E -/* 01164 80A54004 0C021CC3 */ jal Rupees_ChangeBy -/* 01168 80A54008 A609010E */ sh $t1, 0x010E($s0) ## 0000010E -/* 0116C 80A5400C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01170 80A54010 0C042DC8 */ jal func_8010B720 -/* 01174 80A54014 9605010E */ lhu $a1, 0x010E($s0) ## 0000010E -/* 01178 80A54018 3C0A80A5 */ lui $t2, %hi(func_80A5427C) ## $t2 = 80A50000 -/* 0117C 80A5401C 254A427C */ addiu $t2, $t2, %lo(func_80A5427C) ## $t2 = 80A5427C -/* 01180 80A54020 AE0A025C */ sw $t2, 0x025C($s0) ## 0000025C -.L80A54024: -/* 01184 80A54024 8FBF001C */ lw $ra, 0x001C($sp) -.L80A54028: -/* 01188 80A54028 8FB00014 */ lw $s0, 0x0014($sp) -/* 0118C 80A5402C 8FB10018 */ lw $s1, 0x0018($sp) -/* 01190 80A54030 03E00008 */ jr $ra -/* 01194 80A54034 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54038.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54038.s deleted file mode 100644 index 97d01c669d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54038.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_80A54038 -/* 01198 80A54038 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0119C 80A5403C AFBF0014 */ sw $ra, 0x0014($sp) -/* 011A0 80A54040 AFA40018 */ sw $a0, 0x0018($sp) -/* 011A4 80A54044 AFA5001C */ sw $a1, 0x001C($sp) -/* 011A8 80A54048 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 011AC 80A5404C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 011B0 80A54050 8FA4001C */ lw $a0, 0x001C($sp) -/* 011B4 80A54054 0C042F6F */ jal func_8010BDBC -/* 011B8 80A54058 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 011BC 80A5405C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 011C0 80A54060 54410014 */ bnel $v0, $at, .L80A540B4 -/* 011C4 80A54064 8FBF0014 */ lw $ra, 0x0014($sp) -/* 011C8 80A54068 0C041AF2 */ jal func_80106BC8 -/* 011CC 80A5406C 8FA4001C */ lw $a0, 0x001C($sp) -/* 011D0 80A54070 1040000F */ beq $v0, $zero, .L80A540B0 -/* 011D4 80A54074 3C028016 */ lui $v0, %hi(gSaveContext) -/* 011D8 80A54078 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 011DC 80A5407C 944E0F06 */ lhu $t6, 0x0F06($v0) ## 8015F566 -/* 011E0 80A54080 8FA4001C */ lw $a0, 0x001C($sp) -/* 011E4 80A54084 35CF0040 */ ori $t7, $t6, 0x0040 ## $t7 = 00000040 -/* 011E8 80A54088 0C041B33 */ jal func_80106CCC -/* 011EC 80A5408C A44F0F06 */ sh $t7, 0x0F06($v0) ## 8015F566 -/* 011F0 80A54090 8FA4001C */ lw $a0, 0x001C($sp) -/* 011F4 80A54094 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 011F8 80A54098 0C00B7D5 */ jal func_8002DF54 -/* 011FC 80A5409C 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 01200 80A540A0 8FB90018 */ lw $t9, 0x0018($sp) -/* 01204 80A540A4 3C1880A5 */ lui $t8, %hi(func_80A53908) ## $t8 = 80A50000 -/* 01208 80A540A8 27183908 */ addiu $t8, $t8, %lo(func_80A53908) ## $t8 = 80A53908 -/* 0120C 80A540AC AF38025C */ sw $t8, 0x025C($t9) ## 0000025C -.L80A540B0: -/* 01210 80A540B0 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A540B4: -/* 01214 80A540B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01218 80A540B8 03E00008 */ jr $ra -/* 0121C 80A540BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A540C0.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A540C0.s deleted file mode 100644 index 8bf74c28bc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A540C0.s +++ /dev/null @@ -1,87 +0,0 @@ -glabel func_80A540C0 -/* 01220 80A540C0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01224 80A540C4 AFB00014 */ sw $s0, 0x0014($sp) -/* 01228 80A540C8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0122C 80A540CC AFBF001C */ sw $ra, 0x001C($sp) -/* 01230 80A540D0 AFB10018 */ sw $s1, 0x0018($sp) -/* 01234 80A540D4 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 01238 80A540D8 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 0123C 80A540DC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01240 80A540E0 0C042F6F */ jal func_8010BDBC -/* 01244 80A540E4 262420D8 */ addiu $a0, $s1, 0x20D8 ## $a0 = 000020D8 -/* 01248 80A540E8 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 0124C 80A540EC 5441003F */ bnel $v0, $at, .L80A541EC -/* 01250 80A540F0 8FBF001C */ lw $ra, 0x001C($sp) -/* 01254 80A540F4 0C041AF2 */ jal func_80106BC8 -/* 01258 80A540F8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0125C 80A540FC 1040003A */ beq $v0, $zero, .L80A541E8 -/* 01260 80A54100 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 01264 80A54104 00511021 */ addu $v0, $v0, $s1 -/* 01268 80A54108 904204BD */ lbu $v0, 0x04BD($v0) ## 000104BD -/* 0126C 80A5410C 240E2020 */ addiu $t6, $zero, 0x2020 ## $t6 = 00002020 -/* 01270 80A54110 31C5FFFF */ andi $a1, $t6, 0xFFFF ## $a1 = 00002020 -/* 01274 80A54114 10400006 */ beq $v0, $zero, .L80A54130 -/* 01278 80A54118 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0127C 80A5411C 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 01280 80A54120 10430021 */ beq $v0, $v1, .L80A541A8 -/* 01284 80A54124 240D200C */ addiu $t5, $zero, 0x200C ## $t5 = 0000200C -/* 01288 80A54128 10000030 */ beq $zero, $zero, .L80A541EC -/* 0128C 80A5412C 8FBF001C */ lw $ra, 0x001C($sp) -.L80A54130: -/* 01290 80A54130 0C042DC8 */ jal func_8010B720 -/* 01294 80A54134 A60E010E */ sh $t6, 0x010E($s0) ## 0000010E -/* 01298 80A54138 0C023C23 */ jal func_8008F08C -/* 0129C 80A5413C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 012A0 80A54140 3C038016 */ lui $v1, %hi(gSaveContext) -/* 012A4 80A54144 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 012A8 80A54148 946F0F06 */ lhu $t7, 0x0F06($v1) ## 8015F566 -/* 012AC 80A5414C 94790EF6 */ lhu $t9, 0x0EF6($v1) ## 8015F556 -/* 012B0 80A54150 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 012B4 80A54154 35F80080 */ ori $t8, $t7, 0x0080 ## $t8 = 00000080 -/* 012B8 80A54158 37280100 */ ori $t0, $t9, 0x0100 ## $t0 = 00000100 -/* 012BC 80A5415C A4780F06 */ sh $t8, 0x0F06($v1) ## 8015F566 -/* 012C0 80A54160 A4680EF6 */ sh $t0, 0x0EF6($v1) ## 8015F556 -/* 012C4 80A54164 0C021344 */ jal Item_Give -/* 012C8 80A54168 2405002C */ addiu $a1, $zero, 0x002C ## $a1 = 0000002C -/* 012CC 80A5416C 9209030A */ lbu $t1, 0x030A($s0) ## 0000030A -/* 012D0 80A54170 3C0C80A5 */ lui $t4, %hi(func_80A541FC) ## $t4 = 80A50000 -/* 012D4 80A54174 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 012D8 80A54178 11200008 */ beq $t1, $zero, .L80A5419C -/* 012DC 80A5417C 258C41FC */ addiu $t4, $t4, %lo(func_80A541FC) ## $t4 = 80A541FC -/* 012E0 80A54180 3C0B80A5 */ lui $t3, %hi(func_80A5427C) ## $t3 = 80A50000 -/* 012E4 80A54184 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 -/* 012E8 80A54188 256B427C */ addiu $t3, $t3, %lo(func_80A5427C) ## $t3 = 80A5427C -/* 012EC 80A5418C A20A030A */ sb $t2, 0x030A($s0) ## 0000030A -/* 012F0 80A54190 A603030E */ sh $v1, 0x030E($s0) ## 0000030E -/* 012F4 80A54194 10000014 */ beq $zero, $zero, .L80A541E8 -/* 012F8 80A54198 AE0B025C */ sw $t3, 0x025C($s0) ## 0000025C -.L80A5419C: -/* 012FC 80A5419C A600030E */ sh $zero, 0x030E($s0) ## 0000030E -/* 01300 80A541A0 10000011 */ beq $zero, $zero, .L80A541E8 -/* 01304 80A541A4 AE0C025C */ sw $t4, 0x025C($s0) ## 0000025C -.L80A541A8: -/* 01308 80A541A8 A603030E */ sh $v1, 0x030E($s0) ## 0000030E -/* 0130C 80A541AC A60D010E */ sh $t5, 0x010E($s0) ## 0000010E -/* 01310 80A541B0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01314 80A541B4 0C042DC8 */ jal func_8010B720 -/* 01318 80A541B8 31A5FFFF */ andi $a1, $t5, 0xFFFF ## $a1 = 00000000 -/* 0131C 80A541BC 920F030A */ lbu $t7, 0x030A($s0) ## 0000030A -/* 01320 80A541C0 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 01324 80A541C4 A60E0300 */ sh $t6, 0x0300($s0) ## 00000300 -/* 01328 80A541C8 15E00005 */ bne $t7, $zero, .L80A541E0 -/* 0132C 80A541CC 3C1980A5 */ lui $t9, %hi(func_80A54954) ## $t9 = 80A50000 -/* 01330 80A541D0 3C1880A5 */ lui $t8, %hi(func_80A5427C) ## $t8 = 80A50000 -/* 01334 80A541D4 2718427C */ addiu $t8, $t8, %lo(func_80A5427C) ## $t8 = 80A5427C -/* 01338 80A541D8 10000003 */ beq $zero, $zero, .L80A541E8 -/* 0133C 80A541DC AE18025C */ sw $t8, 0x025C($s0) ## 0000025C -.L80A541E0: -/* 01340 80A541E0 27394954 */ addiu $t9, $t9, %lo(func_80A54954) ## $t9 = 80A54954 -/* 01344 80A541E4 AE19025C */ sw $t9, 0x025C($s0) ## 0000025C -.L80A541E8: -/* 01348 80A541E8 8FBF001C */ lw $ra, 0x001C($sp) -.L80A541EC: -/* 0134C 80A541EC 8FB00014 */ lw $s0, 0x0014($sp) -/* 01350 80A541F0 8FB10018 */ lw $s1, 0x0018($sp) -/* 01354 80A541F4 03E00008 */ jr $ra -/* 01358 80A541F8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A541FC.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A541FC.s deleted file mode 100644 index 10be9787c0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A541FC.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_80A541FC -/* 0135C 80A541FC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01360 80A54200 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01364 80A54204 AFA40018 */ sw $a0, 0x0018($sp) -/* 01368 80A54208 AFA5001C */ sw $a1, 0x001C($sp) -/* 0136C 80A5420C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01370 80A54210 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01374 80A54214 8FA4001C */ lw $a0, 0x001C($sp) -/* 01378 80A54218 0C042F6F */ jal func_8010BDBC -/* 0137C 80A5421C 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 01380 80A54220 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 01384 80A54224 54410012 */ bnel $v0, $at, .L80A54270 -/* 01388 80A54228 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0138C 80A5422C 0C041AF2 */ jal func_80106BC8 -/* 01390 80A54230 8FA4001C */ lw $a0, 0x001C($sp) -/* 01394 80A54234 1040000D */ beq $v0, $zero, .L80A5426C -/* 01398 80A54238 240E2021 */ addiu $t6, $zero, 0x2021 ## $t6 = 00002021 -/* 0139C 80A5423C 8FAF0018 */ lw $t7, 0x0018($sp) -/* 013A0 80A54240 2404000F */ addiu $a0, $zero, 0x000F ## $a0 = 0000000F -/* 013A4 80A54244 0C021CC3 */ jal Rupees_ChangeBy -/* 013A8 80A54248 A5EE010E */ sh $t6, 0x010E($t7) ## 0000010E -/* 013AC 80A5424C 8FB80018 */ lw $t8, 0x0018($sp) -/* 013B0 80A54250 8FA4001C */ lw $a0, 0x001C($sp) -/* 013B4 80A54254 0C042DC8 */ jal func_8010B720 -/* 013B8 80A54258 9705010E */ lhu $a1, 0x010E($t8) ## 0000010E -/* 013BC 80A5425C 8FA80018 */ lw $t0, 0x0018($sp) -/* 013C0 80A54260 3C1980A5 */ lui $t9, %hi(func_80A5427C) ## $t9 = 80A50000 -/* 013C4 80A54264 2739427C */ addiu $t9, $t9, %lo(func_80A5427C) ## $t9 = 80A5427C -/* 013C8 80A54268 AD19025C */ sw $t9, 0x025C($t0) ## 0000025C -.L80A5426C: -/* 013CC 80A5426C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A54270: -/* 013D0 80A54270 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 013D4 80A54274 03E00008 */ jr $ra -/* 013D8 80A54278 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5427C.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5427C.s deleted file mode 100644 index e34ab8813f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5427C.s +++ /dev/null @@ -1,46 +0,0 @@ -glabel func_80A5427C -/* 013DC 80A5427C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 013E0 80A54280 AFB00018 */ sw $s0, 0x0018($sp) -/* 013E4 80A54284 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 013E8 80A54288 AFBF001C */ sw $ra, 0x001C($sp) -/* 013EC 80A5428C AFA50024 */ sw $a1, 0x0024($sp) -/* 013F0 80A54290 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 013F4 80A54294 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 013F8 80A54298 8FA40024 */ lw $a0, 0x0024($sp) -/* 013FC 80A5429C 0C042F6F */ jal func_8010BDBC -/* 01400 80A542A0 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 01404 80A542A4 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 01408 80A542A8 54410019 */ bnel $v0, $at, .L80A54310 -/* 0140C 80A542AC 8FBF001C */ lw $ra, 0x001C($sp) -/* 01410 80A542B0 0C041AF2 */ jal func_80106BC8 -/* 01414 80A542B4 8FA40024 */ lw $a0, 0x0024($sp) -/* 01418 80A542B8 50400015 */ beql $v0, $zero, .L80A54310 -/* 0141C 80A542BC 8FBF001C */ lw $ra, 0x001C($sp) -/* 01420 80A542C0 860E030E */ lh $t6, 0x030E($s0) ## 0000030E -/* 01424 80A542C4 24190037 */ addiu $t9, $zero, 0x0037 ## $t9 = 00000037 -/* 01428 80A542C8 8FA80024 */ lw $t0, 0x0024($sp) -/* 0142C 80A542CC 15C0000A */ bne $t6, $zero, .L80A542F8 -/* 01430 80A542D0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01434 80A542D4 A600030E */ sh $zero, 0x030E($s0) ## 0000030E -/* 01438 80A542D8 860F030E */ lh $t7, 0x030E($s0) ## 0000030E -/* 0143C 80A542DC A20F030A */ sb $t7, 0x030A($s0) ## 0000030A -/* 01440 80A542E0 0C041B33 */ jal func_80106CCC -/* 01444 80A542E4 8FA40024 */ lw $a0, 0x0024($sp) -/* 01448 80A542E8 3C1880A5 */ lui $t8, %hi(func_80A53908) ## $t8 = 80A50000 -/* 0144C 80A542EC 27183908 */ addiu $t8, $t8, %lo(func_80A53908) ## $t8 = 80A53908 -/* 01450 80A542F0 10000006 */ beq $zero, $zero, .L80A5430C -/* 01454 80A542F4 AE18025C */ sw $t8, 0x025C($s0) ## 0000025C -.L80A542F8: -/* 01458 80A542F8 00280821 */ addu $at, $at, $t0 -/* 0145C 80A542FC 3C0980A5 */ lui $t1, %hi(func_80A54320) ## $t1 = 80A50000 -/* 01460 80A54300 A03903DC */ sb $t9, 0x03DC($at) ## 000003DC -/* 01464 80A54304 25294320 */ addiu $t1, $t1, %lo(func_80A54320) ## $t1 = 80A54320 -/* 01468 80A54308 AE09025C */ sw $t1, 0x025C($s0) ## 0000025C -.L80A5430C: -/* 0146C 80A5430C 8FBF001C */ lw $ra, 0x001C($sp) -.L80A54310: -/* 01470 80A54310 8FB00018 */ lw $s0, 0x0018($sp) -/* 01474 80A54314 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01478 80A54318 03E00008 */ jr $ra -/* 0147C 80A5431C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54320.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54320.s deleted file mode 100644 index db9a5f38d0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54320.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_80A54320 -/* 01480 80A54320 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01484 80A54324 AFA40028 */ sw $a0, 0x0028($sp) -/* 01488 80A54328 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0148C 80A5432C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 01490 80A54330 AFA5002C */ sw $a1, 0x002C($sp) -/* 01494 80A54334 0C028800 */ jal SkelAnime_GetFrameCount - -/* 01498 80A54338 24845500 */ addiu $a0, $a0, 0x5500 ## $a0 = 06005500 -/* 0149C 80A5433C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 014A0 80A54340 8FA30028 */ lw $v1, 0x0028($sp) -/* 014A4 80A54344 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 014A8 80A54348 46802020 */ cvt.s.w $f0, $f4 -/* 014AC 80A5434C 44813000 */ mtc1 $at, $f6 ## $f6 = -10.00 -/* 014B0 80A54350 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 014B4 80A54354 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 014B8 80A54358 24A55500 */ addiu $a1, $a1, 0x5500 ## $a1 = 06005500 -/* 014BC 80A5435C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 014C0 80A54360 E46002EC */ swc1 $f0, 0x02EC($v1) ## 000002EC -/* 014C4 80A54364 AFAE0014 */ sw $t6, 0x0014($sp) -/* 014C8 80A54368 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 014CC 80A5436C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 014D0 80A54370 2464014C */ addiu $a0, $v1, 0x014C ## $a0 = 0000014C -/* 014D4 80A54374 0C029468 */ jal SkelAnime_ChangeAnim - -/* 014D8 80A54378 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 014DC 80A5437C 8FA30028 */ lw $v1, 0x0028($sp) -/* 014E0 80A54380 3C0F80A5 */ lui $t7, %hi(func_80A543A0) ## $t7 = 80A50000 -/* 014E4 80A54384 25EF43A0 */ addiu $t7, $t7, %lo(func_80A543A0) ## $t7 = 80A543A0 -/* 014E8 80A54388 A0600308 */ sb $zero, 0x0308($v1) ## 00000308 -/* 014EC 80A5438C AC6F025C */ sw $t7, 0x025C($v1) ## 0000025C -/* 014F0 80A54390 8FBF0024 */ lw $ra, 0x0024($sp) -/* 014F4 80A54394 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 014F8 80A54398 03E00008 */ jr $ra -/* 014FC 80A5439C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A543A0.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A543A0.s deleted file mode 100644 index 15cc47c117..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A543A0.s +++ /dev/null @@ -1,78 +0,0 @@ -glabel func_80A543A0 -/* 01500 80A543A0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01504 80A543A4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01508 80A543A8 C4840164 */ lwc1 $f4, 0x0164($a0) ## 00000164 -/* 0150C 80A543AC 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 01510 80A543B0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01514 80A543B4 E7A40020 */ swc1 $f4, 0x0020($sp) -/* 01518 80A543B8 8CA21C6C */ lw $v0, 0x1C6C($a1) ## 00001C6C -/* 0151C 80A543BC AFA60028 */ sw $a2, 0x0028($sp) -/* 01520 80A543C0 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01524 80A543C4 AFA2001C */ sw $v0, 0x001C($sp) -/* 01528 80A543C8 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -/* 0152C 80A543CC 44814000 */ mtc1 $at, $f8 ## $f8 = 12.00 -/* 01530 80A543D0 C7A60020 */ lwc1 $f6, 0x0020($sp) -/* 01534 80A543D4 8FA2001C */ lw $v0, 0x001C($sp) -/* 01538 80A543D8 8FA60028 */ lw $a2, 0x0028($sp) -/* 0153C 80A543DC 4606403E */ c.le.s $f8, $f6 -/* 01540 80A543E0 00000000 */ nop -/* 01544 80A543E4 4502000E */ bc1fl .L80A54420 -/* 01548 80A543E8 C7AA0020 */ lwc1 $f10, 0x0020($sp) -/* 0154C 80A543EC 90CE0308 */ lbu $t6, 0x0308($a2) ## 00000308 -/* 01550 80A543F0 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 01554 80A543F4 24052823 */ addiu $a1, $zero, 0x2823 ## $a1 = 00002823 -/* 01558 80A543F8 55C00009 */ bnel $t6, $zero, .L80A54420 -/* 0155C 80A543FC C7AA0020 */ lwc1 $f10, 0x0020($sp) -/* 01560 80A54400 AFA2001C */ sw $v0, 0x001C($sp) -/* 01564 80A54404 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01568 80A54408 AFA60028 */ sw $a2, 0x0028($sp) -/* 0156C 80A5440C 8FA60028 */ lw $a2, 0x0028($sp) -/* 01570 80A54410 8FA2001C */ lw $v0, 0x001C($sp) -/* 01574 80A54414 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 01578 80A54418 A0CF0308 */ sb $t7, 0x0308($a2) ## 00000308 -/* 0157C 80A5441C C7AA0020 */ lwc1 $f10, 0x0020($sp) -.L80A54420: -/* 01580 80A54420 C4D002EC */ lwc1 $f16, 0x02EC($a2) ## 000002EC -/* 01584 80A54424 3C0B80A5 */ lui $t3, %hi(func_80A53DF8) ## $t3 = 80A50000 -/* 01588 80A54428 256B3DF8 */ addiu $t3, $t3, %lo(func_80A53DF8) ## $t3 = 80A53DF8 -/* 0158C 80A5442C 460A803E */ c.le.s $f16, $f10 -/* 01590 80A54430 00000000 */ nop -/* 01594 80A54434 4502001A */ bc1fl .L80A544A0 -/* 01598 80A54438 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0159C 80A5443C 10400011 */ beq $v0, $zero, .L80A54484 -/* 015A0 80A54440 24030100 */ addiu $v1, $zero, 0x0100 ## $v1 = 00000100 -/* 015A4 80A54444 84580000 */ lh $t8, 0x0000($v0) ## 00000000 -.L80A54448: -/* 015A8 80A54448 50780004 */ beql $v1, $t8, .L80A5445C -/* 015AC 80A5444C 90D9030A */ lbu $t9, 0x030A($a2) ## 0000030A -/* 015B0 80A54450 1000000A */ beq $zero, $zero, .L80A5447C -/* 015B4 80A54454 8C420124 */ lw $v0, 0x0124($v0) ## 00000124 -/* 015B8 80A54458 90D9030A */ lbu $t9, 0x030A($a2) ## 0000030A -.L80A5445C: -/* 015BC 80A5445C 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 -/* 015C0 80A54460 ACC20314 */ sw $v0, 0x0314($a2) ## 00000314 -/* 015C4 80A54464 10790003 */ beq $v1, $t9, .L80A54474 -/* 015C8 80A54468 2408FFFF */ addiu $t0, $zero, 0xFFFF ## $t0 = FFFFFFFF -/* 015CC 80A5446C 10000005 */ beq $zero, $zero, .L80A54484 -/* 015D0 80A54470 A4480168 */ sh $t0, 0x0168($v0) ## 00000168 -.L80A54474: -/* 015D4 80A54474 10000003 */ beq $zero, $zero, .L80A54484 -/* 015D8 80A54478 A4430168 */ sh $v1, 0x0168($v0) ## 00000168 -.L80A5447C: -/* 015DC 80A5447C 5440FFF2 */ bnel $v0, $zero, .L80A54448 -/* 015E0 80A54480 84580000 */ lh $t8, 0x0000($v0) ## 00000000 -.L80A54484: -/* 015E4 80A54484 90C9030A */ lbu $t1, 0x030A($a2) ## 0000030A -/* 015E8 80A54488 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 015EC 80A5448C 55200003 */ bnel $t1, $zero, .L80A5449C -/* 015F0 80A54490 ACCB025C */ sw $t3, 0x025C($a2) ## 0000025C -/* 015F4 80A54494 A0CA030A */ sb $t2, 0x030A($a2) ## 0000030A -/* 015F8 80A54498 ACCB025C */ sw $t3, 0x025C($a2) ## 0000025C -.L80A5449C: -/* 015FC 80A5449C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A544A0: -/* 01600 80A544A0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01604 80A544A4 03E00008 */ jr $ra -/* 01608 80A544A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A544AC.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A544AC.s deleted file mode 100644 index 5b86fc9773..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A544AC.s +++ /dev/null @@ -1,48 +0,0 @@ -glabel func_80A544AC -/* 0160C 80A544AC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01610 80A544B0 AFB00020 */ sw $s0, 0x0020($sp) -/* 01614 80A544B4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01618 80A544B8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0161C 80A544BC AFA5002C */ sw $a1, 0x002C($sp) -/* 01620 80A544C0 C60402E4 */ lwc1 $f4, 0x02E4($s0) ## 000002E4 -/* 01624 80A544C4 AFA00010 */ sw $zero, 0x0010($sp) -/* 01628 80A544C8 2405E82C */ addiu $a1, $zero, 0xE82C ## $a1 = FFFFE82C -/* 0162C 80A544CC 4600218D */ trunc.w.s $f6, $f4 -/* 01630 80A544D0 248400B8 */ addiu $a0, $a0, 0x00B8 ## $a0 = 000000B8 -/* 01634 80A544D4 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 01638 80A544D8 44073000 */ mfc1 $a3, $f6 -/* 0163C 80A544DC 00000000 */ nop -/* 01640 80A544E0 00073C00 */ sll $a3, $a3, 16 -/* 01644 80A544E4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 01648 80A544E8 00073C03 */ sra $a3, $a3, 16 -/* 0164C 80A544EC 3C05453B */ lui $a1, 0x453B ## $a1 = 453B0000 -/* 01650 80A544F0 34A58000 */ ori $a1, $a1, 0x8000 ## $a1 = 453B8000 -/* 01654 80A544F4 260402E4 */ addiu $a0, $s0, 0x02E4 ## $a0 = 000002E4 -/* 01658 80A544F8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0165C 80A544FC 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 01660 80A54500 3C0743FA */ lui $a3, 0x43FA ## $a3 = 43FA0000 -/* 01664 80A54504 860200B8 */ lh $v0, 0x00B8($s0) ## 000000B8 -/* 01668 80A54508 2405708F */ addiu $a1, $zero, 0x708F ## $a1 = 0000708F -/* 0166C 80A5450C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01670 80A54510 2841E890 */ slti $at, $v0, 0xE890 -/* 01674 80A54514 1020000C */ beq $at, $zero, .L80A54548 -/* 01678 80A54518 A6020034 */ sh $v0, 0x0034($s0) ## 00000034 -/* 0167C 80A5451C 0C042DA0 */ jal func_8010B680 -/* 01680 80A54520 8FA4002C */ lw $a0, 0x002C($sp) -/* 01684 80A54524 8E0F0004 */ lw $t7, 0x0004($s0) ## 00000004 -/* 01688 80A54528 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 0168C 80A5452C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01690 80A54530 3C1980A5 */ lui $t9, %hi(func_80A5455C) ## $t9 = 80A50000 -/* 01694 80A54534 2739455C */ addiu $t9, $t9, %lo(func_80A5455C) ## $t9 = 80A5455C -/* 01698 80A54538 01E1C025 */ or $t8, $t7, $at ## $t8 = 00010000 -/* 0169C 80A5453C AE180004 */ sw $t8, 0x0004($s0) ## 00000004 -/* 016A0 80A54540 AE19025C */ sw $t9, 0x025C($s0) ## 0000025C -/* 016A4 80A54544 E60802E4 */ swc1 $f8, 0x02E4($s0) ## 000002E4 -.L80A54548: -/* 016A8 80A54548 8FBF0024 */ lw $ra, 0x0024($sp) -/* 016AC 80A5454C 8FB00020 */ lw $s0, 0x0020($sp) -/* 016B0 80A54550 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 016B4 80A54554 03E00008 */ jr $ra -/* 016B8 80A54558 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A546DC.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A546DC.s deleted file mode 100644 index 23e2edb40c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A546DC.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_80A546DC -/* 0183C 80A546DC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01840 80A546E0 AFB00020 */ sw $s0, 0x0020($sp) -/* 01844 80A546E4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01848 80A546E8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0184C 80A546EC AFA5002C */ sw $a1, 0x002C($sp) -/* 01850 80A546F0 C60402E4 */ lwc1 $f4, 0x02E4($s0) ## 000002E4 -/* 01854 80A546F4 AFA00010 */ sw $zero, 0x0010($sp) -/* 01858 80A546F8 240500C8 */ addiu $a1, $zero, 0x00C8 ## $a1 = 000000C8 -/* 0185C 80A546FC 4600218D */ trunc.w.s $f6, $f4 -/* 01860 80A54700 248400B8 */ addiu $a0, $a0, 0x00B8 ## $a0 = 000000B8 -/* 01864 80A54704 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 01868 80A54708 44073000 */ mfc1 $a3, $f6 -/* 0186C 80A5470C 00000000 */ nop -/* 01870 80A54710 00073C00 */ sll $a3, $a3, 16 -/* 01874 80A54714 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 01878 80A54718 00073C03 */ sra $a3, $a3, 16 -/* 0187C 80A5471C 3C05453B */ lui $a1, 0x453B ## $a1 = 453B0000 -/* 01880 80A54720 34A58000 */ ori $a1, $a1, 0x8000 ## $a1 = 453B8000 -/* 01884 80A54724 260402E4 */ addiu $a0, $s0, 0x02E4 ## $a0 = 000002E4 -/* 01888 80A54728 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0188C 80A5472C 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 01890 80A54730 3C0743FA */ lui $a3, 0x43FA ## $a3 = 43FA0000 -/* 01894 80A54734 860200B8 */ lh $v0, 0x00B8($s0) ## 000000B8 -/* 01898 80A54738 18400003 */ blez $v0, .L80A54748 -/* 0189C 80A5473C A6020034 */ sh $v0, 0x0034($s0) ## 00000034 -/* 018A0 80A54740 0C00B55C */ jal Actor_Kill - -/* 018A4 80A54744 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A54748: -/* 018A8 80A54748 8FBF0024 */ lw $ra, 0x0024($sp) -/* 018AC 80A5474C 8FB00020 */ lw $s0, 0x0020($sp) -/* 018B0 80A54750 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 018B4 80A54754 03E00008 */ jr $ra -/* 018B8 80A54758 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54954.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54954.s deleted file mode 100644 index 73f3ae6604..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54954.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_80A54954 -/* 01AB4 80A54954 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01AB8 80A54958 AFA40028 */ sw $a0, 0x0028($sp) -/* 01ABC 80A5495C AFBF0024 */ sw $ra, 0x0024($sp) -/* 01AC0 80A54960 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 01AC4 80A54964 AFA5002C */ sw $a1, 0x002C($sp) -/* 01AC8 80A54968 0C028800 */ jal SkelAnime_GetFrameCount - -/* 01ACC 80A5496C 24845C30 */ addiu $a0, $a0, 0x5C30 ## $a0 = 06005C30 -/* 01AD0 80A54970 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 01AD4 80A54974 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 01AD8 80A54978 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 01ADC 80A5497C 468021A0 */ cvt.s.w $f6, $f4 -/* 01AE0 80A54980 8FA40028 */ lw $a0, 0x0028($sp) -/* 01AE4 80A54984 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01AE8 80A54988 24A55C30 */ addiu $a1, $a1, 0x5C30 ## $a1 = 06005C30 -/* 01AEC 80A5498C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01AF0 80A54990 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01AF4 80A54994 4600320D */ trunc.w.s $f8, $f6 -/* 01AF8 80A54998 AFA00014 */ sw $zero, 0x0014($sp) -/* 01AFC 80A5499C E7B20018 */ swc1 $f18, 0x0018($sp) -/* 01B00 80A549A0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01B04 80A549A4 440F4000 */ mfc1 $t7, $f8 -/* 01B08 80A549A8 00000000 */ nop -/* 01B0C 80A549AC 000FC400 */ sll $t8, $t7, 16 -/* 01B10 80A549B0 0018CC03 */ sra $t9, $t8, 16 -/* 01B14 80A549B4 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 -/* 01B18 80A549B8 00000000 */ nop -/* 01B1C 80A549BC 46805420 */ cvt.s.w $f16, $f10 -/* 01B20 80A549C0 0C029468 */ jal SkelAnime_ChangeAnim - -/* 01B24 80A549C4 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 01B28 80A549C8 8FA90028 */ lw $t1, 0x0028($sp) -/* 01B2C 80A549CC 3C0880A5 */ lui $t0, %hi(func_80A549E8) ## $t0 = 80A50000 -/* 01B30 80A549D0 250849E8 */ addiu $t0, $t0, %lo(func_80A549E8) ## $t0 = 80A549E8 -/* 01B34 80A549D4 AD28025C */ sw $t0, 0x025C($t1) ## 0000025C -/* 01B38 80A549D8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01B3C 80A549DC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01B40 80A549E0 03E00008 */ jr $ra -/* 01B44 80A549E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A549E8.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A549E8.s deleted file mode 100644 index fc0d5ac167..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A549E8.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_80A549E8 -/* 01B48 80A549E8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01B4C 80A549EC AFB00018 */ sw $s0, 0x0018($sp) -/* 01B50 80A549F0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01B54 80A549F4 AFBF001C */ sw $ra, 0x001C($sp) -/* 01B58 80A549F8 AFA50024 */ sw $a1, 0x0024($sp) -/* 01B5C 80A549FC 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01B60 80A54A00 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01B64 80A54A04 8FA40024 */ lw $a0, 0x0024($sp) -/* 01B68 80A54A08 0C042F6F */ jal func_8010BDBC -/* 01B6C 80A54A0C 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 01B70 80A54A10 860E0300 */ lh $t6, 0x0300($s0) ## 00000300 -/* 01B74 80A54A14 55C20014 */ bnel $t6, $v0, .L80A54A68 -/* 01B78 80A54A18 8FBF001C */ lw $ra, 0x001C($sp) -/* 01B7C 80A54A1C 0C041AF2 */ jal func_80106BC8 -/* 01B80 80A54A20 8FA40024 */ lw $a0, 0x0024($sp) -/* 01B84 80A54A24 50400010 */ beql $v0, $zero, .L80A54A68 -/* 01B88 80A54A28 8FBF001C */ lw $ra, 0x001C($sp) -/* 01B8C 80A54A2C 0C041B33 */ jal func_80106CCC -/* 01B90 80A54A30 8FA40024 */ lw $a0, 0x0024($sp) -/* 01B94 80A54A34 860202FE */ lh $v0, 0x02FE($s0) ## 000002FE -/* 01B98 80A54A38 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01B9C 80A54A3C 3C0F80A5 */ lui $t7, %hi(func_80A531E4) ## $t7 = 80A50000 -/* 01BA0 80A54A40 14410003 */ bne $v0, $at, .L80A54A50 -/* 01BA4 80A54A44 25EF31E4 */ addiu $t7, $t7, %lo(func_80A531E4) ## $t7 = 80A531E4 -/* 01BA8 80A54A48 AE0F025C */ sw $t7, 0x025C($s0) ## 0000025C -/* 01BAC 80A54A4C 860202FE */ lh $v0, 0x02FE($s0) ## 000002FE -.L80A54A50: -/* 01BB0 80A54A50 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 01BB4 80A54A54 14410003 */ bne $v0, $at, .L80A54A64 -/* 01BB8 80A54A58 3C1880A5 */ lui $t8, %hi(func_80A53908) ## $t8 = 80A50000 -/* 01BBC 80A54A5C 27183908 */ addiu $t8, $t8, %lo(func_80A53908) ## $t8 = 80A53908 -/* 01BC0 80A54A60 AE18025C */ sw $t8, 0x025C($s0) ## 0000025C -.L80A54A64: -/* 01BC4 80A54A64 8FBF001C */ lw $ra, 0x001C($sp) -.L80A54A68: -/* 01BC8 80A54A68 8FB00018 */ lw $s0, 0x0018($sp) -/* 01BCC 80A54A6C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01BD0 80A54A70 03E00008 */ jr $ra -/* 01BD4 80A54A74 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54BC0.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54BC0.s deleted file mode 100644 index 0ca7f982b6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54BC0.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_80A54BC0 -/* 01D20 80A54BC0 AFA40000 */ sw $a0, 0x0000($sp) -/* 01D24 80A54BC4 8FA40014 */ lw $a0, 0x0014($sp) -/* 01D28 80A54BC8 AFA60008 */ sw $a2, 0x0008($sp) -/* 01D2C 80A54BCC AFA7000C */ sw $a3, 0x000C($sp) -/* 01D30 80A54BD0 848202FE */ lh $v0, 0x02FE($a0) ## 000002FE -/* 01D34 80A54BD4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01D38 80A54BD8 10410014 */ beq $v0, $at, .L80A54C2C -/* 01D3C 80A54BDC 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 01D40 80A54BE0 10410012 */ beq $v0, $at, .L80A54C2C -/* 01D44 80A54BE4 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 01D48 80A54BE8 14A10005 */ bne $a1, $at, .L80A54C00 -/* 01D4C 80A54BEC 8FA20010 */ lw $v0, 0x0010($sp) -/* 01D50 80A54BF0 844E0000 */ lh $t6, 0x0000($v0) ## 00000000 -/* 01D54 80A54BF4 848F026E */ lh $t7, 0x026E($a0) ## 0000026E -/* 01D58 80A54BF8 01CFC021 */ addu $t8, $t6, $t7 -/* 01D5C 80A54BFC A4580000 */ sh $t8, 0x0000($v0) ## 00000000 -.L80A54C00: -/* 01D60 80A54C00 24010010 */ addiu $at, $zero, 0x0010 ## $at = 00000010 -/* 01D64 80A54C04 14A10009 */ bne $a1, $at, .L80A54C2C -/* 01D68 80A54C08 8FA20010 */ lw $v0, 0x0010($sp) -/* 01D6C 80A54C0C 84590000 */ lh $t9, 0x0000($v0) ## 00000000 -/* 01D70 80A54C10 84880262 */ lh $t0, 0x0262($a0) ## 00000262 -/* 01D74 80A54C14 844A0004 */ lh $t2, 0x0004($v0) ## 00000004 -/* 01D78 80A54C18 03284821 */ addu $t1, $t9, $t0 -/* 01D7C 80A54C1C A4490000 */ sh $t1, 0x0000($v0) ## 00000000 -/* 01D80 80A54C20 848B0264 */ lh $t3, 0x0264($a0) ## 00000264 -/* 01D84 80A54C24 014B6021 */ addu $t4, $t2, $t3 -/* 01D88 80A54C28 A44C0004 */ sh $t4, 0x0004($v0) ## 00000004 -.L80A54C2C: -/* 01D8C 80A54C2C 03E00008 */ jr $ra -/* 01D90 80A54C30 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54C34.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54C34.s deleted file mode 100644 index b43212dfe3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54C34.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80A54C34 -/* 01D94 80A54C34 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01D98 80A54C38 24010010 */ addiu $at, $zero, 0x0010 ## $at = 00000010 -/* 01D9C 80A54C3C AFBF0014 */ sw $ra, 0x0014($sp) -/* 01DA0 80A54C40 AFA40018 */ sw $a0, 0x0018($sp) -/* 01DA4 80A54C44 AFA60020 */ sw $a2, 0x0020($sp) -/* 01DA8 80A54C48 14A10004 */ bne $a1, $at, .L80A54C5C -/* 01DAC 80A54C4C AFA70024 */ sw $a3, 0x0024($sp) -/* 01DB0 80A54C50 8FA40028 */ lw $a0, 0x0028($sp) -/* 01DB4 80A54C54 0C034236 */ jal Matrix_Get -/* 01DB8 80A54C58 24840330 */ addiu $a0, $a0, 0x0330 ## $a0 = 00000330 -.L80A54C5C: -/* 01DBC 80A54C5C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01DC0 80A54C60 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01DC4 80A54C64 03E00008 */ jr $ra -/* 01DC8 80A54C68 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54C6C.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54C6C.s deleted file mode 100644 index 85a02611ef..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54C6C.s +++ /dev/null @@ -1,63 +0,0 @@ -.rdata -glabel D_80A55258 - .asciz "../z_en_heishi2.c" - .balign 4 - -glabel D_80A5526C - .asciz "../z_en_heishi2.c" - .balign 4 - -glabel D_80A55280 - .asciz "../z_en_heishi2.c" - .balign 4 - -.text -glabel func_80A54C6C -/* 01DCC 80A54C6C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 01DD0 80A54C70 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01DD4 80A54C74 AFA40038 */ sw $a0, 0x0038($sp) -/* 01DD8 80A54C78 AFA5003C */ sw $a1, 0x003C($sp) -/* 01DDC 80A54C7C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 01DE0 80A54C80 3C0680A5 */ lui $a2, %hi(D_80A55258) ## $a2 = 80A50000 -/* 01DE4 80A54C84 24C65258 */ addiu $a2, $a2, %lo(D_80A55258) ## $a2 = 80A55258 -/* 01DE8 80A54C88 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFEC -/* 01DEC 80A54C8C 240706EC */ addiu $a3, $zero, 0x06EC ## $a3 = 000006EC -/* 01DF0 80A54C90 0C031AB1 */ jal Graph_OpenDisps -/* 01DF4 80A54C94 AFA50034 */ sw $a1, 0x0034($sp) -/* 01DF8 80A54C98 8FA80034 */ lw $t0, 0x0034($sp) -/* 01DFC 80A54C9C 3C18DA38 */ lui $t8, 0xDA38 ## $t8 = DA380000 -/* 01E00 80A54CA0 37180003 */ ori $t8, $t8, 0x0003 ## $t8 = DA380003 -/* 01E04 80A54CA4 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 01E08 80A54CA8 3C0580A5 */ lui $a1, %hi(D_80A5526C) ## $a1 = 80A50000 -/* 01E0C 80A54CAC 24A5526C */ addiu $a1, $a1, %lo(D_80A5526C) ## $a1 = 80A5526C -/* 01E10 80A54CB0 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 01E14 80A54CB4 AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 -/* 01E18 80A54CB8 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 01E1C 80A54CBC 8FB9003C */ lw $t9, 0x003C($sp) -/* 01E20 80A54CC0 240606EE */ addiu $a2, $zero, 0x06EE ## $a2 = 000006EE -/* 01E24 80A54CC4 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 -/* 01E28 80A54CC8 AFA80034 */ sw $t0, 0x0034($sp) -/* 01E2C 80A54CCC 0C0346A2 */ jal Matrix_NewMtx -/* 01E30 80A54CD0 AFA20020 */ sw $v0, 0x0020($sp) -/* 01E34 80A54CD4 8FA30020 */ lw $v1, 0x0020($sp) -/* 01E38 80A54CD8 8FA80034 */ lw $t0, 0x0034($sp) -/* 01E3C 80A54CDC 3C0B0600 */ lui $t3, 0x0600 ## $t3 = 06000000 -/* 01E40 80A54CE0 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 01E44 80A54CE4 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 01E48 80A54CE8 256B2C10 */ addiu $t3, $t3, 0x2C10 ## $t3 = 06002C10 -/* 01E4C 80A54CEC 3C0ADE00 */ lui $t2, 0xDE00 ## $t2 = DE000000 -/* 01E50 80A54CF0 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 01E54 80A54CF4 AD0902C0 */ sw $t1, 0x02C0($t0) ## 000002C0 -/* 01E58 80A54CF8 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 01E5C 80A54CFC AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 01E60 80A54D00 8FAC003C */ lw $t4, 0x003C($sp) -/* 01E64 80A54D04 3C0680A5 */ lui $a2, %hi(D_80A55280) ## $a2 = 80A50000 -/* 01E68 80A54D08 24C65280 */ addiu $a2, $a2, %lo(D_80A55280) ## $a2 = 80A55280 -/* 01E6C 80A54D0C 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFEC -/* 01E70 80A54D10 240706F1 */ addiu $a3, $zero, 0x06F1 ## $a3 = 000006F1 -/* 01E74 80A54D14 0C031AD5 */ jal Graph_CloseDisps -/* 01E78 80A54D18 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 01E7C 80A54D1C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01E80 80A54D20 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 01E84 80A54D24 03E00008 */ jr $ra -/* 01E88 80A54D28 00000000 */ nop diff --git a/data/overlays/actors/z_en_heishi2.data.s b/data/overlays/actors/z_en_heishi2.data.s deleted file mode 100644 index 2f28948e9c..0000000000 --- a/data/overlays/actors/z_en_heishi2.data.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .data - -glabel En_Heishi2_InitVars - .word 0x00B30400, 0x00000009, 0x00970000, 0x000003E4 -.word EnHeishi2_Init -.word EnHeishi2_Destroy -.word EnHeishi2_Update -.word EnHeishi2_Draw -glabel D_80A54F10 - .word 0x0A000039, 0x20010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x00210028, 0x00000000, 0x00000000, 0x00000000 - diff --git a/include/functions.h b/include/functions.h index 8f0dfa26a5..2ee3167595 100644 --- a/include/functions.h +++ b/include/functions.h @@ -1047,7 +1047,7 @@ void func_8008EDF0(Player*); s32 func_8008EF44(GlobalContext*, s32); // ? func_8008F034(?); u8 func_8008F080(GlobalContext*); -void func_8008F08C(GlobalContext*); +Player* func_8008F08C(GlobalContext*); s32 func_8008F098(GlobalContext*); s32 func_8008F0AC(GlobalContext*); s32 func_8008F0D8(Player* player, s32); diff --git a/spec b/spec index b80e106152..3ff1ea384e 100644 --- a/spec +++ b/spec @@ -2649,7 +2649,6 @@ endseg beginseg name "ovl_En_Heishi2" include "build/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.o" - include "build/data/overlays/actors/z_en_heishi2.data.o" include "build/data/overlays/actors/z_en_heishi2.reloc.o" endseg diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index 7e8f60fd92..9030b5dc3c 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -70,9 +70,10 @@ u8 func_8008F080(GlobalContext* globalCtx) { return player->currentMask; } -void func_8008F08C(GlobalContext* globalCtx) { +Player* func_8008F08C(GlobalContext* globalCtx) { Player* player = PLAYER; player->currentMask = 0; + return player; } s32 func_8008F098(GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c b/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c index b9040639c1..f5f9f65f2d 100644 --- a/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c +++ b/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c @@ -1,7 +1,7 @@ /* * File: z_bg_gate_shutter.c * Overlay: Bg_Gate_Shutter - * Description: + * Description: Death Mountain Trail Gate */ #include "z_bg_gate_shutter.h" @@ -34,8 +34,8 @@ const ActorInit Bg_Gate_Shutter_InitVars = { (ActorFunc)BgGateShutter_Draw, }; -extern UNK_TYPE D_06001CD0; -extern UNK_TYPE D_06001DA8; +extern Gfx D_06001CD0[]; +extern Gfx D_06001DA8[]; void BgGateShutter_Init(Actor* thisx, GlobalContext* globalCtx) { BgGateShutter* this = THIS; @@ -45,14 +45,13 @@ void BgGateShutter_Init(Actor* thisx, GlobalContext* globalCtx) { DynaPolyInfo_SetActorMove(&this->dyna, 0); DynaPolyInfo_Alloc(&D_06001DA8, &local_c); this->dyna.dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, thisx, local_c); - this->somePosX = thisx->posRot.pos.x; - this->somePosY = thisx->posRot.pos.y; - this->somePosZ = thisx->posRot.pos.z; - if ((gSaveContext.infTable[7] & 0x40) || (gSaveContext.eventChkInf[4] & 0x20)) { - if (globalCtx->sceneNum == SCENE_SPOT01) { - thisx->posRot.pos.x = -89.0f; - thisx->posRot.pos.z = -1375.0f; - } + this->somePos.x = thisx->posRot.pos.x; + this->somePos.y = thisx->posRot.pos.y; + this->somePos.z = thisx->posRot.pos.z; + if (((gSaveContext.infTable[7] & 0x40) || (gSaveContext.eventChkInf[4] & 0x20)) && + (globalCtx->sceneNum == SCENE_SPOT01)) { + thisx->posRot.pos.x = -89.0f; + thisx->posRot.pos.z = -1375.0f; } thisx->scale.x = 1.0f; thisx->scale.y = 1.0f; @@ -69,13 +68,13 @@ void BgGateShutter_Destroy(Actor* thisx, GlobalContext* globalCtx) { } void func_8087828C(BgGateShutter* this, GlobalContext* globalCtx) { - if (this->unk_168 == 1 && !(gSaveContext.infTable[7] & 0x40)) { + if (this->openingState == 1 && !(gSaveContext.infTable[7] & 0x40)) { this->unk_178 = 2; this->actionFunc = func_80878300; - } else if (this->unk_168 == 2) { + } else if (this->openingState == 2) { this->unk_178 = 2; this->actionFunc = func_80878300; - } else if (this->unk_168 < 0) { + } else if (this->openingState < 0) { this->unk_178 = 2; this->actionFunc = func_808783D4; } @@ -98,7 +97,7 @@ void func_80878300(BgGateShutter* this, GlobalContext* globalCtx) { void func_808783AC(BgGateShutter* this, GlobalContext* globalCtx) { if (this->unk_178 == 0) { - this->unk_168 = 0; + this->openingState = 0; this->actionFunc = func_8087828C; } } diff --git a/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.h b/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.h index 696033199a..830f8fd593 100644 --- a/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.h +++ b/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.h @@ -11,10 +11,8 @@ typedef void (*BgGateShutterActionFunc)(struct BgGateShutter*, GlobalContext*); typedef struct BgGateShutter { /* 0x0000 */ DynaPolyActor dyna; /* 0x0164 */ BgGateShutterActionFunc actionFunc; - /* 0x0168 */ s16 unk_168; - /* 0x016C */ f32 somePosX; - /* 0x0170 */ f32 somePosY; - /* 0x0174 */ f32 somePosZ; + /* 0x0168 */ s16 openingState; // 1 if gate is opening + /* 0x016C */ Vec3f somePos; /* 0x0178 */ s16 unk_178; } BgGateShutter; // size = 0x017C diff --git a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c index 0bf559ba7b..222a545cda 100644 --- a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c +++ b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c @@ -1,4 +1,14 @@ +/* + * File: z_en_heishi2.c + * Overlay: ovl_En_Heishi2 + * Description: Hyrulian Guards + */ + #include "z_en_heishi2.h" +#include "overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.h" +#include "overlays/actors/ovl_En_Bom/z_en_bom.h" +#include "overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.h" +#include #define FLAGS 0x00000009 @@ -9,7 +19,43 @@ void EnHeishi2_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnHeishi2_Update(Actor* thisx, GlobalContext* globalCtx); void EnHeishi2_Draw(Actor* thisx, GlobalContext* globalCtx); -/* +void func_80A54C6C(Actor* thisx, GlobalContext* globalCtx); +void func_80A531CC(EnHeishi2* this, GlobalContext* globalCtx); +void func_80A531D8(EnHeishi2* this, GlobalContext* globalCtx); +void func_80A531E4(EnHeishi2* this, GlobalContext* globalCtx); +void func_80A53278(EnHeishi2* this, GlobalContext* globalCtx); +void func_80A5344C(EnHeishi2* this, GlobalContext* globalCtx); +void func_80A54954(EnHeishi2* this, GlobalContext* globalCtx); +void func_80A53538(EnHeishi2* this, GlobalContext* globalCtx); +void func_80A535BC(EnHeishi2* this, GlobalContext* globalCtx); +void func_80A5399C(EnHeishi2* this, GlobalContext* globalCtx); +void func_80A53638(EnHeishi2* this, GlobalContext* globalCtx); +void func_80A5372C(EnHeishi2* this, GlobalContext* globalCtx); +void func_80A5475C(EnHeishi2* this, GlobalContext* globalCtx); +void func_80A53AD4(EnHeishi2* this, GlobalContext* globalCtx); +void func_80A53C0C(EnHeishi2* this, GlobalContext* globalCtx); +void func_80A53C90(EnHeishi2* this, GlobalContext* globalCtx); +void func_80A53D0C(EnHeishi2* this, GlobalContext* globalCtx); +void func_80A544AC(EnHeishi2* this, GlobalContext* globalCtx); +void func_80A53908(EnHeishi2* this, GlobalContext* globalCtx); +void func_80A53F30(EnHeishi2* this, GlobalContext* globalCtx); +void func_80A54038(EnHeishi2* this, GlobalContext* globalCtx); +void func_80A5427C(EnHeishi2* this, GlobalContext* globalCtx); +void func_80A549E8(EnHeishi2* this, GlobalContext* globalCtx); +void func_80A53850(EnHeishi2* this, GlobalContext* globalCtx); +void func_80A54320(EnHeishi2* this, GlobalContext* globalCtx); +void func_80A543A0(EnHeishi2* this, GlobalContext* globalCtx); +void func_80A5455C(EnHeishi2* this, GlobalContext* globalCtx); +void func_80A546DC(EnHeishi2* this, GlobalContext* globalCtx); +void func_80A541FC(EnHeishi2* this, GlobalContext* globalCtx); +void func_80A53DF8(EnHeishi2* this, GlobalContext* globalCtx); + +extern AnimationHeader D_06005C30; +extern AnimationHeader D_06005500; +extern SkeletonHeader D_0600BAC8; +extern Gfx D_0602B060[]; // Keaton Mask +extern Gfx D_06002C10[]; + const ActorInit En_Heishi2_InitVars = { ACTOR_EN_HEISHI2, ACTORTYPE_NPC, @@ -21,77 +67,825 @@ const ActorInit En_Heishi2_InitVars = { (ActorFunc)EnHeishi2_Update, (ActorFunc)EnHeishi2_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Init.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Destroy.s") +static ColliderCylinderInit cylinderInit = { + { COLTYPE_UNK10, 0x00, 0x00, 0x39, 0x20, COLSHAPE_CYLINDER }, + { 0x00, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, 0x00, 0x00, 0x01 }, + { 33, 40, 0, { 0, 0, 0 } }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A531CC.s") +void EnHeishi2_Init(Actor* thisx, GlobalContext* globalCtx) { + ColliderCylinder* collider; + EnHeishi2* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A531D8.s") + Actor_SetScale(&this->actor, 0.01f); + this->initParams = this->actor.params & 0xFF; + this->actor.colChkInfo.mass = 0xFF; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A531E4.s") + if ((this->initParams == 6) || (this->initParams == 9)) { + this->actor.draw = func_80A54C6C; + this->actor.flags &= -2; + Actor_ChangeType(globalCtx, &globalCtx->actorCtx, &this->actor, 6); + if (this->initParams == 6) { + this->actionFunc = func_80A531CC; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53278.s") + } else { + osSyncPrintf("\n\n"); + // "No, I'm completely disappointed" (message for when shooting guard window in courtyard) + osSyncPrintf(VT_FGCOL(PURPLE) " ☆☆☆☆☆ いやー ついうっかり ☆☆☆☆☆ \n" VT_RST); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5344C.s") + Actor_SetScale(&this->actor, 0.02f); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53538.s") + this->unk_274 = this->actor.posRot.pos; + this->actor.posRot.rot.y = 0x7918; + this->actor.posRot.pos.x += 90.0f; + this->actor.posRot.pos.y -= 60.0f; + this->actor.posRot.pos.z += 90.0f; + this->actor.shape.rot.y = this->actor.posRot.rot.y; + Collider_DestroyCylinder(globalCtx, &this->collider); + func_8002DF54(globalCtx, 0, 8); + this->actor.flags |= 0x11; + this->actionFunc = func_80A544AC; + } + } else { + this->unk_2E0 = 60.0f; + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 30.0f); + SkelAnime_Init(globalCtx, &this->skelAnime, &D_0600BAC8, &D_06005C30, this->limbDrawTable, + this->transitionDrawTable, 17); + collider = &this->collider; + Collider_InitCylinder(globalCtx, collider); + Collider_SetCylinder(globalCtx, collider, &this->actor, &cylinderInit); + this->collider.dim.yShift = 0; + this->collider.dim.radius = 0xF; + this->collider.dim.height = 0x46; + this->actor.unk_1F = 6; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A535BC.s") + switch (this->initParams) { -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53638.s") + case 2: + this->actionFunc = func_80A531E4; + this->actor.gravity = -1.0f; + break; + case 5: + this->actionFunc = func_80A53908; + this->actor.gravity = -1.0f; + break; + case 6: + osSyncPrintf("\n\n"); + // "Peep hole soldier!" + osSyncPrintf(VT_FGCOL(GREEN) " ☆☆☆☆☆ 覗き穴奥兵士ふぃ〜 ☆☆☆☆☆ \n" VT_RST); + Collider_DestroyCylinder(globalCtx, collider); + this->actor.flags &= -0xA; + this->actionFunc = func_80A531D8; + break; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5372C.s") + this->unk_2F0 = (this->actor.params >> 8) & 0xFF; + osSyncPrintf("\n\n"); + // "Soldier Set 2 Completed!" + osSyncPrintf(VT_FGCOL(GREEN) " ☆☆☆☆☆ 兵士２セット完了！ ☆☆☆☆☆ %d\n" VT_RST, this->actor.params); + // "Identification Completed!" + osSyncPrintf(VT_FGCOL(YELLOW) " ☆☆☆☆☆ 識別完了！ ☆☆☆☆☆ %d\n" VT_RST, this->initParams); + // "Message completed!" + osSyncPrintf(VT_FGCOL(PURPLE) " ☆☆☆☆☆ メッセージ完了！ ☆☆☆☆☆ %x\n\n" VT_RST, (this->actor.params >> 8) & 0xF); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53850.s") +void EnHeishi2_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnHeishi2* this = THIS; + if ((this->collider.dim.radius != 0) || (this->collider.dim.height != 0)) { + Collider_DestroyCylinder(globalCtx, &this->collider); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53908.s") +void func_80A531CC(EnHeishi2* this, GlobalContext* globalCtx) { +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5399C.s") +void func_80A531D8(EnHeishi2* this, GlobalContext* globalCtx) { +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53AD4.s") +void func_80A531E4(EnHeishi2* this, GlobalContext* globalCtx) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_06005C30, 1.0f, 0.0f, + (s16)(f32)SkelAnime_GetFrameCount(&D_06005C30.genericHeader), 0, -10.0f); + this->actionFunc = func_80A53278; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53C0C.s") +void func_80A53278(EnHeishi2* this, GlobalContext* globalCtx) { + this->unk_30B = 0; + this->unk_30E = 0; + if (Text_GetFaceReaction(globalCtx, 5) != 0) { + this->actor.textId = Text_GetFaceReaction(globalCtx, 5); + this->unk_30B = 1; + this->unk_300 = 6; + this->actionFunc = func_80A5475C; + } else if ((gSaveContext.eventChkInf[0] & 0x200) && (gSaveContext.eventChkInf[2] & 0x20) && + (gSaveContext.eventChkInf[3] & 0x80)) { + // "Get all spiritual stones!" + osSyncPrintf(VT_FGCOL(GREEN) " ☆☆☆☆☆ 全部の精霊石GET！ ☆☆☆☆☆ \n" VT_RST); + this->unk_300 = 6; + this->actor.textId = 0x7006; // "There's a lot going on in the castle right now. I can't allow even..." + this->actionFunc = func_80A5475C; + } else if (gSaveContext.nightFlag) { + // "Sleep early for children!" + osSyncPrintf(VT_FGCOL(YELLOW) " ☆☆☆☆☆ 子供ははやくネロ！ ☆☆☆☆☆ \n" VT_RST); + this->unk_300 = 6; + this->actor.textId = 0x7002; // "Welcome to Hyrule Castle Town. It's a peaceful, prosperous town." + this->actionFunc = func_80A5475C; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53C90.s") + } else if (this->unk_30C != 0) { + // "Anything passes" + osSyncPrintf(VT_FGCOL(BLUE) " ☆☆☆☆☆ なんでも通るよ ☆☆☆☆☆ \n" VT_RST); + this->unk_300 = 6; + this->actor.textId = 0x7099; // "KEEP IT A SECRET FROM EVERYONE" + this->actionFunc = func_80A5475C; + } else if (gSaveContext.eventChkInf[1] & 4) { + if (this->unk_30E == 0) { + // "Start under the first sleeve!" + osSyncPrintf(VT_FGCOL(PURPLE) " ☆☆☆☆☆ １回目袖の下開始！ ☆☆☆☆☆ \n" VT_RST); + this->actor.textId = 0x7071; // "Do you really want to go through this gate that much?..." + this->unk_30E = 1; + } else { + // "Start under the second sleeve!" + osSyncPrintf(VT_FGCOL(PURPLE) " ☆☆☆☆☆ ２回目袖の下開始！ ☆☆☆☆☆ \n" VT_RST); + this->actor.textId = 0x7072; // "Give me 10 Rupees...Yes...No" + } + this->unk_300 = 4; + this->actionFunc = func_80A5475C; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53D0C.s") + } else { + // "That's okay" + osSyncPrintf(VT_FGCOL(CYAN) " ☆☆☆☆☆ それはとおらんよぉ ☆☆☆☆☆ \n" VT_RST); + this->unk_300 = 6; + this->actor.textId = 0x7029; // "So you say you want to see Princess Zelda, eh?..." + this->actionFunc = func_80A5475C; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53DF8.s") +void func_80A5344C(EnHeishi2* this, GlobalContext* globalCtx) { + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + if ((func_8010BDBC(&globalCtx->msgCtx) == 4) && (func_80106BC8(globalCtx) != 0)) { + this->unk_300 = 5; + switch (globalCtx->msgCtx.choiceIndex) { + case 0: + if (gSaveContext.rupees >= 10) { + Rupees_ChangeBy(-10); + this->actor.textId = 0x7098; // "OK, I'll let you pass, quickly!" + this->actionFunc = func_80A53538; + break; + } else { + this->actor.textId = 0x7097; // "Well, maybe that's too much for a kid to pay." + this->actionFunc = func_80A54954; + break; + } + case 1: + this->actor.textId = 0x7096; // "Tsk tsk." + this->actionFunc = func_80A54954; + break; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53F30.s") + default: + break; + } + func_8010B720(globalCtx, this->actor.textId); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54038.s") +void func_80A53538(EnHeishi2* this, GlobalContext* globalCtx) { -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A540C0.s") + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + if (this->unk_300 == func_8010BDBC(&globalCtx->msgCtx)) { + if (func_80106BC8(globalCtx) != 0) { + func_8002DF54(globalCtx, NULL, 8); + globalCtx->msgCtx.msgMode = 0x37; + this->actionFunc = func_80A535BC; + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A541FC.s") +void func_80A535BC(EnHeishi2* this, GlobalContext* globalCtx) { + f32 frames = SkelAnime_GetFrameCount(&D_06005500.genericHeader); + this->unk_2EC = frames; + SkelAnime_ChangeAnim(&this->skelAnime, &D_06005500, 1.0f, 0.0f, frames, 2, -10.0f); + this->actionFunc = func_80A53638; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5427C.s") +void func_80A53638(EnHeishi2* this, GlobalContext* globalCtx) { -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54320.s") + Actor* thisx; + f32 frameCount; + BgSpot15Saku* actor; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A543A0.s") + frameCount = this->skelAnime.animCurrentFrame; + thisx = &this->actor; + actor = globalCtx->actorCtx.actorList[ACTORTYPE_ITEMACTION].first; + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + if ((frameCount >= 12.0f) && (!this->audioFlag)) { + Audio_PlayActorSound2(thisx, NA_SE_EV_SPEAR_HIT); + this->audioFlag = 1; + } + if (this->unk_2EC <= frameCount) { + while (actor != NULL) { + if (ACTOR_BG_SPOT15_SAKU != actor->dyna.actor.id) { + actor = (BgSpot15Saku*)(actor->dyna.actor.next); + } else { + this->attachedGate = actor; + actor->unk_168 = 1; + break; + } + } + // "I've come!" + osSyncPrintf(VT_FGCOL(PURPLE) "☆☆☆ きたきたきたぁ！ ☆☆☆ %x\n" VT_RST, actor->dyna.actor.next); + this->actionFunc = func_80A5372C; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A544AC.s") +void func_80A5372C(EnHeishi2* this, GlobalContext* globalCtx) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_06005C30, 1.0f, 0.0f, + (s16)(f32)SkelAnime_GetFrameCount(&D_06005C30.genericHeader), 0, -10.0f); + this->unk_2F2[0] = 200; + this->cameraId = Gameplay_CreateSubCamera(globalCtx); + Gameplay_ChangeCameraStatus(globalCtx, 0, 1); + Gameplay_ChangeCameraStatus(globalCtx, this->cameraId, 7); + this->unk_280.x = 947.0f; + this->unk_280.y = 1195.0f; + this->unk_280.z = 2682.0f; + this->unk_28C.x = 1164.0f; + this->unk_28C.y = 1145.0f; + this->unk_28C.z = 3014.0f; + + func_800C04D8(globalCtx, this->cameraId, &this->unk_280, &this->unk_28C); + this->actionFunc = func_80A53850; +} + +void func_80A53850(EnHeishi2* this, GlobalContext* globalCtx) { + BgSpot15Saku* gate; + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + func_800C04D8(globalCtx, this->cameraId, &this->unk_280, &this->unk_28C); + gate = (BgSpot15Saku*)this->attachedGate; + if ((this->unk_2F2[0] == 0) || (gate->unk_168 == 0)) { + Gameplay_ClearCamera(globalCtx, this->cameraId); + Gameplay_ChangeCameraStatus(globalCtx, 0, 7); + func_80106CCC(globalCtx); + this->unk_30C = 1; + func_8002DF54(globalCtx, NULL, 7); + this->actionFunc = func_80A531E4; + } +} + +void func_80A53908(EnHeishi2* this, GlobalContext* globalCtx) { + f32 frameCount = SkelAnime_GetFrameCount(&D_06005C30.genericHeader); + SkelAnime_ChangeAnim(&this->skelAnime, &D_06005C30, 1.0f, 0.0f, (s16)frameCount, 0, -10.0f); + this->actionFunc = func_80A5399C; +} + +void func_80A5399C(EnHeishi2* this, GlobalContext* globalCtx) { + s16 var; + + this->unk_30B = 0; + var = 0; + if (gSaveContext.infTable[7] & 0x40) { + if (!(gSaveContext.infTable[7] & 0x80)) { + if (func_8008F080(globalCtx) == 1) { + if (this->unk_309 == 0) { + this->actor.textId = 0x200A; // "Wha-ha-ha-hah! Do you think you're in disguise, Mr. Hero?" + } else { + this->actor.textId = 0x200B; // "Will you sell it to me? Yes/No way" + } + this->unk_300 = 4; + this->unk_30B = 1; + var = 1; + } else { + this->actor.textId = 0x2016; + // "I wish I could go to the mask shop in town to buy a present for my kid..sigh.." + this->unk_300 = 6; + var = 1; + } + } else { + this->actor.textId = 0x2020; // "My boy will be very happy with this!" + this->unk_300 = 5; + this->unk_30E = 0; + } + if (Text_GetFaceReaction(globalCtx, 5) != 0) { + if (var == 0) { + this->actor.textId = Text_GetFaceReaction(globalCtx, 5); + this->unk_30B = 1; + this->unk_300 = 6; + this->unk_30E = 0; + } + } + this->actionFunc = func_80A5475C; + } else { + // "I don't know" + osSyncPrintf(VT_FGCOL(PURPLE) " ☆☆☆☆☆ とおしゃしねぇちゅーの ☆☆☆☆☆ \n" VT_RST); + this->actionFunc = func_80A53AD4; + } +} + +void func_80A53AD4(EnHeishi2* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + s32 exchangeItemId; + s16 yawDiffTemp; + s16 yawDiff; + + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + if (Text_GetFaceReaction(globalCtx, 5) != 0) { + this->actor.textId = Text_GetFaceReaction(globalCtx, 5); + } else { + this->actor.textId = 0x200E; // "The road is closed beyond this point! Can't you read..." + } + this->unk_300 = 6; + if (func_8002F194(&this->actor, globalCtx) != 0) { + exchangeItemId = func_8002F368(globalCtx); + if (exchangeItemId == 1) { // exchangeItemId = zelda's letter + func_80078884(NA_SE_SY_CORRECT_CHIME); + player->actor.textId = 0x2010; // "Oh, this is...this is surely Princess Zelda's handwriting!" + this->unk_300 = 5; + this->actionFunc = func_80A53C0C; + } else if (exchangeItemId != 0) { // exchangeItemId != nothing + player->actor.textId = 0x200F; // "I don't want that!" + } + } else { + yawDiffTemp = this->actor.rotTowardsLinkY - this->actor.shape.rot.y; + yawDiff = ABS(yawDiffTemp); + if (!(120.0f < this->actor.xzDistanceFromLink) && (yawDiff < 0x4300)) { + func_8002F298(&this->actor, globalCtx, 100.0f, 1); + } + } +} + +void func_80A53C0C(EnHeishi2* this, GlobalContext* globalCtx) { + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + if (this->unk_300 == func_8010BDBC(&globalCtx->msgCtx)) { + if (func_80106BC8(globalCtx) != 0) { + func_8002DF54(globalCtx, 0, 8); + globalCtx->msgCtx.msgMode = 0x37; + this->actionFunc = func_80A53C90; + } + } +} + +void func_80A53C90(EnHeishi2* this, GlobalContext* globalCtx) { + f32 frameCount = SkelAnime_GetFrameCount(&D_06005500.genericHeader); + this->unk_2EC = frameCount; + SkelAnime_ChangeAnim(&this->skelAnime, &D_06005500, 1.0f, 0.0f, frameCount, 2, -10.0f); + this->actionFunc = func_80A53D0C; +} + +void func_80A53D0C(EnHeishi2* this, GlobalContext* globalCtx) { + s32 pad; + f32 frameCount; + BgGateShutter* gate; + + frameCount = this->skelAnime.animCurrentFrame; + gate = (BgGateShutter*)globalCtx->actorCtx.actorList[ACTORTYPE_ITEMACTION].first; + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + if (12.0f <= frameCount) { + if (this->audioFlag == 0) { + Audio_PlayActorSound2(&this->actor, NA_SE_EV_SPEAR_HIT); + this->audioFlag = 1; + } + } + if (this->unk_2EC <= frameCount) { + while (gate != NULL) { + if (ACTOR_BG_GATE_SHUTTER != gate->dyna.actor.id) { + gate = (BgGateShutter*)gate->dyna.actor.next; + } else { + this->attachedGate = gate; + gate->openingState = 1; + break; + } + } + // "I've come!" + osSyncPrintf(VT_FGCOL(PURPLE) "☆☆☆ きたきたきたぁ！ ☆☆☆ %x\n" VT_RST, gate->dyna.actor.next); + this->actionFunc = func_80A53DF8; + } +} + +void func_80A53DF8(EnHeishi2* this, GlobalContext* globalCtx) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_06005C30, 1.0f, 0.0f, + (s16)(f32)SkelAnime_GetFrameCount(&D_06005C30.genericHeader), 0, -10.0f); + this->unk_2F2[0] = 200; + this->cameraId = Gameplay_CreateSubCamera(globalCtx); + Gameplay_ChangeCameraStatus(globalCtx, 0, 1); + Gameplay_ChangeCameraStatus(globalCtx, this->cameraId, 7); + this->unk_2BC.x = -71.0f; + this->unk_280.x = -71.0f; + this->unk_2BC.y = 571.0f; + this->unk_280.y = 571.0f; + this->unk_2BC.z = -1487.0f; + this->unk_280.z = -1487.0f; + this->unk_298.x = 181.0f; + this->unk_28C.x = 181.0f; + this->unk_298.y = 417.0f; + this->unk_28C.y = 417.0f; + this->unk_298.z = -1079.0f; + this->unk_28C.z = -1079.0f; + func_800C04D8(globalCtx, this->cameraId, &this->unk_280, &this->unk_28C); + this->actionFunc = func_80A53F30; +} + +void func_80A53F30(EnHeishi2* this, GlobalContext* globalCtx) { + BgGateShutter* gate; + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + func_800C04D8(globalCtx, this->cameraId, &this->unk_280, &this->unk_28C); + gate = (BgGateShutter*)this->attachedGate; + if ((this->unk_2F2[0] == 0) || (gate->openingState == 0)) { + Gameplay_ClearCamera(globalCtx, this->cameraId); + Gameplay_ChangeCameraStatus(globalCtx, 0, 7); + if ((this->unk_30A != 2)) { + if (this->unk_30A == 0) { + this->actor.textId = 0x2015; // "By the way Mr. Hero..If you're going to climb Death Mountain..." + func_8010B720(globalCtx, this->actor.textId); + this->actionFunc = func_80A54038; + } else { + func_80106CCC(globalCtx); + func_8002DF54(globalCtx, NULL, 7); + this->actionFunc = func_80A53908; + } + } else { + this->unk_30E = 0; + this->actor.textId = 0x2021; // "You sold the 10-Rupee mask for 15 Rupees. You earned a little profit." + Rupees_ChangeBy(15); + func_8010B720(globalCtx, this->actor.textId); + this->actionFunc = func_80A5427C; + } + } +} + +void func_80A54038(EnHeishi2* this, GlobalContext* globalCtx) { + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + if (func_8010BDBC(&globalCtx->msgCtx) == 5) { + if (func_80106BC8(globalCtx) != 0) { + gSaveContext.infTable[7] |= 0x40; + func_80106CCC(globalCtx); + func_8002DF54(globalCtx, 0, 7); + this->actionFunc = func_80A53908; + } + } +} + +void func_80A540C0(EnHeishi2* this, GlobalContext* globalCtx) { + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + if ((func_8010BDBC(&globalCtx->msgCtx) == 4) && (func_80106BC8(globalCtx) != 0)) { + switch (globalCtx->msgCtx.choiceIndex) { + case 0: + this->actor.textId = 0x2020; // "My boy will be very happy with this!.." + func_8010B720(globalCtx, this->actor.textId); + func_8008F08C(globalCtx); + gSaveContext.infTable[7] |= 0x80; + gSaveContext.itemGetInf[3] |= 0x100; + Item_Give(globalCtx, ITEM_SOLD_OUT); + if (this->unk_30A != 0) { + this->unk_30A = 2; + this->unk_30E = 1; + this->actionFunc = func_80A5427C; + } else { + this->unk_30E = 0; + this->actionFunc = func_80A541FC; + } + break; + case 1: + this->unk_30E = 1; + this->actor.textId = 0x200C; // "I won't give up! I have plenty of patience.." + func_8010B720(globalCtx, this->actor.textId); + this->unk_300 = 5; + if (this->unk_30A == 0) { + this->actionFunc = func_80A5427C; + } else { + this->actionFunc = func_80A54954; + } + } + } +} + +void func_80A541FC(EnHeishi2* this, GlobalContext* globalCtx) { + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + if ((func_8010BDBC(&globalCtx->msgCtx) == 5) && (func_80106BC8(globalCtx) != 0)) { + this->actor.textId = 0x2021; // "You sold the 10-Rupee mask for 15 Rupees. You earned a little profit. Let's + // go to the Mask Shop..." + Rupees_ChangeBy(15); + func_8010B720(globalCtx, this->actor.textId); + this->actionFunc = func_80A5427C; + } +} + +void func_80A5427C(EnHeishi2* this, GlobalContext* globalCtx) { + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + if ((func_8010BDBC(&globalCtx->msgCtx) == 5) && (func_80106BC8(globalCtx) != 0)) { + if (this->unk_30E == 0) { + this->unk_30E = 0; + this->unk_30A = this->unk_30E; + func_80106CCC(globalCtx); + this->actionFunc = func_80A53908; + } else { + globalCtx->msgCtx.msgMode = 0x37; + this->actionFunc = func_80A54320; + } + } +} + +void func_80A54320(EnHeishi2* this, GlobalContext* globalCtx) { + f32 frameCount = SkelAnime_GetFrameCount(&D_06005500.genericHeader); + this->unk_2EC = frameCount; + SkelAnime_ChangeAnim(&this->skelAnime, &D_06005500, 1.0f, 0.0f, frameCount, 2, -10.0f); + this->audioFlag = 0; + this->actionFunc = func_80A543A0; +} + +void func_80A543A0(EnHeishi2* this, GlobalContext* globalCtx) { + Actor* thisx; + f32 frameCount; + BgGateShutter* gate; + + frameCount = this->skelAnime.animCurrentFrame; + thisx = &this->actor; + gate = (BgGateShutter*)(globalCtx->actorCtx.actorList[ACTORTYPE_ITEMACTION].first); + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + if ((frameCount >= 12.0f) && (!this->audioFlag)) { + Audio_PlayActorSound2(thisx, NA_SE_EV_SPEAR_HIT); + this->audioFlag = 1; + } + if (this->unk_2EC <= frameCount) { + while (gate != NULL) { + if (ACTOR_BG_GATE_SHUTTER != gate->dyna.actor.id) { + gate = (BgGateShutter*)(gate->dyna.actor.next); + } else { + this->attachedGate = gate; + if (this->unk_30A != 2) { + gate->openingState = -1; + break; + } else { + gate->openingState = 2; + break; + } + } + } + if (this->unk_30A == 0) { + this->unk_30A = 1; + } + this->actionFunc = func_80A53DF8; + } +} +void func_80A544AC(EnHeishi2* this, GlobalContext* globalCtx) { + Math_SmoothScaleMaxMinS(&this->actor.shape.rot.z, -0x17D4, 5, (s16)(s32)(f32)this->unk_2E4, 0); + Math_SmoothScaleMaxF(&this->unk_2E4, 3000.0f, 1.0f, 500.0f); + this->actor.posRot.rot.z = this->actor.shape.rot.z; + if (this->actor.shape.rot.z < -6000) { + func_8010B680(globalCtx, 0x708F, 0); + this->actor.flags |= 0x10000; + this->actionFunc = func_80A5455C; + this->unk_2E4 = 0.0f; + } +} + +#ifdef NON_MATCHING +// ordering and float stuff +void func_80A5455C(EnHeishi2* this, GlobalContext* globalCtx) { + EnBom* bomb; + Vec3f vec; + Actor* thisx = &this->actor; + s16 temp; + if ((func_8010BDBC(&globalCtx->msgCtx) == 5)) { + if (func_80106BC8(globalCtx) != 0) { + + func_8002DF54(globalCtx, NULL, 7); + func_80106CCC(globalCtx); + vec.x = Math_Rand_CenteredFloat(20.0f) + this->unk_274.x; + vec.y = Math_Rand_CenteredFloat(20.0f) + (this->unk_274.y - 40.0f); + vec.z = Math_Rand_CenteredFloat(20.0f) + (this->unk_274.z - 20.0f); + bomb = (EnBom*)Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_BOM, vec.x, vec.y, vec.z, 0, + (s16)(Math_Rand_CenteredFloat(7000.0f) + thisx->rotTowardsLinkY), 0, 0); + + if (bomb != NULL) { + bomb->actor.speedXZ = Math_Rand_CenteredFloat(5.0f) + 10.0f; + bomb->actor.velocity.y = Math_Rand_CenteredFloat(5.0f) + 10.0f; + } + // This is down! + osSyncPrintf(VT_FGCOL(YELLOW) " ☆☆☆☆☆ これでダウンだ！ ☆☆☆☆☆ \n" VT_RST); + this->actionFunc = func_80A546DC; + } + } +} +#else #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5455C.s") +#endif -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A546DC.s") +void func_80A546DC(EnHeishi2* this, GlobalContext* globalCtx) { + Math_SmoothScaleMaxMinS(&this->actor.shape.rot.z, 200, 5, this->unk_2E4, 0); + Math_SmoothScaleMaxF(&this->unk_2E4, 3000.0f, 1.0f, 500.0f); + this->actor.posRot.rot.z = this->actor.shape.rot.z; + if (this->actor.shape.rot.z > 0) { + Actor_Kill(&this->actor); + } +} + +/* +// can't get this to match, i think it's mostly functionally equivalent +void func_80A5475C(EnHeishi2* this, GlobalContext* globalCtx) { + Actor* thisx; + s16 yawDiff; + s16 yawDiffTemp; + s16 phi_v0; + + thisx = &this->actor; + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + if (Text_GetFaceReaction(globalCtx, 5) != 0) { + if (this->unk_30B == 0) { + if (this->initParams == 2) { + this->actionFunc = func_80A53278; + return; + } + if (this->initParams == ((((u16)5) & 0xFFu))) { + this->actionFunc = func_80A5399C; + return; + } + } + } else { + if (this->unk_30B != 0) { + if (this->initParams == 2) { + this->actionFunc = func_80A53278; + return; + } + if (5 == this->initParams) { + this->actionFunc = func_80A5399C; + return; + } + } + } + if ((func_8002F194(thisx, globalCtx) != 0)) { + if (this->initParams == 2) { + if (this->unk_30E == 1) { + this->actionFunc = func_80A5344C; + return; + } + this->actionFunc = func_80A53278; + return; + } + + if (this->initParams == 5) { + phi_v0 = this->unk_300; + + if (phi_v0 == 6) { + this->actionFunc = func_80A5399C; + phi_v0 = this->unk_300; + do { + phi_v0 = this->unk_300; + } while (0); + } + + if (phi_v0 == 5) { + this->actionFunc = func_80A54954; + phi_v0 = this->unk_300; + do { + phi_v0 = this->unk_300; + } while (0); + } + + if (phi_v0 != 4) { + return; + } + this->unk_309 = 1; + func_80078884(0x4807); + this->actionFunc = func_80A540C0; + return; + } + + phi_v0 = this->initParams; + } else { + if (this->initParams == 2) { + yawDiffTemp = this->actor.rotTowardsLinkY - this->actor.shape.rot.y; + yawDiff = ABS(yawDiffTemp); + if ((!(120.0f < this->actor.xzDistanceFromLink)) && (yawDiff < 0x4300)) { + func_8002F2F4(thisx, globalCtx); + } + } + } +} +*/ #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5475C.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54954.s") +void func_80A54954(EnHeishi2* this, GlobalContext* globalCtx) { + f32 frameCount = SkelAnime_GetFrameCount(&D_06005C30.genericHeader); + SkelAnime_ChangeAnim(&this->skelAnime, &D_06005C30, 1.0f, 0.0f, (s16)frameCount, 0, -10.0f); + this->actionFunc = func_80A549E8; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A549E8.s") +void func_80A549E8(EnHeishi2* this, GlobalContext* globalCtx) { + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + if (this->unk_300 == func_8010BDBC(&globalCtx->msgCtx)) { + if (func_80106BC8(globalCtx) != 0) { + func_80106CCC(globalCtx); + if (this->initParams == 2) { + this->actionFunc = func_80A531E4; + } + if (this->initParams == 5) { + this->actionFunc = func_80A53908; + } + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Update.s") +void EnHeishi2_Update(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + EnHeishi2* this = THIS; + s32 i; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54BC0.s") + Actor_SetHeight(&this->actor, this->unk_2E0); + if ((this->initParams == 2) || (this->initParams == 5)) { + this->actor.posRot2.pos.y = 70.0f; + Actor_SetHeight(&this->actor, 70.0f); + func_80038290(globalCtx, &this->actor, &this->unk_260, &this->unk_26C, this->actor.posRot2.pos); + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54C34.s") + this->unk_2FC++; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54C6C.s") + for (i = 0; i != 5; i++) { + if (this->unk_2F2[i] != 0) { + this->unk_2F2[i]--; + } + } + this->actionFunc(this, globalCtx); + Actor_MoveForward(&this->actor); + switch (this->initParams) { + case 6: + break; + case 9: + break; + default: + func_8002E4B4(globalCtx, &this->actor, 10.0f, 10.0f, 30.0f, 0x1D); + Collider_CylinderUpdate(&this->actor, &this->collider); + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider); + break; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Draw.s") +s32 EnHeishi2_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, + Actor* thisx) { + EnHeishi2* this = THIS; + switch (this->initParams) { + case 1: + break; + case 7: + break; + default: + if (limbIndex == 9) { + rot->x = rot->x + this->unk_26C.y; + } + if (limbIndex == 16) { + rot->x = rot->x + this->unk_260.y; + rot->z = rot->z + this->unk_260.z; + } + } + + return 0; +} + +void EnHeishi2_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx) { + EnHeishi2* this = THIS; + if (limbIndex == 16) { + Matrix_Get(&this->mtxf_330); + } +} + +void func_80A54C6C(Actor* thisx, GlobalContext* globalCtx) { + GraphicsContext* gfxCtx; + Gfx* dispRefs[4]; + + gfxCtx = globalCtx->state.gfxCtx; + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_heishi2.c", 1772); + gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_heishi2.c", 1774), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(gfxCtx->polyOpa.p++, &D_06002C10); // 2D Guard in Window + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_heishi2.c", 1777); +} + +void EnHeishi2_Draw(Actor* thisx, GlobalContext* globalCtx) { + EnHeishi2* this; + GraphicsContext* gfxCtx; + s32 linkObjBankIndex; + Mtx* mtx; + Gfx* dispRefs[4]; + + gfxCtx = globalCtx->state.gfxCtx; + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_heishi2.c", 1792); + func_80093D18(globalCtx->state.gfxCtx); + this = THIS; + SkelAnime_Draw(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, EnHeishi2_OverrideLimbDraw, + EnHeishi2_PostLimbDraw, &this->actor); + if ((this->initParams == 5) && (gSaveContext.infTable[7] & 0x80)) { + linkObjBankIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_LINK_CHILD); + if (linkObjBankIndex >= 0) { + Matrix_Put(&this->mtxf_330); + Matrix_Translate(-570.0f, 0.0f, 0.0f, MTXMODE_APPLY); + Matrix_RotateZ(DEGTORAD(70.0), MTXMODE_APPLY); + mtx = Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_heishi2.c", 1820) - 7; + + gSPSegment(gfxCtx->polyOpa.p++, 0x06, globalCtx->objectCtx.status[linkObjBankIndex].segment); + gSPSegment(gfxCtx->polyOpa.p++, 0x0D, mtx); + gSPDisplayList(gfxCtx->polyOpa.p++, &D_0602B060); + gSPSegment(gfxCtx->polyOpa.p++, 0x06, globalCtx->objectCtx.status[this->actor.objBankIndex].segment); + } + } + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_heishi2.c", 1834); +} diff --git a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.h b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.h index 78fb4849b8..6cdfc2e06c 100644 --- a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.h +++ b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.h @@ -4,11 +4,50 @@ #include #include + struct EnHeishi2; +typedef void (*EnHeishi2ActionFunc)(struct EnHeishi2*, GlobalContext*); + typedef struct EnHeishi2 { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x298]; + /* 0x014C */ SkelAnime skelAnime; + /* 0x0190 */ Vec3s limbDrawTable[17]; + /* 0x01F6 */ Vec3s transitionDrawTable[17]; + /* 0x025C */ EnHeishi2ActionFunc actionFunc; + /* 0x0260 */ Vec3s unk_260; + /* 0x0266 */ char unk_266[0x06]; + /* 0x026C */ Vec3s unk_26C; // padding inbetween these + /* 0x0274 */ Vec3f unk_274; + /* 0x0280 */ Vec3f unk_280; // camera related + /* 0x028C */ Vec3f unk_28C; // camera related + /* 0x0298 */ Vec3f unk_298; // camera related + /* 0x02A4 */ char unk_2A4[0x18]; + /* 0x02BC */ Vec3f unk_2BC; // camera related + /* 0x02C8 */ char unk_2C8[0x18]; + /* 0x02E0 */ f32 unk_2E0; + /* 0x02E4 */ f32 unk_2E4; + /* 0x02E8 */ char unk_2E8[0x4]; + /* 0x02EC */ f32 unk_2EC; + /* 0x02F0 */ u16 unk_2F0; + /* 0x02F2 */ s16 unk_2F2[0x5]; // starts counting down when guard starts to open gate. + /* 0x02FC */ s16 unk_2FC; + /* 0x02FE */ s16 initParams; // copy of actor params at init + /* 0x0300 */ s16 unk_300; // mask related + /* 0x0302 */ char unk_302[0x6]; + /* 0x0308 */ u8 audioFlag; + /* 0x0309 */ u8 unk_309; + /* 0x030A */ u8 unk_30A; + /* 0x030B */ u8 unk_30B; + /* 0x030C */ u8 unk_30C; + /* 0x030D */ char unk_30D; + /* 0x030E */ s16 unk_30E; + /* 0x0310 */ s16 cameraId; + /* 0x0314 */ Actor* attachedGate; + /* 0x0318 */ char unk_318[0x18]; + /* 0x0330 */ MtxF mtxf_330; + /* 0x0370 */ char unk_370[0x28]; + /* 0x0398 */ ColliderCylinder collider; } EnHeishi2; // size = 0x03E4 extern const ActorInit En_Heishi2_InitVars; diff --git a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c index 2b1201aa34..0c68527b71 100644 --- a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c +++ b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c @@ -1,7 +1,7 @@ /* * File: z_en_ma3.c * Overlay: En_Ma3 - * Description: + * Description: Adult Malon (Ranch) */ #include "z_en_ma3.h" @@ -37,7 +37,7 @@ const ActorInit En_Ma3_InitVars = { (ActorFunc)EnMa3_Draw, }; -ColliderCylinderInit cylinderInit = { +static ColliderCylinderInit cylinderInit = { { COLTYPE_UNK10, 0x00, 0x00, 0x39, 0x20, COLSHAPE_CYLINDER }, { 0x00, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, 0x00, 0x00, 0x01 }, { 18, 46, 0, { 0, 0, 0 } }, diff --git a/undefined_syms.txt b/undefined_syms.txt index 8ec647944d..78c9b3b97d 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -529,6 +529,13 @@ D_060067B8 = 0x060067B8; D_060076EC = 0x060076EC; D_060070F0 = 0x060070F0; +// z_en_heishi2 +D_06005C30 = 0x06005C30; +D_06005500 = 0x06005500; +D_0600BAC8 = 0x0600BAC8; +D_0602B060 = 0x0602B060; +D_06002C10 = 0x06002C10; + // z_bg_ddan_kd D_06004F30 = 0x06004F30; D_060048A8 = 0x060048A8;