diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/BgMizuWater_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/BgMizuWater_Destroy.s deleted file mode 100644 index 93ba4c60bc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/BgMizuWater_Destroy.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel BgMizuWater_Destroy -/* 0043C 8089FCEC AFA40000 */ sw $a0, 0x0000($sp) -/* 00440 8089FCF0 03E00008 */ jr $ra -/* 00444 8089FCF4 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/BgMizuWater_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/BgMizuWater_Draw.s deleted file mode 100644 index 986ecf04df..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/BgMizuWater_Draw.s +++ /dev/null @@ -1,109 +0,0 @@ -.rdata -glabel D_808A05A8 - .asciz "../z_bg_mizu_water.c" - .balign 4 - -glabel D_808A05C0 - .asciz "../z_bg_mizu_water.c" - .balign 4 - -glabel D_808A05D8 - .asciz "../z_bg_mizu_water.c" - .balign 4 - -.text -glabel BgMizuWater_Draw -/* 00AE8 808A0398 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 00AEC 808A039C AFB10038 */ sw $s1, 0x0038($sp) -/* 00AF0 808A03A0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00AF4 808A03A4 AFBF003C */ sw $ra, 0x003C($sp) -/* 00AF8 808A03A8 AFB00034 */ sw $s0, 0x0034($sp) -/* 00AFC 808A03AC AFA40078 */ sw $a0, 0x0078($sp) -/* 00B00 808A03B0 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 00B04 808A03B4 3C06808A */ lui $a2, %hi(D_808A05A8) ## $a2 = 808A0000 -/* 00B08 808A03B8 24C605A8 */ addiu $a2, $a2, %lo(D_808A05A8) ## $a2 = 808A05A8 -/* 00B0C 808A03BC 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFE4 -/* 00B10 808A03C0 240702E2 */ addiu $a3, $zero, 0x02E2 ## $a3 = 000002E2 -/* 00B14 808A03C4 0C031AB1 */ jal Graph_OpenDisps -/* 00B18 808A03C8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00B1C 808A03CC 3C030001 */ lui $v1, 0x0001 ## $v1 = 00010000 -/* 00B20 808A03D0 00711821 */ addu $v1, $v1, $s1 -/* 00B24 808A03D4 8C631DE4 */ lw $v1, 0x1DE4($v1) ## 00011DE4 -/* 00B28 808A03D8 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 00B2C 808A03DC 0C024F61 */ jal func_80093D84 -/* 00B30 808A03E0 AFA30070 */ sw $v1, 0x0070($sp) -/* 00B34 808A03E4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00B38 808A03E8 8FA70070 */ lw $a3, 0x0070($sp) -/* 00B3C 808A03EC 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 00B40 808A03F0 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 00B44 808A03F4 AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 -/* 00B48 808A03F8 35EF0030 */ ori $t7, $t7, 0x0030 ## $t7 = DB060030 -/* 00B4C 808A03FC AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 00B50 808A0400 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 00B54 808A0404 24180020 */ addiu $t8, $zero, 0x0020 ## $t8 = 00000020 -/* 00B58 808A0408 24190020 */ addiu $t9, $zero, 0x0020 ## $t9 = 00000020 -/* 00B5C 808A040C 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 00B60 808A0410 240A0020 */ addiu $t2, $zero, 0x0020 ## $t2 = 00000020 -/* 00B64 808A0414 240B0020 */ addiu $t3, $zero, 0x0020 ## $t3 = 00000020 -/* 00B68 808A0418 00073023 */ subu $a2, $zero, $a3 -/* 00B6C 808A041C AFA60020 */ sw $a2, 0x0020($sp) -/* 00B70 808A0420 AFAB0028 */ sw $t3, 0x0028($sp) -/* 00B74 808A0424 AFAA0024 */ sw $t2, 0x0024($sp) -/* 00B78 808A0428 AFA90018 */ sw $t1, 0x0018($sp) -/* 00B7C 808A042C AFB90014 */ sw $t9, 0x0014($sp) -/* 00B80 808A0430 AFB80010 */ sw $t8, 0x0010($sp) -/* 00B84 808A0434 AFA0001C */ sw $zero, 0x001C($sp) -/* 00B88 808A0438 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00B8C 808A043C 0C0253D0 */ jal Gfx_TwoTexScroll -/* 00B90 808A0440 AFA20058 */ sw $v0, 0x0058($sp) -/* 00B94 808A0444 8FA80058 */ lw $t0, 0x0058($sp) -/* 00B98 808A0448 3C0DDA38 */ lui $t5, 0xDA38 ## $t5 = DA380000 -/* 00B9C 808A044C 35AD0003 */ ori $t5, $t5, 0x0003 ## $t5 = DA380003 -/* 00BA0 808A0450 AD020004 */ sw $v0, 0x0004($t0) ## 00000004 -/* 00BA4 808A0454 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00BA8 808A0458 3C05808A */ lui $a1, %hi(D_808A05C0) ## $a1 = 808A0000 -/* 00BAC 808A045C 24A505C0 */ addiu $a1, $a1, %lo(D_808A05C0) ## $a1 = 808A05C0 -/* 00BB0 808A0460 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 00BB4 808A0464 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 -/* 00BB8 808A0468 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 00BBC 808A046C 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 00BC0 808A0470 240602ED */ addiu $a2, $zero, 0x02ED ## $a2 = 000002ED -/* 00BC4 808A0474 0C0346A2 */ jal Matrix_NewMtx -/* 00BC8 808A0478 AFA20054 */ sw $v0, 0x0054($sp) -/* 00BCC 808A047C 8FA30054 */ lw $v1, 0x0054($sp) -/* 00BD0 808A0480 3C0FFB00 */ lui $t7, 0xFB00 ## $t7 = FB000000 -/* 00BD4 808A0484 2418FF80 */ addiu $t8, $zero, 0xFF80 ## $t8 = FFFFFF80 -/* 00BD8 808A0488 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00BDC 808A048C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00BE0 808A0490 3C09FA00 */ lui $t1, 0xFA00 ## $t1 = FA000000 -/* 00BE4 808A0494 240AFF66 */ addiu $t2, $zero, 0xFF66 ## $t2 = FFFFFF66 -/* 00BE8 808A0498 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 00BEC 808A049C AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 -/* 00BF0 808A04A0 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 00BF4 808A04A4 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 00BF8 808A04A8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00BFC 808A04AC 3C0D0600 */ lui $t5, 0x0600 ## $t5 = 06000000 -/* 00C00 808A04B0 25AD4B20 */ addiu $t5, $t5, 0x4B20 ## $t5 = 06004B20 -/* 00C04 808A04B4 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 00C08 808A04B8 AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0 -/* 00C0C 808A04BC AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 -/* 00C10 808A04C0 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 00C14 808A04C4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00C18 808A04C8 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 -/* 00C1C 808A04CC 3C06808A */ lui $a2, %hi(D_808A05D8) ## $a2 = 808A0000 -/* 00C20 808A04D0 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 00C24 808A04D4 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 -/* 00C28 808A04D8 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 00C2C 808A04DC AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 00C30 808A04E0 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 00C34 808A04E4 24C605D8 */ addiu $a2, $a2, %lo(D_808A05D8) ## $a2 = 808A05D8 -/* 00C38 808A04E8 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFE4 -/* 00C3C 808A04EC 0C031AD5 */ jal Graph_CloseDisps -/* 00C40 808A04F0 240702F4 */ addiu $a3, $zero, 0x02F4 ## $a3 = 000002F4 -/* 00C44 808A04F4 8FBF003C */ lw $ra, 0x003C($sp) -/* 00C48 808A04F8 8FB00034 */ lw $s0, 0x0034($sp) -/* 00C4C 808A04FC 8FB10038 */ lw $s1, 0x0038($sp) -/* 00C50 808A0500 03E00008 */ jr $ra -/* 00C54 808A0504 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 -/* 00C58 808A0508 00000000 */ nop -/* 00C5C 808A050C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/BgMizuWater_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/BgMizuWater_Init.s deleted file mode 100644 index 81d8b96ca0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/BgMizuWater_Init.s +++ /dev/null @@ -1,214 +0,0 @@ -.rdata -glabel D_808A0580 - .asciz "<コンストラクト>%x %x %x\n" - .balign 4 - -.late_rodata -glabel jtbl_808A05F0 -.word L8089FAB4 -.word L8089FCCC -.word L8089FBFC -.word L8089FC3C -.word L8089FC84 - -.text -glabel BgMizuWater_Init -/* 0018C 8089FA3C 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00190 8089FA40 AFBF001C */ sw $ra, 0x001C($sp) -/* 00194 8089FA44 AFB10018 */ sw $s1, 0x0018($sp) -/* 00198 8089FA48 AFB00014 */ sw $s0, 0x0014($sp) -/* 0019C 8089FA4C 8CAE07C0 */ lw $t6, 0x07C0($a1) ## 000007C0 -/* 001A0 8089FA50 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 001A4 8089FA54 3C05808A */ lui $a1, %hi(D_808A0578) ## $a1 = 808A0000 -/* 001A8 8089FA58 8DCF0028 */ lw $t7, 0x0028($t6) ## 00000028 -/* 001AC 8089FA5C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 001B0 8089FA60 24A50578 */ addiu $a1, $a1, %lo(D_808A0578) ## $a1 = 808A0578 -/* 001B4 8089FA64 AFAF0034 */ sw $t7, 0x0034($sp) -/* 001B8 8089FA68 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 001BC 8089FA6C 0002CA03 */ sra $t9, $v0, 8 -/* 001C0 8089FA70 332800FF */ andi $t0, $t9, 0x00FF ## $t0 = 00000000 -/* 001C4 8089FA74 305800FF */ andi $t8, $v0, 0x00FF ## $t8 = 00000000 -/* 001C8 8089FA78 AC980150 */ sw $t8, 0x0150($a0) ## 00000150 -/* 001CC 8089FA7C 0C01E037 */ jal Actor_ProcessInitChain - -/* 001D0 8089FA80 AC88015C */ sw $t0, 0x015C($a0) ## 0000015C -/* 001D4 8089FA84 8E090150 */ lw $t1, 0x0150($s0) ## 00000150 -/* 001D8 8089FA88 C6000028 */ lwc1 $f0, 0x0028($s0) ## 00000028 -/* 001DC 8089FA8C 2D210005 */ sltiu $at, $t1, 0x0005 -/* 001E0 8089FA90 E6000158 */ swc1 $f0, 0x0158($s0) ## 00000158 -/* 001E4 8089FA94 1020008D */ beq $at, $zero, .L8089FCCC -/* 001E8 8089FA98 E6000154 */ swc1 $f0, 0x0154($s0) ## 00000154 -/* 001EC 8089FA9C 00094880 */ sll $t1, $t1, 2 -/* 001F0 8089FAA0 3C01808A */ lui $at, %hi(jtbl_808A05F0) ## $at = 808A0000 -/* 001F4 8089FAA4 00290821 */ addu $at, $at, $t1 -/* 001F8 8089FAA8 8C2905F0 */ lw $t1, %lo(jtbl_808A05F0)($at) -/* 001FC 8089FAAC 01200008 */ jr $t1 -/* 00200 8089FAB0 00000000 */ nop -glabel L8089FAB4 -/* 00204 8089FAB4 3C0A8016 */ lui $t2, %hi(gGameInfo) -/* 00208 8089FAB8 8D4AFA90 */ lw $t2, %lo(gGameInfo)($t2) -/* 0020C 8089FABC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00210 8089FAC0 854B1532 */ lh $t3, 0x1532($t2) ## 80161532 -/* 00214 8089FAC4 55600012 */ bnel $t3, $zero, .L8089FB10 -/* 00218 8089FAC8 2404FFFF */ addiu $a0, $zero, 0xFFFF ## $a0 = FFFFFFFF -/* 0021C 8089FACC 0C00B2D0 */ jal Flags_GetSwitch - -/* 00220 8089FAD0 2405001C */ addiu $a1, $zero, 0x001C ## $a1 = 0000001C -/* 00224 8089FAD4 AFA20024 */ sw $v0, 0x0024($sp) -/* 00228 8089FAD8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0022C 8089FADC 0C00B2D0 */ jal Flags_GetSwitch - -/* 00230 8089FAE0 2405001D */ addiu $a1, $zero, 0x001D ## $a1 = 0000001D -/* 00234 8089FAE4 AFA20028 */ sw $v0, 0x0028($sp) -/* 00238 8089FAE8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0023C 8089FAEC 0C00B2D0 */ jal Flags_GetSwitch - -/* 00240 8089FAF0 2405001E */ addiu $a1, $zero, 0x001E ## $a1 = 0000001E -/* 00244 8089FAF4 3C04808A */ lui $a0, %hi(D_808A0580) ## $a0 = 808A0000 -/* 00248 8089FAF8 24840580 */ addiu $a0, $a0, %lo(D_808A0580) ## $a0 = 808A0580 -/* 0024C 8089FAFC 8FA50024 */ lw $a1, 0x0024($sp) -/* 00250 8089FB00 8FA60028 */ lw $a2, 0x0028($sp) -/* 00254 8089FB04 0C00084C */ jal osSyncPrintf - -/* 00258 8089FB08 00403825 */ or $a3, $v0, $zero ## $a3 = 00000000 -/* 0025C 8089FB0C 2404FFFF */ addiu $a0, $zero, 0xFFFF ## $a0 = FFFFFFFF -.L8089FB10: -/* 00260 8089FB10 0C227E2C */ jal func_8089F8B0 -/* 00264 8089FB14 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00268 8089FB18 000260C0 */ sll $t4, $v0, 3 -/* 0026C 8089FB1C 3C0D808A */ lui $t5, %hi(D_808A0514) ## $t5 = 808A0000 -/* 00270 8089FB20 01AC6821 */ addu $t5, $t5, $t4 -/* 00274 8089FB24 8DAD0514 */ lw $t5, %lo(D_808A0514)($t5) -/* 00278 8089FB28 AFA20030 */ sw $v0, 0x0030($sp) -/* 0027C 8089FB2C C6080158 */ lwc1 $f8, 0x0158($s0) ## 00000158 -/* 00280 8089FB30 448D2000 */ mtc1 $t5, $f4 ## $f4 = -0.00 -/* 00284 8089FB34 00000000 */ nop -/* 00288 8089FB38 468021A0 */ cvt.s.w $f6, $f4 -/* 0028C 8089FB3C 46083280 */ add.s $f10, $f6, $f8 -/* 00290 8089FB40 E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 -/* 00294 8089FB44 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 00298 8089FB48 8FA40034 */ lw $a0, 0x0034($sp) -/* 0029C 8089FB4C 4600848D */ trunc.w.s $f18, $f16 -/* 002A0 8089FB50 44059000 */ mfc1 $a1, $f18 -/* 002A4 8089FB54 00000000 */ nop -/* 002A8 8089FB58 00052C00 */ sll $a1, $a1, 16 -/* 002AC 8089FB5C 0C227E74 */ jal func_8089F9D0 -/* 002B0 8089FB60 00052C03 */ sra $a1, $a1, 16 -/* 002B4 8089FB64 8FAF0030 */ lw $t7, 0x0030($sp) -/* 002B8 8089FB68 3C19808A */ lui $t9, %hi(D_808A0510) ## $t9 = 808A0000 -/* 002BC 8089FB6C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 002C0 8089FB70 000FC0C0 */ sll $t8, $t7, 3 -/* 002C4 8089FB74 0338C821 */ addu $t9, $t9, $t8 -/* 002C8 8089FB78 8F390510 */ lw $t9, %lo(D_808A0510)($t9) -/* 002CC 8089FB7C 2405001C */ addiu $a1, $zero, 0x001C ## $a1 = 0000001C -/* 002D0 8089FB80 0C00B2ED */ jal Flags_UnsetSwitch - -/* 002D4 8089FB84 A619001C */ sh $t9, 0x001C($s0) ## 0000001C -/* 002D8 8089FB88 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 002DC 8089FB8C 0C00B2ED */ jal Flags_UnsetSwitch - -/* 002E0 8089FB90 2405001D */ addiu $a1, $zero, 0x001D ## $a1 = 0000001D -/* 002E4 8089FB94 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 002E8 8089FB98 0C00B2ED */ jal Flags_UnsetSwitch - -/* 002EC 8089FB9C 2405001E */ addiu $a1, $zero, 0x001E ## $a1 = 0000001E -/* 002F0 8089FBA0 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 002F4 8089FBA4 2401001C */ addiu $at, $zero, 0x001C ## $at = 0000001C -/* 002F8 8089FBA8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 002FC 8089FBAC 1041000E */ beq $v0, $at, .L8089FBE8 -/* 00300 8089FBB0 2401001D */ addiu $at, $zero, 0x001D ## $at = 0000001D -/* 00304 8089FBB4 10410008 */ beq $v0, $at, .L8089FBD8 -/* 00308 8089FBB8 2405001D */ addiu $a1, $zero, 0x001D ## $a1 = 0000001D -/* 0030C 8089FBBC 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E -/* 00310 8089FBC0 14410009 */ bne $v0, $at, .L8089FBE8 -/* 00314 8089FBC4 2405001E */ addiu $a1, $zero, 0x001E ## $a1 = 0000001E -/* 00318 8089FBC8 0C00B2DD */ jal Flags_SetSwitch - -/* 0031C 8089FBCC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00320 8089FBD0 10000008 */ beq $zero, $zero, .L8089FBF4 -/* 00324 8089FBD4 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -.L8089FBD8: -/* 00328 8089FBD8 0C00B2DD */ jal Flags_SetSwitch - -/* 0032C 8089FBDC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00330 8089FBE0 10000004 */ beq $zero, $zero, .L8089FBF4 -/* 00334 8089FBE4 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -.L8089FBE8: -/* 00338 8089FBE8 0C00B2DD */ jal Flags_SetSwitch - -/* 0033C 8089FBEC 2405001C */ addiu $a1, $zero, 0x001C ## $a1 = 0000001C -/* 00340 8089FBF0 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -.L8089FBF4: -/* 00344 8089FBF4 10000035 */ beq $zero, $zero, .L8089FCCC -/* 00348 8089FBF8 E6040154 */ swc1 $f4, 0x0154($s0) ## 00000154 -glabel L8089FBFC -/* 0034C 8089FBFC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00350 8089FC00 0C00B2D0 */ jal Flags_GetSwitch - -/* 00354 8089FC04 8E05015C */ lw $a1, 0x015C($s0) ## 0000015C -/* 00358 8089FC08 10400006 */ beq $v0, $zero, .L8089FC24 -/* 0035C 8089FC0C 3C0142AA */ lui $at, 0x42AA ## $at = 42AA0000 -/* 00360 8089FC10 C6060158 */ lwc1 $f6, 0x0158($s0) ## 00000158 -/* 00364 8089FC14 44814000 */ mtc1 $at, $f8 ## $f8 = 85.00 -/* 00368 8089FC18 00000000 */ nop -/* 0036C 8089FC1C 46083280 */ add.s $f10, $f6, $f8 -/* 00370 8089FC20 E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 -.L8089FC24: -/* 00374 8089FC24 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 00378 8089FC28 8FAA0034 */ lw $t2, 0x0034($sp) -/* 0037C 8089FC2C 4600848D */ trunc.w.s $f18, $f16 -/* 00380 8089FC30 44099000 */ mfc1 $t1, $f18 -/* 00384 8089FC34 10000025 */ beq $zero, $zero, .L8089FCCC -/* 00388 8089FC38 A5490062 */ sh $t1, 0x0062($t2) ## 00000062 -glabel L8089FC3C -/* 0038C 8089FC3C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00390 8089FC40 0C00B2D0 */ jal Flags_GetSwitch - -/* 00394 8089FC44 8E05015C */ lw $a1, 0x015C($s0) ## 0000015C -/* 00398 8089FC48 10400008 */ beq $v0, $zero, .L8089FC6C -/* 0039C 8089FC4C 3C0142DC */ lui $at, 0x42DC ## $at = 42DC0000 -/* 003A0 8089FC50 C6040158 */ lwc1 $f4, 0x0158($s0) ## 00000158 -/* 003A4 8089FC54 44813000 */ mtc1 $at, $f6 ## $f6 = 110.00 -/* 003A8 8089FC58 00000000 */ nop -/* 003AC 8089FC5C 46062200 */ add.s $f8, $f4, $f6 -/* 003B0 8089FC60 E6080028 */ swc1 $f8, 0x0028($s0) ## 00000028 -/* 003B4 8089FC64 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 -/* 003B8 8089FC68 E60A0154 */ swc1 $f10, 0x0154($s0) ## 00000154 -.L8089FC6C: -/* 003BC 8089FC6C C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 003C0 8089FC70 8FAD0034 */ lw $t5, 0x0034($sp) -/* 003C4 8089FC74 4600848D */ trunc.w.s $f18, $f16 -/* 003C8 8089FC78 440C9000 */ mfc1 $t4, $f18 -/* 003CC 8089FC7C 10000013 */ beq $zero, $zero, .L8089FCCC -/* 003D0 8089FC80 A5AC0082 */ sh $t4, 0x0082($t5) ## 00000082 -glabel L8089FC84 -/* 003D4 8089FC84 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 003D8 8089FC88 0C00B2D0 */ jal Flags_GetSwitch - -/* 003DC 8089FC8C 8E05015C */ lw $a1, 0x015C($s0) ## 0000015C -/* 003E0 8089FC90 10400008 */ beq $v0, $zero, .L8089FCB4 -/* 003E4 8089FC94 3C014320 */ lui $at, 0x4320 ## $at = 43200000 -/* 003E8 8089FC98 C6040158 */ lwc1 $f4, 0x0158($s0) ## 00000158 -/* 003EC 8089FC9C 44813000 */ mtc1 $at, $f6 ## $f6 = 160.00 -/* 003F0 8089FCA0 00000000 */ nop -/* 003F4 8089FCA4 46062200 */ add.s $f8, $f4, $f6 -/* 003F8 8089FCA8 E6080028 */ swc1 $f8, 0x0028($s0) ## 00000028 -/* 003FC 8089FCAC C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 -/* 00400 8089FCB0 E60A0154 */ swc1 $f10, 0x0154($s0) ## 00000154 -.L8089FCB4: -/* 00404 8089FCB4 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 00408 8089FCB8 8FB80034 */ lw $t8, 0x0034($sp) -/* 0040C 8089FCBC 4600848D */ trunc.w.s $f18, $f16 -/* 00410 8089FCC0 440F9000 */ mfc1 $t7, $f18 -/* 00414 8089FCC4 00000000 */ nop -/* 00418 8089FCC8 A70F0102 */ sh $t7, 0x0102($t8) ## 00000102 -glabel L8089FCCC -.L8089FCCC: -/* 0041C 8089FCCC 3C19808A */ lui $t9, %hi(func_8089FCF8) ## $t9 = 808A0000 -/* 00420 8089FCD0 2739FCF8 */ addiu $t9, $t9, %lo(func_8089FCF8) ## $t9 = 8089FCF8 -/* 00424 8089FCD4 AE19014C */ sw $t9, 0x014C($s0) ## 0000014C -/* 00428 8089FCD8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0042C 8089FCDC 8FB10018 */ lw $s1, 0x0018($sp) -/* 00430 8089FCE0 8FB00014 */ lw $s0, 0x0014($sp) -/* 00434 8089FCE4 03E00008 */ jr $ra -/* 00438 8089FCE8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/BgMizuWater_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/BgMizuWater_Update.s deleted file mode 100644 index f2e5c1bd31..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/BgMizuWater_Update.s +++ /dev/null @@ -1,138 +0,0 @@ -.rdata -glabel D_808A059C - .asciz "%x %x %x\n" - .balign 4 - -.late_rodata -glabel D_808A062C - .word 0xC450C000 -glabel D_808A0630 - .word 0x43DE8000 -glabel D_808A0634 - .word 0x443F4000, 0x00000000, 0x00000000 - -.text -glabel BgMizuWater_Update -/* 00924 808A01D4 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* 00928 808A01D8 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* 0092C 808A01DC 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00930 808A01E0 AFBF001C */ sw $ra, 0x001C($sp) -/* 00934 808A01E4 AFB00018 */ sw $s0, 0x0018($sp) -/* 00938 808A01E8 85CF1532 */ lh $t7, 0x1532($t6) ## 80161532 -/* 0093C 808A01EC 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00940 808A01F0 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00944 808A01F4 15E00013 */ bne $t7, $zero, .L808A0244 -/* 00948 808A01F8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0094C 808A01FC 2405001C */ addiu $a1, $zero, 0x001C ## $a1 = 0000001C -/* 00950 808A0200 0C00B2D0 */ jal Flags_GetSwitch - -/* 00954 808A0204 AFA60040 */ sw $a2, 0x0040($sp) -/* 00958 808A0208 AFA20020 */ sw $v0, 0x0020($sp) -/* 0095C 808A020C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00960 808A0210 0C00B2D0 */ jal Flags_GetSwitch - -/* 00964 808A0214 2405001D */ addiu $a1, $zero, 0x001D ## $a1 = 0000001D -/* 00968 808A0218 AFA20024 */ sw $v0, 0x0024($sp) -/* 0096C 808A021C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00970 808A0220 0C00B2D0 */ jal Flags_GetSwitch - -/* 00974 808A0224 2405001E */ addiu $a1, $zero, 0x001E ## $a1 = 0000001E -/* 00978 808A0228 3C04808A */ lui $a0, %hi(D_808A059C) ## $a0 = 808A0000 -/* 0097C 808A022C 2484059C */ addiu $a0, $a0, %lo(D_808A059C) ## $a0 = 808A059C -/* 00980 808A0230 8FA50020 */ lw $a1, 0x0020($sp) -/* 00984 808A0234 8FA60024 */ lw $a2, 0x0024($sp) -/* 00988 808A0238 0C00084C */ jal osSyncPrintf - -/* 0098C 808A023C 00403825 */ or $a3, $v0, $zero ## $a3 = 00000000 -/* 00990 808A0240 8FA60040 */ lw $a2, 0x0040($sp) -.L808A0244: -/* 00994 808A0244 8CD80150 */ lw $t8, 0x0150($a2) ## 00000150 -/* 00998 808A0248 5700004A */ bnel $t8, $zero, .L808A0374 -/* 0099C 808A024C 8CD9014C */ lw $t9, 0x014C($a2) ## 0000014C -/* 009A0 808A0250 C4C40028 */ lwc1 $f4, 0x0028($a2) ## 00000028 -/* 009A4 808A0254 3C01C170 */ lui $at, 0xC170 ## $at = C1700000 -/* 009A8 808A0258 44811000 */ mtc1 $at, $f2 ## $f2 = -15.00 -/* 009AC 808A025C 4600218D */ trunc.w.s $f6, $f4 -/* 009B0 808A0260 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 -/* 009B4 808A0264 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -/* 009B8 808A0268 3C01808A */ lui $at, %hi(D_808A0630) ## $at = 808A0000 -/* 009BC 808A026C 44023000 */ mfc1 $v0, $f6 -/* 009C0 808A0270 00000000 */ nop -/* 009C4 808A0274 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 -/* 009C8 808A0278 00000000 */ nop -/* 009CC 808A027C 46804020 */ cvt.s.w $f0, $f8 -/* 009D0 808A0280 4602003C */ c.lt.s $f0, $f2 -/* 009D4 808A0284 00000000 */ nop -/* 009D8 808A0288 4500000E */ bc1f .L808A02C4 -/* 009DC 808A028C 00000000 */ nop -/* 009E0 808A0290 3C01808A */ lui $at, %hi(D_808A062C) ## $at = 808A0000 -/* 009E4 808A0294 C42A062C */ lwc1 $f10, %lo(D_808A062C)($at) -/* 009E8 808A0298 3C01444D */ lui $at, 0x444D ## $at = 444D0000 -/* 009EC 808A029C 44819000 */ mtc1 $at, $f18 ## $f18 = 820.00 -/* 009F0 808A02A0 460A0401 */ sub.s $f16, $f0, $f10 -/* 009F4 808A02A4 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 009F8 808A02A8 44813000 */ mtc1 $at, $f6 ## $f6 = 200.00 -/* 009FC 808A02AC 46128103 */ div.s $f4, $f16, $f18 -/* 00A00 808A02B0 46062202 */ mul.s $f8, $f4, $f6 -/* 00A04 808A02B4 4600428D */ trunc.w.s $f10, $f8 -/* 00A08 808A02B8 44035000 */ mfc1 $v1, $f10 -/* 00A0C 808A02BC 10000027 */ beq $zero, $zero, .L808A035C -/* 00A10 808A02C0 0004C200 */ sll $t8, $a0, 8 -.L808A02C4: -/* 00A14 808A02C4 C42C0630 */ lwc1 $f12, %lo(D_808A0630)($at) -/* 00A18 808A02C8 3C01808A */ lui $at, %hi(D_808A0634) ## $at = 808A0000 -/* 00A1C 808A02CC 460C003C */ c.lt.s $f0, $f12 -/* 00A20 808A02D0 00000000 */ nop -/* 00A24 808A02D4 4500000E */ bc1f .L808A0310 -/* 00A28 808A02D8 00000000 */ nop -/* 00A2C 808A02DC 46020401 */ sub.s $f16, $f0, $f2 -/* 00A30 808A02E0 3C0143E6 */ lui $at, 0x43E6 ## $at = 43E60000 -/* 00A34 808A02E4 44819000 */ mtc1 $at, $f18 ## $f18 = 460.00 -/* 00A38 808A02E8 3C0142BE */ lui $at, 0x42BE ## $at = 42BE0000 -/* 00A3C 808A02EC 44813000 */ mtc1 $at, $f6 ## $f6 = 95.00 -/* 00A40 808A02F0 46128103 */ div.s $f4, $f16, $f18 -/* 00A44 808A02F4 240B00FF */ addiu $t3, $zero, 0x00FF ## $t3 = 000000FF -/* 00A48 808A02F8 24040001 */ addiu $a0, $zero, 0x0001 ## $a0 = 00000001 -/* 00A4C 808A02FC 46062202 */ mul.s $f8, $f4, $f6 -/* 00A50 808A0300 4600428D */ trunc.w.s $f10, $f8 -/* 00A54 808A0304 440A5000 */ mfc1 $t2, $f10 -/* 00A58 808A0308 10000013 */ beq $zero, $zero, .L808A0358 -/* 00A5C 808A030C 016A1823 */ subu $v1, $t3, $t2 -.L808A0310: -/* 00A60 808A0310 C4300634 */ lwc1 $f16, %lo(D_808A0634)($at) -/* 00A64 808A0314 3C0143A0 */ lui $at, 0x43A0 ## $at = 43A00000 -/* 00A68 808A0318 4610003E */ c.le.s $f0, $f16 -/* 00A6C 808A031C 00000000 */ nop -/* 00A70 808A0320 4502000E */ bc1fl .L808A035C -/* 00A74 808A0324 0004C200 */ sll $t8, $a0, 8 -/* 00A78 808A0328 460C0481 */ sub.s $f18, $f0, $f12 -/* 00A7C 808A032C 44812000 */ mtc1 $at, $f4 ## $f4 = 320.00 -/* 00A80 808A0330 3C0142BE */ lui $at, 0x42BE ## $at = 42BE0000 -/* 00A84 808A0334 44814000 */ mtc1 $at, $f8 ## $f8 = 95.00 -/* 00A88 808A0338 46049183 */ div.s $f6, $f18, $f4 -/* 00A8C 808A033C 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 00A90 808A0340 24040002 */ addiu $a0, $zero, 0x0002 ## $a0 = 00000002 -/* 00A94 808A0344 46083282 */ mul.s $f10, $f6, $f8 -/* 00A98 808A0348 4600540D */ trunc.w.s $f16, $f10 -/* 00A9C 808A034C 440D8000 */ mfc1 $t5, $f16 -/* 00AA0 808A0350 00000000 */ nop -/* 00AA4 808A0354 01CD1823 */ subu $v1, $t6, $t5 -.L808A0358: -/* 00AA8 808A0358 0004C200 */ sll $t8, $a0, 8 -.L808A035C: -/* 00AAC 808A035C 307900FF */ andi $t9, $v1, 0x00FF ## $t9 = 00000000 -/* 00AB0 808A0360 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00AB4 808A0364 00300821 */ addu $at, $at, $s0 -/* 00AB8 808A0368 03194025 */ or $t0, $t8, $t9 ## $t0 = 00000000 -/* 00ABC 808A036C A4281D32 */ sh $t0, 0x1D32($at) ## 00011D32 -/* 00AC0 808A0370 8CD9014C */ lw $t9, 0x014C($a2) ## 0000014C -.L808A0374: -/* 00AC4 808A0374 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 00AC8 808A0378 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00ACC 808A037C 0320F809 */ jalr $ra, $t9 -/* 00AD0 808A0380 00000000 */ nop -/* 00AD4 808A0384 8FBF001C */ lw $ra, 0x001C($sp) -/* 00AD8 808A0388 8FB00018 */ lw $s0, 0x0018($sp) -/* 00ADC 808A038C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00AE0 808A0390 03E00008 */ jr $ra -/* 00AE4 808A0394 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/func_8089F8B0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/func_8089F8B0.s deleted file mode 100644 index 10b55f796d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/func_8089F8B0.s +++ /dev/null @@ -1,91 +0,0 @@ -glabel func_8089F8B0 -/* 00000 8089F8B0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00004 8089F8B4 3C028016 */ lui $v0, %hi(gGameInfo) -/* 00008 8089F8B8 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* 0000C 8089F8BC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00010 8089F8C0 AFA40018 */ sw $a0, 0x0018($sp) -/* 00014 8089F8C4 AFA5001C */ sw $a1, 0x001C($sp) -/* 00018 8089F8C8 844E1514 */ lh $t6, 0x1514($v0) ## 80161514 -/* 0001C 8089F8CC 51C0001D */ beql $t6, $zero, .L8089F944 -/* 00020 8089F8D0 8FA4001C */ lw $a0, 0x001C($sp) -/* 00024 8089F8D4 84431516 */ lh $v1, 0x1516($v0) ## 80161516 -/* 00028 8089F8D8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0002C 8089F8DC 8FA4001C */ lw $a0, 0x001C($sp) -/* 00030 8089F8E0 10600008 */ beq $v1, $zero, .L8089F904 -/* 00034 8089F8E4 00000000 */ nop -/* 00038 8089F8E8 1061000B */ beq $v1, $at, .L8089F918 -/* 0003C 8089F8EC 8FA4001C */ lw $a0, 0x001C($sp) -/* 00040 8089F8F0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00044 8089F8F4 1061000D */ beq $v1, $at, .L8089F92C -/* 00048 8089F8F8 8FA4001C */ lw $a0, 0x001C($sp) -/* 0004C 8089F8FC 10000010 */ beq $zero, $zero, .L8089F940 -/* 00050 8089F900 A4401514 */ sh $zero, 0x1514($v0) ## 80161514 -.L8089F904: -/* 00054 8089F904 0C00B2DD */ jal Flags_SetSwitch - -/* 00058 8089F908 2405001C */ addiu $a1, $zero, 0x001C ## $a1 = 0000001C -/* 0005C 8089F90C 3C028016 */ lui $v0, %hi(gGameInfo) -/* 00060 8089F910 1000000A */ beq $zero, $zero, .L8089F93C -/* 00064 8089F914 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -.L8089F918: -/* 00068 8089F918 0C00B2DD */ jal Flags_SetSwitch - -/* 0006C 8089F91C 2405001D */ addiu $a1, $zero, 0x001D ## $a1 = 0000001D -/* 00070 8089F920 3C028016 */ lui $v0, %hi(gGameInfo) -/* 00074 8089F924 10000005 */ beq $zero, $zero, .L8089F93C -/* 00078 8089F928 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -.L8089F92C: -/* 0007C 8089F92C 0C00B2DD */ jal Flags_SetSwitch - -/* 00080 8089F930 2405001E */ addiu $a1, $zero, 0x001E ## $a1 = 0000001E -/* 00084 8089F934 3C028016 */ lui $v0, %hi(gGameInfo) -/* 00088 8089F938 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -.L8089F93C: -/* 0008C 8089F93C A4401514 */ sh $zero, 0x1514($v0) ## 80161514 -.L8089F940: -/* 00090 8089F940 8FA4001C */ lw $a0, 0x001C($sp) -.L8089F944: -/* 00094 8089F944 0C00B2D0 */ jal Flags_GetSwitch - -/* 00098 8089F948 2405001C */ addiu $a1, $zero, 0x001C ## $a1 = 0000001C -/* 0009C 8089F94C 10400006 */ beq $v0, $zero, .L8089F968 -/* 000A0 8089F950 87AF001A */ lh $t7, 0x001A($sp) -/* 000A4 8089F954 2401001C */ addiu $at, $zero, 0x001C ## $at = 0000001C -/* 000A8 8089F958 51E10004 */ beql $t7, $at, .L8089F96C -/* 000AC 8089F95C 8FA4001C */ lw $a0, 0x001C($sp) -/* 000B0 8089F960 10000016 */ beq $zero, $zero, .L8089F9BC -/* 000B4 8089F964 24030003 */ addiu $v1, $zero, 0x0003 ## $v1 = 00000003 -.L8089F968: -/* 000B8 8089F968 8FA4001C */ lw $a0, 0x001C($sp) -.L8089F96C: -/* 000BC 8089F96C 0C00B2D0 */ jal Flags_GetSwitch - -/* 000C0 8089F970 2405001D */ addiu $a1, $zero, 0x001D ## $a1 = 0000001D -/* 000C4 8089F974 10400006 */ beq $v0, $zero, .L8089F990 -/* 000C8 8089F978 87B8001A */ lh $t8, 0x001A($sp) -/* 000CC 8089F97C 2401001D */ addiu $at, $zero, 0x001D ## $at = 0000001D -/* 000D0 8089F980 53010004 */ beql $t8, $at, .L8089F994 -/* 000D4 8089F984 8FA4001C */ lw $a0, 0x001C($sp) -/* 000D8 8089F988 1000000C */ beq $zero, $zero, .L8089F9BC -/* 000DC 8089F98C 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 -.L8089F990: -/* 000E0 8089F990 8FA4001C */ lw $a0, 0x001C($sp) -.L8089F994: -/* 000E4 8089F994 0C00B2D0 */ jal Flags_GetSwitch - -/* 000E8 8089F998 2405001E */ addiu $a1, $zero, 0x001E ## $a1 = 0000001E -/* 000EC 8089F99C 10400006 */ beq $v0, $zero, .L8089F9B8 -/* 000F0 8089F9A0 87B9001A */ lh $t9, 0x001A($sp) -/* 000F4 8089F9A4 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E -/* 000F8 8089F9A8 53210004 */ beql $t9, $at, .L8089F9BC -/* 000FC 8089F9AC 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -/* 00100 8089F9B0 10000002 */ beq $zero, $zero, .L8089F9BC -/* 00104 8089F9B4 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -.L8089F9B8: -/* 00108 8089F9B8 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L8089F9BC: -/* 0010C 8089F9BC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00110 8089F9C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00114 8089F9C4 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -/* 00118 8089F9C8 03E00008 */ jr $ra -/* 0011C 8089F9CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/func_8089F9D0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/func_8089F9D0.s deleted file mode 100644 index 3054265d2b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/func_8089F9D0.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_8089F9D0 -/* 00120 8089F9D0 AFA50004 */ sw $a1, 0x0004($sp) -/* 00124 8089F9D4 00052C00 */ sll $a1, $a1, 16 -/* 00128 8089F9D8 3C03808A */ lui $v1, %hi(D_808A0558) ## $v1 = 808A0000 -/* 0012C 8089F9DC 3C02808A */ lui $v0, %hi(D_808A0578) ## $v0 = 808A0000 -/* 00130 8089F9E0 00052C03 */ sra $a1, $a1, 16 -/* 00134 8089F9E4 24420578 */ addiu $v0, $v0, %lo(D_808A0578) ## $v0 = 808A0578 -/* 00138 8089F9E8 24630558 */ addiu $v1, $v1, %lo(D_808A0558) ## $v1 = 808A0558 -.L8089F9EC: -/* 0013C 8089F9EC 8C6E0000 */ lw $t6, 0x0000($v1) ## 808A0558 -/* 00140 8089F9F0 24630010 */ addiu $v1, $v1, 0x0010 ## $v1 = 808A0568 -/* 00144 8089F9F4 000E7900 */ sll $t7, $t6, 4 -/* 00148 8089F9F8 008FC021 */ addu $t8, $a0, $t7 -/* 0014C 8089F9FC A7050002 */ sh $a1, 0x0002($t8) ## 00000002 -/* 00150 8089FA00 8C79FFF4 */ lw $t9, -0x000C($v1) ## 808A055C -/* 00154 8089FA04 00194100 */ sll $t0, $t9, 4 -/* 00158 8089FA08 00884821 */ addu $t1, $a0, $t0 -/* 0015C 8089FA0C A5250002 */ sh $a1, 0x0002($t1) ## 00000002 -/* 00160 8089FA10 8C6AFFF8 */ lw $t2, -0x0008($v1) ## 808A0560 -/* 00164 8089FA14 000A5900 */ sll $t3, $t2, 4 -/* 00168 8089FA18 008B6021 */ addu $t4, $a0, $t3 -/* 0016C 8089FA1C A5850002 */ sh $a1, 0x0002($t4) ## 00000002 -/* 00170 8089FA20 8C6DFFFC */ lw $t5, -0x0004($v1) ## 808A0564 -/* 00174 8089FA24 000D7100 */ sll $t6, $t5, 4 -/* 00178 8089FA28 008E7821 */ addu $t7, $a0, $t6 -/* 0017C 8089FA2C 1462FFEF */ bne $v1, $v0, .L8089F9EC -/* 00180 8089FA30 A5E50002 */ sh $a1, 0x0002($t7) ## 00000002 -/* 00184 8089FA34 03E00008 */ jr $ra -/* 00188 8089FA38 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/func_8089FCF8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/func_8089FCF8.s deleted file mode 100644 index 4b3fde8aa0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/func_8089FCF8.s +++ /dev/null @@ -1,141 +0,0 @@ -.late_rodata -glabel jtbl_808A0604 -.word L8089FD30 -.word L8089FE8C -.word L8089FDE8 -.word L8089FE20 -.word L8089FE58 - -.text -glabel func_8089FCF8 -/* 00448 8089FCF8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0044C 8089FCFC AFBF0024 */ sw $ra, 0x0024($sp) -/* 00450 8089FD00 AFB00020 */ sw $s0, 0x0020($sp) -/* 00454 8089FD04 8C8E0150 */ lw $t6, 0x0150($a0) ## 00000150 -/* 00458 8089FD08 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0045C 8089FD0C 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 00460 8089FD10 2DC10005 */ sltiu $at, $t6, 0x0005 -/* 00464 8089FD14 1020005D */ beq $at, $zero, .L8089FE8C -/* 00468 8089FD18 000E7080 */ sll $t6, $t6, 2 -/* 0046C 8089FD1C 3C01808A */ lui $at, %hi(jtbl_808A0604) ## $at = 808A0000 -/* 00470 8089FD20 002E0821 */ addu $at, $at, $t6 -/* 00474 8089FD24 8C2E0604 */ lw $t6, %lo(jtbl_808A0604)($at) -/* 00478 8089FD28 01C00008 */ jr $t6 -/* 0047C 8089FD2C 00000000 */ nop -glabel L8089FD30 -/* 00480 8089FD30 8604001C */ lh $a0, 0x001C($s0) ## 0000001C -/* 00484 8089FD34 AFA6003C */ sw $a2, 0x003C($sp) -/* 00488 8089FD38 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 0048C 8089FD3C 0C227E2C */ jal func_8089F8B0 -/* 00490 8089FD40 A7A4002E */ sh $a0, 0x002E($sp) -/* 00494 8089FD44 1040001E */ beq $v0, $zero, .L8089FDC0 -/* 00498 8089FD48 87AF002E */ lh $t7, 0x002E($sp) -/* 0049C 8089FD4C 0002C0C0 */ sll $t8, $v0, 3 -/* 004A0 8089FD50 3C19808A */ lui $t9, %hi(D_808A0510) ## $t9 = 808A0000 -/* 004A4 8089FD54 0338C821 */ addu $t9, $t9, $t8 -/* 004A8 8089FD58 8F390510 */ lw $t9, %lo(D_808A0510)($t9) -/* 004AC 8089FD5C 8FA4003C */ lw $a0, 0x003C($sp) -/* 004B0 8089FD60 24050C30 */ addiu $a1, $zero, 0x0C30 ## $a1 = 00000C30 -/* 004B4 8089FD64 11F90016 */ beq $t7, $t9, .L8089FDC0 -/* 004B8 8089FD68 2409FF9C */ addiu $t1, $zero, 0xFF9C ## $t1 = FFFFFF9C -/* 004BC 8089FD6C 01223023 */ subu $a2, $t1, $v0 -/* 004C0 8089FD70 00063400 */ sll $a2, $a2, 16 -/* 004C4 8089FD74 00063403 */ sra $a2, $a2, 16 -/* 004C8 8089FD78 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 004CC 8089FD7C AFA00010 */ sw $zero, 0x0010($sp) -/* 004D0 8089FD80 0C02003E */ jal func_800800F8 -/* 004D4 8089FD84 AFA20030 */ sw $v0, 0x0030($sp) -/* 004D8 8089FD88 8FA80030 */ lw $t0, 0x0030($sp) -/* 004DC 8089FD8C 3C0B808A */ lui $t3, %hi(D_808A0510) ## $t3 = 808A0000 -/* 004E0 8089FD90 256B0510 */ addiu $t3, $t3, %lo(D_808A0510) ## $t3 = 808A0510 -/* 004E4 8089FD94 000850C0 */ sll $t2, $t0, 3 -/* 004E8 8089FD98 014B1821 */ addu $v1, $t2, $t3 -/* 004EC 8089FD9C 8C6C0000 */ lw $t4, 0x0000($v1) ## 00000000 -/* 004F0 8089FDA0 C6080158 */ lwc1 $f8, 0x0158($s0) ## 00000158 -/* 004F4 8089FDA4 A60C001C */ sh $t4, 0x001C($s0) ## 0000001C -/* 004F8 8089FDA8 8C6D0004 */ lw $t5, 0x0004($v1) ## 00000004 -/* 004FC 8089FDAC 448D2000 */ mtc1 $t5, $f4 ## $f4 = 0.00 -/* 00500 8089FDB0 00000000 */ nop -/* 00504 8089FDB4 468021A0 */ cvt.s.w $f6, $f4 -/* 00508 8089FDB8 46083280 */ add.s $f10, $f6, $f8 -/* 0050C 8089FDBC E60A0154 */ swc1 $f10, 0x0154($s0) ## 00000154 -.L8089FDC0: -/* 00510 8089FDC0 87AE002E */ lh $t6, 0x002E($sp) -/* 00514 8089FDC4 8618001C */ lh $t8, 0x001C($s0) ## 0000001C -/* 00518 8089FDC8 51D80031 */ beql $t6, $t8, .L8089FE90 -/* 0051C 8089FDCC C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 00520 8089FDD0 11C0002E */ beq $t6, $zero, .L8089FE8C -/* 00524 8089FDD4 8FA4003C */ lw $a0, 0x003C($sp) -/* 00528 8089FDD8 0C00B2ED */ jal Flags_UnsetSwitch - -/* 0052C 8089FDDC 01C02825 */ or $a1, $t6, $zero ## $a1 = 00000000 -/* 00530 8089FDE0 1000002B */ beq $zero, $zero, .L8089FE90 -/* 00534 8089FDE4 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -glabel L8089FDE8 -/* 00538 8089FDE8 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 0053C 8089FDEC 0C00B2D0 */ jal Flags_GetSwitch - -/* 00540 8089FDF0 8E05015C */ lw $a1, 0x015C($s0) ## 0000015C -/* 00544 8089FDF4 10400007 */ beq $v0, $zero, .L8089FE14 -/* 00548 8089FDF8 3C0142AA */ lui $at, 0x42AA ## $at = 42AA0000 -/* 0054C 8089FDFC C6100158 */ lwc1 $f16, 0x0158($s0) ## 00000158 -/* 00550 8089FE00 44819000 */ mtc1 $at, $f18 ## $f18 = 85.00 -/* 00554 8089FE04 00000000 */ nop -/* 00558 8089FE08 46128100 */ add.s $f4, $f16, $f18 -/* 0055C 8089FE0C 1000001F */ beq $zero, $zero, .L8089FE8C -/* 00560 8089FE10 E6040154 */ swc1 $f4, 0x0154($s0) ## 00000154 -.L8089FE14: -/* 00564 8089FE14 C6060158 */ lwc1 $f6, 0x0158($s0) ## 00000158 -/* 00568 8089FE18 1000001C */ beq $zero, $zero, .L8089FE8C -/* 0056C 8089FE1C E6060154 */ swc1 $f6, 0x0154($s0) ## 00000154 -glabel L8089FE20 -/* 00570 8089FE20 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 00574 8089FE24 0C00B2D0 */ jal Flags_GetSwitch - -/* 00578 8089FE28 8E05015C */ lw $a1, 0x015C($s0) ## 0000015C -/* 0057C 8089FE2C 10400007 */ beq $v0, $zero, .L8089FE4C -/* 00580 8089FE30 3C0142DC */ lui $at, 0x42DC ## $at = 42DC0000 -/* 00584 8089FE34 C6080158 */ lwc1 $f8, 0x0158($s0) ## 00000158 -/* 00588 8089FE38 44815000 */ mtc1 $at, $f10 ## $f10 = 110.00 -/* 0058C 8089FE3C 00000000 */ nop -/* 00590 8089FE40 460A4400 */ add.s $f16, $f8, $f10 -/* 00594 8089FE44 10000011 */ beq $zero, $zero, .L8089FE8C -/* 00598 8089FE48 E6100154 */ swc1 $f16, 0x0154($s0) ## 00000154 -.L8089FE4C: -/* 0059C 8089FE4C C6120158 */ lwc1 $f18, 0x0158($s0) ## 00000158 -/* 005A0 8089FE50 1000000E */ beq $zero, $zero, .L8089FE8C -/* 005A4 8089FE54 E6120154 */ swc1 $f18, 0x0154($s0) ## 00000154 -glabel L8089FE58 -/* 005A8 8089FE58 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 005AC 8089FE5C 0C00B2D0 */ jal Flags_GetSwitch - -/* 005B0 8089FE60 8E05015C */ lw $a1, 0x015C($s0) ## 0000015C -/* 005B4 8089FE64 10400007 */ beq $v0, $zero, .L8089FE84 -/* 005B8 8089FE68 3C014320 */ lui $at, 0x4320 ## $at = 43200000 -/* 005BC 8089FE6C C6040158 */ lwc1 $f4, 0x0158($s0) ## 00000158 -/* 005C0 8089FE70 44813000 */ mtc1 $at, $f6 ## $f6 = 160.00 -/* 005C4 8089FE74 00000000 */ nop -/* 005C8 8089FE78 46062200 */ add.s $f8, $f4, $f6 -/* 005CC 8089FE7C 10000003 */ beq $zero, $zero, .L8089FE8C -/* 005D0 8089FE80 E6080154 */ swc1 $f8, 0x0154($s0) ## 00000154 -.L8089FE84: -/* 005D4 8089FE84 C60A0158 */ lwc1 $f10, 0x0158($s0) ## 00000158 -/* 005D8 8089FE88 E60A0154 */ swc1 $f10, 0x0154($s0) ## 00000154 -glabel L8089FE8C -.L8089FE8C: -/* 005DC 8089FE8C C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -.L8089FE90: -/* 005E0 8089FE90 C6120154 */ lwc1 $f18, 0x0154($s0) ## 00000154 -/* 005E4 8089FE94 3C0F808A */ lui $t7, %hi(func_8089FEC4) ## $t7 = 808A0000 -/* 005E8 8089FE98 25EFFEC4 */ addiu $t7, $t7, %lo(func_8089FEC4) ## $t7 = 8089FEC4 -/* 005EC 8089FE9C 46128032 */ c.eq.s $f16, $f18 -/* 005F0 8089FEA0 00000000 */ nop -/* 005F4 8089FEA4 45030003 */ bc1tl .L8089FEB4 -/* 005F8 8089FEA8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 005FC 8089FEAC AE0F014C */ sw $t7, 0x014C($s0) ## 0000014C -/* 00600 8089FEB0 8FBF0024 */ lw $ra, 0x0024($sp) -.L8089FEB4: -/* 00604 8089FEB4 8FB00020 */ lw $s0, 0x0020($sp) -/* 00608 8089FEB8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 0060C 8089FEBC 03E00008 */ jr $ra -/* 00610 8089FEC0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/func_8089FEC4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/func_8089FEC4.s deleted file mode 100644 index 36f8333783..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/func_8089FEC4.s +++ /dev/null @@ -1,237 +0,0 @@ -.late_rodata -glabel jtbl_808A0618 -.word L8089FF08 -.word L808A0154 -.word L8089FFE0 -.word L808A005C -.word L808A00D8 - -.text -glabel func_8089FEC4 -/* 00614 8089FEC4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00618 8089FEC8 AFBF001C */ sw $ra, 0x001C($sp) -/* 0061C 8089FECC AFB00018 */ sw $s0, 0x0018($sp) -/* 00620 8089FED0 8CAE07C0 */ lw $t6, 0x07C0($a1) ## 000007C0 -/* 00624 8089FED4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00628 8089FED8 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 0062C 8089FEDC 8DCF0028 */ lw $t7, 0x0028($t6) ## 00000028 -/* 00630 8089FEE0 AFAF0020 */ sw $t7, 0x0020($sp) -/* 00634 8089FEE4 8C980150 */ lw $t8, 0x0150($a0) ## 00000150 -/* 00638 8089FEE8 2F010005 */ sltiu $at, $t8, 0x0005 -/* 0063C 8089FEEC 10200099 */ beq $at, $zero, .L808A0154 -/* 00640 8089FEF0 0018C080 */ sll $t8, $t8, 2 -/* 00644 8089FEF4 3C01808A */ lui $at, %hi(jtbl_808A0618) ## $at = 808A0000 -/* 00648 8089FEF8 00380821 */ addu $at, $at, $t8 -/* 0064C 8089FEFC 8C380618 */ lw $t8, %lo(jtbl_808A0618)($at) -/* 00650 8089FF00 03000008 */ jr $t8 -/* 00654 8089FF04 00000000 */ nop -glabel L8089FF08 -/* 00658 8089FF08 8604001C */ lh $a0, 0x001C($s0) ## 0000001C -/* 0065C 8089FF0C AFA70034 */ sw $a3, 0x0034($sp) -/* 00660 8089FF10 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 00664 8089FF14 0C227E2C */ jal func_8089F8B0 -/* 00668 8089FF18 A7A4002A */ sh $a0, 0x002A($sp) -/* 0066C 8089FF1C 10400010 */ beq $v0, $zero, .L8089FF60 -/* 00670 8089FF20 87A6002A */ lh $a2, 0x002A($sp) -/* 00674 8089FF24 3C08808A */ lui $t0, %hi(D_808A0510) ## $t0 = 808A0000 -/* 00678 8089FF28 25080510 */ addiu $t0, $t0, %lo(D_808A0510) ## $t0 = 808A0510 -/* 0067C 8089FF2C 0002C8C0 */ sll $t9, $v0, 3 -/* 00680 8089FF30 03281821 */ addu $v1, $t9, $t0 -/* 00684 8089FF34 8C640000 */ lw $a0, 0x0000($v1) ## 00000000 -/* 00688 8089FF38 50C4000A */ beql $a2, $a0, .L8089FF64 -/* 0068C 8089FF3C 860A001C */ lh $t2, 0x001C($s0) ## 0000001C -/* 00690 8089FF40 A604001C */ sh $a0, 0x001C($s0) ## 0000001C -/* 00694 8089FF44 8C690004 */ lw $t1, 0x0004($v1) ## 00000004 -/* 00698 8089FF48 C6080158 */ lwc1 $f8, 0x0158($s0) ## 00000158 -/* 0069C 8089FF4C 44892000 */ mtc1 $t1, $f4 ## $f4 = 0.00 -/* 006A0 8089FF50 00000000 */ nop -/* 006A4 8089FF54 468021A0 */ cvt.s.w $f6, $f4 -/* 006A8 8089FF58 46083280 */ add.s $f10, $f6, $f8 -/* 006AC 8089FF5C E60A0154 */ swc1 $f10, 0x0154($s0) ## 00000154 -.L8089FF60: -/* 006B0 8089FF60 860A001C */ lh $t2, 0x001C($s0) ## 0000001C -.L8089FF64: -/* 006B4 8089FF64 50CA0006 */ beql $a2, $t2, .L8089FF80 -/* 006B8 8089FF68 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 006BC 8089FF6C 10C00003 */ beq $a2, $zero, .L8089FF7C -/* 006C0 8089FF70 8FA40034 */ lw $a0, 0x0034($sp) -/* 006C4 8089FF74 0C00B2ED */ jal Flags_UnsetSwitch - -/* 006C8 8089FF78 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -.L8089FF7C: -/* 006CC 8089FF7C 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -.L8089FF80: -/* 006D0 8089FF80 8E050154 */ lw $a1, 0x0154($s0) ## 00000154 -/* 006D4 8089FF84 0C01DE80 */ jal Math_ApproxF - -/* 006D8 8089FF88 3C0640A0 */ lui $a2, 0x40A0 ## $a2 = 40A00000 -/* 006DC 8089FF8C 10400009 */ beq $v0, $zero, .L8089FFB4 -/* 006E0 8089FF90 8FAB0034 */ lw $t3, 0x0034($sp) -/* 006E4 8089FF94 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 006E8 8089FF98 002B0821 */ addu $at, $at, $t3 -/* 006EC 8089FF9C 3C0C808A */ lui $t4, %hi(func_8089FCF8) ## $t4 = 808A0000 -/* 006F0 8089FFA0 A4201D30 */ sh $zero, 0x1D30($at) ## 00011D30 -/* 006F4 8089FFA4 258CFCF8 */ addiu $t4, $t4, %lo(func_8089FCF8) ## $t4 = 8089FCF8 -/* 006F8 8089FFA8 AE0C014C */ sw $t4, 0x014C($s0) ## 0000014C -/* 006FC 8089FFAC 0C041B33 */ jal func_80106CCC -/* 00700 8089FFB0 8FA40034 */ lw $a0, 0x0034($sp) -.L8089FFB4: -/* 00704 8089FFB4 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 00708 8089FFB8 8FAD0034 */ lw $t5, 0x0034($sp) -/* 0070C 8089FFBC 4600848D */ trunc.w.s $f18, $f16 -/* 00710 8089FFC0 8DAE07C0 */ lw $t6, 0x07C0($t5) ## 000007C0 -/* 00714 8089FFC4 44059000 */ mfc1 $a1, $f18 -/* 00718 8089FFC8 8DC40028 */ lw $a0, 0x0028($t6) ## 00000028 -/* 0071C 8089FFCC 00052C00 */ sll $a1, $a1, 16 -/* 00720 8089FFD0 0C227E74 */ jal func_8089F9D0 -/* 00724 8089FFD4 00052C03 */ sra $a1, $a1, 16 -/* 00728 8089FFD8 1000005F */ beq $zero, $zero, .L808A0158 -/* 0072C 8089FFDC C6000154 */ lwc1 $f0, 0x0154($s0) ## 00000154 -glabel L8089FFE0 -/* 00730 8089FFE0 8E05015C */ lw $a1, 0x015C($s0) ## 0000015C -/* 00734 8089FFE4 AFA70034 */ sw $a3, 0x0034($sp) -/* 00738 8089FFE8 0C00B2D0 */ jal Flags_GetSwitch - -/* 0073C 8089FFEC 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00740 8089FFF0 10400007 */ beq $v0, $zero, .L808A0010 -/* 00744 8089FFF4 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 00748 8089FFF8 3C0142AA */ lui $at, 0x42AA ## $at = 42AA0000 -/* 0074C 8089FFFC 44813000 */ mtc1 $at, $f6 ## $f6 = 85.00 -/* 00750 808A0000 C6040158 */ lwc1 $f4, 0x0158($s0) ## 00000158 -/* 00754 808A0004 46062200 */ add.s $f8, $f4, $f6 -/* 00758 808A0008 10000003 */ beq $zero, $zero, .L808A0018 -/* 0075C 808A000C E6080154 */ swc1 $f8, 0x0154($s0) ## 00000154 -.L808A0010: -/* 00760 808A0010 C60A0158 */ lwc1 $f10, 0x0158($s0) ## 00000158 -/* 00764 808A0014 E60A0154 */ swc1 $f10, 0x0154($s0) ## 00000154 -.L808A0018: -/* 00768 808A0018 8E050154 */ lw $a1, 0x0154($s0) ## 00000154 -/* 0076C 808A001C 0C01DE80 */ jal Math_ApproxF - -/* 00770 808A0020 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00774 808A0024 10400007 */ beq $v0, $zero, .L808A0044 -/* 00778 808A0028 8FB80034 */ lw $t8, 0x0034($sp) -/* 0077C 808A002C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00780 808A0030 00380821 */ addu $at, $at, $t8 -/* 00784 808A0034 3C19808A */ lui $t9, %hi(func_8089FCF8) ## $t9 = 808A0000 -/* 00788 808A0038 A4201D30 */ sh $zero, 0x1D30($at) ## 00011D30 -/* 0078C 808A003C 2739FCF8 */ addiu $t9, $t9, %lo(func_8089FCF8) ## $t9 = 8089FCF8 -/* 00790 808A0040 AE19014C */ sw $t9, 0x014C($s0) ## 0000014C -.L808A0044: -/* 00794 808A0044 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 00798 808A0048 8FAA0020 */ lw $t2, 0x0020($sp) -/* 0079C 808A004C 4600848D */ trunc.w.s $f18, $f16 -/* 007A0 808A0050 44099000 */ mfc1 $t1, $f18 -/* 007A4 808A0054 1000003F */ beq $zero, $zero, .L808A0154 -/* 007A8 808A0058 A5490062 */ sh $t1, 0x0062($t2) ## 00000062 -glabel L808A005C -/* 007AC 808A005C 8E05015C */ lw $a1, 0x015C($s0) ## 0000015C -/* 007B0 808A0060 AFA70034 */ sw $a3, 0x0034($sp) -/* 007B4 808A0064 0C00B2D0 */ jal Flags_GetSwitch - -/* 007B8 808A0068 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 007BC 808A006C 10400007 */ beq $v0, $zero, .L808A008C -/* 007C0 808A0070 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 007C4 808A0074 3C0142DC */ lui $at, 0x42DC ## $at = 42DC0000 -/* 007C8 808A0078 44813000 */ mtc1 $at, $f6 ## $f6 = 110.00 -/* 007CC 808A007C C6040158 */ lwc1 $f4, 0x0158($s0) ## 00000158 -/* 007D0 808A0080 46062200 */ add.s $f8, $f4, $f6 -/* 007D4 808A0084 10000003 */ beq $zero, $zero, .L808A0094 -/* 007D8 808A0088 E6080154 */ swc1 $f8, 0x0154($s0) ## 00000154 -.L808A008C: -/* 007DC 808A008C C60A0158 */ lwc1 $f10, 0x0158($s0) ## 00000158 -/* 007E0 808A0090 E60A0154 */ swc1 $f10, 0x0154($s0) ## 00000154 -.L808A0094: -/* 007E4 808A0094 8E050154 */ lw $a1, 0x0154($s0) ## 00000154 -/* 007E8 808A0098 0C01DE80 */ jal Math_ApproxF - -/* 007EC 808A009C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 007F0 808A00A0 10400007 */ beq $v0, $zero, .L808A00C0 -/* 007F4 808A00A4 8FAB0034 */ lw $t3, 0x0034($sp) -/* 007F8 808A00A8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 007FC 808A00AC 002B0821 */ addu $at, $at, $t3 -/* 00800 808A00B0 3C0C808A */ lui $t4, %hi(func_8089FCF8) ## $t4 = 808A0000 -/* 00804 808A00B4 A4201D30 */ sh $zero, 0x1D30($at) ## 00011D30 -/* 00808 808A00B8 258CFCF8 */ addiu $t4, $t4, %lo(func_8089FCF8) ## $t4 = 8089FCF8 -/* 0080C 808A00BC AE0C014C */ sw $t4, 0x014C($s0) ## 0000014C -.L808A00C0: -/* 00810 808A00C0 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 00814 808A00C4 8FAF0020 */ lw $t7, 0x0020($sp) -/* 00818 808A00C8 4600848D */ trunc.w.s $f18, $f16 -/* 0081C 808A00CC 440E9000 */ mfc1 $t6, $f18 -/* 00820 808A00D0 10000020 */ beq $zero, $zero, .L808A0154 -/* 00824 808A00D4 A5EE0082 */ sh $t6, 0x0082($t7) ## 00000082 -glabel L808A00D8 -/* 00828 808A00D8 8E05015C */ lw $a1, 0x015C($s0) ## 0000015C -/* 0082C 808A00DC AFA70034 */ sw $a3, 0x0034($sp) -/* 00830 808A00E0 0C00B2D0 */ jal Flags_GetSwitch - -/* 00834 808A00E4 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00838 808A00E8 10400007 */ beq $v0, $zero, .L808A0108 -/* 0083C 808A00EC 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 00840 808A00F0 3C014320 */ lui $at, 0x4320 ## $at = 43200000 -/* 00844 808A00F4 44813000 */ mtc1 $at, $f6 ## $f6 = 160.00 -/* 00848 808A00F8 C6040158 */ lwc1 $f4, 0x0158($s0) ## 00000158 -/* 0084C 808A00FC 46062200 */ add.s $f8, $f4, $f6 -/* 00850 808A0100 10000003 */ beq $zero, $zero, .L808A0110 -/* 00854 808A0104 E6080154 */ swc1 $f8, 0x0154($s0) ## 00000154 -.L808A0108: -/* 00858 808A0108 C60A0158 */ lwc1 $f10, 0x0158($s0) ## 00000158 -/* 0085C 808A010C E60A0154 */ swc1 $f10, 0x0154($s0) ## 00000154 -.L808A0110: -/* 00860 808A0110 8E050154 */ lw $a1, 0x0154($s0) ## 00000154 -/* 00864 808A0114 0C01DE80 */ jal Math_ApproxF - -/* 00868 808A0118 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0086C 808A011C 10400007 */ beq $v0, $zero, .L808A013C -/* 00870 808A0120 8FB80034 */ lw $t8, 0x0034($sp) -/* 00874 808A0124 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00878 808A0128 00380821 */ addu $at, $at, $t8 -/* 0087C 808A012C 3C19808A */ lui $t9, %hi(func_8089FCF8) ## $t9 = 808A0000 -/* 00880 808A0130 A4201D30 */ sh $zero, 0x1D30($at) ## 00011D30 -/* 00884 808A0134 2739FCF8 */ addiu $t9, $t9, %lo(func_8089FCF8) ## $t9 = 8089FCF8 -/* 00888 808A0138 AE19014C */ sw $t9, 0x014C($s0) ## 0000014C -.L808A013C: -/* 0088C 808A013C C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 00890 808A0140 8FAA0020 */ lw $t2, 0x0020($sp) -/* 00894 808A0144 4600848D */ trunc.w.s $f18, $f16 -/* 00898 808A0148 44099000 */ mfc1 $t1, $f18 -/* 0089C 808A014C 00000000 */ nop -/* 008A0 808A0150 A5490102 */ sh $t1, 0x0102($t2) ## 00000102 -glabel L808A0154 -.L808A0154: -/* 008A4 808A0154 C6000154 */ lwc1 $f0, 0x0154($s0) ## 00000154 -.L808A0158: -/* 008A8 808A0158 C6020028 */ lwc1 $f2, 0x0028($s0) ## 00000028 -/* 008AC 808A015C 24050078 */ addiu $a1, $zero, 0x0078 ## $a1 = 00000078 -/* 008B0 808A0160 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 008B4 808A0164 4602003C */ c.lt.s $f0, $f2 -/* 008B8 808A0168 00000000 */ nop -/* 008BC 808A016C 4502000A */ bc1fl .L808A0198 -/* 008C0 808A0170 4600103C */ c.lt.s $f2, $f0 -/* 008C4 808A0174 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 008C8 808A0178 0C02A800 */ jal func_800AA000 -/* 008CC 808A017C 2407000A */ addiu $a3, $zero, 0x000A ## $a3 = 0000000A -/* 008D0 808A0180 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 008D4 808A0184 0C00BE52 */ jal func_8002F948 -/* 008D8 808A0188 2405205E */ addiu $a1, $zero, 0x205E ## $a1 = 0000205E -/* 008DC 808A018C 1000000D */ beq $zero, $zero, .L808A01C4 -/* 008E0 808A0190 8FBF001C */ lw $ra, 0x001C($sp) -/* 008E4 808A0194 4600103C */ c.lt.s $f2, $f0 -.L808A0198: -/* 008E8 808A0198 24050078 */ addiu $a1, $zero, 0x0078 ## $a1 = 00000078 -/* 008EC 808A019C 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 008F0 808A01A0 45020008 */ bc1fl .L808A01C4 -/* 008F4 808A01A4 8FBF001C */ lw $ra, 0x001C($sp) -/* 008F8 808A01A8 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 008FC 808A01AC 0C02A800 */ jal func_800AA000 -/* 00900 808A01B0 2407000A */ addiu $a3, $zero, 0x000A ## $a3 = 0000000A -/* 00904 808A01B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00908 808A01B8 0C00BE52 */ jal func_8002F948 -/* 0090C 808A01BC 2405205E */ addiu $a1, $zero, 0x205E ## $a1 = 0000205E -/* 00910 808A01C0 8FBF001C */ lw $ra, 0x001C($sp) -.L808A01C4: -/* 00914 808A01C4 8FB00018 */ lw $s0, 0x0018($sp) -/* 00918 808A01C8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0091C 808A01CC 03E00008 */ jr $ra -/* 00920 808A01D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/BgMoriBigst_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/BgMoriBigst_Destroy.s deleted file mode 100644 index 561f4c9043..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/BgMoriBigst_Destroy.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel BgMoriBigst_Destroy -/* 001EC 808A0DAC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 001F0 808A0DB0 AFA40018 */ sw $a0, 0x0018($sp) -/* 001F4 808A0DB4 8FAE0018 */ lw $t6, 0x0018($sp) -/* 001F8 808A0DB8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 001FC 808A0DBC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00200 808A0DC0 24A50810 */ addiu $a1, $a1, 0x0810 ## $a1 = 00000810 -/* 00204 808A0DC4 0C00FB56 */ jal DynaPolyInfo_Free - ## DynaPolyInfo_delReserve -/* 00208 808A0DC8 8DC6014C */ lw $a2, 0x014C($t6) ## 0000014C -/* 0020C 808A0DCC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00210 808A0DD0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00214 808A0DD4 03E00008 */ jr $ra -/* 00218 808A0DD8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/BgMoriBigst_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/BgMoriBigst_Init.s deleted file mode 100644 index de63b63e8c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/BgMoriBigst_Init.s +++ /dev/null @@ -1,121 +0,0 @@ -.rdata -glabel D_808A1558 - .asciz "mori (bigST.鍵型天井)(arg : %04x)(sw %d)(noE %d)(roomC %d)(playerPosY %f)\n" - .balign 4 - -glabel D_808A15A4 - .asciz "【ビッグスタルフォス鍵型天井】 バンク危険！\n" - .balign 4 - -glabel D_808A15D4 - .asciz "%s %d\n" - .balign 4 - -glabel D_808A15DC - .asciz "../z_bg_mori_bigst.c" - .balign 4 - -.text -glabel BgMoriBigst_Init -/* 00090 808A0C50 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 00094 808A0C54 AFB00024 */ sw $s0, 0x0024($sp) -/* 00098 808A0C58 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0009C 808A0C5C AFB10028 */ sw $s1, 0x0028($sp) -/* 000A0 808A0C60 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 000A4 808A0C64 AFBF002C */ sw $ra, 0x002C($sp) -/* 000A8 808A0C68 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 000AC 808A0C6C 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 000B0 808A0C70 00052A03 */ sra $a1, $a1, 8 -/* 000B4 808A0C74 0C00B2D0 */ jal Flags_GetSwitch - -/* 000B8 808A0C78 30A5003F */ andi $a1, $a1, 0x003F ## $a1 = 00000000 -/* 000BC 808A0C7C AFA20034 */ sw $v0, 0x0034($sp) -/* 000C0 808A0C80 82050003 */ lb $a1, 0x0003($s0) ## 00000003 -/* 000C4 808A0C84 0C00B349 */ jal Flags_GetTempClear - -/* 000C8 808A0C88 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000CC 808A0C8C AFA20038 */ sw $v0, 0x0038($sp) -/* 000D0 808A0C90 82050003 */ lb $a1, 0x0003($s0) ## 00000003 -/* 000D4 808A0C94 0C00B337 */ jal Flags_GetClear - -/* 000D8 808A0C98 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000DC 808A0C9C 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 000E0 808A0CA0 AFA20010 */ sw $v0, 0x0010($sp) -/* 000E4 808A0CA4 8E2E1C44 */ lw $t6, 0x1C44($s1) ## 00001C44 -/* 000E8 808A0CA8 3C04808A */ lui $a0, %hi(D_808A1558) ## $a0 = 808A0000 -/* 000EC 808A0CAC 24841558 */ addiu $a0, $a0, %lo(D_808A1558) ## $a0 = 808A1558 -/* 000F0 808A0CB0 C5C40028 */ lwc1 $f4, 0x0028($t6) ## 00000028 -/* 000F4 808A0CB4 8FA60034 */ lw $a2, 0x0034($sp) -/* 000F8 808A0CB8 8FA70038 */ lw $a3, 0x0038($sp) -/* 000FC 808A0CBC 460021A1 */ cvt.d.s $f6, $f4 -/* 00100 808A0CC0 0C00084C */ jal osSyncPrintf - -/* 00104 808A0CC4 F7A60018 */ sdc1 $f6, 0x0018($sp) -/* 00108 808A0CC8 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 0010C 808A0CCC 24C6221C */ addiu $a2, $a2, 0x221C ## $a2 = 0600221C -/* 00110 808A0CD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00114 808A0CD4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00118 808A0CD8 0C2282F2 */ jal func_808A0BC8 -/* 0011C 808A0CDC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00120 808A0CE0 3C05808A */ lui $a1, %hi(D_808A14E0) ## $a1 = 808A0000 -/* 00124 808A0CE4 24A514E0 */ addiu $a1, $a1, %lo(D_808A14E0) ## $a1 = 808A14E0 -/* 00128 808A0CE8 0C01E037 */ jal Actor_ProcessInitChain - -/* 0012C 808A0CEC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00130 808A0CF0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00134 808A0CF4 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 00138 808A0CF8 02212021 */ addu $a0, $s1, $at -/* 0013C 808A0CFC 0C02604B */ jal Object_GetIndex - ## ObjectIndex -/* 00140 808A0D00 24050073 */ addiu $a1, $zero, 0x0073 ## $a1 = 00000073 -/* 00144 808A0D04 A202016A */ sb $v0, 0x016A($s0) ## 0000016A -/* 00148 808A0D08 820F016A */ lb $t7, 0x016A($s0) ## 0000016A -/* 0014C 808A0D0C 3C04808A */ lui $a0, %hi(D_808A15A4) ## $a0 = 808A0000 -/* 00150 808A0D10 05E3000E */ bgezl $t7, .L808A0D4C -/* 00154 808A0D14 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 00158 808A0D18 0C00084C */ jal osSyncPrintf - -/* 0015C 808A0D1C 248415A4 */ addiu $a0, $a0, %lo(D_808A15A4) ## $a0 = 808A15A4 -/* 00160 808A0D20 3C04808A */ lui $a0, %hi(D_808A15D4) ## $a0 = 808A0000 -/* 00164 808A0D24 3C05808A */ lui $a1, %hi(D_808A15DC) ## $a1 = 808A0000 -/* 00168 808A0D28 24A515DC */ addiu $a1, $a1, %lo(D_808A15DC) ## $a1 = 808A15DC -/* 0016C 808A0D2C 248415D4 */ addiu $a0, $a0, %lo(D_808A15D4) ## $a0 = 808A15D4 -/* 00170 808A0D30 0C00084C */ jal osSyncPrintf - -/* 00174 808A0D34 240600EA */ addiu $a2, $zero, 0x00EA ## $a2 = 000000EA -/* 00178 808A0D38 0C00B55C */ jal Actor_Kill - -/* 0017C 808A0D3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00180 808A0D40 10000016 */ beq $zero, $zero, .L808A0D9C -/* 00184 808A0D44 8FBF002C */ lw $ra, 0x002C($sp) -/* 00188 808A0D48 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -.L808A0D4C: -/* 0018C 808A0D4C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00190 808A0D50 00052A03 */ sra $a1, $a1, 8 -/* 00194 808A0D54 0C00B2D0 */ jal Flags_GetSwitch - -/* 00198 808A0D58 30A5003F */ andi $a1, $a1, 0x003F ## $a1 = 00000000 -/* 0019C 808A0D5C 10400004 */ beq $v0, $zero, .L808A0D70 -/* 001A0 808A0D60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 001A4 808A0D64 C608000C */ lwc1 $f8, 0x000C($s0) ## 0000000C -/* 001A8 808A0D68 10000006 */ beq $zero, $zero, .L808A0D84 -/* 001AC 808A0D6C E6080028 */ swc1 $f8, 0x0028($s0) ## 00000028 -.L808A0D70: -/* 001B0 808A0D70 3C014387 */ lui $at, 0x4387 ## $at = 43870000 -/* 001B4 808A0D74 44818000 */ mtc1 $at, $f16 ## $f16 = 270.00 -/* 001B8 808A0D78 C60A000C */ lwc1 $f10, 0x000C($s0) ## 0000000C -/* 001BC 808A0D7C 46105480 */ add.s $f18, $f10, $f16 -/* 001C0 808A0D80 E6120028 */ swc1 $f18, 0x0028($s0) ## 00000028 -.L808A0D84: -/* 001C4 808A0D84 0C00B56E */ jal Actor_SetHeight - -/* 001C8 808A0D88 3C054248 */ lui $a1, 0x4248 ## $a1 = 42480000 -/* 001CC 808A0D8C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 001D0 808A0D90 0C228377 */ jal func_808A0DDC -/* 001D4 808A0D94 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 001D8 808A0D98 8FBF002C */ lw $ra, 0x002C($sp) -.L808A0D9C: -/* 001DC 808A0D9C 8FB00024 */ lw $s0, 0x0024($sp) -/* 001E0 808A0DA0 8FB10028 */ lw $s1, 0x0028($sp) -/* 001E4 808A0DA4 03E00008 */ jr $ra -/* 001E8 808A0DA8 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/BgMoriBigst_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/BgMoriBigst_Update.s deleted file mode 100644 index 2a99fafaa5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/BgMoriBigst_Update.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel BgMoriBigst_Update -/* 00784 808A1344 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00788 808A1348 AFBF001C */ sw $ra, 0x001C($sp) -/* 0078C 808A134C AFB00018 */ sw $s0, 0x0018($sp) -/* 00790 808A1350 AFA50024 */ sw $a1, 0x0024($sp) -/* 00794 808A1354 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00798 808A1358 0C00B56E */ jal Actor_SetHeight - -/* 0079C 808A135C 3C054248 */ lui $a1, 0x4248 ## $a1 = 42480000 -/* 007A0 808A1360 86020168 */ lh $v0, 0x0168($s0) ## 00000168 -/* 007A4 808A1364 18400002 */ blez $v0, .L808A1370 -/* 007A8 808A1368 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 007AC 808A136C A60E0168 */ sh $t6, 0x0168($s0) ## 00000168 -.L808A1370: -/* 007B0 808A1370 0C010D64 */ jal func_80043590 -/* 007B4 808A1374 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 007B8 808A1378 10400003 */ beq $v0, $zero, .L808A1388 -/* 007BC 808A137C 8FA40024 */ lw $a0, 0x0024($sp) -/* 007C0 808A1380 0C01D33A */ jal func_80074CE8 -/* 007C4 808A1384 24050006 */ addiu $a1, $zero, 0x0006 ## $a1 = 00000006 -.L808A1388: -/* 007C8 808A1388 8E020164 */ lw $v0, 0x0164($s0) ## 00000164 -/* 007CC 808A138C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 007D0 808A1390 50400004 */ beql $v0, $zero, .L808A13A4 -/* 007D4 808A1394 8FBF001C */ lw $ra, 0x001C($sp) -/* 007D8 808A1398 0040F809 */ jalr $ra, $v0 -/* 007DC 808A139C 8FA50024 */ lw $a1, 0x0024($sp) -/* 007E0 808A13A0 8FBF001C */ lw $ra, 0x001C($sp) -.L808A13A4: -/* 007E4 808A13A4 8FB00018 */ lw $s0, 0x0018($sp) -/* 007E8 808A13A8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 007EC 808A13AC 03E00008 */ jr $ra -/* 007F0 808A13B0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0BC0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0BC0.s deleted file mode 100644 index 0eab171c04..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0BC0.s +++ /dev/null @@ -1,3 +0,0 @@ -glabel func_808A0BC0 -/* 00000 808A0BC0 03E00008 */ jr $ra -/* 00004 808A0BC4 AC850164 */ sw $a1, 0x0164($a0) ## 00000164 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0BC8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0BC8.s deleted file mode 100644 index 838517e0fc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0BC8.s +++ /dev/null @@ -1,50 +0,0 @@ -.rdata -glabel D_808A1500 - .asciz "Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_808A1540 - .asciz "../z_bg_mori_bigst.c" - .balign 4 - -.text -glabel func_808A0BC8 -/* 00008 808A0BC8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0000C 808A0BCC AFBF0024 */ sw $ra, 0x0024($sp) -/* 00010 808A0BD0 AFB00020 */ sw $s0, 0x0020($sp) -/* 00014 808A0BD4 AFA5003C */ sw $a1, 0x003C($sp) -/* 00018 808A0BD8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0001C 808A0BDC AFA60040 */ sw $a2, 0x0040($sp) -/* 00020 808A0BE0 AFA00030 */ sw $zero, 0x0030($sp) -/* 00024 808A0BE4 0C010D20 */ jal DynaPolyInfo_SetActorMove - -/* 00028 808A0BE8 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 0002C 808A0BEC 8FA40040 */ lw $a0, 0x0040($sp) -/* 00030 808A0BF0 0C010620 */ jal DynaPolyInfo_Alloc - -/* 00034 808A0BF4 27A50030 */ addiu $a1, $sp, 0x0030 ## $a1 = FFFFFFF8 -/* 00038 808A0BF8 8FA4003C */ lw $a0, 0x003C($sp) -/* 0003C 808A0BFC 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00040 808A0C00 8FA70030 */ lw $a3, 0x0030($sp) -/* 00044 808A0C04 0C00FA9D */ jal DynaPolyInfo_RegisterActor - ## DynaPolyInfo_setActor -/* 00048 808A0C08 24850810 */ addiu $a1, $a0, 0x0810 ## $a1 = 00000810 -/* 0004C 808A0C0C 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 00050 808A0C10 1441000A */ bne $v0, $at, .L808A0C3C -/* 00054 808A0C14 AE02014C */ sw $v0, 0x014C($s0) ## 0000014C -/* 00058 808A0C18 860E001C */ lh $t6, 0x001C($s0) ## 0000001C -/* 0005C 808A0C1C 3C04808A */ lui $a0, %hi(D_808A1500) ## $a0 = 808A0000 -/* 00060 808A0C20 3C05808A */ lui $a1, %hi(D_808A1540) ## $a1 = 808A0000 -/* 00064 808A0C24 86070000 */ lh $a3, 0x0000($s0) ## 00000000 -/* 00068 808A0C28 24A51540 */ addiu $a1, $a1, %lo(D_808A1540) ## $a1 = 808A1540 -/* 0006C 808A0C2C 24841500 */ addiu $a0, $a0, %lo(D_808A1500) ## $a0 = 808A1500 -/* 00070 808A0C30 240600BE */ addiu $a2, $zero, 0x00BE ## $a2 = 000000BE -/* 00074 808A0C34 0C00084C */ jal osSyncPrintf - -/* 00078 808A0C38 AFAE0010 */ sw $t6, 0x0010($sp) -.L808A0C3C: -/* 0007C 808A0C3C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00080 808A0C40 8FB00020 */ lw $s0, 0x0020($sp) -/* 00084 808A0C44 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00088 808A0C48 03E00008 */ jr $ra -/* 0008C 808A0C4C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0DDC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0DDC.s deleted file mode 100644 index 97a686b130..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0DDC.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_808A0DDC -/* 0021C 808A0DDC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00220 808A0DE0 AFA5001C */ sw $a1, 0x001C($sp) -/* 00224 808A0DE4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00228 808A0DE8 3C05808A */ lui $a1, %hi(func_808A0E04) ## $a1 = 808A0000 -/* 0022C 808A0DEC 0C2282F0 */ jal func_808A0BC0 -/* 00230 808A0DF0 24A50E04 */ addiu $a1, $a1, %lo(func_808A0E04) ## $a1 = 808A0E04 -/* 00234 808A0DF4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00238 808A0DF8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0023C 808A0DFC 03E00008 */ jr $ra -/* 00240 808A0E00 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0E04.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0E04.s deleted file mode 100644 index ba0ddf92fb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0E04.s +++ /dev/null @@ -1,59 +0,0 @@ -glabel func_808A0E04 -/* 00244 808A0E04 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00248 808A0E08 AFB00014 */ sw $s0, 0x0014($sp) -/* 0024C 808A0E0C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00250 808A0E10 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00254 808A0E14 AFB10018 */ sw $s1, 0x0018($sp) -/* 00258 808A0E18 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 0025C 808A0E1C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00260 808A0E20 AFBF001C */ sw $ra, 0x001C($sp) -/* 00264 808A0E24 00A12021 */ addu $a0, $a1, $at -/* 00268 808A0E28 0C026062 */ jal Object_IsLoaded - -/* 0026C 808A0E2C 8205016A */ lb $a1, 0x016A($s0) ## 0000016A -/* 00270 808A0E30 10400022 */ beq $v0, $zero, .L808A0EBC -/* 00274 808A0E34 3C0E808A */ lui $t6, %hi(func_808A13B4) ## $t6 = 808A0000 -/* 00278 808A0E38 25CE13B4 */ addiu $t6, $t6, %lo(func_808A13B4) ## $t6 = 808A13B4 -/* 0027C 808A0E3C AE0E0134 */ sw $t6, 0x0134($s0) ## 00000134 -/* 00280 808A0E40 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00284 808A0E44 0C00B337 */ jal Flags_GetClear - -/* 00288 808A0E48 82050003 */ lb $a1, 0x0003($s0) ## 00000003 -/* 0028C 808A0E4C 10400019 */ beq $v0, $zero, .L808A0EB4 -/* 00290 808A0E50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00294 808A0E54 8E2F1C44 */ lw $t7, 0x1C44($s1) ## 00001C44 -/* 00298 808A0E58 3C01442F */ lui $at, 0x442F ## $at = 442F0000 -/* 0029C 808A0E5C 44812000 */ mtc1 $at, $f4 ## $f4 = 700.00 -/* 002A0 808A0E60 C5E60028 */ lwc1 $f6, 0x0028($t7) ## 00000028 -/* 002A4 808A0E64 4606203C */ c.lt.s $f4, $f6 -/* 002A8 808A0E68 00000000 */ nop -/* 002AC 808A0E6C 45000011 */ bc1f .L808A0EB4 -/* 002B0 808A0E70 00000000 */ nop -/* 002B4 808A0E74 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 002B8 808A0E78 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 002BC 808A0E7C 00052A03 */ sra $a1, $a1, 8 -/* 002C0 808A0E80 0C00B2D0 */ jal Flags_GetSwitch - -/* 002C4 808A0E84 30A5003F */ andi $a1, $a1, 0x003F ## $a1 = 00000000 -/* 002C8 808A0E88 10400006 */ beq $v0, $zero, .L808A0EA4 -/* 002CC 808A0E8C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 002D0 808A0E90 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 002D4 808A0E94 0C2284C8 */ jal func_808A1320 -/* 002D8 808A0E98 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 002DC 808A0E9C 10000008 */ beq $zero, $zero, .L808A0EC0 -/* 002E0 808A0EA0 8FBF001C */ lw $ra, 0x001C($sp) -.L808A0EA4: -/* 002E4 808A0EA4 0C2283BD */ jal func_808A0EF4 -/* 002E8 808A0EA8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 002EC 808A0EAC 10000004 */ beq $zero, $zero, .L808A0EC0 -/* 002F0 808A0EB0 8FBF001C */ lw $ra, 0x001C($sp) -.L808A0EB4: -/* 002F4 808A0EB4 0C2283B4 */ jal func_808A0ED0 -/* 002F8 808A0EB8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -.L808A0EBC: -/* 002FC 808A0EBC 8FBF001C */ lw $ra, 0x001C($sp) -.L808A0EC0: -/* 00300 808A0EC0 8FB00014 */ lw $s0, 0x0014($sp) -/* 00304 808A0EC4 8FB10018 */ lw $s1, 0x0018($sp) -/* 00308 808A0EC8 03E00008 */ jr $ra -/* 0030C 808A0ECC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0ED0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0ED0.s deleted file mode 100644 index bac7a6edf1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0ED0.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_808A0ED0 -/* 00310 808A0ED0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00314 808A0ED4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00318 808A0ED8 AFA5001C */ sw $a1, 0x001C($sp) -/* 0031C 808A0EDC 0C2282F0 */ jal func_808A0BC0 -/* 00320 808A0EE0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00324 808A0EE4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00328 808A0EE8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0032C 808A0EEC 03E00008 */ jr $ra -/* 00330 808A0EF0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0EF4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0EF4.s deleted file mode 100644 index 731671d44a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0EF4.s +++ /dev/null @@ -1,66 +0,0 @@ -.rdata -glabel D_808A15F4 - .asciz "Warning : 第２スタルフォス発生失敗\n" - .balign 4 - -.late_rodata -glabel D_808A16B0 - .float 827.0 -glabel D_808A16B4 - .float -3320.0 - -.text -glabel func_808A0EF4 -/* 00334 808A0EF4 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00338 808A0EF8 AFA50044 */ sw $a1, 0x0044($sp) -/* 0033C 808A0EFC AFBF003C */ sw $ra, 0x003C($sp) -/* 00340 808A0F00 AFB00038 */ sw $s0, 0x0038($sp) -/* 00344 808A0F04 3C05808A */ lui $a1, %hi(func_808A0FB0) ## $a1 = 808A0000 -/* 00348 808A0F08 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0034C 808A0F0C 0C2282F0 */ jal func_808A0BC0 -/* 00350 808A0F10 24A50FB0 */ addiu $a1, $a1, %lo(func_808A0FB0) ## $a1 = 808A0FB0 -/* 00354 808A0F14 8FA40044 */ lw $a0, 0x0044($sp) -/* 00358 808A0F18 0C00B342 */ jal Flags_UnsetClear - -/* 0035C 808A0F1C 82050003 */ lb $a1, 0x0003($s0) ## 00000003 -/* 00360 808A0F20 3C014351 */ lui $at, 0x4351 ## $at = 43510000 -/* 00364 808A0F24 44812000 */ mtc1 $at, $f4 ## $f4 = 209.00 -/* 00368 808A0F28 3C01808A */ lui $at, %hi(D_808A16B0) ## $at = 808A0000 -/* 0036C 808A0F2C C42616B0 */ lwc1 $f6, %lo(D_808A16B0)($at) -/* 00370 808A0F30 3C01808A */ lui $at, %hi(D_808A16B4) ## $at = 808A0000 -/* 00374 808A0F34 8FA60044 */ lw $a2, 0x0044($sp) -/* 00378 808A0F38 C42816B4 */ lwc1 $f8, %lo(D_808A16B4)($at) -/* 0037C 808A0F3C 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 00380 808A0F40 AFAE0028 */ sw $t6, 0x0028($sp) -/* 00384 808A0F44 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00388 808A0F48 24070002 */ addiu $a3, $zero, 0x0002 ## $a3 = 00000002 -/* 0038C 808A0F4C AFA0001C */ sw $zero, 0x001C($sp) -/* 00390 808A0F50 AFA00020 */ sw $zero, 0x0020($sp) -/* 00394 808A0F54 AFA00024 */ sw $zero, 0x0024($sp) -/* 00398 808A0F58 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 0039C 808A0F5C E7A60014 */ swc1 $f6, 0x0014($sp) -/* 003A0 808A0F60 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 003A4 808A0F64 0C00C916 */ jal Actor_SpawnAsChild - -/* 003A8 808A0F68 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 003AC 808A0F6C 10400006 */ beq $v0, $zero, .L808A0F88 -/* 003B0 808A0F70 3C04808A */ lui $a0, %hi(D_808A15F4) ## $a0 = 808A0000 -/* 003B4 808A0F74 860F0018 */ lh $t7, 0x0018($s0) ## 00000018 -/* 003B8 808A0F78 AE00011C */ sw $zero, 0x011C($s0) ## 0000011C -/* 003BC 808A0F7C 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 003C0 808A0F80 10000003 */ beq $zero, $zero, .L808A0F90 -/* 003C4 808A0F84 A6180018 */ sh $t8, 0x0018($s0) ## 00000018 -.L808A0F88: -/* 003C8 808A0F88 0C00084C */ jal osSyncPrintf - -/* 003CC 808A0F8C 248415F4 */ addiu $a0, $a0, %lo(D_808A15F4) ## $a0 = 808A15F4 -.L808A0F90: -/* 003D0 808A0F90 8FA40044 */ lw $a0, 0x0044($sp) -/* 003D4 808A0F94 0C00B33C */ jal Flags_SetClear - -/* 003D8 808A0F98 82050003 */ lb $a1, 0x0003($s0) ## 00000003 -/* 003DC 808A0F9C 8FBF003C */ lw $ra, 0x003C($sp) -/* 003E0 808A0FA0 8FB00038 */ lw $s0, 0x0038($sp) -/* 003E4 808A0FA4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 003E8 808A0FA8 03E00008 */ jr $ra -/* 003EC 808A0FAC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0FB0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0FB0.s deleted file mode 100644 index 3d67cbd4fe..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0FB0.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_808A0FB0 -/* 003F0 808A0FB0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 003F4 808A0FB4 AFBF001C */ sw $ra, 0x001C($sp) -/* 003F8 808A0FB8 848E0018 */ lh $t6, 0x0018($a0) ## 00000018 -/* 003FC 808A0FBC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00400 808A0FC0 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 00404 808A0FC4 55C00014 */ bnel $t6, $zero, .L808A1018 -/* 00408 808A0FC8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0040C 808A0FCC C486000C */ lwc1 $f6, 0x000C($a0) ## 0000000C -/* 00410 808A0FD0 44814000 */ mtc1 $at, $f8 ## $f8 = 5.00 -/* 00414 808A0FD4 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 00418 808A0FD8 46083281 */ sub.s $f10, $f6, $f8 -/* 0041C 808A0FDC C5E40028 */ lwc1 $f4, 0x0028($t7) ## 00000028 -/* 00420 808A0FE0 4604503E */ c.le.s $f10, $f4 -/* 00424 808A0FE4 00000000 */ nop -/* 00428 808A0FE8 4502000B */ bc1fl .L808A1018 -/* 0042C 808A0FEC 8FBF001C */ lw $ra, 0x001C($sp) -/* 00430 808A0FF0 AFA50024 */ sw $a1, 0x0024($sp) -/* 00434 808A0FF4 0C228409 */ jal func_808A1024 -/* 00438 808A0FF8 AFA70020 */ sw $a3, 0x0020($sp) -/* 0043C 808A0FFC 8FA70020 */ lw $a3, 0x0020($sp) -/* 00440 808A1000 8FA40024 */ lw $a0, 0x0024($sp) -/* 00444 808A1004 24050C94 */ addiu $a1, $zero, 0x0C94 ## $a1 = 00000C94 -/* 00448 808A1008 24060048 */ addiu $a2, $zero, 0x0048 ## $a2 = 00000048 -/* 0044C 808A100C 0C02003E */ jal func_800800F8 -/* 00450 808A1010 AFA00010 */ sw $zero, 0x0010($sp) -/* 00454 808A1014 8FBF001C */ lw $ra, 0x001C($sp) -.L808A1018: -/* 00458 808A1018 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0045C 808A101C 03E00008 */ jr $ra -/* 00460 808A1020 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A1024.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A1024.s deleted file mode 100644 index 76ea164644..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A1024.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_808A1024 -/* 00464 808A1024 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00468 808A1028 AFA5001C */ sw $a1, 0x001C($sp) -/* 0046C 808A102C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00470 808A1030 3C05808A */ lui $a1, %hi(func_808A104C) ## $a1 = 808A0000 -/* 00474 808A1034 0C2282F0 */ jal func_808A0BC0 -/* 00478 808A1038 24A5104C */ addiu $a1, $a1, %lo(func_808A104C) ## $a1 = 808A104C -/* 0047C 808A103C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00480 808A1040 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00484 808A1044 03E00008 */ jr $ra -/* 00488 808A1048 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A104C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A104C.s deleted file mode 100644 index 250783a51c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A104C.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_808A104C -/* 0048C 808A104C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00490 808A1050 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00494 808A1054 AFB00020 */ sw $s0, 0x0020($sp) -/* 00498 808A1058 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0049C 808A105C 0C00B638 */ jal Actor_MoveForward - -/* 004A0 808A1060 AFA5002C */ sw $a1, 0x002C($sp) -/* 004A4 808A1064 C600000C */ lwc1 $f0, 0x000C($s0) ## 0000000C -/* 004A8 808A1068 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 004AC 808A106C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 004B0 808A1070 4600203E */ c.le.s $f4, $f0 -/* 004B4 808A1074 00000000 */ nop -/* 004B8 808A1078 45020012 */ bc1fl .L808A10C4 -/* 004BC 808A107C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 004C0 808A1080 E6000028 */ swc1 $f0, 0x0028($s0) ## 00000028 -/* 004C4 808A1084 0C228435 */ jal func_808A10D4 -/* 004C8 808A1088 8FA5002C */ lw $a1, 0x002C($sp) -/* 004CC 808A108C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 004D0 808A1090 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 004D4 808A1094 2405281D */ addiu $a1, $zero, 0x281D ## $a1 = 0000281D -/* 004D8 808A1098 8FA4002C */ lw $a0, 0x002C($sp) -/* 004DC 808A109C 240503FC */ addiu $a1, $zero, 0x03FC ## $a1 = 000003FC -/* 004E0 808A10A0 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 004E4 808A10A4 02003825 */ or $a3, $s0, $zero ## $a3 = 00000000 -/* 004E8 808A10A8 0C02003E */ jal func_800800F8 -/* 004EC 808A10AC AFA00010 */ sw $zero, 0x0010($sp) -/* 004F0 808A10B0 8FA4002C */ lw $a0, 0x002C($sp) -/* 004F4 808A10B4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 004F8 808A10B8 0C00B7CE */ jal func_8002DF38 -/* 004FC 808A10BC 2406003C */ addiu $a2, $zero, 0x003C ## $a2 = 0000003C -/* 00500 808A10C0 8FBF0024 */ lw $ra, 0x0024($sp) -.L808A10C4: -/* 00504 808A10C4 8FB00020 */ lw $s0, 0x0020($sp) -/* 00508 808A10C8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0050C 808A10CC 03E00008 */ jr $ra -/* 00510 808A10D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A10D4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A10D4.s deleted file mode 100644 index 1bf469b2ca..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A10D4.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_808A10D4 -/* 00514 808A10D4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00518 808A10D8 AFA50034 */ sw $a1, 0x0034($sp) -/* 0051C 808A10DC AFBF001C */ sw $ra, 0x001C($sp) -/* 00520 808A10E0 3C05808A */ lui $a1, %hi(func_808A1164) ## $a1 = 808A0000 -/* 00524 808A10E4 AFA40030 */ sw $a0, 0x0030($sp) -/* 00528 808A10E8 0C2282F0 */ jal func_808A0BC0 -/* 0052C 808A10EC 24A51164 */ addiu $a1, $a1, %lo(func_808A1164) ## $a1 = 808A1164 -/* 00530 808A10F0 8FAF0030 */ lw $t7, 0x0030($sp) -/* 00534 808A10F4 8FA20034 */ lw $v0, 0x0034($sp) -/* 00538 808A10F8 240E0012 */ addiu $t6, $zero, 0x0012 ## $t6 = 00000012 -/* 0053C 808A10FC A5EE0168 */ sh $t6, 0x0168($t7) ## 00000168 -/* 00540 808A1100 845807A0 */ lh $t8, 0x07A0($v0) ## 000007A0 -/* 00544 808A1104 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 00548 808A1108 0018C880 */ sll $t9, $t8, 2 -/* 0054C 808A110C 00594021 */ addu $t0, $v0, $t9 -/* 00550 808A1110 0C024BE2 */ jal Quake_Add -/* 00554 808A1114 8D040790 */ lw $a0, 0x0790($t0) ## 00000790 -/* 00558 808A1118 00022400 */ sll $a0, $v0, 16 -/* 0055C 808A111C AFA20028 */ sw $v0, 0x0028($sp) -/* 00560 808A1120 00042403 */ sra $a0, $a0, 16 -/* 00564 808A1124 0C024B6B */ jal Quake_SetSpeed -/* 00568 808A1128 240561A8 */ addiu $a1, $zero, 0x61A8 ## $a1 = 000061A8 -/* 0056C 808A112C 87A4002A */ lh $a0, 0x002A($sp) -/* 00570 808A1130 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 -/* 00574 808A1134 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00578 808A1138 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0057C 808A113C AFA00010 */ sw $zero, 0x0010($sp) -/* 00580 808A1140 0C024B9C */ jal Quake_SetQuakeValues -/* 00584 808A1144 AFA40024 */ sw $a0, 0x0024($sp) -/* 00588 808A1148 8FA40024 */ lw $a0, 0x0024($sp) -/* 0058C 808A114C 0C024B7C */ jal Quake_SetCountdown -/* 00590 808A1150 24050010 */ addiu $a1, $zero, 0x0010 ## $a1 = 00000010 -/* 00594 808A1154 8FBF001C */ lw $ra, 0x001C($sp) -/* 00598 808A1158 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0059C 808A115C 03E00008 */ jr $ra -/* 005A0 808A1160 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A1164.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A1164.s deleted file mode 100644 index f5de908dce..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A1164.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_808A1164 -/* 005A4 808A1164 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 005A8 808A1168 AFBF0014 */ sw $ra, 0x0014($sp) -/* 005AC 808A116C 848E0168 */ lh $t6, 0x0168($a0) ## 00000168 -/* 005B0 808A1170 5DC00004 */ bgtzl $t6, .L808A1184 -/* 005B4 808A1174 8FBF0014 */ lw $ra, 0x0014($sp) -/* 005B8 808A1178 0C228464 */ jal func_808A1190 -/* 005BC 808A117C 00000000 */ nop -/* 005C0 808A1180 8FBF0014 */ lw $ra, 0x0014($sp) -.L808A1184: -/* 005C4 808A1184 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 005C8 808A1188 03E00008 */ jr $ra -/* 005CC 808A118C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A1190.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A1190.s deleted file mode 100644 index 51c9e16484..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A1190.s +++ /dev/null @@ -1,108 +0,0 @@ -.rdata -glabel D_808A1618 - .asciz "Warning : 第３-1スタルフォス発生失敗\n" - .balign 4 - -glabel D_808A1640 - .asciz "Warning : 第３-2スタルフォス発生失敗\n" - .balign 4 - -.late_rodata -glabel D_808A16B8 - .float 827.0 -glabel D_808A16BC - .float -3383.0 -glabel D_808A16C0 - .float 827.0 -glabel D_808A16C4 - .float -3260.0 - -.text -glabel func_808A1190 -/* 005D0 808A1190 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 005D4 808A1194 AFB10038 */ sw $s1, 0x0038($sp) -/* 005D8 808A1198 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 005DC 808A119C AFBF003C */ sw $ra, 0x003C($sp) -/* 005E0 808A11A0 AFB00034 */ sw $s0, 0x0034($sp) -/* 005E4 808A11A4 3C05808A */ lui $a1, %hi(func_808A12C4) ## $a1 = 808A0000 -/* 005E8 808A11A8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 005EC 808A11AC 0C2282F0 */ jal func_808A0BC0 -/* 005F0 808A11B0 24A512C4 */ addiu $a1, $a1, %lo(func_808A12C4) ## $a1 = 808A12C4 -/* 005F4 808A11B4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 005F8 808A11B8 0C00B342 */ jal Flags_UnsetClear - -/* 005FC 808A11BC 82050003 */ lb $a1, 0x0003($s0) ## 00000003 -/* 00600 808A11C0 3C01428C */ lui $at, 0x428C ## $at = 428C0000 -/* 00604 808A11C4 44812000 */ mtc1 $at, $f4 ## $f4 = 70.00 -/* 00608 808A11C8 3C01808A */ lui $at, %hi(D_808A16B8) ## $at = 808A0000 -/* 0060C 808A11CC C42616B8 */ lwc1 $f6, %lo(D_808A16B8)($at) -/* 00610 808A11D0 3C01808A */ lui $at, %hi(D_808A16BC) ## $at = 808A0000 -/* 00614 808A11D4 C42816BC */ lwc1 $f8, %lo(D_808A16BC)($at) -/* 00618 808A11D8 26241C24 */ addiu $a0, $s1, 0x1C24 ## $a0 = 00001C24 -/* 0061C 808A11DC 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 00620 808A11E0 AFAE0028 */ sw $t6, 0x0028($sp) -/* 00624 808A11E4 AFA40044 */ sw $a0, 0x0044($sp) -/* 00628 808A11E8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0062C 808A11EC 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 -/* 00630 808A11F0 24070002 */ addiu $a3, $zero, 0x0002 ## $a3 = 00000002 -/* 00634 808A11F4 AFA0001C */ sw $zero, 0x001C($sp) -/* 00638 808A11F8 AFA00020 */ sw $zero, 0x0020($sp) -/* 0063C 808A11FC AFA00024 */ sw $zero, 0x0024($sp) -/* 00640 808A1200 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00644 808A1204 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 00648 808A1208 0C00C916 */ jal Actor_SpawnAsChild - -/* 0064C 808A120C E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00650 808A1210 10400006 */ beq $v0, $zero, .L808A122C -/* 00654 808A1214 3C04808A */ lui $a0, %hi(D_808A1618) ## $a0 = 808A0000 -/* 00658 808A1218 860F0018 */ lh $t7, 0x0018($s0) ## 00000018 -/* 0065C 808A121C AE00011C */ sw $zero, 0x011C($s0) ## 0000011C -/* 00660 808A1220 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 00664 808A1224 10000003 */ beq $zero, $zero, .L808A1234 -/* 00668 808A1228 A6180018 */ sh $t8, 0x0018($s0) ## 00000018 -.L808A122C: -/* 0066C 808A122C 0C00084C */ jal osSyncPrintf - -/* 00670 808A1230 24841618 */ addiu $a0, $a0, %lo(D_808A1618) ## $a0 = 808A1618 -.L808A1234: -/* 00674 808A1234 3C01432A */ lui $at, 0x432A ## $at = 432A0000 -/* 00678 808A1238 44815000 */ mtc1 $at, $f10 ## $f10 = 170.00 -/* 0067C 808A123C 3C01808A */ lui $at, %hi(D_808A16C0) ## $at = 808A0000 -/* 00680 808A1240 C43016C0 */ lwc1 $f16, %lo(D_808A16C0)($at) -/* 00684 808A1244 3C01808A */ lui $at, %hi(D_808A16C4) ## $at = 808A0000 -/* 00688 808A1248 C43216C4 */ lwc1 $f18, %lo(D_808A16C4)($at) -/* 0068C 808A124C 24190005 */ addiu $t9, $zero, 0x0005 ## $t9 = 00000005 -/* 00690 808A1250 AFB90028 */ sw $t9, 0x0028($sp) -/* 00694 808A1254 8FA40044 */ lw $a0, 0x0044($sp) -/* 00698 808A1258 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0069C 808A125C 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 -/* 006A0 808A1260 24070002 */ addiu $a3, $zero, 0x0002 ## $a3 = 00000002 -/* 006A4 808A1264 AFA0001C */ sw $zero, 0x001C($sp) -/* 006A8 808A1268 AFA00020 */ sw $zero, 0x0020($sp) -/* 006AC 808A126C AFA00024 */ sw $zero, 0x0024($sp) -/* 006B0 808A1270 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 006B4 808A1274 E7B00014 */ swc1 $f16, 0x0014($sp) -/* 006B8 808A1278 0C00C916 */ jal Actor_SpawnAsChild - -/* 006BC 808A127C E7B20018 */ swc1 $f18, 0x0018($sp) -/* 006C0 808A1280 10400006 */ beq $v0, $zero, .L808A129C -/* 006C4 808A1284 3C04808A */ lui $a0, %hi(D_808A1640) ## $a0 = 808A0000 -/* 006C8 808A1288 86080018 */ lh $t0, 0x0018($s0) ## 00000018 -/* 006CC 808A128C AE00011C */ sw $zero, 0x011C($s0) ## 0000011C -/* 006D0 808A1290 25090001 */ addiu $t1, $t0, 0x0001 ## $t1 = 00000001 -/* 006D4 808A1294 10000003 */ beq $zero, $zero, .L808A12A4 -/* 006D8 808A1298 A6090018 */ sh $t1, 0x0018($s0) ## 00000018 -.L808A129C: -/* 006DC 808A129C 0C00084C */ jal osSyncPrintf - -/* 006E0 808A12A0 24841640 */ addiu $a0, $a0, %lo(D_808A1640) ## $a0 = 808A1640 -.L808A12A4: -/* 006E4 808A12A4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 006E8 808A12A8 0C00B33C */ jal Flags_SetClear - -/* 006EC 808A12AC 82050003 */ lb $a1, 0x0003($s0) ## 00000003 -/* 006F0 808A12B0 8FBF003C */ lw $ra, 0x003C($sp) -/* 006F4 808A12B4 8FB00034 */ lw $s0, 0x0034($sp) -/* 006F8 808A12B8 8FB10038 */ lw $s1, 0x0038($sp) -/* 006FC 808A12BC 03E00008 */ jr $ra -/* 00700 808A12C0 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A12C4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A12C4.s deleted file mode 100644 index c2efdefd6c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A12C4.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_808A12C4 -/* 00704 808A12C4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00708 808A12C8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0070C 808A12CC AFA40018 */ sw $a0, 0x0018($sp) -/* 00710 808A12D0 AFA5001C */ sw $a1, 0x001C($sp) -/* 00714 808A12D4 848F0018 */ lh $t7, 0x0018($a0) ## 00000018 -/* 00718 808A12D8 55E0000E */ bnel $t7, $zero, .L808A1314 -/* 0071C 808A12DC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00720 808A12E0 0C023A62 */ jal Player_InCsMode -/* 00724 808A12E4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00728 808A12E8 14400009 */ bne $v0, $zero, .L808A1310 -/* 0072C 808A12EC 8FB80018 */ lw $t8, 0x0018($sp) -/* 00730 808A12F0 8705001C */ lh $a1, 0x001C($t8) ## 0000001C -/* 00734 808A12F4 8FA4001C */ lw $a0, 0x001C($sp) -/* 00738 808A12F8 00052A03 */ sra $a1, $a1, 8 -/* 0073C 808A12FC 0C00B2DD */ jal Flags_SetSwitch - -/* 00740 808A1300 30A5003F */ andi $a1, $a1, 0x003F ## $a1 = 00000000 -/* 00744 808A1304 8FA40018 */ lw $a0, 0x0018($sp) -/* 00748 808A1308 0C2284C8 */ jal func_808A1320 -/* 0074C 808A130C 8FA5001C */ lw $a1, 0x001C($sp) -.L808A1310: -/* 00750 808A1310 8FBF0014 */ lw $ra, 0x0014($sp) -.L808A1314: -/* 00754 808A1314 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00758 808A1318 03E00008 */ jr $ra -/* 0075C 808A131C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A1320.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A1320.s deleted file mode 100644 index e14fb99738..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A1320.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_808A1320 -/* 00760 808A1320 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00764 808A1324 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00768 808A1328 AFA5001C */ sw $a1, 0x001C($sp) -/* 0076C 808A132C 0C2282F0 */ jal func_808A0BC0 -/* 00770 808A1330 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00774 808A1334 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00778 808A1338 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0077C 808A133C 03E00008 */ jr $ra -/* 00780 808A1340 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A13B4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A13B4.s deleted file mode 100644 index df78378a61..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A13B4.s +++ /dev/null @@ -1,82 +0,0 @@ -.rdata -glabel D_808A1668 - .asciz "../z_bg_mori_bigst.c" - .balign 4 - -glabel D_808A1680 - .asciz "../z_bg_mori_bigst.c" - .balign 4 - -glabel D_808A1698 - .asciz "../z_bg_mori_bigst.c" - .balign 4 - -.text -glabel func_808A13B4 -/* 007F4 808A13B4 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 007F8 808A13B8 AFB10018 */ sw $s1, 0x0018($sp) -/* 007FC 808A13BC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00800 808A13C0 AFBF001C */ sw $ra, 0x001C($sp) -/* 00804 808A13C4 AFB00014 */ sw $s0, 0x0014($sp) -/* 00808 808A13C8 AFA40050 */ sw $a0, 0x0050($sp) -/* 0080C 808A13CC 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 00810 808A13D0 3C06808A */ lui $a2, %hi(D_808A1668) ## $a2 = 808A0000 -/* 00814 808A13D4 24C61668 */ addiu $a2, $a2, %lo(D_808A1668) ## $a2 = 808A1668 -/* 00818 808A13D8 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 -/* 0081C 808A13DC 2407021D */ addiu $a3, $zero, 0x021D ## $a3 = 0000021D -/* 00820 808A13E0 0C031AB1 */ jal Graph_OpenDisps -/* 00824 808A13E4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00828 808A13E8 0C024F46 */ jal func_80093D18 -/* 0082C 808A13EC 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 00830 808A13F0 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 00834 808A13F4 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 00838 808A13F8 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 -/* 0083C 808A13FC 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 00840 808A1400 AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 -/* 00844 808A1404 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 00848 808A1408 8FB80050 */ lw $t8, 0x0050($sp) -/* 0084C 808A140C 3C0A0001 */ lui $t2, 0x0001 ## $t2 = 00010000 -/* 00850 808A1410 3C0CDA38 */ lui $t4, 0xDA38 ## $t4 = DA380000 -/* 00854 808A1414 8319016A */ lb $t9, 0x016A($t8) ## 0000016A -/* 00858 808A1418 358C0003 */ ori $t4, $t4, 0x0003 ## $t4 = DA380003 -/* 0085C 808A141C 3C05808A */ lui $a1, %hi(D_808A1680) ## $a1 = 808A0000 -/* 00860 808A1420 00194100 */ sll $t0, $t9, 4 -/* 00864 808A1424 01194021 */ addu $t0, $t0, $t9 -/* 00868 808A1428 00084080 */ sll $t0, $t0, 2 -/* 0086C 808A142C 02284821 */ addu $t1, $s1, $t0 -/* 00870 808A1430 01495021 */ addu $t2, $t2, $t1 -/* 00874 808A1434 8D4A17B4 */ lw $t2, 0x17B4($t2) ## 000117B4 -/* 00878 808A1438 24A51680 */ addiu $a1, $a1, %lo(D_808A1680) ## $a1 = 808A1680 -/* 0087C 808A143C 24060224 */ addiu $a2, $zero, 0x0224 ## $a2 = 00000224 -/* 00880 808A1440 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 -/* 00884 808A1444 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 00888 808A1448 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 0088C 808A144C AE0B02C0 */ sw $t3, 0x02C0($s0) ## 000002C0 -/* 00890 808A1450 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 00894 808A1454 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 00898 808A1458 0C0346A2 */ jal Matrix_NewMtx -/* 0089C 808A145C AFA2002C */ sw $v0, 0x002C($sp) -/* 008A0 808A1460 8FA3002C */ lw $v1, 0x002C($sp) -/* 008A4 808A1464 3C0F0600 */ lui $t7, 0x0600 ## $t7 = 06000000 -/* 008A8 808A1468 25EF1E50 */ addiu $t7, $t7, 0x1E50 ## $t7 = 06001E50 -/* 008AC 808A146C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 008B0 808A1470 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 008B4 808A1474 3C0EDE00 */ lui $t6, 0xDE00 ## $t6 = DE000000 -/* 008B8 808A1478 3C06808A */ lui $a2, %hi(D_808A1698) ## $a2 = 808A0000 -/* 008BC 808A147C 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 008C0 808A1480 AE0D02C0 */ sw $t5, 0x02C0($s0) ## 000002C0 -/* 008C4 808A1484 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 008C8 808A1488 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 008CC 808A148C 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 008D0 808A1490 24C61698 */ addiu $a2, $a2, %lo(D_808A1698) ## $a2 = 808A1698 -/* 008D4 808A1494 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 -/* 008D8 808A1498 0C031AD5 */ jal Graph_CloseDisps -/* 008DC 808A149C 24070229 */ addiu $a3, $zero, 0x0229 ## $a3 = 00000229 -/* 008E0 808A14A0 8FBF001C */ lw $ra, 0x001C($sp) -/* 008E4 808A14A4 8FB00014 */ lw $s0, 0x0014($sp) -/* 008E8 808A14A8 8FB10018 */ lw $s1, 0x0018($sp) -/* 008EC 808A14AC 03E00008 */ jr $ra -/* 008F0 808A14B0 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 008F4 808A14B4 00000000 */ nop -/* 008F8 808A14B8 00000000 */ nop -/* 008FC 808A14BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/BgMoriHashira4_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/BgMoriHashira4_Destroy.s deleted file mode 100644 index 13aa72abed..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/BgMoriHashira4_Destroy.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel BgMoriHashira4_Destroy -/* 001CC 808A322C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 001D0 808A3230 AFA40018 */ sw $a0, 0x0018($sp) -/* 001D4 808A3234 8FAE0018 */ lw $t6, 0x0018($sp) -/* 001D8 808A3238 AFBF0014 */ sw $ra, 0x0014($sp) -/* 001DC 808A323C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 001E0 808A3240 24A50810 */ addiu $a1, $a1, 0x0810 ## $a1 = 00000810 -/* 001E4 808A3244 0C00FB56 */ jal DynaPolyInfo_Free - ## DynaPolyInfo_delReserve -/* 001E8 808A3248 8DC6014C */ lw $a2, 0x014C($t6) ## 0000014C -/* 001EC 808A324C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 001F0 808A3250 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 001F4 808A3254 03E00008 */ jr $ra -/* 001F8 808A3258 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/BgMoriHashira4_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/BgMoriHashira4_Init.s deleted file mode 100644 index ce4e5ce549..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/BgMoriHashira4_Init.s +++ /dev/null @@ -1,107 +0,0 @@ -.rdata -glabel D_808A3638 - .asciz "Error : バンク危険！(arg_data 0x%04x)(%s %d)\n" - .balign 4 - -glabel D_808A3668 - .asciz "../z_bg_mori_hashira4.c" - .balign 4 - -glabel D_808A3680 - .asciz "(森の神殿 ４本柱)(arg_data 0x%04x)\n" - .balign 4 - -.text -glabel BgMoriHashira4_Init -/* 00090 808A30F0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00094 808A30F4 AFBF001C */ sw $ra, 0x001C($sp) -/* 00098 808A30F8 AFB00018 */ sw $s0, 0x0018($sp) -/* 0009C 808A30FC AFA50024 */ sw $a1, 0x0024($sp) -/* 000A0 808A3100 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 000A4 808A3104 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 000A8 808A3108 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 000AC 808A310C 305800FF */ andi $t8, $v0, 0x00FF ## $t8 = 00000000 -/* 000B0 808A3110 A498001C */ sh $t8, 0x001C($a0) ## 0000001C -/* 000B4 808A3114 8499001C */ lh $t9, 0x001C($a0) ## 0000001C -/* 000B8 808A3118 00027203 */ sra $t6, $v0, 8 -/* 000BC 808A311C 31CF003F */ andi $t7, $t6, 0x003F ## $t7 = 00000000 -/* 000C0 808A3120 17200008 */ bne $t9, $zero, .L808A3144 -/* 000C4 808A3124 A08F0169 */ sb $t7, 0x0169($a0) ## 00000169 -/* 000C8 808A3128 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 000CC 808A312C 24C61AF8 */ addiu $a2, $a2, 0x1AF8 ## $a2 = 06001AF8 -/* 000D0 808A3130 8FA50024 */ lw $a1, 0x0024($sp) -/* 000D4 808A3134 0C228C1A */ jal func_808A3068 -/* 000D8 808A3138 24070003 */ addiu $a3, $zero, 0x0003 ## $a3 = 00000003 -/* 000DC 808A313C 10000006 */ beq $zero, $zero, .L808A3158 -/* 000E0 808A3140 00000000 */ nop -.L808A3144: -/* 000E4 808A3144 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000E8 808A3148 8FA50024 */ lw $a1, 0x0024($sp) -/* 000EC 808A314C 24C689E0 */ addiu $a2, $a2, 0x89E0 ## $a2 = FFFF89E0 -/* 000F0 808A3150 0C228C1A */ jal func_808A3068 -/* 000F4 808A3154 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -.L808A3158: -/* 000F8 808A3158 3C05808A */ lui $a1, %hi(D_808A35C0) ## $a1 = 808A0000 -/* 000FC 808A315C 24A535C0 */ addiu $a1, $a1, %lo(D_808A35C0) ## $a1 = 808A35C0 -/* 00100 808A3160 0C01E037 */ jal Actor_ProcessInitChain - -/* 00104 808A3164 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00108 808A3168 8FA40024 */ lw $a0, 0x0024($sp) -/* 0010C 808A316C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00110 808A3170 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 00114 808A3174 24050073 */ addiu $a1, $zero, 0x0073 ## $a1 = 00000073 -/* 00118 808A3178 0C02604B */ jal Object_GetIndex - ## ObjectIndex -/* 0011C 808A317C 00812021 */ addu $a0, $a0, $at -/* 00120 808A3180 A2020168 */ sb $v0, 0x0168($s0) ## 00000168 -/* 00124 808A3184 82080168 */ lb $t0, 0x0168($s0) ## 00000168 -/* 00128 808A3188 0503000D */ bgezl $t0, .L808A31C0 -/* 0012C 808A318C 8609001C */ lh $t1, 0x001C($s0) ## 0000001C -/* 00130 808A3190 0C00B55C */ jal Actor_Kill - -/* 00134 808A3194 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00138 808A3198 3C04808A */ lui $a0, %hi(D_808A3638) ## $a0 = 808A0000 -/* 0013C 808A319C 3C06808A */ lui $a2, %hi(D_808A3668) ## $a2 = 808A0000 -/* 00140 808A31A0 24C63668 */ addiu $a2, $a2, %lo(D_808A3668) ## $a2 = 808A3668 -/* 00144 808A31A4 24843638 */ addiu $a0, $a0, %lo(D_808A3638) ## $a0 = 808A3638 -/* 00148 808A31A8 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 0014C 808A31AC 0C00084C */ jal osSyncPrintf - -/* 00150 808A31B0 240700C4 */ addiu $a3, $zero, 0x00C4 ## $a3 = 000000C4 -/* 00154 808A31B4 10000019 */ beq $zero, $zero, .L808A321C -/* 00158 808A31B8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0015C 808A31BC 8609001C */ lh $t1, 0x001C($s0) ## 0000001C -.L808A31C0: -/* 00160 808A31C0 8FA40024 */ lw $a0, 0x0024($sp) -/* 00164 808A31C4 5120000A */ beql $t1, $zero, .L808A31F0 -/* 00168 808A31C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0016C 808A31CC 0C00B2D0 */ jal Flags_GetSwitch - -/* 00170 808A31D0 82050169 */ lb $a1, 0x0169($s0) ## 00000169 -/* 00174 808A31D4 50400006 */ beql $v0, $zero, .L808A31F0 -/* 00178 808A31D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0017C 808A31DC 0C00B55C */ jal Actor_Kill - -/* 00180 808A31E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00184 808A31E4 1000000D */ beq $zero, $zero, .L808A321C -/* 00188 808A31E8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0018C 808A31EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L808A31F0: -/* 00190 808A31F0 0C00B56E */ jal Actor_SetHeight - -/* 00194 808A31F4 3C054248 */ lui $a1, 0x4248 ## $a1 = 42480000 -/* 00198 808A31F8 0C228C97 */ jal func_808A325C -/* 0019C 808A31FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 001A0 808A3200 3C04808A */ lui $a0, %hi(D_808A3680) ## $a0 = 808A0000 -/* 001A4 808A3204 24843680 */ addiu $a0, $a0, %lo(D_808A3680) ## $a0 = 808A3680 -/* 001A8 808A3208 0C00084C */ jal osSyncPrintf - -/* 001AC 808A320C 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 001B0 808A3210 3C01808A */ lui $at, %hi(D_808A37C0) ## $at = 808A0000 -/* 001B4 808A3214 A42037C0 */ sh $zero, %lo(D_808A37C0)($at) -/* 001B8 808A3218 8FBF001C */ lw $ra, 0x001C($sp) -.L808A321C: -/* 001BC 808A321C 8FB00018 */ lw $s0, 0x0018($sp) -/* 001C0 808A3220 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 001C4 808A3224 03E00008 */ jr $ra -/* 001C8 808A3228 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/BgMoriHashira4_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/BgMoriHashira4_Update.s deleted file mode 100644 index 9e32cc41d6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/BgMoriHashira4_Update.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel BgMoriHashira4_Update -/* 003F8 808A3458 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 003FC 808A345C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00400 808A3460 8C820164 */ lw $v0, 0x0164($a0) ## 00000164 -/* 00404 808A3464 50400004 */ beql $v0, $zero, .L808A3478 -/* 00408 808A3468 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0040C 808A346C 0040F809 */ jalr $ra, $v0 -/* 00410 808A3470 00000000 */ nop -/* 00414 808A3474 8FBF0014 */ lw $ra, 0x0014($sp) -.L808A3478: -/* 00418 808A3478 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0041C 808A347C 03E00008 */ jr $ra -/* 00420 808A3480 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3060.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3060.s deleted file mode 100644 index c9f683f40b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3060.s +++ /dev/null @@ -1,3 +0,0 @@ -glabel func_808A3060 -/* 00000 808A3060 03E00008 */ jr $ra -/* 00004 808A3064 AC850164 */ sw $a1, 0x0164($a0) ## 00000164 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3068.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3068.s deleted file mode 100644 index aac8683824..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3068.s +++ /dev/null @@ -1,52 +0,0 @@ -.rdata -glabel D_808A35E0 - .asciz "Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n" - .balign 4 - -.balign 4 - -glabel D_808A3620 - .asciz "../z_bg_mori_hashira4.c" - .balign 4 - -.text -glabel func_808A3068 -/* 00008 808A3068 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0000C 808A306C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00010 808A3070 AFB00020 */ sw $s0, 0x0020($sp) -/* 00014 808A3074 AFA5003C */ sw $a1, 0x003C($sp) -/* 00018 808A3078 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0001C 808A307C AFA60040 */ sw $a2, 0x0040($sp) -/* 00020 808A3080 AFA00030 */ sw $zero, 0x0030($sp) -/* 00024 808A3084 0C010D20 */ jal DynaPolyInfo_SetActorMove - -/* 00028 808A3088 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 0002C 808A308C 8FA40040 */ lw $a0, 0x0040($sp) -/* 00030 808A3090 0C010620 */ jal DynaPolyInfo_Alloc - -/* 00034 808A3094 27A50030 */ addiu $a1, $sp, 0x0030 ## $a1 = FFFFFFF8 -/* 00038 808A3098 8FA4003C */ lw $a0, 0x003C($sp) -/* 0003C 808A309C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00040 808A30A0 8FA70030 */ lw $a3, 0x0030($sp) -/* 00044 808A30A4 0C00FA9D */ jal DynaPolyInfo_RegisterActor - ## DynaPolyInfo_setActor -/* 00048 808A30A8 24850810 */ addiu $a1, $a0, 0x0810 ## $a1 = 00000810 -/* 0004C 808A30AC 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 00050 808A30B0 1441000A */ bne $v0, $at, .L808A30DC -/* 00054 808A30B4 AE02014C */ sw $v0, 0x014C($s0) ## 0000014C -/* 00058 808A30B8 860E001C */ lh $t6, 0x001C($s0) ## 0000001C -/* 0005C 808A30BC 3C04808A */ lui $a0, %hi(D_808A35E0) ## $a0 = 808A0000 -/* 00060 808A30C0 3C05808A */ lui $a1, %hi(D_808A3620) ## $a1 = 808A0000 -/* 00064 808A30C4 86070000 */ lh $a3, 0x0000($s0) ## 00000000 -/* 00068 808A30C8 24A53620 */ addiu $a1, $a1, %lo(D_808A3620) ## $a1 = 808A3620 -/* 0006C 808A30CC 248435E0 */ addiu $a0, $a0, %lo(D_808A35E0) ## $a0 = 808A35E0 -/* 00070 808A30D0 2406009B */ addiu $a2, $zero, 0x009B ## $a2 = 0000009B -/* 00074 808A30D4 0C00084C */ jal osSyncPrintf - -/* 00078 808A30D8 AFAE0010 */ sw $t6, 0x0010($sp) -.L808A30DC: -/* 0007C 808A30DC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00080 808A30E0 8FB00020 */ lw $s0, 0x0020($sp) -/* 00084 808A30E4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00088 808A30E8 03E00008 */ jr $ra -/* 0008C 808A30EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A325C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A325C.s deleted file mode 100644 index e6a1cff174..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A325C.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_808A325C -/* 001FC 808A325C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00200 808A3260 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00204 808A3264 3C05808A */ lui $a1, %hi(func_808A3280) ## $a1 = 808A0000 -/* 00208 808A3268 0C228C18 */ jal func_808A3060 -/* 0020C 808A326C 24A53280 */ addiu $a1, $a1, %lo(func_808A3280) ## $a1 = 808A3280 -/* 00210 808A3270 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00214 808A3274 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00218 808A3278 03E00008 */ jr $ra -/* 0021C 808A327C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3280.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3280.s deleted file mode 100644 index 0d05a1af3e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3280.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_808A3280 -/* 00220 808A3280 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00224 808A3284 AFB00018 */ sw $s0, 0x0018($sp) -/* 00228 808A3288 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0022C 808A328C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00230 808A3290 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 00234 808A3294 AFBF001C */ sw $ra, 0x001C($sp) -/* 00238 808A3298 00A12021 */ addu $a0, $a1, $at -/* 0023C 808A329C 0C026062 */ jal Object_IsLoaded - -/* 00240 808A32A0 82050168 */ lb $a1, 0x0168($s0) ## 00000168 -/* 00244 808A32A4 50400010 */ beql $v0, $zero, .L808A32E8 -/* 00248 808A32A8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0024C 808A32AC 860E001C */ lh $t6, 0x001C($s0) ## 0000001C -/* 00250 808A32B0 A600016A */ sh $zero, 0x016A($s0) ## 0000016A -/* 00254 808A32B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00258 808A32B8 15C00005 */ bne $t6, $zero, .L808A32D0 -/* 0025C 808A32BC 3C05808A */ lui $a1, %hi(func_808A3354) ## $a1 = 808A0000 -/* 00260 808A32C0 0C228CBE */ jal func_808A32F8 -/* 00264 808A32C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00268 808A32C8 10000003 */ beq $zero, $zero, .L808A32D8 -/* 0026C 808A32CC 00000000 */ nop -.L808A32D0: -/* 00270 808A32D0 0C228C18 */ jal func_808A3060 -/* 00274 808A32D4 24A53354 */ addiu $a1, $a1, %lo(func_808A3354) ## $a1 = 00003354 -.L808A32D8: -/* 00278 808A32D8 3C0F808A */ lui $t7, %hi(func_808A3484) ## $t7 = 808A0000 -/* 0027C 808A32DC 25EF3484 */ addiu $t7, $t7, %lo(func_808A3484) ## $t7 = 808A3484 -/* 00280 808A32E0 AE0F0134 */ sw $t7, 0x0134($s0) ## 00000134 -/* 00284 808A32E4 8FBF001C */ lw $ra, 0x001C($sp) -.L808A32E8: -/* 00288 808A32E8 8FB00018 */ lw $s0, 0x0018($sp) -/* 0028C 808A32EC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00290 808A32F0 03E00008 */ jr $ra -/* 00294 808A32F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A32F8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A32F8.s deleted file mode 100644 index 7cbb6b2ebf..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A32F8.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_808A32F8 -/* 00298 808A32F8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0029C 808A32FC AFBF0014 */ sw $ra, 0x0014($sp) -/* 002A0 808A3300 3C05808A */ lui $a1, %hi(func_808A331C) ## $a1 = 808A0000 -/* 002A4 808A3304 0C228C18 */ jal func_808A3060 -/* 002A8 808A3308 24A5331C */ addiu $a1, $a1, %lo(func_808A331C) ## $a1 = 808A331C -/* 002AC 808A330C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 002B0 808A3310 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 002B4 808A3314 03E00008 */ jr $ra -/* 002B8 808A3318 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A331C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A331C.s deleted file mode 100644 index 7ad4e78657..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A331C.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_808A331C -/* 002BC 808A331C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 002C0 808A3320 AFBF0014 */ sw $ra, 0x0014($sp) -/* 002C4 808A3324 AFA5001C */ sw $a1, 0x001C($sp) -/* 002C8 808A3328 848E0032 */ lh $t6, 0x0032($a0) ## 00000032 -/* 002CC 808A332C 24052082 */ addiu $a1, $zero, 0x2082 ## $a1 = 00002082 -/* 002D0 808A3330 25CF0096 */ addiu $t7, $t6, 0x0096 ## $t7 = 00000096 -/* 002D4 808A3334 A48F0032 */ sh $t7, 0x0032($a0) ## 00000032 -/* 002D8 808A3338 84980032 */ lh $t8, 0x0032($a0) ## 00000032 -/* 002DC 808A333C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 002E0 808A3340 A49800B6 */ sh $t8, 0x00B6($a0) ## 000000B6 -/* 002E4 808A3344 8FBF0014 */ lw $ra, 0x0014($sp) -/* 002E8 808A3348 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 002EC 808A334C 03E00008 */ jr $ra -/* 002F0 808A3350 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3354.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3354.s deleted file mode 100644 index 3137675b9c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3354.s +++ /dev/null @@ -1,48 +0,0 @@ -glabel func_808A3354 -/* 002F4 808A3354 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 002F8 808A3358 AFB00020 */ sw $s0, 0x0020($sp) -/* 002FC 808A335C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00300 808A3360 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00304 808A3364 AFA5002C */ sw $a1, 0x002C($sp) -/* 00308 808A3368 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0030C 808A336C 0C00B2D0 */ jal Flags_GetSwitch - -/* 00310 808A3370 82050169 */ lb $a1, 0x0169($s0) ## 00000169 -/* 00314 808A3374 54400005 */ bnel $v0, $zero, .L808A338C -/* 00318 808A3378 860F016A */ lh $t7, 0x016A($s0) ## 0000016A -/* 0031C 808A337C 860E016A */ lh $t6, 0x016A($s0) ## 0000016A -/* 00320 808A3380 51C0001B */ beql $t6, $zero, .L808A33F0 -/* 00324 808A3384 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00328 808A3388 860F016A */ lh $t7, 0x016A($s0) ## 0000016A -.L808A338C: -/* 0032C 808A338C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00330 808A3390 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 00334 808A3394 A618016A */ sh $t8, 0x016A($s0) ## 0000016A -/* 00338 808A3398 8619016A */ lh $t9, 0x016A($s0) ## 0000016A -/* 0033C 808A339C 2B21001F */ slti $at, $t9, 0x001F -/* 00340 808A33A0 54200013 */ bnel $at, $zero, .L808A33F0 -/* 00344 808A33A4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00348 808A33A8 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0034C 808A33AC 24052859 */ addiu $a1, $zero, 0x2859 ## $a1 = 00002859 -/* 00350 808A33B0 3C05808A */ lui $a1, %hi(func_808A3400) ## $a1 = 808A0000 -/* 00354 808A33B4 24A53400 */ addiu $a1, $a1, %lo(func_808A3400) ## $a1 = 808A3400 -/* 00358 808A33B8 0C228C18 */ jal func_808A3060 -/* 0035C 808A33BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00360 808A33C0 8FA4002C */ lw $a0, 0x002C($sp) -/* 00364 808A33C4 2405177A */ addiu $a1, $zero, 0x177A ## $a1 = 0000177A -/* 00368 808A33C8 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 0036C 808A33CC 02003825 */ or $a3, $s0, $zero ## $a3 = 00000000 -/* 00370 808A33D0 0C02003E */ jal func_800800F8 -/* 00374 808A33D4 AFA00010 */ sw $zero, 0x0010($sp) -/* 00378 808A33D8 3C03808A */ lui $v1, %hi(D_808A37C0) ## $v1 = 808A0000 -/* 0037C 808A33DC 246337C0 */ addiu $v1, $v1, %lo(D_808A37C0) ## $v1 = 808A37C0 -/* 00380 808A33E0 84680000 */ lh $t0, 0x0000($v1) ## 808A37C0 -/* 00384 808A33E4 25090001 */ addiu $t1, $t0, 0x0001 ## $t1 = 00000001 -/* 00388 808A33E8 A4690000 */ sh $t1, 0x0000($v1) ## 808A37C0 -/* 0038C 808A33EC 8FBF0024 */ lw $ra, 0x0024($sp) -.L808A33F0: -/* 00390 808A33F0 8FB00020 */ lw $s0, 0x0020($sp) -/* 00394 808A33F4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00398 808A33F8 03E00008 */ jr $ra -/* 0039C 808A33FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3400.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3400.s deleted file mode 100644 index e17271d9a2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3400.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_808A3400 -/* 003A0 808A3400 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 003A4 808A3404 AFBF0014 */ sw $ra, 0x0014($sp) -/* 003A8 808A3408 AFA5001C */ sw $a1, 0x001C($sp) -/* 003AC 808A340C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 003B0 808A3410 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 -/* 003B4 808A3414 44813000 */ mtc1 $at, $f6 ## $f6 = 120.00 -/* 003B8 808A3418 C4E4000C */ lwc1 $f4, 0x000C($a3) ## 0000000C -/* 003BC 808A341C AFA70018 */ sw $a3, 0x0018($sp) -/* 003C0 808A3420 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 -/* 003C4 808A3424 46062200 */ add.s $f8, $f4, $f6 -/* 003C8 808A3428 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 -/* 003CC 808A342C 44054000 */ mfc1 $a1, $f8 -/* 003D0 808A3430 0C01DE80 */ jal Math_ApproxF - -/* 003D4 808A3434 00000000 */ nop -/* 003D8 808A3438 10400003 */ beq $v0, $zero, .L808A3448 -/* 003DC 808A343C 8FA70018 */ lw $a3, 0x0018($sp) -/* 003E0 808A3440 0C00B55C */ jal Actor_Kill - -/* 003E4 808A3444 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -.L808A3448: -/* 003E8 808A3448 8FBF0014 */ lw $ra, 0x0014($sp) -/* 003EC 808A344C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 003F0 808A3450 03E00008 */ jr $ra -/* 003F4 808A3454 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3484.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3484.s deleted file mode 100644 index d553ae4bb2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3484.s +++ /dev/null @@ -1,86 +0,0 @@ -.rdata -glabel D_808A36A4 - .asciz "../z_bg_mori_hashira4.c" - .balign 4 - -glabel D_808A36BC - .asciz "../z_bg_mori_hashira4.c" - .balign 4 - -glabel D_808A36D4 - .asciz "../z_bg_mori_hashira4.c" - .balign 4 - -.text -glabel func_808A3484 -/* 00424 808A3484 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00428 808A3488 AFB10018 */ sw $s1, 0x0018($sp) -/* 0042C 808A348C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00430 808A3490 AFBF001C */ sw $ra, 0x001C($sp) -/* 00434 808A3494 AFB00014 */ sw $s0, 0x0014($sp) -/* 00438 808A3498 AFA40050 */ sw $a0, 0x0050($sp) -/* 0043C 808A349C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 00440 808A34A0 3C06808A */ lui $a2, %hi(D_808A36A4) ## $a2 = 808A0000 -/* 00444 808A34A4 24C636A4 */ addiu $a2, $a2, %lo(D_808A36A4) ## $a2 = 808A36A4 -/* 00448 808A34A8 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 -/* 0044C 808A34AC 24070153 */ addiu $a3, $zero, 0x0153 ## $a3 = 00000153 -/* 00450 808A34B0 0C031AB1 */ jal Graph_OpenDisps -/* 00454 808A34B4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00458 808A34B8 0C024F46 */ jal func_80093D18 -/* 0045C 808A34BC 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 00460 808A34C0 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 00464 808A34C4 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 00468 808A34C8 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 -/* 0046C 808A34CC 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 00470 808A34D0 AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 -/* 00474 808A34D4 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 00478 808A34D8 8FB80050 */ lw $t8, 0x0050($sp) -/* 0047C 808A34DC 3C0A0001 */ lui $t2, 0x0001 ## $t2 = 00010000 -/* 00480 808A34E0 3C0CDA38 */ lui $t4, 0xDA38 ## $t4 = DA380000 -/* 00484 808A34E4 83190168 */ lb $t9, 0x0168($t8) ## 00000168 -/* 00488 808A34E8 358C0003 */ ori $t4, $t4, 0x0003 ## $t4 = DA380003 -/* 0048C 808A34EC 3C05808A */ lui $a1, %hi(D_808A36BC) ## $a1 = 808A0000 -/* 00490 808A34F0 00194100 */ sll $t0, $t9, 4 -/* 00494 808A34F4 01194021 */ addu $t0, $t0, $t9 -/* 00498 808A34F8 00084080 */ sll $t0, $t0, 2 -/* 0049C 808A34FC 02284821 */ addu $t1, $s1, $t0 -/* 004A0 808A3500 01495021 */ addu $t2, $t2, $t1 -/* 004A4 808A3504 8D4A17B4 */ lw $t2, 0x17B4($t2) ## 000117B4 -/* 004A8 808A3508 24A536BC */ addiu $a1, $a1, %lo(D_808A36BC) ## $a1 = 808A36BC -/* 004AC 808A350C 24060158 */ addiu $a2, $zero, 0x0158 ## $a2 = 00000158 -/* 004B0 808A3510 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 -/* 004B4 808A3514 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 004B8 808A3518 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 004BC 808A351C AE0B02C0 */ sw $t3, 0x02C0($s0) ## 000002C0 -/* 004C0 808A3520 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 004C4 808A3524 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 004C8 808A3528 0C0346A2 */ jal Matrix_NewMtx -/* 004CC 808A352C AFA2002C */ sw $v0, 0x002C($sp) -/* 004D0 808A3530 8FA3002C */ lw $v1, 0x002C($sp) -/* 004D4 808A3534 3C0EDE00 */ lui $t6, 0xDE00 ## $t6 = DE000000 -/* 004D8 808A3538 3C08808A */ lui $t0, %hi(D_808A35D0) ## $t0 = 808A0000 -/* 004DC 808A353C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 004E0 808A3540 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 004E4 808A3544 3C06808A */ lui $a2, %hi(D_808A36D4) ## $a2 = 808A0000 -/* 004E8 808A3548 24C636D4 */ addiu $a2, $a2, %lo(D_808A36D4) ## $a2 = 808A36D4 -/* 004EC 808A354C 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 004F0 808A3550 AE0D02C0 */ sw $t5, 0x02C0($s0) ## 000002C0 -/* 004F4 808A3554 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 004F8 808A3558 8FAF0050 */ lw $t7, 0x0050($sp) -/* 004FC 808A355C 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 -/* 00500 808A3560 2407015C */ addiu $a3, $zero, 0x015C ## $a3 = 0000015C -/* 00504 808A3564 85F8001C */ lh $t8, 0x001C($t7) ## 0000001C -/* 00508 808A3568 0018C880 */ sll $t9, $t8, 2 -/* 0050C 808A356C 01194021 */ addu $t0, $t0, $t9 -/* 00510 808A3570 8D0835D0 */ lw $t0, %lo(D_808A35D0)($t0) -/* 00514 808A3574 AC480004 */ sw $t0, 0x0004($v0) ## 00000004 -/* 00518 808A3578 0C031AD5 */ jal Graph_CloseDisps -/* 0051C 808A357C 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 00520 808A3580 8FBF001C */ lw $ra, 0x001C($sp) -/* 00524 808A3584 8FB00014 */ lw $s0, 0x0014($sp) -/* 00528 808A3588 8FB10018 */ lw $s1, 0x0018($sp) -/* 0052C 808A358C 03E00008 */ jr $ra -/* 00530 808A3590 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 00534 808A3594 00000000 */ nop -/* 00538 808A3598 00000000 */ nop -/* 0053C 808A359C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/BgSpot15Rrbox_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/BgSpot15Rrbox_Destroy.s deleted file mode 100644 index d631c7b996..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/BgSpot15Rrbox_Destroy.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel BgSpot15Rrbox_Destroy -/* 0030C 808B3C6C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00310 808B3C70 AFA40018 */ sw $a0, 0x0018($sp) -/* 00314 808B3C74 8FAE0018 */ lw $t6, 0x0018($sp) -/* 00318 808B3C78 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0031C 808B3C7C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00320 808B3C80 24A50810 */ addiu $a1, $a1, 0x0810 ## $a1 = 00000810 -/* 00324 808B3C84 0C00FB56 */ jal DynaPolyInfo_Free - ## DynaPolyInfo_delReserve -/* 00328 808B3C88 8DC6014C */ lw $a2, 0x014C($t6) ## 0000014C -/* 0032C 808B3C8C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00330 808B3C90 3C01808B */ lui $at, %hi(D_808B4590) ## $at = 808B0000 -/* 00334 808B3C94 A4204590 */ sh $zero, %lo(D_808B4590)($at) -/* 00338 808B3C98 03E00008 */ jr $ra -/* 0033C 808B3C9C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/BgSpot15Rrbox_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/BgSpot15Rrbox_Draw.s deleted file mode 100644 index 6ba5147cfc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/BgSpot15Rrbox_Draw.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel BgSpot15Rrbox_Draw -/* 00BF8 808B4558 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00BFC 808B455C AFA40018 */ sw $a0, 0x0018($sp) -/* 00C00 808B4560 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00C04 808B4564 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00C08 808B4568 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00C0C 808B456C 0C00D498 */ jal Gfx_DrawDListOpa - -/* 00C10 808B4570 24A50180 */ addiu $a1, $a1, 0x0180 ## $a1 = 06000180 -/* 00C14 808B4574 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00C18 808B4578 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00C1C 808B457C 03E00008 */ jr $ra -/* 00C20 808B4580 00000000 */ nop -/* 00C24 808B4584 00000000 */ nop -/* 00C28 808B4588 00000000 */ nop -/* 00C2C 808B458C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/BgSpot15Rrbox_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/BgSpot15Rrbox_Init.s deleted file mode 100644 index d021b5a137..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/BgSpot15Rrbox_Init.s +++ /dev/null @@ -1,66 +0,0 @@ -.rdata -glabel D_808B4678 - .asciz "(spot15 ロンロン木箱)(arg_data 0x%04x)\n" - .balign 4 - -.text -glabel BgSpot15Rrbox_Init -/* 00234 808B3B94 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00238 808B3B98 AFBF001C */ sw $ra, 0x001C($sp) -/* 0023C 808B3B9C AFB00018 */ sw $s0, 0x0018($sp) -/* 00240 808B3BA0 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 00244 808B3BA4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00248 808B3BA8 AFA50024 */ sw $a1, 0x0024($sp) -/* 0024C 808B3BAC 24C60348 */ addiu $a2, $a2, 0x0348 ## $a2 = 06000348 -/* 00250 808B3BB0 0C22CE58 */ jal func_808B3960 -/* 00254 808B3BB4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00258 808B3BB8 3C05808B */ lui $a1, %hi(D_808B45B4) ## $a1 = 808B0000 -/* 0025C 808B3BBC 24A545B4 */ addiu $a1, $a1, %lo(D_808B45B4) ## $a1 = 808B45B4 -/* 00260 808B3BC0 0C01E037 */ jal Actor_ProcessInitChain - -/* 00264 808B3BC4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00268 808B3BC8 0C22CE8D */ jal func_808B3A34 -/* 0026C 808B3BCC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00270 808B3BD0 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 00274 808B3BD4 8FA40024 */ lw $a0, 0x0024($sp) -/* 00278 808B3BD8 0C00B2D0 */ jal Flags_GetSwitch - -/* 0027C 808B3BDC 30A5003F */ andi $a1, $a1, 0x003F ## $a1 = 00000000 -/* 00280 808B3BE0 10400016 */ beq $v0, $zero, .L808B3C3C -/* 00284 808B3BE4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00288 808B3BE8 0C22D12E */ jal func_808B44B8 -/* 0028C 808B3BEC 8FA50024 */ lw $a1, 0x0024($sp) -/* 00290 808B3BF0 3C02808B */ lui $v0, %hi(D_808B4590) ## $v0 = 808B0000 -/* 00294 808B3BF4 24424590 */ addiu $v0, $v0, %lo(D_808B4590) ## $v0 = 808B4590 -/* 00298 808B3BF8 844E0000 */ lh $t6, 0x0000($v0) ## 808B4590 -/* 0029C 808B3BFC 3C18808B */ lui $t8, %hi(D_808B45C4) ## $t8 = 808B0000 -/* 002A0 808B3C00 271845C4 */ addiu $t8, $t8, %lo(D_808B45C4) ## $t8 = 808B45C4 -/* 002A4 808B3C04 000E7880 */ sll $t7, $t6, 2 -/* 002A8 808B3C08 01EE7823 */ subu $t7, $t7, $t6 -/* 002AC 808B3C0C 000F7880 */ sll $t7, $t7, 2 -/* 002B0 808B3C10 01F8C821 */ addu $t9, $t7, $t8 -/* 002B4 808B3C14 8F290000 */ lw $t1, 0x0000($t9) ## 00000000 -/* 002B8 808B3C18 AE090024 */ sw $t1, 0x0024($s0) ## 00000024 -/* 002BC 808B3C1C 8F280004 */ lw $t0, 0x0004($t9) ## 00000004 -/* 002C0 808B3C20 AE080028 */ sw $t0, 0x0028($s0) ## 00000028 -/* 002C4 808B3C24 8F290008 */ lw $t1, 0x0008($t9) ## 00000008 -/* 002C8 808B3C28 AE09002C */ sw $t1, 0x002C($s0) ## 0000002C -/* 002CC 808B3C2C 844A0000 */ lh $t2, 0x0000($v0) ## 808B4590 -/* 002D0 808B3C30 254B0001 */ addiu $t3, $t2, 0x0001 ## $t3 = 00000001 -/* 002D4 808B3C34 10000004 */ beq $zero, $zero, .L808B3C48 -/* 002D8 808B3C38 A44B0000 */ sh $t3, 0x0000($v0) ## 808B4590 -.L808B3C3C: -/* 002DC 808B3C3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 002E0 808B3C40 0C22D021 */ jal func_808B4084 -/* 002E4 808B3C44 8FA50024 */ lw $a1, 0x0024($sp) -.L808B3C48: -/* 002E8 808B3C48 3C04808B */ lui $a0, %hi(D_808B4678) ## $a0 = 808B0000 -/* 002EC 808B3C4C 24844678 */ addiu $a0, $a0, %lo(D_808B4678) ## $a0 = 808B4678 -/* 002F0 808B3C50 0C00084C */ jal osSyncPrintf - -/* 002F4 808B3C54 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 002F8 808B3C58 8FBF001C */ lw $ra, 0x001C($sp) -/* 002FC 808B3C5C 8FB00018 */ lw $s0, 0x0018($sp) -/* 00300 808B3C60 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00304 808B3C64 03E00008 */ jr $ra -/* 00308 808B3C68 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/BgSpot15Rrbox_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/BgSpot15Rrbox_Update.s deleted file mode 100644 index 2f2803a498..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/BgSpot15Rrbox_Update.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel BgSpot15Rrbox_Update -/* 00B8C 808B44EC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00B90 808B44F0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00B94 808B44F4 AFA5001C */ sw $a1, 0x001C($sp) -/* 00B98 808B44F8 84820168 */ lh $v0, 0x0168($a0) ## 00000168 -/* 00B9C 808B44FC 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00BA0 808B4500 18400002 */ blez $v0, .L808B450C -/* 00BA4 808B4504 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 00BA8 808B4508 A48E0168 */ sh $t6, 0x0168($a0) ## 00000168 -.L808B450C: -/* 00BAC 808B450C 84CF0158 */ lh $t7, 0x0158($a2) ## 00000158 -/* 00BB0 808B4510 A4CF0032 */ sh $t7, 0x0032($a2) ## 00000032 -/* 00BB4 808B4514 84C40032 */ lh $a0, 0x0032($a2) ## 00000032 -/* 00BB8 808B4518 0C01DE1C */ jal Math_Sins - ## sins? -/* 00BBC 808B451C AFA60018 */ sw $a2, 0x0018($sp) -/* 00BC0 808B4520 8FA60018 */ lw $a2, 0x0018($sp) -/* 00BC4 808B4524 E4C0016C */ swc1 $f0, 0x016C($a2) ## 0000016C -/* 00BC8 808B4528 0C01DE0D */ jal Math_Coss - ## coss? -/* 00BCC 808B452C 84C40032 */ lh $a0, 0x0032($a2) ## 00000032 -/* 00BD0 808B4530 8FA40018 */ lw $a0, 0x0018($sp) -/* 00BD4 808B4534 8C990164 */ lw $t9, 0x0164($a0) ## 00000164 -/* 00BD8 808B4538 E4800170 */ swc1 $f0, 0x0170($a0) ## 00000170 -/* 00BDC 808B453C 8FA5001C */ lw $a1, 0x001C($sp) -/* 00BE0 808B4540 0320F809 */ jalr $ra, $t9 -/* 00BE4 808B4544 00000000 */ nop -/* 00BE8 808B4548 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00BEC 808B454C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00BF0 808B4550 03E00008 */ jr $ra -/* 00BF4 808B4554 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3960.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3960.s deleted file mode 100644 index 4dd4cc369d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3960.s +++ /dev/null @@ -1,52 +0,0 @@ -.rdata -glabel D_808B4620 - .asciz "Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n" - .balign 4 - -.balign 4 - -glabel D_808B4660 - .asciz "../z_bg_spot15_rrbox.c" - .balign 4 - -.text -glabel func_808B3960 -/* 00000 808B3960 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00004 808B3964 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00008 808B3968 AFB00020 */ sw $s0, 0x0020($sp) -/* 0000C 808B396C AFA5003C */ sw $a1, 0x003C($sp) -/* 00010 808B3970 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00014 808B3974 AFA60040 */ sw $a2, 0x0040($sp) -/* 00018 808B3978 AFA00030 */ sw $zero, 0x0030($sp) -/* 0001C 808B397C 0C010D20 */ jal DynaPolyInfo_SetActorMove - -/* 00020 808B3980 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 00024 808B3984 8FA40040 */ lw $a0, 0x0040($sp) -/* 00028 808B3988 0C010620 */ jal DynaPolyInfo_Alloc - -/* 0002C 808B398C 27A50030 */ addiu $a1, $sp, 0x0030 ## $a1 = FFFFFFF8 -/* 00030 808B3990 8FA4003C */ lw $a0, 0x003C($sp) -/* 00034 808B3994 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00038 808B3998 8FA70030 */ lw $a3, 0x0030($sp) -/* 0003C 808B399C 0C00FA9D */ jal DynaPolyInfo_RegisterActor - ## DynaPolyInfo_setActor -/* 00040 808B39A0 24850810 */ addiu $a1, $a0, 0x0810 ## $a1 = 00000810 -/* 00044 808B39A4 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 00048 808B39A8 1441000A */ bne $v0, $at, .L808B39D4 -/* 0004C 808B39AC AE02014C */ sw $v0, 0x014C($s0) ## 0000014C -/* 00050 808B39B0 860E001C */ lh $t6, 0x001C($s0) ## 0000001C -/* 00054 808B39B4 3C04808B */ lui $a0, %hi(D_808B4620) ## $a0 = 808B0000 -/* 00058 808B39B8 3C05808B */ lui $a1, %hi(D_808B4660) ## $a1 = 808B0000 -/* 0005C 808B39BC 86070000 */ lh $a3, 0x0000($s0) ## 00000000 -/* 00060 808B39C0 24A54660 */ addiu $a1, $a1, %lo(D_808B4660) ## $a1 = 808B4660 -/* 00064 808B39C4 24844620 */ addiu $a0, $a0, %lo(D_808B4620) ## $a0 = 808B4620 -/* 00068 808B39C8 240600AB */ addiu $a2, $zero, 0x00AB ## $a2 = 000000AB -/* 0006C 808B39CC 0C00084C */ jal osSyncPrintf - -/* 00070 808B39D0 AFAE0010 */ sw $t6, 0x0010($sp) -.L808B39D4: -/* 00074 808B39D4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00078 808B39D8 8FB00020 */ lw $s0, 0x0020($sp) -/* 0007C 808B39DC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00080 808B39E0 03E00008 */ jr $ra -/* 00084 808B39E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B39E8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B39E8.s deleted file mode 100644 index bca2cfbfec..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B39E8.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_808B39E8 -/* 00088 808B39E8 44866000 */ mtc1 $a2, $f12 ## $f12 = 0.00 -/* 0008C 808B39EC C4A40008 */ lwc1 $f4, 0x0008($a1) ## 00000008 -/* 00090 808B39F0 44877000 */ mtc1 $a3, $f14 ## $f14 = 0.00 -/* 00094 808B39F4 C4A80000 */ lwc1 $f8, 0x0000($a1) ## 00000000 -/* 00098 808B39F8 460C2182 */ mul.s $f6, $f4, $f12 -/* 0009C 808B39FC 00000000 */ nop -/* 000A0 808B3A00 460E4282 */ mul.s $f10, $f8, $f14 -/* 000A4 808B3A04 460A3400 */ add.s $f16, $f6, $f10 -/* 000A8 808B3A08 E4900000 */ swc1 $f16, 0x0000($a0) ## 00000000 -/* 000AC 808B3A0C C4B20004 */ lwc1 $f18, 0x0004($a1) ## 00000004 -/* 000B0 808B3A10 E4920004 */ swc1 $f18, 0x0004($a0) ## 00000004 -/* 000B4 808B3A14 C4A40008 */ lwc1 $f4, 0x0008($a1) ## 00000008 -/* 000B8 808B3A18 C4A60000 */ lwc1 $f6, 0x0000($a1) ## 00000000 -/* 000BC 808B3A1C 460E2202 */ mul.s $f8, $f4, $f14 -/* 000C0 808B3A20 00000000 */ nop -/* 000C4 808B3A24 460C3282 */ mul.s $f10, $f6, $f12 -/* 000C8 808B3A28 460A4401 */ sub.s $f16, $f8, $f10 -/* 000CC 808B3A2C 03E00008 */ jr $ra -/* 000D0 808B3A30 E4900008 */ swc1 $f16, 0x0008($a0) ## 00000008 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3A34.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3A34.s deleted file mode 100644 index f6e7846b6e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3A34.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_808B3A34 -/* 000D4 808B3A34 240E0032 */ addiu $t6, $zero, 0x0032 ## $t6 = 00000032 -/* 000D8 808B3A38 03E00008 */ jr $ra -/* 000DC 808B3A3C AC8E0180 */ sw $t6, 0x0180($a0) ## 00000180 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3A40.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3A40.s deleted file mode 100644 index 39366ad429..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3A40.s +++ /dev/null @@ -1,36 +0,0 @@ -.late_rodata -glabel D_808B46F4 - .float 0.01 - -.text -glabel func_808B3A40 -/* 000E0 808B3A40 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 000E4 808B3A44 AFA40018 */ sw $a0, 0x0018($sp) -/* 000E8 808B3A48 8FAE0018 */ lw $t6, 0x0018($sp) -/* 000EC 808B3A4C AFBF0014 */ sw $ra, 0x0014($sp) -/* 000F0 808B3A50 24A407C0 */ addiu $a0, $a1, 0x07C0 ## $a0 = 000007C0 -/* 000F4 808B3A54 0C00FAE1 */ jal DynaPolyInfo_GetActor - ## DynaPolyInfo_getActor -/* 000F8 808B3A58 8DC50180 */ lw $a1, 0x0180($t6) ## 00000180 -/* 000FC 808B3A5C 1040000E */ beq $v0, $zero, .L808B3A98 -/* 00100 808B3A60 8FA40018 */ lw $a0, 0x0018($sp) -/* 00104 808B3A64 C44C0024 */ lwc1 $f12, 0x0024($v0) ## 00000024 -/* 00108 808B3A68 C44E002C */ lwc1 $f14, 0x002C($v0) ## 0000002C -/* 0010C 808B3A6C 8C860024 */ lw $a2, 0x0024($a0) ## 00000024 -/* 00110 808B3A70 0C032D65 */ jal Math3D_Dist2DSq -/* 00114 808B3A74 8C87002C */ lw $a3, 0x002C($a0) ## 0000002C -/* 00118 808B3A78 3C01808B */ lui $at, %hi(D_808B46F4) ## $at = 808B0000 -/* 0011C 808B3A7C C42446F4 */ lwc1 $f4, %lo(D_808B46F4)($at) -/* 00120 808B3A80 4604003C */ c.lt.s $f0, $f4 -/* 00124 808B3A84 00000000 */ nop -/* 00128 808B3A88 45020004 */ bc1fl .L808B3A9C -/* 0012C 808B3A8C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00130 808B3A90 10000002 */ beq $zero, $zero, .L808B3A9C -/* 00134 808B3A94 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L808B3A98: -/* 00138 808B3A98 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L808B3A9C: -/* 0013C 808B3A9C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00140 808B3AA0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00144 808B3AA4 03E00008 */ jr $ra -/* 00148 808B3AA8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3AAC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3AAC.s deleted file mode 100644 index 57bda84abd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3AAC.s +++ /dev/null @@ -1,70 +0,0 @@ -.late_rodata -glabel D_808B46F8 - .word 0x44688000 - -.text -glabel func_808B3AAC -/* 0014C 808B3AAC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00150 808B3AB0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00154 808B3AB4 84AE00A4 */ lh $t6, 0x00A4($a1) ## 000000A4 -/* 00158 808B3AB8 2401004C */ addiu $at, $zero, 0x004C ## $at = 0000004C -/* 0015C 808B3ABC 15C10003 */ bne $t6, $at, .L808B3ACC -/* 00160 808B3AC0 00000000 */ nop -/* 00164 808B3AC4 1000002F */ beq $zero, $zero, .L808B3B84 -/* 00168 808B3AC8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L808B3ACC: -/* 0016C 808B3ACC 0C22CE90 */ jal func_808B3A40 -/* 00170 808B3AD0 AFA40018 */ sw $a0, 0x0018($sp) -/* 00174 808B3AD4 10400003 */ beq $v0, $zero, .L808B3AE4 -/* 00178 808B3AD8 8FA40018 */ lw $a0, 0x0018($sp) -/* 0017C 808B3ADC 10000029 */ beq $zero, $zero, .L808B3B84 -/* 00180 808B3AE0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L808B3AE4: -/* 00184 808B3AE4 3C01808B */ lui $at, %hi(D_808B46F8) ## $at = 808B0000 -/* 00188 808B3AE8 C42446F8 */ lwc1 $f4, %lo(D_808B46F8)($at) -/* 0018C 808B3AEC C4860024 */ lwc1 $f6, 0x0024($a0) ## 00000024 -/* 00190 808B3AF0 3C01C3B4 */ lui $at, 0xC3B4 ## $at = C3B40000 -/* 00194 808B3AF4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00198 808B3AF8 4604303E */ c.le.s $f6, $f4 -/* 0019C 808B3AFC 00000000 */ nop -/* 001A0 808B3B00 45000020 */ bc1f .L808B3B84 -/* 001A4 808B3B04 00000000 */ nop -/* 001A8 808B3B08 C488002C */ lwc1 $f8, 0x002C($a0) ## 0000002C -/* 001AC 808B3B0C 44815000 */ mtc1 $at, $f10 ## $f10 = -360.00 -/* 001B0 808B3B10 00000000 */ nop -/* 001B4 808B3B14 4608503E */ c.le.s $f10, $f8 -/* 001B8 808B3B18 00000000 */ nop -/* 001BC 808B3B1C 45000019 */ bc1f .L808B3B84 -/* 001C0 808B3B20 00000000 */ nop -/* 001C4 808B3B24 C4900150 */ lwc1 $f16, 0x0150($a0) ## 00000150 -/* 001C8 808B3B28 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 001CC 808B3B2C 00000000 */ nop -/* 001D0 808B3B30 4610903E */ c.le.s $f18, $f16 -/* 001D4 808B3B34 00000000 */ nop -/* 001D8 808B3B38 45020004 */ bc1fl .L808B3B4C -/* 001DC 808B3B3C 84820032 */ lh $v0, 0x0032($a0) ## 00000032 -/* 001E0 808B3B40 10000006 */ beq $zero, $zero, .L808B3B5C -/* 001E4 808B3B44 84820032 */ lh $v0, 0x0032($a0) ## 00000032 -/* 001E8 808B3B48 84820032 */ lh $v0, 0x0032($a0) ## 00000032 -.L808B3B4C: -/* 001EC 808B3B4C 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 001F0 808B3B50 00411021 */ addu $v0, $v0, $at -/* 001F4 808B3B54 00021400 */ sll $v0, $v0, 16 -/* 001F8 808B3B58 00021403 */ sra $v0, $v0, 16 -.L808B3B5C: -/* 001FC 808B3B5C 28412000 */ slti $at, $v0, 0x2000 -/* 00200 808B3B60 10200006 */ beq $at, $zero, .L808B3B7C -/* 00204 808B3B64 2841A001 */ slti $at, $v0, 0xA001 -/* 00208 808B3B68 14200004 */ bne $at, $zero, .L808B3B7C -/* 0020C 808B3B6C 3C028016 */ lui $v0, %hi(gSaveContext+0xed6) -/* 00210 808B3B70 9442F536 */ lhu $v0, %lo(gSaveContext+0xed6)($v0) -/* 00214 808B3B74 10000003 */ beq $zero, $zero, .L808B3B84 -/* 00218 808B3B78 30420010 */ andi $v0, $v0, 0x0010 ## $v0 = 00000000 -.L808B3B7C: -/* 0021C 808B3B7C 10000001 */ beq $zero, $zero, .L808B3B84 -/* 00220 808B3B80 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L808B3B84: -/* 00224 808B3B84 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00228 808B3B88 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0022C 808B3B8C 03E00008 */ jr $ra -/* 00230 808B3B90 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3CA0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3CA0.s deleted file mode 100644 index 691af6573c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3CA0.s +++ /dev/null @@ -1,86 +0,0 @@ -.late_rodata -glabel D_808B46FC - .word 0xBA83126F - -.text -glabel func_808B3CA0 -/* 00340 808B3CA0 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 00344 808B3CA4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00348 808B3CA8 AFB00020 */ sw $s0, 0x0020($sp) -/* 0034C 808B3CAC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00350 808B3CB0 AFA5004C */ sw $a1, 0x004C($sp) -/* 00354 808B3CB4 0C22CE8D */ jal func_808B3A34 -/* 00358 808B3CB8 AFA60050 */ sw $a2, 0x0050($sp) -/* 0035C 808B3CBC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00360 808B3CC0 44810000 */ mtc1 $at, $f0 ## $f0 = 10.00 -/* 00364 808B3CC4 8FAE0050 */ lw $t6, 0x0050($sp) -/* 00368 808B3CC8 C6060050 */ lwc1 $f6, 0x0050($s0) ## 00000050 -/* 0036C 808B3CCC 3C18808B */ lui $t8, %hi(D_808B45DC) ## $t8 = 808B0000 -/* 00370 808B3CD0 000E7880 */ sll $t7, $t6, 2 -/* 00374 808B3CD4 46003202 */ mul.s $f8, $f6, $f0 -/* 00378 808B3CD8 01EE7823 */ subu $t7, $t7, $t6 -/* 0037C 808B3CDC 000F7880 */ sll $t7, $t7, 2 -/* 00380 808B3CE0 271845DC */ addiu $t8, $t8, %lo(D_808B45DC) ## $t8 = 808B45DC -/* 00384 808B3CE4 01F81021 */ addu $v0, $t7, $t8 -/* 00388 808B3CE8 C4440000 */ lwc1 $f4, 0x0000($v0) ## 00000000 -/* 0038C 808B3CEC C4500004 */ lwc1 $f16, 0x0004($v0) ## 00000004 -/* 00390 808B3CF0 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFF0 -/* 00394 808B3CF4 46082282 */ mul.s $f10, $f4, $f8 -/* 00398 808B3CF8 C4480008 */ lwc1 $f8, 0x0008($v0) ## 00000008 -/* 0039C 808B3CFC 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFE4 -/* 003A0 808B3D00 E7AA002C */ swc1 $f10, 0x002C($sp) -/* 003A4 808B3D04 C6120054 */ lwc1 $f18, 0x0054($s0) ## 00000054 -/* 003A8 808B3D08 46009182 */ mul.s $f6, $f18, $f0 -/* 003AC 808B3D0C 00000000 */ nop -/* 003B0 808B3D10 46068102 */ mul.s $f4, $f16, $f6 -/* 003B4 808B3D14 E7A40030 */ swc1 $f4, 0x0030($sp) -/* 003B8 808B3D18 C60A0058 */ lwc1 $f10, 0x0058($s0) ## 00000058 -/* 003BC 808B3D1C 46005482 */ mul.s $f18, $f10, $f0 -/* 003C0 808B3D20 00000000 */ nop -/* 003C4 808B3D24 46124402 */ mul.s $f16, $f8, $f18 -/* 003C8 808B3D28 E7B00034 */ swc1 $f16, 0x0034($sp) -/* 003CC 808B3D2C 8E070170 */ lw $a3, 0x0170($s0) ## 00000170 -/* 003D0 808B3D30 0C22CE7A */ jal func_808B39E8 -/* 003D4 808B3D34 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C -/* 003D8 808B3D38 C7A60038 */ lwc1 $f6, 0x0038($sp) -/* 003DC 808B3D3C C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 003E0 808B3D40 C7A8003C */ lwc1 $f8, 0x003C($sp) -/* 003E4 808B3D44 8FA4004C */ lw $a0, 0x004C($sp) -/* 003E8 808B3D48 46043280 */ add.s $f10, $f6, $f4 -/* 003EC 808B3D4C C7A60040 */ lwc1 $f6, 0x0040($sp) -/* 003F0 808B3D50 27B90038 */ addiu $t9, $sp, 0x0038 ## $t9 = FFFFFFF0 -/* 003F4 808B3D54 26050078 */ addiu $a1, $s0, 0x0078 ## $a1 = 00000078 -/* 003F8 808B3D58 E7AA0038 */ swc1 $f10, 0x0038($sp) -/* 003FC 808B3D5C C6120104 */ lwc1 $f18, 0x0104($s0) ## 00000104 -/* 00400 808B3D60 26060180 */ addiu $a2, $s0, 0x0180 ## $a2 = 00000180 -/* 00404 808B3D64 02003825 */ or $a3, $s0, $zero ## $a3 = 00000000 -/* 00408 808B3D68 46124400 */ add.s $f16, $f8, $f18 -/* 0040C 808B3D6C 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 00410 808B3D70 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 -/* 00414 808B3D74 E7B0003C */ swc1 $f16, 0x003C($sp) -/* 00418 808B3D78 C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C -/* 0041C 808B3D7C AFB90010 */ sw $t9, 0x0010($sp) -/* 00420 808B3D80 E7A80014 */ swc1 $f8, 0x0014($sp) -/* 00424 808B3D84 46043280 */ add.s $f10, $f6, $f4 -/* 00428 808B3D88 0C00F299 */ jal func_8003CA64 -/* 0042C 808B3D8C E7AA0040 */ swc1 $f10, 0x0040($sp) -/* 00430 808B3D90 C6120028 */ lwc1 $f18, 0x0028($s0) ## 00000028 -/* 00434 808B3D94 E6000080 */ swc1 $f0, 0x0080($s0) ## 00000080 -/* 00438 808B3D98 3C01808B */ lui $at, %hi(D_808B46FC) ## $at = 808B0000 -/* 0043C 808B3D9C 46120401 */ sub.s $f16, $f0, $f18 -/* 00440 808B3DA0 C42646FC */ lwc1 $f6, %lo(D_808B46FC)($at) -/* 00444 808B3DA4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00448 808B3DA8 4610303E */ c.le.s $f6, $f16 -/* 0044C 808B3DAC 00000000 */ nop -/* 00450 808B3DB0 45000005 */ bc1f .L808B3DC8 -/* 00454 808B3DB4 00000000 */ nop -/* 00458 808B3DB8 C6040080 */ lwc1 $f4, 0x0080($s0) ## 00000080 -/* 0045C 808B3DBC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00460 808B3DC0 10000001 */ beq $zero, $zero, .L808B3DC8 -/* 00464 808B3DC4 E6040028 */ swc1 $f4, 0x0028($s0) ## 00000028 -.L808B3DC8: -/* 00468 808B3DC8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0046C 808B3DCC 8FB00020 */ lw $s0, 0x0020($sp) -/* 00470 808B3DD0 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 00474 808B3DD4 03E00008 */ jr $ra -/* 00478 808B3DD8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3DDC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3DDC.s deleted file mode 100644 index c8aa0ca69f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3DDC.s +++ /dev/null @@ -1,98 +0,0 @@ -glabel func_808B3DDC -/* 0047C 808B3DDC 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 -/* 00480 808B3DE0 F7B60020 */ sdc1 $f22, 0x0020($sp) -/* 00484 808B3DE4 3C01C6FA */ lui $at, 0xC6FA ## $at = C6FA0000 -/* 00488 808B3DE8 AFBF0054 */ sw $ra, 0x0054($sp) -/* 0048C 808B3DEC AFB2003C */ sw $s2, 0x003C($sp) -/* 00490 808B3DF0 AFB00034 */ sw $s0, 0x0034($sp) -/* 00494 808B3DF4 4481B000 */ mtc1 $at, $f22 ## $f22 = -32000.00 -/* 00498 808B3DF8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0049C 808B3DFC 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 004A0 808B3E00 AFB70050 */ sw $s7, 0x0050($sp) -/* 004A4 808B3E04 AFB6004C */ sw $s6, 0x004C($sp) -/* 004A8 808B3E08 AFB50048 */ sw $s5, 0x0048($sp) -/* 004AC 808B3E0C AFB40044 */ sw $s4, 0x0044($sp) -/* 004B0 808B3E10 AFB30040 */ sw $s3, 0x0040($sp) -/* 004B4 808B3E14 AFB10038 */ sw $s1, 0x0038($sp) -/* 004B8 808B3E18 F7B80028 */ sdc1 $f24, 0x0028($sp) -/* 004BC 808B3E1C 0C22CE8D */ jal func_808B3A34 -/* 004C0 808B3E20 F7B40018 */ sdc1 $f20, 0x0018($sp) -/* 004C4 808B3E24 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 004C8 808B3E28 3C11808B */ lui $s1, %hi(D_808B45DC) ## $s1 = 808B0000 -/* 004CC 808B3E2C 265607C0 */ addiu $s6, $s2, 0x07C0 ## $s6 = 000007C0 -/* 004D0 808B3E30 3C15808B */ lui $s5, %hi(D_808B4618) ## $s5 = 808B0000 -/* 004D4 808B3E34 4481A000 */ mtc1 $at, $f20 ## $f20 = 10.00 -/* 004D8 808B3E38 4480C000 */ mtc1 $zero, $f24 ## $f24 = 0.00 -/* 004DC 808B3E3C 26B54618 */ addiu $s5, $s5, %lo(D_808B4618) ## $s5 = 808B4618 -/* 004E0 808B3E40 27B20080 */ addiu $s2, $sp, 0x0080 ## $s2 = FFFFFFF0 -/* 004E4 808B3E44 263145DC */ addiu $s1, $s1, %lo(D_808B45DC) ## $s1 = 808B45DC -/* 004E8 808B3E48 26170078 */ addiu $s7, $s0, 0x0078 ## $s7 = 00000078 -/* 004EC 808B3E4C 27B40064 */ addiu $s4, $sp, 0x0064 ## $s4 = FFFFFFD4 -/* 004F0 808B3E50 27B30074 */ addiu $s3, $sp, 0x0074 ## $s3 = FFFFFFE4 -/* 004F4 808B3E54 C6060050 */ lwc1 $f6, 0x0050($s0) ## 00000050 -.L808B3E58: -/* 004F8 808B3E58 C6240000 */ lwc1 $f4, 0x0000($s1) ## 808B45DC -/* 004FC 808B3E5C C6300004 */ lwc1 $f16, 0x0004($s1) ## 808B45E0 -/* 00500 808B3E60 46143202 */ mul.s $f8, $f6, $f20 -/* 00504 808B3E64 02402025 */ or $a0, $s2, $zero ## $a0 = FFFFFFF0 -/* 00508 808B3E68 02602825 */ or $a1, $s3, $zero ## $a1 = FFFFFFE4 -/* 0050C 808B3E6C 46082282 */ mul.s $f10, $f4, $f8 -/* 00510 808B3E70 C6280008 */ lwc1 $f8, 0x0008($s1) ## 808B45E4 -/* 00514 808B3E74 E7AA0074 */ swc1 $f10, 0x0074($sp) -/* 00518 808B3E78 C6120054 */ lwc1 $f18, 0x0054($s0) ## 00000054 -/* 0051C 808B3E7C 46149182 */ mul.s $f6, $f18, $f20 -/* 00520 808B3E80 00000000 */ nop -/* 00524 808B3E84 46068102 */ mul.s $f4, $f16, $f6 -/* 00528 808B3E88 E7A40078 */ swc1 $f4, 0x0078($sp) -/* 0052C 808B3E8C C60A0058 */ lwc1 $f10, 0x0058($s0) ## 00000058 -/* 00530 808B3E90 46145482 */ mul.s $f18, $f10, $f20 -/* 00534 808B3E94 00000000 */ nop -/* 00538 808B3E98 46124402 */ mul.s $f16, $f8, $f18 -/* 0053C 808B3E9C E7B0007C */ swc1 $f16, 0x007C($sp) -/* 00540 808B3EA0 8E070170 */ lw $a3, 0x0170($s0) ## 00000170 -/* 00544 808B3EA4 0C22CE7A */ jal func_808B39E8 -/* 00548 808B3EA8 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C -/* 0054C 808B3EAC C7A60080 */ lwc1 $f6, 0x0080($sp) -/* 00550 808B3EB0 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 00554 808B3EB4 C7A80084 */ lwc1 $f8, 0x0084($sp) -/* 00558 808B3EB8 02C02025 */ or $a0, $s6, $zero ## $a0 = 000007C0 -/* 0055C 808B3EBC 46043280 */ add.s $f10, $f6, $f4 -/* 00560 808B3EC0 C7A60088 */ lwc1 $f6, 0x0088($sp) -/* 00564 808B3EC4 02E02825 */ or $a1, $s7, $zero ## $a1 = 00000078 -/* 00568 808B3EC8 02803025 */ or $a2, $s4, $zero ## $a2 = FFFFFFD4 -/* 0056C 808B3ECC E7AA0080 */ swc1 $f10, 0x0080($sp) -/* 00570 808B3ED0 C6120104 */ lwc1 $f18, 0x0104($s0) ## 00000104 -/* 00574 808B3ED4 02003825 */ or $a3, $s0, $zero ## $a3 = 00000000 -/* 00578 808B3ED8 46124400 */ add.s $f16, $f8, $f18 -/* 0057C 808B3EDC E7B00084 */ swc1 $f16, 0x0084($sp) -/* 00580 808B3EE0 C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C -/* 00584 808B3EE4 E7B80014 */ swc1 $f24, 0x0014($sp) -/* 00588 808B3EE8 AFB20010 */ sw $s2, 0x0010($sp) -/* 0058C 808B3EEC 46043280 */ add.s $f10, $f6, $f4 -/* 00590 808B3EF0 0C00F299 */ jal func_8003CA64 -/* 00594 808B3EF4 E7AA0088 */ swc1 $f10, 0x0088($sp) -/* 00598 808B3EF8 4600B03C */ c.lt.s $f22, $f0 -/* 0059C 808B3EFC 2631000C */ addiu $s1, $s1, 0x000C ## $s1 = 808B45E8 -/* 005A0 808B3F00 8FAE0064 */ lw $t6, 0x0064($sp) -/* 005A4 808B3F04 45000003 */ bc1f .L808B3F14 -/* 005A8 808B3F08 00000000 */ nop -/* 005AC 808B3F0C 46000586 */ mov.s $f22, $f0 -/* 005B0 808B3F10 AE0E0180 */ sw $t6, 0x0180($s0) ## 00000180 -.L808B3F14: -/* 005B4 808B3F14 5635FFD0 */ bnel $s1, $s5, .L808B3E58 -/* 005B8 808B3F18 C6060050 */ lwc1 $f6, 0x0050($s0) ## 00000050 -/* 005BC 808B3F1C 8FBF0054 */ lw $ra, 0x0054($sp) -/* 005C0 808B3F20 4600B006 */ mov.s $f0, $f22 -/* 005C4 808B3F24 D7B60020 */ ldc1 $f22, 0x0020($sp) -/* 005C8 808B3F28 D7B40018 */ ldc1 $f20, 0x0018($sp) -/* 005CC 808B3F2C D7B80028 */ ldc1 $f24, 0x0028($sp) -/* 005D0 808B3F30 8FB00034 */ lw $s0, 0x0034($sp) -/* 005D4 808B3F34 8FB10038 */ lw $s1, 0x0038($sp) -/* 005D8 808B3F38 8FB2003C */ lw $s2, 0x003C($sp) -/* 005DC 808B3F3C 8FB30040 */ lw $s3, 0x0040($sp) -/* 005E0 808B3F40 8FB40044 */ lw $s4, 0x0044($sp) -/* 005E4 808B3F44 8FB50048 */ lw $s5, 0x0048($sp) -/* 005E8 808B3F48 8FB6004C */ lw $s6, 0x004C($sp) -/* 005EC 808B3F4C 8FB70050 */ lw $s7, 0x0050($sp) -/* 005F0 808B3F50 03E00008 */ jr $ra -/* 005F4 808B3F54 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3F58.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3F58.s deleted file mode 100644 index ecb6eed32b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3F58.s +++ /dev/null @@ -1,52 +0,0 @@ -glabel func_808B3F58 -/* 005F8 808B3F58 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 005FC 808B3F5C AFBF001C */ sw $ra, 0x001C($sp) -/* 00600 808B3F60 AFB10018 */ sw $s1, 0x0018($sp) -/* 00604 808B3F64 AFB00014 */ sw $s0, 0x0014($sp) -/* 00608 808B3F68 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0060C 808B3F6C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00610 808B3F70 0C22CF28 */ jal func_808B3CA0 -/* 00614 808B3F74 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00618 808B3F78 10400003 */ beq $v0, $zero, .L808B3F88 -/* 0061C 808B3F7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00620 808B3F80 1000001E */ beq $zero, $zero, .L808B3FFC -/* 00624 808B3F84 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L808B3F88: -/* 00628 808B3F88 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0062C 808B3F8C 0C22CF28 */ jal func_808B3CA0 -/* 00630 808B3F90 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00634 808B3F94 10400003 */ beq $v0, $zero, .L808B3FA4 -/* 00638 808B3F98 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0063C 808B3F9C 10000017 */ beq $zero, $zero, .L808B3FFC -/* 00640 808B3FA0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L808B3FA4: -/* 00644 808B3FA4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00648 808B3FA8 0C22CF28 */ jal func_808B3CA0 -/* 0064C 808B3FAC 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 00650 808B3FB0 10400003 */ beq $v0, $zero, .L808B3FC0 -/* 00654 808B3FB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00658 808B3FB8 10000010 */ beq $zero, $zero, .L808B3FFC -/* 0065C 808B3FBC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L808B3FC0: -/* 00660 808B3FC0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00664 808B3FC4 0C22CF28 */ jal func_808B3CA0 -/* 00668 808B3FC8 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 0066C 808B3FCC 10400003 */ beq $v0, $zero, .L808B3FDC -/* 00670 808B3FD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00674 808B3FD4 10000009 */ beq $zero, $zero, .L808B3FFC -/* 00678 808B3FD8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L808B3FDC: -/* 0067C 808B3FDC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00680 808B3FE0 0C22CF28 */ jal func_808B3CA0 -/* 00684 808B3FE4 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 00688 808B3FE8 50400004 */ beql $v0, $zero, .L808B3FFC -/* 0068C 808B3FEC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00690 808B3FF0 10000002 */ beq $zero, $zero, .L808B3FFC -/* 00694 808B3FF4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00698 808B3FF8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L808B3FFC: -/* 0069C 808B3FFC 8FBF001C */ lw $ra, 0x001C($sp) -/* 006A0 808B4000 8FB00014 */ lw $s0, 0x0014($sp) -/* 006A4 808B4004 8FB10018 */ lw $s1, 0x0018($sp) -/* 006A8 808B4008 03E00008 */ jr $ra -/* 006AC 808B400C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B4010.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B4010.s deleted file mode 100644 index 53ef67f0a6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B4010.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_808B4010 -/* 006B0 808B4010 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 006B4 808B4014 AFA50024 */ sw $a1, 0x0024($sp) -/* 006B8 808B4018 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 006BC 808B401C AFBF001C */ sw $ra, 0x001C($sp) -/* 006C0 808B4020 AFA40020 */ sw $a0, 0x0020($sp) -/* 006C4 808B4024 3C014391 */ lui $at, 0x4391 ## $at = 43910000 -/* 006C8 808B4028 44813000 */ mtc1 $at, $f6 ## $f6 = 290.00 -/* 006CC 808B402C C4A40050 */ lwc1 $f4, 0x0050($a1) ## 00000050 -/* 006D0 808B4030 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 006D4 808B4034 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 -/* 006D8 808B4038 46062002 */ mul.s $f0, $f4, $f6 -/* 006DC 808B403C 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 006E0 808B4040 AFB80010 */ sw $t8, 0x0010($sp) -/* 006E4 808B4044 8FA40024 */ lw $a0, 0x0024($sp) -/* 006E8 808B4048 460A0400 */ add.s $f16, $f0, $f10 -/* 006EC 808B404C 4600020D */ trunc.w.s $f8, $f0 -/* 006F0 808B4050 4600848D */ trunc.w.s $f18, $f16 -/* 006F4 808B4054 44064000 */ mfc1 $a2, $f8 -/* 006F8 808B4058 44079000 */ mfc1 $a3, $f18 -/* 006FC 808B405C 00063400 */ sll $a2, $a2, 16 -/* 00700 808B4060 00063403 */ sra $a2, $a2, 16 -/* 00704 808B4064 00073C00 */ sll $a3, $a3, 16 -/* 00708 808B4068 0C010D76 */ jal func_800435D8 -/* 0070C 808B406C 00073C03 */ sra $a3, $a3, 16 -/* 00710 808B4070 8FBF001C */ lw $ra, 0x001C($sp) -/* 00714 808B4074 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00718 808B4078 2C420001 */ sltiu $v0, $v0, 0x0001 -/* 0071C 808B407C 03E00008 */ jr $ra -/* 00720 808B4080 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B4084.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B4084.s deleted file mode 100644 index e4394898f0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B4084.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_808B4084 -/* 00724 808B4084 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00728 808B4088 AFA50004 */ sw $a1, 0x0004($sp) -/* 0072C 808B408C 3C0E808B */ lui $t6, %hi(func_808B40AC) ## $t6 = 808B0000 -/* 00730 808B4090 25CE40AC */ addiu $t6, $t6, %lo(func_808B40AC) ## $t6 = 808B40AC -/* 00734 808B4094 AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 -/* 00738 808B4098 E480006C */ swc1 $f0, 0x006C($a0) ## 0000006C -/* 0073C 808B409C E480005C */ swc1 $f0, 0x005C($a0) ## 0000005C -/* 00740 808B40A0 E4800060 */ swc1 $f0, 0x0060($a0) ## 00000060 -/* 00744 808B40A4 03E00008 */ jr $ra -/* 00748 808B40A8 E4800064 */ swc1 $f0, 0x0064($a0) ## 00000064 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B40AC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B40AC.s deleted file mode 100644 index b2697a04e7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B40AC.s +++ /dev/null @@ -1,61 +0,0 @@ -.late_rodata -glabel D_808B4700 - .float 0.001 - -.text -glabel func_808B40AC -/* 0074C 808B40AC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00750 808B40B0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00754 808B40B4 848E0168 */ lh $t6, 0x0168($a0) ## 00000168 -/* 00758 808B40B8 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 -/* 0075C 808B40BC 5DC00025 */ bgtzl $t6, .L808B4154 -/* 00760 808B40C0 8C790680 */ lw $t9, 0x0680($v1) ## 00000680 -/* 00764 808B40C4 C4800150 */ lwc1 $f0, 0x0150($a0) ## 00000150 -/* 00768 808B40C8 3C01808B */ lui $at, %hi(D_808B4700) ## $at = 808B0000 -/* 0076C 808B40CC C4244700 */ lwc1 $f4, %lo(D_808B4700)($at) -/* 00770 808B40D0 46000005 */ abs.s $f0, $f0 -/* 00774 808B40D4 4600203C */ c.lt.s $f4, $f0 -/* 00778 808B40D8 00000000 */ nop -/* 0077C 808B40DC 4502001D */ bc1fl .L808B4154 -/* 00780 808B40E0 8C790680 */ lw $t9, 0x0680($v1) ## 00000680 -/* 00784 808B40E4 AFA3001C */ sw $v1, 0x001C($sp) -/* 00788 808B40E8 AFA40020 */ sw $a0, 0x0020($sp) -/* 0078C 808B40EC 0C22CEAB */ jal func_808B3AAC -/* 00790 808B40F0 AFA50024 */ sw $a1, 0x0024($sp) -/* 00794 808B40F4 8FA3001C */ lw $v1, 0x001C($sp) -/* 00798 808B40F8 1040000E */ beq $v0, $zero, .L808B4134 -/* 0079C 808B40FC 8FA40020 */ lw $a0, 0x0020($sp) -/* 007A0 808B4100 8FA50024 */ lw $a1, 0x0024($sp) -/* 007A4 808B4104 AFA3001C */ sw $v1, 0x001C($sp) -/* 007A8 808B4108 0C22D004 */ jal func_808B4010 -/* 007AC 808B410C AFA40020 */ sw $a0, 0x0020($sp) -/* 007B0 808B4110 8FA3001C */ lw $v1, 0x001C($sp) -/* 007B4 808B4114 14400007 */ bne $v0, $zero, .L808B4134 -/* 007B8 808B4118 8FA40020 */ lw $a0, 0x0020($sp) -/* 007BC 808B411C C4860150 */ lwc1 $f6, 0x0150($a0) ## 00000150 -/* 007C0 808B4120 E486017C */ swc1 $f6, 0x017C($a0) ## 0000017C -/* 007C4 808B4124 0C22D05E */ jal func_808B4178 -/* 007C8 808B4128 8FA50024 */ lw $a1, 0x0024($sp) -/* 007CC 808B412C 1000000F */ beq $zero, $zero, .L808B416C -/* 007D0 808B4130 8FBF0014 */ lw $ra, 0x0014($sp) -.L808B4134: -/* 007D4 808B4134 8C6F0680 */ lw $t7, 0x0680($v1) ## 00000680 -/* 007D8 808B4138 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF -/* 007DC 808B413C 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 007E0 808B4140 01E1C024 */ and $t8, $t7, $at -/* 007E4 808B4144 AC780680 */ sw $t8, 0x0680($v1) ## 00000680 -/* 007E8 808B4148 10000007 */ beq $zero, $zero, .L808B4168 -/* 007EC 808B414C E4880150 */ swc1 $f8, 0x0150($a0) ## 00000150 -/* 007F0 808B4150 8C790680 */ lw $t9, 0x0680($v1) ## 00000680 -.L808B4154: -/* 007F4 808B4154 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 007F8 808B4158 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF -/* 007FC 808B415C 03214024 */ and $t0, $t9, $at -/* 00800 808B4160 AC680680 */ sw $t0, 0x0680($v1) ## 00000680 -/* 00804 808B4164 E48A0150 */ swc1 $f10, 0x0150($a0) ## 00000150 -.L808B4168: -/* 00808 808B4168 8FBF0014 */ lw $ra, 0x0014($sp) -.L808B416C: -/* 0080C 808B416C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00810 808B4170 03E00008 */ jr $ra -/* 00814 808B4174 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B4178.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B4178.s deleted file mode 100644 index 1f6a1ec7a0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B4178.s +++ /dev/null @@ -1,8 +0,0 @@ -glabel func_808B4178 -/* 00818 808B4178 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 0081C 808B417C 3C0E808B */ lui $t6, %hi(func_808B4194) ## $t6 = 808B0000 -/* 00820 808B4180 AFA50004 */ sw $a1, 0x0004($sp) -/* 00824 808B4184 25CE4194 */ addiu $t6, $t6, %lo(func_808B4194) ## $t6 = 808B4194 -/* 00828 808B4188 AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 -/* 0082C 808B418C 03E00008 */ jr $ra -/* 00830 808B4190 E484006C */ swc1 $f4, 0x006C($a0) ## 0000006C diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B4194.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B4194.s deleted file mode 100644 index f9671387f7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B4194.s +++ /dev/null @@ -1,135 +0,0 @@ -glabel func_808B4194 -/* 00834 808B4194 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00838 808B4198 AFBF001C */ sw $ra, 0x001C($sp) -/* 0083C 808B419C AFB10018 */ sw $s1, 0x0018($sp) -/* 00840 808B41A0 AFB00014 */ sw $s0, 0x0014($sp) -/* 00844 808B41A4 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 -/* 00848 808B41A8 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 0084C 808B41AC 44811000 */ mtc1 $at, $f2 ## $f2 = 2.00 -/* 00850 808B41B0 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00854 808B41B4 AFAE0028 */ sw $t6, 0x0028($sp) -/* 00858 808B41B8 C4840174 */ lwc1 $f4, 0x0174($a0) ## 00000174 -/* 0085C 808B41BC 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 -/* 00860 808B41C0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00864 808B41C4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00868 808B41C8 46062200 */ add.s $f8, $f4, $f6 -/* 0086C 808B41CC 3C0541A0 */ lui $a1, 0x41A0 ## $a1 = 41A00000 -/* 00870 808B41D0 E4880174 */ swc1 $f8, 0x0174($a0) ## 00000174 -/* 00874 808B41D4 C4800174 */ lwc1 $f0, 0x0174($a0) ## 00000174 -/* 00878 808B41D8 4600103C */ c.lt.s $f2, $f0 -/* 0087C 808B41DC 00000000 */ nop -/* 00880 808B41E0 45020004 */ bc1fl .L808B41F4 -/* 00884 808B41E4 E6000174 */ swc1 $f0, 0x0174($s0) ## 00000174 -/* 00888 808B41E8 10000002 */ beq $zero, $zero, .L808B41F4 -/* 0088C 808B41EC E4820174 */ swc1 $f2, 0x0174($a0) ## 00000174 -/* 00890 808B41F0 E6000174 */ swc1 $f0, 0x0174($s0) ## 00000174 -.L808B41F4: -/* 00894 808B41F4 26040178 */ addiu $a0, $s0, 0x0178 ## $a0 = 00000178 -/* 00898 808B41F8 0C01DE80 */ jal Math_ApproxF - -/* 0089C 808B41FC 8E060174 */ lw $a2, 0x0174($s0) ## 00000174 -/* 008A0 808B4200 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 008A4 808B4204 C60A017C */ lwc1 $f10, 0x017C($s0) ## 0000017C -/* 008A8 808B4208 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -/* 008AC 808B420C 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 008B0 808B4210 460A603E */ c.le.s $f12, $f10 -/* 008B4 808B4214 00000000 */ nop -/* 008B8 808B4218 45020006 */ bc1fl .L808B4234 -/* 008BC 808B421C 44811000 */ mtc1 $at, $f2 ## $f2 = -1.00 -/* 008C0 808B4220 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 008C4 808B4224 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 008C8 808B4228 10000004 */ beq $zero, $zero, .L808B423C -/* 008CC 808B422C C6100178 */ lwc1 $f16, 0x0178($s0) ## 00000178 -/* 008D0 808B4230 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -.L808B4234: -/* 008D4 808B4234 00000000 */ nop -/* 008D8 808B4238 C6100178 */ lwc1 $f16, 0x0178($s0) ## 00000178 -.L808B423C: -/* 008DC 808B423C C604016C */ lwc1 $f4, 0x016C($s0) ## 0000016C -/* 008E0 808B4240 C6120008 */ lwc1 $f18, 0x0008($s0) ## 00000008 -/* 008E4 808B4244 46101002 */ mul.s $f0, $f2, $f16 -/* 008E8 808B4248 C6100170 */ lwc1 $f16, 0x0170($s0) ## 00000170 -/* 008EC 808B424C C60A0010 */ lwc1 $f10, 0x0010($s0) ## 00000010 -/* 008F0 808B4250 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 008F4 808B4254 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 008F8 808B4258 46040182 */ mul.s $f6, $f0, $f4 -/* 008FC 808B425C 00000000 */ nop -/* 00900 808B4260 46100102 */ mul.s $f4, $f0, $f16 -/* 00904 808B4264 46069200 */ add.s $f8, $f18, $f6 -/* 00908 808B4268 46045480 */ add.s $f18, $f10, $f4 -/* 0090C 808B426C E6080024 */ swc1 $f8, 0x0024($s0) ## 00000024 -/* 00910 808B4270 E612002C */ swc1 $f18, 0x002C($s0) ## 0000002C -/* 00914 808B4274 0C22CFD6 */ jal func_808B3F58 -/* 00918 808B4278 AFA30020 */ sw $v1, 0x0020($sp) -/* 0091C 808B427C 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 00920 808B4280 14400012 */ bne $v0, $zero, .L808B42CC -/* 00924 808B4284 8FA30020 */ lw $v1, 0x0020($sp) -/* 00928 808B4288 8FA20028 */ lw $v0, 0x0028($sp) -/* 0092C 808B428C C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 -/* 00930 808B4290 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 00934 808B4294 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF -/* 00938 808B4298 E6060008 */ swc1 $f6, 0x0008($s0) ## 00000008 -/* 0093C 808B429C E6080010 */ swc1 $f8, 0x0010($s0) ## 00000010 -/* 00940 808B42A0 8C4F0680 */ lw $t7, 0x0680($v0) ## 00000680 -/* 00944 808B42A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00948 808B42A8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0094C 808B42AC 01E1C024 */ and $t8, $t7, $at -/* 00950 808B42B0 AC580680 */ sw $t8, 0x0680($v0) ## 00000680 -/* 00954 808B42B4 E60C0150 */ swc1 $f12, 0x0150($s0) ## 00000150 -/* 00958 808B42B8 E60C0178 */ swc1 $f12, 0x0178($s0) ## 00000178 -/* 0095C 808B42BC 0C22D0E0 */ jal func_808B4380 -/* 00960 808B42C0 E60C0174 */ swc1 $f12, 0x0174($s0) ## 00000174 -/* 00964 808B42C4 10000027 */ beq $zero, $zero, .L808B4364 -/* 00968 808B42C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L808B42CC: -/* 0096C 808B42CC 10600024 */ beq $v1, $zero, .L808B4360 -/* 00970 808B42D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00974 808B42D4 8E391C44 */ lw $t9, 0x1C44($s1) ## 00001C44 -/* 00978 808B42D8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0097C 808B42DC 0C22D004 */ jal func_808B4010 -/* 00980 808B42E0 AFB90028 */ sw $t9, 0x0028($sp) -/* 00984 808B42E4 10400003 */ beq $v0, $zero, .L808B42F4 -/* 00988 808B42E8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0098C 808B42EC 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00990 808B42F0 240528C9 */ addiu $a1, $zero, 0x28C9 ## $a1 = 000028C9 -.L808B42F4: -/* 00994 808B42F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00998 808B42F8 0C22CE90 */ jal func_808B3A40 -/* 0099C 808B42FC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 009A0 808B4300 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 009A4 808B4304 50400006 */ beql $v0, $zero, .L808B4320 -/* 009A8 808B4308 C6100024 */ lwc1 $f16, 0x0024($s0) ## 00000024 -/* 009AC 808B430C 0C01E221 */ jal func_80078884 -/* 009B0 808B4310 24044802 */ addiu $a0, $zero, 0x4802 ## $a0 = 00004802 -/* 009B4 808B4314 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 009B8 808B4318 00000000 */ nop -/* 009BC 808B431C C6100024 */ lwc1 $f16, 0x0024($s0) ## 00000024 -.L808B4320: -/* 009C0 808B4320 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 009C4 808B4324 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF -/* 009C8 808B4328 E6100008 */ swc1 $f16, 0x0008($s0) ## 00000008 -/* 009CC 808B432C E60A0010 */ swc1 $f10, 0x0010($s0) ## 00000010 -/* 009D0 808B4330 8FA80028 */ lw $t0, 0x0028($sp) -/* 009D4 808B4334 240B000A */ addiu $t3, $zero, 0x000A ## $t3 = 0000000A -/* 009D8 808B4338 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 009DC 808B433C 8D090680 */ lw $t1, 0x0680($t0) ## 00000680 -/* 009E0 808B4340 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 009E4 808B4344 01215024 */ and $t2, $t1, $at -/* 009E8 808B4348 AD0A0680 */ sw $t2, 0x0680($t0) ## 00000680 -/* 009EC 808B434C E60C0150 */ swc1 $f12, 0x0150($s0) ## 00000150 -/* 009F0 808B4350 E60C0178 */ swc1 $f12, 0x0178($s0) ## 00000178 -/* 009F4 808B4354 E60C0174 */ swc1 $f12, 0x0174($s0) ## 00000174 -/* 009F8 808B4358 0C22D021 */ jal func_808B4084 -/* 009FC 808B435C A60B0168 */ sh $t3, 0x0168($s0) ## 00000168 -.L808B4360: -/* 00A00 808B4360 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L808B4364: -/* 00A04 808B4364 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00A08 808B4368 2405200A */ addiu $a1, $zero, 0x200A ## $a1 = 0000200A -/* 00A0C 808B436C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00A10 808B4370 8FB00014 */ lw $s0, 0x0014($sp) -/* 00A14 808B4374 8FB10018 */ lw $s1, 0x0018($sp) -/* 00A18 808B4378 03E00008 */ jr $ra -/* 00A1C 808B437C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B4380.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B4380.s deleted file mode 100644 index 966c3a480f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B4380.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_808B4380 -/* 00A20 808B4380 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00A24 808B4384 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00A28 808B4388 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00A2C 808B438C 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 00A30 808B4390 44812000 */ mtc1 $at, $f4 ## $f4 = -1.00 -/* 00A34 808B4394 E480005C */ swc1 $f0, 0x005C($a0) ## 0000005C -/* 00A38 808B4398 E4800060 */ swc1 $f0, 0x0060($a0) ## 00000060 -/* 00A3C 808B439C E4800064 */ swc1 $f0, 0x0064($a0) ## 00000064 -/* 00A40 808B43A0 E484006C */ swc1 $f4, 0x006C($a0) ## 0000006C -/* 00A44 808B43A4 0C22CF77 */ jal func_808B3DDC -/* 00A48 808B43A8 AFA40018 */ sw $a0, 0x0018($sp) -/* 00A4C 808B43AC 8FA40018 */ lw $a0, 0x0018($sp) -/* 00A50 808B43B0 3C0E808B */ lui $t6, %hi(func_808B43D0) ## $t6 = 808B0000 -/* 00A54 808B43B4 25CE43D0 */ addiu $t6, $t6, %lo(func_808B43D0) ## $t6 = 808B43D0 -/* 00A58 808B43B8 E4800080 */ swc1 $f0, 0x0080($a0) ## 00000080 -/* 00A5C 808B43BC AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 -/* 00A60 808B43C0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00A64 808B43C4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00A68 808B43C8 03E00008 */ jr $ra -/* 00A6C 808B43CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B43D0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B43D0.s deleted file mode 100644 index b443940017..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B43D0.s +++ /dev/null @@ -1,85 +0,0 @@ -.rdata -glabel D_808B46A0 - .asciz "Warning : ロンロン木箱落ちすぎた(%s %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_808B46DC - .asciz "../z_bg_spot15_rrbox.c" - .balign 4 - -.late_rodata -glabel D_808B4704 - .float 0.001 - -glabel D_808B4708 - .word 0xC6F9EC00 -glabel D_808B470C - .word 0xBA83126F - -.text -glabel func_808B43D0 -/* 00A70 808B43D0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00A74 808B43D4 AFBF001C */ sw $ra, 0x001C($sp) -/* 00A78 808B43D8 AFB00018 */ sw $s0, 0x0018($sp) -/* 00A7C 808B43DC C4800150 */ lwc1 $f0, 0x0150($a0) ## 00000150 -/* 00A80 808B43E0 3C01808B */ lui $at, %hi(D_808B4704) ## $at = 808B0000 -/* 00A84 808B43E4 C4244704 */ lwc1 $f4, %lo(D_808B4704)($at) -/* 00A88 808B43E8 46000005 */ abs.s $f0, $f0 -/* 00A8C 808B43EC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00A90 808B43F0 4600203C */ c.lt.s $f4, $f0 -/* 00A94 808B43F4 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 00A98 808B43F8 45020008 */ bc1fl .L808B441C -/* 00A9C 808B43FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00AA0 808B4400 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 00AA4 808B4404 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF -/* 00AA8 808B4408 E4860150 */ swc1 $f6, 0x0150($a0) ## 00000150 -/* 00AAC 808B440C 8C4E0680 */ lw $t6, 0x0680($v0) ## 00000680 -/* 00AB0 808B4410 01C17824 */ and $t7, $t6, $at -/* 00AB4 808B4414 AC4F0680 */ sw $t7, 0x0680($v0) ## 00000680 -/* 00AB8 808B4418 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L808B441C: -/* 00ABC 808B441C 0C00B638 */ jal Actor_MoveForward - -/* 00AC0 808B4420 AFA50024 */ sw $a1, 0x0024($sp) -/* 00AC4 808B4424 3C01808B */ lui $at, %hi(D_808B4708) ## $at = 808B0000 -/* 00AC8 808B4428 C4284708 */ lwc1 $f8, %lo(D_808B4708)($at) -/* 00ACC 808B442C C6020028 */ lwc1 $f2, 0x0028($s0) ## 00000028 -/* 00AD0 808B4430 3C04808B */ lui $a0, %hi(D_808B46A0) ## $a0 = 808B0000 -/* 00AD4 808B4434 8FA50024 */ lw $a1, 0x0024($sp) -/* 00AD8 808B4438 4608103E */ c.le.s $f2, $f8 -/* 00ADC 808B443C 248446A0 */ addiu $a0, $a0, %lo(D_808B46A0) ## $a0 = 808B46A0 -/* 00AE0 808B4440 24060257 */ addiu $a2, $zero, 0x0257 ## $a2 = 00000257 -/* 00AE4 808B4444 4502000A */ bc1fl .L808B4470 -/* 00AE8 808B4448 C6000080 */ lwc1 $f0, 0x0080($s0) ## 00000080 -/* 00AEC 808B444C 3C05808B */ lui $a1, %hi(D_808B46DC) ## $a1 = 808B0000 -/* 00AF0 808B4450 24A546DC */ addiu $a1, $a1, %lo(D_808B46DC) ## $a1 = 808B46DC -/* 00AF4 808B4454 0C00084C */ jal osSyncPrintf - -/* 00AF8 808B4458 8607001C */ lh $a3, 0x001C($s0) ## 0000001C -/* 00AFC 808B445C 0C00B55C */ jal Actor_Kill - -/* 00B00 808B4460 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B04 808B4464 10000010 */ beq $zero, $zero, .L808B44A8 -/* 00B08 808B4468 8FBF001C */ lw $ra, 0x001C($sp) -/* 00B0C 808B446C C6000080 */ lwc1 $f0, 0x0080($s0) ## 00000080 -.L808B4470: -/* 00B10 808B4470 3C01808B */ lui $at, %hi(D_808B470C) ## $at = 808B0000 -/* 00B14 808B4474 C430470C */ lwc1 $f16, %lo(D_808B470C)($at) -/* 00B18 808B4478 46020281 */ sub.s $f10, $f0, $f2 -/* 00B1C 808B447C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B20 808B4480 460A803E */ c.le.s $f16, $f10 -/* 00B24 808B4484 00000000 */ nop -/* 00B28 808B4488 45020007 */ bc1fl .L808B44A8 -/* 00B2C 808B448C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00B30 808B4490 0C22D021 */ jal func_808B4084 -/* 00B34 808B4494 E6000028 */ swc1 $f0, 0x0028($s0) ## 00000028 -/* 00B38 808B4498 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B3C 808B449C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00B40 808B44A0 240528C9 */ addiu $a1, $zero, 0x28C9 ## $a1 = 000028C9 -/* 00B44 808B44A4 8FBF001C */ lw $ra, 0x001C($sp) -.L808B44A8: -/* 00B48 808B44A8 8FB00018 */ lw $s0, 0x0018($sp) -/* 00B4C 808B44AC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00B50 808B44B0 03E00008 */ jr $ra -/* 00B54 808B44B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B44B8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B44B8.s deleted file mode 100644 index 1f29f64b5f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B44B8.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_808B44B8 -/* 00B58 808B44B8 3C0E808B */ lui $t6, %hi(func_808B44CC) ## $t6 = 808B0000 -/* 00B5C 808B44BC AFA50004 */ sw $a1, 0x0004($sp) -/* 00B60 808B44C0 25CE44CC */ addiu $t6, $t6, %lo(func_808B44CC) ## $t6 = 808B44CC -/* 00B64 808B44C4 03E00008 */ jr $ra -/* 00B68 808B44C8 AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B44CC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B44CC.s deleted file mode 100644 index b3cd544310..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B44CC.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_808B44CC -/* 00B6C 808B44CC 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 00B70 808B44D0 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF -/* 00B74 808B44D4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00B78 808B44D8 8C4E0680 */ lw $t6, 0x0680($v0) ## 00000680 -/* 00B7C 808B44DC 01C17824 */ and $t7, $t6, $at -/* 00B80 808B44E0 AC4F0680 */ sw $t7, 0x0680($v0) ## 00000680 -/* 00B84 808B44E4 03E00008 */ jr $ra -/* 00B88 808B44E8 E4840150 */ swc1 $f4, 0x0150($a0) ## 00000150 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/BgSpot16Bombstone_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/BgSpot16Bombstone_Destroy.s deleted file mode 100644 index 62115eda33..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/BgSpot16Bombstone_Destroy.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel BgSpot16Bombstone_Destroy -/* 0052C 808B515C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00530 808B5160 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00534 808B5164 AFA5001C */ sw $a1, 0x001C($sp) -/* 00538 808B5168 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 0053C 808B516C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00540 808B5170 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 00544 808B5174 15C10008 */ bne $t6, $at, .L808B5198 -/* 00548 808B5178 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0054C 808B517C 24C50164 */ addiu $a1, $a2, 0x0164 ## $a1 = 00000164 -/* 00550 808B5180 0C016F32 */ jal Collider_DestroyJntSph -/* 00554 808B5184 AFA60018 */ sw $a2, 0x0018($sp) -/* 00558 808B5188 8FA60018 */ lw $a2, 0x0018($sp) -/* 0055C 808B518C 8FA4001C */ lw $a0, 0x001C($sp) -/* 00560 808B5190 0C0170EB */ jal Collider_DestroyCylinder - -/* 00564 808B5194 24C501C4 */ addiu $a1, $a2, 0x01C4 ## $a1 = 000001C4 -.L808B5198: -/* 00568 808B5198 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0056C 808B519C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00570 808B51A0 03E00008 */ jr $ra -/* 00574 808B51A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/BgSpot16Bombstone_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/BgSpot16Bombstone_Draw.s deleted file mode 100644 index 92e9ce4f48..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/BgSpot16Bombstone_Draw.s +++ /dev/null @@ -1,95 +0,0 @@ -.rdata -glabel D_808B61E4 - .asciz "../z_bg_spot16_bombstone.c" - .balign 4 - -glabel D_808B6200 - .asciz "../z_bg_spot16_bombstone.c" - .balign 4 - -glabel D_808B621C - .asciz "../z_bg_spot16_bombstone.c" - .balign 4 - -.text -glabel BgSpot16Bombstone_Draw -/* 01068 808B5C98 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 0106C 808B5C9C AFB10018 */ sw $s1, 0x0018($sp) -/* 01070 808B5CA0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 01074 808B5CA4 AFBF001C */ sw $ra, 0x001C($sp) -/* 01078 808B5CA8 AFB00014 */ sw $s0, 0x0014($sp) -/* 0107C 808B5CAC AFA40050 */ sw $a0, 0x0050($sp) -/* 01080 808B5CB0 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 01084 808B5CB4 3C06808B */ lui $a2, %hi(D_808B61E4) ## $a2 = 808B0000 -/* 01088 808B5CB8 24C661E4 */ addiu $a2, $a2, %lo(D_808B61E4) ## $a2 = 808B61E4 -/* 0108C 808B5CBC 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 -/* 01090 808B5CC0 240704E5 */ addiu $a3, $zero, 0x04E5 ## $a3 = 000004E5 -/* 01094 808B5CC4 0C031AB1 */ jal Graph_OpenDisps -/* 01098 808B5CC8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 0109C 808B5CCC 0C024F46 */ jal func_80093D18 -/* 010A0 808B5CD0 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 010A4 808B5CD4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 010A8 808B5CD8 3C0FDA38 */ lui $t7, 0xDA38 ## $t7 = DA380000 -/* 010AC 808B5CDC 35EF0003 */ ori $t7, $t7, 0x0003 ## $t7 = DA380003 -/* 010B0 808B5CE0 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 010B4 808B5CE4 AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 -/* 010B8 808B5CE8 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 010BC 808B5CEC 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 010C0 808B5CF0 3C05808B */ lui $a1, %hi(D_808B6200) ## $a1 = 808B0000 -/* 010C4 808B5CF4 24A56200 */ addiu $a1, $a1, %lo(D_808B6200) ## $a1 = 808B6200 -/* 010C8 808B5CF8 240604E9 */ addiu $a2, $zero, 0x04E9 ## $a2 = 000004E9 -/* 010CC 808B5CFC 0C0346A2 */ jal Matrix_NewMtx -/* 010D0 808B5D00 AFA20030 */ sw $v0, 0x0030($sp) -/* 010D4 808B5D04 8FA30030 */ lw $v1, 0x0030($sp) -/* 010D8 808B5D08 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 010DC 808B5D0C 3C06808B */ lui $a2, %hi(D_808B621C) ## $a2 = 808B0000 -/* 010E0 808B5D10 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 010E4 808B5D14 8FA40050 */ lw $a0, 0x0050($sp) -/* 010E8 808B5D18 24C6621C */ addiu $a2, $a2, %lo(D_808B621C) ## $a2 = 808B621C -/* 010EC 808B5D1C 240704FA */ addiu $a3, $zero, 0x04FA ## $a3 = 000004FA -/* 010F0 808B5D20 8498001C */ lh $t8, 0x001C($a0) ## 0000001C -/* 010F4 808B5D24 5701000A */ bnel $t8, $at, .L808B5D50 -/* 010F8 808B5D28 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 010FC 808B5D2C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 01100 808B5D30 3C08DE00 */ lui $t0, 0xDE00 ## $t0 = DE000000 -/* 01104 808B5D34 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 01108 808B5D38 AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 -/* 0110C 808B5D3C AC480000 */ sw $t0, 0x0000($v0) ## 00000000 -/* 01110 808B5D40 8C890150 */ lw $t1, 0x0150($a0) ## 00000150 -/* 01114 808B5D44 10000017 */ beq $zero, $zero, .L808B5DA4 -/* 01118 808B5D48 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 0111C 808B5D4C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -.L808B5D50: -/* 01120 808B5D50 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 01124 808B5D54 356B0018 */ ori $t3, $t3, 0x0018 ## $t3 = DB060018 -/* 01128 808B5D58 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 0112C 808B5D5C AE0A02C0 */ sw $t2, 0x02C0($s0) ## 000002C0 -/* 01130 808B5D60 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 01134 808B5D64 808C0214 */ lb $t4, 0x0214($a0) ## 00000214 -/* 01138 808B5D68 3C0F0001 */ lui $t7, 0x0001 ## $t7 = 00010000 -/* 0113C 808B5D6C 3C19DE00 */ lui $t9, 0xDE00 ## $t9 = DE000000 -/* 01140 808B5D70 000C6900 */ sll $t5, $t4, 4 -/* 01144 808B5D74 01AC6821 */ addu $t5, $t5, $t4 -/* 01148 808B5D78 000D6880 */ sll $t5, $t5, 2 -/* 0114C 808B5D7C 022D7021 */ addu $t6, $s1, $t5 -/* 01150 808B5D80 01EE7821 */ addu $t7, $t7, $t6 -/* 01154 808B5D84 8DEF17B4 */ lw $t7, 0x17B4($t7) ## 000117B4 -/* 01158 808B5D88 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 0115C 808B5D8C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 01160 808B5D90 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 01164 808B5D94 AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 -/* 01168 808B5D98 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 0116C 808B5D9C 8C880150 */ lw $t0, 0x0150($a0) ## 00000150 -/* 01170 808B5DA0 AC480004 */ sw $t0, 0x0004($v0) ## 00000004 -.L808B5DA4: -/* 01174 808B5DA4 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 -/* 01178 808B5DA8 0C031AD5 */ jal Graph_CloseDisps -/* 0117C 808B5DAC 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 01180 808B5DB0 8FBF001C */ lw $ra, 0x001C($sp) -/* 01184 808B5DB4 8FB00014 */ lw $s0, 0x0014($sp) -/* 01188 808B5DB8 8FB10018 */ lw $s1, 0x0018($sp) -/* 0118C 808B5DBC 03E00008 */ jr $ra -/* 01190 808B5DC0 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 01194 808B5DC4 00000000 */ nop -/* 01198 808B5DC8 00000000 */ nop -/* 0119C 808B5DCC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/BgSpot16Bombstone_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/BgSpot16Bombstone_Init.s deleted file mode 100644 index 6589fa198d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/BgSpot16Bombstone_Init.s +++ /dev/null @@ -1,95 +0,0 @@ -.rdata -glabel D_808B6108 - .asciz "Error : arg_data おかしいな(%s %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_808B6140 - .asciz "../z_bg_spot16_bombstone.c" - .balign 4 - -glabel D_808B615C - .asciz "Spot16 obj 爆弾石 (scaleX %f)(arg_data 0x%04x)\n" - .balign 4 - -.late_rodata -glabel jtbl_808B623C -.word L808B50DC -.word L808B50DC -.word L808B50DC -.word L808B50DC -.word L808B50DC -.word L808B50DC - -.text -glabel BgSpot16Bombstone_Init -/* 00438 808B5068 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0043C 808B506C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00440 808B5070 AFB00020 */ sw $s0, 0x0020($sp) -/* 00444 808B5074 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00448 808B5078 0C22D30C */ jal func_808B4C30 -/* 0044C 808B507C AFA5002C */ sw $a1, 0x002C($sp) -/* 00450 808B5080 8607001C */ lh $a3, 0x001C($s0) ## 0000001C -/* 00454 808B5084 8FA5002C */ lw $a1, 0x002C($sp) -/* 00458 808B5088 28E10006 */ slti $at, $a3, 0x0006 -/* 0045C 808B508C 14200006 */ bne $at, $zero, .L808B50A8 -/* 00460 808B5090 00E01025 */ or $v0, $a3, $zero ## $v0 = 00000000 -/* 00464 808B5094 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 00468 808B5098 1041000B */ beq $v0, $at, .L808B50C8 -/* 0046C 808B509C 00000000 */ nop -/* 00470 808B50A0 10000013 */ beq $zero, $zero, .L808B50F0 -/* 00474 808B50A4 00000000 */ nop -.L808B50A8: -/* 00478 808B50A8 2C410006 */ sltiu $at, $v0, 0x0006 -/* 0047C 808B50AC 10200010 */ beq $at, $zero, .L808B50F0 -/* 00480 808B50B0 00027080 */ sll $t6, $v0, 2 -/* 00484 808B50B4 3C01808B */ lui $at, %hi(jtbl_808B623C) ## $at = 808B0000 -/* 00488 808B50B8 002E0821 */ addu $at, $at, $t6 -/* 0048C 808B50BC 8C2E623C */ lw $t6, %lo(jtbl_808B623C)($at) -/* 00490 808B50C0 01C00008 */ jr $t6 -/* 00494 808B50C4 00000000 */ nop -.L808B50C8: -/* 00498 808B50C8 0C22D367 */ jal func_808B4D9C -/* 0049C 808B50CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 004A0 808B50D0 00021C00 */ sll $v1, $v0, 16 -/* 004A4 808B50D4 1000000D */ beq $zero, $zero, .L808B510C -/* 004A8 808B50D8 00031C03 */ sra $v1, $v1, 16 -glabel L808B50DC -/* 004AC 808B50DC 0C22D396 */ jal func_808B4E58 -/* 004B0 808B50E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 004B4 808B50E4 00021C00 */ sll $v1, $v0, 16 -/* 004B8 808B50E8 10000008 */ beq $zero, $zero, .L808B510C -/* 004BC 808B50EC 00031C03 */ sra $v1, $v1, 16 -.L808B50F0: -/* 004C0 808B50F0 3C04808B */ lui $a0, %hi(D_808B6108) ## $a0 = 808B0000 -/* 004C4 808B50F4 3C05808B */ lui $a1, %hi(D_808B6140) ## $a1 = 808B0000 -/* 004C8 808B50F8 24A56140 */ addiu $a1, $a1, %lo(D_808B6140) ## $a1 = 808B6140 -/* 004CC 808B50FC 24846108 */ addiu $a0, $a0, %lo(D_808B6108) ## $a0 = 808B6108 -/* 004D0 808B5100 0C00084C */ jal osSyncPrintf - -/* 004D4 808B5104 2406029C */ addiu $a2, $zero, 0x029C ## $a2 = 0000029C -/* 004D8 808B5108 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L808B510C: -/* 004DC 808B510C 54600006 */ bnel $v1, $zero, .L808B5128 -/* 004E0 808B5110 C6040050 */ lwc1 $f4, 0x0050($s0) ## 00000050 -/* 004E4 808B5114 0C00B55C */ jal Actor_Kill - -/* 004E8 808B5118 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 004EC 808B511C 1000000B */ beq $zero, $zero, .L808B514C -/* 004F0 808B5120 8FBF0024 */ lw $ra, 0x0024($sp) -/* 004F4 808B5124 C6040050 */ lwc1 $f4, 0x0050($s0) ## 00000050 -.L808B5128: -/* 004F8 808B5128 860F001C */ lh $t7, 0x001C($s0) ## 0000001C -/* 004FC 808B512C 3C04808B */ lui $a0, %hi(D_808B615C) ## $a0 = 808B0000 -/* 00500 808B5130 460021A1 */ cvt.d.s $f6, $f4 -/* 00504 808B5134 2484615C */ addiu $a0, $a0, %lo(D_808B615C) ## $a0 = 808B615C -/* 00508 808B5138 44073000 */ mfc1 $a3, $f6 -/* 0050C 808B513C 44063800 */ mfc1 $a2, $f7 -/* 00510 808B5140 0C00084C */ jal osSyncPrintf - -/* 00514 808B5144 AFAF0010 */ sw $t7, 0x0010($sp) -/* 00518 808B5148 8FBF0024 */ lw $ra, 0x0024($sp) -.L808B514C: -/* 0051C 808B514C 8FB00020 */ lw $s0, 0x0020($sp) -/* 00520 808B5150 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00524 808B5154 03E00008 */ jr $ra -/* 00528 808B5158 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/BgSpot16Bombstone_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/BgSpot16Bombstone_Update.s deleted file mode 100644 index 7435f339cb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/BgSpot16Bombstone_Update.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel BgSpot16Bombstone_Update -/* 01034 808B5C64 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01038 808B5C68 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0103C 808B5C6C 848E0154 */ lh $t6, 0x0154($a0) ## 00000154 -/* 01040 808B5C70 8C82014C */ lw $v0, 0x014C($a0) ## 0000014C -/* 01044 808B5C74 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 01048 808B5C78 10400003 */ beq $v0, $zero, .L808B5C88 -/* 0104C 808B5C7C A48F0154 */ sh $t7, 0x0154($a0) ## 00000154 -/* 01050 808B5C80 0040F809 */ jalr $ra, $v0 -/* 01054 808B5C84 00000000 */ nop -.L808B5C88: -/* 01058 808B5C88 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0105C 808B5C8C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01060 808B5C90 03E00008 */ jr $ra -/* 01064 808B5C94 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B4C30.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B4C30.s deleted file mode 100644 index aa7140483b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B4C30.s +++ /dev/null @@ -1,8 +0,0 @@ -glabel func_808B4C30 -/* 00000 808B4C30 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 00004 808B4C34 00027203 */ sra $t6, $v0, 8 -/* 00008 808B4C38 31CF003F */ andi $t7, $t6, 0x003F ## $t7 = 00000000 -/* 0000C 808B4C3C 305800FF */ andi $t8, $v0, 0x00FF ## $t8 = 00000000 -/* 00010 808B4C40 A48F0156 */ sh $t7, 0x0156($a0) ## 00000156 -/* 00014 808B4C44 03E00008 */ jr $ra -/* 00018 808B4C48 A498001C */ sh $t8, 0x001C($a0) ## 0000001C diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B4C4C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B4C4C.s deleted file mode 100644 index 434183c90c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B4C4C.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_808B4C4C -/* 0001C 808B4C4C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00020 808B4C50 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00024 808B4C54 AFA5002C */ sw $a1, 0x002C($sp) -/* 00028 808B4C58 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0002C 808B4C5C AFBF001C */ sw $ra, 0x001C($sp) -/* 00030 808B4C60 24C50164 */ addiu $a1, $a2, 0x0164 ## $a1 = 00000164 -/* 00034 808B4C64 AFA50020 */ sw $a1, 0x0020($sp) -/* 00038 808B4C68 0C016EFE */ jal Collider_InitJntSph -/* 0003C 808B4C6C AFA60028 */ sw $a2, 0x0028($sp) -/* 00040 808B4C70 8FA60028 */ lw $a2, 0x0028($sp) -/* 00044 808B4C74 3C07808B */ lui $a3, %hi(D_808B5E74) ## $a3 = 808B0000 -/* 00048 808B4C78 8FA50020 */ lw $a1, 0x0020($sp) -/* 0004C 808B4C7C 24CE0184 */ addiu $t6, $a2, 0x0184 ## $t6 = 00000184 -/* 00050 808B4C80 AFAE0010 */ sw $t6, 0x0010($sp) -/* 00054 808B4C84 24E75E74 */ addiu $a3, $a3, %lo(D_808B5E74) ## $a3 = 808B5E74 -/* 00058 808B4C88 0C017014 */ jal Collider_SetJntSph -/* 0005C 808B4C8C 8FA4002C */ lw $a0, 0x002C($sp) -/* 00060 808B4C90 8FA60028 */ lw $a2, 0x0028($sp) -/* 00064 808B4C94 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 00068 808B4C98 44815000 */ mtc1 $at, $f10 ## $f10 = 50.00 -/* 0006C 808B4C9C C4C40024 */ lwc1 $f4, 0x0024($a2) ## 00000024 -/* 00070 808B4CA0 8CD90180 */ lw $t9, 0x0180($a2) ## 00000180 -/* 00074 808B4CA4 240E0078 */ addiu $t6, $zero, 0x0078 ## $t6 = 00000078 -/* 00078 808B4CA8 4600218D */ trunc.w.s $f6, $f4 -/* 0007C 808B4CAC 44183000 */ mfc1 $t8, $f6 -/* 00080 808B4CB0 00000000 */ nop -/* 00084 808B4CB4 A7380030 */ sh $t8, 0x0030($t9) ## 00000030 -/* 00088 808B4CB8 C4C80028 */ lwc1 $f8, 0x0028($a2) ## 00000028 -/* 0008C 808B4CBC 8CCA0180 */ lw $t2, 0x0180($a2) ## 00000180 -/* 00090 808B4CC0 460A4400 */ add.s $f16, $f8, $f10 -/* 00094 808B4CC4 4600848D */ trunc.w.s $f18, $f16 -/* 00098 808B4CC8 44099000 */ mfc1 $t1, $f18 -/* 0009C 808B4CCC 00000000 */ nop -/* 000A0 808B4CD0 A5490032 */ sh $t1, 0x0032($t2) ## 00000032 -/* 000A4 808B4CD4 C4C4002C */ lwc1 $f4, 0x002C($a2) ## 0000002C -/* 000A8 808B4CD8 8CCD0180 */ lw $t5, 0x0180($a2) ## 00000180 -/* 000AC 808B4CDC 4600218D */ trunc.w.s $f6, $f4 -/* 000B0 808B4CE0 440C3000 */ mfc1 $t4, $f6 -/* 000B4 808B4CE4 00000000 */ nop -/* 000B8 808B4CE8 A5AC0034 */ sh $t4, 0x0034($t5) ## 00000034 -/* 000BC 808B4CEC 8CCF0180 */ lw $t7, 0x0180($a2) ## 00000180 -/* 000C0 808B4CF0 A5EE0036 */ sh $t6, 0x0036($t7) ## 00000036 -/* 000C4 808B4CF4 8FBF001C */ lw $ra, 0x001C($sp) -/* 000C8 808B4CF8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 000CC 808B4CFC 03E00008 */ jr $ra -/* 000D0 808B4D00 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B4D04.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B4D04.s deleted file mode 100644 index 199d5e8b65..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B4D04.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_808B4D04 -/* 000D4 808B4D04 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 000D8 808B4D08 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 000DC 808B4D0C AFA50024 */ sw $a1, 0x0024($sp) -/* 000E0 808B4D10 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 000E4 808B4D14 AFBF0014 */ sw $ra, 0x0014($sp) -/* 000E8 808B4D18 24C501C4 */ addiu $a1, $a2, 0x01C4 ## $a1 = 000001C4 -/* 000EC 808B4D1C AFA50018 */ sw $a1, 0x0018($sp) -/* 000F0 808B4D20 0C0170D9 */ jal Collider_InitCylinder - -/* 000F4 808B4D24 AFA60020 */ sw $a2, 0x0020($sp) -/* 000F8 808B4D28 3C07808B */ lui $a3, %hi(D_808B5E84) ## $a3 = 808B0000 -/* 000FC 808B4D2C 8FA50018 */ lw $a1, 0x0018($sp) -/* 00100 808B4D30 8FA60020 */ lw $a2, 0x0020($sp) -/* 00104 808B4D34 24E75E84 */ addiu $a3, $a3, %lo(D_808B5E84) ## $a3 = 808B5E84 -/* 00108 808B4D38 0C01712B */ jal Collider_SetCylinder - -/* 0010C 808B4D3C 8FA40024 */ lw $a0, 0x0024($sp) -/* 00110 808B4D40 8FA60020 */ lw $a2, 0x0020($sp) -/* 00114 808B4D44 C4C40024 */ lwc1 $f4, 0x0024($a2) ## 00000024 -/* 00118 808B4D48 C4C80028 */ lwc1 $f8, 0x0028($a2) ## 00000028 -/* 0011C 808B4D4C C4D0002C */ lwc1 $f16, 0x002C($a2) ## 0000002C -/* 00120 808B4D50 4600218D */ trunc.w.s $f6, $f4 -/* 00124 808B4D54 84CE020A */ lh $t6, 0x020A($a2) ## 0000020A -/* 00128 808B4D58 84CA020C */ lh $t2, 0x020C($a2) ## 0000020C -/* 0012C 808B4D5C 4600428D */ trunc.w.s $f10, $f8 -/* 00130 808B4D60 44083000 */ mfc1 $t0, $f6 -/* 00134 808B4D64 84D9020E */ lh $t9, 0x020E($a2) ## 0000020E -/* 00138 808B4D68 4600848D */ trunc.w.s $f18, $f16 -/* 0013C 808B4D6C 440F5000 */ mfc1 $t7, $f10 -/* 00140 808B4D70 01C84821 */ addu $t1, $t6, $t0 -/* 00144 808B4D74 A4C9020A */ sh $t1, 0x020A($a2) ## 0000020A -/* 00148 808B4D78 440B9000 */ mfc1 $t3, $f18 -/* 0014C 808B4D7C 014FC021 */ addu $t8, $t2, $t7 -/* 00150 808B4D80 A4D8020C */ sh $t8, 0x020C($a2) ## 0000020C -/* 00154 808B4D84 032B6021 */ addu $t4, $t9, $t3 -/* 00158 808B4D88 A4CC020E */ sh $t4, 0x020E($a2) ## 0000020E -/* 0015C 808B4D8C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00160 808B4D90 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00164 808B4D94 03E00008 */ jr $ra -/* 00168 808B4D98 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B4D9C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B4D9C.s deleted file mode 100644 index ae188aa6b5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B4D9C.s +++ /dev/null @@ -1,62 +0,0 @@ -.rdata -glabel D_808B60A0 - .asciz "Spot16 obj 爆弾石 破壊済み\n" - .balign 4 - -.text -glabel func_808B4D9C -/* 0016C 808B4D9C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00170 808B4DA0 AFB00018 */ sw $s0, 0x0018($sp) -/* 00174 808B4DA4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00178 808B4DA8 AFBF001C */ sw $ra, 0x001C($sp) -/* 0017C 808B4DAC AFA50024 */ sw $a1, 0x0024($sp) -/* 00180 808B4DB0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00184 808B4DB4 0C00B2D0 */ jal Flags_GetSwitch - -/* 00188 808B4DB8 86050156 */ lh $a1, 0x0156($s0) ## 00000156 -/* 0018C 808B4DBC 10400006 */ beq $v0, $zero, .L808B4DD8 -/* 00190 808B4DC0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00194 808B4DC4 3C04808B */ lui $a0, %hi(D_808B60A0) ## $a0 = 808B0000 -/* 00198 808B4DC8 0C00084C */ jal osSyncPrintf - -/* 0019C 808B4DCC 248460A0 */ addiu $a0, $a0, %lo(D_808B60A0) ## $a0 = 808B60A0 -/* 001A0 808B4DD0 1000001C */ beq $zero, $zero, .L808B4E44 -/* 001A4 808B4DD4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L808B4DD8: -/* 001A8 808B4DD8 3C05808B */ lui $a1, %hi(D_808B603C) ## $a1 = 808B0000 -/* 001AC 808B4DDC 0C01E037 */ jal Actor_ProcessInitChain - -/* 001B0 808B4DE0 24A5603C */ addiu $a1, $a1, %lo(D_808B603C) ## $a1 = 808B603C -/* 001B4 808B4DE4 3C053ECC */ lui $a1, 0x3ECC ## $a1 = 3ECC0000 -/* 001B8 808B4DE8 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3ECCCCCD -/* 001BC 808B4DEC 0C00B58B */ jal Actor_SetScale - -/* 001C0 808B4DF0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 001C4 808B4DF4 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 001C8 808B4DF8 A20E00AE */ sb $t6, 0x00AE($s0) ## 000000AE -/* 001CC 808B4DFC 8FA50024 */ lw $a1, 0x0024($sp) -/* 001D0 808B4E00 0C22D313 */ jal func_808B4C4C -/* 001D4 808B4E04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 001D8 808B4E08 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 001DC 808B4E0C 0C22D341 */ jal func_808B4D04 -/* 001E0 808B4E10 8FA50024 */ lw $a1, 0x0024($sp) -/* 001E4 808B4E14 0C01DE1C */ jal Math_Sins - ## sins? -/* 001E8 808B4E18 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 001EC 808B4E1C E600015C */ swc1 $f0, 0x015C($s0) ## 0000015C -/* 001F0 808B4E20 0C01DE0D */ jal Math_Coss - ## coss? -/* 001F4 808B4E24 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 001F8 808B4E28 3C0F0600 */ lui $t7, 0x0600 ## $t7 = 06000000 -/* 001FC 808B4E2C 25EF0C20 */ addiu $t7, $t7, 0x0C20 ## $t7 = 06000C20 -/* 00200 808B4E30 E6000160 */ swc1 $f0, 0x0160($s0) ## 00000160 -/* 00204 808B4E34 AE0F0150 */ sw $t7, 0x0150($s0) ## 00000150 -/* 00208 808B4E38 0C22D64D */ jal func_808B5934 -/* 0020C 808B4E3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00210 808B4E40 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L808B4E44: -/* 00214 808B4E44 8FBF001C */ lw $ra, 0x001C($sp) -/* 00218 808B4E48 8FB00018 */ lw $s0, 0x0018($sp) -/* 0021C 808B4E4C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00220 808B4E50 03E00008 */ jr $ra -/* 00224 808B4E54 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B4E58.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B4E58.s deleted file mode 100644 index 2ea01cd910..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B4E58.s +++ /dev/null @@ -1,155 +0,0 @@ -.rdata -glabel D_808B60BC - .asciz "Error : バンク危険！(arg_data 0x%04x)(%s %d)\n" - .balign 4 - -glabel D_808B60EC - .asciz "../z_bg_spot16_bombstone.c" - .balign 4 - -.late_rodata -glabel D_808B6238 - .word 0x3ADA740E - -.text -glabel func_808B4E58 -/* 00228 808B4E58 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0022C 808B4E5C AFA50034 */ sw $a1, 0x0034($sp) -/* 00230 808B4E60 AFBF001C */ sw $ra, 0x001C($sp) -/* 00234 808B4E64 AFB00018 */ sw $s0, 0x0018($sp) -/* 00238 808B4E68 3C05808B */ lui $a1, %hi(D_808B6048) ## $a1 = 808B0000 -/* 0023C 808B4E6C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00240 808B4E70 0C01E037 */ jal Actor_ProcessInitChain - -/* 00244 808B4E74 24A56048 */ addiu $a1, $a1, %lo(D_808B6048) ## $a1 = 808B6048 -/* 00248 808B4E78 860E001C */ lh $t6, 0x001C($s0) ## 0000001C -/* 0024C 808B4E7C 3C18808B */ lui $t8, %hi(D_808B5DD8) ## $t8 = 808B0000 -/* 00250 808B4E80 27185DD8 */ addiu $t8, $t8, %lo(D_808B5DD8) ## $t8 = 808B5DD8 -/* 00254 808B4E84 000E7880 */ sll $t7, $t6, 2 -/* 00258 808B4E88 01EE7821 */ addu $t7, $t7, $t6 -/* 0025C 808B4E8C 000F7880 */ sll $t7, $t7, 2 -/* 00260 808B4E90 01F81021 */ addu $v0, $t7, $t8 -/* 00264 808B4E94 84590000 */ lh $t9, 0x0000($v0) ## 00000000 -/* 00268 808B4E98 3C01808B */ lui $at, %hi(D_808B6238) ## $at = 808B0000 -/* 0026C 808B4E9C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00270 808B4EA0 44992000 */ mtc1 $t9, $f4 ## $f4 = 0.00 -/* 00274 808B4EA4 00000000 */ nop -/* 00278 808B4EA8 468021A0 */ cvt.s.w $f6, $f4 -/* 0027C 808B4EAC E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 -/* 00280 808B4EB0 84480002 */ lh $t0, 0x0002($v0) ## 00000002 -/* 00284 808B4EB4 44884000 */ mtc1 $t0, $f8 ## $f8 = 0.00 -/* 00288 808B4EB8 00000000 */ nop -/* 0028C 808B4EBC 468042A0 */ cvt.s.w $f10, $f8 -/* 00290 808B4EC0 E60A0060 */ swc1 $f10, 0x0060($s0) ## 00000060 -/* 00294 808B4EC4 84490004 */ lh $t1, 0x0004($v0) ## 00000004 -/* 00298 808B4EC8 C4246238 */ lwc1 $f4, %lo(D_808B6238)($at) -/* 0029C 808B4ECC 44898000 */ mtc1 $t1, $f16 ## $f16 = 0.00 -/* 002A0 808B4ED0 00000000 */ nop -/* 002A4 808B4ED4 468084A0 */ cvt.s.w $f18, $f16 -/* 002A8 808B4ED8 46049182 */ mul.s $f6, $f18, $f4 -/* 002AC 808B4EDC 44053000 */ mfc1 $a1, $f6 -/* 002B0 808B4EE0 0C00B58B */ jal Actor_SetScale - -/* 002B4 808B4EE4 00000000 */ nop -/* 002B8 808B4EE8 860A001C */ lh $t2, 0x001C($s0) ## 0000001C -/* 002BC 808B4EEC 24030014 */ addiu $v1, $zero, 0x0014 ## $v1 = 00000014 -/* 002C0 808B4EF0 3C02808B */ lui $v0, %hi(D_808B5DD8) ## $v0 = 808B0000 -/* 002C4 808B4EF4 01430019 */ multu $t2, $v1 -/* 002C8 808B4EF8 24425DD8 */ addiu $v0, $v0, %lo(D_808B5DD8) ## $v0 = 808B5DD8 -/* 002CC 808B4EFC 8618001C */ lh $t8, 0x001C($s0) ## 0000001C -/* 002D0 808B4F00 00005812 */ mflo $t3 -/* 002D4 808B4F04 004B6021 */ addu $t4, $v0, $t3 -/* 002D8 808B4F08 858D0006 */ lh $t5, 0x0006($t4) ## 00000006 -/* 002DC 808B4F0C 03030019 */ multu $t8, $v1 -/* 002E0 808B4F10 860C001C */ lh $t4, 0x001C($s0) ## 0000001C -/* 002E4 808B4F14 448D4000 */ mtc1 $t5, $f8 ## $f8 = 0.00 -/* 002E8 808B4F18 00000000 */ nop -/* 002EC 808B4F1C 468042A0 */ cvt.s.w $f10, $f8 -/* 002F0 808B4F20 0000C812 */ mflo $t9 -/* 002F4 808B4F24 4600540D */ trunc.w.s $f16, $f10 -/* 002F8 808B4F28 00594021 */ addu $t0, $v0, $t9 -/* 002FC 808B4F2C 01830019 */ multu $t4, $v1 -/* 00300 808B4F30 440F8000 */ mfc1 $t7, $f16 -/* 00304 808B4F34 00000000 */ nop -/* 00308 808B4F38 A60F0210 */ sh $t7, 0x0210($s0) ## 00000210 -/* 0030C 808B4F3C 85090008 */ lh $t1, 0x0008($t0) ## 00000008 -/* 00310 808B4F40 44899000 */ mtc1 $t1, $f18 ## $f18 = 0.00 -/* 00314 808B4F44 00006812 */ mflo $t5 -/* 00318 808B4F48 004D7021 */ addu $t6, $v0, $t5 -/* 0031C 808B4F4C 46809120 */ cvt.s.w $f4, $f18 -/* 00320 808B4F50 4600218D */ trunc.w.s $f6, $f4 -/* 00324 808B4F54 440B3000 */ mfc1 $t3, $f6 -/* 00328 808B4F58 00000000 */ nop -/* 0032C 808B4F5C A60B0212 */ sh $t3, 0x0212($s0) ## 00000212 -/* 00330 808B4F60 85CF000A */ lh $t7, 0x000A($t6) ## 0000000A -/* 00334 808B4F64 A60F0032 */ sh $t7, 0x0032($s0) ## 00000032 -/* 00338 808B4F68 0C01DE1C */ jal Math_Sins - ## sins? -/* 0033C 808B4F6C 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -/* 00340 808B4F70 E7A00020 */ swc1 $f0, 0x0020($sp) -/* 00344 808B4F74 0C01DE0D */ jal Math_Coss - ## coss? -/* 00348 808B4F78 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -/* 0034C 808B4F7C 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 00350 808B4F80 44811000 */ mtc1 $at, $f2 ## $f2 = 50.00 -/* 00354 808B4F84 C7A80020 */ lwc1 $f8, 0x0020($sp) -/* 00358 808B4F88 C6100008 */ lwc1 $f16, 0x0008($s0) ## 00000008 -/* 0035C 808B4F8C 8618001C */ lh $t8, 0x001C($s0) ## 0000001C -/* 00360 808B4F90 46024282 */ mul.s $f10, $f8, $f2 -/* 00364 808B4F94 3C08808B */ lui $t0, %hi(D_808B5DD8) ## $t0 = 808B0000 -/* 00368 808B4F98 0018C880 */ sll $t9, $t8, 2 -/* 0036C 808B4F9C 0338C821 */ addu $t9, $t9, $t8 -/* 00370 808B4FA0 0019C880 */ sll $t9, $t9, 2 -/* 00374 808B4FA4 25085DD8 */ addiu $t0, $t0, %lo(D_808B5DD8) ## $t0 = 808B5DD8 -/* 00378 808B4FA8 03281021 */ addu $v0, $t9, $t0 -/* 0037C 808B4FAC 46105480 */ add.s $f18, $f10, $f16 -/* 00380 808B4FB0 46020402 */ mul.s $f16, $f0, $f2 -/* 00384 808B4FB4 C608000C */ lwc1 $f8, 0x000C($s0) ## 0000000C -/* 00388 808B4FB8 3C0D0600 */ lui $t5, 0x0600 ## $t5 = 06000000 -/* 0038C 808B4FBC E6120024 */ swc1 $f18, 0x0024($s0) ## 00000024 -/* 00390 808B4FC0 8449000C */ lh $t1, 0x000C($v0) ## 0000000C -/* 00394 808B4FC4 C6120010 */ lwc1 $f18, 0x0010($s0) ## 00000010 -/* 00398 808B4FC8 25AD09E0 */ addiu $t5, $t5, 0x09E0 ## $t5 = 060009E0 -/* 0039C 808B4FCC 44892000 */ mtc1 $t1, $f4 ## $f4 = 0.00 -/* 003A0 808B4FD0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 003A4 808B4FD4 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 003A8 808B4FD8 468021A0 */ cvt.s.w $f6, $f4 -/* 003AC 808B4FDC 24050163 */ addiu $a1, $zero, 0x0163 ## $a1 = 00000163 -/* 003B0 808B4FE0 46128100 */ add.s $f4, $f16, $f18 -/* 003B4 808B4FE4 46083280 */ add.s $f10, $f6, $f8 -/* 003B8 808B4FE8 E604002C */ swc1 $f4, 0x002C($s0) ## 0000002C -/* 003BC 808B4FEC E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 -/* 003C0 808B4FF0 844A000E */ lh $t2, 0x000E($v0) ## 0000000E -/* 003C4 808B4FF4 A60A00B4 */ sh $t2, 0x00B4($s0) ## 000000B4 -/* 003C8 808B4FF8 844B0010 */ lh $t3, 0x0010($v0) ## 00000010 -/* 003CC 808B4FFC A60B00B6 */ sh $t3, 0x00B6($s0) ## 000000B6 -/* 003D0 808B5000 844C0012 */ lh $t4, 0x0012($v0) ## 00000012 -/* 003D4 808B5004 AE0D0150 */ sw $t5, 0x0150($s0) ## 00000150 -/* 003D8 808B5008 A60C00B8 */ sh $t4, 0x00B8($s0) ## 000000B8 -/* 003DC 808B500C 8FA40034 */ lw $a0, 0x0034($sp) -/* 003E0 808B5010 0C02604B */ jal Object_GetIndex - ## ObjectIndex -/* 003E4 808B5014 00812021 */ addu $a0, $a0, $at -/* 003E8 808B5018 A2020214 */ sb $v0, 0x0214($s0) ## 00000214 -/* 003EC 808B501C 820E0214 */ lb $t6, 0x0214($s0) ## 00000214 -/* 003F0 808B5020 3C04808B */ lui $a0, %hi(D_808B60BC) ## $a0 = 808B0000 -/* 003F4 808B5024 248460BC */ addiu $a0, $a0, %lo(D_808B60BC) ## $a0 = 808B60BC -/* 003F8 808B5028 05C10007 */ bgez $t6, .L808B5048 -/* 003FC 808B502C 3C06808B */ lui $a2, %hi(D_808B60EC) ## $a2 = 808B0000 -/* 00400 808B5030 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 00404 808B5034 24C660EC */ addiu $a2, $a2, %lo(D_808B60EC) ## $a2 = 808B60EC -/* 00408 808B5038 0C00084C */ jal osSyncPrintf - -/* 0040C 808B503C 2407024D */ addiu $a3, $zero, 0x024D ## $a3 = 0000024D -/* 00410 808B5040 10000004 */ beq $zero, $zero, .L808B5054 -/* 00414 808B5044 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L808B5048: -/* 00418 808B5048 0C22D6BC */ jal func_808B5AF0 -/* 0041C 808B504C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00420 808B5050 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L808B5054: -/* 00424 808B5054 8FBF001C */ lw $ra, 0x001C($sp) -/* 00428 808B5058 8FB00018 */ lw $s0, 0x0018($sp) -/* 0042C 808B505C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00430 808B5060 03E00008 */ jr $ra -/* 00434 808B5064 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B51A8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B51A8.s deleted file mode 100644 index 5911563abd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B51A8.s +++ /dev/null @@ -1,39 +0,0 @@ -glabel func_808B51A8 -/* 00578 808B51A8 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 0057C 808B51AC AFBF0024 */ sw $ra, 0x0024($sp) -/* 00580 808B51B0 AFA40040 */ sw $a0, 0x0040($sp) -/* 00584 808B51B4 AFA50044 */ sw $a1, 0x0044($sp) -/* 00588 808B51B8 3C014316 */ lui $at, 0x4316 ## $at = 43160000 -/* 0058C 808B51BC 44812000 */ mtc1 $at, $f4 ## $f4 = 150.00 -/* 00590 808B51C0 C4800050 */ lwc1 $f0, 0x0050($a0) ## 00000050 -/* 00594 808B51C4 3C01437A */ lui $at, 0x437A ## $at = 437A0000 -/* 00598 808B51C8 44813000 */ mtc1 $at, $f6 ## $f6 = 250.00 -/* 0059C 808B51CC 46040082 */ mul.s $f2, $f0, $f4 -/* 005A0 808B51D0 C4900024 */ lwc1 $f16, 0x0024($a0) ## 00000024 -/* 005A4 808B51D4 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 005A8 808B51D8 46060202 */ mul.s $f8, $f0, $f6 -/* 005AC 808B51DC E7B0002C */ swc1 $f16, 0x002C($sp) -/* 005B0 808B51E0 C4920028 */ lwc1 $f18, 0x0028($a0) ## 00000028 -/* 005B4 808B51E4 44812000 */ mtc1 $at, $f4 ## $f4 = 50.00 -/* 005B8 808B51E8 44061000 */ mfc1 $a2, $f2 -/* 005BC 808B51EC 241800A0 */ addiu $t8, $zero, 0x00A0 ## $t8 = 000000A0 -/* 005C0 808B51F0 46049180 */ add.s $f6, $f18, $f4 -/* 005C4 808B51F4 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 005C8 808B51F8 24070002 */ addiu $a3, $zero, 0x0002 ## $a3 = 00000002 -/* 005CC 808B51FC 4600428D */ trunc.w.s $f10, $f8 -/* 005D0 808B5200 E7A60030 */ swc1 $f6, 0x0030($sp) -/* 005D4 808B5204 C488002C */ lwc1 $f8, 0x002C($a0) ## 0000002C -/* 005D8 808B5208 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 005DC 808B520C 44025000 */ mfc1 $v0, $f10 -/* 005E0 808B5210 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFEC -/* 005E4 808B5214 AFB90018 */ sw $t9, 0x0018($sp) -/* 005E8 808B5218 00021400 */ sll $v0, $v0, 16 -/* 005EC 808B521C 00021403 */ sra $v0, $v0, 16 -/* 005F0 808B5220 AFA20010 */ sw $v0, 0x0010($sp) -/* 005F4 808B5224 AFB80014 */ sw $t8, 0x0014($sp) -/* 005F8 808B5228 0C00CD20 */ jal func_80033480 -/* 005FC 808B522C E7A80034 */ swc1 $f8, 0x0034($sp) -/* 00600 808B5230 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00604 808B5234 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00608 808B5238 03E00008 */ jr $ra -/* 0060C 808B523C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5240.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5240.s deleted file mode 100644 index 449c4263d3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5240.s +++ /dev/null @@ -1,94 +0,0 @@ -glabel func_808B5240 -/* 00610 808B5240 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 00614 808B5244 AFB5003C */ sw $s5, 0x003C($sp) -/* 00618 808B5248 AFB40038 */ sw $s4, 0x0038($sp) -/* 0061C 808B524C AFB1002C */ sw $s1, 0x002C($sp) -/* 00620 808B5250 AFB60040 */ sw $s6, 0x0040($sp) -/* 00624 808B5254 AFB30034 */ sw $s3, 0x0034($sp) -/* 00628 808B5258 AFB20030 */ sw $s2, 0x0030($sp) -/* 0062C 808B525C AFB00028 */ sw $s0, 0x0028($sp) -/* 00630 808B5260 3C11808B */ lui $s1, %hi(D_808B5EB0) ## $s1 = 808B0000 -/* 00634 808B5264 3C14808B */ lui $s4, %hi(D_808B605C) ## $s4 = 808B0000 -/* 00638 808B5268 3C15808B */ lui $s5, %hi(D_808B6068) ## $s5 = 808B0000 -/* 0063C 808B526C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00640 808B5270 00A0B025 */ or $s6, $a1, $zero ## $s6 = 00000000 -/* 00644 808B5274 AFBF0044 */ sw $ra, 0x0044($sp) -/* 00648 808B5278 26B56068 */ addiu $s5, $s5, %lo(D_808B6068) ## $s5 = 808B6068 -/* 0064C 808B527C 2694605C */ addiu $s4, $s4, %lo(D_808B605C) ## $s4 = 808B605C -/* 00650 808B5280 26315EB0 */ addiu $s1, $s1, %lo(D_808B5EB0) ## $s1 = 808B5EB0 -/* 00654 808B5284 2412000E */ addiu $s2, $zero, 0x000E ## $s2 = 0000000E -/* 00658 808B5288 27B30050 */ addiu $s3, $sp, 0x0050 ## $s3 = FFFFFFE8 -.L808B528C: -/* 0065C 808B528C 86080158 */ lh $t0, 0x0158($s0) ## 00000158 -/* 00660 808B5290 2D01001A */ sltiu $at, $t0, 0x001A -/* 00664 808B5294 1020003A */ beq $at, $zero, .L808B5380 -/* 00668 808B5298 00084C00 */ sll $t1, $t0, 16 -/* 0066C 808B529C 01120019 */ multu $t0, $s2 -/* 00670 808B52A0 860E0154 */ lh $t6, 0x0154($s0) ## 00000154 -/* 00674 808B52A4 00094C03 */ sra $t1, $t1, 16 -/* 00678 808B52A8 00007812 */ mflo $t7 -/* 0067C 808B52AC 022FC021 */ addu $t8, $s1, $t7 -/* 00680 808B52B0 87190000 */ lh $t9, 0x0000($t8) ## 00000000 -/* 00684 808B52B4 01D9082A */ slt $at, $t6, $t9 -/* 00688 808B52B8 54200032 */ bnel $at, $zero, .L808B5384 -/* 0068C 808B52BC 8FBF0044 */ lw $ra, 0x0044($sp) -/* 00690 808B52C0 01320019 */ multu $t1, $s2 -/* 00694 808B52C4 C608015C */ lwc1 $f8, 0x015C($s0) ## 0000015C -/* 00698 808B52C8 C6100160 */ lwc1 $f16, 0x0160($s0) ## 00000160 -/* 0069C 808B52CC 26030024 */ addiu $v1, $s0, 0x0024 ## $v1 = 00000024 -/* 006A0 808B52D0 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 -/* 006A4 808B52D4 02602825 */ or $a1, $s3, $zero ## $a1 = FFFFFFE8 -/* 006A8 808B52D8 02803025 */ or $a2, $s4, $zero ## $a2 = 808B605C -/* 006AC 808B52DC 02A03825 */ or $a3, $s5, $zero ## $a3 = 808B6068 -/* 006B0 808B52E0 00005012 */ mflo $t2 -/* 006B4 808B52E4 022A1021 */ addu $v0, $s1, $t2 -/* 006B8 808B52E8 844C0006 */ lh $t4, 0x0006($v0) ## 00000006 -/* 006BC 808B52EC 844B0002 */ lh $t3, 0x0002($v0) ## 00000002 -/* 006C0 808B52F0 844D0004 */ lh $t5, 0x0004($v0) ## 00000004 -/* 006C4 808B52F4 448C3000 */ mtc1 $t4, $f6 ## $f6 = 0.00 -/* 006C8 808B52F8 448B2000 */ mtc1 $t3, $f4 ## $f4 = 0.00 -/* 006CC 808B52FC 844F0008 */ lh $t7, 0x0008($v0) ## 00000008 -/* 006D0 808B5300 468030A0 */ cvt.s.w $f2, $f6 -/* 006D4 808B5304 C4660000 */ lwc1 $f6, 0x0000($v1) ## 00000024 -/* 006D8 808B5308 8458000A */ lh $t8, 0x000A($v0) ## 0000000A -/* 006DC 808B530C 844E000C */ lh $t6, 0x000C($v0) ## 0000000C -/* 006E0 808B5310 46802020 */ cvt.s.w $f0, $f4 -/* 006E4 808B5314 46024282 */ mul.s $f10, $f8, $f2 -/* 006E8 808B5318 00000000 */ nop -/* 006EC 808B531C 46100482 */ mul.s $f18, $f0, $f16 -/* 006F0 808B5320 448D8000 */ mtc1 $t5, $f16 ## $f16 = 0.00 -/* 006F4 808B5324 46125100 */ add.s $f4, $f10, $f18 -/* 006F8 808B5328 468082A0 */ cvt.s.w $f10, $f16 -/* 006FC 808B532C 46062200 */ add.s $f8, $f4, $f6 -/* 00700 808B5330 E7A80050 */ swc1 $f8, 0x0050($sp) -/* 00704 808B5334 C4720004 */ lwc1 $f18, 0x0004($v1) ## 00000028 -/* 00708 808B5338 46125100 */ add.s $f4, $f10, $f18 -/* 0070C 808B533C E7A40054 */ swc1 $f4, 0x0054($sp) -/* 00710 808B5340 C6060160 */ lwc1 $f6, 0x0160($s0) ## 00000160 -/* 00714 808B5344 C610015C */ lwc1 $f16, 0x015C($s0) ## 0000015C -/* 00718 808B5348 C4640008 */ lwc1 $f4, 0x0008($v1) ## 0000002C -/* 0071C 808B534C 46023202 */ mul.s $f8, $f6, $f2 -/* 00720 808B5350 AFAF0010 */ sw $t7, 0x0010($sp) -/* 00724 808B5354 AFB80014 */ sw $t8, 0x0014($sp) -/* 00728 808B5358 46100282 */ mul.s $f10, $f0, $f16 -/* 0072C 808B535C AFAE0018 */ sw $t6, 0x0018($sp) -/* 00730 808B5360 460A4481 */ sub.s $f18, $f8, $f10 -/* 00734 808B5364 46049180 */ add.s $f6, $f18, $f4 -/* 00738 808B5368 0C00A1EB */ jal func_800287AC -/* 0073C 808B536C E7A60058 */ swc1 $f6, 0x0058($sp) -/* 00740 808B5370 86190158 */ lh $t9, 0x0158($s0) ## 00000158 -/* 00744 808B5374 272A0001 */ addiu $t2, $t9, 0x0001 ## $t2 = 00000001 -/* 00748 808B5378 1000FFC4 */ beq $zero, $zero, .L808B528C -/* 0074C 808B537C A60A0158 */ sh $t2, 0x0158($s0) ## 00000158 -.L808B5380: -/* 00750 808B5380 8FBF0044 */ lw $ra, 0x0044($sp) -.L808B5384: -/* 00754 808B5384 8FB00028 */ lw $s0, 0x0028($sp) -/* 00758 808B5388 8FB1002C */ lw $s1, 0x002C($sp) -/* 0075C 808B538C 8FB20030 */ lw $s2, 0x0030($sp) -/* 00760 808B5390 8FB30034 */ lw $s3, 0x0034($sp) -/* 00764 808B5394 8FB40038 */ lw $s4, 0x0038($sp) -/* 00768 808B5398 8FB5003C */ lw $s5, 0x003C($sp) -/* 0076C 808B539C 8FB60040 */ lw $s6, 0x0040($sp) -/* 00770 808B53A0 03E00008 */ jr $ra -/* 00774 808B53A4 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B53A8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B53A8.s deleted file mode 100644 index 7cb26d6a81..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B53A8.s +++ /dev/null @@ -1,174 +0,0 @@ -.late_rodata -glabel D_808B6254 - .float 1.3 - -.text -glabel func_808B53A8 -/* 00778 808B53A8 27BDFF38 */ addiu $sp, $sp, 0xFF38 ## $sp = FFFFFF38 -/* 0077C 808B53AC AFBF0094 */ sw $ra, 0x0094($sp) -/* 00780 808B53B0 AFB70090 */ sw $s7, 0x0090($sp) -/* 00784 808B53B4 AFB6008C */ sw $s6, 0x008C($sp) -/* 00788 808B53B8 AFB50088 */ sw $s5, 0x0088($sp) -/* 0078C 808B53BC AFB40084 */ sw $s4, 0x0084($sp) -/* 00790 808B53C0 AFB30080 */ sw $s3, 0x0080($sp) -/* 00794 808B53C4 AFB2007C */ sw $s2, 0x007C($sp) -/* 00798 808B53C8 AFB10078 */ sw $s1, 0x0078($sp) -/* 0079C 808B53CC AFB00074 */ sw $s0, 0x0074($sp) -/* 007A0 808B53D0 F7BE0068 */ sdc1 $f30, 0x0068($sp) -/* 007A4 808B53D4 F7BC0060 */ sdc1 $f28, 0x0060($sp) -/* 007A8 808B53D8 F7BA0058 */ sdc1 $f26, 0x0058($sp) -/* 007AC 808B53DC F7B80050 */ sdc1 $f24, 0x0050($sp) -/* 007B0 808B53E0 F7B60048 */ sdc1 $f22, 0x0048($sp) -/* 007B4 808B53E4 F7B40040 */ sdc1 $f20, 0x0040($sp) -/* 007B8 808B53E8 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 007BC 808B53EC 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 007C0 808B53F0 00A0B825 */ or $s7, $a1, $zero ## $s7 = 00000000 -/* 007C4 808B53F4 15C00010 */ bne $t6, $zero, .L808B5438 -/* 007C8 808B53F8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 007CC 808B53FC C6240028 */ lwc1 $f4, 0x0028($s1) ## 00000028 -/* 007D0 808B5400 8E270024 */ lw $a3, 0x0024($s1) ## 00000024 -/* 007D4 808B5404 240F0005 */ addiu $t7, $zero, 0x0005 ## $t7 = 00000005 -/* 007D8 808B5408 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 007DC 808B540C C626002C */ lwc1 $f6, 0x002C($s1) ## 0000002C -/* 007E0 808B5410 AFAF0024 */ sw $t7, 0x0024($sp) -/* 007E4 808B5414 AFA00020 */ sw $zero, 0x0020($sp) -/* 007E8 808B5418 AFA0001C */ sw $zero, 0x001C($sp) -/* 007EC 808B541C AFA00018 */ sw $zero, 0x0018($sp) -/* 007F0 808B5420 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 00001C24 -/* 007F4 808B5424 240600CD */ addiu $a2, $zero, 0x00CD ## $a2 = 000000CD -/* 007F8 808B5428 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 007FC 808B542C E7A60014 */ swc1 $f6, 0x0014($sp) -/* 00800 808B5430 10000001 */ beq $zero, $zero, .L808B5438 -/* 00804 808B5434 24020003 */ addiu $v0, $zero, 0x0003 ## $v0 = 00000003 -.L808B5438: -/* 00808 808B5438 28410005 */ slti $at, $v0, 0x0005 -/* 0080C 808B543C 10200066 */ beq $at, $zero, .L808B55D8 -/* 00810 808B5440 0002C080 */ sll $t8, $v0, 2 -/* 00814 808B5444 3C01808B */ lui $at, %hi(D_808B6254) ## $at = 808B0000 -/* 00818 808B5448 C43E6254 */ lwc1 $f30, %lo(D_808B6254)($at) -/* 0081C 808B544C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 00820 808B5450 4481E000 */ mtc1 $at, $f28 ## $f28 = 5.00 -/* 00824 808B5454 3C01402C */ lui $at, 0x402C ## $at = 402C0000 -/* 00828 808B5458 4481D800 */ mtc1 $at, $f27 ## $f27 = 2.69 -/* 0082C 808B545C 3C014180 */ lui $at, 0x4180 ## $at = 41800000 -/* 00830 808B5460 4481C000 */ mtc1 $at, $f24 ## $f24 = 16.00 -/* 00834 808B5464 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 00838 808B5468 4481B000 */ mtc1 $at, $f22 ## $f22 = 8.00 -/* 0083C 808B546C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00840 808B5470 3C19808B */ lui $t9, %hi(D_808B6074) ## $t9 = 808B0000 -/* 00844 808B5474 27396074 */ addiu $t9, $t9, %lo(D_808B6074) ## $t9 = 808B6074 -/* 00848 808B5478 3C16808B */ lui $s6, %hi(D_808B6088) ## $s6 = 808B0000 -/* 0084C 808B547C 3C150600 */ lui $s5, 0x0600 ## $s5 = 06000000 -/* 00850 808B5480 4481A000 */ mtc1 $at, $f20 ## $f20 = 0.50 -/* 00854 808B5484 4480D000 */ mtc1 $zero, $f26 ## $f26 = 0.00 -/* 00858 808B5488 26B509E0 */ addiu $s5, $s5, 0x09E0 ## $s5 = 060009E0 -/* 0085C 808B548C 26D66088 */ addiu $s6, $s6, %lo(D_808B6088) ## $s6 = 808B6088 -/* 00860 808B5490 03198021 */ addu $s0, $t8, $t9 -/* 00864 808B5494 26320024 */ addiu $s2, $s1, 0x0024 ## $s2 = 00000024 -/* 00868 808B5498 27B400AC */ addiu $s4, $sp, 0x00AC ## $s4 = FFFFFFE4 -/* 0086C 808B549C 27B300B8 */ addiu $s3, $sp, 0x00B8 ## $s3 = FFFFFFF0 -.L808B54A0: -/* 00870 808B54A0 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00874 808B54A4 00000000 */ nop -/* 00878 808B54A8 46140201 */ sub.s $f8, $f0, $f20 -/* 0087C 808B54AC C6300024 */ lwc1 $f16, 0x0024($s1) ## 00000024 -/* 00880 808B54B0 46164282 */ mul.s $f10, $f8, $f22 -/* 00884 808B54B4 46105480 */ add.s $f18, $f10, $f16 -/* 00888 808B54B8 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 0088C 808B54BC E7B200B8 */ swc1 $f18, 0x00B8($sp) -/* 00890 808B54C0 461C0102 */ mul.s $f4, $f0, $f28 -/* 00894 808B54C4 C6260028 */ lwc1 $f6, 0x0028($s1) ## 00000028 -/* 00898 808B54C8 46062200 */ add.s $f8, $f4, $f6 -/* 0089C 808B54CC 46164280 */ add.s $f10, $f8, $f22 -/* 008A0 808B54D0 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 008A4 808B54D4 E7AA00BC */ swc1 $f10, 0x00BC($sp) -/* 008A8 808B54D8 46140401 */ sub.s $f16, $f0, $f20 -/* 008AC 808B54DC C624002C */ lwc1 $f4, 0x002C($s1) ## 0000002C -/* 008B0 808B54E0 46168482 */ mul.s $f18, $f16, $f22 -/* 008B4 808B54E4 46049180 */ add.s $f6, $f18, $f4 -/* 008B8 808B54E8 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 008BC 808B54EC E7A600C0 */ swc1 $f6, 0x00C0($sp) -/* 008C0 808B54F0 46140201 */ sub.s $f8, $f0, $f20 -/* 008C4 808B54F4 46184282 */ mul.s $f10, $f8, $f24 -/* 008C8 808B54F8 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 008CC 808B54FC E7AA00AC */ swc1 $f10, 0x00AC($sp) -/* 008D0 808B5500 46000086 */ mov.s $f2, $f0 -/* 008D4 808B5504 C6200060 */ lwc1 $f0, 0x0060($s1) ## 00000060 -/* 008D8 808B5508 46001121 */ cvt.d.s $f4, $f2 -/* 008DC 808B550C 46000005 */ abs.s $f0, $f0 -/* 008E0 808B5510 461E0402 */ mul.s $f16, $f0, $f30 -/* 008E4 808B5514 00000000 */ nop -/* 008E8 808B5518 463A2182 */ mul.d $f6, $f4, $f26 -/* 008EC 808B551C 460084A1 */ cvt.d.s $f18, $f16 -/* 008F0 808B5520 46269200 */ add.d $f8, $f18, $f6 -/* 008F4 808B5524 462042A0 */ cvt.s.d $f10, $f8 -/* 008F8 808B5528 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 008FC 808B552C E7AA00B0 */ swc1 $f10, 0x00B0($sp) -/* 00900 808B5530 46140401 */ sub.s $f16, $f0, $f20 -/* 00904 808B5534 C6120000 */ lwc1 $f18, 0x0000($s0) ## 00000000 -/* 00908 808B5538 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 0090C 808B553C 44815000 */ mtc1 $at, $f10 ## $f10 = 3.00 -/* 00910 808B5540 46188102 */ mul.s $f4, $f16, $f24 -/* 00914 808B5544 2409FE5C */ addiu $t1, $zero, 0xFE5C ## $t1 = FFFFFE5C -/* 00918 808B5548 240A0031 */ addiu $t2, $zero, 0x0031 ## $t2 = 00000031 -/* 0091C 808B554C 240B000F */ addiu $t3, $zero, 0x000F ## $t3 = 0000000F -/* 00920 808B5550 240C000F */ addiu $t4, $zero, 0x000F ## $t4 = 0000000F -/* 00924 808B5554 240D0002 */ addiu $t5, $zero, 0x0002 ## $t5 = 00000002 -/* 00928 808B5558 240E0040 */ addiu $t6, $zero, 0x0040 ## $t6 = 00000040 -/* 0092C 808B555C E7A400B4 */ swc1 $f4, 0x00B4($sp) -/* 00930 808B5560 C6260050 */ lwc1 $f6, 0x0050($s1) ## 00000050 -/* 00934 808B5564 240F00A0 */ addiu $t7, $zero, 0x00A0 ## $t7 = 000000A0 -/* 00938 808B5568 2418FFFF */ addiu $t8, $zero, 0xFFFF ## $t8 = FFFFFFFF -/* 0093C 808B556C 46069202 */ mul.s $f8, $f18, $f6 -/* 00940 808B5570 24190163 */ addiu $t9, $zero, 0x0163 ## $t9 = 00000163 -/* 00944 808B5574 AFB90038 */ sw $t9, 0x0038($sp) -/* 00948 808B5578 AFB80034 */ sw $t8, 0x0034($sp) -/* 0094C 808B557C AFAF0030 */ sw $t7, 0x0030($sp) -/* 00950 808B5580 AFB5003C */ sw $s5, 0x003C($sp) -/* 00954 808B5584 AFAE002C */ sw $t6, 0x002C($sp) -/* 00958 808B5588 460A4402 */ mul.s $f16, $f8, $f10 -/* 0095C 808B558C AFAD0028 */ sw $t5, 0x0028($sp) -/* 00960 808B5590 AFA00020 */ sw $zero, 0x0020($sp) -/* 00964 808B5594 AFAC001C */ sw $t4, 0x001C($sp) -/* 00968 808B5598 AFAB0018 */ sw $t3, 0x0018($sp) -/* 0096C 808B559C AFAA0014 */ sw $t2, 0x0014($sp) -/* 00970 808B55A0 AFA90010 */ sw $t1, 0x0010($sp) -/* 00974 808B55A4 4600810D */ trunc.w.s $f4, $f16 -/* 00978 808B55A8 02E02025 */ or $a0, $s7, $zero ## $a0 = 00000000 -/* 0097C 808B55AC 02602825 */ or $a1, $s3, $zero ## $a1 = FFFFFFF0 -/* 00980 808B55B0 02803025 */ or $a2, $s4, $zero ## $a2 = FFFFFFE4 -/* 00984 808B55B4 44022000 */ mfc1 $v0, $f4 -/* 00988 808B55B8 02403825 */ or $a3, $s2, $zero ## $a3 = 00000024 -/* 0098C 808B55BC 00021400 */ sll $v0, $v0, 16 -/* 00990 808B55C0 00021403 */ sra $v0, $v0, 16 -/* 00994 808B55C4 0C00A7A3 */ jal func_80029E8C - -/* 00998 808B55C8 AFA20024 */ sw $v0, 0x0024($sp) -/* 0099C 808B55CC 26100004 */ addiu $s0, $s0, 0x0004 ## $s0 = 00000004 -/* 009A0 808B55D0 1616FFB3 */ bne $s0, $s6, .L808B54A0 -/* 009A4 808B55D4 00000000 */ nop -.L808B55D8: -/* 009A8 808B55D8 8FBF0094 */ lw $ra, 0x0094($sp) -/* 009AC 808B55DC D7B40040 */ ldc1 $f20, 0x0040($sp) -/* 009B0 808B55E0 D7B60048 */ ldc1 $f22, 0x0048($sp) -/* 009B4 808B55E4 D7B80050 */ ldc1 $f24, 0x0050($sp) -/* 009B8 808B55E8 D7BA0058 */ ldc1 $f26, 0x0058($sp) -/* 009BC 808B55EC D7BC0060 */ ldc1 $f28, 0x0060($sp) -/* 009C0 808B55F0 D7BE0068 */ ldc1 $f30, 0x0068($sp) -/* 009C4 808B55F4 8FB00074 */ lw $s0, 0x0074($sp) -/* 009C8 808B55F8 8FB10078 */ lw $s1, 0x0078($sp) -/* 009CC 808B55FC 8FB2007C */ lw $s2, 0x007C($sp) -/* 009D0 808B5600 8FB30080 */ lw $s3, 0x0080($sp) -/* 009D4 808B5604 8FB40084 */ lw $s4, 0x0084($sp) -/* 009D8 808B5608 8FB50088 */ lw $s5, 0x0088($sp) -/* 009DC 808B560C 8FB6008C */ lw $s6, 0x008C($sp) -/* 009E0 808B5610 8FB70090 */ lw $s7, 0x0090($sp) -/* 009E4 808B5614 03E00008 */ jr $ra -/* 009E8 808B5618 27BD00C8 */ addiu $sp, $sp, 0x00C8 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B561C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B561C.s deleted file mode 100644 index eea3fe02de..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B561C.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_808B561C -/* 009EC 808B561C 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 009F0 808B5620 AFB40040 */ sw $s4, 0x0040($sp) -/* 009F4 808B5624 AFB00030 */ sw $s0, 0x0030($sp) -/* 009F8 808B5628 AFB3003C */ sw $s3, 0x003C($sp) -/* 009FC 808B562C AFB20038 */ sw $s2, 0x0038($sp) -/* 00A00 808B5630 AFB10034 */ sw $s1, 0x0034($sp) -/* 00A04 808B5634 3C10808B */ lui $s0, %hi(D_808B6088) ## $s0 = 808B0000 -/* 00A08 808B5638 3C14808B */ lui $s4, %hi(D_808B6092) ## $s4 = 808B0000 -/* 00A0C 808B563C 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 00A10 808B5640 AFBF0044 */ sw $ra, 0x0044($sp) -/* 00A14 808B5644 26946092 */ addiu $s4, $s4, %lo(D_808B6092) ## $s4 = 808B6092 -/* 00A18 808B5648 26106088 */ addiu $s0, $s0, %lo(D_808B6088) ## $s0 = 808B6088 -/* 00A1C 808B564C 24910024 */ addiu $s1, $a0, 0x0024 ## $s1 = 00000024 -/* 00A20 808B5650 24B31C24 */ addiu $s3, $a1, 0x1C24 ## $s3 = 00001C24 -/* 00A24 808B5654 C6240004 */ lwc1 $f4, 0x0004($s1) ## 00000028 -.L808B5658: -/* 00A28 808B5658 8E270000 */ lw $a3, 0x0000($s1) ## 00000024 -/* 00A2C 808B565C 860E0000 */ lh $t6, 0x0000($s0) ## 808B6088 -/* 00A30 808B5660 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00A34 808B5664 C6260008 */ lwc1 $f6, 0x0008($s1) ## 0000002C -/* 00A38 808B5668 AFA00020 */ sw $zero, 0x0020($sp) -/* 00A3C 808B566C AFA0001C */ sw $zero, 0x001C($sp) -/* 00A40 808B5670 AFA00018 */ sw $zero, 0x0018($sp) -/* 00A44 808B5674 02602025 */ or $a0, $s3, $zero ## $a0 = 00001C24 -/* 00A48 808B5678 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 00A4C 808B567C 240600CD */ addiu $a2, $zero, 0x00CD ## $a2 = 000000CD -/* 00A50 808B5680 AFAE0024 */ sw $t6, 0x0024($sp) -/* 00A54 808B5684 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 00A58 808B5688 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 00A5C 808B568C 10400003 */ beq $v0, $zero, .L808B569C -/* 00A60 808B5690 26100002 */ addiu $s0, $s0, 0x0002 ## $s0 = 808B608A -/* 00A64 808B5694 5614FFF0 */ bnel $s0, $s4, .L808B5658 -/* 00A68 808B5698 C6240004 */ lwc1 $f4, 0x0004($s1) ## 00000028 -.L808B569C: -/* 00A6C 808B569C 8FBF0044 */ lw $ra, 0x0044($sp) -/* 00A70 808B56A0 8FB00030 */ lw $s0, 0x0030($sp) -/* 00A74 808B56A4 8FB10034 */ lw $s1, 0x0034($sp) -/* 00A78 808B56A8 8FB20038 */ lw $s2, 0x0038($sp) -/* 00A7C 808B56AC 8FB3003C */ lw $s3, 0x003C($sp) -/* 00A80 808B56B0 8FB40040 */ lw $s4, 0x0040($sp) -/* 00A84 808B56B4 03E00008 */ jr $ra -/* 00A88 808B56B8 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B56BC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B56BC.s deleted file mode 100644 index a7fa8eff26..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B56BC.s +++ /dev/null @@ -1,90 +0,0 @@ -.rdata -glabel D_808B618C - .asciz "Error 補正出来ない(%s %d)(arg_data 0x%04x)(hosei_angY %x)\n" - .balign 4 - -glabel D_808B61C8 - .asciz "../z_bg_spot16_bombstone.c" - .balign 4 - -.text -glabel func_808B56BC -/* 00A8C 808B56BC 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00A90 808B56C0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00A94 808B56C4 AFB00020 */ sw $s0, 0x0020($sp) -/* 00A98 808B56C8 3C014302 */ lui $at, 0x4302 ## $at = 43020000 -/* 00A9C 808B56CC 44813000 */ mtc1 $at, $f6 ## $f6 = 130.00 -/* 00AA0 808B56D0 C4840090 */ lwc1 $f4, 0x0090($a0) ## 00000090 -/* 00AA4 808B56D4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00AA8 808B56D8 8CA61C44 */ lw $a2, 0x1C44($a1) ## 00001C44 -/* 00AAC 808B56DC 4606203C */ c.lt.s $f4, $f6 -/* 00AB0 808B56E0 3C014320 */ lui $at, 0x4320 ## $at = 43200000 -/* 00AB4 808B56E4 4502003A */ bc1fl .L808B57D0 -/* 00AB8 808B56E8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00ABC 808B56EC C4800094 */ lwc1 $f0, 0x0094($a0) ## 00000094 -/* 00AC0 808B56F0 44814000 */ mtc1 $at, $f8 ## $f8 = 160.00 -/* 00AC4 808B56F4 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00AC8 808B56F8 4608003C */ c.lt.s $f0, $f8 -/* 00ACC 808B56FC 00000000 */ nop -/* 00AD0 808B5700 45020033 */ bc1fl .L808B57D0 -/* 00AD4 808B5704 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00AD8 808B5708 44815000 */ mtc1 $at, $f10 ## $f10 = -10.00 -/* 00ADC 808B570C 00000000 */ nop -/* 00AE0 808B5710 4600503E */ c.le.s $f10, $f0 -/* 00AE4 808B5714 00000000 */ nop -/* 00AE8 808B5718 4502002D */ bc1fl .L808B57D0 -/* 00AEC 808B571C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00AF0 808B5720 848E008A */ lh $t6, 0x008A($a0) ## 0000008A -/* 00AF4 808B5724 848F00B6 */ lh $t7, 0x00B6($a0) ## 000000B6 -/* 00AF8 808B5728 01CF1023 */ subu $v0, $t6, $t7 -/* 00AFC 808B572C 04400003 */ bltz $v0, .L808B573C -/* 00B00 808B5730 00021823 */ subu $v1, $zero, $v0 -/* 00B04 808B5734 10000001 */ beq $zero, $zero, .L808B573C -/* 00B08 808B5738 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L808B573C: -/* 00B0C 808B573C 2464C001 */ addiu $a0, $v1, 0xC001 ## $a0 = FFFFC001 -/* 00B10 808B5740 00042400 */ sll $a0, $a0, 16 -/* 00B14 808B5744 00042403 */ sra $a0, $a0, 16 -/* 00B18 808B5748 58800021 */ blezl $a0, .L808B57D0 -/* 00B1C 808B574C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00B20 808B5750 AFA40028 */ sw $a0, 0x0028($sp) -/* 00B24 808B5754 0C01DE1C */ jal Math_Sins - ## sins? -/* 00B28 808B5758 AFA6003C */ sw $a2, 0x003C($sp) -/* 00B2C 808B575C C6100090 */ lwc1 $f16, 0x0090($s0) ## 00000090 -/* 00B30 808B5760 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 00B34 808B5764 3C04808B */ lui $a0, %hi(D_808B618C) ## $a0 = 808B0000 -/* 00B38 808B5768 46100082 */ mul.s $f2, $f0, $f16 -/* 00B3C 808B576C 3C05808B */ lui $a1, %hi(D_808B61C8) ## $a1 = 808B0000 -/* 00B40 808B5770 8FA6003C */ lw $a2, 0x003C($sp) -/* 00B44 808B5774 24A561C8 */ addiu $a1, $a1, %lo(D_808B61C8) ## $a1 = 808B61C8 -/* 00B48 808B5778 2484618C */ addiu $a0, $a0, %lo(D_808B618C) ## $a0 = 808B618C -/* 00B4C 808B577C 8FB80028 */ lw $t8, 0x0028($sp) -/* 00B50 808B5780 4602903E */ c.le.s $f18, $f2 -/* 00B54 808B5784 00000000 */ nop -/* 00B58 808B5788 4502000D */ bc1fl .L808B57C0 -/* 00B5C 808B578C 8607001C */ lh $a3, 0x001C($s0) ## 0000001C -/* 00B60 808B5790 C606015C */ lwc1 $f6, 0x015C($s0) ## 0000015C -/* 00B64 808B5794 C4C40024 */ lwc1 $f4, 0x0024($a2) ## 00000024 -/* 00B68 808B5798 C4D0002C */ lwc1 $f16, 0x002C($a2) ## 0000002C -/* 00B6C 808B579C 46061202 */ mul.s $f8, $f2, $f6 -/* 00B70 808B57A0 46082280 */ add.s $f10, $f4, $f8 -/* 00B74 808B57A4 E4CA0024 */ swc1 $f10, 0x0024($a2) ## 00000024 -/* 00B78 808B57A8 C6120160 */ lwc1 $f18, 0x0160($s0) ## 00000160 -/* 00B7C 808B57AC 46121182 */ mul.s $f6, $f2, $f18 -/* 00B80 808B57B0 46068100 */ add.s $f4, $f16, $f6 -/* 00B84 808B57B4 10000005 */ beq $zero, $zero, .L808B57CC -/* 00B88 808B57B8 E4C4002C */ swc1 $f4, 0x002C($a2) ## 0000002C -/* 00B8C 808B57BC 8607001C */ lh $a3, 0x001C($s0) ## 0000001C -.L808B57C0: -/* 00B90 808B57C0 AFB80010 */ sw $t8, 0x0010($sp) -/* 00B94 808B57C4 0C00084C */ jal osSyncPrintf - -/* 00B98 808B57C8 240603A7 */ addiu $a2, $zero, 0x03A7 ## $a2 = 000003A7 -.L808B57CC: -/* 00B9C 808B57CC 8FBF0024 */ lw $ra, 0x0024($sp) -.L808B57D0: -/* 00BA0 808B57D0 8FB00020 */ lw $s0, 0x0020($sp) -/* 00BA4 808B57D4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00BA8 808B57D8 03E00008 */ jr $ra -/* 00BAC 808B57DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B57E0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B57E0.s deleted file mode 100644 index e2e91e6741..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B57E0.s +++ /dev/null @@ -1,100 +0,0 @@ -.late_rodata -glabel D_808B6258 - .word 0x44C56000 -glabel D_808B625C - .word 0x44458000 -glabel D_808B6260 - .word 0x481C4000, 0x00000000, 0x00000000, 0x00000000 - -.text -glabel func_808B57E0 -/* 00BB0 808B57E0 3C09808B */ lui $t1, %hi(D_808B5DD4) ## $t1 = 808B0000 -/* 00BB4 808B57E4 25295DD4 */ addiu $t1, $t1, %lo(D_808B5DD4) ## $t1 = 808B5DD4 -/* 00BB8 808B57E8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00BBC 808B57EC 85220000 */ lh $v0, 0x0000($t1) ## 808B5DD4 -/* 00BC0 808B57F0 AFBF001C */ sw $ra, 0x001C($sp) -/* 00BC4 808B57F4 AFA40020 */ sw $a0, 0x0020($sp) -/* 00BC8 808B57F8 AFA50024 */ sw $a1, 0x0024($sp) -/* 00BCC 808B57FC 18400003 */ blez $v0, .L808B580C -/* 00BD0 808B5800 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 -/* 00BD4 808B5804 244FFFFF */ addiu $t7, $v0, 0xFFFF ## $t7 = FFFFFFFF -/* 00BD8 808B5808 A52F0000 */ sh $t7, 0x0000($t1) ## 808B5DD4 -.L808B580C: -/* 00BDC 808B580C 3C04808B */ lui $a0, %hi(D_808B5DD0) ## $a0 = 808B0000 -/* 00BE0 808B5810 24845DD0 */ addiu $a0, $a0, %lo(D_808B5DD0) ## $a0 = 808B5DD0 -/* 00BE4 808B5814 8C820000 */ lw $v0, 0x0000($a0) ## 808B5DD0 -/* 00BE8 808B5818 50400033 */ beql $v0, $zero, .L808B58E8 -/* 00BEC 808B581C 8C6C067C */ lw $t4, 0x067C($v1) ## 0000067C -/* 00BF0 808B5820 8C580130 */ lw $t8, 0x0130($v0) ## 00000130 -/* 00BF4 808B5824 57000004 */ bnel $t8, $zero, .L808B5838 -/* 00BF8 808B5828 85390000 */ lh $t9, 0x0000($t1) ## 808B5DD4 -/* 00BFC 808B582C 1000003D */ beq $zero, $zero, .L808B5924 -/* 00C00 808B5830 AC800000 */ sw $zero, 0x0000($a0) ## 808B5DD0 -/* 00C04 808B5834 85390000 */ lh $t9, 0x0000($t1) ## 808B5DD4 -.L808B5838: -/* 00C08 808B5838 3C0144AF */ lui $at, 0x44AF ## $at = 44AF0000 -/* 00C0C 808B583C 5F20003A */ bgtzl $t9, .L808B5928 -/* 00C10 808B5840 8FBF001C */ lw $ra, 0x001C($sp) -/* 00C14 808B5844 C4440028 */ lwc1 $f4, 0x0028($v0) ## 00000028 -/* 00C18 808B5848 44813000 */ mtc1 $at, $f6 ## $f6 = 1400.00 -/* 00C1C 808B584C 3C01808B */ lui $at, %hi(D_808B6258) ## $at = 808B0000 -/* 00C20 808B5850 4606203C */ c.lt.s $f4, $f6 -/* 00C24 808B5854 00000000 */ nop -/* 00C28 808B5858 45020033 */ bc1fl .L808B5928 -/* 00C2C 808B585C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00C30 808B5860 C42A6258 */ lwc1 $f10, %lo(D_808B6258)($at) -/* 00C34 808B5864 3C01808B */ lui $at, %hi(D_808B625C) ## $at = 808B0000 -/* 00C38 808B5868 C432625C */ lwc1 $f18, %lo(D_808B625C)($at) -/* 00C3C 808B586C C4480024 */ lwc1 $f8, 0x0024($v0) ## 00000024 -/* 00C40 808B5870 C450002C */ lwc1 $f16, 0x002C($v0) ## 0000002C -/* 00C44 808B5874 460A4300 */ add.s $f12, $f8, $f10 -/* 00C48 808B5878 0C032D57 */ jal Math3D_Dist1DSq -/* 00C4C 808B587C 46128380 */ add.s $f14, $f16, $f18 -/* 00C50 808B5880 3C01808B */ lui $at, %hi(D_808B6260) ## $at = 808B0000 -/* 00C54 808B5884 C4246260 */ lwc1 $f4, %lo(D_808B6260)($at) -/* 00C58 808B5888 3C04808B */ lui $a0, %hi(D_808B5DD0) ## $a0 = 808B0000 -/* 00C5C 808B588C 3C09808B */ lui $t1, %hi(D_808B5DD4) ## $t1 = 808B0000 -/* 00C60 808B5890 4604003C */ c.lt.s $f0, $f4 -/* 00C64 808B5894 25295DD4 */ addiu $t1, $t1, %lo(D_808B5DD4) ## $t1 = 808B5DD4 -/* 00C68 808B5898 24845DD0 */ addiu $a0, $a0, %lo(D_808B5DD0) ## $a0 = 808B5DD0 -/* 00C6C 808B589C 45020022 */ bc1fl .L808B5928 -/* 00C70 808B58A0 8FBF001C */ lw $ra, 0x001C($sp) -/* 00C74 808B58A4 8C820000 */ lw $v0, 0x0000($a0) ## 808B5DD0 -/* 00C78 808B58A8 844A001C */ lh $t2, 0x001C($v0) ## 0000001C -/* 00C7C 808B58AC 5540001E */ bnel $t2, $zero, .L808B5928 -/* 00C80 808B58B0 8FBF001C */ lw $ra, 0x001C($sp) -/* 00C84 808B58B4 844801F8 */ lh $t0, 0x01F8($v0) ## 000001F8 -/* 00C88 808B58B8 24051054 */ addiu $a1, $zero, 0x1054 ## $a1 = 00001054 -/* 00C8C 808B58BC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00C90 808B58C0 19000018 */ blez $t0, .L808B5924 -/* 00C94 808B58C4 250B0014 */ addiu $t3, $t0, 0x0014 ## $t3 = 00000014 -/* 00C98 808B58C8 A52B0000 */ sh $t3, 0x0000($t1) ## 808B5DD4 -/* 00C9C 808B58CC 85260000 */ lh $a2, 0x0000($t1) ## 808B5DD4 -/* 00CA0 808B58D0 8FA40024 */ lw $a0, 0x0024($sp) -/* 00CA4 808B58D4 0C02003E */ jal func_800800F8 -/* 00CA8 808B58D8 AFA00010 */ sw $zero, 0x0010($sp) -/* 00CAC 808B58DC 10000012 */ beq $zero, $zero, .L808B5928 -/* 00CB0 808B58E0 8FBF001C */ lw $ra, 0x001C($sp) -/* 00CB4 808B58E4 8C6C067C */ lw $t4, 0x067C($v1) ## 0000067C -.L808B58E8: -/* 00CB8 808B58E8 318D0800 */ andi $t5, $t4, 0x0800 ## $t5 = 00000000 -/* 00CBC 808B58EC 51A0000E */ beql $t5, $zero, .L808B5928 -/* 00CC0 808B58F0 8FBF001C */ lw $ra, 0x001C($sp) -/* 00CC4 808B58F4 8C6203AC */ lw $v0, 0x03AC($v1) ## 000003AC -/* 00CC8 808B58F8 5040000B */ beql $v0, $zero, .L808B5928 -/* 00CCC 808B58FC 8FBF001C */ lw $ra, 0x001C($sp) -/* 00CD0 808B5900 904E0002 */ lbu $t6, 0x0002($v0) ## 00000002 -/* 00CD4 808B5904 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00CD8 808B5908 55C10007 */ bnel $t6, $at, .L808B5928 -/* 00CDC 808B590C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00CE0 808B5910 844F0000 */ lh $t7, 0x0000($v0) ## 00000000 -/* 00CE4 808B5914 2401004C */ addiu $at, $zero, 0x004C ## $at = 0000004C -/* 00CE8 808B5918 55E10003 */ bnel $t7, $at, .L808B5928 -/* 00CEC 808B591C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00CF0 808B5920 AC820000 */ sw $v0, 0x0000($a0) ## 00000000 -.L808B5924: -/* 00CF4 808B5924 8FBF001C */ lw $ra, 0x001C($sp) -.L808B5928: -/* 00CF8 808B5928 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00CFC 808B592C 03E00008 */ jr $ra -/* 00D00 808B5930 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5934.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5934.s deleted file mode 100644 index 5cd885e0a9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5934.s +++ /dev/null @@ -1,8 +0,0 @@ -glabel func_808B5934 -/* 00D04 808B5934 3C0E808B */ lui $t6, %hi(BgSpot16Bombstone_Draw) ## $t6 = 808B0000 -/* 00D08 808B5938 3C0F808B */ lui $t7, %hi(func_808B5950) ## $t7 = 808B0000 -/* 00D0C 808B593C 25CE5C98 */ addiu $t6, $t6, %lo(BgSpot16Bombstone_Draw) ## $t6 = 808B5C98 -/* 00D10 808B5940 25EF5950 */ addiu $t7, $t7, %lo(func_808B5950) ## $t7 = 808B5950 -/* 00D14 808B5944 AC8E0134 */ sw $t6, 0x0134($a0) ## 00000134 -/* 00D18 808B5948 03E00008 */ jr $ra -/* 00D1C 808B594C AC8F014C */ sw $t7, 0x014C($a0) ## 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5950.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5950.s deleted file mode 100644 index cba5607102..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5950.s +++ /dev/null @@ -1,83 +0,0 @@ -glabel func_808B5950 -/* 00D20 808B5950 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00D24 808B5954 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00D28 808B5958 AFB10020 */ sw $s1, 0x0020($sp) -/* 00D2C 808B595C AFB0001C */ sw $s0, 0x001C($sp) -/* 00D30 808B5960 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00D34 808B5964 0C22D5AF */ jal func_808B56BC -/* 00D38 808B5968 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 00D3C 808B596C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00D40 808B5970 0C22D5F8 */ jal func_808B57E0 -/* 00D44 808B5974 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00D48 808B5978 922201D5 */ lbu $v0, 0x01D5($s1) ## 000001D5 -/* 00D4C 808B597C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00D50 808B5980 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 00D54 808B5984 304E0002 */ andi $t6, $v0, 0x0002 ## $t6 = 00000000 -/* 00D58 808B5988 11C00018 */ beq $t6, $zero, .L808B59EC -/* 00D5C 808B598C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D60 808B5990 304FFFFD */ andi $t7, $v0, 0xFFFD ## $t7 = 00000000 -/* 00D64 808B5994 A22F01D5 */ sb $t7, 0x01D5($s1) ## 000001D5 -/* 00D68 808B5998 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00D6C 808B599C 0C22D587 */ jal func_808B561C -/* 00D70 808B59A0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00D74 808B59A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D78 808B59A8 24051054 */ addiu $a1, $zero, 0x1054 ## $a1 = 00001054 -/* 00D7C 808B59AC 24060032 */ addiu $a2, $zero, 0x0032 ## $a2 = 00000032 -/* 00D80 808B59B0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00D84 808B59B4 0C02003E */ jal func_800800F8 -/* 00D88 808B59B8 AFA00010 */ sw $zero, 0x0010($sp) -/* 00D8C 808B59BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D90 808B59C0 0C00B2DD */ jal Flags_SetSwitch - -/* 00D94 808B59C4 86250156 */ lh $a1, 0x0156($s1) ## 00000156 -/* 00D98 808B59C8 3C028016 */ lui $v0, %hi(gSaveContext) -/* 00D9C 808B59CC 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00DA0 808B59D0 94580ED8 */ lhu $t8, 0x0ED8($v0) ## 8015F538 -/* 00DA4 808B59D4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00DA8 808B59D8 37190008 */ ori $t9, $t8, 0x0008 ## $t9 = 00000008 -/* 00DAC 808B59DC 0C22D69E */ jal func_808B5A78 -/* 00DB0 808B59E0 A4590ED8 */ sh $t9, 0x0ED8($v0) ## 8015F538 -/* 00DB4 808B59E4 1000000E */ beq $zero, $zero, .L808B5A20 -/* 00DB8 808B59E8 00000000 */ nop -.L808B59EC: -/* 00DBC 808B59EC 02012821 */ addu $a1, $s0, $at -/* 00DC0 808B59F0 AFA50030 */ sw $a1, 0x0030($sp) -/* 00DC4 808B59F4 0C01767D */ jal CollisionCheck_SetAC - ## CollisionCheck_setAC -/* 00DC8 808B59F8 262601C4 */ addiu $a2, $s1, 0x01C4 ## $a2 = 000001C4 -/* 00DCC 808B59FC 26260164 */ addiu $a2, $s1, 0x0164 ## $a2 = 00000164 -/* 00DD0 808B5A00 AFA6002C */ sw $a2, 0x002C($sp) -/* 00DD4 808B5A04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00DD8 808B5A08 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOT -/* 00DDC 808B5A0C 8FA50030 */ lw $a1, 0x0030($sp) -/* 00DE0 808B5A10 8FA6002C */ lw $a2, 0x002C($sp) -/* 00DE4 808B5A14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00DE8 808B5A18 0C01767D */ jal CollisionCheck_SetAC - ## CollisionCheck_setAC -/* 00DEC 808B5A1C 8FA50030 */ lw $a1, 0x0030($sp) -.L808B5A20: -/* 00DF0 808B5A20 3C038016 */ lui $v1, %hi(gGameInfo) -/* 00DF4 808B5A24 8C63FA90 */ lw $v1, %lo(gGameInfo)($v1) -/* 00DF8 808B5A28 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00DFC 808B5A2C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00E00 808B5A30 846211D4 */ lh $v0, 0x11D4($v1) ## 801611D4 -/* 00E04 808B5A34 14410008 */ bne $v0, $at, .L808B5A58 -/* 00E08 808B5A38 00000000 */ nop -/* 00E0C 808B5A3C 0C22D587 */ jal func_808B561C -/* 00E10 808B5A40 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00E14 808B5A44 3C098016 */ lui $t1, %hi(gGameInfo) -/* 00E18 808B5A48 8D29FA90 */ lw $t1, %lo(gGameInfo)($t1) -/* 00E1C 808B5A4C 2408FFF6 */ addiu $t0, $zero, 0xFFF6 ## $t0 = FFFFFFF6 -/* 00E20 808B5A50 10000004 */ beq $zero, $zero, .L808B5A64 -/* 00E24 808B5A54 A52811D4 */ sh $t0, 0x11D4($t1) ## 801611D4 -.L808B5A58: -/* 00E28 808B5A58 04410002 */ bgez $v0, .L808B5A64 -/* 00E2C 808B5A5C 244A0001 */ addiu $t2, $v0, 0x0001 ## $t2 = 00000001 -/* 00E30 808B5A60 A46A11D4 */ sh $t2, 0x11D4($v1) ## 000011D4 -.L808B5A64: -/* 00E34 808B5A64 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00E38 808B5A68 8FB0001C */ lw $s0, 0x001C($sp) -/* 00E3C 808B5A6C 8FB10020 */ lw $s1, 0x0020($sp) -/* 00E40 808B5A70 03E00008 */ jr $ra -/* 00E44 808B5A74 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5A78.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5A78.s deleted file mode 100644 index 6da2713ca8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5A78.s +++ /dev/null @@ -1,8 +0,0 @@ -glabel func_808B5A78 -/* 00E48 808B5A78 3C0E808B */ lui $t6, %hi(func_808B5A94) ## $t6 = 808B0000 -/* 00E4C 808B5A7C 25CE5A94 */ addiu $t6, $t6, %lo(func_808B5A94) ## $t6 = 808B5A94 -/* 00E50 808B5A80 A4800154 */ sh $zero, 0x0154($a0) ## 00000154 -/* 00E54 808B5A84 A4800158 */ sh $zero, 0x0158($a0) ## 00000158 -/* 00E58 808B5A88 AC800134 */ sw $zero, 0x0134($a0) ## 00000134 -/* 00E5C 808B5A8C 03E00008 */ jr $ra -/* 00E60 808B5A90 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5A94.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5A94.s deleted file mode 100644 index e4f14be056..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5A94.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_808B5A94 -/* 00E64 808B5A94 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00E68 808B5A98 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00E6C 808B5A9C 0C22D490 */ jal func_808B5240 -/* 00E70 808B5AA0 AFA40018 */ sw $a0, 0x0018($sp) -/* 00E74 808B5AA4 8FA60018 */ lw $a2, 0x0018($sp) -/* 00E78 808B5AA8 24010038 */ addiu $at, $zero, 0x0038 ## $at = 00000038 -/* 00E7C 808B5AAC 24044802 */ addiu $a0, $zero, 0x4802 ## $a0 = 00004802 -/* 00E80 808B5AB0 84C20154 */ lh $v0, 0x0154($a2) ## 00000154 -/* 00E84 808B5AB4 54410006 */ bnel $v0, $at, .L808B5AD0 -/* 00E88 808B5AB8 2841003D */ slti $at, $v0, 0x003D -/* 00E8C 808B5ABC 0C01E221 */ jal func_80078884 -/* 00E90 808B5AC0 AFA60018 */ sw $a2, 0x0018($sp) -/* 00E94 808B5AC4 8FA60018 */ lw $a2, 0x0018($sp) -/* 00E98 808B5AC8 84C20154 */ lh $v0, 0x0154($a2) ## 00000154 -/* 00E9C 808B5ACC 2841003D */ slti $at, $v0, 0x003D -.L808B5AD0: -/* 00EA0 808B5AD0 54200004 */ bnel $at, $zero, .L808B5AE4 -/* 00EA4 808B5AD4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00EA8 808B5AD8 0C00B55C */ jal Actor_Kill - -/* 00EAC 808B5ADC 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 00EB0 808B5AE0 8FBF0014 */ lw $ra, 0x0014($sp) -.L808B5AE4: -/* 00EB4 808B5AE4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00EB8 808B5AE8 03E00008 */ jr $ra -/* 00EBC 808B5AEC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5AF0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5AF0.s deleted file mode 100644 index dba99f4b53..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5AF0.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_808B5AF0 -/* 00EC0 808B5AF0 3C0E808B */ lui $t6, %hi(func_808B5B04) ## $t6 = 808B0000 -/* 00EC4 808B5AF4 25CE5B04 */ addiu $t6, $t6, %lo(func_808B5B04) ## $t6 = 808B5B04 -/* 00EC8 808B5AF8 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 00ECC 808B5AFC 03E00008 */ jr $ra -/* 00ED0 808B5B00 AC800134 */ sw $zero, 0x0134($a0) ## 00000134 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5B04.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5B04.s deleted file mode 100644 index 4c98cf47e8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5B04.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_808B5B04 -/* 00ED4 808B5B04 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00ED8 808B5B08 AFA40018 */ sw $a0, 0x0018($sp) -/* 00EDC 808B5B0C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00EE0 808B5B10 8FAE0018 */ lw $t6, 0x0018($sp) -/* 00EE4 808B5B14 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 00EE8 808B5B18 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00EEC 808B5B1C 00A12021 */ addu $a0, $a1, $at -/* 00EF0 808B5B20 0C026062 */ jal Object_IsLoaded - -/* 00EF4 808B5B24 81C50214 */ lb $a1, 0x0214($t6) ## 00000214 -/* 00EF8 808B5B28 50400008 */ beql $v0, $zero, .L808B5B4C -/* 00EFC 808B5B2C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00F00 808B5B30 0C22D6D6 */ jal func_808B5B58 -/* 00F04 808B5B34 8FA40018 */ lw $a0, 0x0018($sp) -/* 00F08 808B5B38 8FB80018 */ lw $t8, 0x0018($sp) -/* 00F0C 808B5B3C 3C0F808B */ lui $t7, %hi(BgSpot16Bombstone_Draw) ## $t7 = 808B0000 -/* 00F10 808B5B40 25EF5C98 */ addiu $t7, $t7, %lo(BgSpot16Bombstone_Draw) ## $t7 = 808B5C98 -/* 00F14 808B5B44 AF0F0134 */ sw $t7, 0x0134($t8) ## 00000134 -/* 00F18 808B5B48 8FBF0014 */ lw $ra, 0x0014($sp) -.L808B5B4C: -/* 00F1C 808B5B4C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00F20 808B5B50 03E00008 */ jr $ra -/* 00F24 808B5B54 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5B58.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5B58.s deleted file mode 100644 index f959513c40..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5B58.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_808B5B58 -/* 00F28 808B5B58 3C0E808B */ lui $t6, %hi(func_808B5B6C) ## $t6 = 808B0000 -/* 00F2C 808B5B5C 25CE5B6C */ addiu $t6, $t6, %lo(func_808B5B6C) ## $t6 = 808B5B6C -/* 00F30 808B5B60 A4800154 */ sh $zero, 0x0154($a0) ## 00000154 -/* 00F34 808B5B64 03E00008 */ jr $ra -/* 00F38 808B5B68 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5B6C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5B6C.s deleted file mode 100644 index 9892d5a1fd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5B6C.s +++ /dev/null @@ -1,72 +0,0 @@ -glabel func_808B5B6C -/* 00F3C 808B5B6C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00F40 808B5B70 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00F44 808B5B74 AFB00020 */ sw $s0, 0x0020($sp) -/* 00F48 808B5B78 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00F4C 808B5B7C 0C00B638 */ jal Actor_MoveForward - -/* 00F50 808B5B80 AFA5002C */ sw $a1, 0x002C($sp) -/* 00F54 808B5B84 860E00B4 */ lh $t6, 0x00B4($s0) ## 000000B4 -/* 00F58 808B5B88 860F0210 */ lh $t7, 0x0210($s0) ## 00000210 -/* 00F5C 808B5B8C 861900B8 */ lh $t9, 0x00B8($s0) ## 000000B8 -/* 00F60 808B5B90 86080212 */ lh $t0, 0x0212($s0) ## 00000212 -/* 00F64 808B5B94 860A0154 */ lh $t2, 0x0154($s0) ## 00000154 -/* 00F68 808B5B98 01CFC021 */ addu $t8, $t6, $t7 -/* 00F6C 808B5B9C 03284821 */ addu $t1, $t9, $t0 -/* 00F70 808B5BA0 2941003D */ slti $at, $t2, 0x003D -/* 00F74 808B5BA4 A61800B4 */ sh $t8, 0x00B4($s0) ## 000000B4 -/* 00F78 808B5BA8 14200005 */ bne $at, $zero, .L808B5BC0 -/* 00F7C 808B5BAC A60900B8 */ sh $t1, 0x00B8($s0) ## 000000B8 -/* 00F80 808B5BB0 0C00B55C */ jal Actor_Kill - -/* 00F84 808B5BB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F88 808B5BB8 10000026 */ beq $zero, $zero, .L808B5C54 -/* 00F8C 808B5BBC 8FBF0024 */ lw $ra, 0x0024($sp) -.L808B5BC0: -/* 00F90 808B5BC0 96020088 */ lhu $v0, 0x0088($s0) ## 00000088 -/* 00F94 808B5BC4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F98 808B5BC8 304B0008 */ andi $t3, $v0, 0x0008 ## $t3 = 00000000 -/* 00F9C 808B5BCC 1560000A */ bne $t3, $zero, .L808B5BF8 -/* 00FA0 808B5BD0 304C0001 */ andi $t4, $v0, 0x0001 ## $t4 = 00000000 -/* 00FA4 808B5BD4 11800016 */ beq $t4, $zero, .L808B5C30 -/* 00FA8 808B5BD8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00FAC 808B5BDC C6040060 */ lwc1 $f4, 0x0060($s0) ## 00000060 -/* 00FB0 808B5BE0 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 00FB4 808B5BE4 00000000 */ nop -/* 00FB8 808B5BE8 4606203C */ c.lt.s $f4, $f6 -/* 00FBC 808B5BEC 00000000 */ nop -/* 00FC0 808B5BF0 45020010 */ bc1fl .L808B5C34 -/* 00FC4 808B5BF4 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -.L808B5BF8: -/* 00FC8 808B5BF8 0C22D4EA */ jal func_808B53A8 -/* 00FCC 808B5BFC 8FA5002C */ lw $a1, 0x002C($sp) -/* 00FD0 808B5C00 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00FD4 808B5C04 0C22D46A */ jal func_808B51A8 -/* 00FD8 808B5C08 8FA5002C */ lw $a1, 0x002C($sp) -/* 00FDC 808B5C0C 8FA4002C */ lw $a0, 0x002C($sp) -/* 00FE0 808B5C10 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 00FE4 808B5C14 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 00FE8 808B5C18 0C01AEB6 */ jal Audio_PlaySoundAtPosition - -/* 00FEC 808B5C1C 24072852 */ addiu $a3, $zero, 0x2852 ## $a3 = 00002852 -/* 00FF0 808B5C20 0C00B55C */ jal Actor_Kill - -/* 00FF4 808B5C24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00FF8 808B5C28 1000000A */ beq $zero, $zero, .L808B5C54 -/* 00FFC 808B5C2C 8FBF0024 */ lw $ra, 0x0024($sp) -.L808B5C30: -/* 01000 808B5C30 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -.L808B5C34: -/* 01004 808B5C34 240D0005 */ addiu $t5, $zero, 0x0005 ## $t5 = 00000005 -/* 01008 808B5C38 AFAD0014 */ sw $t5, 0x0014($sp) -/* 0100C 808B5C3C 8FA4002C */ lw $a0, 0x002C($sp) -/* 01010 808B5C40 3C06418C */ lui $a2, 0x418C ## $a2 = 418C0000 -/* 01014 808B5C44 3C07420C */ lui $a3, 0x420C ## $a3 = 420C0000 -/* 01018 808B5C48 0C00B92D */ jal func_8002E4B4 -/* 0101C 808B5C4C E7A80010 */ swc1 $f8, 0x0010($sp) -/* 01020 808B5C50 8FBF0024 */ lw $ra, 0x0024($sp) -.L808B5C54: -/* 01024 808B5C54 8FB00020 */ lw $s0, 0x0020($sp) -/* 01028 808B5C58 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0102C 808B5C5C 03E00008 */ jr $ra -/* 01030 808B5C60 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Shd/DemoShd_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Demo_Shd/DemoShd_Destroy.s deleted file mode 100644 index 987989fa09..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Shd/DemoShd_Destroy.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel DemoShd_Destroy -/* 0005C 8099128C AFA40000 */ sw $a0, 0x0000($sp) -/* 00060 80991290 03E00008 */ jr $ra -/* 00064 80991294 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Shd/DemoShd_Draw.s b/asm/non_matchings/overlays/actors/ovl_Demo_Shd/DemoShd_Draw.s deleted file mode 100644 index df5031512b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Shd/DemoShd_Draw.s +++ /dev/null @@ -1,163 +0,0 @@ -.rdata -glabel D_80993600 - .asciz "../z_demo_shd.c" - .balign 4 - -glabel D_80993610 - .asciz "../z_demo_shd.c" - .balign 4 - -glabel D_80993620 - .asciz "../z_demo_shd.c" - .balign 4 - -.text -glabel DemoShd_Draw -/* 001E8 80991418 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 -/* 001EC 8099141C AFBF003C */ sw $ra, 0x003C($sp) -/* 001F0 80991420 AFB00038 */ sw $s0, 0x0038($sp) -/* 001F4 80991424 AFA40080 */ sw $a0, 0x0080($sp) -/* 001F8 80991428 AFA50084 */ sw $a1, 0x0084($sp) -/* 001FC 8099142C 948F014E */ lhu $t7, 0x014E($a0) ## 0000014E -/* 00200 80991430 3C068099 */ lui $a2, %hi(D_80993600) ## $a2 = 80990000 -/* 00204 80991434 24C63600 */ addiu $a2, $a2, %lo(D_80993600) ## $a2 = 80993600 -/* 00208 80991438 AFAF0074 */ sw $t7, 0x0074($sp) -/* 0020C 8099143C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 00210 80991440 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFE0 -/* 00214 80991444 240702D6 */ addiu $a3, $zero, 0x02D6 ## $a3 = 000002D6 -/* 00218 80991448 0C031AB1 */ jal Graph_OpenDisps -/* 0021C 8099144C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00220 80991450 8FB90084 */ lw $t9, 0x0084($sp) -/* 00224 80991454 0C024F61 */ jal func_80093D84 -/* 00228 80991458 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 -/* 0022C 8099145C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00230 80991460 3C0BDA38 */ lui $t3, 0xDA38 ## $t3 = DA380000 -/* 00234 80991464 356B0003 */ ori $t3, $t3, 0x0003 ## $t3 = DA380003 -/* 00238 80991468 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 0023C 8099146C AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 -/* 00240 80991470 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 00244 80991474 8FAC0084 */ lw $t4, 0x0084($sp) -/* 00248 80991478 3C058099 */ lui $a1, %hi(D_80993610) ## $a1 = 80990000 -/* 0024C 8099147C 24A53610 */ addiu $a1, $a1, %lo(D_80993610) ## $a1 = 80993610 -/* 00250 80991480 8D840000 */ lw $a0, 0x0000($t4) ## 00000000 -/* 00254 80991484 240602D9 */ addiu $a2, $zero, 0x02D9 ## $a2 = 000002D9 -/* 00258 80991488 0C0346A2 */ jal Matrix_NewMtx -/* 0025C 8099148C AFA2005C */ sw $v0, 0x005C($sp) -/* 00260 80991490 8FA3005C */ lw $v1, 0x005C($sp) -/* 00264 80991494 3C0E8099 */ lui $t6, %hi(D_809932D0) ## $t6 = 80990000 -/* 00268 80991498 25CE32D0 */ addiu $t6, $t6, %lo(D_809932D0) ## $t6 = 809932D0 -/* 0026C 8099149C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00270 809914A0 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00274 809914A4 3C09DE00 */ lui $t1, 0xDE00 ## $t1 = DE000000 -/* 00278 809914A8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0027C 809914AC 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 00280 809914B0 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 00284 809914B4 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 00288 809914B8 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 0028C 809914BC 8FA30080 */ lw $v1, 0x0080($sp) -/* 00290 809914C0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00294 809914C4 240B03FF */ addiu $t3, $zero, 0x03FF ## $t3 = 000003FF -/* 00298 809914C8 9462014C */ lhu $v0, 0x014C($v1) ## 0000014C -/* 0029C 809914CC 240C0010 */ addiu $t4, $zero, 0x0010 ## $t4 = 00000010 -/* 002A0 809914D0 304F0001 */ andi $t7, $v0, 0x0001 ## $t7 = 00000000 -/* 002A4 809914D4 11E00028 */ beq $t7, $zero, .L80991578 -/* 002A8 809914D8 30580002 */ andi $t8, $v0, 0x0002 ## $t8 = 00000000 -/* 002AC 809914DC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 002B0 809914E0 240D0100 */ addiu $t5, $zero, 0x0100 ## $t5 = 00000100 -/* 002B4 809914E4 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 002B8 809914E8 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 002BC 809914EC AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 002C0 809914F0 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 002C4 809914F4 8FB90084 */ lw $t9, 0x0084($sp) -/* 002C8 809914F8 8FA30074 */ lw $v1, 0x0074($sp) -/* 002CC 809914FC 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 002D0 80991500 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 -/* 002D4 80991504 00600821 */ addu $at, $v1, $zero -/* 002D8 80991508 00031880 */ sll $v1, $v1, 2 -/* 002DC 8099150C 00611821 */ addu $v1, $v1, $at -/* 002E0 80991510 306A03FF */ andi $t2, $v1, 0x03FF ## $t2 = 00000000 -/* 002E4 80991514 016A3823 */ subu $a3, $t3, $t2 -/* 002E8 80991518 306F00FF */ andi $t7, $v1, 0x00FF ## $t7 = 00000000 -/* 002EC 8099151C 030FC823 */ subu $t9, $t8, $t7 -/* 002F0 80991520 240A0020 */ addiu $t2, $zero, 0x0020 ## $t2 = 00000020 -/* 002F4 80991524 240B0020 */ addiu $t3, $zero, 0x0020 ## $t3 = 00000020 -/* 002F8 80991528 AFAB0024 */ sw $t3, 0x0024($sp) -/* 002FC 8099152C AFAA0028 */ sw $t2, 0x0028($sp) -/* 00300 80991530 AFB90020 */ sw $t9, 0x0020($sp) -/* 00304 80991534 AFA0001C */ sw $zero, 0x001C($sp) -/* 00308 80991538 AFAE0018 */ sw $t6, 0x0018($sp) -/* 0030C 8099153C AFAD0014 */ sw $t5, 0x0014($sp) -/* 00310 80991540 AFAC0010 */ sw $t4, 0x0010($sp) -/* 00314 80991544 0C0253D0 */ jal Gfx_TwoTexScroll -/* 00318 80991548 AFA20054 */ sw $v0, 0x0054($sp) -/* 0031C 8099154C 8FA80054 */ lw $t0, 0x0054($sp) -/* 00320 80991550 3C0E8099 */ lui $t6, %hi(D_80993390) ## $t6 = 80990000 -/* 00324 80991554 25CE3390 */ addiu $t6, $t6, %lo(D_80993390) ## $t6 = 80993390 -/* 00328 80991558 AD020004 */ sw $v0, 0x0004($t0) ## 00000004 -/* 0032C 8099155C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00330 80991560 3C0DDE00 */ lui $t5, 0xDE00 ## $t5 = DE000000 -/* 00334 80991564 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 00338 80991568 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 -/* 0033C 8099156C AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 00340 80991570 1000002C */ beq $zero, $zero, .L80991624 -/* 00344 80991574 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -.L80991578: -/* 00348 80991578 1300002A */ beq $t8, $zero, .L80991624 -/* 0034C 8099157C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00350 80991580 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00354 80991584 240A03FF */ addiu $t2, $zero, 0x03FF ## $t2 = 000003FF -/* 00358 80991588 240C0010 */ addiu $t4, $zero, 0x0010 ## $t4 = 00000010 -/* 0035C 8099158C 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 00360 80991590 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 -/* 00364 80991594 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 00368 80991598 8FB90084 */ lw $t9, 0x0084($sp) -/* 0036C 8099159C 8FA30074 */ lw $v1, 0x0074($sp) -/* 00370 809915A0 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF -/* 00374 809915A4 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 -/* 00378 809915A8 00600821 */ addu $at, $v1, $zero -/* 0037C 809915AC 00031880 */ sll $v1, $v1, 2 -/* 00380 809915B0 00611821 */ addu $v1, $v1, $at -/* 00384 809915B4 306B03FF */ andi $t3, $v1, 0x03FF ## $t3 = 00000000 -/* 00388 809915B8 014B3823 */ subu $a3, $t2, $t3 -/* 0038C 809915BC 307800FF */ andi $t8, $v1, 0x00FF ## $t8 = 00000000 -/* 00390 809915C0 01F8C823 */ subu $t9, $t7, $t8 -/* 00394 809915C4 240B0020 */ addiu $t3, $zero, 0x0020 ## $t3 = 00000020 -/* 00398 809915C8 240A0020 */ addiu $t2, $zero, 0x0020 ## $t2 = 00000020 -/* 0039C 809915CC 240D0100 */ addiu $t5, $zero, 0x0100 ## $t5 = 00000100 -/* 003A0 809915D0 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 003A4 809915D4 AFAE0018 */ sw $t6, 0x0018($sp) -/* 003A8 809915D8 AFAD0014 */ sw $t5, 0x0014($sp) -/* 003AC 809915DC AFAA0024 */ sw $t2, 0x0024($sp) -/* 003B0 809915E0 AFAB0028 */ sw $t3, 0x0028($sp) -/* 003B4 809915E4 AFB90020 */ sw $t9, 0x0020($sp) -/* 003B8 809915E8 AFA0001C */ sw $zero, 0x001C($sp) -/* 003BC 809915EC AFAC0010 */ sw $t4, 0x0010($sp) -/* 003C0 809915F0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 003C4 809915F4 0C0253D0 */ jal Gfx_TwoTexScroll -/* 003C8 809915F8 AFA2004C */ sw $v0, 0x004C($sp) -/* 003CC 809915FC 8FA8004C */ lw $t0, 0x004C($sp) -/* 003D0 80991600 3C0E8099 */ lui $t6, %hi(D_809934B8) ## $t6 = 80990000 -/* 003D4 80991604 25CE34B8 */ addiu $t6, $t6, %lo(D_809934B8) ## $t6 = 809934B8 -/* 003D8 80991608 AD020004 */ sw $v0, 0x0004($t0) ## 00000004 -/* 003DC 8099160C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 003E0 80991610 3C0DDE00 */ lui $t5, 0xDE00 ## $t5 = DE000000 -/* 003E4 80991614 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 003E8 80991618 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 -/* 003EC 8099161C AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 003F0 80991620 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -.L80991624: -/* 003F4 80991624 8FAF0084 */ lw $t7, 0x0084($sp) -/* 003F8 80991628 3C068099 */ lui $a2, %hi(D_80993620) ## $a2 = 80990000 -/* 003FC 8099162C 24C63620 */ addiu $a2, $a2, %lo(D_80993620) ## $a2 = 80993620 -/* 00400 80991630 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFE0 -/* 00404 80991634 240702FA */ addiu $a3, $zero, 0x02FA ## $a3 = 000002FA -/* 00408 80991638 0C031AD5 */ jal Graph_CloseDisps -/* 0040C 8099163C 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 -/* 00410 80991640 8FBF003C */ lw $ra, 0x003C($sp) -/* 00414 80991644 8FB00038 */ lw $s0, 0x0038($sp) -/* 00418 80991648 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 -/* 0041C 8099164C 03E00008 */ jr $ra -/* 00420 80991650 00000000 */ nop -/* 00424 80991654 00000000 */ nop -/* 00428 80991658 00000000 */ nop -/* 0042C 8099165C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Shd/DemoShd_Init.s b/asm/non_matchings/overlays/actors/ovl_Demo_Shd/DemoShd_Init.s deleted file mode 100644 index 5039f92f89..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Shd/DemoShd_Init.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel DemoShd_Init -/* 00008 80991238 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0000C 8099123C AFA5001C */ sw $a1, 0x001C($sp) -/* 00010 80991240 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00014 80991244 A480014C */ sh $zero, 0x014C($a0) ## 0000014C -/* 00018 80991248 3C058099 */ lui $a1, %hi(func_80991298) ## $a1 = 80990000 -/* 0001C 8099124C 24A51298 */ addiu $a1, $a1, %lo(func_80991298) ## $a1 = 80991298 -/* 00020 80991250 0C26448C */ jal DemoShd_SetupAction -/* 00024 80991254 AFA40018 */ sw $a0, 0x0018($sp) -/* 00028 80991258 3C053ECC */ lui $a1, 0x3ECC ## $a1 = 3ECC0000 -/* 0002C 8099125C 8FA40018 */ lw $a0, 0x0018($sp) -/* 00030 80991260 0C00B58B */ jal Actor_SetScale - -/* 00034 80991264 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3ECCCCCD -/* 00038 80991268 8FA40018 */ lw $a0, 0x0018($sp) -/* 0003C 8099126C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00040 80991270 00000000 */ nop -/* 00044 80991274 E4800028 */ swc1 $f0, 0x0028($a0) ## 00000028 -/* 00048 80991278 E4800024 */ swc1 $f0, 0x0024($a0) ## 00000024 -/* 0004C 8099127C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00050 80991280 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00054 80991284 03E00008 */ jr $ra -/* 00058 80991288 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Shd/DemoShd_SetupAction.s b/asm/non_matchings/overlays/actors/ovl_Demo_Shd/DemoShd_SetupAction.s deleted file mode 100644 index 59a9fa87ee..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Shd/DemoShd_SetupAction.s +++ /dev/null @@ -1,3 +0,0 @@ -glabel DemoShd_SetupAction -/* 00000 80991230 03E00008 */ jr $ra -/* 00004 80991234 AC850150 */ sw $a1, 0x0150($a0) ## 00000150 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Shd/DemoShd_Update.s b/asm/non_matchings/overlays/actors/ovl_Demo_Shd/DemoShd_Update.s deleted file mode 100644 index f7f1522dd7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Shd/DemoShd_Update.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel DemoShd_Update -/* 001C4 809913F4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 001C8 809913F8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 001CC 809913FC 8C990150 */ lw $t9, 0x0150($a0) ## 00000150 -/* 001D0 80991400 0320F809 */ jalr $ra, $t9 -/* 001D4 80991404 00000000 */ nop -/* 001D8 80991408 8FBF0014 */ lw $ra, 0x0014($sp) -/* 001DC 8099140C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 001E0 80991410 03E00008 */ jr $ra -/* 001E4 80991414 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Shd/func_80991298.s b/asm/non_matchings/overlays/actors/ovl_Demo_Shd/func_80991298.s deleted file mode 100644 index 5bc9e0d97d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Shd/func_80991298.s +++ /dev/null @@ -1,100 +0,0 @@ -glabel func_80991298 -/* 00068 80991298 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0006C 8099129C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00070 809912A0 90A21D6C */ lbu $v0, 0x1D6C($a1) ## 00001D6C -/* 00074 809912A4 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00078 809912A8 10400004 */ beq $v0, $zero, .L809912BC -/* 0007C 809912AC 00000000 */ nop -/* 00080 809912B0 8CAE1D8C */ lw $t6, 0x1D8C($a1) ## 00001D8C -/* 00084 809912B4 55C00007 */ bnel $t6, $zero, .L809912D4 -/* 00088 809912B8 94A21D74 */ lhu $v0, 0x1D74($a1) ## 00001D74 -.L809912BC: -/* 0008C 809912BC 50400018 */ beql $v0, $zero, .L80991320 -/* 00090 809912C0 90A21D6C */ lbu $v0, 0x1D6C($a1) ## 00001D6C -/* 00094 809912C4 8CAF1D90 */ lw $t7, 0x1D90($a1) ## 00001D90 -/* 00098 809912C8 51E00015 */ beql $t7, $zero, .L80991320 -/* 0009C 809912CC 90A21D6C */ lbu $v0, 0x1D6C($a1) ## 00001D6C -/* 000A0 809912D0 94A21D74 */ lhu $v0, 0x1D74($a1) ## 00001D74 -.L809912D4: -/* 000A4 809912D4 24010320 */ addiu $at, $zero, 0x0320 ## $at = 00000320 -/* 000A8 809912D8 24040009 */ addiu $a0, $zero, 0x0009 ## $a0 = 00000009 -/* 000AC 809912DC 54410008 */ bnel $v0, $at, .L80991300 -/* 000B0 809912E0 2401042D */ addiu $at, $zero, 0x042D ## $at = 0000042D -/* 000B4 809912E4 AFA5001C */ sw $a1, 0x001C($sp) -/* 000B8 809912E8 0C03CFCF */ jal func_800F3F3C -/* 000BC 809912EC AFA60018 */ sw $a2, 0x0018($sp) -/* 000C0 809912F0 8FA5001C */ lw $a1, 0x001C($sp) -/* 000C4 809912F4 8FA60018 */ lw $a2, 0x0018($sp) -/* 000C8 809912F8 94A21D74 */ lhu $v0, 0x1D74($a1) ## 00001D74 -/* 000CC 809912FC 2401042D */ addiu $at, $zero, 0x042D ## $at = 0000042D -.L80991300: -/* 000D0 80991300 14410006 */ bne $v0, $at, .L8099131C -/* 000D4 80991304 24040008 */ addiu $a0, $zero, 0x0008 ## $a0 = 00000008 -/* 000D8 80991308 AFA5001C */ sw $a1, 0x001C($sp) -/* 000DC 8099130C 0C03CFCF */ jal func_800F3F3C -/* 000E0 80991310 AFA60018 */ sw $a2, 0x0018($sp) -/* 000E4 80991314 8FA5001C */ lw $a1, 0x001C($sp) -/* 000E8 80991318 8FA60018 */ lw $a2, 0x0018($sp) -.L8099131C: -/* 000EC 8099131C 90A21D6C */ lbu $v0, 0x1D6C($a1) ## 00001D6C -.L80991320: -/* 000F0 80991320 10400017 */ beq $v0, $zero, .L80991380 -/* 000F4 80991324 00000000 */ nop -/* 000F8 80991328 8CA41D8C */ lw $a0, 0x1D8C($a1) ## 00001D8C -/* 000FC 8099132C 10800014 */ beq $a0, $zero, .L80991380 -/* 00100 80991330 00000000 */ nop -/* 00104 80991334 94980000 */ lhu $t8, 0x0000($a0) ## 00000000 -/* 00108 80991338 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0010C 8099133C 5701000D */ bnel $t8, $at, .L80991374 -/* 00110 80991340 94CA014C */ lhu $t2, 0x014C($a2) ## 0000014C -/* 00114 80991344 94C3014C */ lhu $v1, 0x014C($a2) ## 0000014C -/* 00118 80991348 30790001 */ andi $t9, $v1, 0x0001 ## $t9 = 00000000 -/* 0011C 8099134C 57200005 */ bnel $t9, $zero, .L80991364 -/* 00120 80991350 34690001 */ ori $t1, $v1, 0x0001 ## $t1 = 00000001 -/* 00124 80991354 8C88000C */ lw $t0, 0x000C($a0) ## 0000000C -/* 00128 80991358 94C3014C */ lhu $v1, 0x014C($a2) ## 0000014C -/* 0012C 8099135C A4C8014E */ sh $t0, 0x014E($a2) ## 0000014E -/* 00130 80991360 34690001 */ ori $t1, $v1, 0x0001 ## $t1 = 00000001 -.L80991364: -/* 00134 80991364 A4C9014C */ sh $t1, 0x014C($a2) ## 0000014C -/* 00138 80991368 10000005 */ beq $zero, $zero, .L80991380 -/* 0013C 8099136C 90A21D6C */ lbu $v0, 0x1D6C($a1) ## 00001D6C -/* 00140 80991370 94CA014C */ lhu $t2, 0x014C($a2) ## 0000014C -.L80991374: -/* 00144 80991374 314BFFFE */ andi $t3, $t2, 0xFFFE ## $t3 = 00000000 -/* 00148 80991378 A4CB014C */ sh $t3, 0x014C($a2) ## 0000014C -/* 0014C 8099137C 90A21D6C */ lbu $v0, 0x1D6C($a1) ## 00001D6C -.L80991380: -/* 00150 80991380 50400016 */ beql $v0, $zero, .L809913DC -/* 00154 80991384 94C8014E */ lhu $t0, 0x014E($a2) ## 0000014E -/* 00158 80991388 8CA21D90 */ lw $v0, 0x1D90($a1) ## 00001D90 -/* 0015C 8099138C 50400013 */ beql $v0, $zero, .L809913DC -/* 00160 80991390 94C8014E */ lhu $t0, 0x014E($a2) ## 0000014E -/* 00164 80991394 944C0000 */ lhu $t4, 0x0000($v0) ## 00000000 -/* 00168 80991398 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0016C 8099139C 5581000C */ bnel $t4, $at, .L809913D0 -/* 00170 809913A0 94D8014C */ lhu $t8, 0x014C($a2) ## 0000014C -/* 00174 809913A4 94C3014C */ lhu $v1, 0x014C($a2) ## 0000014C -/* 00178 809913A8 306D0002 */ andi $t5, $v1, 0x0002 ## $t5 = 00000000 -/* 0017C 809913AC 55A00005 */ bnel $t5, $zero, .L809913C4 -/* 00180 809913B0 346F0002 */ ori $t7, $v1, 0x0002 ## $t7 = 00000002 -/* 00184 809913B4 8C4E000C */ lw $t6, 0x000C($v0) ## 0000000C -/* 00188 809913B8 94C3014C */ lhu $v1, 0x014C($a2) ## 0000014C -/* 0018C 809913BC A4CE014E */ sh $t6, 0x014E($a2) ## 0000014E -/* 00190 809913C0 346F0002 */ ori $t7, $v1, 0x0002 ## $t7 = 00000002 -.L809913C4: -/* 00194 809913C4 10000004 */ beq $zero, $zero, .L809913D8 -/* 00198 809913C8 A4CF014C */ sh $t7, 0x014C($a2) ## 0000014C -/* 0019C 809913CC 94D8014C */ lhu $t8, 0x014C($a2) ## 0000014C -.L809913D0: -/* 001A0 809913D0 3319FFFD */ andi $t9, $t8, 0xFFFD ## $t9 = 00000000 -/* 001A4 809913D4 A4D9014C */ sh $t9, 0x014C($a2) ## 0000014C -.L809913D8: -/* 001A8 809913D8 94C8014E */ lhu $t0, 0x014E($a2) ## 0000014E -.L809913DC: -/* 001AC 809913DC 25090001 */ addiu $t1, $t0, 0x0001 ## $t1 = 00000001 -/* 001B0 809913E0 A4C9014E */ sh $t1, 0x014E($a2) ## 0000014E -/* 001B4 809913E4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 001B8 809913E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 001BC 809913EC 03E00008 */ jr $ra -/* 001C0 809913F0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mag/EnMag_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Mag/EnMag_Destroy.s deleted file mode 100644 index 7bf74b1eae..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Mag/EnMag_Destroy.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel EnMag_Destroy -/* 00294 80AA3D94 AFA40000 */ sw $a0, 0x0000($sp) -/* 00298 80AA3D98 03E00008 */ jr $ra -/* 0029C 80AA3D9C AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mag/EnMag_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Mag/EnMag_Draw.s deleted file mode 100644 index 7d77ed28a8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Mag/EnMag_Draw.s +++ /dev/null @@ -1,62 +0,0 @@ -.rdata -glabel D_80AA5F10 - .asciz "../z_en_mag.c" - .balign 4 - -glabel D_80AA5F20 - .asciz "../z_en_mag.c" - .balign 4 - -.text -glabel EnMag_Draw -/* 022D4 80AA5DD4 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 022D8 80AA5DD8 AFBF001C */ sw $ra, 0x001C($sp) -/* 022DC 80AA5DDC AFB00018 */ sw $s0, 0x0018($sp) -/* 022E0 80AA5DE0 AFA40050 */ sw $a0, 0x0050($sp) -/* 022E4 80AA5DE4 AFA50054 */ sw $a1, 0x0054($sp) -/* 022E8 80AA5DE8 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 022EC 80AA5DEC 3C0680AA */ lui $a2, %hi(D_80AA5F10) ## $a2 = 80AA0000 -/* 022F0 80AA5DF0 24C65F10 */ addiu $a2, $a2, %lo(D_80AA5F10) ## $a2 = 80AA5F10 -/* 022F4 80AA5DF4 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE0 -/* 022F8 80AA5DF8 2407047F */ addiu $a3, $zero, 0x047F ## $a3 = 0000047F -/* 022FC 80AA5DFC 0C031AB1 */ jal Graph_OpenDisps -/* 02300 80AA5E00 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 02304 80AA5E04 8E0402C0 */ lw $a0, 0x02C0($s0) ## 000002C0 -/* 02308 80AA5E08 0C031B08 */ jal Graph_GfxPlusOne -/* 0230C 80AA5E0C AFA40044 */ sw $a0, 0x0044($sp) -/* 02310 80AA5E10 AFA20048 */ sw $v0, 0x0048($sp) -/* 02314 80AA5E14 8E0302B0 */ lw $v1, 0x02B0($s0) ## 000002B0 -/* 02318 80AA5E18 3C18DE00 */ lui $t8, 0xDE00 ## $t8 = DE000000 -/* 0231C 80AA5E1C 27A60048 */ addiu $a2, $sp, 0x0048 ## $a2 = FFFFFFF8 -/* 02320 80AA5E20 246F0008 */ addiu $t7, $v1, 0x0008 ## $t7 = 00000008 -/* 02324 80AA5E24 AE0F02B0 */ sw $t7, 0x02B0($s0) ## 000002B0 -/* 02328 80AA5E28 AC780000 */ sw $t8, 0x0000($v1) ## 00000000 -/* 0232C 80AA5E2C 8FB90048 */ lw $t9, 0x0048($sp) -/* 02330 80AA5E30 AC790004 */ sw $t9, 0x0004($v1) ## 00000004 -/* 02334 80AA5E34 8FA50054 */ lw $a1, 0x0054($sp) -/* 02338 80AA5E38 0C2A941F */ jal func_80AA507C -/* 0233C 80AA5E3C 8FA40050 */ lw $a0, 0x0050($sp) -/* 02340 80AA5E40 8FA80048 */ lw $t0, 0x0048($sp) -/* 02344 80AA5E44 3C0ADF00 */ lui $t2, 0xDF00 ## $t2 = DF000000 -/* 02348 80AA5E48 25090008 */ addiu $t1, $t0, 0x0008 ## $t1 = 00000008 -/* 0234C 80AA5E4C AFA90048 */ sw $t1, 0x0048($sp) -/* 02350 80AA5E50 AD000004 */ sw $zero, 0x0004($t0) ## 00000004 -/* 02354 80AA5E54 AD0A0000 */ sw $t2, 0x0000($t0) ## 00000000 -/* 02358 80AA5E58 8FA50048 */ lw $a1, 0x0048($sp) -/* 0235C 80AA5E5C 0C031B0A */ jal Graph_BranchDlist -/* 02360 80AA5E60 8FA40044 */ lw $a0, 0x0044($sp) -/* 02364 80AA5E64 8FAB0048 */ lw $t3, 0x0048($sp) -/* 02368 80AA5E68 3C0680AA */ lui $a2, %hi(D_80AA5F20) ## $a2 = 80AA0000 -/* 0236C 80AA5E6C 24C65F20 */ addiu $a2, $a2, %lo(D_80AA5F20) ## $a2 = 80AA5F20 -/* 02370 80AA5E70 AE0B02C0 */ sw $t3, 0x02C0($s0) ## 000002C0 -/* 02374 80AA5E74 8FAC0054 */ lw $t4, 0x0054($sp) -/* 02378 80AA5E78 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE0 -/* 0237C 80AA5E7C 24070489 */ addiu $a3, $zero, 0x0489 ## $a3 = 00000489 -/* 02380 80AA5E80 0C031AD5 */ jal Graph_CloseDisps -/* 02384 80AA5E84 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 02388 80AA5E88 8FBF001C */ lw $ra, 0x001C($sp) -/* 0238C 80AA5E8C 8FB00018 */ lw $s0, 0x0018($sp) -/* 02390 80AA5E90 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 02394 80AA5E94 03E00008 */ jr $ra -/* 02398 80AA5E98 00000000 */ nop -/* 0239C 80AA5E9C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mag/EnMag_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Mag/EnMag_Init.s deleted file mode 100644 index efe081172e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Mag/EnMag_Init.s +++ /dev/null @@ -1,167 +0,0 @@ -glabel EnMag_Init -/* 00000 80AA3B00 3C028016 */ lui $v0, %hi(gGameInfo) -/* 00004 80AA3B04 2442FA90 */ addiu $v0, %lo(gGameInfo) -/* 00008 80AA3B08 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0000C 80AA3B0C 8C4F0000 */ lw $t7, 0x0000($v0) ## 8015FA90 -/* 00010 80AA3B10 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00014 80AA3B14 AFA40018 */ sw $a0, 0x0018($sp) -/* 00018 80AA3B18 AFA5001C */ sw $a1, 0x001C($sp) -/* 0001C 80AA3B1C 240E003F */ addiu $t6, $zero, 0x003F ## $t6 = 0000003F -/* 00020 80AA3B20 A5EE0496 */ sh $t6, 0x0496($t7) ## 00000496 -/* 00024 80AA3B24 8C590000 */ lw $t9, 0x0000($v0) ## 8015FA90 -/* 00028 80AA3B28 24180050 */ addiu $t8, $zero, 0x0050 ## $t8 = 00000050 -/* 0002C 80AA3B2C 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF -/* 00030 80AA3B30 A738049A */ sh $t8, 0x049A($t9) ## 0000049A -/* 00034 80AA3B34 8C4D0000 */ lw $t5, 0x0000($v0) ## 8015FA90 -/* 00038 80AA3B38 2408001E */ addiu $t0, $zero, 0x001E ## $t0 = 0000001E -/* 0003C 80AA3B3C 24180077 */ addiu $t8, $zero, 0x0077 ## $t8 = 00000077 -/* 00040 80AA3B40 A5AC049C */ sh $t4, 0x049C($t5) ## 0000049C -/* 00044 80AA3B44 8C4E0000 */ lw $t6, 0x0000($v0) ## 8015FA90 -/* 00048 80AA3B48 240C0007 */ addiu $t4, $zero, 0x0007 ## $t4 = 00000007 -/* 0004C 80AA3B4C 24090006 */ addiu $t1, $zero, 0x0006 ## $t1 = 00000006 -/* 00050 80AA3B50 A5C8049E */ sh $t0, 0x049E($t6) ## 000004DD -/* 00054 80AA3B54 8C4F0000 */ lw $t7, 0x0000($v0) ## 8015FA90 -/* 00058 80AA3B58 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 0005C 80AA3B5C 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 00060 80AA3B60 A5E804A0 */ sh $t0, 0x04A0($t7) ## 000004A0 -/* 00064 80AA3B64 8C590000 */ lw $t9, 0x0000($v0) ## 8015FA90 -/* 00068 80AA3B68 44817000 */ mtc1 $at, $f14 ## $f14 = 100.00 -/* 0006C 80AA3B6C 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 -/* 00070 80AA3B70 A73804A2 */ sh $t8, 0x04A2($t9) ## 000004A2 -/* 00074 80AA3B74 8C4D0000 */ lw $t5, 0x0000($v0) ## 8015FA90 -/* 00078 80AA3B78 24180003 */ addiu $t8, $zero, 0x0003 ## $t8 = 00000003 -/* 0007C 80AA3B7C 24817FFF */ addiu $at, $a0, 0x7FFF ## $at = 00007FFF -/* 00080 80AA3B80 A5AC04A4 */ sh $t4, 0x04A4($t5) ## 000004A4 -/* 00084 80AA3B84 8C4F0000 */ lw $t7, 0x0000($v0) ## 8015FA90 -/* 00088 80AA3B88 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 0008C 80AA3B8C 240A000A */ addiu $t2, $zero, 0x000A ## $t2 = 0000000A -/* 00090 80AA3B90 A5EE04A6 */ sh $t6, 0x04A6($t7) ## 000004A6 -/* 00094 80AA3B94 8C590000 */ lw $t9, 0x0000($v0) ## 8015FA90 -/* 00098 80AA3B98 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 0009C 80AA3B9C 3C078016 */ lui $a3, %hi(gSaveContext) -/* 000A0 80AA3BA0 A73804A8 */ sh $t8, 0x04A8($t9) ## 000004A8 -/* 000A4 80AA3BA4 8C4D0000 */ lw $t5, 0x0000($v0) ## 8015FA90 -/* 000A8 80AA3BA8 24180063 */ addiu $t8, $zero, 0x0063 ## $t8 = 00000063 -/* 000AC 80AA3BAC 24E7E660 */ addiu $a3, %lo(gSaveContext) -/* 000B0 80AA3BB0 A5AC0F1C */ sh $t4, 0x0F1C($t5) ## 00000F1C -/* 000B4 80AA3BB4 8C4E0000 */ lw $t6, 0x0000($v0) ## 8015FA90 -/* 000B8 80AA3BB8 240C0009 */ addiu $t4, $zero, 0x0009 ## $t4 = 00000009 -/* 000BC 80AA3BBC 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 000C0 80AA3BC0 A5C90F1E */ sh $t1, 0x0F1E($t6) ## 00000F23 -/* 000C4 80AA3BC4 8C4F0000 */ lw $t7, 0x0000($v0) ## 8015FA90 -/* 000C8 80AA3BC8 A5EB0F20 */ sh $t3, 0x0F20($t7) ## 00000F20 -/* 000CC 80AA3BCC A4296313 */ sh $t1, 0x6313($at) ## 0000E312 -/* 000D0 80AA3BD0 A42A6315 */ sh $t2, 0x6315($at) ## 0000E314 -/* 000D4 80AA3BD4 8C590000 */ lw $t9, 0x0000($v0) ## 8015FA90 -/* 000D8 80AA3BD8 240F0008 */ addiu $t7, $zero, 0x0008 ## $t7 = 00000008 -/* 000DC 80AA3BDC A7380F3A */ sh $t8, 0x0F3A($t9) ## 00000F3A -/* 000E0 80AA3BE0 8C4D0000 */ lw $t5, 0x0000($v0) ## 8015FA90 -/* 000E4 80AA3BE4 24190028 */ addiu $t9, $zero, 0x0028 ## $t9 = 00000028 -/* 000E8 80AA3BE8 A5AC0F3E */ sh $t4, 0x0F3E($t5) ## 00000F3E -/* 000EC 80AA3BEC 8C4E0000 */ lw $t6, 0x0000($v0) ## 8015FA90 -/* 000F0 80AA3BF0 240C0014 */ addiu $t4, $zero, 0x0014 ## $t4 = 00000014 -/* 000F4 80AA3BF4 A5CA0F42 */ sh $t2, 0x0F42($t6) ## 00000F47 -/* 000F8 80AA3BF8 8C580000 */ lw $t8, 0x0000($v0) ## 8015FA90 -/* 000FC 80AA3BFC A70F0F44 */ sh $t7, 0x0F44($t8) ## 00000FA7 -/* 00100 80AA3C00 A420630F */ sh $zero, 0x630F($at) ## 0000E30E -/* 00104 80AA3C04 A420630D */ sh $zero, 0x630D($at) ## 0000E30C -/* 00108 80AA3C08 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 0010C 80AA3C0C 00811821 */ addu $v1, $a0, $at -/* 00110 80AA3C10 3C01432A */ lui $at, 0x432A ## $at = 432A0000 -/* 00114 80AA3C14 44812000 */ mtc1 $at, $f4 ## $f4 = 170.00 -/* 00118 80AA3C18 24817FFF */ addiu $at, $a0, 0x7FFF ## $at = 00007FFF -/* 0011C 80AA3C1C E46E62E8 */ swc1 $f14, 0x62E8($v1) ## 000062E8 -/* 00120 80AA3C20 E46E62F4 */ swc1 $f14, 0x62F4($v1) ## 000062F4 -/* 00124 80AA3C24 E46C62E4 */ swc1 $f12, 0x62E4($v1) ## 000062E4 -/* 00128 80AA3C28 E46C62F0 */ swc1 $f12, 0x62F0($v1) ## 000062F0 -/* 0012C 80AA3C2C E46C62F8 */ swc1 $f12, 0x62F8($v1) ## 000062F8 -/* 00130 80AA3C30 E46462EC */ swc1 $f4, 0x62EC($v1) ## 000062EC -/* 00134 80AA3C34 A43962DB */ sh $t9, 0x62DB($at) ## 0000E2DA -/* 00138 80AA3C38 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0013C 80AA3C3C 00240821 */ addu $at, $at, $a0 -/* 00140 80AA3C40 E42CE308 */ swc1 $f12, -0x1CF8($at) ## 0000E308 -/* 00144 80AA3C44 C4606308 */ lwc1 $f0, 0x6308($v1) ## 00006308 -/* 00148 80AA3C48 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0014C 80AA3C4C 00240821 */ addu $at, $at, $a0 -/* 00150 80AA3C50 4600018D */ trunc.w.s $f6, $f0 -/* 00154 80AA3C54 E420E304 */ swc1 $f0, -0x1CFC($at) ## 0000E304 -/* 00158 80AA3C58 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0015C 80AA3C5C 00240821 */ addu $at, $at, $a0 -/* 00160 80AA3C60 44063000 */ mfc1 $a2, $f6 -/* 00164 80AA3C64 E420E300 */ swc1 $f0, -0x1D00($at) ## 0000E300 -/* 00168 80AA3C68 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0016C 80AA3C6C 00066C00 */ sll $t5, $a2, 16 -/* 00170 80AA3C70 000D7403 */ sra $t6, $t5, 16 -/* 00174 80AA3C74 448E4000 */ mtc1 $t6, $f8 ## $f8 = 0.00 -/* 00178 80AA3C78 00240821 */ addu $at, $at, $a0 -/* 0017C 80AA3C7C E420E2FC */ swc1 $f0, -0x1D04($at) ## 0000E2FC -/* 00180 80AA3C80 468040A0 */ cvt.s.w $f2, $f8 -/* 00184 80AA3C84 24817FFF */ addiu $at, $a0, 0x7FFF ## $at = 00007FFF -/* 00188 80AA3C88 A42662DD */ sh $a2, 0x62DD($at) ## 0000E2DC -/* 0018C 80AA3C8C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00190 80AA3C90 00240821 */ addu $at, $at, $a0 -/* 00194 80AA3C94 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 00198 80AA3C98 4600128D */ trunc.w.s $f10, $f2 -/* 0019C 80AA3C9C E422E2E0 */ swc1 $f2, -0x1D20($at) ## 0000E2E0 -/* 001A0 80AA3CA0 24817FFF */ addiu $at, $a0, 0x7FFF ## $at = 00007FFF -/* 001A4 80AA3CA4 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 001A8 80AA3CA8 44185000 */ mfc1 $t8, $f10 -/* 001AC 80AA3CAC 00000000 */ nop -/* 001B0 80AA3CB0 A43862D9 */ sh $t8, 0x62D9($at) ## 0000E2D8 -/* 001B4 80AA3CB4 90F913E7 */ lbu $t9, 0x13E7($a3) ## 8015FA47 -/* 001B8 80AA3CB8 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 001BC 80AA3CBC 53200029 */ beql $t9, $zero, .L80AA3D64 -/* 001C0 80AA3CC0 24A40150 */ addiu $a0, $a1, 0x0150 ## $a0 = 00000150 -/* 001C4 80AA3CC4 44810000 */ mtc1 $at, $f0 ## $f0 = 255.00 -/* 001C8 80AA3CC8 44811000 */ mtc1 $at, $f2 ## $f2 = 255.00 -/* 001CC 80AA3CCC 3C014352 */ lui $at, 0x4352 ## $at = 43520000 -/* 001D0 80AA3CD0 44818000 */ mtc1 $at, $f16 ## $f16 = 210.00 -/* 001D4 80AA3CD4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 001D8 80AA3CD8 00240821 */ addu $at, $at, $a0 -/* 001DC 80AA3CDC E430E300 */ swc1 $f16, -0x1D00($at) ## 0000E300 -/* 001E0 80AA3CE0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 001E4 80AA3CE4 00240821 */ addu $at, $at, $a0 -/* 001E8 80AA3CE8 E422E304 */ swc1 $f2, -0x1CFC($at) ## 0000E304 -/* 001EC 80AA3CEC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 001F0 80AA3CF0 00240821 */ addu $at, $at, $a0 -/* 001F4 80AA3CF4 E422E308 */ swc1 $f2, -0x1CF8($at) ## 0000E308 -/* 001F8 80AA3CF8 3C014300 */ lui $at, 0x4300 ## $at = 43000000 -/* 001FC 80AA3CFC 44819000 */ mtc1 $at, $f18 ## $f18 = 128.00 -/* 00200 80AA3D00 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00204 80AA3D04 00240821 */ addu $at, $at, $a0 -/* 00208 80AA3D08 E432E2E0 */ swc1 $f18, -0x1D20($at) ## 0000E2E0 -/* 0020C 80AA3D0C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00210 80AA3D10 00240821 */ addu $at, $at, $a0 -/* 00214 80AA3D14 E420E2FC */ swc1 $f0, -0x1D04($at) ## 0000E2FC -/* 00218 80AA3D18 3C01432A */ lui $at, 0x432A ## $at = 432A0000 -/* 0021C 80AA3D1C 44812000 */ mtc1 $at, $f4 ## $f4 = 170.00 -/* 00220 80AA3D20 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 00224 80AA3D24 44813000 */ mtc1 $at, $f6 ## $f6 = 200.00 -/* 00228 80AA3D28 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 0022C 80AA3D2C E46062E8 */ swc1 $f0, 0x62E8($v1) ## 000062E8 -/* 00230 80AA3D30 E46062EC */ swc1 $f0, 0x62EC($v1) ## 000062EC -/* 00234 80AA3D34 E46062F4 */ swc1 $f0, 0x62F4($v1) ## 000062F4 -/* 00238 80AA3D38 E46462E4 */ swc1 $f4, 0x62E4($v1) ## 000062E4 -/* 0023C 80AA3D3C E46662F0 */ swc1 $f6, 0x62F0($v1) ## 000062F0 -/* 00240 80AA3D40 E46862F8 */ swc1 $f8, 0x62F8($v1) ## 000062F8 -/* 00244 80AA3D44 A0E013E7 */ sb $zero, 0x13E7($a3) ## 8015FA47 -/* 00248 80AA3D48 24817FFF */ addiu $at, $a0, 0x7FFF ## $at = 0000814F -/* 0024C 80AA3D4C A42B62DD */ sh $t3, 0x62DD($at) ## 0000E42C -/* 00250 80AA3D50 3C0180AA */ lui $at, %hi(D_80AA5EC0) ## $at = 80AA0000 -/* 00254 80AA3D54 A42C5EC0 */ sh $t4, %lo(D_80AA5EC0)($at) -/* 00258 80AA3D58 A0ED1418 */ sb $t5, 0x1418($a3) ## 8015FA78 -/* 0025C 80AA3D5C A0EE1419 */ sb $t6, 0x1419($a3) ## 8015FA79 -/* 00260 80AA3D60 24A40150 */ addiu $a0, $a1, 0x0150 ## $a0 = 00000150 -.L80AA3D64: -/* 00264 80AA3D64 0C01BBC4 */ jal func_8006EF10 -/* 00268 80AA3D68 AFA50018 */ sw $a1, 0x0018($sp) -/* 0026C 80AA3D6C 8FA50018 */ lw $a1, 0x0018($sp) -/* 00270 80AA3D70 24A17FFF */ addiu $at, $a1, 0x7FFF ## $at = 00007FFF -/* 00274 80AA3D74 A4206317 */ sh $zero, 0x6317($at) ## 0000E316 -/* 00278 80AA3D78 A4206319 */ sh $zero, 0x6319($at) ## 0000E318 -/* 0027C 80AA3D7C AC20631D */ sw $zero, 0x631D($at) ## 0000E31C -/* 00280 80AA3D80 AC206321 */ sw $zero, 0x6321($at) ## 0000E320 -/* 00284 80AA3D84 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00288 80AA3D88 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0028C 80AA3D8C 03E00008 */ jr $ra -/* 00290 80AA3D90 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mag/EnMag_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Mag/EnMag_Update.s deleted file mode 100644 index 12489ff740..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Mag/EnMag_Update.s +++ /dev/null @@ -1,470 +0,0 @@ -.late_rodata -glabel D_80AA5F30 - .float 0.8 -glabel D_80AA5F34 - .float 2.4 - -.text -glabel EnMag_Update -/* 002A0 80AA3DA0 3C0E8016 */ lui $t6, %hi(gSaveContext+0x1354) -/* 002A4 80AA3DA4 8DCEF9B4 */ lw $t6, %lo(gSaveContext+0x1354)($t6) -/* 002A8 80AA3DA8 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 002AC 80AA3DAC AFB00020 */ sw $s0, 0x0020($sp) -/* 002B0 80AA3DB0 3401FEDC */ ori $at, $zero, 0xFEDC ## $at = 0000FEDC -/* 002B4 80AA3DB4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 002B8 80AA3DB8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 002BC 80AA3DBC 11C1008B */ beq $t6, $at, .L80AA3FEC -/* 002C0 80AA3DC0 AFA50044 */ sw $a1, 0x0044($sp) -/* 002C4 80AA3DC4 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 002C8 80AA3DC8 00811021 */ addu $v0, $a0, $at -/* 002CC 80AA3DCC 844362DC */ lh $v1, 0x62DC($v0) ## 000062DC -/* 002D0 80AA3DD0 28610002 */ slti $at, $v1, 0x0002 -/* 002D4 80AA3DD4 50200049 */ beql $at, $zero, .L80AA3EFC -/* 002D8 80AA3DD8 28610002 */ slti $at, $v1, 0x0002 -/* 002DC 80AA3DDC 94A30020 */ lhu $v1, 0x0020($a1) ## 00000020 -/* 002E0 80AA3DE0 2401EFFF */ addiu $at, $zero, 0xEFFF ## $at = FFFFEFFF -/* 002E4 80AA3DE4 3C078013 */ lui $a3, %hi(D_801333E0) -/* 002E8 80AA3DE8 0061C027 */ nor $t8, $v1, $at -/* 002EC 80AA3DEC 13000007 */ beq $t8, $zero, .L80AA3E0C -/* 002F0 80AA3DF0 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 -/* 002F4 80AA3DF4 34217FFF */ ori $at, $at, 0x7FFF ## $at = FFFF7FFF -/* 002F8 80AA3DF8 0061C827 */ nor $t9, $v1, $at -/* 002FC 80AA3DFC 13200003 */ beq $t9, $zero, .L80AA3E0C -/* 00300 80AA3E00 2401BFFF */ addiu $at, $zero, 0xBFFF ## $at = FFFFBFFF -/* 00304 80AA3E04 00614027 */ nor $t0, $v1, $at -/* 00308 80AA3E08 15000039 */ bne $t0, $zero, .L80AA3EF0 -.L80AA3E0C: -/* 0030C 80AA3E0C 3C098013 */ lui $t1, %hi(D_801333E8) -/* 00310 80AA3E10 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 00314 80AA3E14 252933E8 */ addiu $t1, %lo(D_801333E8) -/* 00318 80AA3E18 3C058013 */ lui $a1, %hi(D_801333D4) -/* 0031C 80AA3E1C 24A533D4 */ addiu $a1, %lo(D_801333D4) -/* 00320 80AA3E20 AFA90014 */ sw $t1, 0x0014($sp) -/* 00324 80AA3E24 AFA70010 */ sw $a3, 0x0010($sp) -/* 00328 80AA3E28 24044823 */ addiu $a0, $zero, 0x4823 ## $a0 = 00004823 -/* 0032C 80AA3E2C 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 00330 80AA3E30 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 00334 80AA3E34 AFA2002C */ sw $v0, 0x002C($sp) -/* 00338 80AA3E38 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 0033C 80AA3E3C 44810000 */ mtc1 $at, $f0 ## $f0 = 255.00 -/* 00340 80AA3E40 44811000 */ mtc1 $at, $f2 ## $f2 = 255.00 -/* 00344 80AA3E44 3C014352 */ lui $at, 0x4352 ## $at = 43520000 -/* 00348 80AA3E48 44812000 */ mtc1 $at, $f4 ## $f4 = 210.00 -/* 0034C 80AA3E4C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00350 80AA3E50 8FA2002C */ lw $v0, 0x002C($sp) -/* 00354 80AA3E54 00300821 */ addu $at, $at, $s0 -/* 00358 80AA3E58 E424E300 */ swc1 $f4, -0x1D00($at) ## 0000E300 -/* 0035C 80AA3E5C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00360 80AA3E60 00300821 */ addu $at, $at, $s0 -/* 00364 80AA3E64 E420E304 */ swc1 $f0, -0x1CFC($at) ## 0000E304 -/* 00368 80AA3E68 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0036C 80AA3E6C 00300821 */ addu $at, $at, $s0 -/* 00370 80AA3E70 E420E308 */ swc1 $f0, -0x1CF8($at) ## 0000E308 -/* 00374 80AA3E74 3C014300 */ lui $at, 0x4300 ## $at = 43000000 -/* 00378 80AA3E78 44813000 */ mtc1 $at, $f6 ## $f6 = 128.00 -/* 0037C 80AA3E7C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00380 80AA3E80 00300821 */ addu $at, $at, $s0 -/* 00384 80AA3E84 E426E2E0 */ swc1 $f6, -0x1D20($at) ## 0000E2E0 -/* 00388 80AA3E88 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0038C 80AA3E8C 00300821 */ addu $at, $at, $s0 -/* 00390 80AA3E90 E422E2FC */ swc1 $f2, -0x1D04($at) ## 0000E2FC -/* 00394 80AA3E94 3C01432A */ lui $at, 0x432A ## $at = 432A0000 -/* 00398 80AA3E98 44814000 */ mtc1 $at, $f8 ## $f8 = 170.00 -/* 0039C 80AA3E9C 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 003A0 80AA3EA0 44815000 */ mtc1 $at, $f10 ## $f10 = 200.00 -/* 003A4 80AA3EA4 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 003A8 80AA3EA8 26017FFF */ addiu $at, $s0, 0x7FFF ## $at = 00007FFF -/* 003AC 80AA3EAC 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 -/* 003B0 80AA3EB0 E44262E8 */ swc1 $f2, 0x62E8($v0) ## 000062E8 -/* 003B4 80AA3EB4 E44262EC */ swc1 $f2, 0x62EC($v0) ## 000062EC -/* 003B8 80AA3EB8 E44262F4 */ swc1 $f2, 0x62F4($v0) ## 000062F4 -/* 003BC 80AA3EBC E44862E4 */ swc1 $f8, 0x62E4($v0) ## 000062E4 -/* 003C0 80AA3EC0 E44A62F0 */ swc1 $f10, 0x62F0($v0) ## 000062F0 -/* 003C4 80AA3EC4 E45062F8 */ swc1 $f16, 0x62F8($v0) ## 000062F8 -/* 003C8 80AA3EC8 A42A62DD */ sh $t2, 0x62DD($at) ## 0000E2DC -/* 003CC 80AA3ECC 3C038016 */ lui $v1, %hi(gSaveContext) -/* 003D0 80AA3ED0 3C0180AA */ lui $at, %hi(D_80AA5EC0) ## $at = 80AA0000 -/* 003D4 80AA3ED4 240B0014 */ addiu $t3, $zero, 0x0014 ## $t3 = 00000014 -/* 003D8 80AA3ED8 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 003DC 80AA3EDC A42B5EC0 */ sh $t3, %lo(D_80AA5EC0)($at) -/* 003E0 80AA3EE0 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 003E4 80AA3EE4 240D00FF */ addiu $t5, $zero, 0x00FF ## $t5 = 000000FF -/* 003E8 80AA3EE8 A06C1418 */ sb $t4, 0x1418($v1) ## 8015FA78 -/* 003EC 80AA3EEC A06D1419 */ sb $t5, 0x1419($v1) ## 8015FA79 -.L80AA3EF0: -/* 003F0 80AA3EF0 1000003F */ beq $zero, $zero, .L80AA3FF0 -/* 003F4 80AA3EF4 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 003F8 80AA3EF8 28610002 */ slti $at, $v1, 0x0002 -.L80AA3EFC: -/* 003FC 80AA3EFC 1420003B */ bne $at, $zero, .L80AA3FEC -/* 00400 80AA3F00 3C0280AA */ lui $v0, %hi(D_80AA5EC0) ## $v0 = 80AA0000 -/* 00404 80AA3F04 84425EC0 */ lh $v0, %lo(D_80AA5EC0)($v0) -/* 00408 80AA3F08 8FAE0044 */ lw $t6, 0x0044($sp) -/* 0040C 80AA3F0C 3C0180AA */ lui $at, %hi(D_80AA5EC0) ## $at = 80AA0000 -/* 00410 80AA3F10 14400035 */ bne $v0, $zero, .L80AA3FE8 -/* 00414 80AA3F14 2449FFFF */ addiu $t1, $v0, 0xFFFF ## $t1 = 80A9FFFF -/* 00418 80AA3F18 95C30020 */ lhu $v1, 0x0020($t6) ## 00000020 -/* 0041C 80AA3F1C 2401EFFF */ addiu $at, $zero, 0xEFFF ## $at = FFFFEFFF -/* 00420 80AA3F20 8FA80044 */ lw $t0, 0x0044($sp) -/* 00424 80AA3F24 00617827 */ nor $t7, $v1, $at -/* 00428 80AA3F28 11E00007 */ beq $t7, $zero, .L80AA3F48 -/* 0042C 80AA3F2C 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 -/* 00430 80AA3F30 34217FFF */ ori $at, $at, 0x7FFF ## $at = FFFF7FFF -/* 00434 80AA3F34 0061C027 */ nor $t8, $v1, $at -/* 00438 80AA3F38 13000003 */ beq $t8, $zero, .L80AA3F48 -/* 0043C 80AA3F3C 2401BFFF */ addiu $at, $zero, 0xBFFF ## $at = FFFFBFFF -/* 00440 80AA3F40 0061C827 */ nor $t9, $v1, $at -/* 00444 80AA3F44 17200029 */ bne $t9, $zero, .L80AA3FEC -.L80AA3F48: -/* 00448 80AA3F48 3C090001 */ lui $t1, 0x0001 ## $t1 = 00010000 -/* 0044C 80AA3F4C 01284821 */ addu $t1, $t1, $t0 -/* 00450 80AA3F50 81291E15 */ lb $t1, 0x1E15($t1) ## 00011E15 -/* 00454 80AA3F54 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 -/* 00458 80AA3F58 5121001C */ beql $t1, $at, .L80AA3FCC -/* 0045C 80AA3F5C 26017FFF */ addiu $at, $s0, 0x7FFF ## $at = 00007FFF -/* 00460 80AA3F60 0C03DA2F */ jal func_800F68BC -/* 00464 80AA3F64 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 -/* 00468 80AA3F68 3C078013 */ lui $a3, %hi(D_801333E0) -/* 0046C 80AA3F6C 3C0A8013 */ lui $t2, %hi(D_801333E8) -/* 00470 80AA3F70 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 00474 80AA3F74 254A33E8 */ addiu $t2, %lo(D_801333E8) -/* 00478 80AA3F78 3C058013 */ lui $a1, %hi(D_801333D4) -/* 0047C 80AA3F7C 24A533D4 */ addiu $a1, %lo(D_801333D4) -/* 00480 80AA3F80 AFAA0014 */ sw $t2, 0x0014($sp) -/* 00484 80AA3F84 AFA70010 */ sw $a3, 0x0010($sp) -/* 00488 80AA3F88 24044823 */ addiu $a0, $zero, 0x4823 ## $a0 = 00004823 -/* 0048C 80AA3F8C 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 00490 80AA3F90 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 00494 80AA3F94 8FAD0044 */ lw $t5, 0x0044($sp) -/* 00498 80AA3F98 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 -/* 0049C 80AA3F9C 3C018016 */ lui $at, %hi(gSaveContext+0x135c) -/* 004A0 80AA3FA0 AC2BF9BC */ sw $t3, %lo(gSaveContext+0x135c)($at) -/* 004A4 80AA3FA4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 004A8 80AA3FA8 240C0014 */ addiu $t4, $zero, 0x0014 ## $t4 = 00000014 -/* 004AC 80AA3FAC 002D0821 */ addu $at, $at, $t5 -/* 004B0 80AA3FB0 A02C1E15 */ sb $t4, 0x1E15($at) ## 00011E15 -/* 004B4 80AA3FB4 8FAF0044 */ lw $t7, 0x0044($sp) -/* 004B8 80AA3FB8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 004BC 80AA3FBC 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 004C0 80AA3FC0 002F0821 */ addu $at, $at, $t7 -/* 004C4 80AA3FC4 A02E1E5E */ sb $t6, 0x1E5E($at) ## 00011E5E -/* 004C8 80AA3FC8 26017FFF */ addiu $at, $s0, 0x7FFF ## $at = 00007FFF -.L80AA3FCC: -/* 004CC 80AA3FCC 2418000F */ addiu $t8, $zero, 0x000F ## $t8 = 0000000F -/* 004D0 80AA3FD0 24190019 */ addiu $t9, $zero, 0x0019 ## $t9 = 00000019 -/* 004D4 80AA3FD4 24080003 */ addiu $t0, $zero, 0x0003 ## $t0 = 00000003 -/* 004D8 80AA3FD8 A4386313 */ sh $t8, 0x6313($at) ## 0000E312 -/* 004DC 80AA3FDC A4396315 */ sh $t9, 0x6315($at) ## 0000E314 -/* 004E0 80AA3FE0 10000002 */ beq $zero, $zero, .L80AA3FEC -/* 004E4 80AA3FE4 A42862DD */ sh $t0, 0x62DD($at) ## 0000E2DC -.L80AA3FE8: -/* 004E8 80AA3FE8 A4295EC0 */ sh $t1, %lo(D_80AA5EC0)($at) -.L80AA3FEC: -/* 004EC 80AA3FEC 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -.L80AA3FF0: -/* 004F0 80AA3FF0 44811000 */ mtc1 $at, $f2 ## $f2 = 255.00 -/* 004F4 80AA3FF4 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 004F8 80AA3FF8 02011021 */ addu $v0, $s0, $at -/* 004FC 80AA3FFC 844362DC */ lh $v1, 0x62DC($v0) ## 000062DC -/* 00500 80AA4000 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00504 80AA4004 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00508 80AA4008 14C300BC */ bne $a2, $v1, .L80AA42FC -/* 0050C 80AA400C 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 00510 80AA4010 844362D8 */ lh $v1, 0x62D8($v0) ## 000062D8 -/* 00514 80AA4014 3C0140CC */ lui $at, 0x40CC ## $at = 40CC0000 -/* 00518 80AA4018 1460003A */ bne $v1, $zero, .L80AA4104 -/* 0051C 80AA401C 00000000 */ nop -/* 00520 80AA4020 44810000 */ mtc1 $at, $f0 ## $f0 = 6.38 -/* 00524 80AA4024 C45262FC */ lwc1 $f18, 0x62FC($v0) ## 000062FC -/* 00528 80AA4028 3C014078 */ lui $at, 0x4078 ## $at = 40780000 -/* 0052C 80AA402C 44816000 */ mtc1 $at, $f12 ## $f12 = 3.88 -/* 00530 80AA4030 46009100 */ add.s $f4, $f18, $f0 -/* 00534 80AA4034 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00538 80AA4038 00300821 */ addu $at, $at, $s0 -/* 0053C 80AA403C 240D0028 */ addiu $t5, $zero, 0x0028 ## $t5 = 00000028 -/* 00540 80AA4040 E424E2FC */ swc1 $f4, -0x1D04($at) ## 0000E2FC -/* 00544 80AA4044 3C0180AA */ lui $at, %hi(D_80AA5F30) ## $at = 80AA0000 -/* 00548 80AA4048 C4285F30 */ lwc1 $f8, %lo(D_80AA5F30)($at) -/* 0054C 80AA404C C44662E0 */ lwc1 $f6, 0x62E0($v0) ## 000062E0 -/* 00550 80AA4050 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00554 80AA4054 00300821 */ addu $at, $at, $s0 -/* 00558 80AA4058 46083280 */ add.s $f10, $f6, $f8 -/* 0055C 80AA405C E42AE2E0 */ swc1 $f10, -0x1D20($at) ## 0000E2E0 -/* 00560 80AA4060 C45062E4 */ lwc1 $f16, 0x62E4($v0) ## 000062E4 -/* 00564 80AA4064 C44462E8 */ lwc1 $f4, 0x62E8($v0) ## 000062E8 -/* 00568 80AA4068 3C014008 */ lui $at, 0x4008 ## $at = 40080000 -/* 0056C 80AA406C 46008480 */ add.s $f18, $f16, $f0 -/* 00570 80AA4070 44815000 */ mtc1 $at, $f10 ## $f10 = 2.12 -/* 00574 80AA4074 C44862EC */ lwc1 $f8, 0x62EC($v0) ## 000062EC -/* 00578 80AA4078 460C2180 */ add.s $f6, $f4, $f12 -/* 0057C 80AA407C E45262E4 */ swc1 $f18, 0x62E4($v0) ## 000062E4 -/* 00580 80AA4080 C45262F0 */ lwc1 $f18, 0x62F0($v0) ## 000062F0 -/* 00584 80AA4084 460A4400 */ add.s $f16, $f8, $f10 -/* 00588 80AA4088 E44662E8 */ swc1 $f6, 0x62E8($v0) ## 000062E8 -/* 0058C 80AA408C C44662F4 */ lwc1 $f6, 0x62F4($v0) ## 000062F4 -/* 00590 80AA4090 46009100 */ add.s $f4, $f18, $f0 -/* 00594 80AA4094 844A62DA */ lh $t2, 0x62DA($v0) ## 000062DA -/* 00598 80AA4098 E45062EC */ swc1 $f16, 0x62EC($v0) ## 000062EC -/* 0059C 80AA409C 460C3200 */ add.s $f8, $f6, $f12 -/* 005A0 80AA40A0 E44462F0 */ swc1 $f4, 0x62F0($v0) ## 000062F0 -/* 005A4 80AA40A4 26017FFF */ addiu $at, $s0, 0x7FFF ## $at = 00007FFF -/* 005A8 80AA40A8 254BFFFF */ addiu $t3, $t2, 0xFFFF ## $t3 = FFFFFFFF -/* 005AC 80AA40AC E44862F4 */ swc1 $f8, 0x62F4($v0) ## 000062F4 -/* 005B0 80AA40B0 A42B62DB */ sh $t3, 0x62DB($at) ## 0000E2DA -/* 005B4 80AA40B4 844C62DA */ lh $t4, 0x62DA($v0) ## 000062DA -/* 005B8 80AA40B8 3C014200 */ lui $at, 0x4200 ## $at = 42000000 -/* 005BC 80AA40BC 5580003B */ bnel $t4, $zero, .L80AA41AC -/* 005C0 80AA40C0 3C014320 */ lui $at, 0x4320 ## $at = 43200000 -/* 005C4 80AA40C4 44815000 */ mtc1 $at, $f10 ## $f10 = 160.00 -/* 005C8 80AA40C8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 005CC 80AA40CC 00300821 */ addu $at, $at, $s0 -/* 005D0 80AA40D0 E42AE2E0 */ swc1 $f10, -0x1D20($at) ## 0000E2E0 -/* 005D4 80AA40D4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 005D8 80AA40D8 00300821 */ addu $at, $at, $s0 -/* 005DC 80AA40DC E422E2FC */ swc1 $f2, -0x1D04($at) ## 0000E2FC -/* 005E0 80AA40E0 E44262E4 */ swc1 $f2, 0x62E4($v0) ## 000062E4 -/* 005E4 80AA40E4 E44262E8 */ swc1 $f2, 0x62E8($v0) ## 000062E8 -/* 005E8 80AA40E8 E44262EC */ swc1 $f2, 0x62EC($v0) ## 000062EC -/* 005EC 80AA40EC E44262F0 */ swc1 $f2, 0x62F0($v0) ## 000062F0 -/* 005F0 80AA40F0 E44262F4 */ swc1 $f2, 0x62F4($v0) ## 000062F4 -/* 005F4 80AA40F4 26017FFF */ addiu $at, $s0, 0x7FFF ## $at = 00007FFF -/* 005F8 80AA40F8 A42D62DB */ sh $t5, 0x62DB($at) ## 0000E2DA -/* 005FC 80AA40FC 1000002A */ beq $zero, $zero, .L80AA41A8 -/* 00600 80AA4100 A42662D9 */ sh $a2, 0x62D9($at) ## 0000E2D8 -.L80AA4104: -/* 00604 80AA4104 14C30028 */ bne $a2, $v1, .L80AA41A8 -/* 00608 80AA4108 3C01C008 */ lui $at, 0xC008 ## $at = C0080000 -/* 0060C 80AA410C 44819000 */ mtc1 $at, $f18 ## $f18 = -2.12 -/* 00610 80AA4110 3C01BFB0 */ lui $at, 0xBFB0 ## $at = BFB00000 -/* 00614 80AA4114 C45062E4 */ lwc1 $f16, 0x62E4($v0) ## 000062E4 -/* 00618 80AA4118 44814000 */ mtc1 $at, $f8 ## $f8 = -1.38 -/* 0061C 80AA411C C44662F0 */ lwc1 $f6, 0x62F0($v0) ## 000062F0 -/* 00620 80AA4120 46128100 */ add.s $f4, $f16, $f18 -/* 00624 80AA4124 3C0180AA */ lui $at, %hi(D_80AA5F34) ## $at = 80AA0000 -/* 00628 80AA4128 C45062E0 */ lwc1 $f16, 0x62E0($v0) ## 000062E0 -/* 0062C 80AA412C 46083280 */ add.s $f10, $f6, $f8 -/* 00630 80AA4130 E44462E4 */ swc1 $f4, 0x62E4($v0) ## 000062E4 -/* 00634 80AA4134 24190020 */ addiu $t9, $zero, 0x0020 ## $t9 = 00000020 -/* 00638 80AA4138 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 0063C 80AA413C E44A62F0 */ swc1 $f10, 0x62F0($v0) ## 000062F0 -/* 00640 80AA4140 C4325F34 */ lwc1 $f18, %lo(D_80AA5F34)($at) -/* 00644 80AA4144 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00648 80AA4148 00300821 */ addu $at, $at, $s0 -/* 0064C 80AA414C 46128100 */ add.s $f4, $f16, $f18 -/* 00650 80AA4150 E424E2E0 */ swc1 $f4, -0x1D20($at) ## 0000E2E0 -/* 00654 80AA4154 844E62DA */ lh $t6, 0x62DA($v0) ## 000062DA -/* 00658 80AA4158 26017FFF */ addiu $at, $s0, 0x7FFF ## $at = 00007FFF -/* 0065C 80AA415C 25CFFFFF */ addiu $t7, $t6, 0xFFFF ## $t7 = 00000001 -/* 00660 80AA4160 A42F62DB */ sh $t7, 0x62DB($at) ## 0000E2DA -/* 00664 80AA4164 845862DA */ lh $t8, 0x62DA($v0) ## 000062DA -/* 00668 80AA4168 3C014300 */ lui $at, 0x4300 ## $at = 43000000 -/* 0066C 80AA416C 5700000F */ bnel $t8, $zero, .L80AA41AC -/* 00670 80AA4170 3C014320 */ lui $at, 0x4320 ## $at = 43200000 -/* 00674 80AA4174 44813000 */ mtc1 $at, $f6 ## $f6 = 160.00 -/* 00678 80AA4178 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0067C 80AA417C 00300821 */ addu $at, $at, $s0 -/* 00680 80AA4180 E426E2E0 */ swc1 $f6, -0x1D20($at) ## 0000E2E0 -/* 00684 80AA4184 3C01432A */ lui $at, 0x432A ## $at = 432A0000 -/* 00688 80AA4188 44814000 */ mtc1 $at, $f8 ## $f8 = 170.00 -/* 0068C 80AA418C 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 00690 80AA4190 44815000 */ mtc1 $at, $f10 ## $f10 = 200.00 -/* 00694 80AA4194 26017FFF */ addiu $at, $s0, 0x7FFF ## $at = 00007FFF -/* 00698 80AA4198 E44862E4 */ swc1 $f8, 0x62E4($v0) ## 000062E4 -/* 0069C 80AA419C E44A62F0 */ swc1 $f10, 0x62F0($v0) ## 000062F0 -/* 006A0 80AA41A0 A43962DB */ sh $t9, 0x62DB($at) ## 0000E2DA -/* 006A4 80AA41A4 A42862D9 */ sh $t0, 0x62D9($at) ## 0000E2D8 -.L80AA41A8: -/* 006A8 80AA41A8 3C014320 */ lui $at, 0x4320 ## $at = 43200000 -.L80AA41AC: -/* 006AC 80AA41AC 44818000 */ mtc1 $at, $f16 ## $f16 = 160.00 -/* 006B0 80AA41B0 C45262FC */ lwc1 $f18, 0x62FC($v0) ## 000062FC -/* 006B4 80AA41B4 3C038016 */ lui $v1, %hi(gGameInfo) -/* 006B8 80AA41B8 2463FA90 */ addiu $v1, %lo(gGameInfo) -/* 006BC 80AA41BC 4612803C */ c.lt.s $f16, $f18 -/* 006C0 80AA41C0 00000000 */ nop -/* 006C4 80AA41C4 45020094 */ bc1fl .L80AA4418 -/* 006C8 80AA41C8 844362DC */ lh $v1, 0x62DC($v0) ## 000062DC -/* 006CC 80AA41CC 8C690000 */ lw $t1, 0x0000($v1) ## 8015FA90 -/* 006D0 80AA41D0 C4446300 */ lwc1 $f4, 0x6300($v0) ## 00006300 -/* 006D4 80AA41D4 3C014352 */ lui $at, 0x4352 ## $at = 43520000 -/* 006D8 80AA41D8 852A0F1E */ lh $t2, 0x0F1E($t1) ## 00000F1E -/* 006DC 80AA41DC 44816000 */ mtc1 $at, $f12 ## $f12 = 210.00 -/* 006E0 80AA41E0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 006E4 80AA41E4 448A3000 */ mtc1 $t2, $f6 ## $f6 = 0.00 -/* 006E8 80AA41E8 00300821 */ addu $at, $at, $s0 -/* 006EC 80AA41EC 46803220 */ cvt.s.w $f8, $f6 -/* 006F0 80AA41F0 46082280 */ add.s $f10, $f4, $f8 -/* 006F4 80AA41F4 E42AE300 */ swc1 $f10, -0x1D00($at) ## 0000E300 -/* 006F8 80AA41F8 C4406300 */ lwc1 $f0, 0x6300($v0) ## 00006300 -/* 006FC 80AA41FC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00700 80AA4200 00300821 */ addu $at, $at, $s0 -/* 00704 80AA4204 4600603E */ c.le.s $f12, $f0 -/* 00708 80AA4208 00000000 */ nop -/* 0070C 80AA420C 45020004 */ bc1fl .L80AA4220 -/* 00710 80AA4210 3C014352 */ lui $at, 0x4352 ## $at = 43520000 -/* 00714 80AA4214 E42CE300 */ swc1 $f12, -0x1D00($at) ## 4351E300 -/* 00718 80AA4218 C4406300 */ lwc1 $f0, 0x6300($v0) ## 00006300 -/* 0071C 80AA421C 3C014352 */ lui $at, 0x4352 ## $at = 43520000 -.L80AA4220: -/* 00720 80AA4220 44818000 */ mtc1 $at, $f16 ## $f16 = 210.00 -/* 00724 80AA4224 00000000 */ nop -/* 00728 80AA4228 4600803E */ c.le.s $f16, $f0 -/* 0072C 80AA422C 00000000 */ nop -/* 00730 80AA4230 45020079 */ bc1fl .L80AA4418 -/* 00734 80AA4234 844362DC */ lh $v1, 0x62DC($v0) ## 000062DC -/* 00738 80AA4238 8C6B0000 */ lw $t3, 0x0000($v1) ## 8015FA90 -/* 0073C 80AA423C C4526304 */ lwc1 $f18, 0x6304($v0) ## 00006304 -/* 00740 80AA4240 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00744 80AA4244 856C0F20 */ lh $t4, 0x0F20($t3) ## 00000F1F -/* 00748 80AA4248 00300821 */ addu $at, $at, $s0 -/* 0074C 80AA424C 448C3000 */ mtc1 $t4, $f6 ## $f6 = 0.00 -/* 00750 80AA4250 00000000 */ nop -/* 00754 80AA4254 46803120 */ cvt.s.w $f4, $f6 -/* 00758 80AA4258 46049200 */ add.s $f8, $f18, $f4 -/* 0075C 80AA425C E428E304 */ swc1 $f8, -0x1CFC($at) ## 0000E304 -/* 00760 80AA4260 C4406304 */ lwc1 $f0, 0x6304($v0) ## 00006304 -/* 00764 80AA4264 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00768 80AA4268 00300821 */ addu $at, $at, $s0 -/* 0076C 80AA426C 4600103E */ c.le.s $f2, $f0 -/* 00770 80AA4270 00000000 */ nop -/* 00774 80AA4274 45020004 */ bc1fl .L80AA4288 -/* 00778 80AA4278 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 0077C 80AA427C E422E304 */ swc1 $f2, -0x1CFC($at) ## 4347E304 -/* 00780 80AA4280 C4406304 */ lwc1 $f0, 0x6304($v0) ## 00006304 -/* 00784 80AA4284 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -.L80AA4288: -/* 00788 80AA4288 44815000 */ mtc1 $at, $f10 ## $f10 = 200.00 -/* 0078C 80AA428C 00000000 */ nop -/* 00790 80AA4290 4600503E */ c.le.s $f10, $f0 -/* 00794 80AA4294 00000000 */ nop -/* 00798 80AA4298 4502005F */ bc1fl .L80AA4418 -/* 0079C 80AA429C 844362DC */ lh $v1, 0x62DC($v0) ## 000062DC -/* 007A0 80AA42A0 844D6312 */ lh $t5, 0x6312($v0) ## 00006312 -/* 007A4 80AA42A4 C4506308 */ lwc1 $f16, 0x6308($v0) ## 00006308 -/* 007A8 80AA42A8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 007AC 80AA42AC 448D3000 */ mtc1 $t5, $f6 ## $f6 = 0.00 -/* 007B0 80AA42B0 00300821 */ addu $at, $at, $s0 -/* 007B4 80AA42B4 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 007B8 80AA42B8 468034A0 */ cvt.s.w $f18, $f6 -/* 007BC 80AA42BC 240F0014 */ addiu $t7, $zero, 0x0014 ## $t7 = 00000014 -/* 007C0 80AA42C0 46128100 */ add.s $f4, $f16, $f18 -/* 007C4 80AA42C4 E424E308 */ swc1 $f4, -0x1CF8($at) ## 0000E308 -/* 007C8 80AA42C8 C4486308 */ lwc1 $f8, 0x6308($v0) ## 00006308 -/* 007CC 80AA42CC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 007D0 80AA42D0 00300821 */ addu $at, $at, $s0 -/* 007D4 80AA42D4 4608103E */ c.le.s $f2, $f8 -/* 007D8 80AA42D8 00000000 */ nop -/* 007DC 80AA42DC 4502004E */ bc1fl .L80AA4418 -/* 007E0 80AA42E0 844362DC */ lh $v1, 0x62DC($v0) ## 000062DC -/* 007E4 80AA42E4 E422E308 */ swc1 $f2, -0x1CF8($at) ## 0000E308 -/* 007E8 80AA42E8 26017FFF */ addiu $at, $s0, 0x7FFF ## $at = 00007FFF -/* 007EC 80AA42EC A42E62DD */ sh $t6, 0x62DD($at) ## 0000E2DC -/* 007F0 80AA42F0 3C0180AA */ lui $at, %hi(D_80AA5EC0) ## $at = 80AA0000 -/* 007F4 80AA42F4 10000047 */ beq $zero, $zero, .L80AA4414 -/* 007F8 80AA42F8 A42F5EC0 */ sh $t7, %lo(D_80AA5EC0)($at) -.L80AA42FC: -/* 007FC 80AA42FC 54610046 */ bnel $v1, $at, .L80AA4418 -/* 00800 80AA4300 844362DC */ lh $v1, 0x62DC($v0) ## 000062DC -/* 00804 80AA4304 84586314 */ lh $t8, 0x6314($v0) ## 00006314 -/* 00808 80AA4308 C44A62FC */ lwc1 $f10, 0x62FC($v0) ## 000062FC -/* 0080C 80AA430C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00810 80AA4310 44983000 */ mtc1 $t8, $f6 ## $f6 = 0.00 -/* 00814 80AA4314 00300821 */ addu $at, $at, $s0 -/* 00818 80AA4318 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 0081C 80AA431C 46803420 */ cvt.s.w $f16, $f6 -/* 00820 80AA4320 240A0004 */ addiu $t2, $zero, 0x0004 ## $t2 = 00000004 -/* 00824 80AA4324 46105481 */ sub.s $f18, $f10, $f16 -/* 00828 80AA4328 E432E2FC */ swc1 $f18, -0x1D04($at) ## 0000E2FC -/* 0082C 80AA432C C44462FC */ lwc1 $f4, 0x62FC($v0) ## 000062FC -/* 00830 80AA4330 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00834 80AA4334 00300821 */ addu $at, $at, $s0 -/* 00838 80AA4338 4600203C */ c.lt.s $f4, $f0 -/* 0083C 80AA433C 00000000 */ nop -/* 00840 80AA4340 45020003 */ bc1fl .L80AA4350 -/* 00844 80AA4344 84596314 */ lh $t9, 0x6314($v0) ## 00006314 -/* 00848 80AA4348 E420E2FC */ swc1 $f0, -0x1D04($at) ## 0000E2FC -/* 0084C 80AA434C 84596314 */ lh $t9, 0x6314($v0) ## 00006314 -.L80AA4350: -/* 00850 80AA4350 C4486300 */ lwc1 $f8, 0x6300($v0) ## 00006300 -/* 00854 80AA4354 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00858 80AA4358 44993000 */ mtc1 $t9, $f6 ## $f6 = 0.00 -/* 0085C 80AA435C 00300821 */ addu $at, $at, $s0 -/* 00860 80AA4360 468032A0 */ cvt.s.w $f10, $f6 -/* 00864 80AA4364 460A4401 */ sub.s $f16, $f8, $f10 -/* 00868 80AA4368 E430E300 */ swc1 $f16, -0x1D00($at) ## 0000E300 -/* 0086C 80AA436C C4526300 */ lwc1 $f18, 0x6300($v0) ## 00006300 -/* 00870 80AA4370 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00874 80AA4374 00300821 */ addu $at, $at, $s0 -/* 00878 80AA4378 4600903C */ c.lt.s $f18, $f0 -/* 0087C 80AA437C 00000000 */ nop -/* 00880 80AA4380 45020003 */ bc1fl .L80AA4390 -/* 00884 80AA4384 84486314 */ lh $t0, 0x6314($v0) ## 00006314 -/* 00888 80AA4388 E420E300 */ swc1 $f0, -0x1D00($at) ## 0000E300 -/* 0088C 80AA438C 84486314 */ lh $t0, 0x6314($v0) ## 00006314 -.L80AA4390: -/* 00890 80AA4390 C4446304 */ lwc1 $f4, 0x6304($v0) ## 00006304 -/* 00894 80AA4394 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00898 80AA4398 44883000 */ mtc1 $t0, $f6 ## $f6 = 0.00 -/* 0089C 80AA439C 00300821 */ addu $at, $at, $s0 -/* 008A0 80AA43A0 46803220 */ cvt.s.w $f8, $f6 -/* 008A4 80AA43A4 46082281 */ sub.s $f10, $f4, $f8 -/* 008A8 80AA43A8 E42AE304 */ swc1 $f10, -0x1CFC($at) ## 0000E304 -/* 008AC 80AA43AC C4506304 */ lwc1 $f16, 0x6304($v0) ## 00006304 -/* 008B0 80AA43B0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 008B4 80AA43B4 00300821 */ addu $at, $at, $s0 -/* 008B8 80AA43B8 4600803C */ c.lt.s $f16, $f0 -/* 008BC 80AA43BC 00000000 */ nop -/* 008C0 80AA43C0 45020003 */ bc1fl .L80AA43D0 -/* 008C4 80AA43C4 84496312 */ lh $t1, 0x6312($v0) ## 00006312 -/* 008C8 80AA43C8 E420E304 */ swc1 $f0, -0x1CFC($at) ## 0000E304 -/* 008CC 80AA43CC 84496312 */ lh $t1, 0x6312($v0) ## 00006312 -.L80AA43D0: -/* 008D0 80AA43D0 C4526308 */ lwc1 $f18, 0x6308($v0) ## 00006308 -/* 008D4 80AA43D4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 008D8 80AA43D8 44893000 */ mtc1 $t1, $f6 ## $f6 = 0.00 -/* 008DC 80AA43DC 00300821 */ addu $at, $at, $s0 -/* 008E0 80AA43E0 46803120 */ cvt.s.w $f4, $f6 -/* 008E4 80AA43E4 46049201 */ sub.s $f8, $f18, $f4 -/* 008E8 80AA43E8 E428E308 */ swc1 $f8, -0x1CF8($at) ## 0000E308 -/* 008EC 80AA43EC C44A6308 */ lwc1 $f10, 0x6308($v0) ## 00006308 -/* 008F0 80AA43F0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 008F4 80AA43F4 00300821 */ addu $at, $at, $s0 -/* 008F8 80AA43F8 4600503C */ c.lt.s $f10, $f0 -/* 008FC 80AA43FC 00000000 */ nop -/* 00900 80AA4400 45020005 */ bc1fl .L80AA4418 -/* 00904 80AA4404 844362DC */ lh $v1, 0x62DC($v0) ## 000062DC -/* 00908 80AA4408 E420E308 */ swc1 $f0, -0x1CF8($at) ## 0000E308 -/* 0090C 80AA440C 26017FFF */ addiu $at, $s0, 0x7FFF ## $at = 00007FFF -/* 00910 80AA4410 A42A62DD */ sh $t2, 0x62DD($at) ## 0000E2DC -.L80AA4414: -/* 00914 80AA4414 844362DC */ lh $v1, 0x62DC($v0) ## 000062DC -.L80AA4418: -/* 00918 80AA4418 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0091C 80AA441C 1460000A */ bne $v1, $zero, .L80AA4448 -/* 00920 80AA4420 00000000 */ nop -/* 00924 80AA4424 0C01B129 */ jal Flags_GetEnv -/* 00928 80AA4428 8FA40044 */ lw $a0, 0x0044($sp) -/* 0092C 80AA442C 1040000E */ beq $v0, $zero, .L80AA4468 -/* 00930 80AA4430 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00934 80AA4434 240B0028 */ addiu $t3, $zero, 0x0028 ## $t3 = 00000028 -/* 00938 80AA4438 26017FFF */ addiu $at, $s0, 0x7FFF ## $at = 00007FFF -/* 0093C 80AA443C A42B62DB */ sh $t3, 0x62DB($at) ## 0000E2DA -/* 00940 80AA4440 10000009 */ beq $zero, $zero, .L80AA4468 -/* 00944 80AA4444 A42662DD */ sh $a2, 0x62DD($at) ## 0000E2DC -.L80AA4448: -/* 00948 80AA4448 14610007 */ bne $v1, $at, .L80AA4468 -/* 0094C 80AA444C 8FA40044 */ lw $a0, 0x0044($sp) -/* 00950 80AA4450 0C01B129 */ jal Flags_GetEnv -/* 00954 80AA4454 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 00958 80AA4458 10400003 */ beq $v0, $zero, .L80AA4468 -/* 0095C 80AA445C 240C0003 */ addiu $t4, $zero, 0x0003 ## $t4 = 00000003 -/* 00960 80AA4460 26017FFF */ addiu $at, $s0, 0x7FFF ## $at = 00007FFF -/* 00964 80AA4464 A42C62DD */ sh $t4, 0x62DD($at) ## 0000E2DC -.L80AA4468: -/* 00968 80AA4468 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0096C 80AA446C 8FB00020 */ lw $s0, 0x0020($sp) -/* 00970 80AA4470 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00974 80AA4474 03E00008 */ jr $ra -/* 00978 80AA4478 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mag/func_80AA447C.s b/asm/non_matchings/overlays/actors/ovl_En_Mag/func_80AA447C.s deleted file mode 100644 index 99c10cc7d0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Mag/func_80AA447C.s +++ /dev/null @@ -1,147 +0,0 @@ -glabel func_80AA447C -/* 0097C 80AA447C AFA60008 */ sw $a2, 0x0008($sp) -/* 00980 80AA4480 AFA7000C */ sw $a3, 0x000C($sp) -/* 00984 80AA4484 00073C00 */ sll $a3, $a3, 16 -/* 00988 80AA4488 00063400 */ sll $a2, $a2, 16 -/* 0098C 80AA448C 8C820000 */ lw $v0, 0x0000($a0) ## 00000000 -/* 00990 80AA4490 00063403 */ sra $a2, $a2, 16 -/* 00994 80AA4494 00073C03 */ sra $a3, $a3, 16 -/* 00998 80AA4498 00C70019 */ multu $a2, $a3 -/* 0099C 80AA449C 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -/* 009A0 80AA44A0 3C0EFD90 */ lui $t6, 0xFD90 ## $t6 = FD900000 -/* 009A4 80AA44A4 AC6E0000 */ sw $t6, 0x0000($v1) ## 00000000 -/* 009A8 80AA44A8 AC650004 */ sw $a1, 0x0004($v1) ## 00000004 -/* 009AC 80AA44AC 24420008 */ addiu $v0, $v0, 0x0008 ## $v0 = 00000008 -/* 009B0 80AA44B0 00401825 */ or $v1, $v0, $zero ## $v1 = 00000008 -/* 009B4 80AA44B4 3C0C0700 */ lui $t4, 0x0700 ## $t4 = 07000000 -/* 009B8 80AA44B8 3C0FF590 */ lui $t7, 0xF590 ## $t7 = F5900000 -/* 009BC 80AA44BC AC6F0000 */ sw $t7, 0x0000($v1) ## 00000008 -/* 009C0 80AA44C0 AC6C0004 */ sw $t4, 0x0004($v1) ## 0000000C -/* 009C4 80AA44C4 24420008 */ addiu $v0, $v0, 0x0008 ## $v0 = 00000010 -/* 009C8 80AA44C8 00401825 */ or $v1, $v0, $zero ## $v1 = 00000010 -/* 009CC 80AA44CC 00002812 */ mflo $a1 -/* 009D0 80AA44D0 24A50001 */ addiu $a1, $a1, 0x0001 ## $a1 = 00000001 -/* 009D4 80AA44D4 00052843 */ sra $a1, $a1, 1 -/* 009D8 80AA44D8 3C18E600 */ lui $t8, 0xE600 ## $t8 = E6000000 -/* 009DC 80AA44DC AC780000 */ sw $t8, 0x0000($v1) ## 00000010 -/* 009E0 80AA44E0 24A5FFFF */ addiu $a1, $a1, 0xFFFF ## $a1 = 00000000 -/* 009E4 80AA44E4 AC600004 */ sw $zero, 0x0004($v1) ## 00000014 -/* 009E8 80AA44E8 24420008 */ addiu $v0, $v0, 0x0008 ## $v0 = 00000018 -/* 009EC 80AA44EC 00401825 */ or $v1, $v0, $zero ## $v1 = 00000018 -/* 009F0 80AA44F0 28A107FF */ slti $at, $a1, 0x07FF -/* 009F4 80AA44F4 3C19F300 */ lui $t9, 0xF300 ## $t9 = F3000000 -/* 009F8 80AA44F8 AC790000 */ sw $t9, 0x0000($v1) ## 00000018 -/* 009FC 80AA44FC 10200003 */ beq $at, $zero, .L80AA450C -/* 00A00 80AA4500 24420008 */ addiu $v0, $v0, 0x0008 ## $v0 = 00000020 -/* 00A04 80AA4504 10000002 */ beq $zero, $zero, .L80AA4510 -/* 00A08 80AA4508 00A04025 */ or $t0, $a1, $zero ## $t0 = 00000000 -.L80AA450C: -/* 00A0C 80AA450C 240807FF */ addiu $t0, $zero, 0x07FF ## $t0 = 000007FF -.L80AA4510: -/* 00A10 80AA4510 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 00A14 80AA4514 04A10003 */ bgez $a1, .L80AA4524 -/* 00A18 80AA4518 000548C3 */ sra $t1, $a1, 3 -/* 00A1C 80AA451C 24A10007 */ addiu $at, $a1, 0x0007 ## $at = 00000007 -/* 00A20 80AA4520 000148C3 */ sra $t1, $at, 3 -.L80AA4524: -/* 00A24 80AA4524 1D200003 */ bgtz $t1, .L80AA4534 -/* 00A28 80AA4528 31190FFF */ andi $t9, $t0, 0x0FFF ## $t9 = 000007FF -/* 00A2C 80AA452C 10000002 */ beq $zero, $zero, .L80AA4538 -/* 00A30 80AA4530 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -.L80AA4534: -/* 00A34 80AA4534 01205025 */ or $t2, $t1, $zero ## $t2 = 00000000 -.L80AA4538: -/* 00A38 80AA4538 1D200003 */ bgtz $t1, .L80AA4548 -/* 00A3C 80AA453C 254D07FF */ addiu $t5, $t2, 0x07FF ## $t5 = 000007FF -/* 00A40 80AA4540 10000002 */ beq $zero, $zero, .L80AA454C -/* 00A44 80AA4544 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -.L80AA4548: -/* 00A48 80AA4548 01205825 */ or $t3, $t1, $zero ## $t3 = 00000000 -.L80AA454C: -/* 00A4C 80AA454C 01AB001A */ div $zero, $t5, $t3 -/* 00A50 80AA4550 00007012 */ mflo $t6 -/* 00A54 80AA4554 31CF0FFF */ andi $t7, $t6, 0x0FFF ## $t7 = 00000000 -/* 00A58 80AA4558 15600002 */ bne $t3, $zero, .L80AA4564 -/* 00A5C 80AA455C 00000000 */ nop -/* 00A60 80AA4560 0007000D */ break 7 -.L80AA4564: -/* 00A64 80AA4564 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 00A68 80AA4568 15610004 */ bne $t3, $at, .L80AA457C -/* 00A6C 80AA456C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00A70 80AA4570 15A10002 */ bne $t5, $at, .L80AA457C -/* 00A74 80AA4574 00000000 */ nop -/* 00A78 80AA4578 0006000D */ break 6 -.L80AA457C: -/* 00A7C 80AA457C 00196B00 */ sll $t5, $t9, 12 -/* 00A80 80AA4580 01ECC025 */ or $t8, $t7, $t4 ## $t8 = 07000000 -/* 00A84 80AA4584 030D7025 */ or $t6, $t8, $t5 ## $t6 = 070007FF -/* 00A88 80AA4588 AC6E0004 */ sw $t6, 0x0004($v1) ## 0000001C -/* 00A8C 80AA458C 00401825 */ or $v1, $v0, $zero ## $v1 = 00000020 -/* 00A90 80AA4590 3C0FE700 */ lui $t7, 0xE700 ## $t7 = E7000000 -/* 00A94 80AA4594 24B90007 */ addiu $t9, $a1, 0x0007 ## $t9 = 00000007 -/* 00A98 80AA4598 0019C0C3 */ sra $t8, $t9, 3 -/* 00A9C 80AA459C AC6F0000 */ sw $t7, 0x0000($v1) ## 00000020 -/* 00AA0 80AA45A0 AC600004 */ sw $zero, 0x0004($v1) ## 00000024 -/* 00AA4 80AA45A4 24420008 */ addiu $v0, $v0, 0x0008 ## $v0 = 00000028 -/* 00AA8 80AA45A8 00401825 */ or $v1, $v0, $zero ## $v1 = 00000028 -/* 00AAC 80AA45AC 330D01FF */ andi $t5, $t8, 0x01FF ## $t5 = 00000000 -/* 00AB0 80AA45B0 000D7240 */ sll $t6, $t5, 9 -/* 00AB4 80AA45B4 3C01F588 */ lui $at, 0xF588 ## $at = F5880000 -/* 00AB8 80AA45B8 01C17825 */ or $t7, $t6, $at ## $t7 = F78807FF -/* 00ABC 80AA45BC AC6F0000 */ sw $t7, 0x0000($v1) ## 00000028 -/* 00AC0 80AA45C0 AC600004 */ sw $zero, 0x0004($v1) ## 0000002C -/* 00AC4 80AA45C4 24420008 */ addiu $v0, $v0, 0x0008 ## $v0 = 00000030 -/* 00AC8 80AA45C8 00401825 */ or $v1, $v0, $zero ## $v1 = 00000030 -/* 00ACC 80AA45CC 24D8FFFF */ addiu $t8, $a2, 0xFFFF ## $t8 = FFFFFFFF -/* 00AD0 80AA45D0 3C19F200 */ lui $t9, 0xF200 ## $t9 = F2000000 -/* 00AD4 80AA45D4 AC790000 */ sw $t9, 0x0000($v1) ## 00000030 -/* 00AD8 80AA45D8 00186880 */ sll $t5, $t8, 2 -/* 00ADC 80AA45DC 31AE0FFF */ andi $t6, $t5, 0x0FFF ## $t6 = 00000000 -/* 00AE0 80AA45E0 24F9FFFF */ addiu $t9, $a3, 0xFFFF ## $t9 = FFFFFFFF -/* 00AE4 80AA45E4 0019C080 */ sll $t8, $t9, 2 -/* 00AE8 80AA45E8 330D0FFF */ andi $t5, $t8, 0x0FFF ## $t5 = 00000FFF -/* 00AEC 80AA45EC 000E7B00 */ sll $t7, $t6, 12 -/* 00AF0 80AA45F0 01ED7025 */ or $t6, $t7, $t5 ## $t6 = F7880FFF -/* 00AF4 80AA45F4 AC6E0004 */ sw $t6, 0x0004($v1) ## 00000034 -/* 00AF8 80AA45F8 87B9001A */ lh $t9, 0x001A($sp) -/* 00AFC 80AA45FC 87A50012 */ lh $a1, 0x0012($sp) -/* 00B00 80AA4600 87A60016 */ lh $a2, 0x0016($sp) -/* 00B04 80AA4604 3C01E400 */ lui $at, 0xE400 ## $at = E4000000 -/* 00B08 80AA4608 00B9C021 */ addu $t8, $a1, $t9 -/* 00B0C 80AA460C 00187880 */ sll $t7, $t8, 2 -/* 00B10 80AA4610 87B8001E */ lh $t8, 0x001E($sp) -/* 00B14 80AA4614 31ED0FFF */ andi $t5, $t7, 0x0FFF ## $t5 = 000007FF -/* 00B18 80AA4618 000D7300 */ sll $t6, $t5, 12 -/* 00B1C 80AA461C 00D87821 */ addu $t7, $a2, $t8 -/* 00B20 80AA4620 000F6880 */ sll $t5, $t7, 2 -/* 00B24 80AA4624 01C1C825 */ or $t9, $t6, $at ## $t9 = F7880FFF -/* 00B28 80AA4628 31AE0FFF */ andi $t6, $t5, 0x0FFF ## $t6 = 000007FF -/* 00B2C 80AA462C 032EC025 */ or $t8, $t9, $t6 ## $t8 = F7880FFF -/* 00B30 80AA4630 24420008 */ addiu $v0, $v0, 0x0008 ## $v0 = 00000038 -/* 00B34 80AA4634 00401825 */ or $v1, $v0, $zero ## $v1 = 00000038 -/* 00B38 80AA4638 00057880 */ sll $t7, $a1, 2 -/* 00B3C 80AA463C 31ED0FFF */ andi $t5, $t7, 0x0FFF ## $t5 = 000007FF -/* 00B40 80AA4640 AC780000 */ sw $t8, 0x0000($v1) ## 00000038 -/* 00B44 80AA4644 00067080 */ sll $t6, $a2, 2 -/* 00B48 80AA4648 31D80FFF */ andi $t8, $t6, 0x0FFF ## $t8 = 000007FF -/* 00B4C 80AA464C 000DCB00 */ sll $t9, $t5, 12 -/* 00B50 80AA4650 03387825 */ or $t7, $t9, $t8 ## $t7 = F7880FFF -/* 00B54 80AA4654 AC6F0004 */ sw $t7, 0x0004($v1) ## 0000003C -/* 00B58 80AA4658 24420008 */ addiu $v0, $v0, 0x0008 ## $v0 = 00000040 -/* 00B5C 80AA465C 00401825 */ or $v1, $v0, $zero ## $v1 = 00000040 -/* 00B60 80AA4660 3C0DE100 */ lui $t5, 0xE100 ## $t5 = E1000000 -/* 00B64 80AA4664 AC6D0000 */ sw $t5, 0x0000($v1) ## 00000040 -/* 00B68 80AA4668 AC600004 */ sw $zero, 0x0004($v1) ## 00000044 -/* 00B6C 80AA466C 24420008 */ addiu $v0, $v0, 0x0008 ## $v0 = 00000048 -/* 00B70 80AA4670 00401825 */ or $v1, $v0, $zero ## $v1 = 00000048 -/* 00B74 80AA4674 3C0EF100 */ lui $t6, 0xF100 ## $t6 = F1000000 -/* 00B78 80AA4678 AC6E0000 */ sw $t6, 0x0000($v1) ## 00000048 -/* 00B7C 80AA467C 97AD0026 */ lhu $t5, 0x0026($sp) -/* 00B80 80AA4680 97B80022 */ lhu $t8, 0x0022($sp) -/* 00B84 80AA4684 24420008 */ addiu $v0, $v0, 0x0008 ## $v0 = 00000050 -/* 00B88 80AA4688 01A07025 */ or $t6, $t5, $zero ## $t6 = E1000000 -/* 00B8C 80AA468C 00187C00 */ sll $t7, $t8, 16 -/* 00B90 80AA4690 01EEC825 */ or $t9, $t7, $t6 ## $t9 = F7880FFF -/* 00B94 80AA4694 AC790004 */ sw $t9, 0x0004($v1) ## 0000004C -/* 00B98 80AA4698 03E00008 */ jr $ra -/* 00B9C 80AA469C AC820000 */ sw $v0, 0x0000($a0) ## 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mag/func_80AA46A0.s b/asm/non_matchings/overlays/actors/ovl_En_Mag/func_80AA46A0.s deleted file mode 100644 index 2c88006ad3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Mag/func_80AA46A0.s +++ /dev/null @@ -1,285 +0,0 @@ -glabel func_80AA46A0 -/* 00BA0 80AA46A0 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 00BA4 80AA46A4 AFA40068 */ sw $a0, 0x0068($sp) -/* 00BA8 80AA46A8 AFA70074 */ sw $a3, 0x0074($sp) -/* 00BAC 80AA46AC 8C820000 */ lw $v0, 0x0000($a0) ## 00000000 -/* 00BB0 80AA46B0 3C08FD90 */ lui $t0, 0xFD90 ## $t0 = FD900000 -/* 00BB4 80AA46B4 3C0B0700 */ lui $t3, 0x0700 ## $t3 = 07000000 -/* 00BB8 80AA46B8 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -/* 00BBC 80AA46BC AC680000 */ sw $t0, 0x0000($v1) ## 00000000 -/* 00BC0 80AA46C0 AC650004 */ sw $a1, 0x0004($v1) ## 00000004 -/* 00BC4 80AA46C4 24420008 */ addiu $v0, $v0, 0x0008 ## $v0 = 00000008 -/* 00BC8 80AA46C8 00401825 */ or $v1, $v0, $zero ## $v1 = 00000008 -/* 00BCC 80AA46CC 3C0FF590 */ lui $t7, 0xF590 ## $t7 = F5900000 -/* 00BD0 80AA46D0 AC6F0000 */ sw $t7, 0x0000($v1) ## 00000008 -/* 00BD4 80AA46D4 AC6B0004 */ sw $t3, 0x0004($v1) ## 0000000C -/* 00BD8 80AA46D8 24420008 */ addiu $v0, $v0, 0x0008 ## $v0 = 00000010 -/* 00BDC 80AA46DC 00401825 */ or $v1, $v0, $zero ## $v1 = 00000010 -/* 00BE0 80AA46E0 24420008 */ addiu $v0, $v0, 0x0008 ## $v0 = 00000018 -/* 00BE4 80AA46E4 3C0AE600 */ lui $t2, 0xE600 ## $t2 = E6000000 -/* 00BE8 80AA46E8 AC6A0000 */ sw $t2, 0x0000($v1) ## 00000010 -/* 00BEC 80AA46EC 00404825 */ or $t1, $v0, $zero ## $t1 = 00000018 -/* 00BF0 80AA46F0 AC600004 */ sw $zero, 0x0004($v1) ## 00000014 -/* 00BF4 80AA46F4 3C0CF300 */ lui $t4, 0xF300 ## $t4 = F3000000 -/* 00BF8 80AA46F8 AD2C0000 */ sw $t4, 0x0000($t1) ## 00000018 -/* 00BFC 80AA46FC 87B8007A */ lh $t8, 0x007A($sp) -/* 00C00 80AA4700 00073C00 */ sll $a3, $a3, 16 -/* 00C04 80AA4704 00073C03 */ sra $a3, $a3, 16 -/* 00C08 80AA4708 00F80019 */ multu $a3, $t8 -/* 00C0C 80AA470C 00807025 */ or $t6, $a0, $zero ## $t6 = 00000000 -/* 00C10 80AA4710 24420008 */ addiu $v0, $v0, 0x0008 ## $v0 = 00000020 -/* 00C14 80AA4714 240507FF */ addiu $a1, $zero, 0x07FF ## $a1 = 000007FF -/* 00C18 80AA4718 00001812 */ mflo $v1 -/* 00C1C 80AA471C 24630003 */ addiu $v1, $v1, 0x0003 ## $v1 = 00000013 -/* 00C20 80AA4720 00031883 */ sra $v1, $v1, 2 -/* 00C24 80AA4724 2463FFFF */ addiu $v1, $v1, 0xFFFF ## $v1 = 00000012 -/* 00C28 80AA4728 286107FF */ slti $at, $v1, 0x07FF -/* 00C2C 80AA472C 10200003 */ beq $at, $zero, .L80AA473C -/* 00C30 80AA4730 00000000 */ nop -/* 00C34 80AA4734 10000001 */ beq $zero, $zero, .L80AA473C -/* 00C38 80AA4738 00602825 */ or $a1, $v1, $zero ## $a1 = 00000012 -.L80AA473C: -/* 00C3C 80AA473C 04E10003 */ bgez $a3, .L80AA474C -/* 00C40 80AA4740 00076903 */ sra $t5, $a3, 4 -/* 00C44 80AA4744 24E1000F */ addiu $at, $a3, 0x000F ## $at = 0000000F -/* 00C48 80AA4748 00016903 */ sra $t5, $at, 4 -.L80AA474C: -/* 00C4C 80AA474C 1DA00003 */ bgtz $t5, .L80AA475C -/* 00C50 80AA4750 01A02025 */ or $a0, $t5, $zero ## $a0 = 00000000 -/* 00C54 80AA4754 10000001 */ beq $zero, $zero, .L80AA475C -/* 00C58 80AA4758 24040001 */ addiu $a0, $zero, 0x0001 ## $a0 = 00000001 -.L80AA475C: -/* 00C5C 80AA475C 1DA00003 */ bgtz $t5, .L80AA476C -/* 00C60 80AA4760 249907FF */ addiu $t9, $a0, 0x07FF ## $t9 = 00000800 -/* 00C64 80AA4764 10000002 */ beq $zero, $zero, .L80AA4770 -/* 00C68 80AA4768 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -.L80AA476C: -/* 00C6C 80AA476C 01A01825 */ or $v1, $t5, $zero ## $v1 = 00000000 -.L80AA4770: -/* 00C70 80AA4770 0323001A */ div $zero, $t9, $v1 -/* 00C74 80AA4774 00007012 */ mflo $t6 -/* 00C78 80AA4778 31CF0FFF */ andi $t7, $t6, 0x0FFF ## $t7 = 00000000 -/* 00C7C 80AA477C 14600002 */ bne $v1, $zero, .L80AA4788 -/* 00C80 80AA4780 00000000 */ nop -/* 00C84 80AA4784 0007000D */ break 7 -.L80AA4788: -/* 00C88 80AA4788 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 00C8C 80AA478C 14610004 */ bne $v1, $at, .L80AA47A0 -/* 00C90 80AA4790 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00C94 80AA4794 17210002 */ bne $t9, $at, .L80AA47A0 -/* 00C98 80AA4798 00000000 */ nop -/* 00C9C 80AA479C 0006000D */ break 6 -.L80AA47A0: -/* 00CA0 80AA47A0 30B90FFF */ andi $t9, $a1, 0x0FFF ## $t9 = 00000012 -/* 00CA4 80AA47A4 00197300 */ sll $t6, $t9, 12 -/* 00CA8 80AA47A8 01EBC025 */ or $t8, $t7, $t3 ## $t8 = 07000000 -/* 00CAC 80AA47AC 030E7825 */ or $t7, $t8, $t6 ## $t7 = 07000000 -/* 00CB0 80AA47B0 00401825 */ or $v1, $v0, $zero ## $v1 = 00000020 -/* 00CB4 80AA47B4 AD2F0004 */ sw $t7, 0x0004($t1) ## 0000001C -/* 00CB8 80AA47B8 0007C843 */ sra $t9, $a3, 1 -/* 00CBC 80AA47BC 27380007 */ addiu $t8, $t9, 0x0007 ## $t8 = 00000019 -/* 00CC0 80AA47C0 3C0DE700 */ lui $t5, 0xE700 ## $t5 = E7000000 -/* 00CC4 80AA47C4 AC6D0000 */ sw $t5, 0x0000($v1) ## 00000020 -/* 00CC8 80AA47C8 001870C3 */ sra $t6, $t8, 3 -/* 00CCC 80AA47CC AC600004 */ sw $zero, 0x0004($v1) ## 00000024 -/* 00CD0 80AA47D0 24420008 */ addiu $v0, $v0, 0x0008 ## $v0 = 00000028 -/* 00CD4 80AA47D4 00401825 */ or $v1, $v0, $zero ## $v1 = 00000028 -/* 00CD8 80AA47D8 31CF01FF */ andi $t7, $t6, 0x01FF ## $t7 = 00000000 -/* 00CDC 80AA47DC 000FCA40 */ sll $t9, $t7, 9 -/* 00CE0 80AA47E0 3C01F580 */ lui $at, 0xF580 ## $at = F5800000 -/* 00CE4 80AA47E4 0321C025 */ or $t8, $t9, $at ## $t8 = F5800012 -/* 00CE8 80AA47E8 AC780000 */ sw $t8, 0x0000($v1) ## 00000028 -/* 00CEC 80AA47EC AC600004 */ sw $zero, 0x0004($v1) ## 0000002C -/* 00CF0 80AA47F0 24420008 */ addiu $v0, $v0, 0x0008 ## $v0 = 00000030 -/* 00CF4 80AA47F4 00401825 */ or $v1, $v0, $zero ## $v1 = 00000030 -/* 00CF8 80AA47F8 24EEFFFF */ addiu $t6, $a3, 0xFFFF ## $t6 = FFFFFFFF -/* 00CFC 80AA47FC 3C09F200 */ lui $t1, 0xF200 ## $t1 = F2000000 -/* 00D00 80AA4800 AC690000 */ sw $t1, 0x0000($v1) ## 00000030 -/* 00D04 80AA4804 000E7880 */ sll $t7, $t6, 2 -/* 00D08 80AA4808 87AE007A */ lh $t6, 0x007A($sp) -/* 00D0C 80AA480C 31F90FFF */ andi $t9, $t7, 0x0FFF ## $t9 = 00000000 -/* 00D10 80AA4810 0019C300 */ sll $t8, $t9, 12 -/* 00D14 80AA4814 25CFFFFF */ addiu $t7, $t6, 0xFFFF ## $t7 = FFFFFFFE -/* 00D18 80AA4818 000FC880 */ sll $t9, $t7, 2 -/* 00D1C 80AA481C 332E0FFF */ andi $t6, $t9, 0x0FFF ## $t6 = 00000000 -/* 00D20 80AA4820 030E7825 */ or $t7, $t8, $t6 ## $t7 = F5800012 -/* 00D24 80AA4824 AC6F0004 */ sw $t7, 0x0004($v1) ## 00000034 -/* 00D28 80AA4828 97B900A6 */ lhu $t9, 0x00A6($sp) -/* 00D2C 80AA482C 24420008 */ addiu $v0, $v0, 0x0008 ## $v0 = 00000038 -/* 00D30 80AA4830 00401825 */ or $v1, $v0, $zero ## $v1 = 00000038 -/* 00D34 80AA4834 1720007D */ bne $t9, $zero, .L80AA4A2C -/* 00D38 80AA4838 3C18F590 */ lui $t8, 0xF590 ## $t8 = F5900000 -/* 00D3C 80AA483C 24420008 */ addiu $v0, $v0, 0x0008 ## $v0 = 00000040 -/* 00D40 80AA4840 AC680000 */ sw $t0, 0x0000($v1) ## 00000038 -/* 00D44 80AA4844 AC660004 */ sw $a2, 0x0004($v1) ## 0000003C -/* 00D48 80AA4848 00401825 */ or $v1, $v0, $zero ## $v1 = 00000040 -/* 00D4C 80AA484C 37180100 */ ori $t8, $t8, 0x0100 ## $t8 = F5900100 -/* 00D50 80AA4850 AC780000 */ sw $t8, 0x0000($v1) ## 00000040 -/* 00D54 80AA4854 97A600A2 */ lhu $a2, 0x00A2($sp) -/* 00D58 80AA4858 97A7009E */ lhu $a3, 0x009E($sp) -/* 00D5C 80AA485C 3C010701 */ lui $at, 0x0701 ## $at = 07010000 -/* 00D60 80AA4860 30C6000F */ andi $a2, $a2, 0x000F ## $a2 = 00000000 -/* 00D64 80AA4864 00063280 */ sll $a2, $a2, 10 -/* 00D68 80AA4868 34214000 */ ori $at, $at, 0x4000 ## $at = 07014000 -/* 00D6C 80AA486C 00C17025 */ or $t6, $a2, $at ## $t6 = 07014000 -/* 00D70 80AA4870 30E7000F */ andi $a3, $a3, 0x000F ## $a3 = 00000000 -/* 00D74 80AA4874 01C77825 */ or $t7, $t6, $a3 ## $t7 = 07014000 -/* 00D78 80AA4878 AC6F0004 */ sw $t7, 0x0004($v1) ## 00000044 -/* 00D7C 80AA487C 24420008 */ addiu $v0, $v0, 0x0008 ## $v0 = 00000048 -/* 00D80 80AA4880 00401825 */ or $v1, $v0, $zero ## $v1 = 00000048 -/* 00D84 80AA4884 AC6A0000 */ sw $t2, 0x0000($v1) ## 00000048 -/* 00D88 80AA4888 AC600004 */ sw $zero, 0x0004($v1) ## 0000004C -/* 00D8C 80AA488C 87AA0082 */ lh $t2, 0x0082($sp) -/* 00D90 80AA4890 87A8007E */ lh $t0, 0x007E($sp) -/* 00D94 80AA4894 24420008 */ addiu $v0, $v0, 0x0008 ## $v0 = 00000050 -/* 00D98 80AA4898 AFA20038 */ sw $v0, 0x0038($sp) -/* 00D9C 80AA489C 010A0019 */ multu $t0, $t2 -/* 00DA0 80AA48A0 8FB90038 */ lw $t9, 0x0038($sp) -/* 00DA4 80AA48A4 24420008 */ addiu $v0, $v0, 0x0008 ## $v0 = 00000058 -/* 00DA8 80AA48A8 240507FF */ addiu $a1, $zero, 0x07FF ## $a1 = 000007FF -/* 00DAC 80AA48AC AF2C0000 */ sw $t4, 0x0000($t9) ## 00000000 -/* 00DB0 80AA48B0 01006025 */ or $t4, $t0, $zero ## $t4 = FD900000 -/* 00DB4 80AA48B4 00001812 */ mflo $v1 -/* 00DB8 80AA48B8 24630001 */ addiu $v1, $v1, 0x0001 ## $v1 = 00000049 -/* 00DBC 80AA48BC 00031843 */ sra $v1, $v1, 1 -/* 00DC0 80AA48C0 2463FFFF */ addiu $v1, $v1, 0xFFFF ## $v1 = 00000048 -/* 00DC4 80AA48C4 286107FF */ slti $at, $v1, 0x07FF -/* 00DC8 80AA48C8 10200003 */ beq $at, $zero, .L80AA48D8 -/* 00DCC 80AA48CC 00000000 */ nop -/* 00DD0 80AA48D0 10000001 */ beq $zero, $zero, .L80AA48D8 -/* 00DD4 80AA48D4 00602825 */ or $a1, $v1, $zero ## $a1 = 00000048 -.L80AA48D8: -/* 00DD8 80AA48D8 05810003 */ bgez $t4, .L80AA48E8 -/* 00DDC 80AA48DC 000CC0C3 */ sra $t8, $t4, 3 -/* 00DE0 80AA48E0 25810007 */ addiu $at, $t4, 0x0007 ## $at = FD900007 -/* 00DE4 80AA48E4 0001C0C3 */ sra $t8, $at, 3 -.L80AA48E8: -/* 00DE8 80AA48E8 AFB80000 */ sw $t8, 0x0000($sp) -/* 00DEC 80AA48EC 1F000003 */ bgtz $t8, .L80AA48FC -/* 00DF0 80AA48F0 03007025 */ or $t6, $t8, $zero ## $t6 = F5900100 -/* 00DF4 80AA48F4 10000002 */ beq $zero, $zero, .L80AA4900 -/* 00DF8 80AA48F8 24040001 */ addiu $a0, $zero, 0x0001 ## $a0 = 00000001 -.L80AA48FC: -/* 00DFC 80AA48FC 8FA40000 */ lw $a0, 0x0000($sp) -.L80AA4900: -/* 00E00 80AA4900 8FAF0000 */ lw $t7, 0x0000($sp) -/* 00E04 80AA4904 249907FF */ addiu $t9, $a0, 0x07FF ## $t9 = 00000800 -/* 00E08 80AA4908 8FA30000 */ lw $v1, 0x0000($sp) -/* 00E0C 80AA490C 1DE00003 */ bgtz $t7, .L80AA491C -/* 00E10 80AA4910 00000000 */ nop -/* 00E14 80AA4914 10000001 */ beq $zero, $zero, .L80AA491C -/* 00E18 80AA4918 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -.L80AA491C: -/* 00E1C 80AA491C 0323001A */ div $zero, $t9, $v1 -/* 00E20 80AA4920 14600002 */ bne $v1, $zero, .L80AA492C -/* 00E24 80AA4924 00000000 */ nop -/* 00E28 80AA4928 0007000D */ break 7 -.L80AA492C: -/* 00E2C 80AA492C 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 00E30 80AA4930 14610004 */ bne $v1, $at, .L80AA4944 -/* 00E34 80AA4934 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00E38 80AA4938 17210002 */ bne $t9, $at, .L80AA4944 -/* 00E3C 80AA493C 00000000 */ nop -/* 00E40 80AA4940 0006000D */ break 6 -.L80AA4944: -/* 00E44 80AA4944 0000C012 */ mflo $t8 -/* 00E48 80AA4948 330E0FFF */ andi $t6, $t8, 0x0FFF ## $t6 = 00000100 -/* 00E4C 80AA494C 30B90FFF */ andi $t9, $a1, 0x0FFF ## $t9 = 00000048 -/* 00E50 80AA4950 0019C300 */ sll $t8, $t9, 12 -/* 00E54 80AA4954 01CB7825 */ or $t7, $t6, $t3 ## $t7 = 07000100 -/* 00E58 80AA4958 8FB90038 */ lw $t9, 0x0038($sp) -/* 00E5C 80AA495C 01F87025 */ or $t6, $t7, $t8 ## $t6 = F7900100 -/* 00E60 80AA4960 258F0007 */ addiu $t7, $t4, 0x0007 ## $t7 = FD900007 -/* 00E64 80AA4964 000FC0C3 */ sra $t8, $t7, 3 -/* 00E68 80AA4968 AF2E0004 */ sw $t6, 0x0004($t9) ## 0000004C -/* 00E6C 80AA496C 330E01FF */ andi $t6, $t8, 0x01FF ## $t6 = 00000100 -/* 00E70 80AA4970 000ECA40 */ sll $t9, $t6, 9 -/* 00E74 80AA4974 3C01F588 */ lui $at, 0xF588 ## $at = F5880000 -/* 00E78 80AA4978 00401825 */ or $v1, $v0, $zero ## $v1 = 00000058 -/* 00E7C 80AA497C 03217825 */ or $t7, $t9, $at ## $t7 = F5880048 -/* 00E80 80AA4980 3C010101 */ lui $at, 0x0101 ## $at = 01010000 -/* 00E84 80AA4984 34214000 */ ori $at, $at, 0x4000 ## $at = 01014000 -/* 00E88 80AA4988 35F80100 */ ori $t8, $t7, 0x0100 ## $t8 = F5880148 -/* 00E8C 80AA498C AC6D0000 */ sw $t5, 0x0000($v1) ## 00000058 -/* 00E90 80AA4990 AC600004 */ sw $zero, 0x0004($v1) ## 0000005C -/* 00E94 80AA4994 24420008 */ addiu $v0, $v0, 0x0008 ## $v0 = 00000060 -/* 00E98 80AA4998 00401825 */ or $v1, $v0, $zero ## $v1 = 00000060 -/* 00E9C 80AA499C 00C17025 */ or $t6, $a2, $at ## $t6 = 01014000 -/* 00EA0 80AA49A0 01C7C825 */ or $t9, $t6, $a3 ## $t9 = 01014000 -/* 00EA4 80AA49A4 AC780000 */ sw $t8, 0x0000($v1) ## 00000060 -/* 00EA8 80AA49A8 250FFFFF */ addiu $t7, $t0, 0xFFFF ## $t7 = FD8FFFFF -/* 00EAC 80AA49AC 000FC080 */ sll $t8, $t7, 2 -/* 00EB0 80AA49B0 330E0FFF */ andi $t6, $t8, 0x0FFF ## $t6 = 00000148 -/* 00EB4 80AA49B4 AC790004 */ sw $t9, 0x0004($v1) ## 00000064 -/* 00EB8 80AA49B8 000ECB00 */ sll $t9, $t6, 12 -/* 00EBC 80AA49BC 2558FFFF */ addiu $t8, $t2, 0xFFFF ## $t8 = E5FFFFFF -/* 00EC0 80AA49C0 3C010100 */ lui $at, 0x0100 ## $at = 01000000 -/* 00EC4 80AA49C4 03217825 */ or $t7, $t9, $at ## $t7 = 01014000 -/* 00EC8 80AA49C8 00187080 */ sll $t6, $t8, 2 -/* 00ECC 80AA49CC 24420008 */ addiu $v0, $v0, 0x0008 ## $v0 = 00000068 -/* 00ED0 80AA49D0 00401825 */ or $v1, $v0, $zero ## $v1 = 00000068 -/* 00ED4 80AA49D4 31D90FFF */ andi $t9, $t6, 0x0FFF ## $t9 = 00000148 -/* 00ED8 80AA49D8 01F9C025 */ or $t8, $t7, $t9 ## $t8 = 01014148 -/* 00EDC 80AA49DC AC780004 */ sw $t8, 0x0004($v1) ## 0000006C -/* 00EE0 80AA49E0 AC690000 */ sw $t1, 0x0000($v1) ## 00000068 -/* 00EE4 80AA49E4 8FA400A8 */ lw $a0, 0x00A8($sp) -/* 00EE8 80AA49E8 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 00EEC 80AA49EC 24420008 */ addiu $v0, $v0, 0x0008 ## $v0 = 00000070 -/* 00EF0 80AA49F0 00812021 */ addu $a0, $a0, $at -/* 00EF4 80AA49F4 848F630E */ lh $t7, 0x630E($a0) ## 0000630F -/* 00EF8 80AA49F8 00401825 */ or $v1, $v0, $zero ## $v1 = 00000070 -/* 00EFC 80AA49FC 3C010107 */ lui $at, 0x0107 ## $at = 01070000 -/* 00F00 80AA4A00 31F9007F */ andi $t9, $t7, 0x007F ## $t9 = 00000000 -/* 00F04 80AA4A04 0329C025 */ or $t8, $t9, $t1 ## $t8 = F2000000 -/* 00F08 80AA4A08 AC780000 */ sw $t8, 0x0000($v1) ## 00000070 -/* 00F0C 80AA4A0C 848E630E */ lh $t6, 0x630E($a0) ## 0000630F -/* 00F10 80AA4A10 3421C000 */ ori $at, $at, 0xC000 ## $at = 0107C000 -/* 00F14 80AA4A14 24420008 */ addiu $v0, $v0, 0x0008 ## $v0 = 00000078 -/* 00F18 80AA4A18 31CF007F */ andi $t7, $t6, 0x007F ## $t7 = 00000048 -/* 00F1C 80AA4A1C 25F9007C */ addiu $t9, $t7, 0x007C ## $t9 = 000000C4 -/* 00F20 80AA4A20 33380FFF */ andi $t8, $t9, 0x0FFF ## $t8 = 000000C4 -/* 00F24 80AA4A24 03017025 */ or $t6, $t8, $at ## $t6 = 0107C0C4 -/* 00F28 80AA4A28 AC6E0004 */ sw $t6, 0x0004($v1) ## 00000074 -.L80AA4A2C: -/* 00F2C 80AA4A2C 87A40086 */ lh $a0, 0x0086($sp) -/* 00F30 80AA4A30 87AF008E */ lh $t7, 0x008E($sp) -/* 00F34 80AA4A34 87A5008A */ lh $a1, 0x008A($sp) -/* 00F38 80AA4A38 3C01E400 */ lui $at, 0xE400 ## $at = E4000000 -/* 00F3C 80AA4A3C 008FC821 */ addu $t9, $a0, $t7 -/* 00F40 80AA4A40 0019C080 */ sll $t8, $t9, 2 -/* 00F44 80AA4A44 330E0FFF */ andi $t6, $t8, 0x0FFF ## $t6 = 000000C4 -/* 00F48 80AA4A48 87B80092 */ lh $t8, 0x0092($sp) -/* 00F4C 80AA4A4C 000E7B00 */ sll $t7, $t6, 12 -/* 00F50 80AA4A50 01E1C825 */ or $t9, $t7, $at ## $t9 = E4000048 -/* 00F54 80AA4A54 00B87021 */ addu $t6, $a1, $t8 -/* 00F58 80AA4A58 000E7880 */ sll $t7, $t6, 2 -/* 00F5C 80AA4A5C 31F80FFF */ andi $t8, $t7, 0x0FFF ## $t8 = 00000048 -/* 00F60 80AA4A60 03387025 */ or $t6, $t9, $t8 ## $t6 = E4000048 -/* 00F64 80AA4A64 00401825 */ or $v1, $v0, $zero ## $v1 = 00000078 -/* 00F68 80AA4A68 00047880 */ sll $t7, $a0, 2 -/* 00F6C 80AA4A6C 31F90FFF */ andi $t9, $t7, 0x0FFF ## $t9 = 00000048 -/* 00F70 80AA4A70 AC6E0000 */ sw $t6, 0x0000($v1) ## 00000078 -/* 00F74 80AA4A74 00057080 */ sll $t6, $a1, 2 -/* 00F78 80AA4A78 31CF0FFF */ andi $t7, $t6, 0x0FFF ## $t7 = 00000048 -/* 00F7C 80AA4A7C 0019C300 */ sll $t8, $t9, 12 -/* 00F80 80AA4A80 030FC825 */ or $t9, $t8, $t7 ## $t9 = 00000048 -/* 00F84 80AA4A84 AC790004 */ sw $t9, 0x0004($v1) ## 0000007C -/* 00F88 80AA4A88 24420008 */ addiu $v0, $v0, 0x0008 ## $v0 = 00000080 -/* 00F8C 80AA4A8C 00401825 */ or $v1, $v0, $zero ## $v1 = 00000080 -/* 00F90 80AA4A90 3C0EE100 */ lui $t6, 0xE100 ## $t6 = E1000000 -/* 00F94 80AA4A94 AC6E0000 */ sw $t6, 0x0000($v1) ## 00000080 -/* 00F98 80AA4A98 AC600004 */ sw $zero, 0x0004($v1) ## 00000084 -/* 00F9C 80AA4A9C 24420008 */ addiu $v0, $v0, 0x0008 ## $v0 = 00000088 -/* 00FA0 80AA4AA0 00401825 */ or $v1, $v0, $zero ## $v1 = 00000088 -/* 00FA4 80AA4AA4 3C18F100 */ lui $t8, 0xF100 ## $t8 = F1000000 -/* 00FA8 80AA4AA8 AC780000 */ sw $t8, 0x0000($v1) ## 00000088 -/* 00FAC 80AA4AAC 97B90096 */ lhu $t9, 0x0096($sp) -/* 00FB0 80AA4AB0 97AF009A */ lhu $t7, 0x009A($sp) -/* 00FB4 80AA4AB4 24420008 */ addiu $v0, $v0, 0x0008 ## $v0 = 00000090 -/* 00FB8 80AA4AB8 00197400 */ sll $t6, $t9, 16 -/* 00FBC 80AA4ABC 01CFC825 */ or $t9, $t6, $t7 ## $t9 = E1000048 -/* 00FC0 80AA4AC0 AC790004 */ sw $t9, 0x0004($v1) ## 0000008C -/* 00FC4 80AA4AC4 8FB80068 */ lw $t8, 0x0068($sp) -/* 00FC8 80AA4AC8 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 00FCC 80AA4ACC 03E00008 */ jr $ra -/* 00FD0 80AA4AD0 AF020000 */ sw $v0, 0x0000($t8) ## F1000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mag/func_80AA4AD4.s b/asm/non_matchings/overlays/actors/ovl_En_Mag/func_80AA4AD4.s deleted file mode 100644 index e0dfd6ce5d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Mag/func_80AA4AD4.s +++ /dev/null @@ -1,260 +0,0 @@ -glabel func_80AA4AD4 -/* 00FD4 80AA4AD4 27BDFF48 */ addiu $sp, $sp, 0xFF48 ## $sp = FFFFFF48 -/* 00FD8 80AA4AD8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00FDC 80AA4ADC AFA400B8 */ sw $a0, 0x00B8($sp) -/* 00FE0 80AA4AE0 AFA500BC */ sw $a1, 0x00BC($sp) -/* 00FE4 80AA4AE4 AFA600C0 */ sw $a2, 0x00C0($sp) -/* 00FE8 80AA4AE8 AFA700C4 */ sw $a3, 0x00C4($sp) -/* 00FEC 80AA4AEC 8C8F0000 */ lw $t7, 0x0000($a0) ## 00000000 -/* 00FF0 80AA4AF0 27A400B4 */ addiu $a0, $sp, 0x00B4 ## $a0 = FFFFFFFC -/* 00FF4 80AA4AF4 0C02534A */ jal func_80094D28 -/* 00FF8 80AA4AF8 AFAF00B4 */ sw $t7, 0x00B4($sp) -/* 00FFC 80AA4AFC 8FA400C8 */ lw $a0, 0x00C8($sp) -/* 01000 80AA4B00 240E1000 */ addiu $t6, $zero, 0x1000 ## $t6 = 00001000 -/* 01004 80AA4B04 8FA300CC */ lw $v1, 0x00CC($sp) -/* 01008 80AA4B08 00043880 */ sll $a3, $a0, 2 -/* 0100C 80AA4B0C 01C7001B */ divu $zero, $t6, $a3 -/* 01010 80AA4B10 00002812 */ mflo $a1 -/* 01014 80AA4B14 87B800C2 */ lh $t8, 0x00C2($sp) -/* 01018 80AA4B18 0003C842 */ srl $t9, $v1, 1 -/* 0101C 80AA4B1C 00830019 */ multu $a0, $v1 -/* 01020 80AA4B20 03194023 */ subu $t0, $t8, $t9 -/* 01024 80AA4B24 8FB800B4 */ lw $t8, 0x00B4($sp) -/* 01028 80AA4B28 00045840 */ sll $t3, $a0, 1 -/* 0102C 80AA4B2C 8FAA00C4 */ lw $t2, 0x00C4($sp) -/* 01030 80AA4B30 14E00002 */ bne $a3, $zero, .L80AA4B3C -/* 01034 80AA4B34 00000000 */ nop -/* 01038 80AA4B38 0007000D */ break 7 -.L80AA4B3C: -/* 0103C 80AA4B3C 00003012 */ mflo $a2 -/* 01040 80AA4B40 00063080 */ sll $a2, $a2, 2 -/* 01044 80AA4B44 00A04825 */ or $t1, $a1, $zero ## $t1 = 00000000 -/* 01048 80AA4B48 00850019 */ multu $a0, $a1 -/* 0104C 80AA4B4C 256B0007 */ addiu $t3, $t3, 0x0007 ## $t3 = 00000007 -/* 01050 80AA4B50 3C0EE700 */ lui $t6, 0xE700 ## $t6 = E7000000 -/* 01054 80AA4B54 3C0DE800 */ lui $t5, 0xE800 ## $t5 = E8000000 -/* 01058 80AA4B58 27190008 */ addiu $t9, $t8, 0x0008 ## $t9 = 00000008 -/* 0105C 80AA4B5C 00006012 */ mflo $t4 -/* 01060 80AA4B60 000C6080 */ sll $t4, $t4, 2 -/* 01064 80AA4B64 00000000 */ nop -/* 01068 80AA4B68 00CC001A */ div $zero, $a2, $t4 -/* 0106C 80AA4B6C 15800002 */ bne $t4, $zero, .L80AA4B78 -/* 01070 80AA4B70 00000000 */ nop -/* 01074 80AA4B74 0007000D */ break 7 -.L80AA4B78: -/* 01078 80AA4B78 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 0107C 80AA4B7C 15810004 */ bne $t4, $at, .L80AA4B90 -/* 01080 80AA4B80 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01084 80AA4B84 14C10002 */ bne $a2, $at, .L80AA4B90 -/* 01088 80AA4B88 00000000 */ nop -/* 0108C 80AA4B8C 0006000D */ break 6 -.L80AA4B90: -/* 01090 80AA4B90 00001012 */ mflo $v0 -/* 01094 80AA4B94 00007810 */ mfhi $t7 -/* 01098 80AA4B98 0040F825 */ or $ra, $v0, $zero ## $ra = 00000000 -/* 0109C 80AA4B9C 11E00002 */ beq $t7, $zero, .L80AA4BA8 -/* 010A0 80AA4BA0 3C01F518 */ lui $at, 0xF518 ## $at = F5180000 -/* 010A4 80AA4BA4 245F0001 */ addiu $ra, $v0, 0x0001 ## $ra = 00000001 -.L80AA4BA8: -/* 010A8 80AA4BA8 AFB900B4 */ sw $t9, 0x00B4($sp) -/* 010AC 80AA4BAC AF000004 */ sw $zero, 0x0004($t8) ## 00000004 -/* 010B0 80AA4BB0 AF0E0000 */ sw $t6, 0x0000($t8) ## 00000000 -/* 010B4 80AA4BB4 8FAF00B4 */ lw $t7, 0x00B4($sp) -/* 010B8 80AA4BB8 000B58C2 */ srl $t3, $t3, 3 -/* 010BC 80AA4BBC 316B01FF */ andi $t3, $t3, 0x01FF ## $t3 = 00000007 -/* 010C0 80AA4BC0 25F80008 */ addiu $t8, $t7, 0x0008 ## $t8 = 00000008 -/* 010C4 80AA4BC4 AFB800B4 */ sw $t8, 0x00B4($sp) -/* 010C8 80AA4BC8 ADE00004 */ sw $zero, 0x0004($t7) ## 00000004 -/* 010CC 80AA4BCC ADED0000 */ sw $t5, 0x0000($t7) ## 00000000 -/* 010D0 80AA4BD0 8FB900B4 */ lw $t9, 0x00B4($sp) -/* 010D4 80AA4BD4 3C0F0708 */ lui $t7, 0x0708 ## $t7 = 07080000 -/* 010D8 80AA4BD8 000B5A40 */ sll $t3, $t3, 9 -/* 010DC 80AA4BDC 272E0008 */ addiu $t6, $t9, 0x0008 ## $t6 = 00000010 -/* 010E0 80AA4BE0 AFAE00B4 */ sw $t6, 0x00B4($sp) -/* 010E4 80AA4BE4 01615825 */ or $t3, $t3, $at ## $t3 = F5180007 -/* 010E8 80AA4BE8 35EF0200 */ ori $t7, $t7, 0x0200 ## $t7 = 07080200 -/* 010EC 80AA4BEC AF2F0004 */ sw $t7, 0x0004($t9) ## 0000000C -/* 010F0 80AA4BF0 AF2B0000 */ sw $t3, 0x0000($t9) ## 00000008 -/* 010F4 80AA4BF4 8FB800B4 */ lw $t8, 0x00B4($sp) -/* 010F8 80AA4BF8 2483FFFF */ addiu $v1, $a0, 0xFFFF ## $v1 = FFFFFFFF -/* 010FC 80AA4BFC 3C01FD18 */ lui $at, 0xFD18 ## $at = FD180000 -/* 01100 80AA4C00 27190008 */ addiu $t9, $t8, 0x0008 ## $t9 = 00000010 -/* 01104 80AA4C04 AFB900B4 */ sw $t9, 0x00B4($sp) -/* 01108 80AA4C08 AF000004 */ sw $zero, 0x0004($t8) ## 0000000C -/* 0110C 80AA4C0C AF0D0000 */ sw $t5, 0x0000($t8) ## 00000008 -/* 01110 80AA4C10 8FAE00B4 */ lw $t6, 0x00B4($sp) -/* 01114 80AA4C14 3C180008 */ lui $t8, 0x0008 ## $t8 = 00080000 -/* 01118 80AA4C18 37180200 */ ori $t8, $t8, 0x0200 ## $t8 = 00080200 -/* 0111C 80AA4C1C 25CF0008 */ addiu $t7, $t6, 0x0008 ## $t7 = 00000018 -/* 01120 80AA4C20 AFAF00B4 */ sw $t7, 0x00B4($sp) -/* 01124 80AA4C24 ADD80004 */ sw $t8, 0x0004($t6) ## 00000014 -/* 01128 80AA4C28 ADCB0000 */ sw $t3, 0x0000($t6) ## 00000010 -/* 0112C 80AA4C2C 8FA200B4 */ lw $v0, 0x00B4($sp) -/* 01130 80AA4C30 AFBF00AC */ sw $ra, 0x00AC($sp) -/* 01134 80AA4C34 0003F880 */ sll $ra, $v1, 2 -/* 01138 80AA4C38 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 0113C 80AA4C3C AFAE00B4 */ sw $t6, 0x00B4($sp) -/* 01140 80AA4C40 24B8FFFF */ addiu $t8, $a1, 0xFFFF ## $t8 = FFFFFFFF -/* 01144 80AA4C44 0018C880 */ sll $t9, $t8, 2 -/* 01148 80AA4C48 33FF0FFF */ andi $ra, $ra, 0x0FFF ## $ra = 00000001 -/* 0114C 80AA4C4C AFA70040 */ sw $a3, 0x0040($sp) -/* 01150 80AA4C50 3C0FF200 */ lui $t7, 0xF200 ## $t7 = F2000000 -/* 01154 80AA4C54 001FFB00 */ sll $ra, $ra, 12 -/* 01158 80AA4C58 332E0FFF */ andi $t6, $t9, 0x0FFF ## $t6 = 00000010 -/* 0115C 80AA4C5C AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 01160 80AA4C60 03EE7825 */ or $t7, $ra, $t6 ## $t7 = 00000011 -/* 01164 80AA4C64 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 01168 80AA4C68 8FB800AC */ lw $t8, 0x00AC($sp) -/* 0116C 80AA4C6C 00CC2823 */ subu $a1, $a2, $t4 -/* 01170 80AA4C70 87B900BE */ lh $t9, 0x00BE($sp) -/* 01174 80AA4C74 1B000089 */ blez $t8, .L80AA4E9C -/* 01178 80AA4C78 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0117C 80AA4C7C 306F0FFF */ andi $t7, $v1, 0x0FFF ## $t7 = 00000FFF -/* 01180 80AA4C80 01E1C025 */ or $t8, $t7, $at ## $t8 = FD180FFF -/* 01184 80AA4C84 00047042 */ srl $t6, $a0, 1 -/* 01188 80AA4C88 032E1023 */ subu $v0, $t9, $t6 -/* 0118C 80AA4C8C 00827021 */ addu $t6, $a0, $v0 -/* 01190 80AA4C90 3C010700 */ lui $at, 0x0700 ## $at = 07000000 -/* 01194 80AA4C94 03E1C825 */ or $t9, $ra, $at ## $t9 = 07000001 -/* 01198 80AA4C98 000E7880 */ sll $t7, $t6, 2 -/* 0119C 80AA4C9C AFB80028 */ sw $t8, 0x0028($sp) -/* 011A0 80AA4CA0 31F80FFF */ andi $t8, $t7, 0x0FFF ## $t8 = 00000FFF -/* 011A4 80AA4CA4 AFB90024 */ sw $t9, 0x0024($sp) -/* 011A8 80AA4CA8 0018CB00 */ sll $t9, $t8, 12 -/* 011AC 80AA4CAC 00027880 */ sll $t7, $v0, 2 -/* 011B0 80AA4CB0 3C01E400 */ lui $at, 0xE400 ## $at = E4000000 -/* 011B4 80AA4CB4 03217025 */ or $t6, $t9, $at ## $t6 = E7000001 -/* 011B8 80AA4CB8 31F80FFF */ andi $t8, $t7, 0x0FFF ## $t8 = 00000FFF -/* 011BC 80AA4CBC 2526FFFF */ addiu $a2, $t1, 0xFFFF ## $a2 = FFFFFFFF -/* 011C0 80AA4CC0 00063080 */ sll $a2, $a2, 2 -/* 011C4 80AA4CC4 0018CB00 */ sll $t9, $t8, 12 -/* 011C8 80AA4CC8 AFB9001C */ sw $t9, 0x001C($sp) -/* 011CC 80AA4CCC 30C60FFF */ andi $a2, $a2, 0x0FFF ## $a2 = 00000FFF -/* 011D0 80AA4CD0 AFAE0020 */ sw $t6, 0x0020($sp) -/* 011D4 80AA4CD4 8FAF00B4 */ lw $t7, 0x00B4($sp) -.L80AA4CD8: -/* 011D8 80AA4CD8 8FAE0024 */ lw $t6, 0x0024($sp) -/* 011DC 80AA4CDC 8FB90028 */ lw $t9, 0x0028($sp) -/* 011E0 80AA4CE0 25F80008 */ addiu $t8, $t7, 0x0008 ## $t8 = 00001007 -/* 011E4 80AA4CE4 AFB800B4 */ sw $t8, 0x00B4($sp) -/* 011E8 80AA4CE8 ADEA0004 */ sw $t2, 0x0004($t7) ## 00001003 -/* 011EC 80AA4CEC 01C61825 */ or $v1, $t6, $a2 ## $v1 = E7000FFF -/* 011F0 80AA4CF0 ADF90000 */ sw $t9, 0x0000($t7) ## 00000FFF -/* 011F4 80AA4CF4 8FAE00B4 */ lw $t6, 0x00B4($sp) -/* 011F8 80AA4CF8 3C18E600 */ lui $t8, 0xE600 ## $t8 = E6000000 -/* 011FC 80AA4CFC 00AC2023 */ subu $a0, $a1, $t4 -/* 01200 80AA4D00 25CF0008 */ addiu $t7, $t6, 0x0008 ## $t7 = E7000009 -/* 01204 80AA4D04 AFAF00B4 */ sw $t7, 0x00B4($sp) -/* 01208 80AA4D08 ADC00004 */ sw $zero, 0x0004($t6) ## E7000005 -/* 0120C 80AA4D0C ADD80000 */ sw $t8, 0x0000($t6) ## E7000001 -/* 01210 80AA4D10 8FB900B4 */ lw $t9, 0x00B4($sp) -/* 01214 80AA4D14 3C0FF400 */ lui $t7, 0xF400 ## $t7 = F4000000 -/* 01218 80AA4D18 014C5021 */ addu $t2, $t2, $t4 -/* 0121C 80AA4D1C 272E0008 */ addiu $t6, $t9, 0x0008 ## $t6 = 07000009 -/* 01220 80AA4D20 AFAE00B4 */ sw $t6, 0x00B4($sp) -/* 01224 80AA4D24 AF230004 */ sw $v1, 0x0004($t9) ## 07000005 -/* 01228 80AA4D28 AF2F0000 */ sw $t7, 0x0000($t9) ## 07000001 -/* 0122C 80AA4D2C 8FB800B4 */ lw $t8, 0x00B4($sp) -/* 01230 80AA4D30 8FAE0020 */ lw $t6, 0x0020($sp) -/* 01234 80AA4D34 01091821 */ addu $v1, $t0, $t1 -/* 01238 80AA4D38 27190008 */ addiu $t9, $t8, 0x0008 ## $t9 = E6000008 -/* 0123C 80AA4D3C 00037880 */ sll $t7, $v1, 2 -/* 01240 80AA4D40 03001025 */ or $v0, $t8, $zero ## $v0 = E6000000 -/* 01244 80AA4D44 31F80FFF */ andi $t8, $t7, 0x0FFF ## $t8 = 00000000 -/* 01248 80AA4D48 AFB900B4 */ sw $t9, 0x00B4($sp) -/* 0124C 80AA4D4C 01D8C825 */ or $t9, $t6, $t8 ## $t9 = 07000009 -/* 01250 80AA4D50 AC590000 */ sw $t9, 0x0000($v0) ## E6000000 -/* 01254 80AA4D54 8FAF001C */ lw $t7, 0x001C($sp) -/* 01258 80AA4D58 00087080 */ sll $t6, $t0, 2 -/* 0125C 80AA4D5C 31D80FFF */ andi $t8, $t6, 0x0FFF ## $t8 = 00000009 -/* 01260 80AA4D60 01F8C825 */ or $t9, $t7, $t8 ## $t9 = F4000009 -/* 01264 80AA4D64 AC590004 */ sw $t9, 0x0004($v0) ## E6000004 -/* 01268 80AA4D68 8FAE00B4 */ lw $t6, 0x00B4($sp) -/* 0126C 80AA4D6C 3C18E100 */ lui $t8, 0xE100 ## $t8 = E1000000 -/* 01270 80AA4D70 00604025 */ or $t0, $v1, $zero ## $t0 = E7000FFF -/* 01274 80AA4D74 25CF0008 */ addiu $t7, $t6, 0x0008 ## $t7 = 07000011 -/* 01278 80AA4D78 AFAF00B4 */ sw $t7, 0x00B4($sp) -/* 0127C 80AA4D7C ADC00004 */ sw $zero, 0x0004($t6) ## 0700000D -/* 01280 80AA4D80 ADD80000 */ sw $t8, 0x0000($t6) ## 07000009 -/* 01284 80AA4D84 8FA200B4 */ lw $v0, 0x00B4($sp) -/* 01288 80AA4D88 3C180400 */ lui $t8, 0x0400 ## $t8 = 04000000 -/* 0128C 80AA4D8C 37180400 */ ori $t8, $t8, 0x0400 ## $t8 = 04000400 -/* 01290 80AA4D90 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = E6000008 -/* 01294 80AA4D94 AFAE00B4 */ sw $t6, 0x00B4($sp) -/* 01298 80AA4D98 3C0FF100 */ lui $t7, 0xF100 ## $t7 = F1000000 -/* 0129C 80AA4D9C AC4F0000 */ sw $t7, 0x0000($v0) ## E6000000 -/* 012A0 80AA4DA0 04810039 */ bgez $a0, .L80AA4E88 -/* 012A4 80AA4DA4 AC580004 */ sw $t8, 0x0004($v0) ## E6000004 -/* 012A8 80AA4DA8 18A00038 */ blez $a1, .L80AA4E8C -/* 012AC 80AA4DAC 8FB90040 */ lw $t9, 0x0040($sp) -/* 012B0 80AA4DB0 00B9001A */ div $zero, $a1, $t9 -/* 012B4 80AA4DB4 8FAE00B4 */ lw $t6, 0x00B4($sp) -/* 012B8 80AA4DB8 3C18E700 */ lui $t8, 0xE700 ## $t8 = E7000000 -/* 012BC 80AA4DBC 17200002 */ bne $t9, $zero, .L80AA4DC8 -/* 012C0 80AA4DC0 00000000 */ nop -/* 012C4 80AA4DC4 0007000D */ break 7 -.L80AA4DC8: -/* 012C8 80AA4DC8 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 012CC 80AA4DCC 17210004 */ bne $t9, $at, .L80AA4DE0 -/* 012D0 80AA4DD0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 012D4 80AA4DD4 14A10002 */ bne $a1, $at, .L80AA4DE0 -/* 012D8 80AA4DD8 00000000 */ nop -/* 012DC 80AA4DDC 0006000D */ break 6 -.L80AA4DE0: -/* 012E0 80AA4DE0 25CF0008 */ addiu $t7, $t6, 0x0008 ## $t7 = E6000010 -/* 012E4 80AA4DE4 AFAF00B4 */ sw $t7, 0x00B4($sp) -/* 012E8 80AA4DE8 ADC00004 */ sw $zero, 0x0004($t6) ## E600000C -/* 012EC 80AA4DEC ADD80000 */ sw $t8, 0x0000($t6) ## E6000008 -/* 012F0 80AA4DF0 8FB900B4 */ lw $t9, 0x00B4($sp) -/* 012F4 80AA4DF4 00004812 */ mflo $t1 -/* 012F8 80AA4DF8 2526FFFF */ addiu $a2, $t1, 0xFFFF ## $a2 = FFFFFFFF -/* 012FC 80AA4DFC 272E0008 */ addiu $t6, $t9, 0x0008 ## $t6 = F4000011 -/* 01300 80AA4E00 AFAE00B4 */ sw $t6, 0x00B4($sp) -/* 01304 80AA4E04 AF200004 */ sw $zero, 0x0004($t9) ## F400000D -/* 01308 80AA4E08 AF2D0000 */ sw $t5, 0x0000($t9) ## F4000009 -/* 0130C 80AA4E0C 8FAF00B4 */ lw $t7, 0x00B4($sp) -/* 01310 80AA4E10 3C190708 */ lui $t9, 0x0708 ## $t9 = 07080000 -/* 01314 80AA4E14 37390200 */ ori $t9, $t9, 0x0200 ## $t9 = 07080200 -/* 01318 80AA4E18 25F80008 */ addiu $t8, $t7, 0x0008 ## $t8 = E6000018 -/* 0131C 80AA4E1C AFB800B4 */ sw $t8, 0x00B4($sp) -/* 01320 80AA4E20 ADF90004 */ sw $t9, 0x0004($t7) ## E6000014 -/* 01324 80AA4E24 ADEB0000 */ sw $t3, 0x0000($t7) ## E6000010 -/* 01328 80AA4E28 8FAE00B4 */ lw $t6, 0x00B4($sp) -/* 0132C 80AA4E2C 00063080 */ sll $a2, $a2, 2 -/* 01330 80AA4E30 30C60FFF */ andi $a2, $a2, 0x0FFF ## $a2 = 00000FFF -/* 01334 80AA4E34 25CF0008 */ addiu $t7, $t6, 0x0008 ## $t7 = F4000019 -/* 01338 80AA4E38 AFAF00B4 */ sw $t7, 0x00B4($sp) -/* 0133C 80AA4E3C ADC00004 */ sw $zero, 0x0004($t6) ## F4000015 -/* 01340 80AA4E40 ADCD0000 */ sw $t5, 0x0000($t6) ## F4000011 -/* 01344 80AA4E44 8FB800B4 */ lw $t8, 0x00B4($sp) -/* 01348 80AA4E48 3C0E0008 */ lui $t6, 0x0008 ## $t6 = 00080000 -/* 0134C 80AA4E4C 35CE0200 */ ori $t6, $t6, 0x0200 ## $t6 = 00080200 -/* 01350 80AA4E50 27190008 */ addiu $t9, $t8, 0x0008 ## $t9 = E6000020 -/* 01354 80AA4E54 AFB900B4 */ sw $t9, 0x00B4($sp) -/* 01358 80AA4E58 AF0E0004 */ sw $t6, 0x0004($t8) ## E600001C -/* 0135C 80AA4E5C AF0B0000 */ sw $t3, 0x0000($t8) ## E6000018 -/* 01360 80AA4E60 8FAF00B4 */ lw $t7, 0x00B4($sp) -/* 01364 80AA4E64 03E67025 */ or $t6, $ra, $a2 ## $t6 = 00000FFF -/* 01368 80AA4E68 3C19F200 */ lui $t9, 0xF200 ## $t9 = F2000000 -/* 0136C 80AA4E6C 25F80008 */ addiu $t8, $t7, 0x0008 ## $t8 = F4000021 -/* 01370 80AA4E70 AFB800B4 */ sw $t8, 0x00B4($sp) -/* 01374 80AA4E74 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 01378 80AA4E78 ADEE0004 */ sw $t6, 0x0004($t7) ## F400001D -/* 0137C 80AA4E7C ADF90000 */ sw $t9, 0x0000($t7) ## F4000019 -/* 01380 80AA4E80 10000002 */ beq $zero, $zero, .L80AA4E8C -/* 01384 80AA4E84 01E01025 */ or $v0, $t7, $zero ## $v0 = F4000019 -.L80AA4E88: -/* 01388 80AA4E88 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -.L80AA4E8C: -/* 0138C 80AA4E8C 8FAF00AC */ lw $t7, 0x00AC($sp) -/* 01390 80AA4E90 24E70001 */ addiu $a3, $a3, 0x0001 ## $a3 = 00000001 -/* 01394 80AA4E94 54EFFF90 */ bnel $a3, $t7, .L80AA4CD8 -/* 01398 80AA4E98 8FAF00B4 */ lw $t7, 0x00B4($sp) -.L80AA4E9C: -/* 0139C 80AA4E9C 8FB800B4 */ lw $t8, 0x00B4($sp) -/* 013A0 80AA4EA0 8FB900B8 */ lw $t9, 0x00B8($sp) -/* 013A4 80AA4EA4 AF380000 */ sw $t8, 0x0000($t9) ## F2000000 -/* 013A8 80AA4EA8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 013AC 80AA4EAC 27BD00B8 */ addiu $sp, $sp, 0x00B8 ## $sp = 00000000 -/* 013B0 80AA4EB0 03E00008 */ jr $ra -/* 013B4 80AA4EB4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mag/func_80AA4EB8.s b/asm/non_matchings/overlays/actors/ovl_En_Mag/func_80AA4EB8.s deleted file mode 100644 index edc13bffbd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Mag/func_80AA4EB8.s +++ /dev/null @@ -1,114 +0,0 @@ -glabel func_80AA4EB8 -/* 013B8 80AA4EB8 3C038016 */ lui $v1, %hi(gGameInfo) -/* 013BC 80AA4EBC 2463FA90 */ addiu $v1, %lo(gGameInfo) -/* 013C0 80AA4EC0 8C680000 */ lw $t0, 0x0000($v1) ## 8015FA90 -/* 013C4 80AA4EC4 AFA50004 */ sw $a1, 0x0004($sp) -/* 013C8 80AA4EC8 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 013CC 80AA4ECC 850E0496 */ lh $t6, 0x0496($t0) ## 00000496 -/* 013D0 80AA4ED0 44810000 */ mtc1 $at, $f0 ## $f0 = 100.00 -/* 013D4 80AA4ED4 3C014480 */ lui $at, 0x4480 ## $at = 44800000 -/* 013D8 80AA4ED8 448E3000 */ mtc1 $t6, $f6 ## $f6 = 0.00 -/* 013DC 80AA4EDC 44812000 */ mtc1 $at, $f4 ## $f4 = 1024.00 -/* 013E0 80AA4EE0 8C850000 */ lw $a1, 0x0000($a0) ## 00000000 -/* 013E4 80AA4EE4 46803220 */ cvt.s.w $f8, $f6 -/* 013E8 80AA4EE8 3C014180 */ lui $at, 0x4180 ## $at = 41800000 -/* 013EC 80AA4EEC 3C0BFD90 */ lui $t3, 0xFD90 ## $t3 = FD900000 -/* 013F0 80AA4EF0 24A20008 */ addiu $v0, $a1, 0x0008 ## $v0 = 00000008 -/* 013F4 80AA4EF4 3C0E0708 */ lui $t6, 0x0708 ## $t6 = 07080000 -/* 013F8 80AA4EF8 35CE0200 */ ori $t6, $t6, 0x0200 ## $t6 = 07080200 -/* 013FC 80AA4EFC 46004283 */ div.s $f10, $f8, $f0 -/* 01400 80AA4F00 3C0DF590 */ lui $t5, 0xF590 ## $t5 = F5900000 -/* 01404 80AA4F04 3C0FE600 */ lui $t7, 0xE600 ## $t7 = E6000000 -/* 01408 80AA4F08 3C09E700 */ lui $t1, 0xE700 ## $t1 = E7000000 -/* 0140C 80AA4F0C 460A2403 */ div.s $f16, $f4, $f10 -/* 01410 80AA4F10 44815000 */ mtc1 $at, $f10 ## $f10 = 16.00 -/* 01414 80AA4F14 3C01E400 */ lui $at, 0xE400 ## $at = E4000000 -/* 01418 80AA4F18 4600848D */ trunc.w.s $f18, $f16 -/* 0141C 80AA4F1C 44189000 */ mfc1 $t8, $f18 -/* 01420 80AA4F20 00000000 */ nop -/* 01424 80AA4F24 A5180494 */ sh $t8, 0x0494($t0) ## 00000494 -/* 01428 80AA4F28 8C680000 */ lw $t0, 0x0000($v1) ## 8015FA90 -/* 0142C 80AA4F2C 3C18F300 */ lui $t8, 0xF300 ## $t8 = F3000000 -/* 01430 80AA4F30 85190496 */ lh $t9, 0x0496($t0) ## 00000496 -/* 01434 80AA4F34 44993000 */ mtc1 $t9, $f6 ## $f6 = 0.00 -/* 01438 80AA4F38 3C190703 */ lui $t9, 0x0703 ## $t9 = 07030000 -/* 0143C 80AA4F3C 3739F800 */ ori $t9, $t9, 0xF800 ## $t9 = 0703F800 -/* 01440 80AA4F40 46803220 */ cvt.s.w $f8, $f6 -/* 01444 80AA4F44 46004103 */ div.s $f4, $f8, $f0 -/* 01448 80AA4F48 460A2402 */ mul.s $f16, $f4, $f10 -/* 0144C 80AA4F4C 4600848D */ trunc.w.s $f18, $f16 -/* 01450 80AA4F50 440A9000 */ mfc1 $t2, $f18 -/* 01454 80AA4F54 00000000 */ nop -/* 01458 80AA4F58 A50A0498 */ sh $t2, 0x0498($t0) ## 00000498 -/* 0145C 80AA4F5C ACAB0000 */ sw $t3, 0x0000($a1) ## 00000000 -/* 01460 80AA4F60 8FAC0004 */ lw $t4, 0x0004($sp) -/* 01464 80AA4F64 3C0B0008 */ lui $t3, 0x0008 ## $t3 = 00080000 -/* 01468 80AA4F68 3C0AF580 */ lui $t2, 0xF580 ## $t2 = F5800000 -/* 0146C 80AA4F6C ACAC0004 */ sw $t4, 0x0004($a1) ## 00000004 -/* 01470 80AA4F70 00402825 */ or $a1, $v0, $zero ## $a1 = 00000008 -/* 01474 80AA4F74 ACAD0000 */ sw $t5, 0x0000($a1) ## 00000008 -/* 01478 80AA4F78 ACAE0004 */ sw $t6, 0x0004($a1) ## 0000000C -/* 0147C 80AA4F7C 24420008 */ addiu $v0, $v0, 0x0008 ## $v0 = 00000010 -/* 01480 80AA4F80 00402825 */ or $a1, $v0, $zero ## $a1 = 00000010 -/* 01484 80AA4F84 ACAF0000 */ sw $t7, 0x0000($a1) ## 00000010 -/* 01488 80AA4F88 ACA00004 */ sw $zero, 0x0004($a1) ## 00000014 -/* 0148C 80AA4F8C 24420008 */ addiu $v0, $v0, 0x0008 ## $v0 = 00000018 -/* 01490 80AA4F90 00402825 */ or $a1, $v0, $zero ## $a1 = 00000018 -/* 01494 80AA4F94 ACB80000 */ sw $t8, 0x0000($a1) ## 00000018 -/* 01498 80AA4F98 ACB90004 */ sw $t9, 0x0004($a1) ## 0000001C -/* 0149C 80AA4F9C 24420008 */ addiu $v0, $v0, 0x0008 ## $v0 = 00000020 -/* 014A0 80AA4FA0 00402825 */ or $a1, $v0, $zero ## $a1 = 00000020 -/* 014A4 80AA4FA4 ACA90000 */ sw $t1, 0x0000($a1) ## 00000020 -/* 014A8 80AA4FA8 ACA00004 */ sw $zero, 0x0004($a1) ## 00000024 -/* 014AC 80AA4FAC 24420008 */ addiu $v0, $v0, 0x0008 ## $v0 = 00000028 -/* 014B0 80AA4FB0 00402825 */ or $a1, $v0, $zero ## $a1 = 00000028 -/* 014B4 80AA4FB4 354A0200 */ ori $t2, $t2, 0x0200 ## $t2 = F5800200 -/* 014B8 80AA4FB8 356B0200 */ ori $t3, $t3, 0x0200 ## $t3 = 00080200 -/* 014BC 80AA4FBC ACAB0004 */ sw $t3, 0x0004($a1) ## 0000002C -/* 014C0 80AA4FC0 ACAA0000 */ sw $t2, 0x0000($a1) ## 00000028 -/* 014C4 80AA4FC4 24420008 */ addiu $v0, $v0, 0x0008 ## $v0 = 00000030 -/* 014C8 80AA4FC8 00402825 */ or $a1, $v0, $zero ## $a1 = 00000030 -/* 014CC 80AA4FCC 3C0D0003 */ lui $t5, 0x0003 ## $t5 = 00030000 -/* 014D0 80AA4FD0 35ADC03C */ ori $t5, $t5, 0xC03C ## $t5 = 0003C03C -/* 014D4 80AA4FD4 3C0CF200 */ lui $t4, 0xF200 ## $t4 = F2000000 -/* 014D8 80AA4FD8 ACAC0000 */ sw $t4, 0x0000($a1) ## 00000030 -/* 014DC 80AA4FDC ACAD0004 */ sw $t5, 0x0004($a1) ## 00000034 -/* 014E0 80AA4FE0 8C6E0000 */ lw $t6, 0x0000($v1) ## 8015FA90 -/* 014E4 80AA4FE4 24420008 */ addiu $v0, $v0, 0x0008 ## $v0 = 00000038 -/* 014E8 80AA4FE8 00402825 */ or $a1, $v0, $zero ## $a1 = 00000038 -/* 014EC 80AA4FEC 85C80498 */ lh $t0, 0x0498($t6) ## 07080698 -/* 014F0 80AA4FF0 24420008 */ addiu $v0, $v0, 0x0008 ## $v0 = 00000040 -/* 014F4 80AA4FF4 01077821 */ addu $t7, $t0, $a3 -/* 014F8 80AA4FF8 000FC080 */ sll $t8, $t7, 2 -/* 014FC 80AA4FFC 00C85021 */ addu $t2, $a2, $t0 -/* 01500 80AA5000 000A5880 */ sll $t3, $t2, 2 -/* 01504 80AA5004 33190FFF */ andi $t9, $t8, 0x0FFF ## $t9 = 00000000 -/* 01508 80AA5008 316C0FFF */ andi $t4, $t3, 0x0FFF ## $t4 = 00000200 -/* 0150C 80AA500C 00067880 */ sll $t7, $a2, 2 -/* 01510 80AA5010 31F80FFF */ andi $t8, $t7, 0x0FFF ## $t8 = 00000000 -/* 01514 80AA5014 000C6B00 */ sll $t5, $t4, 12 -/* 01518 80AA5018 03214825 */ or $t1, $t9, $at ## $t1 = E4000000 -/* 0151C 80AA501C 00075080 */ sll $t2, $a3, 2 -/* 01520 80AA5020 314B0FFF */ andi $t3, $t2, 0x0FFF ## $t3 = 00000200 -/* 01524 80AA5024 0018CB00 */ sll $t9, $t8, 12 -/* 01528 80AA5028 032B6025 */ or $t4, $t9, $t3 ## $t4 = 00000200 -/* 0152C 80AA502C 012D7025 */ or $t6, $t1, $t5 ## $t6 = E403C03C -/* 01530 80AA5030 ACAE0000 */ sw $t6, 0x0000($a1) ## 00000038 -/* 01534 80AA5034 ACAC0004 */ sw $t4, 0x0004($a1) ## 0000003C -/* 01538 80AA5038 00402825 */ or $a1, $v0, $zero ## $a1 = 00000040 -/* 0153C 80AA503C 3C09E100 */ lui $t1, 0xE100 ## $t1 = E1000000 -/* 01540 80AA5040 ACA90000 */ sw $t1, 0x0000($a1) ## 00000040 -/* 01544 80AA5044 ACA00004 */ sw $zero, 0x0004($a1) ## 00000044 -/* 01548 80AA5048 24420008 */ addiu $v0, $v0, 0x0008 ## $v0 = 00000048 -/* 0154C 80AA504C 00402825 */ or $a1, $v0, $zero ## $a1 = 00000048 -/* 01550 80AA5050 3C0DF100 */ lui $t5, 0xF100 ## $t5 = F1000000 -/* 01554 80AA5054 ACAD0000 */ sw $t5, 0x0000($a1) ## 00000048 -/* 01558 80AA5058 8C6E0000 */ lw $t6, 0x0000($v1) ## 8015FA90 -/* 0155C 80AA505C 24420008 */ addiu $v0, $v0, 0x0008 ## $v0 = 00000050 -/* 01560 80AA5060 85C60494 */ lh $a2, 0x0494($t6) ## E403C4D0 -/* 01564 80AA5064 30C6FFFF */ andi $a2, $a2, 0xFFFF ## $a2 = 00000000 -/* 01568 80AA5068 00067C00 */ sll $t7, $a2, 16 -/* 0156C 80AA506C 00CFC025 */ or $t8, $a2, $t7 ## $t8 = E6000000 -/* 01570 80AA5070 ACB80004 */ sw $t8, 0x0004($a1) ## 0000004C -/* 01574 80AA5074 03E00008 */ jr $ra -/* 01578 80AA5078 AC820000 */ sw $v0, 0x0000($a0) ## 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mag/func_80AA507C.s b/asm/non_matchings/overlays/actors/ovl_En_Mag/func_80AA507C.s deleted file mode 100644 index 587c5df1f7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Mag/func_80AA507C.s +++ /dev/null @@ -1,877 +0,0 @@ -glabel func_80AA507C -/* 0157C 80AA507C 27BDFEA8 */ addiu $sp, $sp, 0xFEA8 ## $sp = FFFFFEA8 -/* 01580 80AA5080 AFBF0074 */ sw $ra, 0x0074($sp) -/* 01584 80AA5084 AFBE0070 */ sw $s8, 0x0070($sp) -/* 01588 80AA5088 AFB7006C */ sw $s7, 0x006C($sp) -/* 0158C 80AA508C AFB60068 */ sw $s6, 0x0068($sp) -/* 01590 80AA5090 AFB50064 */ sw $s5, 0x0064($sp) -/* 01594 80AA5094 AFB40060 */ sw $s4, 0x0060($sp) -/* 01598 80AA5098 AFB3005C */ sw $s3, 0x005C($sp) -/* 0159C 80AA509C AFB20058 */ sw $s2, 0x0058($sp) -/* 015A0 80AA50A0 AFB10054 */ sw $s1, 0x0054($sp) -/* 015A4 80AA50A4 AFB00050 */ sw $s0, 0x0050($sp) -/* 015A8 80AA50A8 AFA40158 */ sw $a0, 0x0158($sp) -/* 015AC 80AA50AC AFA60160 */ sw $a2, 0x0160($sp) -/* 015B0 80AA50B0 8CCF0000 */ lw $t7, 0x0000($a2) ## 00000000 -/* 015B4 80AA50B4 3C08DB06 */ lui $t0, 0xDB06 ## $t0 = DB060000 -/* 015B8 80AA50B8 35080018 */ ori $t0, $t0, 0x0018 ## $t0 = DB060018 -/* 015BC 80AA50BC AFAF0148 */ sw $t7, 0x0148($sp) -/* 015C0 80AA50C0 25F90008 */ addiu $t9, $t7, 0x0008 ## $t9 = 00000008 -/* 015C4 80AA50C4 AFB90148 */ sw $t9, 0x0148($sp) -/* 015C8 80AA50C8 ADE80000 */ sw $t0, 0x0000($t7) ## 00000000 -/* 015CC 80AA50CC 8FA90158 */ lw $t1, 0x0158($sp) -/* 015D0 80AA50D0 3C0D0001 */ lui $t5, 0x0001 ## $t5 = 00010000 -/* 015D4 80AA50D4 27BE0148 */ addiu $s8, $sp, 0x0148 ## $s8 = FFFFFFF0 -/* 015D8 80AA50D8 812A001E */ lb $t2, 0x001E($t1) ## 0000001E -/* 015DC 80AA50DC 03C02025 */ or $a0, $s8, $zero ## $a0 = FFFFFFF0 -/* 015E0 80AA50E0 000A5900 */ sll $t3, $t2, 4 -/* 015E4 80AA50E4 016A5821 */ addu $t3, $t3, $t2 -/* 015E8 80AA50E8 000B5880 */ sll $t3, $t3, 2 -/* 015EC 80AA50EC 00AB6021 */ addu $t4, $a1, $t3 -/* 015F0 80AA50F0 01AC6821 */ addu $t5, $t5, $t4 -/* 015F4 80AA50F4 8DAD17B4 */ lw $t5, 0x17B4($t5) ## 000117B4 -/* 015F8 80AA50F8 0C02515F */ jal func_8009457C -/* 015FC 80AA50FC ADED0004 */ sw $t5, 0x0004($t7) ## 00000004 -/* 01600 80AA5100 8FA50158 */ lw $a1, 0x0158($sp) -/* 01604 80AA5104 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 01608 80AA5108 3C08E300 */ lui $t0, 0xE300 ## $t0 = E3000000 -/* 0160C 80AA510C 00A12021 */ addu $a0, $a1, $at -/* 01610 80AA5110 848E630E */ lh $t6, 0x630E($a0) ## 0000630E -/* 01614 80AA5114 24A17FFF */ addiu $at, $a1, 0x7FFF ## $at = 00007FFF -/* 01618 80AA5118 35080A01 */ ori $t0, $t0, 0x0A01 ## $t0 = E3000A01 -/* 0161C 80AA511C 25CFFFFE */ addiu $t7, $t6, 0xFFFE ## $t7 = FFFFFFFE -/* 01620 80AA5120 A42F630F */ sh $t7, 0x630F($at) ## 0000E30E -/* 01624 80AA5124 8FB80148 */ lw $t8, 0x0148($sp) -/* 01628 80AA5128 3C090010 */ lui $t1, 0x0010 ## $t1 = 00100000 -/* 0162C 80AA512C 3C0CE200 */ lui $t4, 0xE200 ## $t4 = E2000000 -/* 01630 80AA5130 27190008 */ addiu $t9, $t8, 0x0008 ## $t9 = 00000008 -/* 01634 80AA5134 AFB90148 */ sw $t9, 0x0148($sp) -/* 01638 80AA5138 AF090004 */ sw $t1, 0x0004($t8) ## 00000004 -/* 0163C 80AA513C AF080000 */ sw $t0, 0x0000($t8) ## 00000000 -/* 01640 80AA5140 8FAA0148 */ lw $t2, 0x0148($sp) -/* 01644 80AA5144 358C1E01 */ ori $t4, $t4, 0x1E01 ## $t4 = E2001E01 -/* 01648 80AA5148 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 0164C 80AA514C 254B0008 */ addiu $t3, $t2, 0x0008 ## $t3 = 00000008 -/* 01650 80AA5150 AFAB0148 */ sw $t3, 0x0148($sp) -/* 01654 80AA5154 AD4D0004 */ sw $t5, 0x0004($t2) ## 00000004 -/* 01658 80AA5158 AD4C0000 */ sw $t4, 0x0000($t2) ## 00000000 -/* 0165C 80AA515C 8FAE0148 */ lw $t6, 0x0148($sp) -/* 01660 80AA5160 3C18E200 */ lui $t8, 0xE200 ## $t8 = E2000000 -/* 01664 80AA5164 3C190C18 */ lui $t9, 0x0C18 ## $t9 = 0C180000 -/* 01668 80AA5168 25CF0008 */ addiu $t7, $t6, 0x0008 ## $t7 = 00000008 -/* 0166C 80AA516C AFAF0148 */ sw $t7, 0x0148($sp) -/* 01670 80AA5170 37394340 */ ori $t9, $t9, 0x4340 ## $t9 = 0C184340 -/* 01674 80AA5174 3718001C */ ori $t8, $t8, 0x001C ## $t8 = E200001C -/* 01678 80AA5178 ADD80000 */ sw $t8, 0x0000($t6) ## 00000000 -/* 0167C 80AA517C ADD90004 */ sw $t9, 0x0004($t6) ## 00000004 -/* 01680 80AA5180 8FA80148 */ lw $t0, 0x0148($sp) -/* 01684 80AA5184 3C0AFC27 */ lui $t2, 0xFC27 ## $t2 = FC270000 -/* 01688 80AA5188 3C0B350C */ lui $t3, 0x350C ## $t3 = 350C0000 -/* 0168C 80AA518C 25090008 */ addiu $t1, $t0, 0x0008 ## $t1 = E3000A09 -/* 01690 80AA5190 AFA90148 */ sw $t1, 0x0148($sp) -/* 01694 80AA5194 356BE37F */ ori $t3, $t3, 0xE37F ## $t3 = 350CE37F -/* 01698 80AA5198 354A2C60 */ ori $t2, $t2, 0x2C60 ## $t2 = FC272C60 -/* 0169C 80AA519C AD0A0000 */ sw $t2, 0x0000($t0) ## E3000A01 -/* 016A0 80AA51A0 AD0B0004 */ sw $t3, 0x0004($t0) ## E3000A05 -/* 016A4 80AA51A4 8FA20148 */ lw $v0, 0x0148($sp) -/* 016A8 80AA51A8 3C01FA00 */ lui $at, 0xFA00 ## $at = FA000000 -/* 016AC 80AA51AC 3C160602 */ lui $s6, 0x0602 ## $s6 = 06020000 -/* 016B0 80AA51B0 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 016B4 80AA51B4 AFAD0148 */ sw $t5, 0x0148($sp) -/* 016B8 80AA51B8 C48462E0 */ lwc1 $f4, 0x62E0($a0) ## 000062E0 -/* 016BC 80AA51BC 3C1580AA */ lui $s5, %hi(D_80AA5EE8) ## $s5 = 80AA0000 -/* 016C0 80AA51C0 26B55EE8 */ addiu $s5, $s5, %lo(D_80AA5EE8) ## $s5 = 80AA5EE8 -/* 016C4 80AA51C4 4600218D */ trunc.w.s $f6, $f4 -/* 016C8 80AA51C8 26D64800 */ addiu $s6, $s6, 0x4800 ## $s6 = 06024800 -/* 016CC 80AA51CC 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 -/* 016D0 80AA51D0 0000B825 */ or $s7, $zero, $zero ## $s7 = 00000000 -/* 016D4 80AA51D4 44193000 */ mfc1 $t9, $f6 -/* 016D8 80AA51D8 00000000 */ nop -/* 016DC 80AA51DC 332800FF */ andi $t0, $t9, 0x00FF ## $t0 = 00000040 -/* 016E0 80AA51E0 01014825 */ or $t1, $t0, $at ## $t1 = FA000040 -/* 016E4 80AA51E4 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 016E8 80AA51E8 C48862EC */ lwc1 $f8, 0x62EC($a0) ## 000062EC -/* 016EC 80AA51EC C48462E8 */ lwc1 $f4, 0x62E8($a0) ## 000062E8 -/* 016F0 80AA51F0 C49062E4 */ lwc1 $f16, 0x62E4($a0) ## 000062E4 -/* 016F4 80AA51F4 4600428D */ trunc.w.s $f10, $f8 -/* 016F8 80AA51F8 C48862FC */ lwc1 $f8, 0x62FC($a0) ## 000062FC -/* 016FC 80AA51FC 4600218D */ trunc.w.s $f6, $f4 -/* 01700 80AA5200 440D5000 */ mfc1 $t5, $f10 -/* 01704 80AA5204 4600848D */ trunc.w.s $f18, $f16 -/* 01708 80AA5208 44193000 */ mfc1 $t9, $f6 -/* 0170C 80AA520C 31AE00FF */ andi $t6, $t5, 0x00FF ## $t6 = 00000008 -/* 01710 80AA5210 4600428D */ trunc.w.s $f10, $f8 -/* 01714 80AA5214 440A9000 */ mfc1 $t2, $f18 -/* 01718 80AA5218 000E7A00 */ sll $t7, $t6, 8 -/* 0171C 80AA521C 332800FF */ andi $t0, $t9, 0x00FF ## $t0 = 00000040 -/* 01720 80AA5220 440E5000 */ mfc1 $t6, $f10 -/* 01724 80AA5224 000A5E00 */ sll $t3, $t2, 24 -/* 01728 80AA5228 01EB6025 */ or $t4, $t7, $t3 ## $t4 = 350CE37F -/* 0172C 80AA522C 00084C00 */ sll $t1, $t0, 16 -/* 01730 80AA5230 01895025 */ or $t2, $t4, $t1 ## $t2 = FF0CE37F -/* 01734 80AA5234 31D800FF */ andi $t8, $t6, 0x00FF ## $t8 = 00000008 -/* 01738 80AA5238 0158C825 */ or $t9, $t2, $t8 ## $t9 = FF0CE37F -/* 0173C 80AA523C AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 01740 80AA5240 8FA20148 */ lw $v0, 0x0148($sp) -/* 01744 80AA5244 3C09FB00 */ lui $t1, 0xFB00 ## $t1 = FB000000 -/* 01748 80AA5248 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 0174C 80AA524C AFAC0148 */ sw $t4, 0x0148($sp) -/* 01750 80AA5250 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 01754 80AA5254 C49062F8 */ lwc1 $f16, 0x62F8($a0) ## 000062F8 -/* 01758 80AA5258 C48862F4 */ lwc1 $f8, 0x62F4($a0) ## 000062F4 -/* 0175C 80AA525C C48462F0 */ lwc1 $f4, 0x62F0($a0) ## 000062F0 -/* 01760 80AA5260 4600848D */ trunc.w.s $f18, $f16 -/* 01764 80AA5264 4600428D */ trunc.w.s $f10, $f8 -/* 01768 80AA5268 440E9000 */ mfc1 $t6, $f18 -/* 0176C 80AA526C 4600218D */ trunc.w.s $f6, $f4 -/* 01770 80AA5270 44085000 */ mfc1 $t0, $f10 -/* 01774 80AA5274 31CA00FF */ andi $t2, $t6, 0x00FF ## $t2 = 00000008 -/* 01778 80AA5278 000AC200 */ sll $t8, $t2, 8 -/* 0177C 80AA527C 440F3000 */ mfc1 $t7, $f6 -/* 01780 80AA5280 310C00FF */ andi $t4, $t0, 0x00FF ## $t4 = 00000040 -/* 01784 80AA5284 000C4C00 */ sll $t1, $t4, 16 -/* 01788 80AA5288 000F5E00 */ sll $t3, $t7, 24 -/* 0178C 80AA528C 030B6825 */ or $t5, $t8, $t3 ## $t5 = 350CE37F -/* 01790 80AA5290 01A97825 */ or $t7, $t5, $t1 ## $t7 = FF0CE37F -/* 01794 80AA5294 35F800FF */ ori $t8, $t7, 0x00FF ## $t8 = FF0CE3FF -/* 01798 80AA5298 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 0179C 80AA529C C49062E0 */ lwc1 $f16, 0x62E0($a0) ## 000062E0 -/* 017A0 80AA52A0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 017A4 80AA52A4 4600848D */ trunc.w.s $f18, $f16 -/* 017A8 80AA52A8 440E9000 */ mfc1 $t6, $f18 -/* 017AC 80AA52AC 00000000 */ nop -/* 017B0 80AA52B0 000E5400 */ sll $t2, $t6, 16 -/* 017B4 80AA52B4 000ACC03 */ sra $t9, $t2, 16 -/* 017B8 80AA52B8 53200037 */ beql $t9, $zero, .L80AA5398 -/* 017BC 80AA52BC 8FAD0148 */ lw $t5, 0x0148($sp) -/* 017C0 80AA52C0 AFA40080 */ sw $a0, 0x0080($sp) -.L80AA52C4: -/* 017C4 80AA52C4 00029C00 */ sll $s3, $v0, 16 -/* 017C8 80AA52C8 00139C03 */ sra $s3, $s3, 16 -/* 017CC 80AA52CC 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 -/* 017D0 80AA52D0 24140038 */ addiu $s4, $zero, 0x0038 ## $s4 = 00000038 -/* 017D4 80AA52D4 AFA2008C */ sw $v0, 0x008C($sp) -.L80AA52D8: -/* 017D8 80AA52D8 00114080 */ sll $t0, $s1, 2 -/* 017DC 80AA52DC 02A86021 */ addu $t4, $s5, $t0 -/* 017E0 80AA52E0 8D850000 */ lw $a1, 0x0000($t4) ## 00000040 -/* 017E4 80AA52E4 8FAC0158 */ lw $t4, 0x0158($sp) -/* 017E8 80AA52E8 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 017EC 80AA52EC 240D0040 */ addiu $t5, $zero, 0x0040 ## $t5 = 00000040 -/* 017F0 80AA52F0 24090020 */ addiu $t1, $zero, 0x0020 ## $t1 = 00000020 -/* 017F4 80AA52F4 240F0020 */ addiu $t7, $zero, 0x0020 ## $t7 = 00000020 -/* 017F8 80AA52F8 24180040 */ addiu $t8, $zero, 0x0040 ## $t8 = 00000040 -/* 017FC 80AA52FC 240B0040 */ addiu $t3, $zero, 0x0040 ## $t3 = 00000040 -/* 01800 80AA5300 240E0400 */ addiu $t6, $zero, 0x0400 ## $t6 = 00000400 -/* 01804 80AA5304 240A0400 */ addiu $t2, $zero, 0x0400 ## $t2 = 00000400 -/* 01808 80AA5308 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 0180C 80AA530C AFB90034 */ sw $t9, 0x0034($sp) -/* 01810 80AA5310 AFAA0030 */ sw $t2, 0x0030($sp) -/* 01814 80AA5314 AFAE002C */ sw $t6, 0x002C($sp) -/* 01818 80AA5318 AFAB0028 */ sw $t3, 0x0028($sp) -/* 0181C 80AA531C AFB80024 */ sw $t8, 0x0024($sp) -/* 01820 80AA5320 AFAF0018 */ sw $t7, 0x0018($sp) -/* 01824 80AA5324 AFA90014 */ sw $t1, 0x0014($sp) -/* 01828 80AA5328 AFAD0010 */ sw $t5, 0x0010($sp) -/* 0182C 80AA532C AFA80038 */ sw $t0, 0x0038($sp) -/* 01830 80AA5330 AFB1003C */ sw $s1, 0x003C($sp) -/* 01834 80AA5334 AFB30020 */ sw $s3, 0x0020($sp) -/* 01838 80AA5338 AFB4001C */ sw $s4, 0x001C($sp) -/* 0183C 80AA533C 03C02025 */ or $a0, $s8, $zero ## $a0 = FFFFFFF0 -/* 01840 80AA5340 02C03025 */ or $a2, $s6, $zero ## $a2 = 06024800 -/* 01844 80AA5344 24070040 */ addiu $a3, $zero, 0x0040 ## $a3 = 00000040 -/* 01848 80AA5348 02809025 */ or $s2, $s4, $zero ## $s2 = 00000038 -/* 0184C 80AA534C 0C2A91A8 */ jal func_80AA46A0 -/* 01850 80AA5350 AFAC0040 */ sw $t4, 0x0040($sp) -/* 01854 80AA5354 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 01858 80AA5358 3210FFFF */ andi $s0, $s0, 0xFFFF ## $s0 = 00000001 -/* 0185C 80AA535C 2A010003 */ slti $at, $s0, 0x0003 -/* 01860 80AA5360 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 -/* 01864 80AA5364 26540040 */ addiu $s4, $s2, 0x0040 ## $s4 = 00000078 -/* 01868 80AA5368 3294FFFF */ andi $s4, $s4, 0xFFFF ## $s4 = 00000078 -/* 0186C 80AA536C 1420FFDA */ bne $at, $zero, .L80AA52D8 -/* 01870 80AA5370 3231FFFF */ andi $s1, $s1, 0xFFFF ## $s1 = 00000001 -/* 01874 80AA5374 8FA2008C */ lw $v0, 0x008C($sp) -/* 01878 80AA5378 26F70001 */ addiu $s7, $s7, 0x0001 ## $s7 = 00000001 -/* 0187C 80AA537C 32F7FFFF */ andi $s7, $s7, 0xFFFF ## $s7 = 00000001 -/* 01880 80AA5380 2AE10003 */ slti $at, $s7, 0x0003 -/* 01884 80AA5384 24420040 */ addiu $v0, $v0, 0x0040 ## $v0 = 00000040 -/* 01888 80AA5388 1420FFCE */ bne $at, $zero, .L80AA52C4 -/* 0188C 80AA538C 3042FFFF */ andi $v0, $v0, 0xFFFF ## $v0 = 00000040 -/* 01890 80AA5390 8FA40080 */ lw $a0, 0x0080($sp) -/* 01894 80AA5394 8FAD0148 */ lw $t5, 0x0148($sp) -.L80AA5398: -/* 01898 80AA5398 3C0FFA00 */ lui $t7, 0xFA00 ## $t7 = FA000000 -/* 0189C 80AA539C 2412FF00 */ addiu $s2, $zero, 0xFF00 ## $s2 = FFFFFF00 -/* 018A0 80AA53A0 25A90008 */ addiu $t1, $t5, 0x0008 ## $t1 = 00000008 -/* 018A4 80AA53A4 AFA90148 */ sw $t1, 0x0148($sp) -/* 018A8 80AA53A8 ADAF0000 */ sw $t7, 0x0000($t5) ## 00000000 -/* 018AC 80AA53AC C4846300 */ lwc1 $f4, 0x6300($a0) ## 00006300 -/* 018B0 80AA53B0 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 018B4 80AA53B4 24E70000 */ addiu $a3, $a3, 0x0000 ## $a3 = 06000000 -/* 018B8 80AA53B8 4600218D */ trunc.w.s $f6, $f4 -/* 018BC 80AA53BC 24050098 */ addiu $a1, $zero, 0x0098 ## $a1 = 00000098 -/* 018C0 80AA53C0 24060064 */ addiu $a2, $zero, 0x0064 ## $a2 = 00000064 -/* 018C4 80AA53C4 241800A0 */ addiu $t8, $zero, 0x00A0 ## $t8 = 000000A0 -/* 018C8 80AA53C8 440A3000 */ mfc1 $t2, $f6 -/* 018CC 80AA53CC 240B00A0 */ addiu $t3, $zero, 0x00A0 ## $t3 = 000000A0 -/* 018D0 80AA53D0 315900FF */ andi $t9, $t2, 0x00FF ## $t9 = 00000000 -/* 018D4 80AA53D4 03324025 */ or $t0, $t9, $s2 ## $t0 = FFFFFF00 -/* 018D8 80AA53D8 ADA80004 */ sw $t0, 0x0004($t5) ## 00000004 -/* 018DC 80AA53DC AFA40080 */ sw $a0, 0x0080($sp) -/* 018E0 80AA53E0 C4886300 */ lwc1 $f8, 0x6300($a0) ## 00006300 -/* 018E4 80AA53E4 03C02025 */ or $a0, $s8, $zero ## $a0 = FFFFFFF0 -/* 018E8 80AA53E8 4600428D */ trunc.w.s $f10, $f8 -/* 018EC 80AA53EC 440D5000 */ mfc1 $t5, $f10 -/* 018F0 80AA53F0 00000000 */ nop -/* 018F4 80AA53F4 000D4C00 */ sll $t1, $t5, 16 -/* 018F8 80AA53F8 00097C03 */ sra $t7, $t1, 16 -/* 018FC 80AA53FC 11E00004 */ beq $t7, $zero, .L80AA5410 -/* 01900 80AA5400 00000000 */ nop -/* 01904 80AA5404 AFB80010 */ sw $t8, 0x0010($sp) -/* 01908 80AA5408 0C2A92B5 */ jal func_80AA4AD4 -/* 0190C 80AA540C AFAB0014 */ sw $t3, 0x0014($sp) -.L80AA5410: -/* 01910 80AA5410 0C02515F */ jal func_8009457C -/* 01914 80AA5414 03C02025 */ or $a0, $s8, $zero ## $a0 = FFFFFFF0 -/* 01918 80AA5418 8FAE0148 */ lw $t6, 0x0148($sp) -/* 0191C 80AA541C 3C19E700 */ lui $t9, 0xE700 ## $t9 = E7000000 -/* 01920 80AA5420 3C0DE200 */ lui $t5, 0xE200 ## $t5 = E2000000 -/* 01924 80AA5424 25CA0008 */ addiu $t2, $t6, 0x0008 ## $t2 = 00000008 -/* 01928 80AA5428 AFAA0148 */ sw $t2, 0x0148($sp) -/* 0192C 80AA542C ADC00004 */ sw $zero, 0x0004($t6) ## 00000004 -/* 01930 80AA5430 ADD90000 */ sw $t9, 0x0000($t6) ## 00000000 -/* 01934 80AA5434 8FA80148 */ lw $t0, 0x0148($sp) -/* 01938 80AA5438 35AD1E01 */ ori $t5, $t5, 0x1E01 ## $t5 = E2001E01 -/* 0193C 80AA543C 3C18FC30 */ lui $t8, 0xFC30 ## $t8 = FC300000 -/* 01940 80AA5440 250C0008 */ addiu $t4, $t0, 0x0008 ## $t4 = 00000008 -/* 01944 80AA5444 AFAC0148 */ sw $t4, 0x0148($sp) -/* 01948 80AA5448 AD000004 */ sw $zero, 0x0004($t0) ## 00000004 -/* 0194C 80AA544C AD0D0000 */ sw $t5, 0x0000($t0) ## 00000000 -/* 01950 80AA5450 8FA90148 */ lw $t1, 0x0148($sp) -/* 01954 80AA5454 3C0B552E */ lui $t3, 0x552E ## $t3 = 552E0000 -/* 01958 80AA5458 356BFF7F */ ori $t3, $t3, 0xFF7F ## $t3 = 552EFF7F -/* 0195C 80AA545C 252F0008 */ addiu $t7, $t1, 0x0008 ## $t7 = 00000008 -/* 01960 80AA5460 AFAF0148 */ sw $t7, 0x0148($sp) -/* 01964 80AA5464 37189661 */ ori $t8, $t8, 0x9661 ## $t8 = FC309661 -/* 01968 80AA5468 AD380000 */ sw $t8, 0x0000($t1) ## 00000000 -/* 0196C 80AA546C AD2B0004 */ sw $t3, 0x0004($t1) ## 00000004 -/* 01970 80AA5470 8FA30080 */ lw $v1, 0x0080($sp) -/* 01974 80AA5474 8FAC0148 */ lw $t4, 0x0148($sp) -/* 01978 80AA5478 8FB80148 */ lw $t8, 0x0148($sp) -/* 0197C 80AA547C C4706300 */ lwc1 $f16, 0x6300($v1) ## 00006300 -/* 01980 80AA5480 3C09E200 */ lui $t1, 0xE200 ## $t1 = E2000000 -/* 01984 80AA5484 3C0EE200 */ lui $t6, 0xE200 ## $t6 = E2000000 -/* 01988 80AA5488 4600848D */ trunc.w.s $f18, $f16 -/* 0198C 80AA548C 3529001C */ ori $t1, $t1, 0x001C ## $t1 = E200001C -/* 01990 80AA5490 3C0F0050 */ lui $t7, 0x0050 ## $t7 = 00500000 -/* 01994 80AA5494 35CE001C */ ori $t6, $t6, 0x001C ## $t6 = E200001C -/* 01998 80AA5498 440A9000 */ mfc1 $t2, $f18 -/* 0199C 80AA549C 258D0008 */ addiu $t5, $t4, 0x0008 ## $t5 = 00000010 -/* 019A0 80AA54A0 270B0008 */ addiu $t3, $t8, 0x0008 ## $t3 = FC309669 -/* 019A4 80AA54A4 000ACC00 */ sll $t9, $t2, 16 -/* 019A8 80AA54A8 00194403 */ sra $t0, $t9, 16 -/* 019AC 80AA54AC 29010064 */ slti $at, $t0, 0x0064 -/* 019B0 80AA54B0 10200006 */ beq $at, $zero, .L80AA54CC -/* 019B4 80AA54B4 3C0A0050 */ lui $t2, 0x0050 ## $t2 = 00500000 -/* 019B8 80AA54B8 AFAD0148 */ sw $t5, 0x0148($sp) -/* 019BC 80AA54BC 35EF4340 */ ori $t7, $t7, 0x4340 ## $t7 = 00504340 -/* 019C0 80AA54C0 AD8F0004 */ sw $t7, 0x0004($t4) ## 0000000C -/* 019C4 80AA54C4 10000005 */ beq $zero, $zero, .L80AA54DC -/* 019C8 80AA54C8 AD890000 */ sw $t1, 0x0000($t4) ## 00000008 -.L80AA54CC: -/* 019CC 80AA54CC AFAB0148 */ sw $t3, 0x0148($sp) -/* 019D0 80AA54D0 354A4240 */ ori $t2, $t2, 0x4240 ## $t2 = 00504240 -/* 019D4 80AA54D4 AF0A0004 */ sw $t2, 0x0004($t8) ## FC309665 -/* 019D8 80AA54D8 AF0E0000 */ sw $t6, 0x0000($t8) ## FC309661 -.L80AA54DC: -/* 019DC 80AA54DC 8FB90148 */ lw $t9, 0x0148($sp) -/* 019E0 80AA54E0 3C0CFA00 */ lui $t4, 0xFA00 ## $t4 = FA000000 -/* 019E4 80AA54E4 3C100602 */ lui $s0, 0x0602 ## $s0 = 06020000 -/* 019E8 80AA54E8 27280008 */ addiu $t0, $t9, 0x0008 ## $t0 = E7000008 -/* 019EC 80AA54EC AFA80148 */ sw $t0, 0x0148($sp) -/* 019F0 80AA54F0 AF2C0000 */ sw $t4, 0x0000($t9) ## E7000000 -/* 019F4 80AA54F4 C4646300 */ lwc1 $f4, 0x6300($v1) ## 00006300 -/* 019F8 80AA54F8 240864FF */ addiu $t0, $zero, 0x64FF ## $t0 = 000064FF -/* 019FC 80AA54FC 26104C00 */ addiu $s0, $s0, 0x4C00 ## $s0 = 06024C00 -/* 01A00 80AA5500 4600218D */ trunc.w.s $f6, $f4 -/* 01A04 80AA5504 02002825 */ or $a1, $s0, $zero ## $a1 = 06024C00 -/* 01A08 80AA5508 03C02025 */ or $a0, $s8, $zero ## $a0 = FFFFFFF0 -/* 01A0C 80AA550C 24060048 */ addiu $a2, $zero, 0x0048 ## $a2 = 00000048 -/* 01A10 80AA5510 44183000 */ mfc1 $t8, $f6 -/* 01A14 80AA5514 24070008 */ addiu $a3, $zero, 0x0008 ## $a3 = 00000008 -/* 01A18 80AA5518 330B00FF */ andi $t3, $t8, 0x00FF ## $t3 = 00000061 -/* 01A1C 80AA551C AF2B0004 */ sw $t3, 0x0004($t9) ## E7000004 -/* 01A20 80AA5520 8FAE0148 */ lw $t6, 0x0148($sp) -/* 01A24 80AA5524 3C19FB00 */ lui $t9, 0xFB00 ## $t9 = FB000000 -/* 01A28 80AA5528 240B0049 */ addiu $t3, $zero, 0x0049 ## $t3 = 00000049 -/* 01A2C 80AA552C 25CA0008 */ addiu $t2, $t6, 0x0008 ## $t2 = E2000024 -/* 01A30 80AA5530 AFAA0148 */ sw $t2, 0x0148($sp) -/* 01A34 80AA5534 ADC80004 */ sw $t0, 0x0004($t6) ## E2000020 -/* 01A38 80AA5538 ADD90000 */ sw $t9, 0x0000($t6) ## E200001C -/* 01A3C 80AA553C C4686300 */ lwc1 $f8, 0x6300($v1) ## 00006300 -/* 01A40 80AA5540 24190400 */ addiu $t9, $zero, 0x0400 ## $t9 = 00000400 -/* 01A44 80AA5544 240E0048 */ addiu $t6, $zero, 0x0048 ## $t6 = 00000048 -/* 01A48 80AA5548 4600428D */ trunc.w.s $f10, $f8 -/* 01A4C 80AA554C 24080400 */ addiu $t0, $zero, 0x0400 ## $t0 = 00000400 -/* 01A50 80AA5550 240A0008 */ addiu $t2, $zero, 0x0008 ## $t2 = 00000008 -/* 01A54 80AA5554 24180092 */ addiu $t8, $zero, 0x0092 ## $t8 = 00000092 -/* 01A58 80AA5558 440D5000 */ mfc1 $t5, $f10 -/* 01A5C 80AA555C 00000000 */ nop -/* 01A60 80AA5560 000D4C00 */ sll $t1, $t5, 16 -/* 01A64 80AA5564 00097C03 */ sra $t7, $t1, 16 -/* 01A68 80AA5568 11E00076 */ beq $t7, $zero, .L80AA5744 -/* 01A6C 80AA556C 00000000 */ nop -/* 01A70 80AA5570 AFB80010 */ sw $t8, 0x0010($sp) -/* 01A74 80AA5574 AFAB0014 */ sw $t3, 0x0014($sp) -/* 01A78 80AA5578 AFAE0018 */ sw $t6, 0x0018($sp) -/* 01A7C 80AA557C AFAA001C */ sw $t2, 0x001C($sp) -/* 01A80 80AA5580 AFB90020 */ sw $t9, 0x0020($sp) -/* 01A84 80AA5584 0C2A911F */ jal func_80AA447C -/* 01A88 80AA5588 AFA80024 */ sw $t0, 0x0024($sp) -/* 01A8C 80AA558C 3C110602 */ lui $s1, 0x0602 ## $s1 = 06020000 -/* 01A90 80AA5590 26314E40 */ addiu $s1, $s1, 0x4E40 ## $s1 = 06024E40 -/* 01A94 80AA5594 240C0090 */ addiu $t4, $zero, 0x0090 ## $t4 = 00000090 -/* 01A98 80AA5598 240D007F */ addiu $t5, $zero, 0x007F ## $t5 = 0000007F -/* 01A9C 80AA559C 24090060 */ addiu $t1, $zero, 0x0060 ## $t1 = 00000060 -/* 01AA0 80AA55A0 240F0008 */ addiu $t7, $zero, 0x0008 ## $t7 = 00000008 -/* 01AA4 80AA55A4 24180400 */ addiu $t8, $zero, 0x0400 ## $t8 = 00000400 -/* 01AA8 80AA55A8 240B0400 */ addiu $t3, $zero, 0x0400 ## $t3 = 00000400 -/* 01AAC 80AA55AC AFAB0024 */ sw $t3, 0x0024($sp) -/* 01AB0 80AA55B0 AFB80020 */ sw $t8, 0x0020($sp) -/* 01AB4 80AA55B4 AFAF001C */ sw $t7, 0x001C($sp) -/* 01AB8 80AA55B8 AFA90018 */ sw $t1, 0x0018($sp) -/* 01ABC 80AA55BC AFAD0014 */ sw $t5, 0x0014($sp) -/* 01AC0 80AA55C0 AFAC0010 */ sw $t4, 0x0010($sp) -/* 01AC4 80AA55C4 02202825 */ or $a1, $s1, $zero ## $a1 = 06024E40 -/* 01AC8 80AA55C8 03C02025 */ or $a0, $s8, $zero ## $a0 = FFFFFFF0 -/* 01ACC 80AA55CC 24060060 */ addiu $a2, $zero, 0x0060 ## $a2 = 00000060 -/* 01AD0 80AA55D0 0C2A911F */ jal func_80AA447C -/* 01AD4 80AA55D4 24070008 */ addiu $a3, $zero, 0x0008 ## $a3 = 00000008 -/* 01AD8 80AA55D8 8FAE0148 */ lw $t6, 0x0148($sp) -/* 01ADC 80AA55DC 3C19E700 */ lui $t9, 0xE700 ## $t9 = E7000000 -/* 01AE0 80AA55E0 3C0DFA00 */ lui $t5, 0xFA00 ## $t5 = FA000000 -/* 01AE4 80AA55E4 25CA0008 */ addiu $t2, $t6, 0x0008 ## $t2 = 00000008 -/* 01AE8 80AA55E8 AFAA0148 */ sw $t2, 0x0148($sp) -/* 01AEC 80AA55EC ADC00004 */ sw $zero, 0x0004($t6) ## 00000004 -/* 01AF0 80AA55F0 ADD90000 */ sw $t9, 0x0000($t6) ## 00000000 -/* 01AF4 80AA55F4 8FA80148 */ lw $t0, 0x0148($sp) -/* 01AF8 80AA55F8 3C016496 */ lui $at, 0x6496 ## $at = 64960000 -/* 01AFC 80AA55FC 3421FF00 */ ori $at, $at, 0xFF00 ## $at = 6496FF00 -/* 01B00 80AA5600 250C0008 */ addiu $t4, $t0, 0x0008 ## $t4 = 00000008 -/* 01B04 80AA5604 AFAC0148 */ sw $t4, 0x0148($sp) -/* 01B08 80AA5608 AD0D0000 */ sw $t5, 0x0000($t0) ## 00000000 -/* 01B0C 80AA560C 8FA90080 */ lw $t1, 0x0080($sp) -/* 01B10 80AA5610 3C0DFB00 */ lui $t5, 0xFB00 ## $t5 = FB000000 -/* 01B14 80AA5614 240F0091 */ addiu $t7, $zero, 0x0091 ## $t7 = 00000091 -/* 01B18 80AA5618 C5306300 */ lwc1 $f16, 0x6300($t1) ## 00006300 -/* 01B1C 80AA561C 3C091450 */ lui $t1, 0x1450 ## $t1 = 14500000 -/* 01B20 80AA5620 3529A0FF */ ori $t1, $t1, 0xA0FF ## $t1 = 1450A0FF -/* 01B24 80AA5624 4600848D */ trunc.w.s $f18, $f16 -/* 01B28 80AA5628 24180048 */ addiu $t8, $zero, 0x0048 ## $t8 = 00000048 -/* 01B2C 80AA562C 240B0048 */ addiu $t3, $zero, 0x0048 ## $t3 = 00000048 -/* 01B30 80AA5630 03C02025 */ or $a0, $s8, $zero ## $a0 = FFFFFFF0 -/* 01B34 80AA5634 440E9000 */ mfc1 $t6, $f18 -/* 01B38 80AA5638 02002825 */ or $a1, $s0, $zero ## $a1 = 06024C00 -/* 01B3C 80AA563C 24060048 */ addiu $a2, $zero, 0x0048 ## $a2 = 00000048 -/* 01B40 80AA5640 31CA00FF */ andi $t2, $t6, 0x00FF ## $t2 = 00000000 -/* 01B44 80AA5644 0141C825 */ or $t9, $t2, $at ## $t9 = 6496FF00 -/* 01B48 80AA5648 AD190004 */ sw $t9, 0x0004($t0) ## 00000004 -/* 01B4C 80AA564C 8FA80148 */ lw $t0, 0x0148($sp) -/* 01B50 80AA5650 24190400 */ addiu $t9, $zero, 0x0400 ## $t9 = 00000400 -/* 01B54 80AA5654 240A0400 */ addiu $t2, $zero, 0x0400 ## $t2 = 00000400 -/* 01B58 80AA5658 250C0008 */ addiu $t4, $t0, 0x0008 ## $t4 = 00000008 -/* 01B5C 80AA565C AFAC0148 */ sw $t4, 0x0148($sp) -/* 01B60 80AA5660 AD090004 */ sw $t1, 0x0004($t0) ## 00000004 -/* 01B64 80AA5664 AD0D0000 */ sw $t5, 0x0000($t0) ## 00000000 -/* 01B68 80AA5668 240E0008 */ addiu $t6, $zero, 0x0008 ## $t6 = 00000008 -/* 01B6C 80AA566C AFAE001C */ sw $t6, 0x001C($sp) -/* 01B70 80AA5670 AFB90024 */ sw $t9, 0x0024($sp) -/* 01B74 80AA5674 AFAA0020 */ sw $t2, 0x0020($sp) -/* 01B78 80AA5678 AFAB0018 */ sw $t3, 0x0018($sp) -/* 01B7C 80AA567C AFB80014 */ sw $t8, 0x0014($sp) -/* 01B80 80AA5680 AFAF0010 */ sw $t7, 0x0010($sp) -/* 01B84 80AA5684 0C2A911F */ jal func_80AA447C -/* 01B88 80AA5688 24070008 */ addiu $a3, $zero, 0x0008 ## $a3 = 00000008 -/* 01B8C 80AA568C 2408008F */ addiu $t0, $zero, 0x008F ## $t0 = 0000008F -/* 01B90 80AA5690 240C007E */ addiu $t4, $zero, 0x007E ## $t4 = 0000007E -/* 01B94 80AA5694 240D0060 */ addiu $t5, $zero, 0x0060 ## $t5 = 00000060 -/* 01B98 80AA5698 24090008 */ addiu $t1, $zero, 0x0008 ## $t1 = 00000008 -/* 01B9C 80AA569C 240F0400 */ addiu $t7, $zero, 0x0400 ## $t7 = 00000400 -/* 01BA0 80AA56A0 24180400 */ addiu $t8, $zero, 0x0400 ## $t8 = 00000400 -/* 01BA4 80AA56A4 AFB80024 */ sw $t8, 0x0024($sp) -/* 01BA8 80AA56A8 AFAF0020 */ sw $t7, 0x0020($sp) -/* 01BAC 80AA56AC AFA9001C */ sw $t1, 0x001C($sp) -/* 01BB0 80AA56B0 AFAD0018 */ sw $t5, 0x0018($sp) -/* 01BB4 80AA56B4 AFAC0014 */ sw $t4, 0x0014($sp) -/* 01BB8 80AA56B8 AFA80010 */ sw $t0, 0x0010($sp) -/* 01BBC 80AA56BC 03C02025 */ or $a0, $s8, $zero ## $a0 = FFFFFFF0 -/* 01BC0 80AA56C0 02202825 */ or $a1, $s1, $zero ## $a1 = 06024E40 -/* 01BC4 80AA56C4 24060060 */ addiu $a2, $zero, 0x0060 ## $a2 = 00000060 -/* 01BC8 80AA56C8 0C2A911F */ jal func_80AA447C -/* 01BCC 80AA56CC 24070008 */ addiu $a3, $zero, 0x0008 ## $a3 = 00000008 -/* 01BD0 80AA56D0 8FAB0148 */ lw $t3, 0x0148($sp) -/* 01BD4 80AA56D4 3C0AE700 */ lui $t2, 0xE700 ## $t2 = E7000000 -/* 01BD8 80AA56D8 3C0CFA00 */ lui $t4, 0xFA00 ## $t4 = FA000000 -/* 01BDC 80AA56DC 256E0008 */ addiu $t6, $t3, 0x0008 ## $t6 = 00000008 -/* 01BE0 80AA56E0 AFAE0148 */ sw $t6, 0x0148($sp) -/* 01BE4 80AA56E4 AD600004 */ sw $zero, 0x0004($t3) ## 00000004 -/* 01BE8 80AA56E8 AD6A0000 */ sw $t2, 0x0000($t3) ## 00000000 -/* 01BEC 80AA56EC 8FB90148 */ lw $t9, 0x0148($sp) -/* 01BF0 80AA56F0 3C070602 */ lui $a3, 0x0602 ## $a3 = 06020000 -/* 01BF4 80AA56F4 24E7A400 */ addiu $a3, $a3, 0xA400 ## $a3 = 0601A400 -/* 01BF8 80AA56F8 27280008 */ addiu $t0, $t9, 0x0008 ## $t0 = 00000008 -/* 01BFC 80AA56FC AFA80148 */ sw $t0, 0x0148($sp) -/* 01C00 80AA5700 AF2C0000 */ sw $t4, 0x0000($t9) ## 00000000 -/* 01C04 80AA5704 8FAD0080 */ lw $t5, 0x0080($sp) -/* 01C08 80AA5708 24080020 */ addiu $t0, $zero, 0x0020 ## $t0 = 00000020 -/* 01C0C 80AA570C 03C02025 */ or $a0, $s8, $zero ## $a0 = FFFFFFF0 -/* 01C10 80AA5710 C5A46304 */ lwc1 $f4, 0x6304($t5) ## 00006304 -/* 01C14 80AA5714 240500AE */ addiu $a1, $zero, 0x00AE ## $a1 = 000000AE -/* 01C18 80AA5718 24060091 */ addiu $a2, $zero, 0x0091 ## $a2 = 00000091 -/* 01C1C 80AA571C 4600218D */ trunc.w.s $f6, $f4 -/* 01C20 80AA5720 440B3000 */ mfc1 $t3, $f6 -/* 01C24 80AA5724 00000000 */ nop -/* 01C28 80AA5728 316E00FF */ andi $t6, $t3, 0x00FF ## $t6 = 00000000 -/* 01C2C 80AA572C 01D25025 */ or $t2, $t6, $s2 ## $t2 = FFFFFF00 -/* 01C30 80AA5730 AF2A0004 */ sw $t2, 0x0004($t9) ## 00000004 -/* 01C34 80AA5734 24190080 */ addiu $t9, $zero, 0x0080 ## $t9 = 00000080 -/* 01C38 80AA5738 AFB90010 */ sw $t9, 0x0010($sp) -/* 01C3C 80AA573C 0C2A92B5 */ jal func_80AA4AD4 -/* 01C40 80AA5740 AFA80014 */ sw $t0, 0x0014($sp) -.L80AA5744: -/* 01C44 80AA5744 0C02515F */ jal func_8009457C -/* 01C48 80AA5748 03C02025 */ or $a0, $s8, $zero ## $a0 = FFFFFFF0 -/* 01C4C 80AA574C 8FAC0148 */ lw $t4, 0x0148($sp) -/* 01C50 80AA5750 3C09E200 */ lui $t1, 0xE200 ## $t1 = E2000000 -/* 01C54 80AA5754 35291E01 */ ori $t1, $t1, 0x1E01 ## $t1 = E2001E01 -/* 01C58 80AA5758 258D0008 */ addiu $t5, $t4, 0x0008 ## $t5 = 00000008 -/* 01C5C 80AA575C AFAD0148 */ sw $t5, 0x0148($sp) -/* 01C60 80AA5760 AD800004 */ sw $zero, 0x0004($t4) ## 00000004 -/* 01C64 80AA5764 AD890000 */ sw $t1, 0x0000($t4) ## 00000000 -/* 01C68 80AA5768 8FAF0148 */ lw $t7, 0x0148($sp) -/* 01C6C 80AA576C 3C0BFC11 */ lui $t3, 0xFC11 ## $t3 = FC110000 -/* 01C70 80AA5770 3C0EFF2F */ lui $t6, 0xFF2F ## $t6 = FF2F0000 -/* 01C74 80AA5774 25F80008 */ addiu $t8, $t7, 0x0008 ## $t8 = 00000008 -/* 01C78 80AA5778 AFB80148 */ sw $t8, 0x0148($sp) -/* 01C7C 80AA577C 35CEFFFF */ ori $t6, $t6, 0xFFFF ## $t6 = FF2FFFFF -/* 01C80 80AA5780 356B9623 */ ori $t3, $t3, 0x9623 ## $t3 = FC119623 -/* 01C84 80AA5784 ADEB0000 */ sw $t3, 0x0000($t7) ## 00000000 -/* 01C88 80AA5788 ADEE0004 */ sw $t6, 0x0004($t7) ## 00000004 -/* 01C8C 80AA578C 8FA30148 */ lw $v1, 0x0148($sp) -/* 01C90 80AA5790 3C08FA00 */ lui $t0, 0xFA00 ## $t0 = FA000000 -/* 01C94 80AA5794 3C138016 */ lui $s3, %hi(gGameInfo) -/* 01C98 80AA5798 24790008 */ addiu $t9, $v1, 0x0008 ## $t9 = 00000008 -/* 01C9C 80AA579C AFB90148 */ sw $t9, 0x0148($sp) -/* 01CA0 80AA57A0 AC680000 */ sw $t0, 0x0000($v1) ## 00000000 -/* 01CA4 80AA57A4 8FAC0080 */ lw $t4, 0x0080($sp) -/* 01CA8 80AA57A8 3C08F570 */ lui $t0, 0xF570 ## $t0 = F5700000 -/* 01CAC 80AA57AC 3C05E700 */ lui $a1, 0xE700 ## $a1 = E7000000 -/* 01CB0 80AA57B0 C5886308 */ lwc1 $f8, 0x6308($t4) ## 00006308 -/* 01CB4 80AA57B4 2673FA90 */ addiu $s3, %lo(gGameInfo) -/* 01CB8 80AA57B8 0000B825 */ or $s7, $zero, $zero ## $s7 = 00000000 -/* 01CBC 80AA57BC 4600428D */ trunc.w.s $f10, $f8 -/* 01CC0 80AA57C0 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 -/* 01CC4 80AA57C4 3C1680AA */ lui $s6, %hi(D_80AA5ED0) ## $s6 = 80AA0000 -/* 01CC8 80AA57C8 44025000 */ mfc1 $v0, $f10 -/* 01CCC 80AA57CC 00000000 */ nop -/* 01CD0 80AA57D0 00021400 */ sll $v0, $v0, 16 -/* 01CD4 80AA57D4 00021403 */ sra $v0, $v0, 16 -/* 01CD8 80AA57D8 304200FF */ andi $v0, $v0, 0x00FF ## $v0 = 00000000 -/* 01CDC 80AA57DC 00024E00 */ sll $t1, $v0, 24 -/* 01CE0 80AA57E0 00027C00 */ sll $t7, $v0, 16 -/* 01CE4 80AA57E4 012FC025 */ or $t8, $t1, $t7 ## $t8 = E2001E01 -/* 01CE8 80AA57E8 00025A00 */ sll $t3, $v0, 8 -/* 01CEC 80AA57EC 030B7025 */ or $t6, $t8, $t3 ## $t6 = FE119E23 -/* 01CF0 80AA57F0 01C25025 */ or $t2, $t6, $v0 ## $t2 = FE119E23 -/* 01CF4 80AA57F4 AC6A0004 */ sw $t2, 0x0004($v1) ## 00000004 -/* 01CF8 80AA57F8 8FB90080 */ lw $t9, 0x0080($sp) -/* 01CFC 80AA57FC 8FAF0148 */ lw $t7, 0x0148($sp) -/* 01D00 80AA5800 3C0E0602 */ lui $t6, 0x0602 ## $t6 = 06020000 -/* 01D04 80AA5804 C7306308 */ lwc1 $f16, 0x6308($t9) ## 00006310 -/* 01D08 80AA5808 25CE9A00 */ addiu $t6, $t6, 0x9A00 ## $t6 = 06019A00 -/* 01D0C 80AA580C 3C0BFD70 */ lui $t3, 0xFD70 ## $t3 = FD700000 -/* 01D10 80AA5810 4600848D */ trunc.w.s $f18, $f16 -/* 01D14 80AA5814 3C0380AA */ lui $v1, %hi(D_80AA5ECC) ## $v1 = 80AA0000 -/* 01D18 80AA5818 25F80008 */ addiu $t8, $t7, 0x0008 ## $t8 = 00000008 -/* 01D1C 80AA581C 440C9000 */ mfc1 $t4, $f18 -/* 01D20 80AA5820 00000000 */ nop -/* 01D24 80AA5824 000C6C00 */ sll $t5, $t4, 16 -/* 01D28 80AA5828 000D4C03 */ sra $t1, $t5, 16 -/* 01D2C 80AA582C 11200045 */ beq $t1, $zero, .L80AA5944 -/* 01D30 80AA5830 3C0C0708 */ lui $t4, 0x0708 ## $t4 = 07080000 -/* 01D34 80AA5834 AFB80148 */ sw $t8, 0x0148($sp) -/* 01D38 80AA5838 ADEE0004 */ sw $t6, 0x0004($t7) ## 00000004 -/* 01D3C 80AA583C ADEB0000 */ sw $t3, 0x0000($t7) ## 00000000 -/* 01D40 80AA5840 8FAA0148 */ lw $t2, 0x0148($sp) -/* 01D44 80AA5844 358C0200 */ ori $t4, $t4, 0x0200 ## $t4 = 07080200 -/* 01D48 80AA5848 3C0FE600 */ lui $t7, 0xE600 ## $t7 = E6000000 -/* 01D4C 80AA584C 25590008 */ addiu $t9, $t2, 0x0008 ## $t9 = FE119E2B -/* 01D50 80AA5850 AFB90148 */ sw $t9, 0x0148($sp) -/* 01D54 80AA5854 AD4C0004 */ sw $t4, 0x0004($t2) ## FE119E27 -/* 01D58 80AA5858 AD480000 */ sw $t0, 0x0000($t2) ## FE119E23 -/* 01D5C 80AA585C 8FAD0148 */ lw $t5, 0x0148($sp) -/* 01D60 80AA5860 3C0A074F */ lui $t2, 0x074F ## $t2 = 074F0000 -/* 01D64 80AA5864 354AF067 */ ori $t2, $t2, 0xF067 ## $t2 = 074FF067 -/* 01D68 80AA5868 25A90008 */ addiu $t1, $t5, 0x0008 ## $t1 = 00000010 -/* 01D6C 80AA586C AFA90148 */ sw $t1, 0x0148($sp) -/* 01D70 80AA5870 ADA00004 */ sw $zero, 0x0004($t5) ## 0000000C -/* 01D74 80AA5874 ADAF0000 */ sw $t7, 0x0000($t5) ## 00000008 -/* 01D78 80AA5878 8FB80148 */ lw $t8, 0x0148($sp) -/* 01D7C 80AA587C 3C0EF300 */ lui $t6, 0xF300 ## $t6 = F3000000 -/* 01D80 80AA5880 3C0F0008 */ lui $t7, 0x0008 ## $t7 = 00080000 -/* 01D84 80AA5884 270B0008 */ addiu $t3, $t8, 0x0008 ## $t3 = 00000010 -/* 01D88 80AA5888 AFAB0148 */ sw $t3, 0x0148($sp) -/* 01D8C 80AA588C AF0A0004 */ sw $t2, 0x0004($t8) ## 0000000C -/* 01D90 80AA5890 AF0E0000 */ sw $t6, 0x0000($t8) ## 00000008 -/* 01D94 80AA5894 8FB90148 */ lw $t9, 0x0148($sp) -/* 01D98 80AA5898 3C09F568 */ lui $t1, 0xF568 ## $t1 = F5680000 -/* 01D9C 80AA589C 35292800 */ ori $t1, $t1, 0x2800 ## $t1 = F5682800 -/* 01DA0 80AA58A0 27280008 */ addiu $t0, $t9, 0x0008 ## $t0 = FE119E33 -/* 01DA4 80AA58A4 AFA80148 */ sw $t0, 0x0148($sp) -/* 01DA8 80AA58A8 AF200004 */ sw $zero, 0x0004($t9) ## FE119E2F -/* 01DAC 80AA58AC AF250000 */ sw $a1, 0x0000($t9) ## FE119E2B -/* 01DB0 80AA58B0 8FAC0148 */ lw $t4, 0x0148($sp) -/* 01DB4 80AA58B4 35EF0200 */ ori $t7, $t7, 0x0200 ## $t7 = 00080200 -/* 01DB8 80AA58B8 3C0A0027 */ lui $t2, 0x0027 ## $t2 = 00270000 -/* 01DBC 80AA58BC 258D0008 */ addiu $t5, $t4, 0x0008 ## $t5 = 07080208 -/* 01DC0 80AA58C0 AFAD0148 */ sw $t5, 0x0148($sp) -/* 01DC4 80AA58C4 AD8F0004 */ sw $t7, 0x0004($t4) ## 07080204 -/* 01DC8 80AA58C8 AD890000 */ sw $t1, 0x0000($t4) ## 07080200 -/* 01DCC 80AA58CC 8FB80148 */ lw $t8, 0x0148($sp) -/* 01DD0 80AA58D0 354AC03C */ ori $t2, $t2, 0xC03C ## $t2 = 0027C03C -/* 01DD4 80AA58D4 3C0EF200 */ lui $t6, 0xF200 ## $t6 = F2000000 -/* 01DD8 80AA58D8 270B0008 */ addiu $t3, $t8, 0x0008 ## $t3 = 00000010 -/* 01DDC 80AA58DC AFAB0148 */ sw $t3, 0x0148($sp) -/* 01DE0 80AA58E0 AF0A0004 */ sw $t2, 0x0004($t8) ## 0000000C -/* 01DE4 80AA58E4 AF0E0000 */ sw $t6, 0x0000($t8) ## 00000008 -/* 01DE8 80AA58E8 8FB90148 */ lw $t9, 0x0148($sp) -/* 01DEC 80AA58EC 3C0CE43B */ lui $t4, 0xE43B ## $t4 = E43B0000 -/* 01DF0 80AA58F0 3C0D0013 */ lui $t5, 0x0013 ## $t5 = 00130000 -/* 01DF4 80AA58F4 27280008 */ addiu $t0, $t9, 0x0008 ## $t0 = FE119E33 -/* 01DF8 80AA58F8 AFA80148 */ sw $t0, 0x0148($sp) -/* 01DFC 80AA58FC 35AD8318 */ ori $t5, $t5, 0x8318 ## $t5 = 00138318 -/* 01E00 80AA5900 358C8358 */ ori $t4, $t4, 0x8358 ## $t4 = E43B8358 -/* 01E04 80AA5904 AF2C0000 */ sw $t4, 0x0000($t9) ## FE119E2B -/* 01E08 80AA5908 AF2D0004 */ sw $t5, 0x0004($t9) ## FE119E2F -/* 01E0C 80AA590C 8FA90148 */ lw $t1, 0x0148($sp) -/* 01E10 80AA5910 3C18E100 */ lui $t8, 0xE100 ## $t8 = E1000000 -/* 01E14 80AA5914 3C190400 */ lui $t9, 0x0400 ## $t9 = 04000000 -/* 01E18 80AA5918 252F0008 */ addiu $t7, $t1, 0x0008 ## $t7 = F5682808 -/* 01E1C 80AA591C AFAF0148 */ sw $t7, 0x0148($sp) -/* 01E20 80AA5920 AD200004 */ sw $zero, 0x0004($t1) ## F5682804 -/* 01E24 80AA5924 AD380000 */ sw $t8, 0x0000($t1) ## F5682800 -/* 01E28 80AA5928 8FAB0148 */ lw $t3, 0x0148($sp) -/* 01E2C 80AA592C 37390400 */ ori $t9, $t9, 0x0400 ## $t9 = 04000400 -/* 01E30 80AA5930 3C0AF100 */ lui $t2, 0xF100 ## $t2 = F1000000 -/* 01E34 80AA5934 256E0008 */ addiu $t6, $t3, 0x0008 ## $t6 = 00000018 -/* 01E38 80AA5938 AFAE0148 */ sw $t6, 0x0148($sp) -/* 01E3C 80AA593C AD790004 */ sw $t9, 0x0004($t3) ## 00000014 -/* 01E40 80AA5940 AD6A0000 */ sw $t2, 0x0000($t3) ## 00000010 -.L80AA5944: -/* 01E44 80AA5944 3C088016 */ lui $t0, %hi(gSaveContext+0x1354) -/* 01E48 80AA5948 8D08F9B4 */ lw $t0, %lo(gSaveContext+0x1354)($t0) -/* 01E4C 80AA594C 3401FEDC */ ori $at, $zero, 0xFEDC ## $at = 0000FEDC -/* 01E50 80AA5950 3C05E700 */ lui $a1, 0xE700 ## $a1 = E7000000 -/* 01E54 80AA5954 15010072 */ bne $t0, $at, .L80AA5B20 -/* 01E58 80AA5958 8FAA0080 */ lw $t2, 0x0080($sp) -/* 01E5C 80AA595C 84635ECC */ lh $v1, %lo(D_80AA5ECC)($v1) -/* 01E60 80AA5960 8FAC0148 */ lw $t4, 0x0148($sp) -/* 01E64 80AA5964 3C18FCFF */ lui $t8, 0xFCFF ## $t8 = FCFF0000 -/* 01E68 80AA5968 00600821 */ addu $at, $v1, $zero -/* 01E6C 80AA596C 00031880 */ sll $v1, $v1, 2 -/* 01E70 80AA5970 00611821 */ addu $v1, $v1, $at -/* 01E74 80AA5974 00031840 */ sll $v1, $v1, 1 -/* 01E78 80AA5978 00031C00 */ sll $v1, $v1, 16 -/* 01E7C 80AA597C 00031C03 */ sra $v1, $v1, 16 -/* 01E80 80AA5980 286100FF */ slti $at, $v1, 0x00FF -/* 01E84 80AA5984 14200002 */ bne $at, $zero, .L80AA5990 -/* 01E88 80AA5988 258D0008 */ addiu $t5, $t4, 0x0008 ## $t5 = E43B8360 -/* 01E8C 80AA598C 240300FF */ addiu $v1, $zero, 0x00FF ## $v1 = 000000FF -.L80AA5990: -/* 01E90 80AA5990 AFAD0148 */ sw $t5, 0x0148($sp) -/* 01E94 80AA5994 AD800004 */ sw $zero, 0x0004($t4) ## E43B835C -/* 01E98 80AA5998 AD850000 */ sw $a1, 0x0000($t4) ## E43B8358 -/* 01E9C 80AA599C 8FA90148 */ lw $t1, 0x0148($sp) -/* 01EA0 80AA59A0 3C0BFF2D */ lui $t3, 0xFF2D ## $t3 = FF2D0000 -/* 01EA4 80AA59A4 356BFEFF */ ori $t3, $t3, 0xFEFF ## $t3 = FF2DFEFF -/* 01EA8 80AA59A8 252F0008 */ addiu $t7, $t1, 0x0008 ## $t7 = F5682808 -/* 01EAC 80AA59AC AFAF0148 */ sw $t7, 0x0148($sp) -/* 01EB0 80AA59B0 371897FF */ ori $t8, $t8, 0x97FF ## $t8 = FCFF97FF -/* 01EB4 80AA59B4 AD380000 */ sw $t8, 0x0000($t1) ## F5682800 -/* 01EB8 80AA59B8 AD2B0004 */ sw $t3, 0x0004($t1) ## F5682804 -/* 01EBC 80AA59BC 8FAE0148 */ lw $t6, 0x0148($sp) -/* 01EC0 80AA59C0 3C19FA00 */ lui $t9, 0xFA00 ## $t9 = FA000000 -/* 01EC4 80AA59C4 306400FF */ andi $a0, $v1, 0x00FF ## $a0 = 000000FF -/* 01EC8 80AA59C8 25CA0008 */ addiu $t2, $t6, 0x0008 ## $t2 = 00000020 -/* 01ECC 80AA59CC AFAA0148 */ sw $t2, 0x0148($sp) -/* 01ED0 80AA59D0 3C0180AA */ lui $at, %hi(D_80AA5EC4) ## $at = 80AA0000 -/* 01ED4 80AA59D4 ADC40004 */ sw $a0, 0x0004($t6) ## 0000001C -/* 01ED8 80AA59D8 ADD90000 */ sw $t9, 0x0000($t6) ## 00000018 -/* 01EDC 80AA59DC A4235EC4 */ sh $v1, %lo(D_80AA5EC4)($at) -/* 01EE0 80AA59E0 8E700000 */ lw $s0, 0x0000($s3) ## 8015FA90 -/* 01EE4 80AA59E4 8FB50158 */ lw $s5, 0x0158($sp) -/* 01EE8 80AA59E8 26D65ED0 */ addiu $s6, $s6, %lo(D_80AA5ED0) ## $s6 = 80AA5ED0 -/* 01EEC 80AA59EC 86140F3A */ lh $s4, 0x0F3A($s0) ## 06025B3A -/* 01EF0 80AA59F0 AFA40080 */ sw $a0, 0x0080($sp) -/* 01EF4 80AA59F4 26B50150 */ addiu $s5, $s5, 0x0150 ## $s5 = 80AA6038 -/* 01EF8 80AA59F8 26940001 */ addiu $s4, $s4, 0x0001 ## $s4 = 00000079 -/* 01EFC 80AA59FC 3294FFFF */ andi $s4, $s4, 0xFFFF ## $s4 = 00000079 -.L80AA5A00: -/* 01F00 80AA5A00 02D74021 */ addu $t0, $s6, $s7 -/* 01F04 80AA5A04 910C0000 */ lbu $t4, 0x0000($t0) ## 80160000 -/* 01F08 80AA5A08 860704A8 */ lh $a3, 0x04A8($s0) ## 060250A8 -/* 01F0C 80AA5A0C 03C02025 */ or $a0, $s8, $zero ## $a0 = FFFFFFF0 -/* 01F10 80AA5A10 000C69C0 */ sll $t5, $t4, 7 -/* 01F14 80AA5A14 01B52821 */ addu $a1, $t5, $s5 -/* 01F18 80AA5A18 24A53C88 */ addiu $a1, $a1, 0x3C88 ## $a1 = E7003C88 -/* 01F1C 80AA5A1C 02809025 */ or $s2, $s4, $zero ## $s2 = 00000079 -/* 01F20 80AA5A20 02803025 */ or $a2, $s4, $zero ## $a2 = 00000079 -/* 01F24 80AA5A24 0C2A93AE */ jal func_80AA4EB8 -/* 01F28 80AA5A28 24E700AC */ addiu $a3, $a3, 0x00AC ## $a3 = 000000AC -/* 01F2C 80AA5A2C 8E700000 */ lw $s0, 0x0000($s3) ## 8015FA90 -/* 01F30 80AA5A30 26F70001 */ addiu $s7, $s7, 0x0001 ## $s7 = 00000001 -/* 01F34 80AA5A34 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01F38 80AA5A38 86090F3E */ lh $t1, 0x0F3E($s0) ## 06025B3E -/* 01F3C 80AA5A3C 32F7FFFF */ andi $s7, $s7, 0xFFFF ## $s7 = 00000001 -/* 01F40 80AA5A40 0249A021 */ addu $s4, $s2, $t1 -/* 01F44 80AA5A44 16210004 */ bne $s1, $at, .L80AA5A58 -/* 01F48 80AA5A48 3294FFFF */ andi $s4, $s4, 0xFFFF ## $s4 = 00000079 -/* 01F4C 80AA5A4C 860F0F42 */ lh $t7, 0x0F42($s0) ## 06025B42 -/* 01F50 80AA5A50 028FA021 */ addu $s4, $s4, $t7 -/* 01F54 80AA5A54 3294FFFF */ andi $s4, $s4, 0xFFFF ## $s4 = 00000079 -.L80AA5A58: -/* 01F58 80AA5A58 2AE1000C */ slti $at, $s7, 0x000C -/* 01F5C 80AA5A5C 1420FFE8 */ bne $at, $zero, .L80AA5A00 -/* 01F60 80AA5A60 02E08825 */ or $s1, $s7, $zero ## $s1 = 00000001 -/* 01F64 80AA5A64 8FB80148 */ lw $t8, 0x0148($sp) -/* 01F68 80AA5A68 3C0EE700 */ lui $t6, 0xE700 ## $t6 = E7000000 -/* 01F6C 80AA5A6C 3C08FA00 */ lui $t0, 0xFA00 ## $t0 = FA000000 -/* 01F70 80AA5A70 270B0008 */ addiu $t3, $t8, 0x0008 ## $t3 = 00000008 -/* 01F74 80AA5A74 AFAB0148 */ sw $t3, 0x0148($sp) -/* 01F78 80AA5A78 AF000004 */ sw $zero, 0x0004($t8) ## 00000004 -/* 01F7C 80AA5A7C AF0E0000 */ sw $t6, 0x0000($t8) ## 00000000 -/* 01F80 80AA5A80 8FAA0148 */ lw $t2, 0x0148($sp) -/* 01F84 80AA5A84 3C0164FF */ lui $at, 0x64FF ## $at = 64FF0000 -/* 01F88 80AA5A88 3421FF00 */ ori $at, $at, 0xFF00 ## $at = 64FFFF00 -/* 01F8C 80AA5A8C 25590008 */ addiu $t9, $t2, 0x0008 ## $t9 = 00000008 -/* 01F90 80AA5A90 AFB90148 */ sw $t9, 0x0148($sp) -/* 01F94 80AA5A94 AD480000 */ sw $t0, 0x0000($t2) ## 00000000 -/* 01F98 80AA5A98 8FAC0080 */ lw $t4, 0x0080($sp) -/* 01F9C 80AA5A9C 0000B825 */ or $s7, $zero, $zero ## $s7 = 00000000 -/* 01FA0 80AA5AA0 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 -/* 01FA4 80AA5AA4 01816825 */ or $t5, $t4, $at ## $t5 = 64FFFF00 -/* 01FA8 80AA5AA8 AD4D0004 */ sw $t5, 0x0004($t2) ## 00000004 -/* 01FAC 80AA5AAC 8E700000 */ lw $s0, 0x0000($s3) ## 8015FA90 -/* 01FB0 80AA5AB0 96140F3A */ lhu $s4, 0x0F3A($s0) ## 06025B3A -.L80AA5AB4: -/* 01FB4 80AA5AB4 02D74821 */ addu $t1, $s6, $s7 -/* 01FB8 80AA5AB8 912F0000 */ lbu $t7, 0x0000($t1) ## 00000000 -/* 01FBC 80AA5ABC 860704A8 */ lh $a3, 0x04A8($s0) ## 060250A8 -/* 01FC0 80AA5AC0 03C02025 */ or $a0, $s8, $zero ## $a0 = FFFFFFF0 -/* 01FC4 80AA5AC4 000FC1C0 */ sll $t8, $t7, 7 -/* 01FC8 80AA5AC8 03152821 */ addu $a1, $t8, $s5 -/* 01FCC 80AA5ACC 24A53C88 */ addiu $a1, $a1, 0x3C88 ## $a1 = 00003C88 -/* 01FD0 80AA5AD0 02809025 */ or $s2, $s4, $zero ## $s2 = 00000079 -/* 01FD4 80AA5AD4 02803025 */ or $a2, $s4, $zero ## $a2 = 00000079 -/* 01FD8 80AA5AD8 0C2A93AE */ jal func_80AA4EB8 -/* 01FDC 80AA5ADC 24E700AB */ addiu $a3, $a3, 0x00AB ## $a3 = 000000AB -/* 01FE0 80AA5AE0 8E700000 */ lw $s0, 0x0000($s3) ## 8015FA90 -/* 01FE4 80AA5AE4 26F70001 */ addiu $s7, $s7, 0x0001 ## $s7 = 00000001 -/* 01FE8 80AA5AE8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01FEC 80AA5AEC 860B0F3E */ lh $t3, 0x0F3E($s0) ## 06025B3E -/* 01FF0 80AA5AF0 32F7FFFF */ andi $s7, $s7, 0xFFFF ## $s7 = 00000001 -/* 01FF4 80AA5AF4 024BA021 */ addu $s4, $s2, $t3 -/* 01FF8 80AA5AF8 16210004 */ bne $s1, $at, .L80AA5B0C -/* 01FFC 80AA5AFC 3294FFFF */ andi $s4, $s4, 0xFFFF ## $s4 = 00000079 -/* 02000 80AA5B00 860E0F42 */ lh $t6, 0x0F42($s0) ## 06025B42 -/* 02004 80AA5B04 028EA021 */ addu $s4, $s4, $t6 -/* 02008 80AA5B08 3294FFFF */ andi $s4, $s4, 0xFFFF ## $s4 = 00000079 -.L80AA5B0C: -/* 0200C 80AA5B0C 2AE1000C */ slti $at, $s7, 0x000C -/* 02010 80AA5B10 1420FFE8 */ bne $at, $zero, .L80AA5AB4 -/* 02014 80AA5B14 02E08825 */ or $s1, $s7, $zero ## $s1 = 00000001 -/* 02018 80AA5B18 10000084 */ beq $zero, $zero, .L80AA5D2C -/* 0201C 80AA5B1C 00000000 */ nop -.L80AA5B20: -/* 02020 80AA5B20 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 02024 80AA5B24 44813000 */ mtc1 $at, $f6 ## $f6 = 200.00 -/* 02028 80AA5B28 C5446308 */ lwc1 $f4, 0x6308($t2) ## 00006308 -/* 0202C 80AA5B2C 8FB90148 */ lw $t9, 0x0148($sp) -/* 02030 80AA5B30 3C09FCFF */ lui $t1, 0xFCFF ## $t1 = FCFF0000 -/* 02034 80AA5B34 4604303E */ c.le.s $f6, $f4 -/* 02038 80AA5B38 3C0380AA */ lui $v1, %hi(D_80AA5ECC) ## $v1 = 80AA0000 -/* 0203C 80AA5B3C 352997FF */ ori $t1, $t1, 0x97FF ## $t1 = FCFF97FF -/* 02040 80AA5B40 3C0FFF2D */ lui $t7, 0xFF2D ## $t7 = FF2D0000 -/* 02044 80AA5B44 45000079 */ bc1f .L80AA5D2C -/* 02048 80AA5B48 27280008 */ addiu $t0, $t9, 0x0008 ## $t0 = 00000008 -/* 0204C 80AA5B4C 84635ECC */ lh $v1, %lo(D_80AA5ECC)($v1) -/* 02050 80AA5B50 35EFFEFF */ ori $t7, $t7, 0xFEFF ## $t7 = FF2DFEFF -/* 02054 80AA5B54 3C0EFA00 */ lui $t6, 0xFA00 ## $t6 = FA000000 -/* 02058 80AA5B58 00600821 */ addu $at, $v1, $zero -/* 0205C 80AA5B5C 00031880 */ sll $v1, $v1, 2 -/* 02060 80AA5B60 00611821 */ addu $v1, $v1, $at -/* 02064 80AA5B64 00031840 */ sll $v1, $v1, 1 -/* 02068 80AA5B68 00031C00 */ sll $v1, $v1, 16 -/* 0206C 80AA5B6C 00031C03 */ sra $v1, $v1, 16 -/* 02070 80AA5B70 286100FF */ slti $at, $v1, 0x00FF -/* 02074 80AA5B74 14200002 */ bne $at, $zero, .L80AA5B80 -/* 02078 80AA5B78 3C138016 */ lui $s3, %hi(gGameInfo) -/* 0207C 80AA5B7C 240300FF */ addiu $v1, $zero, 0x00FF ## $v1 = 000000FF -.L80AA5B80: -/* 02080 80AA5B80 AFA80148 */ sw $t0, 0x0148($sp) -/* 02084 80AA5B84 AF200004 */ sw $zero, 0x0004($t9) ## 00000004 -/* 02088 80AA5B88 AF250000 */ sw $a1, 0x0000($t9) ## 00000000 -/* 0208C 80AA5B8C 8FAC0148 */ lw $t4, 0x0148($sp) -/* 02090 80AA5B90 306A00FF */ andi $t2, $v1, 0x00FF ## $t2 = 000000FF -/* 02094 80AA5B94 3C0180AA */ lui $at, %hi(D_80AA5EC4) ## $at = 80AA0000 -/* 02098 80AA5B98 258D0008 */ addiu $t5, $t4, 0x0008 ## $t5 = 00000008 -/* 0209C 80AA5B9C AFAD0148 */ sw $t5, 0x0148($sp) -/* 020A0 80AA5BA0 AD8F0004 */ sw $t7, 0x0004($t4) ## 00000004 -/* 020A4 80AA5BA4 AD890000 */ sw $t1, 0x0000($t4) ## 00000000 -/* 020A8 80AA5BA8 8FB80148 */ lw $t8, 0x0148($sp) -/* 020AC 80AA5BAC 2673FA90 */ addiu $s3, %lo(gGameInfo) -/* 020B0 80AA5BB0 3C1680AA */ lui $s6, %hi(D_80AA5EDC) ## $s6 = 80AA0000 -/* 020B4 80AA5BB4 270B0008 */ addiu $t3, $t8, 0x0008 ## $t3 = 00000008 -/* 020B8 80AA5BB8 AFAB0148 */ sw $t3, 0x0148($sp) -/* 020BC 80AA5BBC AF0E0000 */ sw $t6, 0x0000($t8) ## 00000000 -/* 020C0 80AA5BC0 AFAA0080 */ sw $t2, 0x0080($sp) -/* 020C4 80AA5BC4 AF0A0004 */ sw $t2, 0x0004($t8) ## 00000004 -/* 020C8 80AA5BC8 A4235EC4 */ sh $v1, %lo(D_80AA5EC4)($at) -/* 020CC 80AA5BCC 8E700000 */ lw $s0, 0x0000($s3) ## 8015FA90 -/* 020D0 80AA5BD0 8FB50158 */ lw $s5, 0x0158($sp) -/* 020D4 80AA5BD4 26D65EDC */ addiu $s6, $s6, %lo(D_80AA5EDC) ## $s6 = 80AA5EDC -/* 020D8 80AA5BD8 861404A2 */ lh $s4, 0x04A2($s0) ## 060250A2 -/* 020DC 80AA5BDC 0000B825 */ or $s7, $zero, $zero ## $s7 = 00000000 -/* 020E0 80AA5BE0 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 -/* 020E4 80AA5BE4 26940001 */ addiu $s4, $s4, 0x0001 ## $s4 = 0000007A -/* 020E8 80AA5BE8 3294FFFF */ andi $s4, $s4, 0xFFFF ## $s4 = 0000007A -/* 020EC 80AA5BEC 26B50150 */ addiu $s5, $s5, 0x0150 ## $s5 = 80AA6188 -.L80AA5BF0: -/* 020F0 80AA5BF0 02D74021 */ addu $t0, $s6, $s7 -/* 020F4 80AA5BF4 910C0000 */ lbu $t4, 0x0000($t0) ## 00000008 -/* 020F8 80AA5BF8 860704A8 */ lh $a3, 0x04A8($s0) ## 060250A8 -/* 020FC 80AA5BFC 03C02025 */ or $a0, $s8, $zero ## $a0 = FFFFFFF0 -/* 02100 80AA5C00 000C69C0 */ sll $t5, $t4, 7 -/* 02104 80AA5C04 01B52821 */ addu $a1, $t5, $s5 -/* 02108 80AA5C08 24A53C88 */ addiu $a1, $a1, 0x3C88 ## $a1 = 00003C88 -/* 0210C 80AA5C0C 02809025 */ or $s2, $s4, $zero ## $s2 = 0000007A -/* 02110 80AA5C10 02803025 */ or $a2, $s4, $zero ## $a2 = 0000007A -/* 02114 80AA5C14 0C2A93AE */ jal func_80AA4EB8 -/* 02118 80AA5C18 24E700AC */ addiu $a3, $a3, 0x00AC ## $a3 = 000000AC -/* 0211C 80AA5C1C 8E700000 */ lw $s0, 0x0000($s3) ## 8015FA90 -/* 02120 80AA5C20 26F70001 */ addiu $s7, $s7, 0x0001 ## $s7 = 00000001 -/* 02124 80AA5C24 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 02128 80AA5C28 860904A4 */ lh $t1, 0x04A4($s0) ## 060250A4 -/* 0212C 80AA5C2C 32F7FFFF */ andi $s7, $s7, 0xFFFF ## $s7 = 00000001 -/* 02130 80AA5C30 0249A021 */ addu $s4, $s2, $t1 -/* 02134 80AA5C34 16210004 */ bne $s1, $at, .L80AA5C48 -/* 02138 80AA5C38 3294FFFF */ andi $s4, $s4, 0xFFFF ## $s4 = 0000007A -/* 0213C 80AA5C3C 860F04A6 */ lh $t7, 0x04A6($s0) ## 060250A6 -/* 02140 80AA5C40 028FA021 */ addu $s4, $s4, $t7 -/* 02144 80AA5C44 3294FFFF */ andi $s4, $s4, 0xFFFF ## $s4 = 0000007A -.L80AA5C48: -/* 02148 80AA5C48 2AE1000A */ slti $at, $s7, 0x000A -/* 0214C 80AA5C4C 1420FFE8 */ bne $at, $zero, .L80AA5BF0 -/* 02150 80AA5C50 02E08825 */ or $s1, $s7, $zero ## $s1 = 00000001 -/* 02154 80AA5C54 8FB80148 */ lw $t8, 0x0148($sp) -/* 02158 80AA5C58 3C0EE700 */ lui $t6, 0xE700 ## $t6 = E7000000 -/* 0215C 80AA5C5C 3C08FA00 */ lui $t0, 0xFA00 ## $t0 = FA000000 -/* 02160 80AA5C60 270B0008 */ addiu $t3, $t8, 0x0008 ## $t3 = 00000008 -/* 02164 80AA5C64 AFAB0148 */ sw $t3, 0x0148($sp) -/* 02168 80AA5C68 AF000004 */ sw $zero, 0x0004($t8) ## 00000004 -/* 0216C 80AA5C6C AF0E0000 */ sw $t6, 0x0000($t8) ## 00000000 -/* 02170 80AA5C70 8FA20148 */ lw $v0, 0x0148($sp) -/* 02174 80AA5C74 0000B825 */ or $s7, $zero, $zero ## $s7 = 00000000 -/* 02178 80AA5C78 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 -/* 0217C 80AA5C7C 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 02180 80AA5C80 AFB90148 */ sw $t9, 0x0148($sp) -/* 02184 80AA5C84 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 -/* 02188 80AA5C88 8E700000 */ lw $s0, 0x0000($s3) ## 8015FA90 -/* 0218C 80AA5C8C 860C04A0 */ lh $t4, 0x04A0($s0) ## 060250A0 -/* 02190 80AA5C90 8618049C */ lh $t8, 0x049C($s0) ## 0602509C -/* 02194 80AA5C94 860A049E */ lh $t2, 0x049E($s0) ## 0602509E -/* 02198 80AA5C98 318D00FF */ andi $t5, $t4, 0x00FF ## $t5 = 00000000 -/* 0219C 80AA5C9C 000D4A00 */ sll $t1, $t5, 8 -/* 021A0 80AA5CA0 8FAD0080 */ lw $t5, 0x0080($sp) -/* 021A4 80AA5CA4 00185E00 */ sll $t3, $t8, 24 -/* 021A8 80AA5CA8 315900FF */ andi $t9, $t2, 0x00FF ## $t9 = 00000000 -/* 021AC 80AA5CAC 00194400 */ sll $t0, $t9, 16 -/* 021B0 80AA5CB0 012B7025 */ or $t6, $t1, $t3 ## $t6 = 00000008 -/* 021B4 80AA5CB4 01C86025 */ or $t4, $t6, $t0 ## $t4 = FA000008 -/* 021B8 80AA5CB8 018D7825 */ or $t7, $t4, $t5 ## $t7 = FA000008 -/* 021BC 80AA5CBC AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 021C0 80AA5CC0 8E700000 */ lw $s0, 0x0000($s3) ## 8015FA90 -/* 021C4 80AA5CC4 961404A2 */ lhu $s4, 0x04A2($s0) ## 060250A2 -.L80AA5CC8: -/* 021C8 80AA5CC8 02D7C021 */ addu $t8, $s6, $s7 -/* 021CC 80AA5CCC 93090000 */ lbu $t1, 0x0000($t8) ## 00000000 -/* 021D0 80AA5CD0 860704A8 */ lh $a3, 0x04A8($s0) ## 060250A8 -/* 021D4 80AA5CD4 03C02025 */ or $a0, $s8, $zero ## $a0 = FFFFFFF0 -/* 021D8 80AA5CD8 000959C0 */ sll $t3, $t1, 7 -/* 021DC 80AA5CDC 01752821 */ addu $a1, $t3, $s5 -/* 021E0 80AA5CE0 24A53C88 */ addiu $a1, $a1, 0x3C88 ## $a1 = 00003C88 -/* 021E4 80AA5CE4 02809025 */ or $s2, $s4, $zero ## $s2 = 0000007A -/* 021E8 80AA5CE8 02803025 */ or $a2, $s4, $zero ## $a2 = 0000007A -/* 021EC 80AA5CEC 0C2A93AE */ jal func_80AA4EB8 -/* 021F0 80AA5CF0 24E700AB */ addiu $a3, $a3, 0x00AB ## $a3 = 000000AB -/* 021F4 80AA5CF4 8E700000 */ lw $s0, 0x0000($s3) ## 8015FA90 -/* 021F8 80AA5CF8 26F70001 */ addiu $s7, $s7, 0x0001 ## $s7 = 00000001 -/* 021FC 80AA5CFC 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 02200 80AA5D00 860A04A4 */ lh $t2, 0x04A4($s0) ## 060250A4 -/* 02204 80AA5D04 32F7FFFF */ andi $s7, $s7, 0xFFFF ## $s7 = 00000001 -/* 02208 80AA5D08 024AA021 */ addu $s4, $s2, $t2 -/* 0220C 80AA5D0C 16210004 */ bne $s1, $at, .L80AA5D20 -/* 02210 80AA5D10 3294FFFF */ andi $s4, $s4, 0xFFFF ## $s4 = 0000007A -/* 02214 80AA5D14 861904A6 */ lh $t9, 0x04A6($s0) ## 060250A6 -/* 02218 80AA5D18 0299A021 */ addu $s4, $s4, $t9 -/* 0221C 80AA5D1C 3294FFFF */ andi $s4, $s4, 0xFFFF ## $s4 = 0000007A -.L80AA5D20: -/* 02220 80AA5D20 2AE1000A */ slti $at, $s7, 0x000A -/* 02224 80AA5D24 1420FFE8 */ bne $at, $zero, .L80AA5CC8 -/* 02228 80AA5D28 02E08825 */ or $s1, $s7, $zero ## $s1 = 00000001 -.L80AA5D2C: -/* 0222C 80AA5D2C 3C0E80AA */ lui $t6, %hi(D_80AA5EC8) ## $t6 = 80AA0000 -/* 02230 80AA5D30 85CE5EC8 */ lh $t6, %lo(D_80AA5EC8)($t6) -/* 02234 80AA5D34 3C0880AA */ lui $t0, %hi(D_80AA5ECC) ## $t0 = 80AA0000 -/* 02238 80AA5D38 3C1880AA */ lui $t8, %hi(D_80AA5ECC) ## $t8 = 80AA0000 -/* 0223C 80AA5D3C 11C0000B */ beq $t6, $zero, .L80AA5D6C -/* 02240 80AA5D40 00000000 */ nop -/* 02244 80AA5D44 85085ECC */ lh $t0, %lo(D_80AA5ECC)($t0) -/* 02248 80AA5D48 3C0180AA */ lui $at, %hi(D_80AA5ECC) ## $at = 80AA0000 -/* 0224C 80AA5D4C 250CFFFF */ addiu $t4, $t0, 0xFFFF ## $t4 = 80A9FFFF -/* 02250 80AA5D50 000C6C00 */ sll $t5, $t4, 16 -/* 02254 80AA5D54 000D7C03 */ sra $t7, $t5, 16 -/* 02258 80AA5D58 15E0000F */ bne $t7, $zero, .L80AA5D98 -/* 0225C 80AA5D5C A42C5ECC */ sh $t4, %lo(D_80AA5ECC)($at) -/* 02260 80AA5D60 3C0180AA */ lui $at, %hi(D_80AA5EC8) ## $at = 80AA0000 -/* 02264 80AA5D64 1000000C */ beq $zero, $zero, .L80AA5D98 -/* 02268 80AA5D68 A4205EC8 */ sh $zero, %lo(D_80AA5EC8)($at) -.L80AA5D6C: -/* 0226C 80AA5D6C 87185ECC */ lh $t8, %lo(D_80AA5ECC)($t8) -/* 02270 80AA5D70 3C0180AA */ lui $at, %hi(D_80AA5ECC) ## $at = 80AA0000 -/* 02274 80AA5D74 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 02278 80AA5D78 27090001 */ addiu $t1, $t8, 0x0001 ## $t1 = 80AA0001 -/* 0227C 80AA5D7C 00095C00 */ sll $t3, $t1, 16 -/* 02280 80AA5D80 000B5403 */ sra $t2, $t3, 16 -/* 02284 80AA5D84 A4295ECC */ sh $t1, %lo(D_80AA5ECC)($at) -/* 02288 80AA5D88 2941001A */ slti $at, $t2, 0x001A -/* 0228C 80AA5D8C 14200002 */ bne $at, $zero, .L80AA5D98 -/* 02290 80AA5D90 3C0180AA */ lui $at, %hi(D_80AA5EC8) ## $at = 80AA0000 -/* 02294 80AA5D94 A4395EC8 */ sh $t9, %lo(D_80AA5EC8)($at) -.L80AA5D98: -/* 02298 80AA5D98 8FAE0148 */ lw $t6, 0x0148($sp) -/* 0229C 80AA5D9C 8FA80160 */ lw $t0, 0x0160($sp) -/* 022A0 80AA5DA0 AD0E0000 */ sw $t6, 0x0000($t0) ## 80AA0000 -/* 022A4 80AA5DA4 8FBF0074 */ lw $ra, 0x0074($sp) -/* 022A8 80AA5DA8 8FBE0070 */ lw $s8, 0x0070($sp) -/* 022AC 80AA5DAC 8FB7006C */ lw $s7, 0x006C($sp) -/* 022B0 80AA5DB0 8FB60068 */ lw $s6, 0x0068($sp) -/* 022B4 80AA5DB4 8FB50064 */ lw $s5, 0x0064($sp) -/* 022B8 80AA5DB8 8FB40060 */ lw $s4, 0x0060($sp) -/* 022BC 80AA5DBC 8FB3005C */ lw $s3, 0x005C($sp) -/* 022C0 80AA5DC0 8FB20058 */ lw $s2, 0x0058($sp) -/* 022C4 80AA5DC4 8FB10054 */ lw $s1, 0x0054($sp) -/* 022C8 80AA5DC8 8FB00050 */ lw $s0, 0x0050($sp) -/* 022CC 80AA5DCC 03E00008 */ jr $ra -/* 022D0 80AA5DD0 27BD0158 */ addiu $sp, $sp, 0x0158 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Destroy.s deleted file mode 100644 index e34098507a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Destroy.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel EnRd_Destroy -/* 001F0 80AE25F0 3C028016 */ lui $v0, %hi(gSaveContext) -/* 001F4 80AE25F4 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 001F8 80AE25F8 844E1422 */ lh $t6, 0x1422($v0) ## 8015FA82 -/* 001FC 80AE25FC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00200 80AE2600 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00204 80AE2604 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00208 80AE2608 11C00002 */ beq $t6, $zero, .L80AE2614 -/* 0020C 80AE260C 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 00210 80AE2610 A4401422 */ sh $zero, 0x1422($v0) ## 8015FA82 -.L80AE2614: -/* 00214 80AE2614 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00218 80AE2618 0C0170EB */ jal Collider_DestroyCylinder - -/* 0021C 80AE261C 24C50320 */ addiu $a1, $a2, 0x0320 ## $a1 = 00000320 -/* 00220 80AE2620 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00224 80AE2624 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00228 80AE2628 03E00008 */ jr $ra -/* 0022C 80AE262C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Draw.s deleted file mode 100644 index d3cec6c31b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Draw.s +++ /dev/null @@ -1,155 +0,0 @@ -.rdata -glabel D_80AE4970 - .asciz "../z_en_rd.c" - .balign 4 - -glabel D_80AE4980 - .asciz "../z_en_rd.c" - .balign 4 - -.text -glabel EnRd_Draw -/* 02268 80AE4668 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 0226C 80AE466C AFBF0034 */ sw $ra, 0x0034($sp) -/* 02270 80AE4670 AFB20030 */ sw $s2, 0x0030($sp) -/* 02274 80AE4674 AFB1002C */ sw $s1, 0x002C($sp) -/* 02278 80AE4678 AFB00028 */ sw $s0, 0x0028($sp) -/* 0227C 80AE467C 8C980024 */ lw $t8, 0x0024($a0) ## 00000024 -/* 02280 80AE4680 27AE0064 */ addiu $t6, $sp, 0x0064 ## $t6 = FFFFFFEC -/* 02284 80AE4684 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 02288 80AE4688 ADD80000 */ sw $t8, 0x0000($t6) ## FFFFFFEC -/* 0228C 80AE468C 8C8F0028 */ lw $t7, 0x0028($a0) ## 00000028 -/* 02290 80AE4690 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02294 80AE4694 3C0680AE */ lui $a2, %hi(D_80AE4970) ## $a2 = 80AE0000 -/* 02298 80AE4698 ADCF0004 */ sw $t7, 0x0004($t6) ## FFFFFFF0 -/* 0229C 80AE469C 8C98002C */ lw $t8, 0x002C($a0) ## 0000002C -/* 022A0 80AE46A0 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD8 -/* 022A4 80AE46A4 24C64970 */ addiu $a2, $a2, %lo(D_80AE4970) ## $a2 = 80AE4970 -/* 022A8 80AE46A8 ADD80008 */ sw $t8, 0x0008($t6) ## FFFFFFF4 -/* 022AC 80AE46AC 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 022B0 80AE46B0 2407068F */ addiu $a3, $zero, 0x068F ## $a3 = 0000068F -/* 022B4 80AE46B4 0C031AB1 */ jal Graph_OpenDisps -/* 022B8 80AE46B8 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 022BC 80AE46BC 86190314 */ lh $t9, 0x0314($s0) ## 00000314 -/* 022C0 80AE46C0 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 022C4 80AE46C4 17210044 */ bne $t9, $at, .L80AE47D8 -/* 022C8 80AE46C8 00000000 */ nop -/* 022CC 80AE46CC 0C024F46 */ jal func_80093D18 -/* 022D0 80AE46D0 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 022D4 80AE46D4 8E2302C0 */ lw $v1, 0x02C0($s1) ## 000002C0 -/* 022D8 80AE46D8 3C09FB00 */ lui $t1, 0xFB00 ## $t1 = FB000000 -/* 022DC 80AE46DC 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 -/* 022E0 80AE46E0 24680008 */ addiu $t0, $v1, 0x0008 ## $t0 = 00000008 -/* 022E4 80AE46E4 AE2802C0 */ sw $t0, 0x02C0($s1) ## 000002C0 -/* 022E8 80AE46E8 AC690000 */ sw $t1, 0x0000($v1) ## 00000000 -/* 022EC 80AE46EC 860A0314 */ lh $t2, 0x0314($s0) ## 00000314 -/* 022F0 80AE46F0 3C0E8011 */ lui $t6, %hi(D_80116280+0x10) -/* 022F4 80AE46F4 25CE6290 */ addiu $t6, %lo(D_80116280+0x10) -/* 022F8 80AE46F8 314B00FF */ andi $t3, $t2, 0x00FF ## $t3 = 00000000 -/* 022FC 80AE46FC AC6B0004 */ sw $t3, 0x0004($v1) ## 00000004 -/* 02300 80AE4700 8E2302C0 */ lw $v1, 0x02C0($s1) ## 000002C0 -/* 02304 80AE4704 35AD0020 */ ori $t5, $t5, 0x0020 ## $t5 = DB060020 -/* 02308 80AE4708 3C0F80AE */ lui $t7, %hi(func_80AE44C4) ## $t7 = 80AE0000 -/* 0230C 80AE470C 246C0008 */ addiu $t4, $v1, 0x0008 ## $t4 = 00000008 -/* 02310 80AE4710 AE2C02C0 */ sw $t4, 0x02C0($s1) ## 000002C0 -/* 02314 80AE4714 AC6E0004 */ sw $t6, 0x0004($v1) ## 00000004 -/* 02318 80AE4718 AC6D0000 */ sw $t5, 0x0000($v1) ## 00000000 -/* 0231C 80AE471C 9207018A */ lbu $a3, 0x018A($s0) ## 0000018A -/* 02320 80AE4720 8E0601A8 */ lw $a2, 0x01A8($s0) ## 000001A8 -/* 02324 80AE4724 8E05018C */ lw $a1, 0x018C($s0) ## 0000018C -/* 02328 80AE4728 3C1880AE */ lui $t8, %hi(func_80AE4520) ## $t8 = 80AE0000 -/* 0232C 80AE472C 27184520 */ addiu $t8, $t8, %lo(func_80AE4520) ## $t8 = 80AE4520 -/* 02330 80AE4730 25EF44C4 */ addiu $t7, $t7, %lo(func_80AE44C4) ## $t7 = 80AE44C4 -/* 02334 80AE4734 AFAF0010 */ sw $t7, 0x0010($sp) -/* 02338 80AE4738 AFB80014 */ sw $t8, 0x0014($sp) -/* 0233C 80AE473C AFB00018 */ sw $s0, 0x0018($sp) -/* 02340 80AE4740 8E3902C0 */ lw $t9, 0x02C0($s1) ## 000002C0 -/* 02344 80AE4744 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 02348 80AE4748 0C0289CF */ jal SkelAnime_DrawSV2 -/* 0234C 80AE474C AFB9001C */ sw $t9, 0x001C($sp) -/* 02350 80AE4750 3C0580AE */ lui $a1, %hi(D_80AE4958) ## $a1 = 80AE0000 -/* 02354 80AE4754 AE2202C0 */ sw $v0, 0x02C0($s1) ## 000002C0 -/* 02358 80AE4758 24A54958 */ addiu $a1, $a1, %lo(D_80AE4958) ## $a1 = 80AE4958 -/* 0235C 80AE475C 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFEC -/* 02360 80AE4760 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 02364 80AE4764 0C00CF0C */ jal func_80033C30 -/* 02368 80AE4768 02403825 */ or $a3, $s2, $zero ## $a3 = 00000000 -/* 0236C 80AE476C 9208031A */ lbu $t0, 0x031A($s0) ## 0000031A -/* 02370 80AE4770 1100003F */ beq $t0, $zero, .L80AE4870 -/* 02374 80AE4774 00000000 */ nop -/* 02378 80AE4778 920B031A */ lbu $t3, 0x031A($s0) ## 0000031A -/* 0237C 80AE477C 92090114 */ lbu $t1, 0x0114($s0) ## 00000114 -/* 02380 80AE4780 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 02384 80AE4784 256CFFFF */ addiu $t4, $t3, 0xFFFF ## $t4 = FFFFFFFF -/* 02388 80AE4788 318300FF */ andi $v1, $t4, 0x00FF ## $v1 = 000000FF -/* 0238C 80AE478C 306D0003 */ andi $t5, $v1, 0x0003 ## $t5 = 00000003 -/* 02390 80AE4790 252A0001 */ addiu $t2, $t1, 0x0001 ## $t2 = 00000001 -/* 02394 80AE4794 A20A0114 */ sb $t2, 0x0114($s0) ## 00000114 -/* 02398 80AE4798 15A00035 */ bne $t5, $zero, .L80AE4870 -/* 0239C 80AE479C A20C031A */ sb $t4, 0x031A($s0) ## 0000031A -/* 023A0 80AE47A0 00031083 */ sra $v0, $v1, 2 -/* 023A4 80AE47A4 00027080 */ sll $t6, $v0, 2 -/* 023A8 80AE47A8 01C27023 */ subu $t6, $t6, $v0 -/* 023AC 80AE47AC 000E7040 */ sll $t6, $t6, 1 -/* 023B0 80AE47B0 020E3021 */ addu $a2, $s0, $t6 -/* 023B4 80AE47B4 24C6014C */ addiu $a2, $a2, 0x014C ## $a2 = 0000014C -/* 023B8 80AE47B8 AFA20018 */ sw $v0, 0x0018($sp) -/* 023BC 80AE47BC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 023C0 80AE47C0 2407004B */ addiu $a3, $zero, 0x004B ## $a3 = 0000004B -/* 023C4 80AE47C4 AFA00010 */ sw $zero, 0x0010($sp) -/* 023C8 80AE47C8 0C00A953 */ jal func_8002A54C -/* 023CC 80AE47CC AFA00014 */ sw $zero, 0x0014($sp) -/* 023D0 80AE47D0 10000027 */ beq $zero, $zero, .L80AE4870 -/* 023D4 80AE47D4 00000000 */ nop -.L80AE47D8: -/* 023D8 80AE47D8 0C024F61 */ jal func_80093D84 -/* 023DC 80AE47DC 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 023E0 80AE47E0 8E2302D0 */ lw $v1, 0x02D0($s1) ## 000002D0 -/* 023E4 80AE47E4 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 -/* 023E8 80AE47E8 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 -/* 023EC 80AE47EC 246F0008 */ addiu $t7, $v1, 0x0008 ## $t7 = 00000008 -/* 023F0 80AE47F0 AE2F02D0 */ sw $t7, 0x02D0($s1) ## 000002D0 -/* 023F4 80AE47F4 AC780000 */ sw $t8, 0x0000($v1) ## 00000000 -/* 023F8 80AE47F8 86190314 */ lh $t9, 0x0314($s0) ## 00000314 -/* 023FC 80AE47FC 3C0B8011 */ lui $t3, %hi(D_80116280) -/* 02400 80AE4800 256B6280 */ addiu $t3, %lo(D_80116280) -/* 02404 80AE4804 332800FF */ andi $t0, $t9, 0x00FF ## $t0 = 00000000 -/* 02408 80AE4808 AC680004 */ sw $t0, 0x0004($v1) ## 00000004 -/* 0240C 80AE480C 8E2302D0 */ lw $v1, 0x02D0($s1) ## 000002D0 -/* 02410 80AE4810 354A0020 */ ori $t2, $t2, 0x0020 ## $t2 = DB060020 -/* 02414 80AE4814 3C0C80AE */ lui $t4, %hi(func_80AE44C4) ## $t4 = 80AE0000 -/* 02418 80AE4818 24690008 */ addiu $t1, $v1, 0x0008 ## $t1 = 00000008 -/* 0241C 80AE481C AE2902D0 */ sw $t1, 0x02D0($s1) ## 000002D0 -/* 02420 80AE4820 AC6B0004 */ sw $t3, 0x0004($v1) ## 00000004 -/* 02424 80AE4824 AC6A0000 */ sw $t2, 0x0000($v1) ## 00000000 -/* 02428 80AE4828 9207018A */ lbu $a3, 0x018A($s0) ## 0000018A -/* 0242C 80AE482C 8E0601A8 */ lw $a2, 0x01A8($s0) ## 000001A8 -/* 02430 80AE4830 8E05018C */ lw $a1, 0x018C($s0) ## 0000018C -/* 02434 80AE4834 258C44C4 */ addiu $t4, $t4, %lo(func_80AE44C4) ## $t4 = 80AE44C4 -/* 02438 80AE4838 AFAC0010 */ sw $t4, 0x0010($sp) -/* 0243C 80AE483C AFB00018 */ sw $s0, 0x0018($sp) -/* 02440 80AE4840 AFA00014 */ sw $zero, 0x0014($sp) -/* 02444 80AE4844 8E2D02D0 */ lw $t5, 0x02D0($s1) ## 000002D0 -/* 02448 80AE4848 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 0244C 80AE484C 0C0289CF */ jal SkelAnime_DrawSV2 -/* 02450 80AE4850 AFAD001C */ sw $t5, 0x001C($sp) -/* 02454 80AE4854 AE2202D0 */ sw $v0, 0x02D0($s1) ## 000002D0 -/* 02458 80AE4858 3C0580AE */ lui $a1, %hi(D_80AE4958) ## $a1 = 80AE0000 -/* 0245C 80AE485C 24A54958 */ addiu $a1, $a1, %lo(D_80AE4958) ## $a1 = 80AE4958 -/* 02460 80AE4860 92060315 */ lbu $a2, 0x0315($s0) ## 00000315 -/* 02464 80AE4864 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFEC -/* 02468 80AE4868 0C00CF0C */ jal func_80033C30 -/* 0246C 80AE486C 02403825 */ or $a3, $s2, $zero ## $a3 = 00000000 -.L80AE4870: -/* 02470 80AE4870 3C0680AE */ lui $a2, %hi(D_80AE4980) ## $a2 = 80AE0000 -/* 02474 80AE4874 24C64980 */ addiu $a2, $a2, %lo(D_80AE4980) ## $a2 = 80AE4980 -/* 02478 80AE4878 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD8 -/* 0247C 80AE487C 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 02480 80AE4880 0C031AD5 */ jal Graph_CloseDisps -/* 02484 80AE4884 240706C7 */ addiu $a3, $zero, 0x06C7 ## $a3 = 000006C7 -/* 02488 80AE4888 8FBF0034 */ lw $ra, 0x0034($sp) -/* 0248C 80AE488C 8FB00028 */ lw $s0, 0x0028($sp) -/* 02490 80AE4890 8FB1002C */ lw $s1, 0x002C($sp) -/* 02494 80AE4894 8FB20030 */ lw $s2, 0x0030($sp) -/* 02498 80AE4898 03E00008 */ jr $ra -/* 0249C 80AE489C 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Init.s deleted file mode 100644 index 00f19a95ac..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Init.s +++ /dev/null @@ -1,135 +0,0 @@ -glabel EnRd_Init -/* 00008 80AE2408 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 0000C 80AE240C AFA50044 */ sw $a1, 0x0044($sp) -/* 00010 80AE2410 AFBF002C */ sw $ra, 0x002C($sp) -/* 00014 80AE2414 AFB00028 */ sw $s0, 0x0028($sp) -/* 00018 80AE2418 3C0580AE */ lui $a1, %hi(D_80AE490C) ## $a1 = 80AE0000 -/* 0001C 80AE241C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00020 80AE2420 0C01E037 */ jal Actor_ProcessInitChain - -/* 00024 80AE2424 24A5490C */ addiu $a1, $a1, %lo(D_80AE490C) ## $a1 = 80AE490C -/* 00028 80AE2428 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 0002C 80AE242C 3C0E80AE */ lui $t6, %hi(D_80AE48EC) ## $t6 = 80AE0000 -/* 00030 80AE2430 25CE48EC */ addiu $t6, $t6, %lo(D_80AE48EC) ## $t6 = 80AE48EC -/* 00034 80AE2434 44050000 */ mfc1 $a1, $f0 -/* 00038 80AE2438 44070000 */ mfc1 $a3, $f0 -/* 0003C 80AE243C A200001F */ sb $zero, 0x001F($s0) ## 0000001F -/* 00040 80AE2440 AE0E0098 */ sw $t6, 0x0098($s0) ## 00000098 -/* 00044 80AE2444 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 00048 80AE2448 0C00AC78 */ jal ActorShape_Init - -/* 0004C 80AE244C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00050 80AE2450 8E180028 */ lw $t8, 0x0028($s0) ## 00000028 -/* 00054 80AE2454 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 00058 80AE2458 8E190024 */ lw $t9, 0x0024($s0) ## 00000024 -/* 0005C 80AE245C AE18003C */ sw $t8, 0x003C($s0) ## 0000003C -/* 00060 80AE2460 C604003C */ lwc1 $f4, 0x003C($s0) ## 0000003C -/* 00064 80AE2464 44813000 */ mtc1 $at, $f6 ## $f6 = 50.00 -/* 00068 80AE2468 A600030E */ sh $zero, 0x030E($s0) ## 0000030E -/* 0006C 80AE246C 860F030E */ lh $t7, 0x030E($s0) ## 0000030E -/* 00070 80AE2470 860C001C */ lh $t4, 0x001C($s0) ## 0000001C -/* 00074 80AE2474 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 00078 80AE2478 46062200 */ add.s $f8, $f4, $f6 -/* 0007C 80AE247C AE190038 */ sw $t9, 0x0038($s0) ## 00000038 -/* 00080 80AE2480 8E19002C */ lw $t9, 0x002C($s0) ## 0000002C -/* 00084 80AE2484 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF -/* 00088 80AE2488 A60F0310 */ sh $t7, 0x0310($s0) ## 00000310 -/* 0008C 80AE248C 318DFF00 */ andi $t5, $t4, 0xFF00 ## $t5 = 00000000 -/* 00090 80AE2490 240800FE */ addiu $t0, $zero, 0x00FE ## $t0 = 000000FE -/* 00094 80AE2494 24090008 */ addiu $t1, $zero, 0x0008 ## $t1 = 00000008 -/* 00098 80AE2498 314B00FF */ andi $t3, $t2, 0x00FF ## $t3 = 000000FF -/* 0009C 80AE249C 000D7203 */ sra $t6, $t5, 8 -/* 000A0 80AE24A0 304F0080 */ andi $t7, $v0, 0x0080 ## $t7 = 00000000 -/* 000A4 80AE24A4 E608003C */ swc1 $f8, 0x003C($s0) ## 0000003C -/* 000A8 80AE24A8 A20800AE */ sb $t0, 0x00AE($s0) ## 000000AE -/* 000AC 80AE24AC A20900AF */ sb $t1, 0x00AF($s0) ## 000000AF -/* 000B0 80AE24B0 A60B0314 */ sh $t3, 0x0314($s0) ## 00000314 -/* 000B4 80AE24B4 A20A031D */ sb $t2, 0x031D($s0) ## 0000031D -/* 000B8 80AE24B8 A60E0312 */ sh $t6, 0x0312($s0) ## 00000312 -/* 000BC 80AE24BC 11E00004 */ beq $t7, $zero, .L80AE24D0 -/* 000C0 80AE24C0 AE190040 */ sw $t9, 0x0040($s0) ## 00000040 -/* 000C4 80AE24C4 3458FF00 */ ori $t8, $v0, 0xFF00 ## $t8 = 0000FF00 -/* 000C8 80AE24C8 10000003 */ beq $zero, $zero, .L80AE24D8 -/* 000CC 80AE24CC A618001C */ sh $t8, 0x001C($s0) ## 0000001C -.L80AE24D0: -/* 000D0 80AE24D0 305900FF */ andi $t9, $v0, 0x00FF ## $t9 = 00000000 -/* 000D4 80AE24D4 A619001C */ sh $t9, 0x001C($s0) ## 0000001C -.L80AE24D8: -/* 000D8 80AE24D8 8608001C */ lh $t0, 0x001C($s0) ## 0000001C -/* 000DC 80AE24DC 8FA40044 */ lw $a0, 0x0044($sp) -/* 000E0 80AE24E0 26050188 */ addiu $a1, $s0, 0x0188 ## $a1 = 00000188 -/* 000E4 80AE24E4 2901FFFF */ slti $at, $t0, 0xFFFF -/* 000E8 80AE24E8 14200012 */ bne $at, $zero, .L80AE2534 -/* 000EC 80AE24EC 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 000F0 80AE24F0 26050188 */ addiu $a1, $s0, 0x0188 ## $a1 = 00000188 -/* 000F4 80AE24F4 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 000F8 80AE24F8 3C070601 */ lui $a3, 0x0601 ## $a3 = 06010000 -/* 000FC 80AE24FC 260901CC */ addiu $t1, $s0, 0x01CC ## $t1 = 000001CC -/* 00100 80AE2500 260A0268 */ addiu $t2, $s0, 0x0268 ## $t2 = 00000268 -/* 00104 80AE2504 240B001A */ addiu $t3, $zero, 0x001A ## $t3 = 0000001A -/* 00108 80AE2508 AFAB0018 */ sw $t3, 0x0018($sp) -/* 0010C 80AE250C AFAA0014 */ sw $t2, 0x0014($sp) -/* 00110 80AE2510 AFA90010 */ sw $t1, 0x0010($sp) -/* 00114 80AE2514 24E787D0 */ addiu $a3, $a3, 0x87D0 ## $a3 = 060087D0 -/* 00118 80AE2518 24C6E778 */ addiu $a2, $a2, 0xE778 ## $a2 = 0600E778 -/* 0011C 80AE251C AFA50038 */ sw $a1, 0x0038($sp) -/* 00120 80AE2520 0C0291BE */ jal SkelAnime_InitSV -/* 00124 80AE2524 8FA40044 */ lw $a0, 0x0044($sp) -/* 00128 80AE2528 240C002A */ addiu $t4, $zero, 0x002A ## $t4 = 0000002A -/* 0012C 80AE252C 1000000E */ beq $zero, $zero, .L80AE2568 -/* 00130 80AE2530 A20C0117 */ sb $t4, 0x0117($s0) ## 00000117 -.L80AE2534: -/* 00134 80AE2534 3C070601 */ lui $a3, 0x0601 ## $a3 = 06010000 -/* 00138 80AE2538 260D01CC */ addiu $t5, $s0, 0x01CC ## $t5 = 000001CC -/* 0013C 80AE253C 260E0268 */ addiu $t6, $s0, 0x0268 ## $t6 = 00000268 -/* 00140 80AE2540 240F001A */ addiu $t7, $zero, 0x001A ## $t7 = 0000001A -/* 00144 80AE2544 AFAF0018 */ sw $t7, 0x0018($sp) -/* 00148 80AE2548 AFAE0014 */ sw $t6, 0x0014($sp) -/* 0014C 80AE254C AFAD0010 */ sw $t5, 0x0010($sp) -/* 00150 80AE2550 24E787D0 */ addiu $a3, $a3, 0x87D0 ## $a3 = 060087D0 -/* 00154 80AE2554 24C63DD8 */ addiu $a2, $a2, 0x3DD8 ## $a2 = 00003DD8 -/* 00158 80AE2558 0C0291BE */ jal SkelAnime_InitSV -/* 0015C 80AE255C AFA50038 */ sw $a1, 0x0038($sp) -/* 00160 80AE2560 2418002D */ addiu $t8, $zero, 0x002D ## $t8 = 0000002D -/* 00164 80AE2564 A2180117 */ sb $t8, 0x0117($s0) ## 00000117 -.L80AE2568: -/* 00168 80AE2568 26050320 */ addiu $a1, $s0, 0x0320 ## $a1 = 00000320 -/* 0016C 80AE256C AFA50034 */ sw $a1, 0x0034($sp) -/* 00170 80AE2570 0C0170D9 */ jal Collider_InitCylinder - -/* 00174 80AE2574 8FA40044 */ lw $a0, 0x0044($sp) -/* 00178 80AE2578 3C0780AE */ lui $a3, %hi(D_80AE48C0) ## $a3 = 80AE0000 -/* 0017C 80AE257C 8FA50034 */ lw $a1, 0x0034($sp) -/* 00180 80AE2580 24E748C0 */ addiu $a3, $a3, %lo(D_80AE48C0) ## $a3 = 80AE48C0 -/* 00184 80AE2584 8FA40044 */ lw $a0, 0x0044($sp) -/* 00188 80AE2588 0C01712B */ jal Collider_SetCylinder - -/* 0018C 80AE258C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00190 80AE2590 8619001C */ lh $t9, 0x001C($s0) ## 0000001C -/* 00194 80AE2594 2B21FFFE */ slti $at, $t9, 0xFFFE -/* 00198 80AE2598 14200005 */ bne $at, $zero, .L80AE25B0 -/* 0019C 80AE259C 00000000 */ nop -/* 001A0 80AE25A0 0C2B89A7 */ jal func_80AE269C -/* 001A4 80AE25A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 001A8 80AE25A8 10000003 */ beq $zero, $zero, .L80AE25B8 -/* 001AC 80AE25AC 00000000 */ nop -.L80AE25B0: -/* 001B0 80AE25B0 0C2B8A5C */ jal func_80AE2970 -/* 001B4 80AE25B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80AE25B8: -/* 001B8 80AE25B8 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 001BC 80AE25BC 8FA40038 */ lw $a0, 0x0038($sp) -/* 001C0 80AE25C0 8608001C */ lh $t0, 0x001C($s0) ## 0000001C -/* 001C4 80AE25C4 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 001C8 80AE25C8 55010005 */ bnel $t0, $at, .L80AE25E0 -/* 001CC 80AE25CC 8FBF002C */ lw $ra, 0x002C($sp) -/* 001D0 80AE25D0 8E090004 */ lw $t1, 0x0004($s0) ## 00000004 -/* 001D4 80AE25D4 352A0080 */ ori $t2, $t1, 0x0080 ## $t2 = 00000080 -/* 001D8 80AE25D8 AE0A0004 */ sw $t2, 0x0004($s0) ## 00000004 -/* 001DC 80AE25DC 8FBF002C */ lw $ra, 0x002C($sp) -.L80AE25E0: -/* 001E0 80AE25E0 8FB00028 */ lw $s0, 0x0028($sp) -/* 001E4 80AE25E4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 001E8 80AE25E8 03E00008 */ jr $ra -/* 001EC 80AE25EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Update.s deleted file mode 100644 index 2b14514c1b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Update.s +++ /dev/null @@ -1,138 +0,0 @@ -glabel EnRd_Update -/* 01EDC 80AE42DC 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 01EE0 80AE42E0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01EE4 80AE42E4 AFB00020 */ sw $s0, 0x0020($sp) -/* 01EE8 80AE42E8 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 -/* 01EEC 80AE42EC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01EF0 80AE42F0 AFA50044 */ sw $a1, 0x0044($sp) -/* 01EF4 80AE42F4 0C2B9045 */ jal func_80AE4114 -/* 01EF8 80AE42F8 AFAE0034 */ sw $t6, 0x0034($sp) -/* 01EFC 80AE42FC 3C028016 */ lui $v0, %hi(gSaveContext) -/* 01F00 80AE4300 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 01F04 80AE4304 844F1422 */ lh $t7, 0x1422($v0) ## 8015FA82 -/* 01F08 80AE4308 51E00006 */ beql $t7, $zero, .L80AE4324 -/* 01F0C 80AE430C 9202031C */ lbu $v0, 0x031C($s0) ## 0000031C -/* 01F10 80AE4310 92180318 */ lbu $t8, 0x0318($s0) ## 00000318 -/* 01F14 80AE4314 57000003 */ bnel $t8, $zero, .L80AE4324 -/* 01F18 80AE4318 9202031C */ lbu $v0, 0x031C($s0) ## 0000031C -/* 01F1C 80AE431C A4401422 */ sh $zero, 0x1422($v0) ## 8015FA82 -/* 01F20 80AE4320 9202031C */ lbu $v0, 0x031C($s0) ## 0000031C -.L80AE4324: -/* 01F24 80AE4324 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 01F28 80AE4328 50410038 */ beql $v0, $at, .L80AE440C -/* 01F2C 80AE432C 8E0B0028 */ lw $t3, 0x0028($s0) ## 00000028 -/* 01F30 80AE4330 9219031B */ lbu $t9, 0x031B($s0) ## 0000031B -/* 01F34 80AE4334 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 01F38 80AE4338 17210003 */ bne $t9, $at, .L80AE4348 -/* 01F3C 80AE433C 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 01F40 80AE4340 50410032 */ beql $v0, $at, .L80AE440C -/* 01F44 80AE4344 8E0B0028 */ lw $t3, 0x0028($s0) ## 00000028 -.L80AE4348: -/* 01F48 80AE4348 92020306 */ lbu $v0, 0x0306($s0) ## 00000306 -/* 01F4C 80AE434C 10400002 */ beq $v0, $zero, .L80AE4358 -/* 01F50 80AE4350 2448FFFF */ addiu $t0, $v0, 0xFFFF ## $t0 = 8015E65F -/* 01F54 80AE4354 A2080306 */ sb $t0, 0x0306($s0) ## 00000306 -.L80AE4358: -/* 01F58 80AE4358 8E190308 */ lw $t9, 0x0308($s0) ## 00000308 -/* 01F5C 80AE435C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01F60 80AE4360 8FA50044 */ lw $a1, 0x0044($sp) -/* 01F64 80AE4364 0320F809 */ jalr $ra, $t9 -/* 01F68 80AE4368 00000000 */ nop -/* 01F6C 80AE436C 9202031B */ lbu $v0, 0x031B($s0) ## 0000031B -/* 01F70 80AE4370 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 01F74 80AE4374 5041000B */ beql $v0, $at, .L80AE43A4 -/* 01F78 80AE4378 860900B4 */ lh $t1, 0x00B4($s0) ## 000000B4 -/* 01F7C 80AE437C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01F80 80AE4380 C6060068 */ lwc1 $f6, 0x0068($s0) ## 00000068 -/* 01F84 80AE4384 46062032 */ c.eq.s $f4, $f6 -/* 01F88 80AE4388 00000000 */ nop -/* 01F8C 80AE438C 45030005 */ bc1tl .L80AE43A4 -/* 01F90 80AE4390 860900B4 */ lh $t1, 0x00B4($s0) ## 000000B4 -/* 01F94 80AE4394 0C00B638 */ jal Actor_MoveForward - -/* 01F98 80AE4398 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01F9C 80AE439C 9202031B */ lbu $v0, 0x031B($s0) ## 0000031B -/* 01FA0 80AE43A0 860900B4 */ lh $t1, 0x00B4($s0) ## 000000B4 -.L80AE43A4: -/* 01FA4 80AE43A4 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 01FA8 80AE43A8 55200013 */ bnel $t1, $zero, .L80AE43F8 -/* 01FAC 80AE43AC 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 01FB0 80AE43B0 50410011 */ beql $v0, $at, .L80AE43F8 -/* 01FB4 80AE43B4 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 01FB8 80AE43B8 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 01FBC 80AE43BC C60A0068 */ lwc1 $f10, 0x0068($s0) ## 00000068 -/* 01FC0 80AE43C0 8FA40044 */ lw $a0, 0x0044($sp) -/* 01FC4 80AE43C4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01FC8 80AE43C8 460A4032 */ c.eq.s $f8, $f10 -/* 01FCC 80AE43CC 3C0641F0 */ lui $a2, 0x41F0 ## $a2 = 41F00000 -/* 01FD0 80AE43D0 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 -/* 01FD4 80AE43D4 3C01420C */ lui $at, 0x420C ## $at = 420C0000 -/* 01FD8 80AE43D8 45010006 */ bc1t .L80AE43F4 -/* 01FDC 80AE43DC 240A001D */ addiu $t2, $zero, 0x001D ## $t2 = 0000001D -/* 01FE0 80AE43E0 44818000 */ mtc1 $at, $f16 ## $f16 = 35.00 -/* 01FE4 80AE43E4 AFAA0014 */ sw $t2, 0x0014($sp) -/* 01FE8 80AE43E8 0C00B92D */ jal func_8002E4B4 -/* 01FEC 80AE43EC E7B00010 */ swc1 $f16, 0x0010($sp) -/* 01FF0 80AE43F0 9202031B */ lbu $v0, 0x031B($s0) ## 0000031B -.L80AE43F4: -/* 01FF4 80AE43F4 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -.L80AE43F8: -/* 01FF8 80AE43F8 14410003 */ bne $v0, $at, .L80AE4408 -/* 01FFC 80AE43FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02000 80AE4400 0C2B8FE7 */ jal func_80AE3F9C -/* 02004 80AE4404 8FA50044 */ lw $a1, 0x0044($sp) -.L80AE4408: -/* 02008 80AE4408 8E0B0028 */ lw $t3, 0x0028($s0) ## 00000028 -.L80AE440C: -/* 0200C 80AE440C 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 02010 80AE4410 8E0C0024 */ lw $t4, 0x0024($s0) ## 00000024 -/* 02014 80AE4414 AE0B003C */ sw $t3, 0x003C($s0) ## 0000003C -/* 02018 80AE4418 C612003C */ lwc1 $f18, 0x003C($s0) ## 0000003C -/* 0201C 80AE441C 44812000 */ mtc1 $at, $f4 ## $f4 = 50.00 -/* 02020 80AE4420 920D00AF */ lbu $t5, 0x00AF($s0) ## 000000AF -/* 02024 80AE4424 AE0C0038 */ sw $t4, 0x0038($s0) ## 00000038 -/* 02028 80AE4428 46049180 */ add.s $f6, $f18, $f4 -/* 0202C 80AE442C 8E0C002C */ lw $t4, 0x002C($s0) ## 0000002C -/* 02030 80AE4430 E606003C */ swc1 $f6, 0x003C($s0) ## 0000003C -/* 02034 80AE4434 19A0001E */ blez $t5, .L80AE44B0 -/* 02038 80AE4438 AE0C0040 */ sw $t4, 0x0040($s0) ## 00000040 -/* 0203C 80AE443C 920E031B */ lbu $t6, 0x031B($s0) ## 0000031B -/* 02040 80AE4440 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 02044 80AE4444 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02048 80AE4448 11C10019 */ beq $t6, $at, .L80AE44B0 -/* 0204C 80AE444C 26050320 */ addiu $a1, $s0, 0x0320 ## $a1 = 00000320 -/* 02050 80AE4450 0C0189B7 */ jal Collider_CylinderUpdate - -/* 02054 80AE4454 AFA50028 */ sw $a1, 0x0028($sp) -/* 02058 80AE4458 8FA40044 */ lw $a0, 0x0044($sp) -/* 0205C 80AE445C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 02060 80AE4460 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 02064 80AE4464 00812821 */ addu $a1, $a0, $at -/* 02068 80AE4468 AFA5002C */ sw $a1, 0x002C($sp) -/* 0206C 80AE446C 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOT -/* 02070 80AE4470 8FA60028 */ lw $a2, 0x0028($sp) -/* 02074 80AE4474 9218031B */ lbu $t8, 0x031B($s0) ## 0000031B -/* 02078 80AE4478 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 0207C 80AE447C 8FA5002C */ lw $a1, 0x002C($sp) -/* 02080 80AE4480 17010008 */ bne $t8, $at, .L80AE44A4 -/* 02084 80AE4484 8FA20034 */ lw $v0, 0x0034($sp) -/* 02088 80AE4488 80480844 */ lb $t0, 0x0844($v0) ## 00000844 -/* 0208C 80AE448C 51000009 */ beql $t0, $zero, .L80AE44B4 -/* 02090 80AE4490 8FBF0024 */ lw $ra, 0x0024($sp) -/* 02094 80AE4494 9219031D */ lbu $t9, 0x031D($s0) ## 0000031D -/* 02098 80AE4498 90490845 */ lbu $t1, 0x0845($v0) ## 00000845 -/* 0209C 80AE449C 53290005 */ beql $t9, $t1, .L80AE44B4 -/* 020A0 80AE44A0 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AE44A4: -/* 020A4 80AE44A4 8FA40044 */ lw $a0, 0x0044($sp) -/* 020A8 80AE44A8 0C01767D */ jal CollisionCheck_SetAC - ## CollisionCheck_setAC -/* 020AC 80AE44AC 8FA60028 */ lw $a2, 0x0028($sp) -.L80AE44B0: -/* 020B0 80AE44B0 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AE44B4: -/* 020B4 80AE44B4 8FB00020 */ lw $s0, 0x0020($sp) -/* 020B8 80AE44B8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 020BC 80AE44BC 03E00008 */ jr $ra -/* 020C0 80AE44C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2400.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2400.s deleted file mode 100644 index 56ab7ad8d8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2400.s +++ /dev/null @@ -1,3 +0,0 @@ -glabel func_80AE2400 -/* 00000 80AE2400 03E00008 */ jr $ra -/* 00004 80AE2404 AC850308 */ sw $a1, 0x0308($a0) ## 00000308 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2630.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2630.s deleted file mode 100644 index 288d05e331..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2630.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_80AE2630 -/* 00230 80AE2630 8C821C5C */ lw $v0, 0x1C5C($a0) ## 00001C5C -/* 00234 80AE2634 24030090 */ addiu $v1, $zero, 0x0090 ## $v1 = 00000090 -/* 00238 80AE2638 10400016 */ beq $v0, $zero, .L80AE2694 -/* 0023C 80AE263C 00000000 */ nop -/* 00240 80AE2640 844E0000 */ lh $t6, 0x0000($v0) ## 00000000 -.L80AE2644: -/* 00244 80AE2644 146E0006 */ bne $v1, $t6, .L80AE2660 -/* 00248 80AE2648 00000000 */ nop -/* 0024C 80AE264C 10450004 */ beq $v0, $a1, .L80AE2660 -/* 00250 80AE2650 00000000 */ nop -/* 00254 80AE2654 844F001C */ lh $t7, 0x001C($v0) ## 0000001C -/* 00258 80AE2658 05E10003 */ bgez $t7, .L80AE2668 -/* 0025C 80AE265C 00000000 */ nop -.L80AE2660: -/* 00260 80AE2660 1000000A */ beq $zero, $zero, .L80AE268C -/* 00264 80AE2664 8C420124 */ lw $v0, 0x0124($v0) ## 00000124 -.L80AE2668: -/* 00268 80AE2668 50C00004 */ beql $a2, $zero, .L80AE267C -/* 0026C 80AE266C 8C580118 */ lw $t8, 0x0118($v0) ## 00000118 -/* 00270 80AE2670 10000005 */ beq $zero, $zero, .L80AE2688 -/* 00274 80AE2674 AC450118 */ sw $a1, 0x0118($v0) ## 00000118 -/* 00278 80AE2678 8C580118 */ lw $t8, 0x0118($v0) ## 00000118 -.L80AE267C: -/* 0027C 80AE267C 54B80003 */ bnel $a1, $t8, .L80AE268C -/* 00280 80AE2680 8C420124 */ lw $v0, 0x0124($v0) ## 00000124 -/* 00284 80AE2684 AC400118 */ sw $zero, 0x0118($v0) ## 00000118 -.L80AE2688: -/* 00288 80AE2688 8C420124 */ lw $v0, 0x0124($v0) ## 00000124 -.L80AE268C: -/* 0028C 80AE268C 5440FFED */ bnel $v0, $zero, .L80AE2644 -/* 00290 80AE2690 844E0000 */ lh $t6, 0x0000($v0) ## 00000000 -.L80AE2694: -/* 00294 80AE2694 03E00008 */ jr $ra -/* 00298 80AE2698 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE269C.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE269C.s deleted file mode 100644 index e4fece9e3d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE269C.s +++ /dev/null @@ -1,46 +0,0 @@ -glabel func_80AE269C -/* 0029C 80AE269C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 002A0 80AE26A0 AFBF001C */ sw $ra, 0x001C($sp) -/* 002A4 80AE26A4 AFB00018 */ sw $s0, 0x0018($sp) -/* 002A8 80AE26A8 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 002AC 80AE26AC 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 002B0 80AE26B0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 002B4 80AE26B4 11C10008 */ beq $t6, $at, .L80AE26D8 -/* 002B8 80AE26B8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 002BC 80AE26BC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 002C0 80AE26C0 24A587D0 */ addiu $a1, $a1, 0x87D0 ## $a1 = 060087D0 -/* 002C4 80AE26C4 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 002C8 80AE26C8 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat -/* 002CC 80AE26CC 3C06C0C0 */ lui $a2, 0xC0C0 ## $a2 = C0C00000 -/* 002D0 80AE26D0 10000004 */ beq $zero, $zero, .L80AE26E4 -/* 002D4 80AE26D4 00000000 */ nop -.L80AE26D8: -/* 002D8 80AE26D8 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 -/* 002DC 80AE26DC 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat -/* 002E0 80AE26E0 24A55D98 */ addiu $a1, $a1, 0x5D98 ## $a1 = 00005D98 -.L80AE26E4: -/* 002E4 80AE26E4 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 002E8 80AE26E8 A200031B */ sb $zero, 0x031B($s0) ## 0000031B -/* 002EC 80AE26EC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 002F0 80AE26F0 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 -/* 002F4 80AE26F4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 002F8 80AE26F8 44814000 */ mtc1 $at, $f8 ## $f8 = 5.00 -/* 002FC 80AE26FC 46040182 */ mul.s $f6, $f0, $f4 -/* 00300 80AE2700 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 00304 80AE2704 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B6 -/* 00308 80AE2708 3C0580AE */ lui $a1, %hi(func_80AE2744) ## $a1 = 80AE0000 -/* 0030C 80AE270C 24A52744 */ addiu $a1, $a1, %lo(func_80AE2744) ## $a1 = 80AE2744 -/* 00310 80AE2710 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00314 80AE2714 E6120068 */ swc1 $f18, 0x0068($s0) ## 00000068 -/* 00318 80AE2718 46083280 */ add.s $f10, $f6, $f8 -/* 0031C 80AE271C A6190032 */ sh $t9, 0x0032($s0) ## 00000032 -/* 00320 80AE2720 4600540D */ trunc.w.s $f16, $f10 -/* 00324 80AE2724 44188000 */ mfc1 $t8, $f16 -/* 00328 80AE2728 0C2B8900 */ jal func_80AE2400 -/* 0032C 80AE272C A618030C */ sh $t8, 0x030C($s0) ## 0000030C -/* 00330 80AE2730 8FBF001C */ lw $ra, 0x001C($sp) -/* 00334 80AE2734 8FB00018 */ lw $s0, 0x0018($sp) -/* 00338 80AE2738 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0033C 80AE273C 03E00008 */ jr $ra -/* 00340 80AE2740 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2744.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2744.s deleted file mode 100644 index 665921f698..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2744.s +++ /dev/null @@ -1,156 +0,0 @@ -glabel func_80AE2744 -/* 00344 80AE2744 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00348 80AE2748 AFB00020 */ sw $s0, 0x0020($sp) -/* 0034C 80AE274C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00350 80AE2750 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00354 80AE2754 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 00358 80AE2758 AFA50034 */ sw $a1, 0x0034($sp) -/* 0035C 80AE275C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00360 80AE2760 AFA4002C */ sw $a0, 0x002C($sp) -/* 00364 80AE2764 2604030E */ addiu $a0, $s0, 0x030E ## $a0 = 0000030E -/* 00368 80AE2768 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0036C 80AE276C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00370 80AE2770 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 -/* 00374 80AE2774 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00378 80AE2778 AFA00010 */ sw $zero, 0x0010($sp) -/* 0037C 80AE277C 26040310 */ addiu $a0, $s0, 0x0310 ## $a0 = 00000310 -/* 00380 80AE2780 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00384 80AE2784 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00388 80AE2788 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 -/* 0038C 80AE278C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00390 80AE2790 AFA00010 */ sw $zero, 0x0010($sp) -/* 00394 80AE2794 860E001C */ lh $t6, 0x001C($s0) ## 0000001C -/* 00398 80AE2798 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0039C 80AE279C 55C1001C */ bnel $t6, $at, .L80AE2810 -/* 003A0 80AE27A0 860F030C */ lh $t7, 0x030C($s0) ## 0000030C -/* 003A4 80AE27A4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 003A8 80AE27A8 C60601A0 */ lwc1 $f6, 0x01A0($s0) ## 000001A0 -/* 003AC 80AE27AC 46062032 */ c.eq.s $f4, $f6 -/* 003B0 80AE27B0 00000000 */ nop -/* 003B4 80AE27B4 45020016 */ bc1fl .L80AE2810 -/* 003B8 80AE27B8 860F030C */ lh $t7, 0x030C($s0) ## 0000030C -/* 003BC 80AE27BC 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 003C0 80AE27C0 00000000 */ nop -/* 003C4 80AE27C4 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 003C8 80AE27C8 44814000 */ mtc1 $at, $f8 ## $f8 = 0.50 -/* 003CC 80AE27CC 8FA4002C */ lw $a0, 0x002C($sp) -/* 003D0 80AE27D0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 003D4 80AE27D4 4600403E */ c.le.s $f8, $f0 -/* 003D8 80AE27D8 00000000 */ nop -/* 003DC 80AE27DC 45000007 */ bc1f .L80AE27FC -/* 003E0 80AE27E0 00000000 */ nop -/* 003E4 80AE27E4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 003E8 80AE27E8 24A55D98 */ addiu $a1, $a1, 0x5D98 ## $a1 = 06005D98 -/* 003EC 80AE27EC 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat -/* 003F0 80AE27F0 8FA4002C */ lw $a0, 0x002C($sp) -/* 003F4 80AE27F4 10000018 */ beq $zero, $zero, .L80AE2858 -/* 003F8 80AE27F8 8E0A0118 */ lw $t2, 0x0118($s0) ## 00000118 -.L80AE27FC: -/* 003FC 80AE27FC 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat -/* 00400 80AE2800 24A557AC */ addiu $a1, $a1, 0x57AC ## $a1 = 000057AC -/* 00404 80AE2804 10000014 */ beq $zero, $zero, .L80AE2858 -/* 00408 80AE2808 8E0A0118 */ lw $t2, 0x0118($s0) ## 00000118 -/* 0040C 80AE280C 860F030C */ lh $t7, 0x030C($s0) ## 0000030C -.L80AE2810: -/* 00410 80AE2810 25F8FFFF */ addiu $t8, $t7, 0xFFFF ## $t8 = FFFFFFFF -/* 00414 80AE2814 A618030C */ sh $t8, 0x030C($s0) ## 0000030C -/* 00418 80AE2818 8619030C */ lh $t9, 0x030C($s0) ## 0000030C -/* 0041C 80AE281C 5720000E */ bnel $t9, $zero, .L80AE2858 -/* 00420 80AE2820 8E0A0118 */ lw $t2, 0x0118($s0) ## 00000118 -/* 00424 80AE2824 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00428 80AE2828 00000000 */ nop -/* 0042C 80AE282C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00430 80AE2830 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 -/* 00434 80AE2834 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00438 80AE2838 46020282 */ mul.s $f10, $f0, $f2 -/* 0043C 80AE283C E60401A0 */ swc1 $f4, 0x01A0($s0) ## 000001A0 -/* 00440 80AE2840 46025400 */ add.s $f16, $f10, $f2 -/* 00444 80AE2844 4600848D */ trunc.w.s $f18, $f16 -/* 00448 80AE2848 44099000 */ mfc1 $t1, $f18 -/* 0044C 80AE284C 00000000 */ nop -/* 00450 80AE2850 A609030C */ sh $t1, 0x030C($s0) ## 0000030C -/* 00454 80AE2854 8E0A0118 */ lw $t2, 0x0118($s0) ## 00000118 -.L80AE2858: -/* 00458 80AE2858 51400011 */ beql $t2, $zero, .L80AE28A0 -/* 0045C 80AE285C 920D0305 */ lbu $t5, 0x0305($s0) ## 00000305 -/* 00460 80AE2860 920B0305 */ lbu $t3, 0x0305($s0) ## 00000305 -/* 00464 80AE2864 55600034 */ bnel $t3, $zero, .L80AE2938 -/* 00468 80AE2868 8FB90034 */ lw $t9, 0x0034($sp) -/* 0046C 80AE286C 860C001C */ lh $t4, 0x001C($s0) ## 0000001C -/* 00470 80AE2870 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00474 80AE2874 11810005 */ beq $t4, $at, .L80AE288C -/* 00478 80AE2878 00000000 */ nop -/* 0047C 80AE287C 0C2B8C77 */ jal func_80AE31DC -/* 00480 80AE2880 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00484 80AE2884 1000002C */ beq $zero, $zero, .L80AE2938 -/* 00488 80AE2888 8FB90034 */ lw $t9, 0x0034($sp) -.L80AE288C: -/* 0048C 80AE288C 0C2B8E4B */ jal func_80AE392C -/* 00490 80AE2890 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00494 80AE2894 10000028 */ beq $zero, $zero, .L80AE2938 -/* 00498 80AE2898 8FB90034 */ lw $t9, 0x0034($sp) -/* 0049C 80AE289C 920D0305 */ lbu $t5, 0x0305($s0) ## 00000305 -.L80AE28A0: -/* 004A0 80AE28A0 51A0000C */ beql $t5, $zero, .L80AE28D4 -/* 004A4 80AE28A4 3C014316 */ lui $at, 0x4316 ## $at = 43160000 -/* 004A8 80AE28A8 860E001C */ lh $t6, 0x001C($s0) ## 0000001C -/* 004AC 80AE28AC 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 004B0 80AE28B0 11C10005 */ beq $t6, $at, .L80AE28C8 -/* 004B4 80AE28B4 00000000 */ nop -/* 004B8 80AE28B8 0C2B8DEF */ jal func_80AE37BC -/* 004BC 80AE28BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 004C0 80AE28C0 10000004 */ beq $zero, $zero, .L80AE28D4 -/* 004C4 80AE28C4 3C014316 */ lui $at, 0x4316 ## $at = 43160000 -.L80AE28C8: -/* 004C8 80AE28C8 0C2B8E4B */ jal func_80AE392C -/* 004CC 80AE28CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 004D0 80AE28D0 3C014316 */ lui $at, 0x4316 ## $at = 43160000 -.L80AE28D4: -/* 004D4 80AE28D4 44813000 */ mtc1 $at, $f6 ## $f6 = 150.00 -/* 004D8 80AE28D8 C6080090 */ lwc1 $f8, 0x0090($s0) ## 00000090 -/* 004DC 80AE28DC A2000305 */ sb $zero, 0x0305($s0) ## 00000305 -/* 004E0 80AE28E0 4606403E */ c.le.s $f8, $f6 -/* 004E4 80AE28E4 00000000 */ nop -/* 004E8 80AE28E8 45020013 */ bc1fl .L80AE2938 -/* 004EC 80AE28EC 8FB90034 */ lw $t9, 0x0034($sp) -/* 004F0 80AE28F0 0C00B779 */ jal func_8002DDE4 -/* 004F4 80AE28F4 8FA40034 */ lw $a0, 0x0034($sp) -/* 004F8 80AE28F8 5040000F */ beql $v0, $zero, .L80AE2938 -/* 004FC 80AE28FC 8FB90034 */ lw $t9, 0x0034($sp) -/* 00500 80AE2900 860F001C */ lh $t7, 0x001C($s0) ## 0000001C -/* 00504 80AE2904 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00508 80AE2908 11E10008 */ beq $t7, $at, .L80AE292C -/* 0050C 80AE290C 00000000 */ nop -/* 00510 80AE2910 92180305 */ lbu $t8, 0x0305($s0) ## 00000305 -/* 00514 80AE2914 17000005 */ bne $t8, $zero, .L80AE292C -/* 00518 80AE2918 00000000 */ nop -/* 0051C 80AE291C 0C2B8DEF */ jal func_80AE37BC -/* 00520 80AE2920 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00524 80AE2924 10000004 */ beq $zero, $zero, .L80AE2938 -/* 00528 80AE2928 8FB90034 */ lw $t9, 0x0034($sp) -.L80AE292C: -/* 0052C 80AE292C 0C2B8E4B */ jal func_80AE392C -/* 00530 80AE2930 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00534 80AE2934 8FB90034 */ lw $t9, 0x0034($sp) -.L80AE2938: -/* 00538 80AE2938 3C080001 */ lui $t0, 0x0001 ## $t0 = 00010000 -/* 0053C 80AE293C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00540 80AE2940 01194021 */ addu $t0, $t0, $t9 -/* 00544 80AE2944 8D081DE4 */ lw $t0, 0x1DE4($t0) ## 00011DE4 -/* 00548 80AE2948 3109005F */ andi $t1, $t0, 0x005F ## $t1 = 00000000 -/* 0054C 80AE294C 55200004 */ bnel $t1, $zero, .L80AE2960 -/* 00550 80AE2950 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00554 80AE2954 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00558 80AE2958 240538E4 */ addiu $a1, $zero, 0x38E4 ## $a1 = 000038E4 -/* 0055C 80AE295C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AE2960: -/* 00560 80AE2960 8FB00020 */ lw $s0, 0x0020($sp) -/* 00564 80AE2964 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00568 80AE2968 03E00008 */ jr $ra -/* 0056C 80AE296C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2970.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2970.s deleted file mode 100644 index 8bb5fff237..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2970.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_80AE2970 -/* 00570 80AE2970 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00574 80AE2974 AFB00028 */ sw $s0, 0x0028($sp) -/* 00578 80AE2978 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0057C 80AE297C AFBF002C */ sw $ra, 0x002C($sp) -/* 00580 80AE2980 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 00584 80AE2984 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00588 80AE2988 248487D0 */ addiu $a0, $a0, 0x87D0 ## $a0 = 060087D0 -/* 0058C 80AE298C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00590 80AE2990 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00594 80AE2994 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 -/* 00598 80AE2998 468021A0 */ cvt.s.w $f6, $f4 -/* 0059C 80AE299C 44814000 */ mtc1 $at, $f8 ## $f8 = -6.00 -/* 005A0 80AE29A0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 005A4 80AE29A4 44060000 */ mfc1 $a2, $f0 -/* 005A8 80AE29A8 44070000 */ mfc1 $a3, $f0 -/* 005AC 80AE29AC 24A587D0 */ addiu $a1, $a1, 0x87D0 ## $a1 = 060087D0 -/* 005B0 80AE29B0 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 005B4 80AE29B4 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 -/* 005B8 80AE29B8 AFA00014 */ sw $zero, 0x0014($sp) -/* 005BC 80AE29BC 0C029468 */ jal SkelAnime_ChangeAnim - -/* 005C0 80AE29C0 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 005C4 80AE29C4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 005C8 80AE29C8 240E000B */ addiu $t6, $zero, 0x000B ## $t6 = 0000000B -/* 005CC 80AE29CC 240F0006 */ addiu $t7, $zero, 0x0006 ## $t7 = 00000006 -/* 005D0 80AE29D0 2418C000 */ addiu $t8, $zero, 0xC000 ## $t8 = FFFFC000 -/* 005D4 80AE29D4 3C0580AE */ lui $a1, %hi(func_80AE2A10) ## $a1 = 80AE0000 -/* 005D8 80AE29D8 A20E031B */ sb $t6, 0x031B($s0) ## 0000031B -/* 005DC 80AE29DC A60F030C */ sh $t7, 0x030C($s0) ## 0000030C -/* 005E0 80AE29E0 A61800B4 */ sh $t8, 0x00B4($s0) ## 000000B4 -/* 005E4 80AE29E4 24A52A10 */ addiu $a1, $a1, %lo(func_80AE2A10) ## $a1 = 80AE2A10 -/* 005E8 80AE29E8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 005EC 80AE29EC E600006C */ swc1 $f0, 0x006C($s0) ## 0000006C -/* 005F0 80AE29F0 E60000BC */ swc1 $f0, 0x00BC($s0) ## 000000BC -/* 005F4 80AE29F4 0C2B8900 */ jal func_80AE2400 -/* 005F8 80AE29F8 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 005FC 80AE29FC 8FBF002C */ lw $ra, 0x002C($sp) -/* 00600 80AE2A00 8FB00028 */ lw $s0, 0x0028($sp) -/* 00604 80AE2A04 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00608 80AE2A08 03E00008 */ jr $ra -/* 0060C 80AE2A0C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2A10.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2A10.s deleted file mode 100644 index 29ad4507d4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2A10.s +++ /dev/null @@ -1,119 +0,0 @@ -.late_rodata -glabel D_80AE4990 - .float 0.3 - -glabel D_80AE4994 - .float 0.3 - -glabel D_80AE4998 - .float 0.3 - -.text -glabel func_80AE2A10 -/* 00610 80AE2A10 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00614 80AE2A14 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00618 80AE2A18 AFB00020 */ sw $s0, 0x0020($sp) -/* 0061C 80AE2A1C AFA5002C */ sw $a1, 0x002C($sp) -/* 00620 80AE2A20 848E00B4 */ lh $t6, 0x00B4($a0) ## 000000B4 -/* 00624 80AE2A24 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00628 80AE2A28 2401C000 */ addiu $at, $zero, 0xC000 ## $at = FFFFC000 -/* 0062C 80AE2A2C 11C1001A */ beq $t6, $at, .L80AE2A98 -/* 00630 80AE2A30 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 -/* 00634 80AE2A34 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00638 80AE2A38 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 0063C 80AE2A3C 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 -/* 00640 80AE2A40 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00644 80AE2A44 AFA00010 */ sw $zero, 0x0010($sp) -/* 00648 80AE2A48 3C0180AE */ lui $at, %hi(D_80AE4990) ## $at = 80AE0000 -/* 0064C 80AE2A4C C4224990 */ lwc1 $f2, %lo(D_80AE4990)($at) -/* 00650 80AE2A50 8E05000C */ lw $a1, 0x000C($s0) ## 0000000C -/* 00654 80AE2A54 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 00658 80AE2A58 44061000 */ mfc1 $a2, $f2 -/* 0065C 80AE2A5C 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 -/* 00660 80AE2A60 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 00664 80AE2A64 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 00668 80AE2A68 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 0066C 80AE2A6C 3C01C060 */ lui $at, 0xC060 ## $at = C0600000 -/* 00670 80AE2A70 46040032 */ c.eq.s $f0, $f4 -/* 00674 80AE2A74 00000000 */ nop -/* 00678 80AE2A78 45020041 */ bc1fl .L80AE2B80 -/* 0067C 80AE2A7C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00680 80AE2A80 44813000 */ mtc1 $at, $f6 ## $f6 = -3.50 -/* 00684 80AE2A84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00688 80AE2A88 0C2B89A7 */ jal func_80AE269C -/* 0068C 80AE2A8C E606006C */ swc1 $f6, 0x006C($s0) ## 0000006C -/* 00690 80AE2A90 1000003B */ beq $zero, $zero, .L80AE2B80 -/* 00694 80AE2A94 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AE2A98: -/* 00698 80AE2A98 C600000C */ lwc1 $f0, 0x000C($s0) ## 0000000C -/* 0069C 80AE2A9C C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 006A0 80AE2AA0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 006A4 80AE2AA4 46080032 */ c.eq.s $f0, $f8 -/* 006A8 80AE2AA8 00000000 */ nop -/* 006AC 80AE2AAC 45000004 */ bc1f .L80AE2AC0 -/* 006B0 80AE2AB0 00000000 */ nop -/* 006B4 80AE2AB4 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 006B8 80AE2AB8 240538E4 */ addiu $a1, $zero, 0x38E4 ## $a1 = 000038E4 -/* 006BC 80AE2ABC C600000C */ lwc1 $f0, 0x000C($s0) ## 0000000C -.L80AE2AC0: -/* 006C0 80AE2AC0 3C0180AE */ lui $at, %hi(D_80AE4994) ## $at = 80AE0000 -/* 006C4 80AE2AC4 C4224994 */ lwc1 $f2, %lo(D_80AE4994)($at) -/* 006C8 80AE2AC8 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 006CC 80AE2ACC 44815000 */ mtc1 $at, $f10 ## $f10 = 50.00 -/* 006D0 80AE2AD0 44061000 */ mfc1 $a2, $f2 -/* 006D4 80AE2AD4 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 006D8 80AE2AD8 460A0400 */ add.s $f16, $f0, $f10 -/* 006DC 80AE2ADC 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 -/* 006E0 80AE2AE0 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 006E4 80AE2AE4 44058000 */ mfc1 $a1, $f16 -/* 006E8 80AE2AE8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 006EC 80AE2AEC 00000000 */ nop -/* 006F0 80AE2AF0 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 006F4 80AE2AF4 3C0180AE */ lui $at, %hi(D_80AE4998) ## $at = 80AE0000 -/* 006F8 80AE2AF8 C4224998 */ lwc1 $f2, %lo(D_80AE4998)($at) -/* 006FC 80AE2AFC 460C0032 */ c.eq.s $f0, $f12 -/* 00700 80AE2B00 00000000 */ nop -/* 00704 80AE2B04 4502001E */ bc1fl .L80AE2B80 -/* 00708 80AE2B08 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0070C 80AE2B0C 8602030C */ lh $v0, 0x030C($s0) ## 0000030C -/* 00710 80AE2B10 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 00714 80AE2B14 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 00718 80AE2B18 1040000A */ beq $v0, $zero, .L80AE2B44 -/* 0071C 80AE2B1C 244FFFFF */ addiu $t7, $v0, 0xFFFF ## $t7 = FFFFFFFF -/* 00720 80AE2B20 A60F030C */ sh $t7, 0x030C($s0) ## 0000030C -/* 00724 80AE2B24 44061000 */ mfc1 $a2, $f2 -/* 00728 80AE2B28 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 0072C 80AE2B2C 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 00730 80AE2B30 3C0540C0 */ lui $a1, 0x40C0 ## $a1 = 40C00000 -/* 00734 80AE2B34 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 00738 80AE2B38 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 0073C 80AE2B3C 10000010 */ beq $zero, $zero, .L80AE2B80 -/* 00740 80AE2B40 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AE2B44: -/* 00744 80AE2B44 44056000 */ mfc1 $a1, $f12 -/* 00748 80AE2B48 44061000 */ mfc1 $a2, $f2 -/* 0074C 80AE2B4C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 00750 80AE2B50 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 00754 80AE2B54 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 00758 80AE2B58 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 0075C 80AE2B5C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00760 80AE2B60 46120032 */ c.eq.s $f0, $f18 -/* 00764 80AE2B64 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00768 80AE2B68 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 -/* 0076C 80AE2B6C 45020004 */ bc1fl .L80AE2B80 -/* 00770 80AE2B70 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00774 80AE2B74 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00778 80AE2B78 AFA00010 */ sw $zero, 0x0010($sp) -/* 0077C 80AE2B7C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AE2B80: -/* 00780 80AE2B80 8FB00020 */ lw $s0, 0x0020($sp) -/* 00784 80AE2B84 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00788 80AE2B88 03E00008 */ jr $ra -/* 0078C 80AE2B8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2B90.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2B90.s deleted file mode 100644 index eaa537eac6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2B90.s +++ /dev/null @@ -1,43 +0,0 @@ -.late_rodata -glabel D_80AE499C - .float 0.4 - -.text -glabel func_80AE2B90 -/* 00790 80AE2B90 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00794 80AE2B94 AFA40028 */ sw $a0, 0x0028($sp) -/* 00798 80AE2B98 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0079C 80AE2B9C 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 007A0 80AE2BA0 AFA5002C */ sw $a1, 0x002C($sp) -/* 007A4 80AE2BA4 0C028800 */ jal SkelAnime_GetFrameCount - -/* 007A8 80AE2BA8 2484EFDC */ addiu $a0, $a0, 0xEFDC ## $a0 = 0600EFDC -/* 007AC 80AE2BAC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 007B0 80AE2BB0 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 -/* 007B4 80AE2BB4 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 -/* 007B8 80AE2BB8 468021A0 */ cvt.s.w $f6, $f4 -/* 007BC 80AE2BBC 8FA40028 */ lw $a0, 0x0028($sp) -/* 007C0 80AE2BC0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 007C4 80AE2BC4 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 007C8 80AE2BC8 AFAE0014 */ sw $t6, 0x0014($sp) -/* 007CC 80AE2BCC 24A5EFDC */ addiu $a1, $a1, 0xEFDC ## $a1 = 0600EFDC -/* 007D0 80AE2BD0 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 007D4 80AE2BD4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 007D8 80AE2BD8 3C074080 */ lui $a3, 0x4080 ## $a3 = 40800000 -/* 007DC 80AE2BDC E7A80018 */ swc1 $f8, 0x0018($sp) -/* 007E0 80AE2BE0 0C029468 */ jal SkelAnime_ChangeAnim - -/* 007E4 80AE2BE4 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 007E8 80AE2BE8 8FA40028 */ lw $a0, 0x0028($sp) -/* 007EC 80AE2BEC 3C0180AE */ lui $at, %hi(D_80AE499C) ## $at = 80AE0000 -/* 007F0 80AE2BF0 C42A499C */ lwc1 $f10, %lo(D_80AE499C)($at) -/* 007F4 80AE2BF4 240F0004 */ addiu $t7, $zero, 0x0004 ## $t7 = 00000004 -/* 007F8 80AE2BF8 3C0580AE */ lui $a1, %hi(func_80AE2C1C) ## $a1 = 80AE0000 -/* 007FC 80AE2BFC 24A52C1C */ addiu $a1, $a1, %lo(func_80AE2C1C) ## $a1 = 80AE2C1C -/* 00800 80AE2C00 A08F031B */ sb $t7, 0x031B($a0) ## 0000031B -/* 00804 80AE2C04 0C2B8900 */ jal func_80AE2400 -/* 00808 80AE2C08 E48A0068 */ swc1 $f10, 0x0068($a0) ## 00000068 -/* 0080C 80AE2C0C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00810 80AE2C10 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00814 80AE2C14 03E00008 */ jr $ra -/* 00818 80AE2C18 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2C1C.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2C1C.s deleted file mode 100644 index e97dddc60a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2C1C.s +++ /dev/null @@ -1,226 +0,0 @@ -glabel func_80AE2C1C -/* 0081C 80AE2C1C 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00820 80AE2C20 3C0F80AE */ lui $t7, %hi(D_80AE4918) ## $t7 = 80AE0000 -/* 00824 80AE2C24 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00828 80AE2C28 AFB00020 */ sw $s0, 0x0020($sp) -/* 0082C 80AE2C2C AFA50054 */ sw $a1, 0x0054($sp) -/* 00830 80AE2C30 25EF4918 */ addiu $t7, $t7, %lo(D_80AE4918) ## $t7 = 80AE4918 -/* 00834 80AE2C34 8DF90000 */ lw $t9, 0x0000($t7) ## 80AE4918 -/* 00838 80AE2C38 27AE0044 */ addiu $t6, $sp, 0x0044 ## $t6 = FFFFFFF4 -/* 0083C 80AE2C3C 8DF80004 */ lw $t8, 0x0004($t7) ## 80AE491C -/* 00840 80AE2C40 ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFF4 -/* 00844 80AE2C44 8DF90008 */ lw $t9, 0x0008($t7) ## 80AE4920 -/* 00848 80AE2C48 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFF8 -/* 0084C 80AE2C4C 3C0880AE */ lui $t0, %hi(D_80AE4924) ## $t0 = 80AE0000 -/* 00850 80AE2C50 ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFFC -/* 00854 80AE2C54 3C0980AE */ lui $t1, %hi(D_80AE4928) ## $t1 = 80AE0000 -/* 00858 80AE2C58 8D084924 */ lw $t0, %lo(D_80AE4924)($t0) -/* 0085C 80AE2C5C 8D294928 */ lw $t1, %lo(D_80AE4928)($t1) -/* 00860 80AE2C60 8FAA0054 */ lw $t2, 0x0054($sp) -/* 00864 80AE2C64 AFA80040 */ sw $t0, 0x0040($sp) -/* 00868 80AE2C68 AFA9003C */ sw $t1, 0x003C($sp) -/* 0086C 80AE2C6C 8D4B1C44 */ lw $t3, 0x1C44($t2) ## 00001C44 -/* 00870 80AE2C70 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00874 80AE2C74 248400B6 */ addiu $a0, $a0, 0x00B6 ## $a0 = 000000B6 -/* 00878 80AE2C78 AFAB0038 */ sw $t3, 0x0038($sp) -/* 0087C 80AE2C7C 848C0000 */ lh $t4, 0x0000($a0) ## 000000B6 -/* 00880 80AE2C80 8485FFD4 */ lh $a1, -0x002C($a0) ## 0000008A -/* 00884 80AE2C84 848E0258 */ lh $t6, 0x0258($a0) ## 0000030E -/* 00888 80AE2C88 8498025A */ lh $t8, 0x025A($a0) ## 00000310 -/* 0088C 80AE2C8C 00AC6823 */ subu $t5, $a1, $t4 -/* 00890 80AE2C90 01AE7823 */ subu $t7, $t5, $t6 -/* 00894 80AE2C94 01F8C823 */ subu $t9, $t7, $t8 -/* 00898 80AE2C98 A7B90032 */ sh $t9, 0x0032($sp) -/* 0089C 80AE2C9C C484FFB2 */ lwc1 $f4, -0x004E($a0) ## 00000068 -/* 008A0 80AE2CA0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 008A4 80AE2CA4 240700FA */ addiu $a3, $zero, 0x00FA ## $a3 = 000000FA -/* 008A8 80AE2CA8 E48400EE */ swc1 $f4, 0x00EE($a0) ## 000001A4 -/* 008AC 80AE2CAC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 008B0 80AE2CB0 AFA00010 */ sw $zero, 0x0010($sp) -/* 008B4 80AE2CB4 2604030E */ addiu $a0, $s0, 0x030E ## $a0 = 0000030E -/* 008B8 80AE2CB8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 008BC 80AE2CBC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 008C0 80AE2CC0 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 -/* 008C4 80AE2CC4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 008C8 80AE2CC8 AFA00010 */ sw $zero, 0x0010($sp) -/* 008CC 80AE2CCC 26040310 */ addiu $a0, $s0, 0x0310 ## $a0 = 00000310 -/* 008D0 80AE2CD0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 008D4 80AE2CD4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 008D8 80AE2CD8 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 -/* 008DC 80AE2CDC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 008E0 80AE2CE0 AFA00010 */ sw $zero, 0x0010($sp) -/* 008E4 80AE2CE4 860800B6 */ lh $t0, 0x00B6($s0) ## 000000B6 -/* 008E8 80AE2CE8 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 -/* 008EC 80AE2CEC 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 008F0 80AE2CF0 A6080032 */ sh $t0, 0x0032($s0) ## 00000032 -/* 008F4 80AE2CF4 8FA40038 */ lw $a0, 0x0038($sp) -/* 008F8 80AE2CF8 0C00B6DB */ jal func_8002DB6C -/* 008FC 80AE2CFC 26050008 */ addiu $a1, $s0, 0x0008 ## $a1 = 00000008 -/* 00900 80AE2D00 3C014316 */ lui $at, 0x4316 ## $at = 43160000 -/* 00904 80AE2D04 44813000 */ mtc1 $at, $f6 ## $f6 = 150.00 -/* 00908 80AE2D08 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0090C 80AE2D0C 4600303E */ c.le.s $f6, $f0 -/* 00910 80AE2D10 00000000 */ nop -/* 00914 80AE2D14 45020004 */ bc1fl .L80AE2D28 -/* 00918 80AE2D18 87A30032 */ lh $v1, 0x0032($sp) -/* 0091C 80AE2D1C 0C2B8BD4 */ jal func_80AE2F50 -/* 00920 80AE2D20 8FA50054 */ lw $a1, 0x0054($sp) -/* 00924 80AE2D24 87A30032 */ lh $v1, 0x0032($sp) -.L80AE2D28: -/* 00928 80AE2D28 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0092C 80AE2D2C 04600003 */ bltz $v1, .L80AE2D3C -/* 00930 80AE2D30 00031023 */ subu $v0, $zero, $v1 -/* 00934 80AE2D34 10000001 */ beq $zero, $zero, .L80AE2D3C -/* 00938 80AE2D38 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -.L80AE2D3C: -/* 0093C 80AE2D3C 28411554 */ slti $at, $v0, 0x1554 -/* 00940 80AE2D40 50200032 */ beql $at, $zero, .L80AE2E0C -/* 00944 80AE2D44 92020307 */ lbu $v0, 0x0307($s0) ## 00000307 -/* 00948 80AE2D48 0C00B6D2 */ jal func_8002DB48 -/* 0094C 80AE2D4C 8FA50038 */ lw $a1, 0x0038($sp) -/* 00950 80AE2D50 3C014316 */ lui $at, 0x4316 ## $at = 43160000 -/* 00954 80AE2D54 44814000 */ mtc1 $at, $f8 ## $f8 = 150.00 -/* 00958 80AE2D58 8FA90038 */ lw $t1, 0x0038($sp) -/* 0095C 80AE2D5C 4608003E */ c.le.s $f0, $f8 -/* 00960 80AE2D60 00000000 */ nop -/* 00964 80AE2D64 45020029 */ bc1fl .L80AE2E0C -/* 00968 80AE2D68 92020307 */ lbu $v0, 0x0307($s0) ## 00000307 -/* 0096C 80AE2D6C 8D2A067C */ lw $t2, 0x067C($t1) ## 0000067C -/* 00970 80AE2D70 3C01002C */ lui $at, 0x002C ## $at = 002C0000 -/* 00974 80AE2D74 34216080 */ ori $at, $at, 0x6080 ## $at = 002C6080 -/* 00978 80AE2D78 01415824 */ and $t3, $t2, $at -/* 0097C 80AE2D7C 15600020 */ bne $t3, $zero, .L80AE2E00 -/* 00980 80AE2D80 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00984 80AE2D84 8D2C0680 */ lw $t4, 0x0680($t1) ## 00000680 -/* 00988 80AE2D88 318D0080 */ andi $t5, $t4, 0x0080 ## $t5 = 00000000 -/* 0098C 80AE2D8C 15A0001C */ bne $t5, $zero, .L80AE2E00 -/* 00990 80AE2D90 00000000 */ nop -/* 00994 80AE2D94 920E0306 */ lbu $t6, 0x0306($s0) ## 00000306 -/* 00998 80AE2D98 55C0001C */ bnel $t6, $zero, .L80AE2E0C -/* 0099C 80AE2D9C 92020307 */ lbu $v0, 0x0307($s0) ## 00000307 -/* 009A0 80AE2DA0 860F0312 */ lh $t7, 0x0312($s0) ## 00000312 -/* 009A4 80AE2DA4 24190028 */ addiu $t9, $zero, 0x0028 ## $t9 = 00000028 -/* 009A8 80AE2DA8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 009AC 80AE2DAC 31F80080 */ andi $t8, $t7, 0x0080 ## $t8 = 00000000 -/* 009B0 80AE2DB0 5700000D */ bnel $t8, $zero, .L80AE2DE8 -/* 009B4 80AE2DB4 240B003C */ addiu $t3, $zero, 0x003C ## $t3 = 0000003C -/* 009B8 80AE2DB8 A5390110 */ sh $t9, 0x0110($t1) ## 00000110 -/* 009BC 80AE2DBC 0C023BAB */ jal func_8008EEAC -/* 009C0 80AE2DC0 8FA40054 */ lw $a0, 0x0054($sp) -/* 009C4 80AE2DC4 8FA80054 */ lw $t0, 0x0054($sp) -/* 009C8 80AE2DC8 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF -/* 009CC 80AE2DCC 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 009D0 80AE2DD0 8D0A1C44 */ lw $t2, 0x1C44($t0) ## 00001C44 -/* 009D4 80AE2DD4 24070096 */ addiu $a3, $zero, 0x0096 ## $a3 = 00000096 -/* 009D8 80AE2DD8 AD500684 */ sw $s0, 0x0684($t2) ## 00000684 -/* 009DC 80AE2DDC 0C02A800 */ jal func_800AA000 -/* 009E0 80AE2DE0 C60C0090 */ lwc1 $f12, 0x0090($s0) ## 00000090 -/* 009E4 80AE2DE4 240B003C */ addiu $t3, $zero, 0x003C ## $t3 = 0000003C -.L80AE2DE8: -/* 009E8 80AE2DE8 A20B0306 */ sb $t3, 0x0306($s0) ## 00000306 -/* 009EC 80AE2DEC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 009F0 80AE2DF0 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 009F4 80AE2DF4 240538E5 */ addiu $a1, $zero, 0x38E5 ## $a1 = 000038E5 -/* 009F8 80AE2DF8 10000004 */ beq $zero, $zero, .L80AE2E0C -/* 009FC 80AE2DFC 92020307 */ lbu $v0, 0x0307($s0) ## 00000307 -.L80AE2E00: -/* 00A00 80AE2E00 0C2B8BD4 */ jal func_80AE2F50 -/* 00A04 80AE2E04 8FA50054 */ lw $a1, 0x0054($sp) -/* 00A08 80AE2E08 92020307 */ lbu $v0, 0x0307($s0) ## 00000307 -.L80AE2E0C: -/* 00A0C 80AE2E0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A10 80AE2E10 10400003 */ beq $v0, $zero, .L80AE2E20 -/* 00A14 80AE2E14 244CFFFF */ addiu $t4, $v0, 0xFFFF ## $t4 = FFFFFFFF -/* 00A18 80AE2E18 A20C0307 */ sb $t4, 0x0307($s0) ## 00000307 -/* 00A1C 80AE2E1C 318200FF */ andi $v0, $t4, 0x00FF ## $v0 = 000000FF -.L80AE2E20: -/* 00A20 80AE2E20 54400021 */ bnel $v0, $zero, .L80AE2EA8 -/* 00A24 80AE2E24 8618001C */ lh $t8, 0x001C($s0) ## 0000001C -/* 00A28 80AE2E28 0C00B6D2 */ jal func_8002DB48 -/* 00A2C 80AE2E2C 8FA50038 */ lw $a1, 0x0038($sp) -/* 00A30 80AE2E30 3C014234 */ lui $at, 0x4234 ## $at = 42340000 -/* 00A34 80AE2E34 44815000 */ mtc1 $at, $f10 ## $f10 = 45.00 -/* 00A38 80AE2E38 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A3C 80AE2E3C 460A003E */ c.le.s $f0, $f10 -/* 00A40 80AE2E40 00000000 */ nop -/* 00A44 80AE2E44 45020018 */ bc1fl .L80AE2EA8 -/* 00A48 80AE2E48 8618001C */ lh $t8, 0x001C($s0) ## 0000001C -/* 00A4C 80AE2E4C 0C00B821 */ jal func_8002E084 -/* 00A50 80AE2E50 240538E3 */ addiu $a1, $zero, 0x38E3 ## $a1 = 000038E3 -/* 00A54 80AE2E54 10400013 */ beq $v0, $zero, .L80AE2EA4 -/* 00A58 80AE2E58 8FA40054 */ lw $a0, 0x0054($sp) -/* 00A5C 80AE2E5C 8FAD0038 */ lw $t5, 0x0038($sp) -/* 00A60 80AE2E60 3C190001 */ lui $t9, 0x0001 ## $t9 = 00010000 -/* 00A64 80AE2E64 0324C821 */ addu $t9, $t9, $a0 -/* 00A68 80AE2E68 A5A00110 */ sh $zero, 0x0110($t5) ## 00000110 -/* 00A6C 80AE2E6C 8F391D4C */ lw $t9, 0x1D4C($t9) ## 00011D4C -/* 00A70 80AE2E70 8FA50038 */ lw $a1, 0x0038($sp) -/* 00A74 80AE2E74 0320F809 */ jalr $ra, $t9 -/* 00A78 80AE2E78 00000000 */ nop -/* 00A7C 80AE2E7C 50400015 */ beql $v0, $zero, .L80AE2ED4 -/* 00A80 80AE2E80 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00A84 80AE2E84 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 -/* 00A88 80AE2E88 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 00A8C 80AE2E8C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A90 80AE2E90 01C17824 */ and $t7, $t6, $at -/* 00A94 80AE2E94 0C2B8CFC */ jal func_80AE33F0 -/* 00A98 80AE2E98 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 -/* 00A9C 80AE2E9C 1000000D */ beq $zero, $zero, .L80AE2ED4 -/* 00AA0 80AE2EA0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -.L80AE2EA4: -/* 00AA4 80AE2EA4 8618001C */ lh $t8, 0x001C($s0) ## 0000001C -.L80AE2EA8: -/* 00AA8 80AE2EA8 5B00000A */ blezl $t8, .L80AE2ED4 -/* 00AAC 80AE2EAC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00AB0 80AE2EB0 8E090118 */ lw $t1, 0x0118($s0) ## 00000118 -/* 00AB4 80AE2EB4 51200006 */ beql $t1, $zero, .L80AE2ED0 -/* 00AB8 80AE2EB8 A2000305 */ sb $zero, 0x0305($s0) ## 00000305 -/* 00ABC 80AE2EBC 0C2B8C77 */ jal func_80AE31DC -/* 00AC0 80AE2EC0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00AC4 80AE2EC4 10000003 */ beq $zero, $zero, .L80AE2ED4 -/* 00AC8 80AE2EC8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00ACC 80AE2ECC A2000305 */ sb $zero, 0x0305($s0) ## 00000305 -.L80AE2ED0: -/* 00AD0 80AE2ED0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -.L80AE2ED4: -/* 00AD4 80AE2ED4 44818000 */ mtc1 $at, $f16 ## $f16 = 10.00 -/* 00AD8 80AE2ED8 C60001A0 */ lwc1 $f0, 0x01A0($s0) ## 000001A0 -/* 00ADC 80AE2EDC 3C0141B0 */ lui $at, 0x41B0 ## $at = 41B00000 -/* 00AE0 80AE2EE0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00AE4 80AE2EE4 46008032 */ c.eq.s $f16, $f0 -/* 00AE8 80AE2EE8 00000000 */ nop -/* 00AEC 80AE2EEC 45010008 */ bc1t .L80AE2F10 -/* 00AF0 80AE2EF0 00000000 */ nop -/* 00AF4 80AE2EF4 44819000 */ mtc1 $at, $f18 ## $f18 = 22.00 -/* 00AF8 80AE2EF8 8FA80054 */ lw $t0, 0x0054($sp) -/* 00AFC 80AE2EFC 3C0A0001 */ lui $t2, 0x0001 ## $t2 = 00010000 -/* 00B00 80AE2F00 46009032 */ c.eq.s $f18, $f0 -/* 00B04 80AE2F04 01485021 */ addu $t2, $t2, $t0 -/* 00B08 80AE2F08 45020006 */ bc1fl .L80AE2F24 -/* 00B0C 80AE2F0C 8D4A1DE4 */ lw $t2, 0x1DE4($t2) ## 00011DE4 -.L80AE2F10: -/* 00B10 80AE2F10 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00B14 80AE2F14 2405382E */ addiu $a1, $zero, 0x382E ## $a1 = 0000382E -/* 00B18 80AE2F18 10000009 */ beq $zero, $zero, .L80AE2F40 -/* 00B1C 80AE2F1C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00B20 80AE2F20 8D4A1DE4 */ lw $t2, 0x1DE4($t2) ## 00001DE4 -.L80AE2F24: -/* 00B24 80AE2F24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B28 80AE2F28 314B005F */ andi $t3, $t2, 0x005F ## $t3 = 00000000 -/* 00B2C 80AE2F2C 55600004 */ bnel $t3, $zero, .L80AE2F40 -/* 00B30 80AE2F30 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00B34 80AE2F34 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00B38 80AE2F38 240538E4 */ addiu $a1, $zero, 0x38E4 ## $a1 = 000038E4 -/* 00B3C 80AE2F3C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AE2F40: -/* 00B40 80AE2F40 8FB00020 */ lw $s0, 0x0020($sp) -/* 00B44 80AE2F44 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 00B48 80AE2F48 03E00008 */ jr $ra -/* 00B4C 80AE2F4C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2F50.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2F50.s deleted file mode 100644 index 81fad75c9b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2F50.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_80AE2F50 -/* 00B50 80AE2F50 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00B54 80AE2F54 AFA40028 */ sw $a0, 0x0028($sp) -/* 00B58 80AE2F58 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00B5C 80AE2F5C 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 00B60 80AE2F60 AFA5002C */ sw $a1, 0x002C($sp) -/* 00B64 80AE2F64 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00B68 80AE2F68 2484EFDC */ addiu $a0, $a0, 0xEFDC ## $a0 = 0600EFDC -/* 00B6C 80AE2F6C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00B70 80AE2F70 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 -/* 00B74 80AE2F74 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 -/* 00B78 80AE2F78 468021A0 */ cvt.s.w $f6, $f4 -/* 00B7C 80AE2F7C 8FA40028 */ lw $a0, 0x0028($sp) -/* 00B80 80AE2F80 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00B84 80AE2F84 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 00B88 80AE2F88 AFAE0014 */ sw $t6, 0x0014($sp) -/* 00B8C 80AE2F8C 24A5EFDC */ addiu $a1, $a1, 0xEFDC ## $a1 = 0600EFDC -/* 00B90 80AE2F90 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00B94 80AE2F94 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 00B98 80AE2F98 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00B9C 80AE2F9C E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00BA0 80AE2FA0 0C029468 */ jal SkelAnime_ChangeAnim - -/* 00BA4 80AE2FA4 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 00BA8 80AE2FA8 8FA40028 */ lw $a0, 0x0028($sp) -/* 00BAC 80AE2FAC 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 00BB0 80AE2FB0 3C0580AE */ lui $a1, %hi(func_80AE2FD0) ## $a1 = 80AE0000 -/* 00BB4 80AE2FB4 24A52FD0 */ addiu $a1, $a1, %lo(func_80AE2FD0) ## $a1 = 80AE2FD0 -/* 00BB8 80AE2FB8 0C2B8900 */ jal func_80AE2400 -/* 00BBC 80AE2FBC A08F031B */ sb $t7, 0x031B($a0) ## 0000031B -/* 00BC0 80AE2FC0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00BC4 80AE2FC4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00BC8 80AE2FC8 03E00008 */ jr $ra -/* 00BCC 80AE2FCC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2FD0.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2FD0.s deleted file mode 100644 index 35f976870c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2FD0.s +++ /dev/null @@ -1,148 +0,0 @@ -glabel func_80AE2FD0 -/* 00BD0 80AE2FD0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00BD4 80AE2FD4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00BD8 80AE2FD8 AFB00020 */ sw $s0, 0x0020($sp) -/* 00BDC 80AE2FDC AFA5003C */ sw $a1, 0x003C($sp) -/* 00BE0 80AE2FE0 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 00BE4 80AE2FE4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00BE8 80AE2FE8 26050008 */ addiu $a1, $s0, 0x0008 ## $a1 = 00000008 -/* 00BEC 80AE2FEC AFA50028 */ sw $a1, 0x0028($sp) -/* 00BF0 80AE2FF0 0C00B6B0 */ jal func_8002DAC0 -/* 00BF4 80AE2FF4 AFAF0034 */ sw $t7, 0x0034($sp) -/* 00BF8 80AE2FF8 A7A2002E */ sh $v0, 0x002E($sp) -/* 00BFC 80AE2FFC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C00 80AE3000 0C00B6DB */ jal func_8002DB6C -/* 00C04 80AE3004 8FA50028 */ lw $a1, 0x0028($sp) -/* 00C08 80AE3008 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 00C0C 80AE300C 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 -/* 00C10 80AE3010 87A5002E */ lh $a1, 0x002E($sp) -/* 00C14 80AE3014 240701C2 */ addiu $a3, $zero, 0x01C2 ## $a3 = 000001C2 -/* 00C18 80AE3018 4600203E */ c.le.s $f4, $f0 -/* 00C1C 80AE301C 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 00C20 80AE3020 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00C24 80AE3024 45020008 */ bc1fl .L80AE3048 -/* 00C28 80AE3028 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 00C2C 80AE302C 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 00C30 80AE3030 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00C34 80AE3034 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00C38 80AE3038 AFA00010 */ sw $zero, 0x0010($sp) -/* 00C3C 80AE303C 10000014 */ beq $zero, $zero, .L80AE3090 -/* 00C40 80AE3040 2604030E */ addiu $a0, $s0, 0x030E ## $a0 = 0000030E -/* 00C44 80AE3044 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -.L80AE3048: -/* 00C48 80AE3048 86050016 */ lh $a1, 0x0016($s0) ## 00000016 -/* 00C4C 80AE304C 240701C2 */ addiu $a3, $zero, 0x01C2 ## $a3 = 000001C2 -/* 00C50 80AE3050 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 -/* 00C54 80AE3054 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00C58 80AE3058 AFA00010 */ sw $zero, 0x0010($sp) -/* 00C5C 80AE305C 5440000C */ bnel $v0, $zero, .L80AE3090 -/* 00C60 80AE3060 2604030E */ addiu $a0, $s0, 0x030E ## $a0 = 0000030E -/* 00C64 80AE3064 8618001C */ lh $t8, 0x001C($s0) ## 0000001C -/* 00C68 80AE3068 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00C6C 80AE306C 13010005 */ beq $t8, $at, .L80AE3084 -/* 00C70 80AE3070 00000000 */ nop -/* 00C74 80AE3074 0C2B89A7 */ jal func_80AE269C -/* 00C78 80AE3078 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C7C 80AE307C 10000004 */ beq $zero, $zero, .L80AE3090 -/* 00C80 80AE3080 2604030E */ addiu $a0, $s0, 0x030E ## $a0 = 0000030E -.L80AE3084: -/* 00C84 80AE3084 0C2B8E75 */ jal func_80AE39D4 -/* 00C88 80AE3088 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C8C 80AE308C 2604030E */ addiu $a0, $s0, 0x030E ## $a0 = 0000030E -.L80AE3090: -/* 00C90 80AE3090 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00C94 80AE3094 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00C98 80AE3098 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 -/* 00C9C 80AE309C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00CA0 80AE30A0 AFA00010 */ sw $zero, 0x0010($sp) -/* 00CA4 80AE30A4 26040310 */ addiu $a0, $s0, 0x0310 ## $a0 = 00000310 -/* 00CA8 80AE30A8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00CAC 80AE30AC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00CB0 80AE30B0 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 -/* 00CB4 80AE30B4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00CB8 80AE30B8 AFA00010 */ sw $zero, 0x0010($sp) -/* 00CBC 80AE30BC 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B6 -/* 00CC0 80AE30C0 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 -/* 00CC4 80AE30C4 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00CC8 80AE30C8 A6190032 */ sh $t9, 0x0032($s0) ## 00000032 -/* 00CCC 80AE30CC 8FA40034 */ lw $a0, 0x0034($sp) -/* 00CD0 80AE30D0 3C01002C */ lui $at, 0x002C ## $at = 002C0000 -/* 00CD4 80AE30D4 34216080 */ ori $at, $at, 0x6080 ## $at = 002C6080 -/* 00CD8 80AE30D8 8C88067C */ lw $t0, 0x067C($a0) ## 0000067C -/* 00CDC 80AE30DC 01014824 */ and $t1, $t0, $at -/* 00CE0 80AE30E0 55200014 */ bnel $t1, $zero, .L80AE3134 -/* 00CE4 80AE30E4 860C001C */ lh $t4, 0x001C($s0) ## 0000001C -/* 00CE8 80AE30E8 8C8A0680 */ lw $t2, 0x0680($a0) ## 00000680 -/* 00CEC 80AE30EC 314B0080 */ andi $t3, $t2, 0x0080 ## $t3 = 00000000 -/* 00CF0 80AE30F0 55600010 */ bnel $t3, $zero, .L80AE3134 -/* 00CF4 80AE30F4 860C001C */ lh $t4, 0x001C($s0) ## 0000001C -/* 00CF8 80AE30F8 0C00B6DB */ jal func_8002DB6C -/* 00CFC 80AE30FC 8FA50028 */ lw $a1, 0x0028($sp) -/* 00D00 80AE3100 3C014316 */ lui $at, 0x4316 ## $at = 43160000 -/* 00D04 80AE3104 44814000 */ mtc1 $at, $f8 ## $f8 = 150.00 -/* 00D08 80AE3108 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D0C 80AE310C 4608003C */ c.lt.s $f0, $f8 -/* 00D10 80AE3110 00000000 */ nop -/* 00D14 80AE3114 45020007 */ bc1fl .L80AE3134 -/* 00D18 80AE3118 860C001C */ lh $t4, 0x001C($s0) ## 0000001C -/* 00D1C 80AE311C A200001F */ sb $zero, 0x001F($s0) ## 0000001F -/* 00D20 80AE3120 0C2B8AE4 */ jal func_80AE2B90 -/* 00D24 80AE3124 8FA5003C */ lw $a1, 0x003C($sp) -/* 00D28 80AE3128 1000000D */ beq $zero, $zero, .L80AE3160 -/* 00D2C 80AE312C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00D30 80AE3130 860C001C */ lh $t4, 0x001C($s0) ## 0000001C -.L80AE3134: -/* 00D34 80AE3134 5980000A */ blezl $t4, .L80AE3160 -/* 00D38 80AE3138 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00D3C 80AE313C 8E0D0118 */ lw $t5, 0x0118($s0) ## 00000118 -/* 00D40 80AE3140 51A00006 */ beql $t5, $zero, .L80AE315C -/* 00D44 80AE3144 A2000305 */ sb $zero, 0x0305($s0) ## 00000305 -/* 00D48 80AE3148 0C2B8C77 */ jal func_80AE31DC -/* 00D4C 80AE314C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D50 80AE3150 10000003 */ beq $zero, $zero, .L80AE3160 -/* 00D54 80AE3154 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00D58 80AE3158 A2000305 */ sb $zero, 0x0305($s0) ## 00000305 -.L80AE315C: -/* 00D5C 80AE315C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -.L80AE3160: -/* 00D60 80AE3160 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 -/* 00D64 80AE3164 C60001A0 */ lwc1 $f0, 0x01A0($s0) ## 000001A0 -/* 00D68 80AE3168 3C0141B0 */ lui $at, 0x41B0 ## $at = 41B00000 -/* 00D6C 80AE316C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D70 80AE3170 46005032 */ c.eq.s $f10, $f0 -/* 00D74 80AE3174 00000000 */ nop -/* 00D78 80AE3178 45010008 */ bc1t .L80AE319C -/* 00D7C 80AE317C 00000000 */ nop -/* 00D80 80AE3180 44818000 */ mtc1 $at, $f16 ## $f16 = 22.00 -/* 00D84 80AE3184 8FAE003C */ lw $t6, 0x003C($sp) -/* 00D88 80AE3188 3C0F0001 */ lui $t7, 0x0001 ## $t7 = 00010000 -/* 00D8C 80AE318C 46008032 */ c.eq.s $f16, $f0 -/* 00D90 80AE3190 01EE7821 */ addu $t7, $t7, $t6 -/* 00D94 80AE3194 45020006 */ bc1fl .L80AE31B0 -/* 00D98 80AE3198 8DEF1DE4 */ lw $t7, 0x1DE4($t7) ## 00011DE4 -.L80AE319C: -/* 00D9C 80AE319C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00DA0 80AE31A0 2405382E */ addiu $a1, $zero, 0x382E ## $a1 = 0000382E -/* 00DA4 80AE31A4 10000009 */ beq $zero, $zero, .L80AE31CC -/* 00DA8 80AE31A8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00DAC 80AE31AC 8DEF1DE4 */ lw $t7, 0x1DE4($t7) ## 00001DE4 -.L80AE31B0: -/* 00DB0 80AE31B0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00DB4 80AE31B4 31F8005F */ andi $t8, $t7, 0x005F ## $t8 = 00000000 -/* 00DB8 80AE31B8 57000004 */ bnel $t8, $zero, .L80AE31CC -/* 00DBC 80AE31BC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00DC0 80AE31C0 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00DC4 80AE31C4 240538E4 */ addiu $a1, $zero, 0x38E4 ## $a1 = 000038E4 -/* 00DC8 80AE31C8 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AE31CC: -/* 00DCC 80AE31CC 8FB00020 */ lw $s0, 0x0020($sp) -/* 00DD0 80AE31D0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00DD4 80AE31D4 03E00008 */ jr $ra -/* 00DD8 80AE31D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE31DC.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE31DC.s deleted file mode 100644 index 5ed0bf63eb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE31DC.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_80AE31DC -/* 00DDC 80AE31DC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00DE0 80AE31E0 AFA40028 */ sw $a0, 0x0028($sp) -/* 00DE4 80AE31E4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00DE8 80AE31E8 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 00DEC 80AE31EC 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00DF0 80AE31F0 2484EFDC */ addiu $a0, $a0, 0xEFDC ## $a0 = 0600EFDC -/* 00DF4 80AE31F4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00DF8 80AE31F8 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 -/* 00DFC 80AE31FC 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 -/* 00E00 80AE3200 468021A0 */ cvt.s.w $f6, $f4 -/* 00E04 80AE3204 8FA40028 */ lw $a0, 0x0028($sp) -/* 00E08 80AE3208 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00E0C 80AE320C 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 00E10 80AE3210 AFAE0014 */ sw $t6, 0x0014($sp) -/* 00E14 80AE3214 24A5EFDC */ addiu $a1, $a1, 0xEFDC ## $a1 = 0600EFDC -/* 00E18 80AE3218 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00E1C 80AE321C 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 00E20 80AE3220 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00E24 80AE3224 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00E28 80AE3228 0C029468 */ jal SkelAnime_ChangeAnim - -/* 00E2C 80AE322C 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 00E30 80AE3230 8FA40028 */ lw $a0, 0x0028($sp) -/* 00E34 80AE3234 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 -/* 00E38 80AE3238 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 00E3C 80AE323C 3C0580AE */ lui $a1, %hi(func_80AE3260) ## $a1 = 80AE0000 -/* 00E40 80AE3240 24A53260 */ addiu $a1, $a1, %lo(func_80AE3260) ## $a1 = 80AE3260 -/* 00E44 80AE3244 A08F031B */ sb $t7, 0x031B($a0) ## 0000031B -/* 00E48 80AE3248 0C2B8900 */ jal func_80AE2400 -/* 00E4C 80AE324C A0980305 */ sb $t8, 0x0305($a0) ## 00000305 -/* 00E50 80AE3250 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00E54 80AE3254 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00E58 80AE3258 03E00008 */ jr $ra -/* 00E5C 80AE325C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3260.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3260.s deleted file mode 100644 index 410956a36f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3260.s +++ /dev/null @@ -1,121 +0,0 @@ -.late_rodata -glabel D_80AE49A0 - .float 0.4 - -.text -glabel func_80AE3260 -/* 00E60 80AE3260 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00E64 80AE3264 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00E68 80AE3268 AFB00020 */ sw $s0, 0x0020($sp) -/* 00E6C 80AE326C AFA50044 */ sw $a1, 0x0044($sp) -/* 00E70 80AE3270 8C820118 */ lw $v0, 0x0118($a0) ## 00000118 -/* 00E74 80AE3274 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00E78 80AE3278 8FA50044 */ lw $a1, 0x0044($sp) -/* 00E7C 80AE327C 10400036 */ beq $v0, $zero, .L80AE3358 -/* 00E80 80AE3280 00000000 */ nop -/* 00E84 80AE3284 8C4F0024 */ lw $t7, 0x0024($v0) ## 00000024 -/* 00E88 80AE3288 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFEC -/* 00E8C 80AE328C ACAF0000 */ sw $t7, 0x0000($a1) ## FFFFFFEC -/* 00E90 80AE3290 8C4E0028 */ lw $t6, 0x0028($v0) ## 00000028 -/* 00E94 80AE3294 ACAE0004 */ sw $t6, 0x0004($a1) ## FFFFFFF0 -/* 00E98 80AE3298 8C4F002C */ lw $t7, 0x002C($v0) ## 0000002C -/* 00E9C 80AE329C 0C00B6B0 */ jal func_8002DAC0 -/* 00EA0 80AE32A0 ACAF0008 */ sw $t7, 0x0008($a1) ## FFFFFFF4 -/* 00EA4 80AE32A4 00022C00 */ sll $a1, $v0, 16 -/* 00EA8 80AE32A8 00052C03 */ sra $a1, $a1, 16 -/* 00EAC 80AE32AC 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 00EB0 80AE32B0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00EB4 80AE32B4 240700FA */ addiu $a3, $zero, 0x00FA ## $a3 = 000000FA -/* 00EB8 80AE32B8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00EBC 80AE32BC AFA00010 */ sw $zero, 0x0010($sp) -/* 00EC0 80AE32C0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00EC4 80AE32C4 0C00B6DB */ jal func_8002DB6C -/* 00EC8 80AE32C8 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFEC -/* 00ECC 80AE32CC 3C014234 */ lui $at, 0x4234 ## $at = 42340000 -/* 00ED0 80AE32D0 44812000 */ mtc1 $at, $f4 ## $f4 = 45.00 -/* 00ED4 80AE32D4 3C0180AE */ lui $at, %hi(D_80AE49A0) ## $at = 80AE0000 -/* 00ED8 80AE32D8 4600203E */ c.le.s $f4, $f0 -/* 00EDC 80AE32DC 00000000 */ nop -/* 00EE0 80AE32E0 45020005 */ bc1fl .L80AE32F8 -/* 00EE4 80AE32E4 8618001C */ lh $t8, 0x001C($s0) ## 0000001C -/* 00EE8 80AE32E8 C42649A0 */ lwc1 $f6, %lo(D_80AE49A0)($at) -/* 00EEC 80AE32EC 1000000C */ beq $zero, $zero, .L80AE3320 -/* 00EF0 80AE32F0 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 -/* 00EF4 80AE32F4 8618001C */ lh $t8, 0x001C($s0) ## 0000001C -.L80AE32F8: -/* 00EF8 80AE32F8 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 00EFC 80AE32FC 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00F00 80AE3300 13010005 */ beq $t8, $at, .L80AE3318 -/* 00F04 80AE3304 E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 -/* 00F08 80AE3308 0C2B89A7 */ jal func_80AE269C -/* 00F0C 80AE330C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F10 80AE3310 10000004 */ beq $zero, $zero, .L80AE3324 -/* 00F14 80AE3314 2604030E */ addiu $a0, $s0, 0x030E ## $a0 = 0000030E -.L80AE3318: -/* 00F18 80AE3318 0C2B8E75 */ jal func_80AE39D4 -/* 00F1C 80AE331C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80AE3320: -/* 00F20 80AE3320 2604030E */ addiu $a0, $s0, 0x030E ## $a0 = 0000030E -.L80AE3324: -/* 00F24 80AE3324 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00F28 80AE3328 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00F2C 80AE332C 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 -/* 00F30 80AE3330 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00F34 80AE3334 AFA00010 */ sw $zero, 0x0010($sp) -/* 00F38 80AE3338 26040310 */ addiu $a0, $s0, 0x0310 ## $a0 = 00000310 -/* 00F3C 80AE333C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00F40 80AE3340 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00F44 80AE3344 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 -/* 00F48 80AE3348 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00F4C 80AE334C AFA00010 */ sw $zero, 0x0010($sp) -/* 00F50 80AE3350 10000004 */ beq $zero, $zero, .L80AE3364 -/* 00F54 80AE3354 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B6 -.L80AE3358: -/* 00F58 80AE3358 0C2B8AE4 */ jal func_80AE2B90 -/* 00F5C 80AE335C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F60 80AE3360 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B6 -.L80AE3364: -/* 00F64 80AE3364 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 -/* 00F68 80AE3368 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00F6C 80AE336C A6190032 */ sh $t9, 0x0032($s0) ## 00000032 -/* 00F70 80AE3370 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00F74 80AE3374 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 -/* 00F78 80AE3378 C60001A0 */ lwc1 $f0, 0x01A0($s0) ## 000001A0 -/* 00F7C 80AE337C 3C0141B0 */ lui $at, 0x41B0 ## $at = 41B00000 -/* 00F80 80AE3380 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F84 80AE3384 46005032 */ c.eq.s $f10, $f0 -/* 00F88 80AE3388 00000000 */ nop -/* 00F8C 80AE338C 45010008 */ bc1t .L80AE33B0 -/* 00F90 80AE3390 00000000 */ nop -/* 00F94 80AE3394 44818000 */ mtc1 $at, $f16 ## $f16 = 22.00 -/* 00F98 80AE3398 8FA80044 */ lw $t0, 0x0044($sp) -/* 00F9C 80AE339C 3C090001 */ lui $t1, 0x0001 ## $t1 = 00010000 -/* 00FA0 80AE33A0 46008032 */ c.eq.s $f16, $f0 -/* 00FA4 80AE33A4 01284821 */ addu $t1, $t1, $t0 -/* 00FA8 80AE33A8 45020006 */ bc1fl .L80AE33C4 -/* 00FAC 80AE33AC 8D291DE4 */ lw $t1, 0x1DE4($t1) ## 00011DE4 -.L80AE33B0: -/* 00FB0 80AE33B0 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00FB4 80AE33B4 2405382E */ addiu $a1, $zero, 0x382E ## $a1 = 0000382E -/* 00FB8 80AE33B8 10000009 */ beq $zero, $zero, .L80AE33E0 -/* 00FBC 80AE33BC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00FC0 80AE33C0 8D291DE4 */ lw $t1, 0x1DE4($t1) ## 00001DE4 -.L80AE33C4: -/* 00FC4 80AE33C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00FC8 80AE33C8 312A005F */ andi $t2, $t1, 0x005F ## $t2 = 00000000 -/* 00FCC 80AE33CC 55400004 */ bnel $t2, $zero, .L80AE33E0 -/* 00FD0 80AE33D0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00FD4 80AE33D4 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00FD8 80AE33D8 240538E4 */ addiu $a1, $zero, 0x38E4 ## $a1 = 000038E4 -/* 00FDC 80AE33DC 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AE33E0: -/* 00FE0 80AE33E0 8FB00020 */ lw $s0, 0x0020($sp) -/* 00FE4 80AE33E4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00FE8 80AE33E8 03E00008 */ jr $ra -/* 00FEC 80AE33EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE33F0.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE33F0.s deleted file mode 100644 index 3a12002ddd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE33F0.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80AE33F0 -/* 00FF0 80AE33F0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00FF4 80AE33F4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00FF8 80AE33F8 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00FFC 80AE33FC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01000 80AE3400 24A54ADC */ addiu $a1, $a1, 0x4ADC ## $a1 = 06004ADC -/* 01004 80AE3404 AFA60018 */ sw $a2, 0x0018($sp) -/* 01008 80AE3408 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop -/* 0100C 80AE340C 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 01010 80AE3410 8FA40018 */ lw $a0, 0x0018($sp) -/* 01014 80AE3414 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01018 80AE3418 300E00FF */ andi $t6, $zero, 0x00FF ## $t6 = 00000000 -/* 0101C 80AE341C 240F00C8 */ addiu $t7, $zero, 0x00C8 ## $t7 = 000000C8 -/* 01020 80AE3420 24180008 */ addiu $t8, $zero, 0x0008 ## $t8 = 00000008 -/* 01024 80AE3424 3C0580AE */ lui $a1, %hi(func_80AE3454) ## $a1 = 80AE0000 -/* 01028 80AE3428 24A53454 */ addiu $a1, $a1, %lo(func_80AE3454) ## $a1 = 80AE3454 -/* 0102C 80AE342C A48E030C */ sh $t6, 0x030C($a0) ## 0000030C -/* 01030 80AE3430 A0800304 */ sb $zero, 0x0304($a0) ## 00000304 -/* 01034 80AE3434 A08F0319 */ sb $t7, 0x0319($a0) ## 00000319 -/* 01038 80AE3438 A098031B */ sb $t8, 0x031B($a0) ## 0000031B -/* 0103C 80AE343C 0C2B8900 */ jal func_80AE2400 -/* 01040 80AE3440 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 01044 80AE3444 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01048 80AE3448 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0104C 80AE344C 03E00008 */ jr $ra -/* 01050 80AE3450 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3454.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3454.s deleted file mode 100644 index a947aedf8b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3454.s +++ /dev/null @@ -1,255 +0,0 @@ -.late_rodata -glabel jtbl_80AE49A4 -.word L80AE3508 -.word L80AE34B4 -.word L80AE3538 -.word L80AE3724 -.word L80AE3754 - -.text -glabel func_80AE3454 -/* 01054 80AE3454 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 01058 80AE3458 AFB00028 */ sw $s0, 0x0028($sp) -/* 0105C 80AE345C AFBF002C */ sw $ra, 0x002C($sp) -/* 01060 80AE3460 AFA5004C */ sw $a1, 0x004C($sp) -/* 01064 80AE3464 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 01068 80AE3468 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0106C 80AE346C 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 01070 80AE3470 AFA40034 */ sw $a0, 0x0034($sp) -/* 01074 80AE3474 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01078 80AE3478 AFAF0040 */ sw $t7, 0x0040($sp) -/* 0107C 80AE347C 50400005 */ beql $v0, $zero, .L80AE3494 -/* 01080 80AE3480 92080304 */ lbu $t0, 0x0304($s0) ## 00000304 -/* 01084 80AE3484 92180304 */ lbu $t8, 0x0304($s0) ## 00000304 -/* 01088 80AE3488 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 0108C 80AE348C A2190304 */ sb $t9, 0x0304($s0) ## 00000304 -/* 01090 80AE3490 92080304 */ lbu $t0, 0x0304($s0) ## 00000304 -.L80AE3494: -/* 01094 80AE3494 2D010005 */ sltiu $at, $t0, 0x0005 -/* 01098 80AE3498 102000C3 */ beq $at, $zero, .L80AE37A8 -/* 0109C 80AE349C 00084080 */ sll $t0, $t0, 2 -/* 010A0 80AE34A0 3C0180AE */ lui $at, %hi(jtbl_80AE49A4) ## $at = 80AE0000 -/* 010A4 80AE34A4 00280821 */ addu $at, $at, $t0 -/* 010A8 80AE34A8 8C2849A4 */ lw $t0, %lo(jtbl_80AE49A4)($at) -/* 010AC 80AE34AC 01000008 */ jr $t0 -/* 010B0 80AE34B0 00000000 */ nop -glabel L80AE34B4 -/* 010B4 80AE34B4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 010B8 80AE34B8 24A54268 */ addiu $a1, $a1, 0x4268 ## $a1 = 06004268 -/* 010BC 80AE34BC 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat -/* 010C0 80AE34C0 8FA40034 */ lw $a0, 0x0034($sp) -/* 010C4 80AE34C4 92090304 */ lbu $t1, 0x0304($s0) ## 00000304 -/* 010C8 80AE34C8 8FA4004C */ lw $a0, 0x004C($sp) -/* 010CC 80AE34CC 3C190001 */ lui $t9, 0x0001 ## $t9 = 00010000 -/* 010D0 80AE34D0 252A0001 */ addiu $t2, $t1, 0x0001 ## $t2 = 00000001 -/* 010D4 80AE34D4 A20A0304 */ sb $t2, 0x0304($s0) ## 00000304 -/* 010D8 80AE34D8 0324C821 */ addu $t9, $t9, $a0 -/* 010DC 80AE34DC 8F391D58 */ lw $t9, 0x1D58($t9) ## 00011D58 -/* 010E0 80AE34E0 2405FFF8 */ addiu $a1, $zero, 0xFFF8 ## $a1 = FFFFFFF8 -/* 010E4 80AE34E4 0320F809 */ jalr $ra, $t9 -/* 010E8 80AE34E8 00000000 */ nop -/* 010EC 80AE34EC C60C0090 */ lwc1 $f12, 0x0090($s0) ## 00000090 -/* 010F0 80AE34F0 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF -/* 010F4 80AE34F4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 010F8 80AE34F8 0C02A800 */ jal func_800AA000 -/* 010FC 80AE34FC 2407000C */ addiu $a3, $zero, 0x000C ## $a3 = 0000000C -/* 01100 80AE3500 240B0014 */ addiu $t3, $zero, 0x0014 ## $t3 = 00000014 -/* 01104 80AE3504 A20B0319 */ sb $t3, 0x0319($s0) ## 00000319 -glabel L80AE3508 -/* 01108 80AE3508 2604030E */ addiu $a0, $s0, 0x030E ## $a0 = 0000030E -/* 0110C 80AE350C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01110 80AE3510 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01114 80AE3514 240705DC */ addiu $a3, $zero, 0x05DC ## $a3 = 000005DC -/* 01118 80AE3518 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 0111C 80AE351C AFA00010 */ sw $zero, 0x0010($sp) -/* 01120 80AE3520 26040310 */ addiu $a0, $s0, 0x0310 ## $a0 = 00000310 -/* 01124 80AE3524 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01128 80AE3528 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 0112C 80AE352C 240705DC */ addiu $a3, $zero, 0x05DC ## $a3 = 000005DC -/* 01130 80AE3530 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 01134 80AE3534 AFA00010 */ sw $zero, 0x0010($sp) -glabel L80AE3538 -/* 01138 80AE3538 8FAC0040 */ lw $t4, 0x0040($sp) -/* 0113C 80AE353C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 01140 80AE3540 3C0A8016 */ lui $t2, %hi(gSaveContext+4) -/* 01144 80AE3544 8D8D0680 */ lw $t5, 0x0680($t4) ## 00000680 -/* 01148 80AE3548 31AE0080 */ andi $t6, $t5, 0x0080 ## $t6 = 00000000 -/* 0114C 80AE354C 15C00016 */ bne $t6, $zero, .L80AE35A8 -/* 01150 80AE3550 00000000 */ nop -/* 01154 80AE3554 0C028800 */ jal SkelAnime_GetFrameCount - -/* 01158 80AE3558 248446F8 */ addiu $a0, $a0, 0x46F8 ## $a0 = 060046F8 -/* 0115C 80AE355C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 01160 80AE3560 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01164 80AE3564 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01168 80AE3568 468021A0 */ cvt.s.w $f6, $f4 -/* 0116C 80AE356C 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 -/* 01170 80AE3570 44070000 */ mfc1 $a3, $f0 -/* 01174 80AE3574 AFAF0014 */ sw $t7, 0x0014($sp) -/* 01178 80AE3578 24A546F8 */ addiu $a1, $a1, 0x46F8 ## $a1 = 060046F8 -/* 0117C 80AE357C 8FA40034 */ lw $a0, 0x0034($sp) -/* 01180 80AE3580 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 01184 80AE3584 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 01188 80AE3588 0C029468 */ jal SkelAnime_ChangeAnim - -/* 0118C 80AE358C E7A00018 */ swc1 $f0, 0x0018($sp) -/* 01190 80AE3590 92180304 */ lbu $t8, 0x0304($s0) ## 00000304 -/* 01194 80AE3594 24090004 */ addiu $t1, $zero, 0x0004 ## $t1 = 00000004 -/* 01198 80AE3598 A209031B */ sb $t1, 0x031B($s0) ## 0000031B -/* 0119C 80AE359C 27080001 */ addiu $t0, $t8, 0x0001 ## $t0 = 00000001 -/* 011A0 80AE35A0 10000081 */ beq $zero, $zero, .L80AE37A8 -/* 011A4 80AE35A4 A2080304 */ sb $t0, 0x0304($s0) ## 00000304 -.L80AE35A8: -/* 011A8 80AE35A8 8D4AE664 */ lw $t2, %lo(gSaveContext+4)($t2) -/* 011AC 80AE35AC 3C05C4BB */ lui $a1, 0xC4BB ## $a1 = C4BB0000 -/* 011B0 80AE35B0 34A58000 */ ori $a1, $a1, 0x8000 ## $a1 = C4BB8000 -/* 011B4 80AE35B4 11400006 */ beq $t2, $zero, .L80AE35D0 -/* 011B8 80AE35B8 260400BC */ addiu $a0, $s0, 0x00BC ## $a0 = 000000BC -/* 011BC 80AE35BC 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 011C0 80AE35C0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 011C4 80AE35C4 3C074316 */ lui $a3, 0x4316 ## $a3 = 43160000 -/* 011C8 80AE35C8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 011CC 80AE35CC E7A80010 */ swc1 $f8, 0x0010($sp) -.L80AE35D0: -/* 011D0 80AE35D0 8FB90040 */ lw $t9, 0x0040($sp) -/* 011D4 80AE35D4 0C01DE1C */ jal Math_Sins - ## sins? -/* 011D8 80AE35D8 872400B6 */ lh $a0, 0x00B6($t9) ## 000000B6 -/* 011DC 80AE35DC 3C01C1C8 */ lui $at, 0xC1C8 ## $at = C1C80000 -/* 011E0 80AE35E0 44815000 */ mtc1 $at, $f10 ## $f10 = -25.00 -/* 011E4 80AE35E4 8FAB0040 */ lw $t3, 0x0040($sp) -/* 011E8 80AE35E8 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 011EC 80AE35EC 460A0402 */ mul.s $f16, $f0, $f10 -/* 011F0 80AE35F0 C5720024 */ lwc1 $f18, 0x0024($t3) ## 00000024 -/* 011F4 80AE35F4 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 011F8 80AE35F8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 011FC 80AE35FC 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 01200 80AE3600 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 01204 80AE3604 46128100 */ add.s $f4, $f16, $f18 -/* 01208 80AE3608 44052000 */ mfc1 $a1, $f4 -/* 0120C 80AE360C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 01210 80AE3610 00000000 */ nop -/* 01214 80AE3614 8FAC0040 */ lw $t4, 0x0040($sp) -/* 01218 80AE3618 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 0121C 80AE361C 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 01220 80AE3620 8D850028 */ lw $a1, 0x0028($t4) ## 00000028 -/* 01224 80AE3624 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01228 80AE3628 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 0122C 80AE362C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 01230 80AE3630 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 01234 80AE3634 8FAD0040 */ lw $t5, 0x0040($sp) -/* 01238 80AE3638 0C01DE0D */ jal Math_Coss - ## coss? -/* 0123C 80AE363C 85A400B6 */ lh $a0, 0x00B6($t5) ## 000000B6 -/* 01240 80AE3640 3C01C1C8 */ lui $at, 0xC1C8 ## $at = C1C80000 -/* 01244 80AE3644 44815000 */ mtc1 $at, $f10 ## $f10 = -25.00 -/* 01248 80AE3648 8FAE0040 */ lw $t6, 0x0040($sp) -/* 0124C 80AE364C 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 01250 80AE3650 460A0402 */ mul.s $f16, $f0, $f10 -/* 01254 80AE3654 C5D2002C */ lwc1 $f18, 0x002C($t6) ## 0000002C -/* 01258 80AE3658 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C -/* 0125C 80AE365C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01260 80AE3660 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 01264 80AE3664 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 01268 80AE3668 46128100 */ add.s $f4, $f16, $f18 -/* 0126C 80AE366C 44052000 */ mfc1 $a1, $f4 -/* 01270 80AE3670 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 01274 80AE3674 00000000 */ nop -/* 01278 80AE3678 8FAF0040 */ lw $t7, 0x0040($sp) -/* 0127C 80AE367C 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 01280 80AE3680 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01284 80AE3684 85E500B6 */ lh $a1, 0x00B6($t7) ## 000000B6 -/* 01288 80AE3688 AFA00010 */ sw $zero, 0x0010($sp) -/* 0128C 80AE368C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 01290 80AE3690 24071770 */ addiu $a3, $zero, 0x1770 ## $a3 = 00001770 -/* 01294 80AE3694 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 01298 80AE3698 C60A01A0 */ lwc1 $f10, 0x01A0($s0) ## 000001A0 -/* 0129C 80AE369C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 012A0 80AE36A0 460A4032 */ c.eq.s $f8, $f10 -/* 012A4 80AE36A4 00000000 */ nop -/* 012A8 80AE36A8 45020004 */ bc1fl .L80AE36BC -/* 012AC 80AE36AC 92180319 */ lbu $t8, 0x0319($s0) ## 00000319 -/* 012B0 80AE36B0 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 012B4 80AE36B4 240538E8 */ addiu $a1, $zero, 0x38E8 ## $a1 = 000038E8 -/* 012B8 80AE36B8 92180319 */ lbu $t8, 0x0319($s0) ## 00000319 -.L80AE36BC: -/* 012BC 80AE36BC 2708FFFF */ addiu $t0, $t8, 0xFFFF ## $t0 = FFFFFFFF -/* 012C0 80AE36C0 310900FF */ andi $t1, $t0, 0x00FF ## $t1 = 000000FF -/* 012C4 80AE36C4 15200038 */ bne $t1, $zero, .L80AE37A8 -/* 012C8 80AE36C8 A2080319 */ sb $t0, 0x0319($s0) ## 00000319 -/* 012CC 80AE36CC 8FA4004C */ lw $a0, 0x004C($sp) -/* 012D0 80AE36D0 3C190001 */ lui $t9, 0x0001 ## $t9 = 00010000 -/* 012D4 80AE36D4 2405FFF8 */ addiu $a1, $zero, 0xFFF8 ## $a1 = FFFFFFF8 -/* 012D8 80AE36D8 0324C821 */ addu $t9, $t9, $a0 -/* 012DC 80AE36DC 8F391D58 */ lw $t9, 0x1D58($t9) ## 00011D58 -/* 012E0 80AE36E0 0320F809 */ jalr $ra, $t9 -/* 012E4 80AE36E4 00000000 */ nop -/* 012E8 80AE36E8 C60C0090 */ lwc1 $f12, 0x0090($s0) ## 00000090 -/* 012EC 80AE36EC 240500F0 */ addiu $a1, $zero, 0x00F0 ## $a1 = 000000F0 -/* 012F0 80AE36F0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 012F4 80AE36F4 0C02A800 */ jal func_800AA000 -/* 012F8 80AE36F8 2407000C */ addiu $a3, $zero, 0x000C ## $a3 = 0000000C -/* 012FC 80AE36FC 240A0014 */ addiu $t2, $zero, 0x0014 ## $t2 = 00000014 -/* 01300 80AE3700 A20A0319 */ sb $t2, 0x0319($s0) ## 00000319 -/* 01304 80AE3704 8FA40040 */ lw $a0, 0x0040($sp) -/* 01308 80AE3708 8C8C0678 */ lw $t4, 0x0678($a0) ## 00000678 -/* 0130C 80AE370C 95850092 */ lhu $a1, 0x0092($t4) ## 00000092 -/* 01310 80AE3710 24A56805 */ addiu $a1, $a1, 0x6805 ## $a1 = 00006805 -/* 01314 80AE3714 0C00BDF7 */ jal func_8002F7DC -/* 01318 80AE3718 30A5FFFF */ andi $a1, $a1, 0xFFFF ## $a1 = 00006805 -/* 0131C 80AE371C 10000023 */ beq $zero, $zero, .L80AE37AC -/* 01320 80AE3720 8FBF002C */ lw $ra, 0x002C($sp) -glabel L80AE3724 -/* 01324 80AE3724 3C0D8016 */ lui $t5, %hi(gSaveContext+4) -/* 01328 80AE3728 8DADE664 */ lw $t5, %lo(gSaveContext+4)($t5) -/* 0132C 80AE372C 260400BC */ addiu $a0, $s0, 0x00BC ## $a0 = 000000BC -/* 01330 80AE3730 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 01334 80AE3734 11A0001C */ beq $t5, $zero, .L80AE37A8 -/* 01338 80AE3738 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0133C 80AE373C 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 01340 80AE3740 3C0743C8 */ lui $a3, 0x43C8 ## $a3 = 43C80000 -/* 01344 80AE3744 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 01348 80AE3748 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 0134C 80AE374C 10000017 */ beq $zero, $zero, .L80AE37AC -/* 01350 80AE3750 8FBF002C */ lw $ra, 0x002C($sp) -glabel L80AE3754 -/* 01354 80AE3754 3C0E8016 */ lui $t6, %hi(gSaveContext+4) -/* 01358 80AE3758 8DCEE664 */ lw $t6, %lo(gSaveContext+4)($t6) -/* 0135C 80AE375C 260400BC */ addiu $a0, $s0, 0x00BC ## $a0 = 000000BC -/* 01360 80AE3760 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 01364 80AE3764 11C00005 */ beq $t6, $zero, .L80AE377C -/* 01368 80AE3768 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0136C 80AE376C 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 01370 80AE3770 3C0743C8 */ lui $a3, 0x43C8 ## $a3 = 43C80000 -/* 01374 80AE3774 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 01378 80AE3778 E7B20010 */ swc1 $f18, 0x0010($sp) -.L80AE377C: -/* 0137C 80AE377C 8E0F0004 */ lw $t7, 0x0004($s0) ## 00000004 -/* 01380 80AE3780 2408000A */ addiu $t0, $zero, 0x000A ## $t0 = 0000000A -/* 01384 80AE3784 2409000F */ addiu $t1, $zero, 0x000F ## $t1 = 0000000F -/* 01388 80AE3788 35F80001 */ ori $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 0138C 80AE378C A200001F */ sb $zero, 0x001F($s0) ## 0000001F -/* 01390 80AE3790 AE180004 */ sw $t8, 0x0004($s0) ## 00000004 -/* 01394 80AE3794 A2080306 */ sb $t0, 0x0306($s0) ## 00000306 -/* 01398 80AE3798 A2090307 */ sb $t1, 0x0307($s0) ## 00000307 -/* 0139C 80AE379C 8FA5004C */ lw $a1, 0x004C($sp) -/* 013A0 80AE37A0 0C2B8AE4 */ jal func_80AE2B90 -/* 013A4 80AE37A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80AE37A8: -/* 013A8 80AE37A8 8FBF002C */ lw $ra, 0x002C($sp) -.L80AE37AC: -/* 013AC 80AE37AC 8FB00028 */ lw $s0, 0x0028($sp) -/* 013B0 80AE37B0 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 013B4 80AE37B4 03E00008 */ jr $ra -/* 013B8 80AE37B8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE37BC.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE37BC.s deleted file mode 100644 index 7c1e95703f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE37BC.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_80AE37BC -/* 013BC 80AE37BC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 013C0 80AE37C0 AFA40028 */ sw $a0, 0x0028($sp) -/* 013C4 80AE37C4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 013C8 80AE37C8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 013CC 80AE37CC 0C028800 */ jal SkelAnime_GetFrameCount - -/* 013D0 80AE37D0 24844F94 */ addiu $a0, $a0, 0x4F94 ## $a0 = 06004F94 -/* 013D4 80AE37D4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 013D8 80AE37D8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 013DC 80AE37DC 8FA40028 */ lw $a0, 0x0028($sp) -/* 013E0 80AE37E0 468021A0 */ cvt.s.w $f6, $f4 -/* 013E4 80AE37E4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 013E8 80AE37E8 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 013EC 80AE37EC 44060000 */ mfc1 $a2, $f0 -/* 013F0 80AE37F0 44070000 */ mfc1 $a3, $f0 -/* 013F4 80AE37F4 AFAE0014 */ sw $t6, 0x0014($sp) -/* 013F8 80AE37F8 24A54F94 */ addiu $a1, $a1, 0x4F94 ## $a1 = 06004F94 -/* 013FC 80AE37FC E7A60010 */ swc1 $f6, 0x0010($sp) -/* 01400 80AE3800 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 01404 80AE3804 0C029468 */ jal SkelAnime_ChangeAnim - -/* 01408 80AE3808 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 0140C 80AE380C 8FA40028 */ lw $a0, 0x0028($sp) -/* 01410 80AE3810 240F0007 */ addiu $t7, $zero, 0x0007 ## $t7 = 00000007 -/* 01414 80AE3814 3C0580AE */ lui $a1, %hi(func_80AE3834) ## $a1 = 80AE0000 -/* 01418 80AE3818 24A53834 */ addiu $a1, $a1, %lo(func_80AE3834) ## $a1 = 80AE3834 -/* 0141C 80AE381C 0C2B8900 */ jal func_80AE2400 -/* 01420 80AE3820 A08F031B */ sb $t7, 0x031B($a0) ## 0000031B -/* 01424 80AE3824 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01428 80AE3828 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0142C 80AE382C 03E00008 */ jr $ra -/* 01430 80AE3830 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3834.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3834.s deleted file mode 100644 index 6715ac49db..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3834.s +++ /dev/null @@ -1,68 +0,0 @@ -glabel func_80AE3834 -/* 01434 80AE3834 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 01438 80AE3838 3C0F80AE */ lui $t7, %hi(D_80AE492C) ## $t7 = 80AE0000 -/* 0143C 80AE383C AFBF001C */ sw $ra, 0x001C($sp) -/* 01440 80AE3840 AFB00018 */ sw $s0, 0x0018($sp) -/* 01444 80AE3844 AFA50044 */ sw $a1, 0x0044($sp) -/* 01448 80AE3848 25EF492C */ addiu $t7, $t7, %lo(D_80AE492C) ## $t7 = 80AE492C -/* 0144C 80AE384C 8DF90000 */ lw $t9, 0x0000($t7) ## 80AE492C -/* 01450 80AE3850 27AE0034 */ addiu $t6, $sp, 0x0034 ## $t6 = FFFFFFF4 -/* 01454 80AE3854 8DF80004 */ lw $t8, 0x0004($t7) ## 80AE4930 -/* 01458 80AE3858 ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFF4 -/* 0145C 80AE385C 8DF90008 */ lw $t9, 0x0008($t7) ## 80AE4934 -/* 01460 80AE3860 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFF8 -/* 01464 80AE3864 3C0980AE */ lui $t1, %hi(D_80AE4938) ## $t1 = 80AE0000 -/* 01468 80AE3868 ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFFC -/* 0146C 80AE386C 3C0A80AE */ lui $t2, %hi(D_80AE493C) ## $t2 = 80AE0000 -/* 01470 80AE3870 8D294938 */ lw $t1, %lo(D_80AE4938)($t1) -/* 01474 80AE3874 8D4A493C */ lw $t2, %lo(D_80AE493C)($t2) -/* 01478 80AE3878 8FAB0044 */ lw $t3, 0x0044($sp) -/* 0147C 80AE387C AFA90030 */ sw $t1, 0x0030($sp) -/* 01480 80AE3880 AFAA002C */ sw $t2, 0x002C($sp) -/* 01484 80AE3884 848D00B6 */ lh $t5, 0x00B6($a0) ## 000000B6 -/* 01488 80AE3888 848C008A */ lh $t4, 0x008A($a0) ## 0000008A -/* 0148C 80AE388C 848F030E */ lh $t7, 0x030E($a0) ## 0000030E -/* 01490 80AE3890 84990310 */ lh $t9, 0x0310($a0) ## 00000310 -/* 01494 80AE3894 018D7023 */ subu $t6, $t4, $t5 -/* 01498 80AE3898 01CFC023 */ subu $t8, $t6, $t7 -/* 0149C 80AE389C 03191023 */ subu $v0, $t8, $t9 -/* 014A0 80AE38A0 00021400 */ sll $v0, $v0, 16 -/* 014A4 80AE38A4 00021403 */ sra $v0, $v0, 16 -/* 014A8 80AE38A8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 014AC 80AE38AC 04400003 */ bltz $v0, .L80AE38BC -/* 014B0 80AE38B0 8D681C44 */ lw $t0, 0x1C44($t3) ## 00001C44 -/* 014B4 80AE38B4 10000002 */ beq $zero, $zero, .L80AE38C0 -/* 014B8 80AE38B8 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L80AE38BC: -/* 014BC 80AE38BC 00021823 */ subu $v1, $zero, $v0 -.L80AE38C0: -/* 014C0 80AE38C0 28612008 */ slti $at, $v1, 0x2008 -/* 014C4 80AE38C4 50200015 */ beql $at, $zero, .L80AE391C -/* 014C8 80AE38C8 8FBF001C */ lw $ra, 0x001C($sp) -/* 014CC 80AE38CC 86090312 */ lh $t1, 0x0312($s0) ## 00000312 -/* 014D0 80AE38D0 240B003C */ addiu $t3, $zero, 0x003C ## $t3 = 0000003C -/* 014D4 80AE38D4 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF -/* 014D8 80AE38D8 312A0080 */ andi $t2, $t1, 0x0080 ## $t2 = 00000000 -/* 014DC 80AE38DC 15400008 */ bne $t2, $zero, .L80AE3900 -/* 014E0 80AE38E0 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 014E4 80AE38E4 A50B0110 */ sh $t3, 0x0110($t0) ## 00000110 -/* 014E8 80AE38E8 C60C0090 */ lwc1 $f12, 0x0090($s0) ## 00000090 -/* 014EC 80AE38EC 0C02A800 */ jal func_800AA000 -/* 014F0 80AE38F0 24070096 */ addiu $a3, $zero, 0x0096 ## $a3 = 00000096 -/* 014F4 80AE38F4 8FA40044 */ lw $a0, 0x0044($sp) -/* 014F8 80AE38F8 0C023BAB */ jal func_8008EEAC -/* 014FC 80AE38FC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -.L80AE3900: -/* 01500 80AE3900 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01504 80AE3904 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01508 80AE3908 240538E5 */ addiu $a1, $zero, 0x38E5 ## $a1 = 000038E5 -/* 0150C 80AE390C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01510 80AE3910 0C2B8AE4 */ jal func_80AE2B90 -/* 01514 80AE3914 8FA50044 */ lw $a1, 0x0044($sp) -/* 01518 80AE3918 8FBF001C */ lw $ra, 0x001C($sp) -.L80AE391C: -/* 0151C 80AE391C 8FB00018 */ lw $s0, 0x0018($sp) -/* 01520 80AE3920 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 01524 80AE3924 03E00008 */ jr $ra -/* 01528 80AE3928 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE392C.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE392C.s deleted file mode 100644 index 8e241027d2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE392C.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80AE392C -/* 0152C 80AE392C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01530 80AE3930 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01534 80AE3934 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 01538 80AE3938 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 0153C 80AE393C 24A58040 */ addiu $a1, $a1, 0x8040 ## $a1 = 06008040 -/* 01540 80AE3940 AFA70018 */ sw $a3, 0x0018($sp) -/* 01544 80AE3944 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 01548 80AE3948 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop -/* 0154C 80AE394C 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 -/* 01550 80AE3950 8FA40018 */ lw $a0, 0x0018($sp) -/* 01554 80AE3954 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 01558 80AE3958 3C0580AE */ lui $a1, %hi(func_80AE3978) ## $a1 = 80AE0000 -/* 0155C 80AE395C 24A53978 */ addiu $a1, $a1, %lo(func_80AE3978) ## $a1 = 80AE3978 -/* 01560 80AE3960 0C2B8900 */ jal func_80AE2400 -/* 01564 80AE3964 A08E031B */ sb $t6, 0x031B($a0) ## 0000031B -/* 01568 80AE3968 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0156C 80AE396C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01570 80AE3970 03E00008 */ jr $ra -/* 01574 80AE3974 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3978.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3978.s deleted file mode 100644 index 7358cdfafa..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3978.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_80AE3978 -/* 01578 80AE3978 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0157C 80AE397C AFA5001C */ sw $a1, 0x001C($sp) -/* 01580 80AE3980 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 01584 80AE3984 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01588 80AE3988 AFA40018 */ sw $a0, 0x0018($sp) -/* 0158C 80AE398C AFA50018 */ sw $a1, 0x0018($sp) -/* 01590 80AE3990 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01594 80AE3994 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 01598 80AE3998 1040000A */ beq $v0, $zero, .L80AE39C4 -/* 0159C 80AE399C 8FA50018 */ lw $a1, 0x0018($sp) -/* 015A0 80AE39A0 8CAE0118 */ lw $t6, 0x0118($a1) ## 00000118 -/* 015A4 80AE39A4 11C00005 */ beq $t6, $zero, .L80AE39BC -/* 015A8 80AE39A8 00000000 */ nop -/* 015AC 80AE39AC 0C2B8C77 */ jal func_80AE31DC -/* 015B0 80AE39B0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 015B4 80AE39B4 10000004 */ beq $zero, $zero, .L80AE39C8 -/* 015B8 80AE39B8 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AE39BC: -/* 015BC 80AE39BC 0C2B8DEF */ jal func_80AE37BC -/* 015C0 80AE39C0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -.L80AE39C4: -/* 015C4 80AE39C4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AE39C8: -/* 015C8 80AE39C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 015CC 80AE39CC 03E00008 */ jr $ra -/* 015D0 80AE39D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE39D4.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE39D4.s deleted file mode 100644 index 0581a8ca40..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE39D4.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_80AE39D4 -/* 015D4 80AE39D4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 015D8 80AE39D8 AFA40028 */ sw $a0, 0x0028($sp) -/* 015DC 80AE39DC AFBF0024 */ sw $ra, 0x0024($sp) -/* 015E0 80AE39E0 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 015E4 80AE39E4 0C028800 */ jal SkelAnime_GetFrameCount - -/* 015E8 80AE39E8 24848040 */ addiu $a0, $a0, 0x8040 ## $a0 = 06008040 -/* 015EC 80AE39EC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 015F0 80AE39F0 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 -/* 015F4 80AE39F4 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 -/* 015F8 80AE39F8 46802120 */ cvt.s.w $f4, $f4 -/* 015FC 80AE39FC 8FA40028 */ lw $a0, 0x0028($sp) -/* 01600 80AE3A00 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 01604 80AE3A04 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01608 80AE3A08 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 0160C 80AE3A0C AFAE0014 */ sw $t6, 0x0014($sp) -/* 01610 80AE3A10 44072000 */ mfc1 $a3, $f4 -/* 01614 80AE3A14 24A58040 */ addiu $a1, $a1, 0x8040 ## $a1 = 06008040 -/* 01618 80AE3A18 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 -/* 0161C 80AE3A1C E7A80018 */ swc1 $f8, 0x0018($sp) -/* 01620 80AE3A20 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 01624 80AE3A24 0C029468 */ jal SkelAnime_ChangeAnim - -/* 01628 80AE3A28 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 0162C 80AE3A2C 8FA40028 */ lw $a0, 0x0028($sp) -/* 01630 80AE3A30 240F0006 */ addiu $t7, $zero, 0x0006 ## $t7 = 00000006 -/* 01634 80AE3A34 3C0580AE */ lui $a1, %hi(func_80AE3A54) ## $a1 = 80AE0000 -/* 01638 80AE3A38 24A53A54 */ addiu $a1, $a1, %lo(func_80AE3A54) ## $a1 = 80AE3A54 -/* 0163C 80AE3A3C 0C2B8900 */ jal func_80AE2400 -/* 01640 80AE3A40 A08F031B */ sb $t7, 0x031B($a0) ## 0000031B -/* 01644 80AE3A44 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01648 80AE3A48 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0164C 80AE3A4C 03E00008 */ jr $ra -/* 01650 80AE3A50 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3A54.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3A54.s deleted file mode 100644 index d15b4410b7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3A54.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80AE3A54 -/* 01654 80AE3A54 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01658 80AE3A58 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0165C 80AE3A5C AFA40018 */ sw $a0, 0x0018($sp) -/* 01660 80AE3A60 AFA5001C */ sw $a1, 0x001C($sp) -/* 01664 80AE3A64 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01668 80AE3A68 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 0166C 80AE3A6C 50400004 */ beql $v0, $zero, .L80AE3A80 -/* 01670 80AE3A70 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01674 80AE3A74 0C2B89A7 */ jal func_80AE269C -/* 01678 80AE3A78 8FA40018 */ lw $a0, 0x0018($sp) -/* 0167C 80AE3A7C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AE3A80: -/* 01680 80AE3A80 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01684 80AE3A84 03E00008 */ jr $ra -/* 01688 80AE3A88 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3A8C.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3A8C.s deleted file mode 100644 index a8e333b662..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3A8C.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_80AE3A8C -/* 0168C 80AE3A8C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01690 80AE3A90 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01694 80AE3A94 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 01698 80AE3A98 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0169C 80AE3A9C 24A574F0 */ addiu $a1, $a1, 0x74F0 ## $a1 = 060074F0 -/* 016A0 80AE3AA0 AFA70018 */ sw $a3, 0x0018($sp) -/* 016A4 80AE3AA4 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 016A8 80AE3AA8 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop -/* 016AC 80AE3AAC 3C06C0C0 */ lui $a2, 0xC0C0 ## $a2 = C0C00000 -/* 016B0 80AE3AB0 8FA70018 */ lw $a3, 0x0018($sp) -/* 016B4 80AE3AB4 3C01C000 */ lui $at, 0xC000 ## $at = C0000000 -/* 016B8 80AE3AB8 94EE0088 */ lhu $t6, 0x0088($a3) ## 00000088 -/* 016BC 80AE3ABC 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 016C0 80AE3AC0 51E00005 */ beql $t7, $zero, .L80AE3AD8 -/* 016C4 80AE3AC4 8CF80004 */ lw $t8, 0x0004($a3) ## 00000004 -/* 016C8 80AE3AC8 44812000 */ mtc1 $at, $f4 ## $f4 = -2.00 -/* 016CC 80AE3ACC 00000000 */ nop -/* 016D0 80AE3AD0 E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 -/* 016D4 80AE3AD4 8CF80004 */ lw $t8, 0x0004($a3) ## 00000004 -.L80AE3AD8: -/* 016D8 80AE3AD8 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 016DC 80AE3ADC 240538E6 */ addiu $a1, $zero, 0x38E6 ## $a1 = 000038E6 -/* 016E0 80AE3AE0 37190001 */ ori $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 016E4 80AE3AE4 ACF90004 */ sw $t9, 0x0004($a3) ## 00000004 -/* 016E8 80AE3AE8 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 016EC 80AE3AEC AFA70018 */ sw $a3, 0x0018($sp) -/* 016F0 80AE3AF0 8FA40018 */ lw $a0, 0x0018($sp) -/* 016F4 80AE3AF4 24080009 */ addiu $t0, $zero, 0x0009 ## $t0 = 00000009 -/* 016F8 80AE3AF8 3C0580AE */ lui $a1, %hi(func_80AE3B18) ## $a1 = 80AE0000 -/* 016FC 80AE3AFC 24A53B18 */ addiu $a1, $a1, %lo(func_80AE3B18) ## $a1 = 80AE3B18 -/* 01700 80AE3B00 0C2B8900 */ jal func_80AE2400 -/* 01704 80AE3B04 A088031B */ sb $t0, 0x031B($a0) ## 0000031B -/* 01708 80AE3B08 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0170C 80AE3B0C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01710 80AE3B10 03E00008 */ jr $ra -/* 01714 80AE3B14 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3B18.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3B18.s deleted file mode 100644 index d4b27c86a2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3B18.s +++ /dev/null @@ -1,80 +0,0 @@ -.late_rodata -glabel D_80AE49B8 - .float 0.15 - -.text -glabel func_80AE3B18 -/* 01718 80AE3B18 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0171C 80AE3B1C AFBF0024 */ sw $ra, 0x0024($sp) -/* 01720 80AE3B20 AFB00020 */ sw $s0, 0x0020($sp) -/* 01724 80AE3B24 AFA50034 */ sw $a1, 0x0034($sp) -/* 01728 80AE3B28 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 0172C 80AE3B2C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01730 80AE3B30 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01734 80AE3B34 AFAF002C */ sw $t7, 0x002C($sp) -/* 01738 80AE3B38 C4800068 */ lwc1 $f0, 0x0068($a0) ## 00000068 -/* 0173C 80AE3B3C 3C0180AE */ lui $at, %hi(D_80AE49B8) ## $at = 80AE0000 -/* 01740 80AE3B40 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01744 80AE3B44 4604003C */ c.lt.s $f0, $f4 -/* 01748 80AE3B48 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 0174C 80AE3B4C 45020005 */ bc1fl .L80AE3B64 -/* 01750 80AE3B50 8618008A */ lh $t8, 0x008A($s0) ## 0000008A -/* 01754 80AE3B54 C42649B8 */ lwc1 $f6, %lo(D_80AE49B8)($at) -/* 01758 80AE3B58 46060200 */ add.s $f8, $f0, $f6 -/* 0175C 80AE3B5C E4880068 */ swc1 $f8, 0x0068($a0) ## 00000068 -/* 01760 80AE3B60 8618008A */ lh $t8, 0x008A($s0) ## 0000008A -.L80AE3B64: -/* 01764 80AE3B64 2604030E */ addiu $a0, $s0, 0x030E ## $a0 = 0000030E -/* 01768 80AE3B68 2407012C */ addiu $a3, $zero, 0x012C ## $a3 = 0000012C -/* 0176C 80AE3B6C A6180032 */ sh $t8, 0x0032($s0) ## 00000032 -/* 01770 80AE3B70 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 01774 80AE3B74 AFA00010 */ sw $zero, 0x0010($sp) -/* 01778 80AE3B78 26040310 */ addiu $a0, $s0, 0x0310 ## $a0 = 00000310 -/* 0177C 80AE3B7C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01780 80AE3B80 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01784 80AE3B84 2407012C */ addiu $a3, $zero, 0x012C ## $a3 = 0000012C -/* 01788 80AE3B88 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 0178C 80AE3B8C AFA00010 */ sw $zero, 0x0010($sp) -/* 01790 80AE3B90 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01794 80AE3B94 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 -/* 01798 80AE3B98 5040001D */ beql $v0, $zero, .L80AE3C10 -/* 0179C 80AE3B9C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 017A0 80AE3BA0 8E080118 */ lw $t0, 0x0118($s0) ## 00000118 -/* 017A4 80AE3BA4 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B6 -/* 017A8 80AE3BA8 26050008 */ addiu $a1, $s0, 0x0008 ## $a1 = 00000008 -/* 017AC 80AE3BAC 11000005 */ beq $t0, $zero, .L80AE3BC4 -/* 017B0 80AE3BB0 A6190032 */ sh $t9, 0x0032($s0) ## 00000032 -/* 017B4 80AE3BB4 0C2B8C77 */ jal func_80AE31DC -/* 017B8 80AE3BB8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 017BC 80AE3BBC 10000012 */ beq $zero, $zero, .L80AE3C08 -/* 017C0 80AE3BC0 240900FF */ addiu $t1, $zero, 0x00FF ## $t1 = 000000FF -.L80AE3BC4: -/* 017C4 80AE3BC4 0C00B6DB */ jal func_8002DB6C -/* 017C8 80AE3BC8 8FA4002C */ lw $a0, 0x002C($sp) -/* 017CC 80AE3BCC 3C014316 */ lui $at, 0x4316 ## $at = 43160000 -/* 017D0 80AE3BD0 44815000 */ mtc1 $at, $f10 ## $f10 = 150.00 -/* 017D4 80AE3BD4 8FA50034 */ lw $a1, 0x0034($sp) -/* 017D8 80AE3BD8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 017DC 80AE3BDC 4600503E */ c.le.s $f10, $f0 -/* 017E0 80AE3BE0 00000000 */ nop -/* 017E4 80AE3BE4 45000005 */ bc1f .L80AE3BFC -/* 017E8 80AE3BE8 00000000 */ nop -/* 017EC 80AE3BEC 0C2B8BD4 */ jal func_80AE2F50 -/* 017F0 80AE3BF0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 017F4 80AE3BF4 10000004 */ beq $zero, $zero, .L80AE3C08 -/* 017F8 80AE3BF8 240900FF */ addiu $t1, $zero, 0x00FF ## $t1 = 000000FF -.L80AE3BFC: -/* 017FC 80AE3BFC 0C2B8AE4 */ jal func_80AE2B90 -/* 01800 80AE3C00 8FA50034 */ lw $a1, 0x0034($sp) -/* 01804 80AE3C04 240900FF */ addiu $t1, $zero, 0x00FF ## $t1 = 000000FF -.L80AE3C08: -/* 01808 80AE3C08 A209031D */ sb $t1, 0x031D($s0) ## 0000031D -/* 0180C 80AE3C0C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AE3C10: -/* 01810 80AE3C10 8FB00020 */ lw $s0, 0x0020($sp) -/* 01814 80AE3C14 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01818 80AE3C18 03E00008 */ jr $ra -/* 0181C 80AE3C1C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3C20.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3C20.s deleted file mode 100644 index 33f9bee3e9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3C20.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_80AE3C20 -/* 01820 80AE3C20 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01824 80AE3C24 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01828 80AE3C28 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 0182C 80AE3C2C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01830 80AE3C30 24A56E88 */ addiu $a1, $a1, 0x6E88 ## $a1 = 06006E88 -/* 01834 80AE3C34 AFA70018 */ sw $a3, 0x0018($sp) -/* 01838 80AE3C38 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 0183C 80AE3C3C 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop -/* 01840 80AE3C40 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 -/* 01844 80AE3C44 8FA40018 */ lw $a0, 0x0018($sp) -/* 01848 80AE3C48 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 0184C 80AE3C4C 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 01850 80AE3C50 8C980004 */ lw $t8, 0x0004($a0) ## 00000004 -/* 01854 80AE3C54 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A -/* 01858 80AE3C58 240F012C */ addiu $t7, $zero, 0x012C ## $t7 = 0000012C -/* 0185C 80AE3C5C 0301C824 */ and $t9, $t8, $at -/* 01860 80AE3C60 240538E7 */ addiu $a1, $zero, 0x38E7 ## $a1 = 000038E7 -/* 01864 80AE3C64 A08E031B */ sb $t6, 0x031B($a0) ## 0000031B -/* 01868 80AE3C68 A48F030C */ sh $t7, 0x030C($a0) ## 0000030C -/* 0186C 80AE3C6C AC990004 */ sw $t9, 0x0004($a0) ## 00000004 -/* 01870 80AE3C70 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01874 80AE3C74 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 01878 80AE3C78 3C0580AE */ lui $a1, %hi(func_80AE3C98) ## $a1 = 80AE0000 -/* 0187C 80AE3C7C 8FA40018 */ lw $a0, 0x0018($sp) -/* 01880 80AE3C80 0C2B8900 */ jal func_80AE2400 -/* 01884 80AE3C84 24A53C98 */ addiu $a1, $a1, %lo(func_80AE3C98) ## $a1 = 80AE3C98 -/* 01888 80AE3C88 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0188C 80AE3C8C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01890 80AE3C90 03E00008 */ jr $ra -/* 01894 80AE3C94 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3C98.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3C98.s deleted file mode 100644 index efa022d326..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3C98.s +++ /dev/null @@ -1,106 +0,0 @@ -.late_rodata -glabel D_80AE49BC - .float 7.5e-5 - -.text -glabel func_80AE3C98 -/* 01898 80AE3C98 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0189C 80AE3C9C AFBF0024 */ sw $ra, 0x0024($sp) -/* 018A0 80AE3CA0 AFB00020 */ sw $s0, 0x0020($sp) -/* 018A4 80AE3CA4 AFA5002C */ sw $a1, 0x002C($sp) -/* 018A8 80AE3CA8 908E0002 */ lbu $t6, 0x0002($a0) ## 00000002 -/* 018AC 80AE3CAC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 018B0 80AE3CB0 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 018B4 80AE3CB4 11C10005 */ beq $t6, $at, .L80AE3CCC -/* 018B8 80AE3CB8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 018BC 80AE3CBC 24A51C24 */ addiu $a1, $a1, 0x1C24 ## $a1 = 00001C24 -/* 018C0 80AE3CC0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 018C4 80AE3CC4 0C00CDD2 */ jal Actor_ChangeType - -/* 018C8 80AE3CC8 24070006 */ addiu $a3, $zero, 0x0006 ## $a3 = 00000006 -.L80AE3CCC: -/* 018CC 80AE3CCC 2604030E */ addiu $a0, $s0, 0x030E ## $a0 = 0000030E -/* 018D0 80AE3CD0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 018D4 80AE3CD4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 018D8 80AE3CD8 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 -/* 018DC 80AE3CDC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 018E0 80AE3CE0 AFA00010 */ sw $zero, 0x0010($sp) -/* 018E4 80AE3CE4 26040310 */ addiu $a0, $s0, 0x0310 ## $a0 = 00000310 -/* 018E8 80AE3CE8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 018EC 80AE3CEC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 018F0 80AE3CF0 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 -/* 018F4 80AE3CF4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 018F8 80AE3CF8 AFA00010 */ sw $zero, 0x0010($sp) -/* 018FC 80AE3CFC 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01900 80AE3D00 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 -/* 01904 80AE3D04 50400027 */ beql $v0, $zero, .L80AE3DA4 -/* 01908 80AE3D08 C60A01A0 */ lwc1 $f10, 0x01A0($s0) ## 000001A0 -/* 0190C 80AE3D0C 8602030C */ lh $v0, 0x030C($s0) ## 0000030C -/* 01910 80AE3D10 14400021 */ bne $v0, $zero, .L80AE3D98 -/* 01914 80AE3D14 2459FFFF */ addiu $t9, $v0, 0xFFFF ## $t9 = FFFFFFFF -/* 01918 80AE3D18 86050312 */ lh $a1, 0x0312($s0) ## 00000312 -/* 0191C 80AE3D1C 8FA4002C */ lw $a0, 0x002C($sp) -/* 01920 80AE3D20 0C00B2D0 */ jal Flags_GetSwitch - -/* 01924 80AE3D24 30A5007F */ andi $a1, $a1, 0x007F ## $a1 = 00000000 -/* 01928 80AE3D28 54400006 */ bnel $v0, $zero, .L80AE3D44 -/* 0192C 80AE3D2C 86020314 */ lh $v0, 0x0314($s0) ## 00000314 -/* 01930 80AE3D30 86050312 */ lh $a1, 0x0312($s0) ## 00000312 -/* 01934 80AE3D34 8FA4002C */ lw $a0, 0x002C($sp) -/* 01938 80AE3D38 0C00B2DD */ jal Flags_SetSwitch - -/* 0193C 80AE3D3C 30A5007F */ andi $a1, $a1, 0x007F ## $a1 = 00000000 -/* 01940 80AE3D40 86020314 */ lh $v0, 0x0314($s0) ## 00000314 -.L80AE3D44: -/* 01944 80AE3D44 240100B4 */ addiu $at, $zero, 0x00B4 ## $at = 000000B4 -/* 01948 80AE3D48 1040000F */ beq $v0, $zero, .L80AE3D88 -/* 0194C 80AE3D4C 00000000 */ nop -/* 01950 80AE3D50 14410005 */ bne $v0, $at, .L80AE3D68 -/* 01954 80AE3D54 8FA4002C */ lw $a0, 0x002C($sp) -/* 01958 80AE3D58 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0195C 80AE3D5C 0C2B898C */ jal func_80AE2630 -/* 01960 80AE3D60 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01964 80AE3D64 86020314 */ lh $v0, 0x0314($s0) ## 00000314 -.L80AE3D68: -/* 01968 80AE3D68 3C0180AE */ lui $at, %hi(D_80AE49BC) ## $at = 80AE0000 -/* 0196C 80AE3D6C C42649BC */ lwc1 $f6, %lo(D_80AE49BC)($at) -/* 01970 80AE3D70 C6040054 */ lwc1 $f4, 0x0054($s0) ## 00000054 -/* 01974 80AE3D74 2458FFFB */ addiu $t8, $v0, 0xFFFB ## $t8 = FFFFFFFB -/* 01978 80AE3D78 A6180314 */ sh $t8, 0x0314($s0) ## 00000314 -/* 0197C 80AE3D7C 46062201 */ sub.s $f8, $f4, $f6 -/* 01980 80AE3D80 10000013 */ beq $zero, $zero, .L80AE3DD0 -/* 01984 80AE3D84 E6080054 */ swc1 $f8, 0x0054($s0) ## 00000054 -.L80AE3D88: -/* 01988 80AE3D88 0C00B55C */ jal Actor_Kill - -/* 0198C 80AE3D8C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01990 80AE3D90 10000010 */ beq $zero, $zero, .L80AE3DD4 -/* 01994 80AE3D94 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AE3D98: -/* 01998 80AE3D98 1000000D */ beq $zero, $zero, .L80AE3DD0 -/* 0199C 80AE3D9C A619030C */ sh $t9, 0x030C($s0) ## 0000030C -/* 019A0 80AE3DA0 C60A01A0 */ lwc1 $f10, 0x01A0($s0) ## 000001A0 -.L80AE3DA4: -/* 019A4 80AE3DA4 24010021 */ addiu $at, $zero, 0x0021 ## $at = 00000021 -/* 019A8 80AE3DA8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 019AC 80AE3DAC 4600540D */ trunc.w.s $f16, $f10 -/* 019B0 80AE3DB0 44028000 */ mfc1 $v0, $f16 -/* 019B4 80AE3DB4 00000000 */ nop -/* 019B8 80AE3DB8 10410003 */ beq $v0, $at, .L80AE3DC8 -/* 019BC 80AE3DBC 24010028 */ addiu $at, $zero, 0x0028 ## $at = 00000028 -/* 019C0 80AE3DC0 54410004 */ bnel $v0, $at, .L80AE3DD4 -/* 019C4 80AE3DC4 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AE3DC8: -/* 019C8 80AE3DC8 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 019CC 80AE3DCC 2405387A */ addiu $a1, $zero, 0x387A ## $a1 = 0000387A -.L80AE3DD0: -/* 019D0 80AE3DD0 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AE3DD4: -/* 019D4 80AE3DD4 8FB00020 */ lw $s0, 0x0020($sp) -/* 019D8 80AE3DD8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 019DC 80AE3DDC 03E00008 */ jr $ra -/* 019E0 80AE3DE0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3DE4.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3DE4.s deleted file mode 100644 index c6c7f38fcb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3DE4.s +++ /dev/null @@ -1,64 +0,0 @@ -glabel func_80AE3DE4 -/* 019E4 80AE3DE4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 019E8 80AE3DE8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 019EC 80AE3DEC AFB00020 */ sw $s0, 0x0020($sp) -/* 019F0 80AE3DF0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 019F4 80AE3DF4 848E00B6 */ lh $t6, 0x00B6($a0) ## 000000B6 -/* 019F8 80AE3DF8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 019FC 80AE3DFC A082031B */ sb $v0, 0x031B($a0) ## 0000031B -/* 01A00 80AE3E00 3C0F8016 */ lui $t7, %hi(gSaveContext+0x1422) -/* 01A04 80AE3E04 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 01A08 80AE3E08 A48E0032 */ sh $t6, 0x0032($a0) ## 00000032 -/* 01A0C 80AE3E0C 85EFFA82 */ lh $t7, %lo(gSaveContext+0x1422)($t7) -/* 01A10 80AE3E10 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01A14 80AE3E14 24180258 */ addiu $t8, $zero, 0x0258 ## $t8 = 00000258 -/* 01A18 80AE3E18 11E0000D */ beq $t7, $zero, .L80AE3E50 -/* 01A1C 80AE3E1C 24053836 */ addiu $a1, $zero, 0x3836 ## $a1 = 00003836 -/* 01A20 80AE3E20 A0820318 */ sb $v0, 0x0318($a0) ## 00000318 -/* 01A24 80AE3E24 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01A28 80AE3E28 A4980316 */ sh $t8, 0x0316($a0) ## 00000316 -/* 01A2C 80AE3E2C 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 01A30 80AE3E30 AFB90010 */ sw $t9, 0x0010($sp) -/* 01A34 80AE3E34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01A38 80AE3E38 24058000 */ addiu $a1, $zero, 0x8000 ## $a1 = FFFF8000 -/* 01A3C 80AE3E3C 240680C8 */ addiu $a2, $zero, 0x80C8 ## $a2 = FFFF80C8 -/* 01A40 80AE3E40 0C00D09B */ jal func_8003426C -/* 01A44 80AE3E44 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01A48 80AE3E48 10000017 */ beq $zero, $zero, .L80AE3EA8 -/* 01A4C 80AE3E4C 00000000 */ nop -.L80AE3E50: -/* 01A50 80AE3E50 9208031C */ lbu $t0, 0x031C($s0) ## 0000031C -/* 01A54 80AE3E54 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01A58 80AE3E58 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01A5C 80AE3E5C 15010009 */ bne $t0, $at, .L80AE3E84 -/* 01A60 80AE3E60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01A64 80AE3E64 24090050 */ addiu $t1, $zero, 0x0050 ## $t1 = 00000050 -/* 01A68 80AE3E68 AFA90010 */ sw $t1, 0x0010($sp) -/* 01A6C 80AE3E6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01A70 80AE3E70 240600C8 */ addiu $a2, $zero, 0x00C8 ## $a2 = 000000C8 -/* 01A74 80AE3E74 0C00D09B */ jal func_8003426C -/* 01A78 80AE3E78 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01A7C 80AE3E7C 1000000A */ beq $zero, $zero, .L80AE3EA8 -/* 01A80 80AE3E80 00000000 */ nop -.L80AE3E84: -/* 01A84 80AE3E84 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01A88 80AE3E88 24053836 */ addiu $a1, $zero, 0x3836 ## $a1 = 00003836 -/* 01A8C 80AE3E8C 240A0050 */ addiu $t2, $zero, 0x0050 ## $t2 = 00000050 -/* 01A90 80AE3E90 AFAA0010 */ sw $t2, 0x0010($sp) -/* 01A94 80AE3E94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01A98 80AE3E98 24058000 */ addiu $a1, $zero, 0x8000 ## $a1 = FFFF8000 -/* 01A9C 80AE3E9C 240600C8 */ addiu $a2, $zero, 0x00C8 ## $a2 = 000000C8 -/* 01AA0 80AE3EA0 0C00D09B */ jal func_8003426C -/* 01AA4 80AE3EA4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -.L80AE3EA8: -/* 01AA8 80AE3EA8 3C0580AE */ lui $a1, %hi(func_80AE3ECC) ## $a1 = 80AE0000 -/* 01AAC 80AE3EAC 24A53ECC */ addiu $a1, $a1, %lo(func_80AE3ECC) ## $a1 = 80AE3ECC -/* 01AB0 80AE3EB0 0C2B8900 */ jal func_80AE2400 -/* 01AB4 80AE3EB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01AB8 80AE3EB8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01ABC 80AE3EBC 8FB00020 */ lw $s0, 0x0020($sp) -/* 01AC0 80AE3EC0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01AC4 80AE3EC4 03E00008 */ jr $ra -/* 01AC8 80AE3EC8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3ECC.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3ECC.s deleted file mode 100644 index b0c6382fe2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3ECC.s +++ /dev/null @@ -1,59 +0,0 @@ -glabel func_80AE3ECC -/* 01ACC 80AE3ECC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01AD0 80AE3ED0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01AD4 80AE3ED4 AFB00020 */ sw $s0, 0x0020($sp) -/* 01AD8 80AE3ED8 AFA5002C */ sw $a1, 0x002C($sp) -/* 01ADC 80AE3EDC 908E0318 */ lbu $t6, 0x0318($a0) ## 00000318 -/* 01AE0 80AE3EE0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01AE4 80AE3EE4 51C00014 */ beql $t6, $zero, .L80AE3F38 -/* 01AE8 80AE3EE8 92190114 */ lbu $t9, 0x0114($s0) ## 00000114 -/* 01AEC 80AE3EEC 84820316 */ lh $v0, 0x0316($a0) ## 00000316 -/* 01AF0 80AE3EF0 10400010 */ beq $v0, $zero, .L80AE3F34 -/* 01AF4 80AE3EF4 244FFFFF */ addiu $t7, $v0, 0xFFFF ## $t7 = FFFFFFFF -/* 01AF8 80AE3EF8 A48F0316 */ sh $t7, 0x0316($a0) ## 00000316 -/* 01AFC 80AE3EFC 84820316 */ lh $v0, 0x0316($a0) ## 00000316 -/* 01B00 80AE3F00 24058000 */ addiu $a1, $zero, 0x8000 ## $a1 = FFFF8000 -/* 01B04 80AE3F04 240600C8 */ addiu $a2, $zero, 0x00C8 ## $a2 = 000000C8 -/* 01B08 80AE3F08 284100FF */ slti $at, $v0, 0x00FF -/* 01B0C 80AE3F0C 14200005 */ bne $at, $zero, .L80AE3F24 -/* 01B10 80AE3F10 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01B14 80AE3F14 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 01B18 80AE3F18 0C00D09B */ jal func_8003426C -/* 01B1C 80AE3F1C AFB80010 */ sw $t8, 0x0010($sp) -/* 01B20 80AE3F20 86020316 */ lh $v0, 0x0316($s0) ## 00000316 -.L80AE3F24: -/* 01B24 80AE3F24 14400003 */ bne $v0, $zero, .L80AE3F34 -/* 01B28 80AE3F28 3C018016 */ lui $at, %hi(gSaveContext+0x1422) -/* 01B2C 80AE3F2C A2000318 */ sb $zero, 0x0318($s0) ## 00000318 -/* 01B30 80AE3F30 A420FA82 */ sh $zero, %lo(gSaveContext+0x1422)($at) -.L80AE3F34: -/* 01B34 80AE3F34 92190114 */ lbu $t9, 0x0114($s0) ## 00000114 -.L80AE3F38: -/* 01B38 80AE3F38 57200014 */ bnel $t9, $zero, .L80AE3F8C -/* 01B3C 80AE3F3C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01B40 80AE3F40 920800AF */ lbu $t0, 0x00AF($s0) ## 000000AF -/* 01B44 80AE3F44 8FA4002C */ lw $a0, 0x002C($sp) -/* 01B48 80AE3F48 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01B4C 80AE3F4C 1500000C */ bne $t0, $zero, .L80AE3F80 -/* 01B50 80AE3F50 00000000 */ nop -/* 01B54 80AE3F54 0C2B898C */ jal func_80AE2630 -/* 01B58 80AE3F58 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01B5C 80AE3F5C 0C2B8F08 */ jal func_80AE3C20 -/* 01B60 80AE3F60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01B64 80AE3F64 8FA4002C */ lw $a0, 0x002C($sp) -/* 01B68 80AE3F68 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01B6C 80AE3F6C 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024 -/* 01B70 80AE3F70 0C007E50 */ jal Item_DropCollectibleRandom - -/* 01B74 80AE3F74 24070090 */ addiu $a3, $zero, 0x0090 ## $a3 = 00000090 -/* 01B78 80AE3F78 10000004 */ beq $zero, $zero, .L80AE3F8C -/* 01B7C 80AE3F7C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AE3F80: -/* 01B80 80AE3F80 0C2B8EA3 */ jal func_80AE3A8C -/* 01B84 80AE3F84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01B88 80AE3F88 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AE3F8C: -/* 01B8C 80AE3F8C 8FB00020 */ lw $s0, 0x0020($sp) -/* 01B90 80AE3F90 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01B94 80AE3F94 03E00008 */ jr $ra -/* 01B98 80AE3F98 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE4114.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE4114.s deleted file mode 100644 index 57905a2edd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE4114.s +++ /dev/null @@ -1,128 +0,0 @@ -glabel func_80AE4114 -/* 01D14 80AE4114 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01D18 80AE4118 3C0F8016 */ lui $t7, %hi(gSaveContext+0x1422) -/* 01D1C 80AE411C 85EFFA82 */ lh $t7, %lo(gSaveContext+0x1422)($t7) -/* 01D20 80AE4120 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01D24 80AE4124 AFB00020 */ sw $s0, 0x0020($sp) -/* 01D28 80AE4128 AFA50034 */ sw $a1, 0x0034($sp) -/* 01D2C 80AE412C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01D30 80AE4130 11E00013 */ beq $t7, $zero, .L80AE4180 -/* 01D34 80AE4134 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 -/* 01D38 80AE4138 849800B4 */ lh $t8, 0x00B4($a0) ## 000000B4 -/* 01D3C 80AE413C 57000011 */ bnel $t8, $zero, .L80AE4184 -/* 01D40 80AE4140 92020331 */ lbu $v0, 0x0331($s0) ## 00000331 -/* 01D44 80AE4144 90990318 */ lbu $t9, 0x0318($a0) ## 00000318 -/* 01D48 80AE4148 5720000E */ bnel $t9, $zero, .L80AE4184 -/* 01D4C 80AE414C 92020331 */ lbu $v0, 0x0331($s0) ## 00000331 -/* 01D50 80AE4150 9082031B */ lbu $v0, 0x031B($a0) ## 0000031B -/* 01D54 80AE4154 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 01D58 80AE4158 10410009 */ beq $v0, $at, .L80AE4180 -/* 01D5C 80AE415C 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 01D60 80AE4160 10410007 */ beq $v0, $at, .L80AE4180 -/* 01D64 80AE4164 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01D68 80AE4168 50410006 */ beql $v0, $at, .L80AE4184 -/* 01D6C 80AE416C 92020331 */ lbu $v0, 0x0331($s0) ## 00000331 -/* 01D70 80AE4170 0C2B8F79 */ jal func_80AE3DE4 -/* 01D74 80AE4174 00000000 */ nop -/* 01D78 80AE4178 10000054 */ beq $zero, $zero, .L80AE42CC -/* 01D7C 80AE417C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AE4180: -/* 01D80 80AE4180 92020331 */ lbu $v0, 0x0331($s0) ## 00000331 -.L80AE4184: -/* 01D84 80AE4184 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 01D88 80AE4188 30480002 */ andi $t0, $v0, 0x0002 ## $t0 = 00000000 -/* 01D8C 80AE418C 1100004E */ beq $t0, $zero, .L80AE42C8 -/* 01D90 80AE4190 3049FFFD */ andi $t1, $v0, 0xFFFD ## $t1 = 00000000 -/* 01D94 80AE4194 920B031B */ lbu $t3, 0x031B($s0) ## 0000031B -/* 01D98 80AE4198 920A00B1 */ lbu $t2, 0x00B1($s0) ## 000000B1 -/* 01D9C 80AE419C A2090331 */ sb $t1, 0x0331($s0) ## 00000331 -/* 01DA0 80AE41A0 11610049 */ beq $t3, $at, .L80AE42C8 -/* 01DA4 80AE41A4 A20A031C */ sb $t2, 0x031C($s0) ## 0000031C -/* 01DA8 80AE41A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01DAC 80AE41AC 26050338 */ addiu $a1, $s0, 0x0338 ## $a1 = 00000338 -/* 01DB0 80AE41B0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01DB4 80AE41B4 0C00D594 */ jal func_80035650 -/* 01DB8 80AE41B8 AFA30028 */ sw $v1, 0x0028($sp) -/* 01DBC 80AE41BC 8FA30028 */ lw $v1, 0x0028($sp) -/* 01DC0 80AE41C0 24040001 */ addiu $a0, $zero, 0x0001 ## $a0 = 00000001 -/* 01DC4 80AE41C4 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 01DC8 80AE41C8 806C0844 */ lb $t4, 0x0844($v1) ## 00000844 -/* 01DCC 80AE41CC 51800004 */ beql $t4, $zero, .L80AE41E0 -/* 01DD0 80AE41D0 9202031C */ lbu $v0, 0x031C($s0) ## 0000031C -/* 01DD4 80AE41D4 906D0845 */ lbu $t5, 0x0845($v1) ## 00000845 -/* 01DD8 80AE41D8 A20D031D */ sb $t5, 0x031D($s0) ## 0000031D -/* 01DDC 80AE41DC 9202031C */ lbu $v0, 0x031C($s0) ## 0000031C -.L80AE41E0: -/* 01DE0 80AE41E0 5040003A */ beql $v0, $zero, .L80AE42CC -/* 01DE4 80AE41E4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01DE8 80AE41E8 50410038 */ beql $v0, $at, .L80AE42CC -/* 01DEC 80AE41EC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01DF0 80AE41F0 10820003 */ beq $a0, $v0, .L80AE4200 -/* 01DF4 80AE41F4 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D -/* 01DF8 80AE41F8 5441000B */ bnel $v0, $at, .L80AE4228 -/* 01DFC 80AE41FC 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -.L80AE4200: -/* 01E00 80AE4200 920E031B */ lbu $t6, 0x031B($s0) ## 0000031B -/* 01E04 80AE4204 508E0008 */ beql $a0, $t6, .L80AE4228 -/* 01E08 80AE4208 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 01E0C 80AE420C 0C00D58A */ jal Actor_ApplyDamage - -/* 01E10 80AE4210 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01E14 80AE4214 0C2B8F79 */ jal func_80AE3DE4 -/* 01E18 80AE4218 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01E1C 80AE421C 1000002B */ beq $zero, $zero, .L80AE42CC -/* 01E20 80AE4220 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01E24 80AE4224 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -.L80AE4228: -/* 01E28 80AE4228 A2000318 */ sb $zero, 0x0318($s0) ## 00000318 -/* 01E2C 80AE422C 1441000B */ bne $v0, $at, .L80AE425C -/* 01E30 80AE4230 A6000316 */ sh $zero, 0x0316($s0) ## 00000316 -/* 01E34 80AE4234 240F0050 */ addiu $t7, $zero, 0x0050 ## $t7 = 00000050 -/* 01E38 80AE4238 AFAF0010 */ sw $t7, 0x0010($sp) -/* 01E3C 80AE423C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01E40 80AE4240 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 -/* 01E44 80AE4244 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 01E48 80AE4248 0C00D09B */ jal func_8003426C -/* 01E4C 80AE424C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01E50 80AE4250 24180028 */ addiu $t8, $zero, 0x0028 ## $t8 = 00000028 -/* 01E54 80AE4254 10000008 */ beq $zero, $zero, .L80AE4278 -/* 01E58 80AE4258 A218031A */ sb $t8, 0x031A($s0) ## 0000031A -.L80AE425C: -/* 01E5C 80AE425C 24190008 */ addiu $t9, $zero, 0x0008 ## $t9 = 00000008 -/* 01E60 80AE4260 AFB90010 */ sw $t9, 0x0010($sp) -/* 01E64 80AE4264 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01E68 80AE4268 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 -/* 01E6C 80AE426C 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 01E70 80AE4270 0C00D09B */ jal func_8003426C -/* 01E74 80AE4274 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -.L80AE4278: -/* 01E78 80AE4278 0C00D58A */ jal Actor_ApplyDamage - -/* 01E7C 80AE427C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01E80 80AE4280 920800AF */ lbu $t0, 0x00AF($s0) ## 000000AF -/* 01E84 80AE4284 8FA40034 */ lw $a0, 0x0034($sp) -/* 01E88 80AE4288 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01E8C 80AE428C 1500000C */ bne $t0, $zero, .L80AE42C0 -/* 01E90 80AE4290 00000000 */ nop -/* 01E94 80AE4294 0C2B898C */ jal func_80AE2630 -/* 01E98 80AE4298 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01E9C 80AE429C 0C2B8F08 */ jal func_80AE3C20 -/* 01EA0 80AE42A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01EA4 80AE42A4 8FA40034 */ lw $a0, 0x0034($sp) -/* 01EA8 80AE42A8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01EAC 80AE42AC 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024 -/* 01EB0 80AE42B0 0C007E50 */ jal Item_DropCollectibleRandom - -/* 01EB4 80AE42B4 24070090 */ addiu $a3, $zero, 0x0090 ## $a3 = 00000090 -/* 01EB8 80AE42B8 10000004 */ beq $zero, $zero, .L80AE42CC -/* 01EBC 80AE42BC 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AE42C0: -/* 01EC0 80AE42C0 0C2B8EA3 */ jal func_80AE3A8C -/* 01EC4 80AE42C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80AE42C8: -/* 01EC8 80AE42C8 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AE42CC: -/* 01ECC 80AE42CC 8FB00020 */ lw $s0, 0x0020($sp) -/* 01ED0 80AE42D0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01ED4 80AE42D4 03E00008 */ jr $ra -/* 01ED8 80AE42D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE44C4.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE44C4.s deleted file mode 100644 index b42d700ef6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE44C4.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80AE44C4 -/* 020C4 80AE44C4 24010017 */ addiu $at, $zero, 0x0017 ## $at = 00000017 -/* 020C8 80AE44C8 AFA40000 */ sw $a0, 0x0000($sp) -/* 020CC 80AE44CC AFA60008 */ sw $a2, 0x0008($sp) -/* 020D0 80AE44D0 14A10009 */ bne $a1, $at, .L80AE44F8 -/* 020D4 80AE44D4 AFA7000C */ sw $a3, 0x000C($sp) -/* 020D8 80AE44D8 8FA20010 */ lw $v0, 0x0010($sp) -/* 020DC 80AE44DC 8FAF0014 */ lw $t7, 0x0014($sp) -/* 020E0 80AE44E0 844E0002 */ lh $t6, 0x0002($v0) ## 00000002 -/* 020E4 80AE44E4 85F8030E */ lh $t8, 0x030E($t7) ## 0000030E -/* 020E8 80AE44E8 01D8C821 */ addu $t9, $t6, $t8 -/* 020EC 80AE44EC A4590002 */ sh $t9, 0x0002($v0) ## 00000002 -/* 020F0 80AE44F0 03E00008 */ jr $ra -/* 020F4 80AE44F4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80AE44F8: -/* 020F8 80AE44F8 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 020FC 80AE44FC 14A10006 */ bne $a1, $at, .L80AE4518 -/* 02100 80AE4500 8FA20010 */ lw $v0, 0x0010($sp) -/* 02104 80AE4504 8FA90014 */ lw $t1, 0x0014($sp) -/* 02108 80AE4508 84480002 */ lh $t0, 0x0002($v0) ## 00000002 -/* 0210C 80AE450C 852A0310 */ lh $t2, 0x0310($t1) ## 00000310 -/* 02110 80AE4510 010A5821 */ addu $t3, $t0, $t2 -/* 02114 80AE4514 A44B0002 */ sh $t3, 0x0002($v0) ## 00000002 -.L80AE4518: -/* 02118 80AE4518 03E00008 */ jr $ra -/* 0211C 80AE451C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE4520.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE4520.s deleted file mode 100644 index 002b04b0e3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE4520.s +++ /dev/null @@ -1,128 +0,0 @@ -.late_rodata -.late_rodata_alignment 8 -glabel jtbl_80AE49C0 -.word L80AE45B4 -.word L80AE45F8 -.word L80AE45F8 -.word L80AE45E4 -.word L80AE45F8 -.word L80AE45F4 -.word L80AE45F8 -.word L80AE45F8 -.word L80AE45DC -.word L80AE45F8 -.word L80AE45EC -.word L80AE45F8 -.word L80AE45F8 -.word L80AE45CC -.word L80AE45F8 -.word L80AE45F8 -.word L80AE45F8 -.word L80AE45C4 -.word L80AE45F8 -.word L80AE45F8 -.word L80AE45F8 -.word L80AE45BC -.word L80AE45F8 -.word L80AE45AC -.word L80AE45D4 - -.text -glabel func_80AE4520 -/* 02120 80AE4520 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 02124 80AE4524 3C0E80AE */ lui $t6, %hi(D_80AE4940) ## $t6 = 80AE0000 -/* 02128 80AE4528 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0212C 80AE452C AFA40038 */ sw $a0, 0x0038($sp) -/* 02130 80AE4530 AFA60040 */ sw $a2, 0x0040($sp) -/* 02134 80AE4534 AFA70044 */ sw $a3, 0x0044($sp) -/* 02138 80AE4538 25CE4940 */ addiu $t6, $t6, %lo(D_80AE4940) ## $t6 = 80AE4940 -/* 0213C 80AE453C 8DD80000 */ lw $t8, 0x0000($t6) ## 80AE4940 -/* 02140 80AE4540 8FA60048 */ lw $a2, 0x0048($sp) -/* 02144 80AE4544 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFF4 -/* 02148 80AE4548 AC980000 */ sw $t8, 0x0000($a0) ## FFFFFFF4 -/* 0214C 80AE454C 8DCF0004 */ lw $t7, 0x0004($t6) ## 80AE4944 -/* 02150 80AE4550 24ABFFFF */ addiu $t3, $a1, 0xFFFF ## $t3 = FFFFFFFF -/* 02154 80AE4554 2403FFFF */ addiu $v1, $zero, 0xFFFF ## $v1 = FFFFFFFF -/* 02158 80AE4558 AC8F0004 */ sw $t7, 0x0004($a0) ## FFFFFFF8 -/* 0215C 80AE455C 8DD80008 */ lw $t8, 0x0008($t6) ## 80AE4948 -/* 02160 80AE4560 2D610019 */ sltiu $at, $t3, 0x0019 -/* 02164 80AE4564 AC980008 */ sw $t8, 0x0008($a0) ## FFFFFFFC -/* 02168 80AE4568 90D9031A */ lbu $t9, 0x031A($a2) ## 0000031A -/* 0216C 80AE456C 17200008 */ bne $t9, $zero, .L80AE4590 -/* 02170 80AE4570 00000000 */ nop -/* 02174 80AE4574 90C80114 */ lbu $t0, 0x0114($a2) ## 00000114 -/* 02178 80AE4578 51000038 */ beql $t0, $zero, .L80AE465C -/* 0217C 80AE457C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02180 80AE4580 94C90112 */ lhu $t1, 0x0112($a2) ## 00000112 -/* 02184 80AE4584 312A4000 */ andi $t2, $t1, 0x4000 ## $t2 = 00000000 -/* 02188 80AE4588 51400034 */ beql $t2, $zero, .L80AE465C -/* 0218C 80AE458C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AE4590: -/* 02190 80AE4590 10200019 */ beq $at, $zero, .L80AE45F8 -/* 02194 80AE4594 000B5880 */ sll $t3, $t3, 2 -/* 02198 80AE4598 3C0180AE */ lui $at, %hi(jtbl_80AE49C0) ## $at = 80AE0000 -/* 0219C 80AE459C 002B0821 */ addu $at, $at, $t3 -/* 021A0 80AE45A0 8C2B49C0 */ lw $t3, %lo(jtbl_80AE49C0)($at) -/* 021A4 80AE45A4 01600008 */ jr $t3 -/* 021A8 80AE45A8 00000000 */ nop -glabel L80AE45AC -/* 021AC 80AE45AC 10000012 */ beq $zero, $zero, .L80AE45F8 -/* 021B0 80AE45B0 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -glabel L80AE45B4 -/* 021B4 80AE45B4 10000010 */ beq $zero, $zero, .L80AE45F8 -/* 021B8 80AE45B8 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -glabel L80AE45BC -/* 021BC 80AE45BC 1000000E */ beq $zero, $zero, .L80AE45F8 -/* 021C0 80AE45C0 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 -glabel L80AE45C4 -/* 021C4 80AE45C4 1000000C */ beq $zero, $zero, .L80AE45F8 -/* 021C8 80AE45C8 24030003 */ addiu $v1, $zero, 0x0003 ## $v1 = 00000003 -glabel L80AE45CC -/* 021CC 80AE45CC 1000000A */ beq $zero, $zero, .L80AE45F8 -/* 021D0 80AE45D0 24030004 */ addiu $v1, $zero, 0x0004 ## $v1 = 00000004 -glabel L80AE45D4 -/* 021D4 80AE45D4 10000008 */ beq $zero, $zero, .L80AE45F8 -/* 021D8 80AE45D8 24030005 */ addiu $v1, $zero, 0x0005 ## $v1 = 00000005 -glabel L80AE45DC -/* 021DC 80AE45DC 10000006 */ beq $zero, $zero, .L80AE45F8 -/* 021E0 80AE45E0 24030006 */ addiu $v1, $zero, 0x0006 ## $v1 = 00000006 -glabel L80AE45E4 -/* 021E4 80AE45E4 10000004 */ beq $zero, $zero, .L80AE45F8 -/* 021E8 80AE45E8 24030007 */ addiu $v1, $zero, 0x0007 ## $v1 = 00000007 -glabel L80AE45EC -/* 021EC 80AE45EC 10000002 */ beq $zero, $zero, .L80AE45F8 -/* 021F0 80AE45F0 24030008 */ addiu $v1, $zero, 0x0008 ## $v1 = 00000008 -glabel L80AE45F4 -/* 021F4 80AE45F4 24030009 */ addiu $v1, $zero, 0x0009 ## $v1 = 00000009 -glabel L80AE45F8 -.L80AE45F8: -/* 021F8 80AE45F8 04600017 */ bltz $v1, .L80AE4658 -/* 021FC 80AE45FC 27A50018 */ addiu $a1, $sp, 0x0018 ## $a1 = FFFFFFE0 -/* 02200 80AE4600 0C0346BD */ jal Matrix_MultVec3f -/* 02204 80AE4604 AFA30024 */ sw $v1, 0x0024($sp) -/* 02208 80AE4608 C7A40018 */ lwc1 $f4, 0x0018($sp) -/* 0220C 80AE460C 8FA30024 */ lw $v1, 0x0024($sp) -/* 02210 80AE4610 8FA60048 */ lw $a2, 0x0048($sp) -/* 02214 80AE4614 4600218D */ trunc.w.s $f6, $f4 -/* 02218 80AE4618 00036080 */ sll $t4, $v1, 2 -/* 0221C 80AE461C 01836023 */ subu $t4, $t4, $v1 -/* 02220 80AE4620 000C6040 */ sll $t4, $t4, 1 -/* 02224 80AE4624 440E3000 */ mfc1 $t6, $f6 -/* 02228 80AE4628 00CC1021 */ addu $v0, $a2, $t4 -/* 0222C 80AE462C A44E014C */ sh $t6, 0x014C($v0) ## 0000014C -/* 02230 80AE4630 C7A8001C */ lwc1 $f8, 0x001C($sp) -/* 02234 80AE4634 4600428D */ trunc.w.s $f10, $f8 -/* 02238 80AE4638 44185000 */ mfc1 $t8, $f10 -/* 0223C 80AE463C 00000000 */ nop -/* 02240 80AE4640 A458014E */ sh $t8, 0x014E($v0) ## 0000014E -/* 02244 80AE4644 C7B00020 */ lwc1 $f16, 0x0020($sp) -/* 02248 80AE4648 4600848D */ trunc.w.s $f18, $f16 -/* 0224C 80AE464C 44089000 */ mfc1 $t0, $f18 -/* 02250 80AE4650 00000000 */ nop -/* 02254 80AE4654 A4480150 */ sh $t0, 0x0150($v0) ## 00000150 -.L80AE4658: -/* 02258 80AE4658 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AE465C: -/* 0225C 80AE465C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 02260 80AE4660 03E00008 */ jr $ra -/* 02264 80AE4664 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Destroy.s deleted file mode 100644 index a7cc55978b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Destroy.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel EnTakaraMan_Destroy -/* 00000 80B17560 AFA40000 */ sw $a0, 0x0000($sp) -/* 00004 80B17564 03E00008 */ jr $ra -/* 00008 80B17568 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Draw.s deleted file mode 100644 index d001ffe1ff..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Draw.s +++ /dev/null @@ -1,75 +0,0 @@ -.rdata -glabel D_80B17E40 - .asciz "../z_en_takara_man.c" - .balign 4 - -glabel D_80B17E58 - .asciz "../z_en_takara_man.c" - .balign 4 - -.text -glabel EnTakaraMan_Draw -/* 00750 80B17CB0 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00754 80B17CB4 AFBF002C */ sw $ra, 0x002C($sp) -/* 00758 80B17CB8 AFB00028 */ sw $s0, 0x0028($sp) -/* 0075C 80B17CBC AFA50054 */ sw $a1, 0x0054($sp) -/* 00760 80B17CC0 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 00764 80B17CC4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00768 80B17CC8 3C0680B1 */ lui $a2, %hi(D_80B17E40) ## $a2 = 80B10000 -/* 0076C 80B17CCC 24C67E40 */ addiu $a2, $a2, %lo(D_80B17E40) ## $a2 = 80B17E40 -/* 00770 80B17CD0 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 -/* 00774 80B17CD4 24070210 */ addiu $a3, $zero, 0x0210 ## $a3 = 00000210 -/* 00778 80B17CD8 0C031AB1 */ jal Graph_OpenDisps -/* 0077C 80B17CDC AFA50048 */ sw $a1, 0x0048($sp) -/* 00780 80B17CE0 8FAF0054 */ lw $t7, 0x0054($sp) -/* 00784 80B17CE4 0C024F46 */ jal func_80093D18 -/* 00788 80B17CE8 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 0078C 80B17CEC 8FA50048 */ lw $a1, 0x0048($sp) -/* 00790 80B17CF0 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 -/* 00794 80B17CF4 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 -/* 00798 80B17CF8 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 -/* 0079C 80B17CFC 3C0480B1 */ lui $a0, %hi(D_80B17DD4) ## $a0 = 80B10000 -/* 007A0 80B17D00 3C0E8016 */ lui $t6, %hi(gSegments) -/* 007A4 80B17D04 24780008 */ addiu $t8, $v1, 0x0008 ## $t8 = 00000008 -/* 007A8 80B17D08 ACB802C0 */ sw $t8, 0x02C0($a1) ## 000002C0 -/* 007AC 80B17D0C AC790000 */ sw $t9, 0x0000($v1) ## 00000000 -/* 007B0 80B17D10 8608020E */ lh $t0, 0x020E($s0) ## 0000020E -/* 007B4 80B17D14 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 007B8 80B17D18 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 007BC 80B17D1C 00084880 */ sll $t1, $t0, 2 -/* 007C0 80B17D20 00892021 */ addu $a0, $a0, $t1 -/* 007C4 80B17D24 8C847DD4 */ lw $a0, %lo(D_80B17DD4)($a0) -/* 007C8 80B17D28 3C1980B1 */ lui $t9, %hi(func_80B17C4C) ## $t9 = 80B10000 -/* 007CC 80B17D2C 27397C4C */ addiu $t9, $t9, %lo(func_80B17C4C) ## $t9 = 80B17C4C -/* 007D0 80B17D30 00045900 */ sll $t3, $a0, 4 -/* 007D4 80B17D34 000B6702 */ srl $t4, $t3, 28 -/* 007D8 80B17D38 000C6880 */ sll $t5, $t4, 2 -/* 007DC 80B17D3C 01CD7021 */ addu $t6, $t6, $t5 -/* 007E0 80B17D40 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) -/* 007E4 80B17D44 00815024 */ and $t2, $a0, $at -/* 007E8 80B17D48 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 007EC 80B17D4C 014E7821 */ addu $t7, $t2, $t6 -/* 007F0 80B17D50 01E1C021 */ addu $t8, $t7, $at -/* 007F4 80B17D54 AC780004 */ sw $t8, 0x0004($v1) ## 00000004 -/* 007F8 80B17D58 92070152 */ lbu $a3, 0x0152($s0) ## 00000152 -/* 007FC 80B17D5C 8E060170 */ lw $a2, 0x0170($s0) ## 00000170 -/* 00800 80B17D60 8E050154 */ lw $a1, 0x0154($s0) ## 00000154 -/* 00804 80B17D64 AFB00018 */ sw $s0, 0x0018($sp) -/* 00808 80B17D68 AFA00014 */ sw $zero, 0x0014($sp) -/* 0080C 80B17D6C AFB90010 */ sw $t9, 0x0010($sp) -/* 00810 80B17D70 0C0286B2 */ jal SkelAnime_DrawSV -/* 00814 80B17D74 8FA40054 */ lw $a0, 0x0054($sp) -/* 00818 80B17D78 8FA80054 */ lw $t0, 0x0054($sp) -/* 0081C 80B17D7C 3C0680B1 */ lui $a2, %hi(D_80B17E58) ## $a2 = 80B10000 -/* 00820 80B17D80 24C67E58 */ addiu $a2, $a2, %lo(D_80B17E58) ## $a2 = 80B17E58 -/* 00824 80B17D84 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 -/* 00828 80B17D88 24070220 */ addiu $a3, $zero, 0x0220 ## $a3 = 00000220 -/* 0082C 80B17D8C 0C031AD5 */ jal Graph_CloseDisps -/* 00830 80B17D90 8D050000 */ lw $a1, 0x0000($t0) ## 00000000 -/* 00834 80B17D94 8FBF002C */ lw $ra, 0x002C($sp) -/* 00838 80B17D98 8FB00028 */ lw $s0, 0x0028($sp) -/* 0083C 80B17D9C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 00840 80B17DA0 03E00008 */ jr $ra -/* 00844 80B17DA4 00000000 */ nop -/* 00848 80B17DA8 00000000 */ nop -/* 0084C 80B17DAC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Init.s deleted file mode 100644 index c7897b0bca..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Init.s +++ /dev/null @@ -1,115 +0,0 @@ -.rdata -glabel D_80B17DE0 - .asciz "\x1b[32m☆☆☆☆☆ もういてる原 ☆☆☆☆☆ \n\x1b[m" - .balign 4 - -glabel D_80B17E10 - .asciz "\n\n" - .balign 4 - -glabel D_80B17E14 - .asciz "\x1b[35m☆☆☆☆☆ ばぅん！ ☆☆☆☆☆ %x\n\x1b[m" - .balign 4 - -.text -glabel EnTakaraMan_Init -/* 0000C 80B1756C 3C0280B1 */ lui $v0, %hi(D_80B17DD0) ## $v0 = 80B10000 -/* 00010 80B17570 24427DD0 */ addiu $v0, $v0, %lo(D_80B17DD0) ## $v0 = 80B17DD0 -/* 00014 80B17574 904E0000 */ lbu $t6, 0x0000($v0) ## 80B17DD0 -/* 00018 80B17578 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0001C 80B1757C AFB00028 */ sw $s0, 0x0028($sp) -/* 00020 80B17580 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00024 80B17584 AFBF002C */ sw $ra, 0x002C($sp) -/* 00028 80B17588 11C00008 */ beq $t6, $zero, .L80B175AC -/* 0002C 80B1758C AFA50034 */ sw $a1, 0x0034($sp) -/* 00030 80B17590 0C00B55C */ jal Actor_Kill - -/* 00034 80B17594 00000000 */ nop -/* 00038 80B17598 3C0480B1 */ lui $a0, %hi(D_80B17DE0) ## $a0 = 80B10000 -/* 0003C 80B1759C 0C00084C */ jal osSyncPrintf - -/* 00040 80B175A0 24847DE0 */ addiu $a0, $a0, %lo(D_80B17DE0) ## $a0 = 80B17DE0 -/* 00044 80B175A4 1000004A */ beq $zero, $zero, .L80B176D0 -/* 00048 80B175A8 8FBF002C */ lw $ra, 0x002C($sp) -.L80B175AC: -/* 0004C 80B175AC 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 00050 80B175B0 3C0480B1 */ lui $a0, %hi(D_80B17E10) ## $a0 = 80B10000 -/* 00054 80B175B4 A04F0000 */ sb $t7, 0x0000($v0) ## 00000000 -/* 00058 80B175B8 0C00084C */ jal osSyncPrintf - -/* 0005C 80B175BC 24847E10 */ addiu $a0, $a0, %lo(D_80B17E10) ## $a0 = 80B17E10 -/* 00060 80B175C0 8FB80034 */ lw $t8, 0x0034($sp) -/* 00064 80B175C4 3C0480B1 */ lui $a0, %hi(D_80B17E14) ## $a0 = 80B10000 -/* 00068 80B175C8 24847E14 */ addiu $a0, $a0, %lo(D_80B17E14) ## $a0 = 80B17E14 -/* 0006C 80B175CC 0C00084C */ jal osSyncPrintf - -/* 00070 80B175D0 8F051D38 */ lw $a1, 0x1D38($t8) ## 00001D38 -/* 00074 80B175D4 8FA40034 */ lw $a0, 0x0034($sp) -/* 00078 80B175D8 3C028016 */ lui $v0, %hi(gSaveContext) -/* 0007C 80B175DC 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00080 80B175E0 AC801D38 */ sw $zero, 0x1D38($a0) ## 00001D38 -/* 00084 80B175E4 94481402 */ lhu $t0, 0x1402($v0) ## 8015FA62 -/* 00088 80B175E8 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF -/* 0008C 80B175EC 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 00090 80B175F0 00484821 */ addu $t1, $v0, $t0 -/* 00094 80B175F4 A13900BC */ sb $t9, 0x00BC($t1) ## 000000BC -/* 00098 80B175F8 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 0009C 80B175FC 260A0194 */ addiu $t2, $s0, 0x0194 ## $t2 = 00000194 -/* 000A0 80B17600 260B01D0 */ addiu $t3, $s0, 0x01D0 ## $t3 = 000001D0 -/* 000A4 80B17604 240C000A */ addiu $t4, $zero, 0x000A ## $t4 = 0000000A -/* 000A8 80B17608 AFAC0018 */ sw $t4, 0x0018($sp) -/* 000AC 80B1760C AFAB0014 */ sw $t3, 0x0014($sp) -/* 000B0 80B17610 AFAA0010 */ sw $t2, 0x0010($sp) -/* 000B4 80B17614 24E70498 */ addiu $a3, $a3, 0x0498 ## $a3 = 06000498 -/* 000B8 80B17618 24C64FE0 */ addiu $a2, $a2, 0x4FE0 ## $a2 = 06004FE0 -/* 000BC 80B1761C 0C0291BE */ jal SkelAnime_InitSV -/* 000C0 80B17620 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 -/* 000C4 80B17624 26020024 */ addiu $v0, $s0, 0x0024 ## $v0 = 00000024 -/* 000C8 80B17628 8C4E0000 */ lw $t6, 0x0000($v0) ## 00000024 -/* 000CC 80B1762C 3C014305 */ lui $at, 0x4305 ## $at = 43050000 -/* 000D0 80B17630 44812000 */ mtc1 $at, $f4 ## $f4 = 133.00 -/* 000D4 80B17634 AE0E0038 */ sw $t6, 0x0038($s0) ## 00000038 -/* 000D8 80B17638 8C4D0004 */ lw $t5, 0x0004($v0) ## 00000028 -/* 000DC 80B1763C 3C01C140 */ lui $at, 0xC140 ## $at = C1400000 -/* 000E0 80B17640 44813000 */ mtc1 $at, $f6 ## $f6 = -12.00 -/* 000E4 80B17644 AE0D003C */ sw $t5, 0x003C($s0) ## 0000003C -/* 000E8 80B17648 8C4E0008 */ lw $t6, 0x0008($v0) ## 0000002C -/* 000EC 80B1764C 3C0142CC */ lui $at, 0x42CC ## $at = 42CC0000 -/* 000F0 80B17650 44814000 */ mtc1 $at, $f8 ## $f8 = 102.00 -/* 000F4 80B17654 AE0E0040 */ sw $t6, 0x0040($s0) ## 00000040 -/* 000F8 80B17658 8C580000 */ lw $t8, 0x0000($v0) ## 00000024 -/* 000FC 80B1765C 3C053C54 */ lui $a1, 0x3C54 ## $a1 = 3C540000 -/* 00100 80B17660 34A5FDF4 */ ori $a1, $a1, 0xFDF4 ## $a1 = 3C54FDF4 -/* 00104 80B17664 AE180220 */ sw $t8, 0x0220($s0) ## 00000220 -/* 00108 80B17668 8C4F0004 */ lw $t7, 0x0004($v0) ## 00000028 -/* 0010C 80B1766C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00110 80B17670 AE0F0224 */ sw $t7, 0x0224($s0) ## 00000224 -/* 00114 80B17674 8C580008 */ lw $t8, 0x0008($v0) ## 0000002C -/* 00118 80B17678 E6040024 */ swc1 $f4, 0x0024($s0) ## 00000024 -/* 0011C 80B1767C E6060028 */ swc1 $f6, 0x0028($s0) ## 00000028 -/* 00120 80B17680 E608002C */ swc1 $f8, 0x002C($s0) ## 0000002C -/* 00124 80B17684 0C00B58B */ jal Actor_SetScale - -/* 00128 80B17688 AE180228 */ sw $t8, 0x0228($s0) ## 00000228 -/* 0012C 80B1768C 2409B1E0 */ addiu $t1, $zero, 0xB1E0 ## $t1 = FFFFB1E0 -/* 00130 80B17690 3C0142B4 */ lui $at, 0x42B4 ## $at = 42B40000 -/* 00134 80B17694 A60900B6 */ sh $t1, 0x00B6($s0) ## 000000B6 -/* 00138 80B17698 44815000 */ mtc1 $at, $f10 ## $f10 = 90.00 -/* 0013C 80B1769C 82080003 */ lb $t0, 0x0003($s0) ## 00000003 -/* 00140 80B176A0 860A00B6 */ lh $t2, 0x00B6($s0) ## 000000B6 -/* 00144 80B176A4 3C0C80B1 */ lui $t4, %hi(func_80B176E0) ## $t4 = 80B10000 -/* 00148 80B176A8 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF -/* 0014C 80B176AC 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 00150 80B176B0 258C76E0 */ addiu $t4, $t4, %lo(func_80B176E0) ## $t4 = 80B176E0 -/* 00154 80B176B4 A2190003 */ sb $t9, 0x0003($s0) ## 00000003 -/* 00158 80B176B8 A20B001F */ sb $t3, 0x001F($s0) ## 0000001F -/* 0015C 80B176BC AE0C014C */ sw $t4, 0x014C($s0) ## 0000014C -/* 00160 80B176C0 E60A021C */ swc1 $f10, 0x021C($s0) ## 0000021C -/* 00164 80B176C4 A6080216 */ sh $t0, 0x0216($s0) ## 00000216 -/* 00168 80B176C8 A60A0032 */ sh $t2, 0x0032($s0) ## 00000032 -/* 0016C 80B176CC 8FBF002C */ lw $ra, 0x002C($sp) -.L80B176D0: -/* 00170 80B176D0 8FB00028 */ lw $s0, 0x0028($sp) -/* 00174 80B176D4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00178 80B176D8 03E00008 */ jr $ra -/* 0017C 80B176DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Update.s deleted file mode 100644 index 0f0f1735c0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Update.s +++ /dev/null @@ -1,60 +0,0 @@ -glabel EnTakaraMan_Update -/* 00614 80B17B74 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00618 80B17B78 AFBF002C */ sw $ra, 0x002C($sp) -/* 0061C 80B17B7C AFB00028 */ sw $s0, 0x0028($sp) -/* 00620 80B17B80 AFA50034 */ sw $a1, 0x0034($sp) -/* 00624 80B17B84 84820210 */ lh $v0, 0x0210($a0) ## 00000210 -/* 00628 80B17B88 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0062C 80B17B8C 10400002 */ beq $v0, $zero, .L80B17B98 -/* 00630 80B17B90 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 00634 80B17B94 A48E0210 */ sh $t6, 0x0210($a0) ## 00000210 -.L80B17B98: -/* 00638 80B17B98 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0063C 80B17B9C 0C00B56E */ jal Actor_SetHeight - -/* 00640 80B17BA0 8E05021C */ lw $a1, 0x021C($s0) ## 0000021C -/* 00644 80B17BA4 8E180038 */ lw $t8, 0x0038($s0) ## 00000038 -/* 00648 80B17BA8 8FA40034 */ lw $a0, 0x0034($sp) -/* 0064C 80B17BAC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00650 80B17BB0 AFB80010 */ sw $t8, 0x0010($sp) -/* 00654 80B17BB4 8E0F003C */ lw $t7, 0x003C($s0) ## 0000003C -/* 00658 80B17BB8 2606022C */ addiu $a2, $s0, 0x022C ## $a2 = 0000022C -/* 0065C 80B17BBC 26070232 */ addiu $a3, $s0, 0x0232 ## $a3 = 00000232 -/* 00660 80B17BC0 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00664 80B17BC4 8E180040 */ lw $t8, 0x0040($s0) ## 00000040 -/* 00668 80B17BC8 0C00E0A4 */ jal func_80038290 -/* 0066C 80B17BCC AFB80018 */ sw $t8, 0x0018($sp) -/* 00670 80B17BD0 86190210 */ lh $t9, 0x0210($s0) ## 00000210 -/* 00674 80B17BD4 57200011 */ bnel $t9, $zero, .L80B17C1C -/* 00678 80B17BD8 86180212 */ lh $t8, 0x0212($s0) ## 00000212 -/* 0067C 80B17BDC 8608020E */ lh $t0, 0x020E($s0) ## 0000020E -/* 00680 80B17BE0 25090001 */ addiu $t1, $t0, 0x0001 ## $t1 = 00000001 -/* 00684 80B17BE4 A609020E */ sh $t1, 0x020E($s0) ## 0000020E -/* 00688 80B17BE8 860A020E */ lh $t2, 0x020E($s0) ## 0000020E -/* 0068C 80B17BEC 29410002 */ slti $at, $t2, 0x0002 -/* 00690 80B17BF0 14200009 */ bne $at, $zero, .L80B17C18 -/* 00694 80B17BF4 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 00698 80B17BF8 44816000 */ mtc1 $at, $f12 ## $f12 = 60.00 -/* 0069C 80B17BFC 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 006A0 80B17C00 A600020E */ sh $zero, 0x020E($s0) ## 0000020E -/* 006A4 80B17C04 4600010D */ trunc.w.s $f4, $f0 -/* 006A8 80B17C08 440E2000 */ mfc1 $t6, $f4 -/* 006AC 80B17C0C 00000000 */ nop -/* 006B0 80B17C10 25CF0014 */ addiu $t7, $t6, 0x0014 ## $t7 = 00000014 -/* 006B4 80B17C14 A60F0210 */ sh $t7, 0x0210($s0) ## 00000210 -.L80B17C18: -/* 006B8 80B17C18 86180212 */ lh $t8, 0x0212($s0) ## 00000212 -.L80B17C1C: -/* 006BC 80B17C1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 006C0 80B17C20 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 006C4 80B17C24 A6190212 */ sh $t9, 0x0212($s0) ## 00000212 -/* 006C8 80B17C28 8E19014C */ lw $t9, 0x014C($s0) ## 0000014C -/* 006CC 80B17C2C 8FA50034 */ lw $a1, 0x0034($sp) -/* 006D0 80B17C30 0320F809 */ jalr $ra, $t9 -/* 006D4 80B17C34 00000000 */ nop -/* 006D8 80B17C38 8FBF002C */ lw $ra, 0x002C($sp) -/* 006DC 80B17C3C 8FB00028 */ lw $s0, 0x0028($sp) -/* 006E0 80B17C40 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 006E4 80B17C44 03E00008 */ jr $ra -/* 006E8 80B17C48 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B176E0.s b/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B176E0.s deleted file mode 100644 index a599fb5348..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B176E0.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_80B176E0 -/* 00180 80B176E0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00184 80B176E4 AFB00028 */ sw $s0, 0x0028($sp) -/* 00188 80B176E8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0018C 80B176EC AFBF002C */ sw $ra, 0x002C($sp) -/* 00190 80B176F0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00194 80B176F4 AFA50034 */ sw $a1, 0x0034($sp) -/* 00198 80B176F8 0C028800 */ jal SkelAnime_GetFrameCount - -/* 0019C 80B176FC 24840498 */ addiu $a0, $a0, 0x0498 ## $a0 = 06000498 -/* 001A0 80B17700 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 001A4 80B17704 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 001A8 80B17708 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 001AC 80B1770C 468021A0 */ cvt.s.w $f6, $f4 -/* 001B0 80B17710 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 001B4 80B17714 24A50498 */ addiu $a1, $a1, 0x0498 ## $a1 = 06000498 -/* 001B8 80B17718 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 -/* 001BC 80B1771C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 001C0 80B17720 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 001C4 80B17724 4600320D */ trunc.w.s $f8, $f6 -/* 001C8 80B17728 AFA00014 */ sw $zero, 0x0014($sp) -/* 001CC 80B1772C E7B20018 */ swc1 $f18, 0x0018($sp) -/* 001D0 80B17730 440F4000 */ mfc1 $t7, $f8 -/* 001D4 80B17734 00000000 */ nop -/* 001D8 80B17738 000FC400 */ sll $t8, $t7, 16 -/* 001DC 80B1773C 0018CC03 */ sra $t9, $t8, 16 -/* 001E0 80B17740 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 -/* 001E4 80B17744 00000000 */ nop -/* 001E8 80B17748 46805420 */ cvt.s.w $f16, $f10 -/* 001EC 80B1774C 0C029468 */ jal SkelAnime_ChangeAnim - -/* 001F0 80B17750 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 001F4 80B17754 86080214 */ lh $t0, 0x0214($s0) ## 00000214 -/* 001F8 80B17758 3C0B80B1 */ lui $t3, %hi(func_80B1778C) ## $t3 = 80B10000 -/* 001FC 80B1775C 2409006D */ addiu $t1, $zero, 0x006D ## $t1 = 0000006D -/* 00200 80B17760 15000004 */ bne $t0, $zero, .L80B17774 -/* 00204 80B17764 256B778C */ addiu $t3, $t3, %lo(func_80B1778C) ## $t3 = 80B1778C -/* 00208 80B17768 240A0004 */ addiu $t2, $zero, 0x0004 ## $t2 = 00000004 -/* 0020C 80B1776C A609010E */ sh $t1, 0x010E($s0) ## 0000010E -/* 00210 80B17770 A60A020C */ sh $t2, 0x020C($s0) ## 0000020C -.L80B17774: -/* 00214 80B17774 AE0B014C */ sw $t3, 0x014C($s0) ## 0000014C -/* 00218 80B17778 8FBF002C */ lw $ra, 0x002C($sp) -/* 0021C 80B1777C 8FB00028 */ lw $s0, 0x0028($sp) -/* 00220 80B17780 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00224 80B17784 03E00008 */ jr $ra -/* 00228 80B17788 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B1778C.s b/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B1778C.s deleted file mode 100644 index 762fabe5ec..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B1778C.s +++ /dev/null @@ -1,122 +0,0 @@ -glabel func_80B1778C -/* 0022C 80B1778C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00230 80B17790 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00234 80B17794 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00238 80B17798 AFA50024 */ sw $a1, 0x0024($sp) -/* 0023C 80B1779C AFA70020 */ sw $a3, 0x0020($sp) -/* 00240 80B177A0 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00244 80B177A4 24840150 */ addiu $a0, $a0, 0x0150 ## $a0 = 00000150 -/* 00248 80B177A8 8FA40020 */ lw $a0, 0x0020($sp) -/* 0024C 80B177AC 0C00BC65 */ jal func_8002F194 -/* 00250 80B177B0 8FA50024 */ lw $a1, 0x0024($sp) -/* 00254 80B177B4 1040000F */ beq $v0, $zero, .L80B177F4 -/* 00258 80B177B8 8FA70020 */ lw $a3, 0x0020($sp) -/* 0025C 80B177BC 84EE020C */ lh $t6, 0x020C($a3) ## 0000020C -/* 00260 80B177C0 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 00264 80B177C4 50CE000C */ beql $a2, $t6, .L80B177F8 -/* 00268 80B177C8 8FA80024 */ lw $t0, 0x0024($sp) -/* 0026C 80B177CC 84EF0214 */ lh $t7, 0x0214($a3) ## 00000214 -/* 00270 80B177D0 3C1980B1 */ lui $t9, %hi(func_80B17B14) ## $t9 = 80B10000 -/* 00274 80B177D4 3C1880B1 */ lui $t8, %hi(func_80B17934) ## $t8 = 80B10000 -/* 00278 80B177D8 15E00004 */ bne $t7, $zero, .L80B177EC -/* 0027C 80B177DC 27397B14 */ addiu $t9, $t9, %lo(func_80B17B14) ## $t9 = 80B17B14 -/* 00280 80B177E0 27187934 */ addiu $t8, $t8, %lo(func_80B17934) ## $t8 = 80B17934 -/* 00284 80B177E4 1000004F */ beq $zero, $zero, .L80B17924 -/* 00288 80B177E8 ACF8014C */ sw $t8, 0x014C($a3) ## 0000014C -.L80B177EC: -/* 0028C 80B177EC 1000004D */ beq $zero, $zero, .L80B17924 -/* 00290 80B177F0 ACF9014C */ sw $t9, 0x014C($a3) ## 0000014C -.L80B177F4: -/* 00294 80B177F4 8FA80024 */ lw $t0, 0x0024($sp) -.L80B177F8: -/* 00298 80B177F8 84E9008A */ lh $t1, 0x008A($a3) ## 0000008A -/* 0029C 80B177FC 84EA00B6 */ lh $t2, 0x00B6($a3) ## 000000B6 -/* 002A0 80B17800 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 002A4 80B17804 01014021 */ addu $t0, $t0, $at -/* 002A8 80B17808 810B1CBC */ lb $t3, 0x1CBC($t0) ## 00001CBC -/* 002AC 80B1780C 012A1823 */ subu $v1, $t1, $t2 -/* 002B0 80B17810 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 002B4 80B17814 00031C00 */ sll $v1, $v1, 16 -/* 002B8 80B17818 14CB0009 */ bne $a2, $t3, .L80B17840 -/* 002BC 80B1781C 00031C03 */ sra $v1, $v1, 16 -/* 002C0 80B17820 84EC021A */ lh $t4, 0x021A($a3) ## 0000021A -/* 002C4 80B17824 240D006E */ addiu $t5, $zero, 0x006E ## $t5 = 0000006E -/* 002C8 80B17828 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 002CC 80B1782C 55800005 */ bnel $t4, $zero, .L80B17844 -/* 002D0 80B17830 84EF021A */ lh $t7, 0x021A($a3) ## 0000021A -/* 002D4 80B17834 A4ED010E */ sh $t5, 0x010E($a3) ## 0000010E -/* 002D8 80B17838 A4EE021A */ sh $t6, 0x021A($a3) ## 0000021A -/* 002DC 80B1783C A4E6020C */ sh $a2, 0x020C($a3) ## 0000020C -.L80B17840: -/* 002E0 80B17840 84EF021A */ lh $t7, 0x021A($a3) ## 0000021A -.L80B17844: -/* 002E4 80B17844 15E00017 */ bne $t7, $zero, .L80B178A4 -/* 002E8 80B17848 00000000 */ nop -/* 002EC 80B1784C 84F80214 */ lh $t8, 0x0214($a3) ## 00000214 -/* 002F0 80B17850 8FA40024 */ lw $a0, 0x0024($sp) -/* 002F4 80B17854 24050032 */ addiu $a1, $zero, 0x0032 ## $a1 = 00000032 -/* 002F8 80B17858 13000012 */ beq $t8, $zero, .L80B178A4 -/* 002FC 80B1785C 00000000 */ nop -/* 00300 80B17860 A7A3001C */ sh $v1, 0x001C($sp) -/* 00304 80B17864 AFA70020 */ sw $a3, 0x0020($sp) -/* 00308 80B17868 0C00B2D0 */ jal Flags_GetSwitch - -/* 0030C 80B1786C AFA80018 */ sw $t0, 0x0018($sp) -/* 00310 80B17870 87A3001C */ lh $v1, 0x001C($sp) -/* 00314 80B17874 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 00318 80B17878 8FA70020 */ lw $a3, 0x0020($sp) -/* 0031C 80B1787C 10400006 */ beq $v0, $zero, .L80B17898 -/* 00320 80B17880 8FA80018 */ lw $t0, 0x0018($sp) -/* 00324 80B17884 24190084 */ addiu $t9, $zero, 0x0084 ## $t9 = 00000084 -/* 00328 80B17888 24090005 */ addiu $t1, $zero, 0x0005 ## $t1 = 00000005 -/* 0032C 80B1788C A4F9010E */ sh $t9, 0x010E($a3) ## 0000010E -/* 00330 80B17890 10000004 */ beq $zero, $zero, .L80B178A4 -/* 00334 80B17894 A4E9020C */ sh $t1, 0x020C($a3) ## 0000020C -.L80B17898: -/* 00338 80B17898 240A704C */ addiu $t2, $zero, 0x704C ## $t2 = 0000704C -/* 0033C 80B1789C A4EA010E */ sh $t2, 0x010E($a3) ## 0000010E -/* 00340 80B178A0 A4E6020C */ sh $a2, 0x020C($a3) ## 0000020C -.L80B178A4: -/* 00344 80B178A4 04600004 */ bltz $v1, .L80B178B8 -/* 00348 80B178A8 00031023 */ subu $v0, $zero, $v1 -/* 0034C 80B178AC 00031400 */ sll $v0, $v1, 16 -/* 00350 80B178B0 10000003 */ beq $zero, $zero, .L80B178C0 -/* 00354 80B178B4 00021403 */ sra $v0, $v0, 16 -.L80B178B8: -/* 00358 80B178B8 00021400 */ sll $v0, $v0, 16 -/* 0035C 80B178BC 00021403 */ sra $v0, $v0, 16 -.L80B178C0: -/* 00360 80B178C0 28414300 */ slti $at, $v0, 0x4300 -/* 00364 80B178C4 50200018 */ beql $at, $zero, .L80B17928 -/* 00368 80B178C8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0036C 80B178CC 84EB0216 */ lh $t3, 0x0216($a3) ## 00000216 -/* 00370 80B178D0 810C1CBC */ lb $t4, 0x1CBC($t0) ## 00001CBC -/* 00374 80B178D4 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00378 80B178D8 3C0642C8 */ lui $a2, 0x42C8 ## $a2 = 42C80000 -/* 0037C 80B178DC 516C0008 */ beql $t3, $t4, .L80B17900 -/* 00380 80B178E0 84EF0218 */ lh $t7, 0x0218($a3) ## 00000218 -/* 00384 80B178E4 8CED0004 */ lw $t5, 0x0004($a3) ## 00000004 -/* 00388 80B178E8 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 0038C 80B178EC A4E00218 */ sh $zero, 0x0218($a3) ## 00000218 -/* 00390 80B178F0 01A17024 */ and $t6, $t5, $at -/* 00394 80B178F4 1000000B */ beq $zero, $zero, .L80B17924 -/* 00398 80B178F8 ACEE0004 */ sw $t6, 0x0004($a3) ## 00000004 -/* 0039C 80B178FC 84EF0218 */ lh $t7, 0x0218($a3) ## 00000218 -.L80B17900: -/* 003A0 80B17900 15E00006 */ bne $t7, $zero, .L80B1791C -/* 003A4 80B17904 00000000 */ nop -/* 003A8 80B17908 8CF80004 */ lw $t8, 0x0004($a3) ## 00000004 -/* 003AC 80B1790C 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 003B0 80B17910 A4E90218 */ sh $t1, 0x0218($a3) ## 00000218 -/* 003B4 80B17914 37190001 */ ori $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 003B8 80B17918 ACF90004 */ sw $t9, 0x0004($a3) ## 00000004 -.L80B1791C: -/* 003BC 80B1791C 0C00BCB3 */ jal func_8002F2CC -/* 003C0 80B17920 8FA50024 */ lw $a1, 0x0024($sp) -.L80B17924: -/* 003C4 80B17924 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B17928: -/* 003C8 80B17928 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 003CC 80B1792C 03E00008 */ jr $ra -/* 003D0 80B17930 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B17934.s b/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B17934.s deleted file mode 100644 index 9a30153c3b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B17934.s +++ /dev/null @@ -1,84 +0,0 @@ -glabel func_80B17934 -/* 003D4 80B17934 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 003D8 80B17938 AFB0001C */ sw $s0, 0x001C($sp) -/* 003DC 80B1793C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 003E0 80B17940 AFBF0024 */ sw $ra, 0x0024($sp) -/* 003E4 80B17944 AFB10020 */ sw $s1, 0x0020($sp) -/* 003E8 80B17948 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 003EC 80B1794C 0C042F6F */ jal func_8010BDBC -/* 003F0 80B17950 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 003F4 80B17954 860E020C */ lh $t6, 0x020C($s0) ## 0000020C -/* 003F8 80B17958 55C20040 */ bnel $t6, $v0, .L80B17A5C -/* 003FC 80B1795C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00400 80B17960 0C041AF2 */ jal func_80106BC8 -/* 00404 80B17964 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00408 80B17968 1040003B */ beq $v0, $zero, .L80B17A58 -/* 0040C 80B1796C 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 00410 80B17970 00511021 */ addu $v0, $v0, $s1 -/* 00414 80B17974 904204BD */ lbu $v0, 0x04BD($v0) ## 000104BD -/* 00418 80B17978 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0041C 80B1797C 3C0F8016 */ lui $t7, %hi(gSaveContext+0x34) -/* 00420 80B17980 10400005 */ beq $v0, $zero, .L80B17998 -/* 00424 80B17984 00000000 */ nop -/* 00428 80B17988 10410027 */ beq $v0, $at, .L80B17A28 -/* 0042C 80B1798C 00000000 */ nop -/* 00430 80B17990 10000032 */ beq $zero, $zero, .L80B17A5C -/* 00434 80B17994 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B17998: -/* 00438 80B17998 85EFE694 */ lh $t7, %lo(gSaveContext+0x34)($t7) -/* 0043C 80B1799C 29E1000A */ slti $at, $t7, 0x000A -/* 00440 80B179A0 14200014 */ bne $at, $zero, .L80B179F4 -/* 00444 80B179A4 00000000 */ nop -/* 00448 80B179A8 0C041B33 */ jal func_80106CCC -/* 0044C 80B179AC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00450 80B179B0 0C021CC3 */ jal Rupees_ChangeBy -/* 00454 80B179B4 2404FFF6 */ addiu $a0, $zero, 0xFFF6 ## $a0 = FFFFFFF6 -/* 00458 80B179B8 3C01447A */ lui $at, 0x447A ## $at = 447A0000 -/* 0045C 80B179BC 44812000 */ mtc1 $at, $f4 ## $f4 = 1000.00 -/* 00460 80B179C0 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 00464 80B179C4 A6180214 */ sh $t8, 0x0214($s0) ## 00000214 -/* 00468 80B179C8 AE000118 */ sw $zero, 0x0118($s0) ## 00000118 -/* 0046C 80B179CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00470 80B179D0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00474 80B179D4 24060071 */ addiu $a2, $zero, 0x0071 ## $a2 = 00000071 -/* 00478 80B179D8 3C0744FA */ lui $a3, 0x44FA ## $a3 = 44FA0000 -/* 0047C 80B179DC 0C00BD0D */ jal func_8002F434 -/* 00480 80B179E0 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00484 80B179E4 3C1980B1 */ lui $t9, %hi(func_80B17A6C) ## $t9 = 80B10000 -/* 00488 80B179E8 27397A6C */ addiu $t9, $t9, %lo(func_80B17A6C) ## $t9 = 80B17A6C -/* 0048C 80B179EC 1000001A */ beq $zero, $zero, .L80B17A58 -/* 00490 80B179F0 AE19014C */ sw $t9, 0x014C($s0) ## 0000014C -.L80B179F4: -/* 00494 80B179F4 0C041B33 */ jal func_80106CCC -/* 00498 80B179F8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0049C 80B179FC 24080085 */ addiu $t0, $zero, 0x0085 ## $t0 = 00000085 -/* 004A0 80B17A00 A608010E */ sh $t0, 0x010E($s0) ## 0000010E -/* 004A4 80B17A04 3105FFFF */ andi $a1, $t0, 0xFFFF ## $a1 = 00000085 -/* 004A8 80B17A08 0C042DC8 */ jal func_8010B720 -/* 004AC 80B17A0C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 004B0 80B17A10 3C0A80B1 */ lui $t2, %hi(func_80B17B14) ## $t2 = 80B10000 -/* 004B4 80B17A14 24090005 */ addiu $t1, $zero, 0x0005 ## $t1 = 00000005 -/* 004B8 80B17A18 254A7B14 */ addiu $t2, $t2, %lo(func_80B17B14) ## $t2 = 80B17B14 -/* 004BC 80B17A1C A609020C */ sh $t1, 0x020C($s0) ## 0000020C -/* 004C0 80B17A20 1000000D */ beq $zero, $zero, .L80B17A58 -/* 004C4 80B17A24 AE0A014C */ sw $t2, 0x014C($s0) ## 0000014C -.L80B17A28: -/* 004C8 80B17A28 0C041B33 */ jal func_80106CCC -/* 004CC 80B17A2C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 004D0 80B17A30 240B002D */ addiu $t3, $zero, 0x002D ## $t3 = 0000002D -/* 004D4 80B17A34 A60B010E */ sh $t3, 0x010E($s0) ## 0000010E -/* 004D8 80B17A38 3165FFFF */ andi $a1, $t3, 0xFFFF ## $a1 = 0000002D -/* 004DC 80B17A3C 0C042DC8 */ jal func_8010B720 -/* 004E0 80B17A40 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 004E4 80B17A44 3C0D80B1 */ lui $t5, %hi(func_80B17B14) ## $t5 = 80B10000 -/* 004E8 80B17A48 240C0005 */ addiu $t4, $zero, 0x0005 ## $t4 = 00000005 -/* 004EC 80B17A4C 25AD7B14 */ addiu $t5, $t5, %lo(func_80B17B14) ## $t5 = 80B17B14 -/* 004F0 80B17A50 A60C020C */ sh $t4, 0x020C($s0) ## 0000020C -/* 004F4 80B17A54 AE0D014C */ sw $t5, 0x014C($s0) ## 0000014C -.L80B17A58: -/* 004F8 80B17A58 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B17A5C: -/* 004FC 80B17A5C 8FB0001C */ lw $s0, 0x001C($sp) -/* 00500 80B17A60 8FB10020 */ lw $s1, 0x0020($sp) -/* 00504 80B17A64 03E00008 */ jr $ra -/* 00508 80B17A68 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B17A6C.s b/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B17A6C.s deleted file mode 100644 index 9416a8f0d5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B17A6C.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80B17A6C -/* 0050C 80B17A6C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00510 80B17A70 AFBF001C */ sw $ra, 0x001C($sp) -/* 00514 80B17A74 AFA50024 */ sw $a1, 0x0024($sp) -/* 00518 80B17A78 0C00BD04 */ jal Actor_HasParent -/* 0051C 80B17A7C AFA40020 */ sw $a0, 0x0020($sp) -/* 00520 80B17A80 10400005 */ beq $v0, $zero, .L80B17A98 -/* 00524 80B17A84 8FA40020 */ lw $a0, 0x0020($sp) -/* 00528 80B17A88 3C0E80B1 */ lui $t6, %hi(func_80B17AC4) ## $t6 = 80B10000 -/* 0052C 80B17A8C 25CE7AC4 */ addiu $t6, $t6, %lo(func_80B17AC4) ## $t6 = 80B17AC4 -/* 00530 80B17A90 10000008 */ beq $zero, $zero, .L80B17AB4 -/* 00534 80B17A94 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -.L80B17A98: -/* 00538 80B17A98 3C01447A */ lui $at, 0x447A ## $at = 447A0000 -/* 0053C 80B17A9C 44812000 */ mtc1 $at, $f4 ## $f4 = 1000.00 -/* 00540 80B17AA0 8FA50024 */ lw $a1, 0x0024($sp) -/* 00544 80B17AA4 24060071 */ addiu $a2, $zero, 0x0071 ## $a2 = 00000071 -/* 00548 80B17AA8 3C0744FA */ lui $a3, 0x44FA ## $a3 = 44FA0000 -/* 0054C 80B17AAC 0C00BD0D */ jal func_8002F434 -/* 00550 80B17AB0 E7A40010 */ swc1 $f4, 0x0010($sp) -.L80B17AB4: -/* 00554 80B17AB4 8FBF001C */ lw $ra, 0x001C($sp) -/* 00558 80B17AB8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0055C 80B17ABC 03E00008 */ jr $ra -/* 00560 80B17AC0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B17AC4.s b/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B17AC4.s deleted file mode 100644 index 70eb816c25..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B17AC4.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80B17AC4 -/* 00564 80B17AC4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00568 80B17AC8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0056C 80B17ACC AFA40018 */ sw $a0, 0x0018($sp) -/* 00570 80B17AD0 AFA5001C */ sw $a1, 0x001C($sp) -/* 00574 80B17AD4 0C042F6F */ jal func_8010BDBC -/* 00578 80B17AD8 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 0057C 80B17ADC 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 00580 80B17AE0 54410009 */ bnel $v0, $at, .L80B17B08 -/* 00584 80B17AE4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00588 80B17AE8 0C041AF2 */ jal func_80106BC8 -/* 0058C 80B17AEC 8FA4001C */ lw $a0, 0x001C($sp) -/* 00590 80B17AF0 10400004 */ beq $v0, $zero, .L80B17B04 -/* 00594 80B17AF4 8FAF0018 */ lw $t7, 0x0018($sp) -/* 00598 80B17AF8 3C0E80B1 */ lui $t6, %hi(func_80B176E0) ## $t6 = 80B10000 -/* 0059C 80B17AFC 25CE76E0 */ addiu $t6, $t6, %lo(func_80B176E0) ## $t6 = 80B176E0 -/* 005A0 80B17B00 ADEE014C */ sw $t6, 0x014C($t7) ## 0000014C -.L80B17B04: -/* 005A4 80B17B04 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B17B08: -/* 005A8 80B17B08 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 005AC 80B17B0C 03E00008 */ jr $ra -/* 005B0 80B17B10 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B17B14.s b/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B17B14.s deleted file mode 100644 index 745a42a389..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B17B14.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80B17B14 -/* 005B4 80B17B14 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 005B8 80B17B18 AFBF0014 */ sw $ra, 0x0014($sp) -/* 005BC 80B17B1C AFA40018 */ sw $a0, 0x0018($sp) -/* 005C0 80B17B20 AFA5001C */ sw $a1, 0x001C($sp) -/* 005C4 80B17B24 0C042F6F */ jal func_8010BDBC -/* 005C8 80B17B28 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 005CC 80B17B2C 8FAE0018 */ lw $t6, 0x0018($sp) -/* 005D0 80B17B30 85CF020C */ lh $t7, 0x020C($t6) ## 0000020C -/* 005D4 80B17B34 55E2000C */ bnel $t7, $v0, .L80B17B68 -/* 005D8 80B17B38 8FBF0014 */ lw $ra, 0x0014($sp) -/* 005DC 80B17B3C 0C041AF2 */ jal func_80106BC8 -/* 005E0 80B17B40 8FA4001C */ lw $a0, 0x001C($sp) -/* 005E4 80B17B44 50400008 */ beql $v0, $zero, .L80B17B68 -/* 005E8 80B17B48 8FBF0014 */ lw $ra, 0x0014($sp) -/* 005EC 80B17B4C 0C041B33 */ jal func_80106CCC -/* 005F0 80B17B50 8FA4001C */ lw $a0, 0x001C($sp) -/* 005F4 80B17B54 8FB90018 */ lw $t9, 0x0018($sp) -/* 005F8 80B17B58 3C1880B1 */ lui $t8, %hi(func_80B176E0) ## $t8 = 80B10000 -/* 005FC 80B17B5C 271876E0 */ addiu $t8, $t8, %lo(func_80B176E0) ## $t8 = 80B176E0 -/* 00600 80B17B60 AF38014C */ sw $t8, 0x014C($t9) ## 0000014C -/* 00604 80B17B64 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B17B68: -/* 00608 80B17B68 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0060C 80B17B6C 03E00008 */ jr $ra -/* 00610 80B17B70 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B17C4C.s b/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B17C4C.s deleted file mode 100644 index f77325e2bd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B17C4C.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_80B17C4C -/* 006EC 80B17C4C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 006F0 80B17C50 AFA40000 */ sw $a0, 0x0000($sp) -/* 006F4 80B17C54 AFA60008 */ sw $a2, 0x0008($sp) -/* 006F8 80B17C58 14A10007 */ bne $a1, $at, .L80B17C78 -/* 006FC 80B17C5C AFA7000C */ sw $a3, 0x000C($sp) -/* 00700 80B17C60 8FA20014 */ lw $v0, 0x0014($sp) -/* 00704 80B17C64 8FA30010 */ lw $v1, 0x0010($sp) -/* 00708 80B17C68 844F0234 */ lh $t7, 0x0234($v0) ## 00000234 -/* 0070C 80B17C6C 846E0000 */ lh $t6, 0x0000($v1) ## 00000000 -/* 00710 80B17C70 01CFC021 */ addu $t8, $t6, $t7 -/* 00714 80B17C74 A4780000 */ sh $t8, 0x0000($v1) ## 00000000 -.L80B17C78: -/* 00718 80B17C78 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 0071C 80B17C7C 8FA20014 */ lw $v0, 0x0014($sp) -/* 00720 80B17C80 14A10009 */ bne $a1, $at, .L80B17CA8 -/* 00724 80B17C84 8FA30010 */ lw $v1, 0x0010($sp) -/* 00728 80B17C88 84790000 */ lh $t9, 0x0000($v1) ## 00000000 -/* 0072C 80B17C8C 8448022E */ lh $t0, 0x022E($v0) ## 0000022E -/* 00730 80B17C90 846A0004 */ lh $t2, 0x0004($v1) ## 00000004 -/* 00734 80B17C94 03284821 */ addu $t1, $t9, $t0 -/* 00738 80B17C98 A4690000 */ sh $t1, 0x0000($v1) ## 00000000 -/* 0073C 80B17C9C 844B0230 */ lh $t3, 0x0230($v0) ## 00000230 -/* 00740 80B17CA0 014B6021 */ addu $t4, $t2, $t3 -/* 00744 80B17CA4 A46C0004 */ sh $t4, 0x0004($v1) ## 00000004 -.L80B17CA8: -/* 00748 80B17CA8 03E00008 */ jr $ra -/* 0074C 80B17CAC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/ObjLightswitch_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/ObjLightswitch_Destroy.s deleted file mode 100644 index aa9eb5b6ad..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/ObjLightswitch_Destroy.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel ObjLightswitch_Destroy -/* 005E0 80B97180 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 005E4 80B97184 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 005E8 80B97188 AFBF0014 */ sw $ra, 0x0014($sp) -/* 005EC 80B9718C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 005F0 80B97190 0C016F32 */ jal Collider_DestroyJntSph -/* 005F4 80B97194 24E50150 */ addiu $a1, $a3, 0x0150 ## $a1 = 00000150 -/* 005F8 80B97198 8FBF0014 */ lw $ra, 0x0014($sp) -/* 005FC 80B9719C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00600 80B971A0 03E00008 */ jr $ra -/* 00604 80B971A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/ObjLightswitch_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/ObjLightswitch_Draw.s deleted file mode 100644 index 5960e71294..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/ObjLightswitch_Draw.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel ObjLightswitch_Draw -/* 012B8 80B97E58 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 012BC 80B97E5C AFBF0014 */ sw $ra, 0x0014($sp) -/* 012C0 80B97E60 848301BC */ lh $v1, 0x01BC($a0) ## 000001BC -/* 012C4 80B97E64 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 012C8 80B97E68 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 012CC 80B97E6C 00031983 */ sra $v1, $v1, 6 -/* 012D0 80B97E70 304E0001 */ andi $t6, $v0, 0x0001 ## $t6 = 00000000 -/* 012D4 80B97E74 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 012D8 80B97E78 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 012DC 80B97E7C 15C1000B */ bne $t6, $at, .L80B97EAC -/* 012E0 80B97E80 306300FF */ andi $v1, $v1, 0x00FF ## $v1 = 00000000 -/* 012E4 80B97E84 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 -/* 012E8 80B97E88 24C50150 */ addiu $a1, $a2, 0x0150 ## $a1 = 00000150 -/* 012EC 80B97E8C AFA30018 */ sw $v1, 0x0018($sp) -/* 012F0 80B97E90 AFA60020 */ sw $a2, 0x0020($sp) -/* 012F4 80B97E94 0C018A29 */ jal func_800628A4 -/* 012F8 80B97E98 AFA70024 */ sw $a3, 0x0024($sp) -/* 012FC 80B97E9C 8FA60020 */ lw $a2, 0x0020($sp) -/* 01300 80B97EA0 8FA30018 */ lw $v1, 0x0018($sp) -/* 01304 80B97EA4 8FA70024 */ lw $a3, 0x0024($sp) -/* 01308 80B97EA8 84C2001C */ lh $v0, 0x001C($a2) ## 0000001C -.L80B97EAC: -/* 0130C 80B97EAC 00027903 */ sra $t7, $v0, 4 -/* 01310 80B97EB0 31F80003 */ andi $t8, $t7, 0x0003 ## $t8 = 00000000 -/* 01314 80B97EB4 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 01318 80B97EB8 1701000A */ bne $t8, $at, .L80B97EE4 -/* 0131C 80B97EBC 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 01320 80B97EC0 1C600003 */ bgtz $v1, .L80B97ED0 -/* 01324 80B97EC4 286100FF */ slti $at, $v1, 0x00FF -/* 01328 80B97EC8 10200006 */ beq $at, $zero, .L80B97EE4 -/* 0132C 80B97ECC 00000000 */ nop -.L80B97ED0: -/* 01330 80B97ED0 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 01334 80B97ED4 0C2E5ED4 */ jal func_80B97B50 -/* 01338 80B97ED8 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 0133C 80B97EDC 10000004 */ beq $zero, $zero, .L80B97EF0 -/* 01340 80B97EE0 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B97EE4: -/* 01344 80B97EE4 0C2E5DF4 */ jal func_80B977D0 -/* 01348 80B97EE8 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 0134C 80B97EEC 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B97EF0: -/* 01350 80B97EF0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01354 80B97EF4 03E00008 */ jr $ra -/* 01358 80B97EF8 00000000 */ nop -/* 0135C 80B97EFC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/ObjLightswitch_Init.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/ObjLightswitch_Init.s deleted file mode 100644 index c6ea64474e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/ObjLightswitch_Init.s +++ /dev/null @@ -1,158 +0,0 @@ -.rdata -glabel D_80B97F90 - .asciz "\x1b[41;37m" - .balign 4 - -glabel D_80B97F9C - .asciz "押引ブロック発生失敗(%s %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_80B97FCC - .asciz "../z_obj_lightswitch.c" - .balign 4 - -glabel D_80B97FE4 - .asciz "\x1b[m" - .balign 4 - -glabel D_80B97FE8 - .asciz "(光スイッチ)(arg_data 0x%04x)\n" - .balign 4 - -.text -glabel ObjLightswitch_Init -/* 00408 80B96FA8 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 0040C 80B96FAC AFB00038 */ sw $s0, 0x0038($sp) -/* 00410 80B96FB0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00414 80B96FB4 AFBF003C */ sw $ra, 0x003C($sp) -/* 00418 80B96FB8 AFA50054 */ sw $a1, 0x0054($sp) -/* 0041C 80B96FBC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00420 80B96FC0 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 00424 80B96FC4 00052A03 */ sra $a1, $a1, 8 -/* 00428 80B96FC8 0C00B2D0 */ jal Flags_GetSwitch - -/* 0042C 80B96FCC 30A5003F */ andi $a1, $a1, 0x003F ## $a1 = 00000000 -/* 00430 80B96FD0 3C0580B9 */ lui $a1, %hi(D_80B97F80) ## $a1 = 80B90000 -/* 00434 80B96FD4 AFA20048 */ sw $v0, 0x0048($sp) -/* 00438 80B96FD8 AFA00044 */ sw $zero, 0x0044($sp) -/* 0043C 80B96FDC 24A57F80 */ addiu $a1, $a1, %lo(D_80B97F80) ## $a1 = 80B97F80 -/* 00440 80B96FE0 0C01E037 */ jal Actor_ProcessInitChain - -/* 00444 80B96FE4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00448 80B96FE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0044C 80B96FEC 0C00B56E */ jal Actor_SetHeight - -/* 00450 80B96FF0 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 00454 80B96FF4 8FAE0048 */ lw $t6, 0x0048($sp) -/* 00458 80B96FF8 11C0000E */ beq $t6, $zero, .L80B97034 -/* 0045C 80B96FFC 00000000 */ nop -/* 00460 80B97000 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 00464 80B97004 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00468 80B97008 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 0046C 80B9700C 00027903 */ sra $t7, $v0, 4 -/* 00470 80B97010 31F80003 */ andi $t8, $t7, 0x0003 ## $t8 = 00000000 -/* 00474 80B97014 17010003 */ bne $t8, $at, .L80B97024 -/* 00478 80B97018 00000000 */ nop -/* 0047C 80B9701C 10000008 */ beq $zero, $zero, .L80B97040 -/* 00480 80B97020 AFB90044 */ sw $t9, 0x0044($sp) -.L80B97024: -/* 00484 80B97024 0C2E5CF2 */ jal func_80B973C8 -/* 00488 80B97028 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0048C 80B9702C 10000004 */ beq $zero, $zero, .L80B97040 -/* 00490 80B97030 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -.L80B97034: -/* 00494 80B97034 0C2E5C6A */ jal func_80B971A8 -/* 00498 80B97038 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0049C 80B9703C 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -.L80B97040: -/* 004A0 80B97040 30480001 */ andi $t0, $v0, 0x0001 ## $t0 = 00000000 -/* 004A4 80B97044 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 004A8 80B97048 15010037 */ bne $t0, $at, .L80B97128 -/* 004AC 80B9704C 8FA90048 */ lw $t1, 0x0048($sp) -/* 004B0 80B97050 11200008 */ beq $t1, $zero, .L80B97074 -/* 004B4 80B97054 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 004B8 80B97058 3C0580B9 */ lui $a1, %hi(D_80B97F68) ## $a1 = 80B90000 -/* 004BC 80B9705C 0C01DF90 */ jal Math_Vec3f_Copy - ## Vec3f_Copy -/* 004C0 80B97060 24A57F68 */ addiu $a1, $a1, %lo(D_80B97F68) ## $a1 = 80B97F68 -/* 004C4 80B97064 3C0580B9 */ lui $a1, %hi(D_80B97F68) ## $a1 = 80B90000 -/* 004C8 80B97068 24A57F68 */ addiu $a1, $a1, %lo(D_80B97F68) ## $a1 = 80B97F68 -/* 004CC 80B9706C 0C01DF90 */ jal Math_Vec3f_Copy - ## Vec3f_Copy -/* 004D0 80B97070 26040008 */ addiu $a0, $s0, 0x0008 ## $a0 = 00000008 -.L80B97074: -/* 004D4 80B97074 8FA60054 */ lw $a2, 0x0054($sp) -/* 004D8 80B97078 240AC000 */ addiu $t2, $zero, 0xC000 ## $t2 = FFFFC000 -/* 004DC 80B9707C A60A00B4 */ sh $t2, 0x00B4($s0) ## 000000B4 -/* 004E0 80B97080 860200B4 */ lh $v0, 0x00B4($s0) ## 000000B4 -/* 004E4 80B97084 A60000B8 */ sh $zero, 0x00B8($s0) ## 000000B8 -/* 004E8 80B97088 8E0B0004 */ lw $t3, 0x0004($s0) ## 00000004 -/* 004EC 80B9708C A6020014 */ sh $v0, 0x0014($s0) ## 00000014 -/* 004F0 80B97090 A6020030 */ sh $v0, 0x0030($s0) ## 00000030 -/* 004F4 80B97094 860200B8 */ lh $v0, 0x00B8($s0) ## 000000B8 -/* 004F8 80B97098 C6040008 */ lwc1 $f4, 0x0008($s0) ## 00000008 -/* 004FC 80B9709C 356C0020 */ ori $t4, $t3, 0x0020 ## $t4 = 00000020 -/* 00500 80B970A0 AE0C0004 */ sw $t4, 0x0004($s0) ## 00000004 -/* 00504 80B970A4 A6020018 */ sh $v0, 0x0018($s0) ## 00000018 -/* 00508 80B970A8 A6020034 */ sh $v0, 0x0034($s0) ## 00000034 -/* 0050C 80B970AC E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00510 80B970B0 C606000C */ lwc1 $f6, 0x000C($s0) ## 0000000C -/* 00514 80B970B4 240EFF00 */ addiu $t6, $zero, 0xFF00 ## $t6 = FFFFFF00 -/* 00518 80B970B8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0051C 80B970BC E7A60014 */ swc1 $f6, 0x0014($sp) -/* 00520 80B970C0 C6080010 */ lwc1 $f8, 0x0010($s0) ## 00000010 -/* 00524 80B970C4 AFA0001C */ sw $zero, 0x001C($sp) -/* 00528 80B970C8 240700FF */ addiu $a3, $zero, 0x00FF ## $a3 = 000000FF -/* 0052C 80B970CC E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00530 80B970D0 860D0016 */ lh $t5, 0x0016($s0) ## 00000016 -/* 00534 80B970D4 AFAE0028 */ sw $t6, 0x0028($sp) -/* 00538 80B970D8 AFA00024 */ sw $zero, 0x0024($sp) -/* 0053C 80B970DC 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 00540 80B970E0 0C00C916 */ jal Actor_SpawnAsChild - -/* 00544 80B970E4 AFAD0020 */ sw $t5, 0x0020($sp) -/* 00548 80B970E8 1440000F */ bne $v0, $zero, .L80B97128 -/* 0054C 80B970EC 3C0480B9 */ lui $a0, %hi(D_80B97F90) ## $a0 = 80B90000 -/* 00550 80B970F0 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 00554 80B970F4 AFAF0044 */ sw $t7, 0x0044($sp) -/* 00558 80B970F8 0C00084C */ jal osSyncPrintf - -/* 0055C 80B970FC 24847F90 */ addiu $a0, $a0, %lo(D_80B97F90) ## $a0 = 80B97F90 -/* 00560 80B97100 3C0480B9 */ lui $a0, %hi(D_80B97F9C) ## $a0 = 80B90000 -/* 00564 80B97104 3C0580B9 */ lui $a1, %hi(D_80B97FCC) ## $a1 = 80B90000 -/* 00568 80B97108 24A57FCC */ addiu $a1, $a1, %lo(D_80B97FCC) ## $a1 = 80B97FCC -/* 0056C 80B9710C 24847F9C */ addiu $a0, $a0, %lo(D_80B97F9C) ## $a0 = 80B97F9C -/* 00570 80B97110 240601C4 */ addiu $a2, $zero, 0x01C4 ## $a2 = 000001C4 -/* 00574 80B97114 0C00084C */ jal osSyncPrintf - -/* 00578 80B97118 8607001C */ lh $a3, 0x001C($s0) ## 0000001C -/* 0057C 80B9711C 3C0480B9 */ lui $a0, %hi(D_80B97FE4) ## $a0 = 80B90000 -/* 00580 80B97120 0C00084C */ jal osSyncPrintf - -/* 00584 80B97124 24847FE4 */ addiu $a0, $a0, %lo(D_80B97FE4) ## $a0 = 80B97FE4 -.L80B97128: -/* 00588 80B97128 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0058C 80B9712C 0C2E5AE8 */ jal func_80B96BA0 -/* 00590 80B97130 8FA50054 */ lw $a1, 0x0054($sp) -/* 00594 80B97134 3C0680B9 */ lui $a2, %hi(D_80B97F54) ## $a2 = 80B90000 -/* 00598 80B97138 24C67F54 */ addiu $a2, $a2, %lo(D_80B97F54) ## $a2 = 80B97F54 -/* 0059C 80B9713C 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 005A0 80B97140 0C0187B5 */ jal func_80061ED4 -/* 005A4 80B97144 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 005A8 80B97148 8FB80044 */ lw $t8, 0x0044($sp) -/* 005AC 80B9714C 13000003 */ beq $t8, $zero, .L80B9715C -/* 005B0 80B97150 00000000 */ nop -/* 005B4 80B97154 0C00B55C */ jal Actor_Kill - -/* 005B8 80B97158 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80B9715C: -/* 005BC 80B9715C 3C0480B9 */ lui $a0, %hi(D_80B97FE8) ## $a0 = 80B90000 -/* 005C0 80B97160 24847FE8 */ addiu $a0, $a0, %lo(D_80B97FE8) ## $a0 = 80B97FE8 -/* 005C4 80B97164 0C00084C */ jal osSyncPrintf - -/* 005C8 80B97168 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 005CC 80B9716C 8FBF003C */ lw $ra, 0x003C($sp) -/* 005D0 80B97170 8FB00038 */ lw $s0, 0x0038($sp) -/* 005D4 80B97174 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 005D8 80B97178 03E00008 */ jr $ra -/* 005DC 80B9717C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/ObjLightswitch_Update.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/ObjLightswitch_Update.s deleted file mode 100644 index 1d2abcd566..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/ObjLightswitch_Update.s +++ /dev/null @@ -1,64 +0,0 @@ -glabel ObjLightswitch_Update -/* 00B4C 80B976EC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00B50 80B976F0 AFBF001C */ sw $ra, 0x001C($sp) -/* 00B54 80B976F4 AFB10018 */ sw $s1, 0x0018($sp) -/* 00B58 80B976F8 AFB00014 */ sw $s0, 0x0014($sp) -/* 00B5C 80B976FC 848201B2 */ lh $v0, 0x01B2($a0) ## 000001B2 -/* 00B60 80B97700 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00B64 80B97704 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00B68 80B97708 18400002 */ blez $v0, .L80B97714 -/* 00B6C 80B9770C 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 00B70 80B97710 A48E01B2 */ sh $t6, 0x01B2($a0) ## 000001B2 -.L80B97714: -/* 00B74 80B97714 8E19014C */ lw $t9, 0x014C($s0) ## 0000014C -/* 00B78 80B97718 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B7C 80B9771C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00B80 80B97720 0320F809 */ jalr $ra, $t9 -/* 00B84 80B97724 00000000 */ nop -/* 00B88 80B97728 8E0F0130 */ lw $t7, 0x0130($s0) ## 00000130 -/* 00B8C 80B9772C 51E00024 */ beql $t7, $zero, .L80B977C0 -/* 00B90 80B97730 8FBF001C */ lw $ra, 0x001C($sp) -/* 00B94 80B97734 8618001C */ lh $t8, 0x001C($s0) ## 0000001C -/* 00B98 80B97738 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00B9C 80B9773C 33080001 */ andi $t0, $t8, 0x0001 ## $t0 = 00000000 -/* 00BA0 80B97740 5501000F */ bnel $t0, $at, .L80B97780 -/* 00BA4 80B97744 92020161 */ lbu $v0, 0x0161($s0) ## 00000161 -/* 00BA8 80B97748 8E02011C */ lw $v0, 0x011C($s0) ## 0000011C -/* 00BAC 80B9774C 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 00BB0 80B97750 44814000 */ mtc1 $at, $f8 ## $f8 = 60.00 -/* 00BB4 80B97754 C4440024 */ lwc1 $f4, 0x0024($v0) ## 00000024 -/* 00BB8 80B97758 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00BBC 80B9775C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 00BC0 80B97760 E6040024 */ swc1 $f4, 0x0024($s0) ## 00000024 -/* 00BC4 80B97764 C4460028 */ lwc1 $f6, 0x0028($v0) ## 00000028 -/* 00BC8 80B97768 46083280 */ add.s $f10, $f6, $f8 -/* 00BCC 80B9776C E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 -/* 00BD0 80B97770 C450002C */ lwc1 $f16, 0x002C($v0) ## 0000002C -/* 00BD4 80B97774 0C00B56E */ jal Actor_SetHeight - -/* 00BD8 80B97778 E610002C */ swc1 $f16, 0x002C($s0) ## 0000002C -/* 00BDC 80B9777C 92020161 */ lbu $v0, 0x0161($s0) ## 00000161 -.L80B97780: -/* 00BE0 80B97780 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00BE4 80B97784 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 00BE8 80B97788 3049FFFD */ andi $t1, $v0, 0xFFFD ## $t1 = 00000000 -/* 00BEC 80B9778C A2090161 */ sb $t1, 0x0161($s0) ## 00000161 -/* 00BF0 80B97790 02212821 */ addu $a1, $s1, $at -/* 00BF4 80B97794 26060150 */ addiu $a2, $s0, 0x0150 ## $a2 = 00000150 -/* 00BF8 80B97798 A20201C2 */ sb $v0, 0x01C2($s0) ## 000001C2 -/* 00BFC 80B9779C AFA60020 */ sw $a2, 0x0020($sp) -/* 00C00 80B977A0 AFA50024 */ sw $a1, 0x0024($sp) -/* 00C04 80B977A4 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOT -/* 00C08 80B977A8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00C0C 80B977AC 8FA50024 */ lw $a1, 0x0024($sp) -/* 00C10 80B977B0 8FA60020 */ lw $a2, 0x0020($sp) -/* 00C14 80B977B4 0C01767D */ jal CollisionCheck_SetAC - ## CollisionCheck_setAC -/* 00C18 80B977B8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00C1C 80B977BC 8FBF001C */ lw $ra, 0x001C($sp) -.L80B977C0: -/* 00C20 80B977C0 8FB00014 */ lw $s0, 0x0014($sp) -/* 00C24 80B977C4 8FB10018 */ lw $s1, 0x0018($sp) -/* 00C28 80B977C8 03E00008 */ jr $ra -/* 00C2C 80B977CC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B96BA0.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B96BA0.s deleted file mode 100644 index 993e05a834..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B96BA0.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_80B96BA0 -/* 00000 80B96BA0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00004 80B96BA4 AFB00020 */ sw $s0, 0x0020($sp) -/* 00008 80B96BA8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0000C 80B96BAC AFA50034 */ sw $a1, 0x0034($sp) -/* 00010 80B96BB0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00014 80B96BB4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00018 80B96BB8 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 -/* 0001C 80B96BBC 0C016EFE */ jal Collider_InitJntSph -/* 00020 80B96BC0 AFA50028 */ sw $a1, 0x0028($sp) -/* 00024 80B96BC4 3C0780B9 */ lui $a3, %hi(D_80B97F44) ## $a3 = 80B90000 -/* 00028 80B96BC8 260E0170 */ addiu $t6, $s0, 0x0170 ## $t6 = 00000170 -/* 0002C 80B96BCC AFAE0010 */ sw $t6, 0x0010($sp) -/* 00030 80B96BD0 24E77F44 */ addiu $a3, $a3, %lo(D_80B97F44) ## $a3 = 80B97F44 -/* 00034 80B96BD4 8FA40034 */ lw $a0, 0x0034($sp) -/* 00038 80B96BD8 8FA50028 */ lw $a1, 0x0028($sp) -/* 0003C 80B96BDC 0C017014 */ jal Collider_SetJntSph -/* 00040 80B96BE0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00044 80B96BE4 C60400BC */ lwc1 $f4, 0x00BC($s0) ## 000000BC -/* 00048 80B96BE8 C6060054 */ lwc1 $f6, 0x0054($s0) ## 00000054 -/* 0004C 80B96BEC C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 -/* 00050 80B96BF0 C60C0024 */ lwc1 $f12, 0x0024($s0) ## 00000024 -/* 00054 80B96BF4 46062202 */ mul.s $f8, $f4, $f6 -/* 00058 80B96BF8 8E06002C */ lw $a2, 0x002C($s0) ## 0000002C -/* 0005C 80B96BFC 260700B4 */ addiu $a3, $s0, 0x00B4 ## $a3 = 000000B4 -/* 00060 80B96C00 0C0345A5 */ jal func_800D1694 -/* 00064 80B96C04 46085380 */ add.s $f14, $f10, $f8 -/* 00068 80B96C08 C60C0050 */ lwc1 $f12, 0x0050($s0) ## 00000050 -/* 0006C 80B96C0C C60E0054 */ lwc1 $f14, 0x0054($s0) ## 00000054 -/* 00070 80B96C10 8E060058 */ lw $a2, 0x0058($s0) ## 00000058 -/* 00074 80B96C14 0C0342A3 */ jal Matrix_Scale -/* 00078 80B96C18 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0007C 80B96C1C 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 -/* 00080 80B96C20 0C018A29 */ jal func_800628A4 -/* 00084 80B96C24 8FA50028 */ lw $a1, 0x0028($sp) -/* 00088 80B96C28 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0008C 80B96C2C 8FB00020 */ lw $s0, 0x0020($sp) -/* 00090 80B96C30 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00094 80B96C34 03E00008 */ jr $ra -/* 00098 80B96C38 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B96C3C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B96C3C.s deleted file mode 100644 index d6d0abdb90..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B96C3C.s +++ /dev/null @@ -1,56 +0,0 @@ -glabel func_80B96C3C -/* 0009C 80B96C3C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 000A0 80B96C40 AFB00018 */ sw $s0, 0x0018($sp) -/* 000A4 80B96C44 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 000A8 80B96C48 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 000AC 80B96C4C AFBF001C */ sw $ra, 0x001C($sp) -/* 000B0 80B96C50 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 000B4 80B96C54 84E5001C */ lh $a1, 0x001C($a3) ## 0000001C -/* 000B8 80B96C58 AFA70028 */ sw $a3, 0x0028($sp) -/* 000BC 80B96C5C 00052A03 */ sra $a1, $a1, 8 -/* 000C0 80B96C60 0C00B2D0 */ jal Flags_GetSwitch - -/* 000C4 80B96C64 30A5003F */ andi $a1, $a1, 0x003F ## $a1 = 00000000 -/* 000C8 80B96C68 14400020 */ bne $v0, $zero, .L80B96CEC -/* 000CC 80B96C6C 8FA70028 */ lw $a3, 0x0028($sp) -/* 000D0 80B96C70 84E2001C */ lh $v0, 0x001C($a3) ## 0000001C -/* 000D4 80B96C74 AFA70028 */ sw $a3, 0x0028($sp) -/* 000D8 80B96C78 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000DC 80B96C7C 00021903 */ sra $v1, $v0, 4 -/* 000E0 80B96C80 30630003 */ andi $v1, $v1, 0x0003 ## $v1 = 00000000 -/* 000E4 80B96C84 00022A03 */ sra $a1, $v0, 8 -/* 000E8 80B96C88 30A5003F */ andi $a1, $a1, 0x003F ## $a1 = 00000000 -/* 000EC 80B96C8C 0C00B2DD */ jal Flags_SetSwitch - -/* 000F0 80B96C90 AFA30020 */ sw $v1, 0x0020($sp) -/* 000F4 80B96C94 8FA30020 */ lw $v1, 0x0020($sp) -/* 000F8 80B96C98 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 000FC 80B96C9C 8FA70028 */ lw $a3, 0x0028($sp) -/* 00100 80B96CA0 14610006 */ bne $v1, $at, .L80B96CBC -/* 00104 80B96CA4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00108 80B96CA8 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 0010C 80B96CAC 0C0201AF */ jal func_800806BC -/* 00110 80B96CB0 24064807 */ addiu $a2, $zero, 0x4807 ## $a2 = 00004807 -/* 00114 80B96CB4 1000000E */ beq $zero, $zero, .L80B96CF0 -/* 00118 80B96CB8 8FBF001C */ lw $ra, 0x001C($sp) -.L80B96CBC: -/* 0011C 80B96CBC 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00120 80B96CC0 14610007 */ bne $v1, $at, .L80B96CE0 -/* 00124 80B96CC4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00128 80B96CC8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0012C 80B96CCC 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 00130 80B96CD0 0C0201AF */ jal func_800806BC -/* 00134 80B96CD4 24064806 */ addiu $a2, $zero, 0x4806 ## $a2 = 00004806 -/* 00138 80B96CD8 10000005 */ beq $zero, $zero, .L80B96CF0 -/* 0013C 80B96CDC 8FBF001C */ lw $ra, 0x001C($sp) -.L80B96CE0: -/* 00140 80B96CE0 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 00144 80B96CE4 0C0201AF */ jal func_800806BC -/* 00148 80B96CE8 24064802 */ addiu $a2, $zero, 0x4802 ## $a2 = 00004802 -.L80B96CEC: -/* 0014C 80B96CEC 8FBF001C */ lw $ra, 0x001C($sp) -.L80B96CF0: -/* 00150 80B96CF0 8FB00018 */ lw $s0, 0x0018($sp) -/* 00154 80B96CF4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00158 80B96CF8 03E00008 */ jr $ra -/* 0015C 80B96CFC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B96D00.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B96D00.s deleted file mode 100644 index a809fb5cbe..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B96D00.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_80B96D00 -/* 00160 80B96D00 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00164 80B96D04 AFA40018 */ sw $a0, 0x0018($sp) -/* 00168 80B96D08 8FAE0018 */ lw $t6, 0x0018($sp) -/* 0016C 80B96D0C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00170 80B96D10 AFA5001C */ sw $a1, 0x001C($sp) -/* 00174 80B96D14 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00178 80B96D18 85C5001C */ lh $a1, 0x001C($t6) ## 0000001C -/* 0017C 80B96D1C 00052A03 */ sra $a1, $a1, 8 -/* 00180 80B96D20 0C00B2D0 */ jal Flags_GetSwitch - -/* 00184 80B96D24 30A5003F */ andi $a1, $a1, 0x003F ## $a1 = 00000000 -/* 00188 80B96D28 10400011 */ beq $v0, $zero, .L80B96D70 -/* 0018C 80B96D2C 8FAF0018 */ lw $t7, 0x0018($sp) -/* 00190 80B96D30 85E5001C */ lh $a1, 0x001C($t7) ## 0000001C -/* 00194 80B96D34 8FA4001C */ lw $a0, 0x001C($sp) -/* 00198 80B96D38 00052A03 */ sra $a1, $a1, 8 -/* 0019C 80B96D3C 0C00B2ED */ jal Flags_UnsetSwitch - -/* 001A0 80B96D40 30A5003F */ andi $a1, $a1, 0x003F ## $a1 = 00000000 -/* 001A4 80B96D44 8FB80018 */ lw $t8, 0x0018($sp) -/* 001A8 80B96D48 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 001AC 80B96D4C 8FA4001C */ lw $a0, 0x001C($sp) -/* 001B0 80B96D50 8719001C */ lh $t9, 0x001C($t8) ## 0000001C -/* 001B4 80B96D54 03002825 */ or $a1, $t8, $zero ## $a1 = 00000000 -/* 001B8 80B96D58 00194103 */ sra $t0, $t9, 4 -/* 001BC 80B96D5C 31090003 */ andi $t1, $t0, 0x0003 ## $t1 = 00000000 -/* 001C0 80B96D60 55210004 */ bnel $t1, $at, .L80B96D74 -/* 001C4 80B96D64 8FBF0014 */ lw $ra, 0x0014($sp) -/* 001C8 80B96D68 0C0201AF */ jal func_800806BC -/* 001CC 80B96D6C 24064807 */ addiu $a2, $zero, 0x4807 ## $a2 = 00004807 -.L80B96D70: -/* 001D0 80B96D70 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B96D74: -/* 001D4 80B96D74 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 001D8 80B96D78 03E00008 */ jr $ra -/* 001DC 80B96D7C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B96D80.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B96D80.s deleted file mode 100644 index c290c6eaf3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B96D80.s +++ /dev/null @@ -1,154 +0,0 @@ -.late_rodata -glabel D_80B980F8 - .word 0x38808081, 0x00000000 - -.text -glabel func_80B96D80 -/* 001E0 80B96D80 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 -/* 001E4 80B96D84 AFB00048 */ sw $s0, 0x0048($sp) -/* 001E8 80B96D88 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 001EC 80B96D8C AFBF004C */ sw $ra, 0x004C($sp) -/* 001F0 80B96D90 AFA50084 */ sw $a1, 0x0084($sp) -/* 001F4 80B96D94 0C01DE1C */ jal Math_Sins - ## sins? -/* 001F8 80B96D98 848400B6 */ lh $a0, 0x00B6($a0) ## 000000B6 -/* 001FC 80B96D9C E7A00070 */ swc1 $f0, 0x0070($sp) -/* 00200 80B96DA0 0C01DE0D */ jal Math_Coss - ## coss? -/* 00204 80B96DA4 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 00208 80B96DA8 E7A0006C */ swc1 $f0, 0x006C($sp) -/* 0020C 80B96DAC 860201BC */ lh $v0, 0x01BC($s0) ## 000001BC -/* 00210 80B96DB0 28411900 */ slti $at, $v0, 0x1900 -/* 00214 80B96DB4 54200078 */ bnel $at, $zero, .L80B96F98 -/* 00218 80B96DB8 8FBF004C */ lw $ra, 0x004C($sp) -/* 0021C 80B96DBC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00220 80B96DC0 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 00224 80B96DC4 44811000 */ mtc1 $at, $f2 ## $f2 = 60.00 -/* 00228 80B96DC8 468021A0 */ cvt.s.w $f6, $f4 -/* 0022C 80B96DCC 3C0180BA */ lui $at, %hi(D_80B980F8) ## $at = 80BA0000 -/* 00230 80B96DD0 C42880F8 */ lwc1 $f8, %lo(D_80B980F8)($at) -/* 00234 80B96DD4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00238 80B96DD8 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 0023C 80B96DDC 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 -/* 00240 80B96DE0 46083282 */ mul.s $f10, $f6, $f8 -/* 00244 80B96DE4 44814000 */ mtc1 $at, $f8 ## $f8 = 400.00 -/* 00248 80B96DE8 460A2181 */ sub.s $f6, $f4, $f10 -/* 0024C 80B96DEC 46083002 */ mul.s $f0, $f6, $f8 -/* 00250 80B96DF0 4600103C */ c.lt.s $f2, $f0 -/* 00254 80B96DF4 00000000 */ nop -/* 00258 80B96DF8 45020004 */ bc1fl .L80B96E0C -/* 0025C 80B96DFC 46000386 */ mov.s $f14, $f0 -/* 00260 80B96E00 10000002 */ beq $zero, $zero, .L80B96E0C -/* 00264 80B96E04 46001386 */ mov.s $f14, $f2 -/* 00268 80B96E08 46000386 */ mov.s $f14, $f0 -.L80B96E0C: -/* 0026C 80B96E0C 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00270 80B96E10 E7AE0058 */ swc1 $f14, 0x0058($sp) -/* 00274 80B96E14 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 00278 80B96E18 44818000 */ mtc1 $at, $f16 ## $f16 = 30.00 -/* 0027C 80B96E1C C7AE0058 */ lwc1 $f14, 0x0058($sp) -/* 00280 80B96E20 46107101 */ sub.s $f4, $f14, $f16 -/* 00284 80B96E24 46102280 */ add.s $f10, $f4, $f16 -/* 00288 80B96E28 460A0082 */ mul.s $f2, $f0, $f10 -/* 0028C 80B96E2C 4602803C */ c.lt.s $f16, $f2 -/* 00290 80B96E30 46101301 */ sub.s $f12, $f2, $f16 -/* 00294 80B96E34 45000003 */ bc1f .L80B96E44 -/* 00298 80B96E38 E7AC0064 */ swc1 $f12, 0x0064($sp) -/* 0029C 80B96E3C 1000000F */ beq $zero, $zero, .L80B96E7C -/* 002A0 80B96E40 46008086 */ mov.s $f2, $f16 -.L80B96E44: -/* 002A4 80B96E44 460C6202 */ mul.s $f8, $f12, $f12 -/* 002A8 80B96E48 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 002AC 80B96E4C 44817000 */ mtc1 $at, $f14 ## $f14 = 100.00 -/* 002B0 80B96E50 3C014461 */ lui $at, 0x4461 ## $at = 44610000 -/* 002B4 80B96E54 44813000 */ mtc1 $at, $f6 ## $f6 = 900.00 -/* 002B8 80B96E58 00000000 */ nop -/* 002BC 80B96E5C 46083081 */ sub.s $f2, $f6, $f8 -/* 002C0 80B96E60 460E103C */ c.lt.s $f2, $f14 -/* 002C4 80B96E64 00000000 */ nop -/* 002C8 80B96E68 45020003 */ bc1fl .L80B96E78 -/* 002CC 80B96E6C 46001004 */ sqrt.s $f0, $f2 -/* 002D0 80B96E70 46007086 */ mov.s $f2, $f14 -/* 002D4 80B96E74 46001004 */ sqrt.s $f0, $f2 -.L80B96E78: -/* 002D8 80B96E78 46000086 */ mov.s $f2, $f0 -.L80B96E7C: -/* 002DC 80B96E7C 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 002E0 80B96E80 E7A20068 */ swc1 $f2, 0x0068($sp) -/* 002E4 80B96E84 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 002E8 80B96E88 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 002EC 80B96E8C C7A20068 */ lwc1 $f2, 0x0068($sp) -/* 002F0 80B96E90 46040281 */ sub.s $f10, $f0, $f4 -/* 002F4 80B96E94 46025302 */ mul.s $f12, $f10, $f2 -/* 002F8 80B96E98 460C6080 */ add.s $f2, $f12, $f12 -/* 002FC 80B96E9C 46001385 */ abs.s $f14, $f2 -/* 00300 80B96EA0 E7A20068 */ swc1 $f2, 0x0068($sp) -/* 00304 80B96EA4 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00308 80B96EA8 E7AE0058 */ swc1 $f14, 0x0058($sp) -/* 0030C 80B96EAC 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 00310 80B96EB0 44818000 */ mtc1 $at, $f16 ## $f16 = 30.00 -/* 00314 80B96EB4 C7AE0058 */ lwc1 $f14, 0x0058($sp) -/* 00318 80B96EB8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 0031C 80B96EBC 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 -/* 00320 80B96EC0 460E8181 */ sub.s $f6, $f16, $f14 -/* 00324 80B96EC4 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00328 80B96EC8 44814000 */ mtc1 $at, $f8 ## $f8 = 0.50 -/* 0032C 80B96ECC C7A20068 */ lwc1 $f2, 0x0068($sp) -/* 00330 80B96ED0 3C0680B9 */ lui $a2, %hi(D_80B97F74) ## $a2 = 80B90000 -/* 00334 80B96ED4 46083102 */ mul.s $f4, $f6, $f8 -/* 00338 80B96ED8 C7A60070 */ lwc1 $f6, 0x0070($sp) -/* 0033C 80B96EDC 24C67F74 */ addiu $a2, $a2, %lo(D_80B97F74) ## $a2 = 80B97F74 -/* 00340 80B96EE0 46120282 */ mul.s $f10, $f0, $f18 -/* 00344 80B96EE4 240E0064 */ addiu $t6, $zero, 0x0064 ## $t6 = 00000064 -/* 00348 80B96EE8 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF -/* 0034C 80B96EEC 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 00350 80B96EF0 241900A0 */ addiu $t9, $zero, 0x00A0 ## $t9 = 000000A0 -/* 00354 80B96EF4 240800A0 */ addiu $t0, $zero, 0x00A0 ## $t0 = 000000A0 -/* 00358 80B96EF8 240900FF */ addiu $t1, $zero, 0x00FF ## $t1 = 000000FF -/* 0035C 80B96EFC 46045300 */ add.s $f12, $f10, $f4 -/* 00360 80B96F00 C7AA006C */ lwc1 $f10, 0x006C($sp) -/* 00364 80B96F04 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 00368 80B96F08 240B0009 */ addiu $t3, $zero, 0x0009 ## $t3 = 00000009 -/* 0036C 80B96F0C 46066202 */ mul.s $f8, $f12, $f6 -/* 00370 80B96F10 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 00374 80B96F14 00C03825 */ or $a3, $a2, $zero ## $a3 = 80B97F74 -/* 00378 80B96F18 460A1102 */ mul.s $f4, $f2, $f10 -/* 0037C 80B96F1C 8FA40084 */ lw $a0, 0x0084($sp) -/* 00380 80B96F20 27A50074 */ addiu $a1, $sp, 0x0074 ## $a1 = FFFFFFF4 -/* 00384 80B96F24 46044200 */ add.s $f8, $f8, $f4 -/* 00388 80B96F28 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 0038C 80B96F2C 46082100 */ add.s $f4, $f4, $f8 -/* 00390 80B96F30 E7A40074 */ swc1 $f4, 0x0074($sp) -/* 00394 80B96F34 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 00398 80B96F38 C7A40064 */ lwc1 $f4, 0x0064($sp) -/* 0039C 80B96F3C 46044200 */ add.s $f8, $f8, $f4 -/* 003A0 80B96F40 46124100 */ add.s $f4, $f8, $f18 -/* 003A4 80B96F44 460A6202 */ mul.s $f8, $f12, $f10 -/* 003A8 80B96F48 E7A40078 */ swc1 $f4, 0x0078($sp) -/* 003AC 80B96F4C 46061102 */ mul.s $f4, $f2, $f6 -/* 003B0 80B96F50 C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C -/* 003B4 80B96F54 AFAC003C */ sw $t4, 0x003C($sp) -/* 003B8 80B96F58 AFAB0038 */ sw $t3, 0x0038($sp) -/* 003BC 80B96F5C AFAA0034 */ sw $t2, 0x0034($sp) -/* 003C0 80B96F60 AFA00030 */ sw $zero, 0x0030($sp) -/* 003C4 80B96F64 AFA0002C */ sw $zero, 0x002C($sp) -/* 003C8 80B96F68 46044281 */ sub.s $f10, $f8, $f4 -/* 003CC 80B96F6C AFA90028 */ sw $t1, 0x0028($sp) -/* 003D0 80B96F70 AFA80024 */ sw $t0, 0x0024($sp) -/* 003D4 80B96F74 AFB90020 */ sw $t9, 0x0020($sp) -/* 003D8 80B96F78 460A3200 */ add.s $f8, $f6, $f10 -/* 003DC 80B96F7C AFB8001C */ sw $t8, 0x001C($sp) -/* 003E0 80B96F80 AFAF0018 */ sw $t7, 0x0018($sp) -/* 003E4 80B96F84 AFA00014 */ sw $zero, 0x0014($sp) -/* 003E8 80B96F88 E7A8007C */ swc1 $f8, 0x007C($sp) -/* 003EC 80B96F8C 0C00A9AE */ jal func_8002A6B8 -/* 003F0 80B96F90 AFAE0010 */ sw $t6, 0x0010($sp) -/* 003F4 80B96F94 8FBF004C */ lw $ra, 0x004C($sp) -.L80B96F98: -/* 003F8 80B96F98 8FB00048 */ lw $s0, 0x0048($sp) -/* 003FC 80B96F9C 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 -/* 00400 80B96FA0 03E00008 */ jr $ra -/* 00404 80B96FA4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B971A8.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B971A8.s deleted file mode 100644 index 54daf647ca..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B971A8.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_80B971A8 -/* 00608 80B971A8 3C0E80B9 */ lui $t6, %hi(func_80B971D8) ## $t6 = 80B90000 -/* 0060C 80B971AC 24023FC0 */ addiu $v0, $zero, 0x3FC0 ## $v0 = 00003FC0 -/* 00610 80B971B0 25CE71D8 */ addiu $t6, $t6, %lo(func_80B971D8) ## $t6 = 80B971D8 -/* 00614 80B971B4 240F26C0 */ addiu $t7, $zero, 0x26C0 ## $t7 = 000026C0 -/* 00618 80B971B8 24181F40 */ addiu $t8, $zero, 0x1F40 ## $t8 = 00001F40 -/* 0061C 80B971BC AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 00620 80B971C0 A48001B4 */ sh $zero, 0x01B4($a0) ## 000001B4 -/* 00624 80B971C4 A48F01B6 */ sh $t7, 0x01B6($a0) ## 000001B6 -/* 00628 80B971C8 A49801B8 */ sh $t8, 0x01B8($a0) ## 000001B8 -/* 0062C 80B971CC A48201BA */ sh $v0, 0x01BA($a0) ## 000001BA -/* 00630 80B971D0 03E00008 */ jr $ra -/* 00634 80B971D4 A48201BC */ sh $v0, 0x01BC($a0) ## 000001BC diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B971D8.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B971D8.s deleted file mode 100644 index 79864cb066..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B971D8.s +++ /dev/null @@ -1,62 +0,0 @@ -glabel func_80B971D8 -/* 00638 80B971D8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0063C 80B971DC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00640 80B971E0 AFA5001C */ sw $a1, 0x001C($sp) -/* 00644 80B971E4 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 00648 80B971E8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0064C 80B971EC 00021103 */ sra $v0, $v0, 4 -/* 00650 80B971F0 30420003 */ andi $v0, $v0, 0x0003 ## $v0 = 00000000 -/* 00654 80B971F4 5040000A */ beql $v0, $zero, .L80B97220 -/* 00658 80B971F8 908E0161 */ lbu $t6, 0x0161($a0) ## 00000161 -/* 0065C 80B971FC 10410012 */ beq $v0, $at, .L80B97248 -/* 00660 80B97200 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00664 80B97204 10410005 */ beq $v0, $at, .L80B9721C -/* 00668 80B97208 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 0066C 80B9720C 5041001E */ beql $v0, $at, .L80B97288 -/* 00670 80B97210 908A0161 */ lbu $t2, 0x0161($a0) ## 00000161 -/* 00674 80B97214 10000025 */ beq $zero, $zero, .L80B972AC -/* 00678 80B97218 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B9721C: -/* 0067C 80B9721C 908E0161 */ lbu $t6, 0x0161($a0) ## 00000161 -.L80B97220: -/* 00680 80B97220 31CF0002 */ andi $t7, $t6, 0x0002 ## $t7 = 00000000 -/* 00684 80B97224 51E00021 */ beql $t7, $zero, .L80B972AC -/* 00688 80B97228 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0068C 80B9722C 0C2E5CAE */ jal func_80B972B8 -/* 00690 80B97230 AFA40018 */ sw $a0, 0x0018($sp) -/* 00694 80B97234 8FA40018 */ lw $a0, 0x0018($sp) -/* 00698 80B97238 0C2E5B0F */ jal func_80B96C3C -/* 0069C 80B9723C 8FA5001C */ lw $a1, 0x001C($sp) -/* 006A0 80B97240 1000001A */ beq $zero, $zero, .L80B972AC -/* 006A4 80B97244 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B97248: -/* 006A8 80B97248 90980161 */ lbu $t8, 0x0161($a0) ## 00000161 -/* 006AC 80B9724C 33190002 */ andi $t9, $t8, 0x0002 ## $t9 = 00000000 -/* 006B0 80B97250 53200016 */ beql $t9, $zero, .L80B972AC -/* 006B4 80B97254 8FBF0014 */ lw $ra, 0x0014($sp) -/* 006B8 80B97258 908801C2 */ lbu $t0, 0x01C2($a0) ## 000001C2 -/* 006BC 80B9725C 31090002 */ andi $t1, $t0, 0x0002 ## $t1 = 00000000 -/* 006C0 80B97260 55200012 */ bnel $t1, $zero, .L80B972AC -/* 006C4 80B97264 8FBF0014 */ lw $ra, 0x0014($sp) -/* 006C8 80B97268 0C2E5CAE */ jal func_80B972B8 -/* 006CC 80B9726C AFA40018 */ sw $a0, 0x0018($sp) -/* 006D0 80B97270 8FA40018 */ lw $a0, 0x0018($sp) -/* 006D4 80B97274 0C2E5B0F */ jal func_80B96C3C -/* 006D8 80B97278 8FA5001C */ lw $a1, 0x001C($sp) -/* 006DC 80B9727C 1000000B */ beq $zero, $zero, .L80B972AC -/* 006E0 80B97280 8FBF0014 */ lw $ra, 0x0014($sp) -/* 006E4 80B97284 908A0161 */ lbu $t2, 0x0161($a0) ## 00000161 -.L80B97288: -/* 006E8 80B97288 314B0002 */ andi $t3, $t2, 0x0002 ## $t3 = 00000000 -/* 006EC 80B9728C 51600007 */ beql $t3, $zero, .L80B972AC -/* 006F0 80B97290 8FBF0014 */ lw $ra, 0x0014($sp) -/* 006F4 80B97294 0C2E5D8C */ jal func_80B97630 -/* 006F8 80B97298 AFA40018 */ sw $a0, 0x0018($sp) -/* 006FC 80B9729C 8FA40018 */ lw $a0, 0x0018($sp) -/* 00700 80B972A0 0C2E5B0F */ jal func_80B96C3C -/* 00704 80B972A4 8FA5001C */ lw $a1, 0x001C($sp) -/* 00708 80B972A8 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B972AC: -/* 0070C 80B972AC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00710 80B972B0 03E00008 */ jr $ra -/* 00714 80B972B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B972B8.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B972B8.s deleted file mode 100644 index 1bc652b799..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B972B8.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80B972B8 -/* 00718 80B972B8 3C0E80B9 */ lui $t6, %hi(func_80B972D8) ## $t6 = 80B90000 -/* 0071C 80B972BC 25CE72D8 */ addiu $t6, $t6, %lo(func_80B972D8) ## $t6 = 80B972D8 -/* 00720 80B972C0 240F0064 */ addiu $t7, $zero, 0x0064 ## $t7 = 00000064 -/* 00724 80B972C4 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 00728 80B972C8 A48F01B2 */ sh $t7, 0x01B2($a0) ## 000001B2 -/* 0072C 80B972CC A48001B0 */ sh $zero, 0x01B0($a0) ## 000001B0 -/* 00730 80B972D0 03E00008 */ jr $ra -/* 00734 80B972D4 A48001B4 */ sh $zero, 0x01B4($a0) ## 000001B4 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B972D8.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B972D8.s deleted file mode 100644 index 9e4eeab5d3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B972D8.s +++ /dev/null @@ -1,69 +0,0 @@ -glabel func_80B972D8 -/* 00738 80B972D8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0073C 80B972DC AFBF001C */ sw $ra, 0x001C($sp) -/* 00740 80B972E0 AFB00018 */ sw $s0, 0x0018($sp) -/* 00744 80B972E4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00748 80B972E8 0C016C66 */ jal func_8005B198 -/* 0074C 80B972EC AFA50024 */ sw $a1, 0x0024($sp) -/* 00750 80B972F0 920E0002 */ lbu $t6, 0x0002($s0) ## 00000002 -/* 00754 80B972F4 504E0005 */ beql $v0, $t6, .L80B9730C -/* 00758 80B972F8 860301B0 */ lh $v1, 0x01B0($s0) ## 000001B0 -/* 0075C 80B972FC 860F01B2 */ lh $t7, 0x01B2($s0) ## 000001B2 -/* 00760 80B97300 5DE0002D */ bgtzl $t7, .L80B973B8 -/* 00764 80B97304 8FBF001C */ lw $ra, 0x001C($sp) -/* 00768 80B97308 860301B0 */ lh $v1, 0x01B0($s0) ## 000001B0 -.L80B9730C: -/* 0076C 80B9730C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00770 80B97310 54600005 */ bnel $v1, $zero, .L80B97328 -/* 00774 80B97314 24780001 */ addiu $t8, $v1, 0x0001 ## $t8 = 00000001 -/* 00778 80B97318 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0077C 80B9731C 2405286F */ addiu $a1, $zero, 0x286F ## $a1 = 0000286F -/* 00780 80B97320 860301B0 */ lh $v1, 0x01B0($s0) ## 000001B0 -/* 00784 80B97324 24780001 */ addiu $t8, $v1, 0x0001 ## $t8 = 00000001 -.L80B97328: -/* 00788 80B97328 A61801B0 */ sh $t8, 0x01B0($s0) ## 000001B0 -/* 0078C 80B9732C 260401C0 */ addiu $a0, $s0, 0x01C0 ## $a0 = 000001C0 -/* 00790 80B97330 2405FF56 */ addiu $a1, $zero, 0xFF56 ## $a1 = FFFFFF56 -/* 00794 80B97334 0C01DE5F */ jal Math_ApproxS - -/* 00798 80B97338 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 0079C 80B9733C 860301B0 */ lh $v1, 0x01B0($s0) ## 000001B0 -/* 007A0 80B97340 861901BE */ lh $t9, 0x01BE($s0) ## 000001BE -/* 007A4 80B97344 860801C0 */ lh $t0, 0x01C0($s0) ## 000001C0 -/* 007A8 80B97348 00036080 */ sll $t4, $v1, 2 -/* 007AC 80B9734C 01836023 */ subu $t4, $t4, $v1 -/* 007B0 80B97350 000C6080 */ sll $t4, $t4, 2 -/* 007B4 80B97354 00035080 */ sll $t2, $v1, 2 -/* 007B8 80B97358 01435021 */ addu $t2, $t2, $v1 -/* 007BC 80B9735C 01836021 */ addu $t4, $t4, $v1 -/* 007C0 80B97360 000A5180 */ sll $t2, $t2, 6 -/* 007C4 80B97364 000C6140 */ sll $t4, $t4, 5 -/* 007C8 80B97368 254B26C0 */ addiu $t3, $t2, 0x26C0 ## $t3 = 000026C0 -/* 007CC 80B9736C 258D1F40 */ addiu $t5, $t4, 0x1F40 ## $t5 = 00001F40 -/* 007D0 80B97370 28610014 */ slti $at, $v1, 0x0014 -/* 007D4 80B97374 03284821 */ addu $t1, $t9, $t0 -/* 007D8 80B97378 A60901BE */ sh $t1, 0x01BE($s0) ## 000001BE -/* 007DC 80B9737C A60B01B6 */ sh $t3, 0x01B6($s0) ## 000001B6 -/* 007E0 80B97380 14200005 */ bne $at, $zero, .L80B97398 -/* 007E4 80B97384 A60D01B8 */ sh $t5, 0x01B8($s0) ## 000001B8 -/* 007E8 80B97388 0C2E5CF2 */ jal func_80B973C8 -/* 007EC 80B9738C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 007F0 80B97390 10000009 */ beq $zero, $zero, .L80B973B8 -/* 007F4 80B97394 8FBF001C */ lw $ra, 0x001C($sp) -.L80B97398: -/* 007F8 80B97398 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 007FC 80B9739C 14610005 */ bne $v1, $at, .L80B973B4 -/* 00800 80B973A0 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 00804 80B973A4 A60E01B4 */ sh $t6, 0x01B4($s0) ## 000001B4 -/* 00808 80B973A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0080C 80B973AC 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00810 80B973B0 24052815 */ addiu $a1, $zero, 0x2815 ## $a1 = 00002815 -.L80B973B4: -/* 00814 80B973B4 8FBF001C */ lw $ra, 0x001C($sp) -.L80B973B8: -/* 00818 80B973B8 8FB00018 */ lw $s0, 0x0018($sp) -/* 0081C 80B973BC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00820 80B973C0 03E00008 */ jr $ra -/* 00824 80B973C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B973C8.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B973C8.s deleted file mode 100644 index 6ceba63e45..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B973C8.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80B973C8 -/* 00828 80B973C8 24023FC0 */ addiu $v0, $zero, 0x3FC0 ## $v0 = 00003FC0 -/* 0082C 80B973CC 3C0E80B9 */ lui $t6, %hi(func_80B97400) ## $t6 = 80B90000 -/* 00830 80B973D0 25CE7400 */ addiu $t6, $t6, %lo(func_80B97400) ## $t6 = 80B97400 -/* 00834 80B973D4 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 00838 80B973D8 2418FF56 */ addiu $t8, $zero, 0xFF56 ## $t8 = FFFFFF56 -/* 0083C 80B973DC AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 00840 80B973E0 A48F01B4 */ sh $t7, 0x01B4($a0) ## 000001B4 -/* 00844 80B973E4 A48201B6 */ sh $v0, 0x01B6($a0) ## 000001B6 -/* 00848 80B973E8 A48201B8 */ sh $v0, 0x01B8($a0) ## 000001B8 -/* 0084C 80B973EC A48201BA */ sh $v0, 0x01BA($a0) ## 000001BA -/* 00850 80B973F0 A48201BC */ sh $v0, 0x01BC($a0) ## 000001BC -/* 00854 80B973F4 A49801C0 */ sh $t8, 0x01C0($a0) ## 000001C0 -/* 00858 80B973F8 03E00008 */ jr $ra -/* 0085C 80B973FC A48001B0 */ sh $zero, 0x01B0($a0) ## 000001B0 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97400.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97400.s deleted file mode 100644 index 58d48b4e1c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97400.s +++ /dev/null @@ -1,78 +0,0 @@ -glabel func_80B97400 -/* 00860 80B97400 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00864 80B97404 AFBF001C */ sw $ra, 0x001C($sp) -/* 00868 80B97408 AFB00018 */ sw $s0, 0x0018($sp) -/* 0086C 80B9740C 8483001C */ lh $v1, 0x001C($a0) ## 0000001C -/* 00870 80B97410 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00874 80B97414 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 00878 80B97418 00031103 */ sra $v0, $v1, 4 -/* 0087C 80B9741C 30420003 */ andi $v0, $v0, 0x0003 ## $v0 = 00000000 -/* 00880 80B97420 10400008 */ beq $v0, $zero, .L80B97444 -/* 00884 80B97424 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 00888 80B97428 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0088C 80B9742C 1041000E */ beq $v0, $at, .L80B97468 -/* 00890 80B97430 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00894 80B97434 5041001D */ beql $v0, $at, .L80B974AC -/* 00898 80B97438 92080161 */ lbu $t0, 0x0161($s0) ## 00000161 -/* 0089C 80B9743C 1000002E */ beq $zero, $zero, .L80B974F8 -/* 008A0 80B97440 860B01BE */ lh $t3, 0x01BE($s0) ## 000001BE -.L80B97444: -/* 008A4 80B97444 00032A03 */ sra $a1, $v1, 8 -/* 008A8 80B97448 0C00B2D0 */ jal Flags_GetSwitch - -/* 008AC 80B9744C 30A5003F */ andi $a1, $a1, 0x003F ## $a1 = 00000000 -/* 008B0 80B97450 54400029 */ bnel $v0, $zero, .L80B974F8 -/* 008B4 80B97454 860B01BE */ lh $t3, 0x01BE($s0) ## 000001BE -/* 008B8 80B97458 0C2E5D46 */ jal func_80B97518 -/* 008BC 80B9745C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 008C0 80B97460 10000025 */ beq $zero, $zero, .L80B974F8 -/* 008C4 80B97464 860B01BE */ lh $t3, 0x01BE($s0) ## 000001BE -.L80B97468: -/* 008C8 80B97468 920E0161 */ lbu $t6, 0x0161($s0) ## 00000161 -/* 008CC 80B9746C 31CF0002 */ andi $t7, $t6, 0x0002 ## $t7 = 00000000 -/* 008D0 80B97470 51E00021 */ beql $t7, $zero, .L80B974F8 -/* 008D4 80B97474 860B01BE */ lh $t3, 0x01BE($s0) ## 000001BE -/* 008D8 80B97478 921801C2 */ lbu $t8, 0x01C2($s0) ## 000001C2 -/* 008DC 80B9747C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 008E0 80B97480 33190002 */ andi $t9, $t8, 0x0002 ## $t9 = 00000000 -/* 008E4 80B97484 5720001C */ bnel $t9, $zero, .L80B974F8 -/* 008E8 80B97488 860B01BE */ lh $t3, 0x01BE($s0) ## 000001BE -/* 008EC 80B9748C 0C2E5D46 */ jal func_80B97518 -/* 008F0 80B97490 AFA60024 */ sw $a2, 0x0024($sp) -/* 008F4 80B97494 8FA50024 */ lw $a1, 0x0024($sp) -/* 008F8 80B97498 0C2E5B40 */ jal func_80B96D00 -/* 008FC 80B9749C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00900 80B974A0 10000015 */ beq $zero, $zero, .L80B974F8 -/* 00904 80B974A4 860B01BE */ lh $t3, 0x01BE($s0) ## 000001BE -/* 00908 80B974A8 92080161 */ lbu $t0, 0x0161($s0) ## 00000161 -.L80B974AC: -/* 0090C 80B974AC 31090002 */ andi $t1, $t0, 0x0002 ## $t1 = 00000000 -/* 00910 80B974B0 55200010 */ bnel $t1, $zero, .L80B974F4 -/* 00914 80B974B4 A60001B0 */ sh $zero, 0x01B0($s0) ## 000001B0 -/* 00918 80B974B8 860201B0 */ lh $v0, 0x01B0($s0) ## 000001B0 -/* 0091C 80B974BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00920 80B974C0 28410007 */ slti $at, $v0, 0x0007 -/* 00924 80B974C4 14200008 */ bne $at, $zero, .L80B974E8 -/* 00928 80B974C8 244A0001 */ addiu $t2, $v0, 0x0001 ## $t2 = 00000001 -/* 0092C 80B974CC 0C2E5D46 */ jal func_80B97518 -/* 00930 80B974D0 AFA60024 */ sw $a2, 0x0024($sp) -/* 00934 80B974D4 8FA50024 */ lw $a1, 0x0024($sp) -/* 00938 80B974D8 0C2E5B40 */ jal func_80B96D00 -/* 0093C 80B974DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00940 80B974E0 10000005 */ beq $zero, $zero, .L80B974F8 -/* 00944 80B974E4 860B01BE */ lh $t3, 0x01BE($s0) ## 000001BE -.L80B974E8: -/* 00948 80B974E8 10000002 */ beq $zero, $zero, .L80B974F4 -/* 0094C 80B974EC A60A01B0 */ sh $t2, 0x01B0($s0) ## 000001B0 -/* 00950 80B974F0 A60001B0 */ sh $zero, 0x01B0($s0) ## 000001B0 -.L80B974F4: -/* 00954 80B974F4 860B01BE */ lh $t3, 0x01BE($s0) ## 000001BE -.L80B974F8: -/* 00958 80B974F8 860C01C0 */ lh $t4, 0x01C0($s0) ## 000001C0 -/* 0095C 80B974FC 016C6821 */ addu $t5, $t3, $t4 -/* 00960 80B97500 A60D01BE */ sh $t5, 0x01BE($s0) ## 000001BE -/* 00964 80B97504 8FBF001C */ lw $ra, 0x001C($sp) -/* 00968 80B97508 8FB00018 */ lw $s0, 0x0018($sp) -/* 0096C 80B9750C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00970 80B97510 03E00008 */ jr $ra -/* 00974 80B97514 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97518.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97518.s deleted file mode 100644 index c8696de9f3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97518.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80B97518 -/* 00978 80B97518 3C0E80B9 */ lui $t6, %hi(func_80B97540) ## $t6 = 80B90000 -/* 0097C 80B9751C 25CE7540 */ addiu $t6, $t6, %lo(func_80B97540) ## $t6 = 80B97540 -/* 00980 80B97520 240F0064 */ addiu $t7, $zero, 0x0064 ## $t7 = 00000064 -/* 00984 80B97524 24180014 */ addiu $t8, $zero, 0x0014 ## $t8 = 00000014 -/* 00988 80B97528 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 0098C 80B9752C AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 00990 80B97530 A48F01B2 */ sh $t7, 0x01B2($a0) ## 000001B2 -/* 00994 80B97534 A49801B0 */ sh $t8, 0x01B0($a0) ## 000001B0 -/* 00998 80B97538 03E00008 */ jr $ra -/* 0099C 80B9753C A49901B4 */ sh $t9, 0x01B4($a0) ## 000001B4 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97540.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97540.s deleted file mode 100644 index 162a28928f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97540.s +++ /dev/null @@ -1,67 +0,0 @@ -glabel func_80B97540 -/* 009A0 80B97540 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 009A4 80B97544 AFBF0014 */ sw $ra, 0x0014($sp) -/* 009A8 80B97548 AFA5001C */ sw $a1, 0x001C($sp) -/* 009AC 80B9754C 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 009B0 80B97550 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 009B4 80B97554 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 009B8 80B97558 000E7903 */ sra $t7, $t6, 4 -/* 009BC 80B9755C 31F80003 */ andi $t8, $t7, 0x0003 ## $t8 = 00000000 -/* 009C0 80B97560 5701000B */ bnel $t8, $at, .L80B97590 -/* 009C4 80B97564 84E901B0 */ lh $t1, 0x01B0($a3) ## 000001B0 -/* 009C8 80B97568 0C016C66 */ jal func_8005B198 -/* 009CC 80B9756C AFA40018 */ sw $a0, 0x0018($sp) -/* 009D0 80B97570 8FA70018 */ lw $a3, 0x0018($sp) -/* 009D4 80B97574 90F90002 */ lbu $t9, 0x0002($a3) ## 00000002 -/* 009D8 80B97578 50590005 */ beql $v0, $t9, .L80B97590 -/* 009DC 80B9757C 84E901B0 */ lh $t1, 0x01B0($a3) ## 000001B0 -/* 009E0 80B97580 84E801B2 */ lh $t0, 0x01B2($a3) ## 000001B2 -/* 009E4 80B97584 5D000027 */ bgtzl $t0, .L80B97624 -/* 009E8 80B97588 8FBF0014 */ lw $ra, 0x0014($sp) -/* 009EC 80B9758C 84E901B0 */ lh $t1, 0x01B0($a3) ## 000001B0 -.L80B97590: -/* 009F0 80B97590 24E401C0 */ addiu $a0, $a3, 0x01C0 ## $a0 = 000001C0 -/* 009F4 80B97594 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 009F8 80B97598 252AFFFF */ addiu $t2, $t1, 0xFFFF ## $t2 = FFFFFFFF -/* 009FC 80B9759C A4EA01B0 */ sh $t2, 0x01B0($a3) ## 000001B0 -/* 00A00 80B975A0 AFA70018 */ sw $a3, 0x0018($sp) -/* 00A04 80B975A4 0C01DE5F */ jal Math_ApproxS - -/* 00A08 80B975A8 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 00A0C 80B975AC 8FA70018 */ lw $a3, 0x0018($sp) -/* 00A10 80B975B0 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 00A14 80B975B4 84E301B0 */ lh $v1, 0x01B0($a3) ## 000001B0 -/* 00A18 80B975B8 84EB01BE */ lh $t3, 0x01BE($a3) ## 000001BE -/* 00A1C 80B975BC 84EC01C0 */ lh $t4, 0x01C0($a3) ## 000001C0 -/* 00A20 80B975C0 0003C080 */ sll $t8, $v1, 2 -/* 00A24 80B975C4 0303C023 */ subu $t8, $t8, $v1 -/* 00A28 80B975C8 0018C080 */ sll $t8, $t8, 2 -/* 00A2C 80B975CC 00037080 */ sll $t6, $v1, 2 -/* 00A30 80B975D0 01C37021 */ addu $t6, $t6, $v1 -/* 00A34 80B975D4 0303C021 */ addu $t8, $t8, $v1 -/* 00A38 80B975D8 000E7180 */ sll $t6, $t6, 6 -/* 00A3C 80B975DC 0018C140 */ sll $t8, $t8, 5 -/* 00A40 80B975E0 25CF26C0 */ addiu $t7, $t6, 0x26C0 ## $t7 = 000026C0 -/* 00A44 80B975E4 27191F40 */ addiu $t9, $t8, 0x1F40 ## $t9 = 00001F40 -/* 00A48 80B975E8 016C6821 */ addu $t5, $t3, $t4 -/* 00A4C 80B975EC A4ED01BE */ sh $t5, 0x01BE($a3) ## 000001BE -/* 00A50 80B975F0 A4EF01B6 */ sh $t7, 0x01B6($a3) ## 000001B6 -/* 00A54 80B975F4 1C600005 */ bgtz $v1, .L80B9760C -/* 00A58 80B975F8 A4F901B8 */ sh $t9, 0x01B8($a3) ## 000001B8 -/* 00A5C 80B975FC 0C2E5C6A */ jal func_80B971A8 -/* 00A60 80B97600 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00A64 80B97604 10000007 */ beq $zero, $zero, .L80B97624 -/* 00A68 80B97608 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B9760C: -/* 00A6C 80B9760C 14610004 */ bne $v1, $at, .L80B97620 -/* 00A70 80B97610 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00A74 80B97614 A4E001B4 */ sh $zero, 0x01B4($a3) ## 000001B4 -/* 00A78 80B97618 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00A7C 80B9761C 24052815 */ addiu $a1, $zero, 0x2815 ## $a1 = 00002815 -.L80B97620: -/* 00A80 80B97620 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B97624: -/* 00A84 80B97624 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00A88 80B97628 03E00008 */ jr $ra -/* 00A8C 80B9762C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97630.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97630.s deleted file mode 100644 index f61e6fbf7e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97630.s +++ /dev/null @@ -1,7 +0,0 @@ -glabel func_80B97630 -/* 00A90 80B97630 3C0E80B9 */ lui $t6, %hi(func_80B97648) ## $t6 = 80B90000 -/* 00A94 80B97634 25CE7648 */ addiu $t6, $t6, %lo(func_80B97648) ## $t6 = 80B97648 -/* 00A98 80B97638 240F0064 */ addiu $t7, $zero, 0x0064 ## $t7 = 00000064 -/* 00A9C 80B9763C AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 00AA0 80B97640 03E00008 */ jr $ra -/* 00AA4 80B97644 A48F01B2 */ sh $t7, 0x01B2($a0) ## 000001B2 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97648.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97648.s deleted file mode 100644 index 6fb6f8fd72..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97648.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80B97648 -/* 00AA8 80B97648 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00AAC 80B9764C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00AB0 80B97650 AFA5001C */ sw $a1, 0x001C($sp) -/* 00AB4 80B97654 0C016C66 */ jal func_8005B198 -/* 00AB8 80B97658 AFA40018 */ sw $a0, 0x0018($sp) -/* 00ABC 80B9765C 8FA40018 */ lw $a0, 0x0018($sp) -/* 00AC0 80B97660 908E0002 */ lbu $t6, 0x0002($a0) ## 00000002 -/* 00AC4 80B97664 104E0004 */ beq $v0, $t6, .L80B97678 -/* 00AC8 80B97668 00000000 */ nop -/* 00ACC 80B9766C 848F01B2 */ lh $t7, 0x01B2($a0) ## 000001B2 -/* 00AD0 80B97670 5DE00004 */ bgtzl $t7, .L80B97684 -/* 00AD4 80B97674 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B97678: -/* 00AD8 80B97678 0C2E5DA4 */ jal func_80B97690 -/* 00ADC 80B9767C 00000000 */ nop -/* 00AE0 80B97680 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B97684: -/* 00AE4 80B97684 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00AE8 80B97688 03E00008 */ jr $ra -/* 00AEC 80B9768C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97690.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97690.s deleted file mode 100644 index a2b926abf7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97690.s +++ /dev/null @@ -1,7 +0,0 @@ -glabel func_80B97690 -/* 00AF0 80B97690 3C0E80B9 */ lui $t6, %hi(func_80B976A8) ## $t6 = 80B90000 -/* 00AF4 80B97694 25CE76A8 */ addiu $t6, $t6, %lo(func_80B976A8) ## $t6 = 80B976A8 -/* 00AF8 80B97698 240F3FC0 */ addiu $t7, $zero, 0x3FC0 ## $t7 = 00003FC0 -/* 00AFC 80B9769C AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 00B00 80B976A0 03E00008 */ jr $ra -/* 00B04 80B976A4 A48F01BC */ sh $t7, 0x01BC($a0) ## 000001BC diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B976A8.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B976A8.s deleted file mode 100644 index 9f0382c972..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B976A8.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80B976A8 -/* 00B08 80B976A8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00B0C 80B976AC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00B10 80B976B0 848E01BC */ lh $t6, 0x01BC($a0) ## 000001BC -/* 00B14 80B976B4 25CFFF38 */ addiu $t7, $t6, 0xFF38 ## $t7 = FFFFFF38 -/* 00B18 80B976B8 A48F01BC */ sh $t7, 0x01BC($a0) ## 000001BC -/* 00B1C 80B976BC 0C2E5B60 */ jal func_80B96D80 -/* 00B20 80B976C0 AFA40018 */ sw $a0, 0x0018($sp) -/* 00B24 80B976C4 8FA40018 */ lw $a0, 0x0018($sp) -/* 00B28 80B976C8 849801BC */ lh $t8, 0x01BC($a0) ## 000001BC -/* 00B2C 80B976CC 07030004 */ bgezl $t8, .L80B976E0 -/* 00B30 80B976D0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00B34 80B976D4 0C00B55C */ jal Actor_Kill - -/* 00B38 80B976D8 00000000 */ nop -/* 00B3C 80B976DC 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B976E0: -/* 00B40 80B976E0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00B44 80B976E4 03E00008 */ jr $ra -/* 00B48 80B976E8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B977D0.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B977D0.s deleted file mode 100644 index ab20d2551b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B977D0.s +++ /dev/null @@ -1,250 +0,0 @@ -.rdata -glabel D_80B98008 - .asciz "../z_obj_lightswitch.c" - .balign 4 - -glabel D_80B98020 - .asciz "../z_obj_lightswitch.c" - .balign 4 - -glabel D_80B98038 - .asciz "../z_obj_lightswitch.c" - .balign 4 - -glabel D_80B98050 - .asciz "../z_obj_lightswitch.c" - .balign 4 - -glabel D_80B98068 - .asciz "../z_obj_lightswitch.c" - .balign 4 - -.text -glabel func_80B977D0 -/* 00C30 80B977D0 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 00C34 80B977D4 AFBF001C */ sw $ra, 0x001C($sp) -/* 00C38 80B977D8 AFB10018 */ sw $s1, 0x0018($sp) -/* 00C3C 80B977DC AFB00014 */ sw $s0, 0x0014($sp) -/* 00C40 80B977E0 AFA5007C */ sw $a1, 0x007C($sp) -/* 00C44 80B977E4 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 00C48 80B977E8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00C4C 80B977EC 3C0680BA */ lui $a2, %hi(D_80B98008) ## $a2 = 80BA0000 -/* 00C50 80B977F0 24C68008 */ addiu $a2, $a2, %lo(D_80B98008) ## $a2 = 80B98008 -/* 00C54 80B977F4 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFD4 -/* 00C58 80B977F8 24070329 */ addiu $a3, $zero, 0x0329 ## $a3 = 00000329 -/* 00C5C 80B977FC 0C031AB1 */ jal Graph_OpenDisps -/* 00C60 80B97800 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00C64 80B97804 8FAF007C */ lw $t7, 0x007C($sp) -/* 00C68 80B97808 0C024F46 */ jal func_80093D18 -/* 00C6C 80B9780C 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 00C70 80B97810 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 -/* 00C74 80B97814 3C19FB00 */ lui $t9, 0xFB00 ## $t9 = FB000000 -/* 00C78 80B97818 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00C7C 80B9781C 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 00C80 80B97820 AE3802C0 */ sw $t8, 0x02C0($s1) ## 000002C0 -/* 00C84 80B97824 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 00C88 80B97828 860D01B6 */ lh $t5, 0x01B6($s0) ## 000001B6 -/* 00C8C 80B9782C 860801BA */ lh $t0, 0x01BA($s0) ## 000001BA -/* 00C90 80B97830 860901B8 */ lh $t1, 0x01B8($s0) ## 000001B8 -/* 00C94 80B97834 000DC183 */ sra $t8, $t5, 6 -/* 00C98 80B97838 00085183 */ sra $t2, $t0, 6 -/* 00C9C 80B9783C 314B00FF */ andi $t3, $t2, 0x00FF ## $t3 = 00000000 -/* 00CA0 80B97840 0018CE00 */ sll $t9, $t8, 24 -/* 00CA4 80B97844 861801BC */ lh $t8, 0x01BC($s0) ## 000001BC -/* 00CA8 80B97848 000B6200 */ sll $t4, $t3, 8 -/* 00CAC 80B9784C 00095983 */ sra $t3, $t1, 6 -/* 00CB0 80B97850 316D00FF */ andi $t5, $t3, 0x00FF ## $t5 = 00000000 -/* 00CB4 80B97854 01994025 */ or $t0, $t4, $t9 ## $t0 = FB000000 -/* 00CB8 80B97858 000D7400 */ sll $t6, $t5, 16 -/* 00CBC 80B9785C 0018C983 */ sra $t9, $t8, 6 -/* 00CC0 80B97860 332900FF */ andi $t1, $t9, 0x00FF ## $t1 = 00000000 -/* 00CC4 80B97864 010E7825 */ or $t7, $t0, $t6 ## $t7 = FB000000 -/* 00CC8 80B97868 01E95025 */ or $t2, $t7, $t1 ## $t2 = FB000000 -/* 00CCC 80B9786C AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 -/* 00CD0 80B97870 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 -/* 00CD4 80B97874 3C088011 */ lui $t0, %hi(D_80116280+0x10) -/* 00CD8 80B97878 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 -/* 00CDC 80B9787C 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 00CE0 80B97880 AE2B02C0 */ sw $t3, 0x02C0($s1) ## 000002C0 -/* 00CE4 80B97884 35AD0024 */ ori $t5, $t5, 0x0024 ## $t5 = DB060024 -/* 00CE8 80B97888 25086290 */ addiu $t0, %lo(D_80116280+0x10) -/* 00CEC 80B9788C AC480004 */ sw $t0, 0x0004($v0) ## 00000004 -/* 00CF0 80B97890 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 00CF4 80B97894 860E001C */ lh $t6, 0x001C($s0) ## 0000001C -/* 00CF8 80B97898 31D80001 */ andi $t8, $t6, 0x0001 ## $t8 = 00000000 -/* 00CFC 80B9789C 5701001B */ bnel $t8, $at, .L80B9790C -/* 00D00 80B978A0 C6120024 */ lwc1 $f18, 0x0024($s0) ## 00000024 -/* 00D04 80B978A4 8E02011C */ lw $v0, 0x011C($s0) ## 0000011C -/* 00D08 80B978A8 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 00D0C 80B978AC 44814000 */ mtc1 $at, $f8 ## $f8 = 60.00 -/* 00D10 80B978B0 C4440024 */ lwc1 $f4, 0x0024($v0) ## 00000024 -/* 00D14 80B978B4 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFF0 -/* 00D18 80B978B8 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 00D1C 80B978BC E6040024 */ swc1 $f4, 0x0024($s0) ## 00000024 -/* 00D20 80B978C0 C4460028 */ lwc1 $f6, 0x0028($v0) ## 00000028 -/* 00D24 80B978C4 46083280 */ add.s $f10, $f6, $f8 -/* 00D28 80B978C8 E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 -/* 00D2C 80B978CC C450002C */ lwc1 $f16, 0x002C($v0) ## 0000002C -/* 00D30 80B978D0 0C01DF90 */ jal Math_Vec3f_Copy - ## Vec3f_Copy -/* 00D34 80B978D4 E610002C */ swc1 $f16, 0x002C($s0) ## 0000002C -/* 00D38 80B978D8 C7AC0068 */ lwc1 $f12, 0x0068($sp) -/* 00D3C 80B978DC C7AE006C */ lwc1 $f14, 0x006C($sp) -/* 00D40 80B978E0 8FA60070 */ lw $a2, 0x0070($sp) -/* 00D44 80B978E4 0C0345A5 */ jal func_800D1694 -/* 00D48 80B978E8 260700B4 */ addiu $a3, $s0, 0x00B4 ## $a3 = 000000B4 -/* 00D4C 80B978EC C60C0050 */ lwc1 $f12, 0x0050($s0) ## 00000050 -/* 00D50 80B978F0 C60E0054 */ lwc1 $f14, 0x0054($s0) ## 00000054 -/* 00D54 80B978F4 8E060058 */ lw $a2, 0x0058($s0) ## 00000058 -/* 00D58 80B978F8 0C0342A3 */ jal Matrix_Scale -/* 00D5C 80B978FC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00D60 80B97900 1000000C */ beq $zero, $zero, .L80B97934 -/* 00D64 80B97904 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 -/* 00D68 80B97908 C6120024 */ lwc1 $f18, 0x0024($s0) ## 00000024 -.L80B9790C: -/* 00D6C 80B9790C E7B20068 */ swc1 $f18, 0x0068($sp) -/* 00D70 80B97910 C6060054 */ lwc1 $f6, 0x0054($s0) ## 00000054 -/* 00D74 80B97914 C60400BC */ lwc1 $f4, 0x00BC($s0) ## 000000BC -/* 00D78 80B97918 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 -/* 00D7C 80B9791C 46062202 */ mul.s $f8, $f4, $f6 -/* 00D80 80B97920 46085400 */ add.s $f16, $f10, $f8 -/* 00D84 80B97924 E7B0006C */ swc1 $f16, 0x006C($sp) -/* 00D88 80B97928 C612002C */ lwc1 $f18, 0x002C($s0) ## 0000002C -/* 00D8C 80B9792C E7B20070 */ swc1 $f18, 0x0070($sp) -/* 00D90 80B97930 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 -.L80B97934: -/* 00D94 80B97934 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 -/* 00D98 80B97938 37390003 */ ori $t9, $t9, 0x0003 ## $t9 = DA380003 -/* 00D9C 80B9793C 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 00DA0 80B97940 AE2C02C0 */ sw $t4, 0x02C0($s1) ## 000002C0 -/* 00DA4 80B97944 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 00DA8 80B97948 8FAF007C */ lw $t7, 0x007C($sp) -/* 00DAC 80B9794C 3C0580BA */ lui $a1, %hi(D_80B98020) ## $a1 = 80BA0000 -/* 00DB0 80B97950 24A58020 */ addiu $a1, $a1, %lo(D_80B98020) ## $a1 = 80B98020 -/* 00DB4 80B97954 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 00DB8 80B97958 24060349 */ addiu $a2, $zero, 0x0349 ## $a2 = 00000349 -/* 00DBC 80B9795C 0C0346A2 */ jal Matrix_NewMtx -/* 00DC0 80B97960 AFA20040 */ sw $v0, 0x0040($sp) -/* 00DC4 80B97964 8FA30040 */ lw $v1, 0x0040($sp) -/* 00DC8 80B97968 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 -/* 00DCC 80B9796C 354A0020 */ ori $t2, $t2, 0x0020 ## $t2 = DB060020 -/* 00DD0 80B97970 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00DD4 80B97974 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 -/* 00DD8 80B97978 3C0480B9 */ lui $a0, %hi(D_80B97F5C) ## $a0 = 80B90000 -/* 00DDC 80B9797C 3C198016 */ lui $t9, %hi(gSegments) -/* 00DE0 80B97980 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 00DE4 80B97984 AE2902C0 */ sw $t1, 0x02C0($s1) ## 000002C0 -/* 00DE8 80B97988 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 00DEC 80B9798C 860B01B4 */ lh $t3, 0x01B4($s0) ## 000001B4 -/* 00DF0 80B97990 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00DF4 80B97994 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00DF8 80B97998 000B6880 */ sll $t5, $t3, 2 -/* 00DFC 80B9799C 008D2021 */ addu $a0, $a0, $t5 -/* 00E00 80B979A0 8C847F5C */ lw $a0, %lo(D_80B97F5C)($a0) -/* 00E04 80B979A4 3C0D0600 */ lui $t5, 0x0600 ## $t5 = 06000000 -/* 00E08 80B979A8 25AD0260 */ addiu $t5, $t5, 0x0260 ## $t5 = 06000260 -/* 00E0C 80B979AC 00047100 */ sll $t6, $a0, 4 -/* 00E10 80B979B0 000EC702 */ srl $t8, $t6, 28 -/* 00E14 80B979B4 00186080 */ sll $t4, $t8, 2 -/* 00E18 80B979B8 032CC821 */ addu $t9, $t9, $t4 -/* 00E1C 80B979BC 8F396FA8 */ lw $t9, %lo(gSegments)($t9) -/* 00E20 80B979C0 00814024 */ and $t0, $a0, $at -/* 00E24 80B979C4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00E28 80B979C8 01197821 */ addu $t7, $t0, $t9 -/* 00E2C 80B979CC 01E14821 */ addu $t1, $t7, $at -/* 00E30 80B979D0 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 00E34 80B979D4 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 -/* 00E38 80B979D8 3C0BDE00 */ lui $t3, 0xDE00 ## $t3 = DE000000 -/* 00E3C 80B979DC 27A70060 */ addiu $a3, $sp, 0x0060 ## $a3 = FFFFFFE8 -/* 00E40 80B979E0 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 00E44 80B979E4 AE2A02C0 */ sw $t2, 0x02C0($s1) ## 000002C0 -/* 00E48 80B979E8 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 00E4C 80B979EC AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 00E50 80B979F0 860E00B4 */ lh $t6, 0x00B4($s0) ## 000000B4 -/* 00E54 80B979F4 8FA60070 */ lw $a2, 0x0070($sp) -/* 00E58 80B979F8 C7AE006C */ lwc1 $f14, 0x006C($sp) -/* 00E5C 80B979FC A7AE0060 */ sh $t6, 0x0060($sp) -/* 00E60 80B97A00 861800B6 */ lh $t8, 0x00B6($s0) ## 000000B6 -/* 00E64 80B97A04 C7AC0068 */ lwc1 $f12, 0x0068($sp) -/* 00E68 80B97A08 A7B80062 */ sh $t8, 0x0062($sp) -/* 00E6C 80B97A0C 860801BE */ lh $t0, 0x01BE($s0) ## 000001BE -/* 00E70 80B97A10 860C00B8 */ lh $t4, 0x00B8($s0) ## 000000B8 -/* 00E74 80B97A14 0188C821 */ addu $t9, $t4, $t0 -/* 00E78 80B97A18 0C0345A5 */ jal func_800D1694 -/* 00E7C 80B97A1C A7B90064 */ sh $t9, 0x0064($sp) -/* 00E80 80B97A20 C60C0050 */ lwc1 $f12, 0x0050($s0) ## 00000050 -/* 00E84 80B97A24 C60E0054 */ lwc1 $f14, 0x0054($s0) ## 00000054 -/* 00E88 80B97A28 8E060058 */ lw $a2, 0x0058($s0) ## 00000058 -/* 00E8C 80B97A2C 0C0342A3 */ jal Matrix_Scale -/* 00E90 80B97A30 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00E94 80B97A34 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 -/* 00E98 80B97A38 3C09DA38 */ lui $t1, 0xDA38 ## $t1 = DA380000 -/* 00E9C 80B97A3C 35290003 */ ori $t1, $t1, 0x0003 ## $t1 = DA380003 -/* 00EA0 80B97A40 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 00EA4 80B97A44 AE2F02C0 */ sw $t7, 0x02C0($s1) ## 000002C0 -/* 00EA8 80B97A48 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 00EAC 80B97A4C 8FAA007C */ lw $t2, 0x007C($sp) -/* 00EB0 80B97A50 3C0580BA */ lui $a1, %hi(D_80B98038) ## $a1 = 80BA0000 -/* 00EB4 80B97A54 24A58038 */ addiu $a1, $a1, %lo(D_80B98038) ## $a1 = 80B98038 -/* 00EB8 80B97A58 8D440000 */ lw $a0, 0x0000($t2) ## 00000000 -/* 00EBC 80B97A5C 2406035B */ addiu $a2, $zero, 0x035B ## $a2 = 0000035B -/* 00EC0 80B97A60 0C0346A2 */ jal Matrix_NewMtx -/* 00EC4 80B97A64 AFA20034 */ sw $v0, 0x0034($sp) -/* 00EC8 80B97A68 8FA30034 */ lw $v1, 0x0034($sp) -/* 00ECC 80B97A6C 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 -/* 00ED0 80B97A70 25CE0398 */ addiu $t6, $t6, 0x0398 ## $t6 = 06000398 -/* 00ED4 80B97A74 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00ED8 80B97A78 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 -/* 00EDC 80B97A7C 3C0DDE00 */ lui $t5, 0xDE00 ## $t5 = DE000000 -/* 00EE0 80B97A80 27A70060 */ addiu $a3, $sp, 0x0060 ## $a3 = FFFFFFE8 -/* 00EE4 80B97A84 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 00EE8 80B97A88 AE2B02C0 */ sw $t3, 0x02C0($s1) ## 000002C0 -/* 00EEC 80B97A8C AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 00EF0 80B97A90 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 00EF4 80B97A94 860C01BE */ lh $t4, 0x01BE($s0) ## 000001BE -/* 00EF8 80B97A98 861800B8 */ lh $t8, 0x00B8($s0) ## 000000B8 -/* 00EFC 80B97A9C 8FA60070 */ lw $a2, 0x0070($sp) -/* 00F00 80B97AA0 C7AE006C */ lwc1 $f14, 0x006C($sp) -/* 00F04 80B97AA4 030C4023 */ subu $t0, $t8, $t4 -/* 00F08 80B97AA8 A7A80064 */ sh $t0, 0x0064($sp) -/* 00F0C 80B97AAC 0C0345A5 */ jal func_800D1694 -/* 00F10 80B97AB0 C7AC0068 */ lwc1 $f12, 0x0068($sp) -/* 00F14 80B97AB4 C60C0050 */ lwc1 $f12, 0x0050($s0) ## 00000050 -/* 00F18 80B97AB8 C60E0054 */ lwc1 $f14, 0x0054($s0) ## 00000054 -/* 00F1C 80B97ABC 8E060058 */ lw $a2, 0x0058($s0) ## 00000058 -/* 00F20 80B97AC0 0C0342A3 */ jal Matrix_Scale -/* 00F24 80B97AC4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00F28 80B97AC8 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 -/* 00F2C 80B97ACC 3C0FDA38 */ lui $t7, 0xDA38 ## $t7 = DA380000 -/* 00F30 80B97AD0 35EF0003 */ ori $t7, $t7, 0x0003 ## $t7 = DA380003 -/* 00F34 80B97AD4 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 00F38 80B97AD8 AE3902C0 */ sw $t9, 0x02C0($s1) ## 000002C0 -/* 00F3C 80B97ADC AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 00F40 80B97AE0 8FA9007C */ lw $t1, 0x007C($sp) -/* 00F44 80B97AE4 3C0580BA */ lui $a1, %hi(D_80B98050) ## $a1 = 80BA0000 -/* 00F48 80B97AE8 24A58050 */ addiu $a1, $a1, %lo(D_80B98050) ## $a1 = 80B98050 -/* 00F4C 80B97AEC 24060369 */ addiu $a2, $zero, 0x0369 ## $a2 = 00000369 -/* 00F50 80B97AF0 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 00F54 80B97AF4 0C0346A2 */ jal Matrix_NewMtx -/* 00F58 80B97AF8 8D240000 */ lw $a0, 0x0000($t1) ## 00000000 -/* 00F5C 80B97AFC AE020004 */ sw $v0, 0x0004($s0) ## 00000004 -/* 00F60 80B97B00 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 -/* 00F64 80B97B04 3C0D0600 */ lui $t5, 0x0600 ## $t5 = 06000000 -/* 00F68 80B97B08 25AD0408 */ addiu $t5, $t5, 0x0408 ## $t5 = 06000408 -/* 00F6C 80B97B0C 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 00F70 80B97B10 AE2A02C0 */ sw $t2, 0x02C0($s1) ## 000002C0 -/* 00F74 80B97B14 3C0BDE00 */ lui $t3, 0xDE00 ## $t3 = DE000000 -/* 00F78 80B97B18 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 00F7C 80B97B1C AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 00F80 80B97B20 8FAE007C */ lw $t6, 0x007C($sp) -/* 00F84 80B97B24 3C0680BA */ lui $a2, %hi(D_80B98068) ## $a2 = 80BA0000 -/* 00F88 80B97B28 24C68068 */ addiu $a2, $a2, %lo(D_80B98068) ## $a2 = 80B98068 -/* 00F8C 80B97B2C 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFD4 -/* 00F90 80B97B30 2407036E */ addiu $a3, $zero, 0x036E ## $a3 = 0000036E -/* 00F94 80B97B34 0C031AD5 */ jal Graph_CloseDisps -/* 00F98 80B97B38 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 00F9C 80B97B3C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00FA0 80B97B40 8FB00014 */ lw $s0, 0x0014($sp) -/* 00FA4 80B97B44 8FB10018 */ lw $s1, 0x0018($sp) -/* 00FA8 80B97B48 03E00008 */ jr $ra -/* 00FAC 80B97B4C 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97B50.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97B50.s deleted file mode 100644 index 2ea8366104..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97B50.s +++ /dev/null @@ -1,217 +0,0 @@ -.rdata -glabel D_80B98080 - .asciz "../z_obj_lightswitch.c" - .balign 4 - -glabel D_80B98098 - .asciz "../z_obj_lightswitch.c" - .balign 4 - -glabel D_80B980B0 - .asciz "../z_obj_lightswitch.c" - .balign 4 - -glabel D_80B980C8 - .asciz "../z_obj_lightswitch.c" - .balign 4 - -glabel D_80B980E0 - .asciz "../z_obj_lightswitch.c" - .balign 4 - -.text -glabel func_80B97B50 -/* 00FB0 80B97B50 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 00FB4 80B97B54 AFBF001C */ sw $ra, 0x001C($sp) -/* 00FB8 80B97B58 AFB10018 */ sw $s1, 0x0018($sp) -/* 00FBC 80B97B5C AFB00014 */ sw $s0, 0x0014($sp) -/* 00FC0 80B97B60 AFA5007C */ sw $a1, 0x007C($sp) -/* 00FC4 80B97B64 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 00FC8 80B97B68 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00FCC 80B97B6C 3C0680BA */ lui $a2, %hi(D_80B98080) ## $a2 = 80BA0000 -/* 00FD0 80B97B70 24C68080 */ addiu $a2, $a2, %lo(D_80B98080) ## $a2 = 80B98080 -/* 00FD4 80B97B74 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFD4 -/* 00FD8 80B97B78 2407037A */ addiu $a3, $zero, 0x037A ## $a3 = 0000037A -/* 00FDC 80B97B7C 0C031AB1 */ jal Graph_OpenDisps -/* 00FE0 80B97B80 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00FE4 80B97B84 8FAF007C */ lw $t7, 0x007C($sp) -/* 00FE8 80B97B88 0C024F61 */ jal func_80093D84 -/* 00FEC 80B97B8C 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 00FF0 80B97B90 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 00FF4 80B97B94 3C19FB00 */ lui $t9, 0xFB00 ## $t9 = FB000000 -/* 00FF8 80B97B98 3C0580BA */ lui $a1, %hi(D_80B98098) ## $a1 = 80BA0000 -/* 00FFC 80B97B9C 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 01000 80B97BA0 AE3802D0 */ sw $t8, 0x02D0($s1) ## 000002D0 -/* 01004 80B97BA4 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 01008 80B97BA8 860D01B6 */ lh $t5, 0x01B6($s0) ## 000001B6 -/* 0100C 80B97BAC 860801BA */ lh $t0, 0x01BA($s0) ## 000001BA -/* 01010 80B97BB0 860901B8 */ lh $t1, 0x01B8($s0) ## 000001B8 -/* 01014 80B97BB4 000DC183 */ sra $t8, $t5, 6 -/* 01018 80B97BB8 00085183 */ sra $t2, $t0, 6 -/* 0101C 80B97BBC 314B00FF */ andi $t3, $t2, 0x00FF ## $t3 = 00000000 -/* 01020 80B97BC0 0018CE00 */ sll $t9, $t8, 24 -/* 01024 80B97BC4 861801BC */ lh $t8, 0x01BC($s0) ## 000001BC -/* 01028 80B97BC8 000B6200 */ sll $t4, $t3, 8 -/* 0102C 80B97BCC 00095983 */ sra $t3, $t1, 6 -/* 01030 80B97BD0 316D00FF */ andi $t5, $t3, 0x00FF ## $t5 = 00000000 -/* 01034 80B97BD4 01994025 */ or $t0, $t4, $t9 ## $t0 = FB000000 -/* 01038 80B97BD8 000D7400 */ sll $t6, $t5, 16 -/* 0103C 80B97BDC 0018C983 */ sra $t9, $t8, 6 -/* 01040 80B97BE0 332900FF */ andi $t1, $t9, 0x00FF ## $t1 = 00000000 -/* 01044 80B97BE4 010E7825 */ or $t7, $t0, $t6 ## $t7 = FB000000 -/* 01048 80B97BE8 01E95025 */ or $t2, $t7, $t1 ## $t2 = FB000000 -/* 0104C 80B97BEC AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 -/* 01050 80B97BF0 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 01054 80B97BF4 3C088011 */ lui $t0, %hi(D_80116280) -/* 01058 80B97BF8 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 -/* 0105C 80B97BFC 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 01060 80B97C00 AE2B02D0 */ sw $t3, 0x02D0($s1) ## 000002D0 -/* 01064 80B97C04 35AD0024 */ ori $t5, $t5, 0x0024 ## $t5 = DB060024 -/* 01068 80B97C08 25086280 */ addiu $t0, %lo(D_80116280) -/* 0106C 80B97C0C AC480004 */ sw $t0, 0x0004($v0) ## 00000004 -/* 01070 80B97C10 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 01074 80B97C14 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 01078 80B97C18 3C18DA38 */ lui $t8, 0xDA38 ## $t8 = DA380000 -/* 0107C 80B97C1C 37180003 */ ori $t8, $t8, 0x0003 ## $t8 = DA380003 -/* 01080 80B97C20 E7A40068 */ swc1 $f4, 0x0068($sp) -/* 01084 80B97C24 C6080054 */ lwc1 $f8, 0x0054($s0) ## 00000054 -/* 01088 80B97C28 C60600BC */ lwc1 $f6, 0x00BC($s0) ## 000000BC -/* 0108C 80B97C2C C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 01090 80B97C30 24A58098 */ addiu $a1, $a1, %lo(D_80B98098) ## $a1 = 80B98098 -/* 01094 80B97C34 46083282 */ mul.s $f10, $f6, $f8 -/* 01098 80B97C38 24060390 */ addiu $a2, $zero, 0x0390 ## $a2 = 00000390 -/* 0109C 80B97C3C 460A8480 */ add.s $f18, $f16, $f10 -/* 010A0 80B97C40 E7B2006C */ swc1 $f18, 0x006C($sp) -/* 010A4 80B97C44 C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C -/* 010A8 80B97C48 E7A40070 */ swc1 $f4, 0x0070($sp) -/* 010AC 80B97C4C 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 010B0 80B97C50 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 010B4 80B97C54 AE2E02D0 */ sw $t6, 0x02D0($s1) ## 000002D0 -/* 010B8 80B97C58 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 010BC 80B97C5C 8FAC007C */ lw $t4, 0x007C($sp) -/* 010C0 80B97C60 8D840000 */ lw $a0, 0x0000($t4) ## 00000000 -/* 010C4 80B97C64 0C0346A2 */ jal Matrix_NewMtx -/* 010C8 80B97C68 AFA20040 */ sw $v0, 0x0040($sp) -/* 010CC 80B97C6C 8FA30040 */ lw $v1, 0x0040($sp) -/* 010D0 80B97C70 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 010D4 80B97C74 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 -/* 010D8 80B97C78 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 010DC 80B97C7C 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 010E0 80B97C80 3C0480B9 */ lui $a0, %hi(D_80B97F5C) ## $a0 = 80B90000 -/* 010E4 80B97C84 3C188016 */ lui $t8, %hi(gSegments) -/* 010E8 80B97C88 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 010EC 80B97C8C AE3902D0 */ sw $t9, 0x02D0($s1) ## 000002D0 -/* 010F0 80B97C90 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 010F4 80B97C94 860901B4 */ lh $t1, 0x01B4($s0) ## 000001B4 -/* 010F8 80B97C98 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 010FC 80B97C9C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 01100 80B97CA0 00095080 */ sll $t2, $t1, 2 -/* 01104 80B97CA4 008A2021 */ addu $a0, $a0, $t2 -/* 01108 80B97CA8 8C847F5C */ lw $a0, %lo(D_80B97F5C)($a0) -/* 0110C 80B97CAC 3C0A0600 */ lui $t2, 0x0600 ## $t2 = 06000000 -/* 01110 80B97CB0 254A0260 */ addiu $t2, $t2, 0x0260 ## $t2 = 06000260 -/* 01114 80B97CB4 00046900 */ sll $t5, $a0, 4 -/* 01118 80B97CB8 000D4702 */ srl $t0, $t5, 28 -/* 0111C 80B97CBC 00087080 */ sll $t6, $t0, 2 -/* 01120 80B97CC0 030EC021 */ addu $t8, $t8, $t6 -/* 01124 80B97CC4 8F186FA8 */ lw $t8, %lo(gSegments)($t8) -/* 01128 80B97CC8 00815824 */ and $t3, $a0, $at -/* 0112C 80B97CCC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01130 80B97CD0 01786021 */ addu $t4, $t3, $t8 -/* 01134 80B97CD4 0181C821 */ addu $t9, $t4, $at -/* 01138 80B97CD8 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 0113C 80B97CDC 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 01140 80B97CE0 3C09DE00 */ lui $t1, 0xDE00 ## $t1 = DE000000 -/* 01144 80B97CE4 27A70060 */ addiu $a3, $sp, 0x0060 ## $a3 = FFFFFFE8 -/* 01148 80B97CE8 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 0114C 80B97CEC AE2F02D0 */ sw $t7, 0x02D0($s1) ## 000002D0 -/* 01150 80B97CF0 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 -/* 01154 80B97CF4 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 01158 80B97CF8 860D00B4 */ lh $t5, 0x00B4($s0) ## 000000B4 -/* 0115C 80B97CFC 8FA60070 */ lw $a2, 0x0070($sp) -/* 01160 80B97D00 C7AE006C */ lwc1 $f14, 0x006C($sp) -/* 01164 80B97D04 A7AD0060 */ sh $t5, 0x0060($sp) -/* 01168 80B97D08 860800B6 */ lh $t0, 0x00B6($s0) ## 000000B6 -/* 0116C 80B97D0C C7AC0068 */ lwc1 $f12, 0x0068($sp) -/* 01170 80B97D10 A7A80062 */ sh $t0, 0x0062($sp) -/* 01174 80B97D14 860B01BE */ lh $t3, 0x01BE($s0) ## 000001BE -/* 01178 80B97D18 860E00B8 */ lh $t6, 0x00B8($s0) ## 000000B8 -/* 0117C 80B97D1C 01CBC021 */ addu $t8, $t6, $t3 -/* 01180 80B97D20 0C0345A5 */ jal func_800D1694 -/* 01184 80B97D24 A7B80064 */ sh $t8, 0x0064($sp) -/* 01188 80B97D28 C60C0050 */ lwc1 $f12, 0x0050($s0) ## 00000050 -/* 0118C 80B97D2C C60E0054 */ lwc1 $f14, 0x0054($s0) ## 00000054 -/* 01190 80B97D30 8E060058 */ lw $a2, 0x0058($s0) ## 00000058 -/* 01194 80B97D34 0C0342A3 */ jal Matrix_Scale -/* 01198 80B97D38 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0119C 80B97D3C 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 011A0 80B97D40 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 -/* 011A4 80B97D44 37390003 */ ori $t9, $t9, 0x0003 ## $t9 = DA380003 -/* 011A8 80B97D48 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 011AC 80B97D4C AE2C02D0 */ sw $t4, 0x02D0($s1) ## 000002D0 -/* 011B0 80B97D50 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 011B4 80B97D54 8FAF007C */ lw $t7, 0x007C($sp) -/* 011B8 80B97D58 3C0580BA */ lui $a1, %hi(D_80B980B0) ## $a1 = 80BA0000 -/* 011BC 80B97D5C 24A580B0 */ addiu $a1, $a1, %lo(D_80B980B0) ## $a1 = 80B980B0 -/* 011C0 80B97D60 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 011C4 80B97D64 240603A2 */ addiu $a2, $zero, 0x03A2 ## $a2 = 000003A2 -/* 011C8 80B97D68 0C0346A2 */ jal Matrix_NewMtx -/* 011CC 80B97D6C AFA20034 */ sw $v0, 0x0034($sp) -/* 011D0 80B97D70 8FA30034 */ lw $v1, 0x0034($sp) -/* 011D4 80B97D74 3C0D0600 */ lui $t5, 0x0600 ## $t5 = 06000000 -/* 011D8 80B97D78 25AD0398 */ addiu $t5, $t5, 0x0398 ## $t5 = 06000398 -/* 011DC 80B97D7C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 011E0 80B97D80 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 011E4 80B97D84 3C0ADE00 */ lui $t2, 0xDE00 ## $t2 = DE000000 -/* 011E8 80B97D88 27A70060 */ addiu $a3, $sp, 0x0060 ## $a3 = FFFFFFE8 -/* 011EC 80B97D8C 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 011F0 80B97D90 AE2902D0 */ sw $t1, 0x02D0($s1) ## 000002D0 -/* 011F4 80B97D94 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 011F8 80B97D98 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 011FC 80B97D9C 860E01BE */ lh $t6, 0x01BE($s0) ## 000001BE -/* 01200 80B97DA0 860800B8 */ lh $t0, 0x00B8($s0) ## 000000B8 -/* 01204 80B97DA4 8FA60070 */ lw $a2, 0x0070($sp) -/* 01208 80B97DA8 C7AE006C */ lwc1 $f14, 0x006C($sp) -/* 0120C 80B97DAC 010E5823 */ subu $t3, $t0, $t6 -/* 01210 80B97DB0 A7AB0064 */ sh $t3, 0x0064($sp) -/* 01214 80B97DB4 0C0345A5 */ jal func_800D1694 -/* 01218 80B97DB8 C7AC0068 */ lwc1 $f12, 0x0068($sp) -/* 0121C 80B97DBC C60C0050 */ lwc1 $f12, 0x0050($s0) ## 00000050 -/* 01220 80B97DC0 C60E0054 */ lwc1 $f14, 0x0054($s0) ## 00000054 -/* 01224 80B97DC4 8E060058 */ lw $a2, 0x0058($s0) ## 00000058 -/* 01228 80B97DC8 0C0342A3 */ jal Matrix_Scale -/* 0122C 80B97DCC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01230 80B97DD0 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 01234 80B97DD4 3C0CDA38 */ lui $t4, 0xDA38 ## $t4 = DA380000 -/* 01238 80B97DD8 358C0003 */ ori $t4, $t4, 0x0003 ## $t4 = DA380003 -/* 0123C 80B97DDC 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 01240 80B97DE0 AE3802D0 */ sw $t8, 0x02D0($s1) ## 000002D0 -/* 01244 80B97DE4 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 01248 80B97DE8 8FB9007C */ lw $t9, 0x007C($sp) -/* 0124C 80B97DEC 3C0580BA */ lui $a1, %hi(D_80B980C8) ## $a1 = 80BA0000 -/* 01250 80B97DF0 24A580C8 */ addiu $a1, $a1, %lo(D_80B980C8) ## $a1 = 80B980C8 -/* 01254 80B97DF4 240603B0 */ addiu $a2, $zero, 0x03B0 ## $a2 = 000003B0 -/* 01258 80B97DF8 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 0125C 80B97DFC 0C0346A2 */ jal Matrix_NewMtx -/* 01260 80B97E00 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 -/* 01264 80B97E04 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 -/* 01268 80B97E08 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 0126C 80B97E0C 3C0A0600 */ lui $t2, 0x0600 ## $t2 = 06000000 -/* 01270 80B97E10 254A0408 */ addiu $t2, $t2, 0x0408 ## $t2 = 06000408 -/* 01274 80B97E14 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 01278 80B97E18 AE2F02D0 */ sw $t7, 0x02D0($s1) ## 000002D0 -/* 0127C 80B97E1C 3C09DE00 */ lui $t1, 0xDE00 ## $t1 = DE000000 -/* 01280 80B97E20 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 01284 80B97E24 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 -/* 01288 80B97E28 8FAD007C */ lw $t5, 0x007C($sp) -/* 0128C 80B97E2C 3C0680BA */ lui $a2, %hi(D_80B980E0) ## $a2 = 80BA0000 -/* 01290 80B97E30 24C680E0 */ addiu $a2, $a2, %lo(D_80B980E0) ## $a2 = 80B980E0 -/* 01294 80B97E34 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFD4 -/* 01298 80B97E38 240703B5 */ addiu $a3, $zero, 0x03B5 ## $a3 = 000003B5 -/* 0129C 80B97E3C 0C031AD5 */ jal Graph_CloseDisps -/* 012A0 80B97E40 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 -/* 012A4 80B97E44 8FBF001C */ lw $ra, 0x001C($sp) -/* 012A8 80B97E48 8FB00014 */ lw $s0, 0x0014($sp) -/* 012AC 80B97E4C 8FB10018 */ lw $s1, 0x0018($sp) -/* 012B0 80B97E50 03E00008 */ jr $ra -/* 012B4 80B97E54 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 diff --git a/data/overlays/actors/z_bg_mizu_water.data.s b/data/overlays/actors/z_bg_mizu_water.data.s deleted file mode 100644 index 0adc3b63de..0000000000 --- a/data/overlays/actors/z_bg_mizu_water.data.s +++ /dev/null @@ -1,27 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel D_808A0510 - .word 0x00000000 -glabel D_808A0514 - .word 0x00000000, 0x0000001E, 0x00000000, 0x0000001D, 0xFFFFFEC0, 0x0000001C, 0xFFFFFCF4 -glabel Bg_Mizu_Water_InitVars - .word 0x00650100, 0x00000030, 0x00590000, 0x00000160 -.word BgMizuWater_Init -.word BgMizuWater_Destroy -.word BgMizuWater_Update -.word BgMizuWater_Draw -.word 0x00000000, 0x42DC0000 -glabel D_808A0558 - .word 0x00000002, 0x00000003, 0x00000005, 0x00000007, 0x0000000C, 0x00000014, 0x00000015, 0x00000016 -glabel D_808A0578 - .word 0x40500001, 0x00000000 - diff --git a/data/overlays/actors/z_bg_mizu_water.reloc.s b/data/overlays/actors/z_bg_mizu_water.reloc.s deleted file mode 100644 index 9f5ea8caa6..0000000000 --- a/data/overlays/actors/z_bg_mizu_water.reloc.s +++ /dev/null @@ -1,13 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_808A0640 - .incbin "baserom/ovl_Bg_Mizu_Water", 0xD90, 0x00000140 diff --git a/data/overlays/actors/z_bg_mori_bigst.data.s b/data/overlays/actors/z_bg_mori_bigst.data.s deleted file mode 100644 index d3eca92e46..0000000000 --- a/data/overlays/actors/z_bg_mori_bigst.data.s +++ /dev/null @@ -1,20 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel Bg_Mori_Bigst_InitVars - .word 0x00860100, 0x00000010, 0x00720000, 0x0000016C -.word BgMoriBigst_Init -.word BgMoriBigst_Destroy -.word BgMoriBigst_Update -.word 0x00000000 -glabel D_808A14E0 - .word 0xB0F40BB8, 0xB0F80BB8, 0xB0FC0BB8, 0xB86CFE0C, 0xB870D120, 0x485003E8, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_bg_mori_bigst.reloc.s b/data/overlays/actors/z_bg_mori_bigst.reloc.s deleted file mode 100644 index 838fda448f..0000000000 --- a/data/overlays/actors/z_bg_mori_bigst.reloc.s +++ /dev/null @@ -1,13 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_808A16D0 - .incbin "baserom/ovl_Bg_Mori_Bigst", 0xB10, 0x00000130 diff --git a/data/overlays/actors/z_bg_mori_hashira4.bss.s b/data/overlays/actors/z_bg_mori_hashira4.bss.s deleted file mode 100644 index 7adb98b07a..0000000000 --- a/data/overlays/actors/z_bg_mori_hashira4.bss.s +++ /dev/null @@ -1,14 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .bss - -.balign 16 - -glabel D_808A37C0 - .space 0x10 - diff --git a/data/overlays/actors/z_bg_mori_hashira4.data.s b/data/overlays/actors/z_bg_mori_hashira4.data.s deleted file mode 100644 index d56b0c18cd..0000000000 --- a/data/overlays/actors/z_bg_mori_hashira4.data.s +++ /dev/null @@ -1,22 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel Bg_Mori_Hashira4_InitVars - .word 0x00E30100, 0x00000010, 0x00720000, 0x0000016C -.word BgMoriHashira4_Init -.word BgMoriHashira4_Destroy -.word BgMoriHashira4_Update -.word 0x00000000 -glabel D_808A35C0 - .word 0xB0F403E8, 0xB0F802BC, 0xB0FC03E8, 0x485003E8 -glabel D_808A35D0 - .word 0x06001300, 0x06008840, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_bg_mori_hashira4.reloc.s b/data/overlays/actors/z_bg_mori_hashira4.reloc.s deleted file mode 100644 index 5b20e6a168..0000000000 --- a/data/overlays/actors/z_bg_mori_hashira4.reloc.s +++ /dev/null @@ -1,13 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_808A36F0 - .incbin "baserom/ovl_Bg_Mori_Hashira4", 0x690, 0x000000D0 diff --git a/data/overlays/actors/z_bg_spot15_rrbox.data.s b/data/overlays/actors/z_bg_spot15_rrbox.data.s deleted file mode 100644 index 62927bed7f..0000000000 --- a/data/overlays/actors/z_bg_spot15_rrbox.data.s +++ /dev/null @@ -1,28 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel D_808B4590 - .word 0x00000000 -glabel Bg_Spot15_Rrbox_InitVars - .word 0x01070100, 0x00000000, 0x00F00000, 0x00000184 -.word BgSpot15Rrbox_Init -.word BgSpot15Rrbox_Destroy -.word BgSpot15Rrbox_Update -.word BgSpot15Rrbox_Draw -glabel D_808B45B4 - .word 0xC8500064, 0xB0F403E8, 0xB0F801F4, 0x30FC03E8 -glabel D_808B45C4 - .word 0x44408000, 0x44BA4000, 0xC3958000, 0x44408000, 0x44C1C000, 0xC3958000 -glabel D_808B45DC - .word 0x41EFEB85, 0x3C23D70A, 0xC1EFEB85, 0xC1EFEB85, 0x3C23D70A, 0xC1EFEB85, 0xC1EFEB85, 0x3C23D70A, 0x41EFEB85, 0x41EFEB85, 0x3C23D70A, 0x41EFEB85, 0x00000000, 0x3C23D70A, 0x00000000 -glabel D_808B4618 - .word 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_bg_spot15_rrbox.reloc.s b/data/overlays/actors/z_bg_spot15_rrbox.reloc.s deleted file mode 100644 index cab1a65dce..0000000000 --- a/data/overlays/actors/z_bg_spot15_rrbox.reloc.s +++ /dev/null @@ -1,13 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_808B4710 - .incbin "baserom/ovl_Bg_Spot15_Rrbox", 0xDB0, 0x00000140 diff --git a/data/overlays/actors/z_bg_spot16_bombstone.data.s b/data/overlays/actors/z_bg_spot16_bombstone.data.s deleted file mode 100644 index bd80e9b054..0000000000 --- a/data/overlays/actors/z_bg_spot16_bombstone.data.s +++ /dev/null @@ -1,47 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel D_808B5DD0 - .word 0x00000000 -glabel D_808B5DD4 - .word 0x00000000 -glabel D_808B5DD8 - .word 0x00080004, 0x004607D0, 0xFCE00000, 0x00640000, 0x00000000, 0x00060003, 0x003200C8, 0x0A28C350, 0x005A0000, 0x00000000, 0x00050003, 0x0028F63C, 0x019030B0, 0x00320000, 0x00000000, 0x00030001, 0x003C0258, 0xFF9CAFC8, 0x00320000, 0x00000000, 0x00030001, 0x0028F2B8, 0xFF9C6590, 0x001E0000, 0x00000000, 0x00060009, 0x00280000, 0x0BB8D8F0, 0x001E0000, 0x00000000 -glabel D_808B5E50 - .word 0x00000000, 0x00000000, 0x00000000, 0x4FC1FFF6, 0x00000000, 0x00010100, 0x00000000, 0x00320000, 0x01200064 -glabel D_808B5E74 - .word 0x0C000D39, 0x20000000, 0x00000001 -.word D_808B5E50 -glabel D_808B5E84 - .word 0x0A000900, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000000, 0x00010000, 0x00BE0050, 0x0000000A, 0x00000032 -glabel D_808B5EB0 - .word 0x0000000A, 0x003CFFF6, 0x010401E0, 0x00070000, 0x00000032, 0x00000104, 0x017C000D, 0x0001001E, 0x00140014, 0x00A00104, 0x000A0002, 0x00140028, 0x001400C8, 0x00960007, 0x0003FFD8, 0x0064001E, 0x00D20064, 0x00070004, 0x000A0078, 0x000A00A0, 0x0028000A, 0x0005FFA7, 0x006E0041, 0x00960118, 0x00070006, 0xFFC40070, 0x006D006E, 0x00820007, 0x0007FFF2, 0x0050007F, 0x008C00D2, 0x00070008, 0x00140032, 0x001E008C, 0x00C80007, 0x0009FFEC, 0x00140028, 0x00C800B4, 0x0007000A, 0x001E0028, 0xFFE20064, 0x00780007, 0x000AFF92, 0x001D0078, 0x008C0118, 0x000A000B, 0x001E0014, 0x001E0050, 0x00C80006, 0x000C0028, 0x001EFFE2, 0x00AA010E, 0x0011000D, 0xFFD80032, 0xFFEC008C, 0x00560006, 0x000D0032, 0x00320032, 0x009600C8, 0x000A000E, 0x00280028, 0xFFD8003C, 0x00A00006, 0x000FFFE2, 0x00140032, 0x00AA012C, 0x00060010, 0x00280032, 0x001400AA, 0x00780007, 0x0010001E, 0x0032003C, 0x009600C8, 0x00060011, 0x000A000A, 0x00000082, 0x00DC0006, 0x0012000A, 0x00280014, 0x00B400DC, 0x000B0013, 0x000A0005, 0x0000006E, 0x00460011, 0x0013FFEC, 0x0032FFE2, 0x009600C8, 0x00060014, 0x00500032, 0x00000096, 0x00C80008 -glabel Bg_Spot16_Bombstone_InitVars - .word 0x00CD0600, 0x00000010, 0x00C20000, 0x00000218 -.word BgSpot16Bombstone_Init -.word BgSpot16Bombstone_Destroy -.word BgSpot16Bombstone_Update -.word BgSpot16Bombstone_Draw -glabel D_808B603C - .word 0xB0F407D0, 0xB0F801F4, 0x30FC03E8 -glabel D_808B6048 - .word 0xB06CFFFF, 0xB070FFF6, 0xB0F403E8, 0xB0F800C8, 0x30FC03E8 -glabel D_808B605C - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_808B6068 - .word 0x00000000, 0x3ECCCCCD, 0x00000000 -glabel D_808B6074 - .word 0x42840000, 0x424C0000, 0x42400000, 0x42100000, 0x41A80000 -glabel D_808B6088 - .byte 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x04 -glabel D_808B6092 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - diff --git a/data/overlays/actors/z_bg_spot16_bombstone.reloc.s b/data/overlays/actors/z_bg_spot16_bombstone.reloc.s deleted file mode 100644 index 43b1ea5275..0000000000 --- a/data/overlays/actors/z_bg_spot16_bombstone.reloc.s +++ /dev/null @@ -1,13 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_808B6270 - .incbin "baserom/ovl_Bg_Spot16_Bombstone", 0x1640, 0x000001D0 diff --git a/data/overlays/actors/z_demo_shd.data.s b/data/overlays/actors/z_demo_shd.data.s deleted file mode 100644 index b21e93bbe2..0000000000 --- a/data/overlays/actors/z_demo_shd.data.s +++ /dev/null @@ -1,68 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel Demo_Shd_InitVars - .word 0x01190700, 0x00000030, 0x00010000, 0x00000154 -.word DemoShd_Init -.word DemoShd_Destroy -.word DemoShd_Update -.word DemoShd_Draw -glabel D_80991680 - .word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000005, 0x08000000, 0x00000000, 0x00000000, 0x00000524, 0x31090000, 0x00000000, 0x00000000, 0x00041443, 0x4C120001, 0x03000000, 0x00000500, 0x072D5D88, 0x7C37100D, 0x12030000, 0x00051808, 0x2479B9D7, 0xC37C4C3A, 0x2C060000, 0x00051A0D, 0x4ABEF1FC, 0xEEAE8D79, 0x4B0A0000, 0x00041612, 0x68E0FEFF, 0xF5BBB8B6, 0x6D100000, 0x00031423, 0x84EEFFFF, 0xF4C4D1DB, 0x8A1D0300, 0x00041C3C, 0xA0F4FFFE, 0xF1DAE7E9, 0x93200400, 0x00083154, 0xB6F7FFFA, 0xF4F7FBEA, 0x84140100, 0x000C4767, 0xC3F9FCEA, 0xEAFCFFED, 0x7C0F0200, 0x000D4E77, 0xCCFAFBE5, 0xE3FAFFEE, 0x7D0F0200, 0x000A3F83, 0xD6FBFEF0, 0xE4F6FEF0, 0x84110200, 0x00052688, 0xE5FDFDF0, 0xE6F9FFEF, 0x7F100200, 0x0002147E, 0xECFFFCE6, 0xDFFAFFEC, 0x710E0200, 0x00020C65, 0xE2FEFAD9, 0xCFF7FFEA, 0x660B0200, 0x00020953, 0xD2FBFADA, 0xC9F5FFEB, 0x6B0D0200, 0x00020951, 0xCBFAFAE0, 0xD4F6FFED, 0x750F0200, 0x00020C5C, 0xD4FAF1E2, 0xEBFCFFEB, 0x740F0100, 0x00010B60, 0xDEF8DDD7, 0xF6FFFEE9, 0x690D0100, 0x00010B60, 0xE2F8D7CF, 0xF1FDFFE9, 0x5F0A0100, 0x00000C63, 0xDAFAE6D4, 0xE1F1FDE7, 0x5B0A0000, 0x00000C5F, 0xC6F8F8E1, 0xDAE9FAD9, 0x52090000, 0x00000B59, 0xB4F0FBE0, 0xD1DDF4C0, 0x44070000, 0x00000A54, 0xAFEFF3C6, 0xBBC0EDB0, 0x40070000, 0x00000B57, 0xB1E8DAA4, 0xA092DCA6, 0x45080000, 0x00000C5A, 0xAEDAB480, 0x8C68BF92, 0x40080000, 0x00000C52, 0xA2C99264, 0x814FA06F, 0x23030000, 0x00010F48, 0x97BC7B4A, 0x75459760, 0x0F000000, 0x00010E41, 0x95B46B36, 0x683E9663, 0x0D000000, 0x00000941, 0x9AAD602B, 0x5A328C64, 0x0E000000, 0x00000841, 0x989E5524, 0x54347951, 0x0B000000, 0x0000073D, 0x88834C22, 0x4F3D6330, 0x07000000, 0x0000073B, 0x73624726, 0x463E4B17, 0x0B010000, 0x00000941, 0x6748482C, 0x392A3413, 0x1C050000, 0x00000A46, 0x5D303B2E, 0x3310211B, 0x2D070000, 0x00000941, 0x4B131B2C, 0x3F0D1821, 0x33080000, 0x0000093F, 0x4109092D, 0x490D0C20, 0x32080000, 0x00000A43, 0x3F09062C, 0x450B061E, 0x2B070000, 0x00000B47, 0x410A0722, 0x3108081E, 0x20040000, 0x00000838, 0x35090C19, 0x21050920, 0x20040000, 0x00000522, 0x1F060B0A, 0x1B04061E, 0x29060000, 0x00000313, 0x0B020608, 0x28070319, 0x34090000, 0x0000020E, 0x03000108, 0x2F080214, 0x2F090000, 0x0000020D, 0x03000007, 0x2407020C, 0x0B000000, 0x00000311, 0x06010001, 0x0D010413, 0x04000000, 0x0000051C, 0x0B010001, 0x0801020C, 0x02000000, 0x00000623, 0x0D010003, 0x12030002, 0x00000000, 0x0000051D, 0x0A010005, 0x1B050000, 0x00000000, 0x0000020C, 0x03000005, 0x18050000, 0x00000000, 0x00000002, 0x00000000, 0x05000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 -glabel D_80991E80 - .word 0x2F3E56AB, 0xA4582102, 0x10417AB0, 0x805C312A, 0x32376DD4, 0xA2633907, 0x0B387DA2, 0x6D81470C, 0x3C5C60AC, 0xA5571801, 0x154C97B9, 0x68533236, 0x304276D6, 0x9B533108, 0x154A96B7, 0x7C9B400B, 0x3E756FAE, 0xAF5D1301, 0x1D59B4BF, 0x53432C38, 0x2F487DCC, 0x8A4A2406, 0x1F5DB0C8, 0x90B55110, 0x408B7FAA, 0xB76D1503, 0x286ACCBE, 0x43312030, 0x2B4C82BA, 0x77431607, 0x2B70C7D5, 0xA6B95B13, 0x409C93A6, 0xB87D1D08, 0x367FE1C1, 0x3C261629, 0x2A508AAB, 0x69410C0C, 0x3986DDDB, 0xB5AE6316, 0x40A0A7A1, 0xAA7D2610, 0x4596F1CD, 0x47281E36, 0x365C97A3, 0x63450713, 0x499DF0D8, 0xB49E721A, 0x409AB59F, 0x8A662D1C, 0x57AEFBDF, 0x6B404456, 0x536EA49B, 0x6A4D061E, 0x5CB6FCC6, 0x9A8E7F20, 0x428EBEA0, 0x623F2E2A, 0x69C6FFF0, 0x9A686569, 0x6F83AC92, 0x7F5D0B2A, 0x70CDFFB2, 0x77848D29, 0x4787C4A0, 0x401D2E3E, 0x7ED9FFFC, 0xC48F7973, 0x8598AE86, 0x9A701339, 0x85E1FFA6, 0x5E859534, 0x5189C99B, 0x2C0B3455, 0x92E9FFFA, 0xDCAB8071, 0x94ACAD7A, 0xB1882249, 0x9AF1FFB0, 0x6A8F9746, 0x6394CD8D, 0x290C416F, 0xA5EEFFF4, 0xDCB46B6D, 0xA1BFAD77, 0xB6A43A58, 0xAAF8FFC8, 0x84959963, 0x7BA4CE78, 0x351A588E, 0xB5E3F9F1, 0xCFAC6077, 0xABCFAC77, 0xA8C05A6A, 0xB2F3FFE1, 0xA3959471, 0x94B9D065, 0x473274A9, 0xBDCDECEF, 0xC2A05F86, 0xBADDAC78, 0x92D87C7D, 0xAFDEFDF1, 0xBC8C8971, 0xA6D2D45A, 0x584B95BB, 0xC1B3D5ED, 0xB8956697, 0xC5E9A670, 0x7AE6978F, 0xA4BEF0EF, 0xB9797360, 0xB1E8DD5D, 0x5D5FAFC7, 0xC49CB8E3, 0xAF8C78A5, 0xCBF19D5F, 0x6AE5A6A3, 0x9398DBE7, 0xB46A5841, 0xB8F2E871, 0x586DC1CD, 0xC78C9DD5, 0xAA878CB1, 0xD8F89249, 0x63DCABB3, 0x8576C5D8, 0xA95E4430, 0xC0EBEE91, 0x5378CACE, 0xC58087C5, 0xA4859EAE, 0xE1FD8A36, 0x60D0ACBD, 0x7765B9C5, 0x9C563A2B, 0xCED7E7B4, 0x5484C7CC, 0xB66F7CBB, 0x9F81A898, 0xE3FF8D2E, 0x63C8B0BA, 0x6D69B8B0, 0x93573B2E, 0xE0C2CED2, 0x6898C0C3, 0x97587EBC, 0x9D749570, 0xDEFF9D36, 0x67C8B4A8, 0x6682BD9B, 0x93643E37, 0xF0B4A8DE, 0x86A9B6B0, 0x70448BBE, 0x99617545, 0xD1FFB84E, 0x70CAB48C, 0x64A4BD8D, 0x96763D41, 0xFAAC82DA, 0xA7B6AE9A, 0x4D359AC0, 0x90494F27, 0xC0FFD675, 0x80CCAD6D, 0x63C1B681, 0x9C85374E, 0xFFA069C9, 0xC1BAA785, 0x3936A4B6, 0x7D342E18, 0xA9FFEEA5, 0x9AC59F56, 0x60D0A873, 0x9288315E, 0xFB8669B6, 0xD0B6A473, 0x3C47A39A, 0x6228241B, 0x8BFFF6CD, 0xB7BB8F47, 0x57CFA169, 0x77782C6B, 0xE56478AA, 0xD6AC9E64, 0x4E61977C, 0x4B232428, 0x6FFFEBE5, 0xD0AF813C, 0x44C2A266, 0x5B61296E, 0xC04188A8, 0xD4A09051, 0x5D788B61, 0x3E202234, 0x58F9D7DF, 0xDEA27332, 0x31AE9A6C, 0x3E4B2F62, 0x902688B3, 0xD0937A3F, 0x5D7D8B58, 0x37241F35, 0x46F2C5BF, 0xD7956528, 0x1E918E76, 0x3442424A, 0x601774C3, 0xCB8F6630, 0x48698261, 0x333C2729, 0x3CECBF95, 0xC2885420, 0x11717B78, 0x4952673A, 0x3D1153CD, 0xC994602F, 0x2D496F6D, 0x31674418, 0x32E7CA6C, 0xA77D4318, 0x09526672, 0x6B6F963E, 0x2B1036D0, 0xCAA26E3C, 0x1B2A5A7B, 0x3798700F, 0x2BDFD94D, 0x8C773712, 0x043C606C, 0x9086B955, 0x281225C9, 0xC7AD8954, 0x141B4085, 0x53CB9C10, 0x26D3E63A, 0x757A3B11, 0x0131666F, 0xAB87BA6A, 0x2E151FBF, 0xC1AEA16A, 0x1721388C, 0x81ECBB17, 0x23C1EE30, 0x6688561E, 0x02317381, 0xA36A9566, 0x3B171FB9, 0xB5A5AF7A, 0x1B384395, 0xABFBC81D, 0x20AAEB28, 0x61987838, 0x05358299, 0x85405D4E, 0x45181FB5, 0xA695B083, 0x1C55569C, 0xCEFFCF1E, 0x1A8CDA24, 0x62A39755, 0x0A398FAE, 0x601A2A2C, 0x49161FB1, 0x9A8BAC8A, 0x23736DA0, 0xE0FFD61E, 0x136BAF23, 0x70ABAD6D, 0x143D95BD, 0x41030D16, 0x41151DAA, 0x938BAA94, 0x2E8A8BA7, 0xE6FFD921, 0x0C4A7D2D, 0x7CACAB70, 0x244093C3, 0x38020F11, 0x2F151CA3, 0x9293ABA1, 0x3995AAB7, 0xEDF7D924, 0x072F5842, 0x83AE9C66, 0x3F498EC7, 0x420D2812, 0x1E151F9B, 0x989CB0B2, 0x4697C5CE, 0xF5F0D626, 0x061B435B, 0x85B18A5B, 0x5F568BCD, 0x54245213, 0x12172593, 0x9FA1BAC0, 0x5291D4E1, 0xFAF0D123, 0x0711416F, 0x82B2765B, 0x84668FCB, 0x684D8212, 0x1318308A, 0xA3A2C2C6, 0x5F88D3EE, 0xFEF6C81B, 0x0B104276, 0x85B06A72, 0xA97896C3, 0x7C81AC19, 0x24194083, 0xA2A0C6C4, 0x6A82CCF1, 0xFFFFB910, 0x14173E77, 0x8BAE6992, 0xC6879BB4, 0x92B3C933, 0x3C1D4F7D, 0x9DA2CCBE, 0x7381C6E6, 0xFFFFB111, 0x26233975, 0x92AF6DAF, 0xDB949AA3, 0xADDBDD64, 0x5927597B, 0x99AAD4B9, 0x7687C6D5, 0xFCFFB736, 0x432D3A78, 0x98B371BD, 0xE5A0989E, 0xCCF2EAA0, 0x753C5C80, 0x9DB9E3BC, 0x7896CFBF, 0xF6FFCB72, 0x64323F81, 0x9CBC70B4, 0xE3AC9EAD, 0xE6FBF6CF, 0x8B5C5C85, 0xA7C8F4C2, 0x7AA6D9A3, 0xF0FFE2A9, 0x8032448D, 0xA4C970A0, 0xDBB5AAC6, 0xF7FEFDE7, 0xA3806187, 0xB0D6FFC9, 0x7FB5D686, 0xE7FFF0D2, 0x8D2F4E98, 0xABD7768D, 0xCFB9B4E1, 0xF8F8FFE7, 0xB29B7089, 0xB7E4FFCD, 0x8CB8BF65, 0xD5FFF0D7, 0x8D34609D, 0xB4E48385, 0xC3BAB0F1, 0xE2E8FEDC, 0xB5A07A8D, 0xBDEFFFD0, 0x9AAB9543, 0xB9FFE9C3, 0x80447497, 0xC0EF9C90, 0xBDB997E5, 0xC2CCFBD4, 0xAB8F7387, 0xC8F8FFD4, 0xA4936324, 0x98FFE5B3, 0x6F577E8A, 0xCEFABCA8, 0xC0BC71C7, 0x9EADF4D2, 0x916D5D7B, 0xD4FEFFD6, 0xA575390F, 0x76FFE4A6, 0x656A7F7D, 0xDDFFDABF, 0xC8BF4CA1, 0x8095E8CC, 0x744A3B66, 0xDAFFFFD6, 0x9D5B1E04, 0x5DFDDF9A, 0x6075787A, 0xECFFF1CD, 0xCEC42E7C, 0x7087D6BF, 0x5A311F49, 0xD4FFFFD0, 0x8E4B1100, 0x50F7D892, 0x68767788, 0xF6FFFDCE, 0xCDC31E65, 0x6E88C3A8, 0x4922153A, 0xC3FFFDC4, 0x7F410B03, 0x4BEED08B, 0x747682A0, 0xFDFFFEBF, 0xBCB61456, 0x7792B18B, 0x3E19153D, 0xB5FFF8B2, 0x733B0908, 0x4DE0C487, 0x827797BC, 0xFFFFF8AB, 0x9E9B0E50, 0x869E9F6E, 0x3714184D, 0xB5FFF09E, 0x67380C11, 0x56CFB285, 0x8F7EADD4, 0xFFFFED96, 0x78730A53, 0x9CA98F57, 0x310F1C69, 0xC8FFE18A, 0x5D35161D, 0x64BC9E84, 0x978BBFE7, 0xFFFFDD81, 0x5348075A, 0xB5B07F48, 0x290A2088, 0xE1FFCF75, 0x5335272B, 0x74AD877F, 0x9C9DCFF3, 0xFFFEC86E, 0x35260864, 0xC6B16F3E, 0x200422A6, 0xF8FCB95F, 0x47373A3C, 0x86A36F73, 0x9FB0D9FA, 0xFFF7B15B, 0x21110E70, 0xCDAB6139, 0x160027C1, 0xFFF09F4C, 0x3B3A4B4D, 0x989D5B5D, 0x9DB5D9FE, 0xFFEA994C, 0x1509177B, 0xC8A15C3C, 0x0E022BD1, 0xFFE1873B, 0x2F3E5460, 0xA8954F44, 0x96A6CEFF, 0xFFD7823C, 0x0C0A2784, 0xB9956343, 0x0B0731DB, 0xFFCE722C, 0x22415672, 0xB58C4A31, 0x8A88BAFF, 0xFAC56E2E, 0x060F398F, 0xA989764A, 0x0A0C3AE1, 0xFFB85F20, 0x17425787, 0xBF824826, 0x775FA3FF, 0xF1B66121, 0x03164B98, 0x9A818E4A, 0x0A1040D4, 0xE8974D14, 0x11405495, 0xBB74401F, 0x603D86F1, 0xD7A35414, 0x02195694, 0x8476943E, 0x171A46C5, 0xCC7D3D0C, 0x0D3E599E, 0xAE6C371C, 0x4A2D72E3, 0xC38F4C0E, 0x03205F96, 0x766A792A, 0x242B4FB8, 0xB66A2E06, 0x0D3E66AA, 0x9B663322, 0x3B2D6CDD, 0xB47B450A, 0x062B6E9C, 0x6E705D17 -glabel D_80992680 - .word 0x01950624, 0xF9950000, 0x0191F272, 0x007800FF, 0x01D605D0, 0xF8F90000, 0x0200F155, 0x007800FF, 0x00CF0520, 0xFB760000, 0x00FBF2D8, 0x007800FF, 0x00CF0334, 0xFB760000, 0x003DF2CB, 0x007800FF, 0x03CD0334, 0xFCB10000, 0x0200F51C, 0x007800FF, 0x00CF0520, 0xFB760000, 0x00FCF2D8, 0x007800FF, 0x03CD0520, 0xFCB10000, 0x0200F439, 0x007800FF, 0x053C03F4, 0xFF2F0000, 0x0200FE39, 0x007800FF, 0x053C00DC, 0xFF2F0000, 0x0200FBC7, 0x007800FF, 0x03AB0208, 0xFF2F0000, 0x00C9FA84, 0x007800FF, 0x03AB00DC, 0xFF2F0000, 0x0187FA91, 0x007800FF, 0x04C700B1, 0x033F0000, 0x000006AB, 0x007800FF, 0x051D00DC, 0x033F0000, 0x008F068F, 0x007800FF, 0x04C701F4, 0x033F0000, 0x00000555, 0x007800FF, 0x074F00DC, 0x033F0000, 0x02000639, 0x007800FF, 0x03CD0520, 0xFCB10000, 0x0200F439, 0x007800FF, 0x02640624, 0xF9EA0000, 0x0200F31C, 0x007800FF, 0x02640624, 0xF9EA0000, 0x0200F31C, 0x007800FF, 0x034703F4, 0xFF2F0000, 0x008FFD8E, 0x007800FF, 0x064204F8, 0x01380000, 0x0200011C, 0x007800FF, 0x03470498, 0x00770000, 0x0000FEE4, 0x007800FF, 0x03B904F8, 0x01380000, 0x00000072, 0x007800FF, 0x04C703F6, 0x033F0000, 0x00000355, 0x007800FF, 0x074F03F6, 0x033F0000, 0x02000355, 0x007800FF, 0x02B30208, 0xFF2F0000, 0x0000FA00, 0x007800FF, 0x034702A4, 0x00770000, 0x0000FC39, 0x007800FF, 0x03470208, 0xFF2F0000, 0x007FFA54, 0x007800FF, 0x077100DC, 0x04020000, 0x018C09B1, 0x007800FF, 0x067A00DC, 0x04910000, 0x006509B7, 0x007800FF, 0x07710127, 0x04020000, 0x019A0A39, 0x007800FF, 0x067A0127, 0x04910000, 0x00660A39, 0x007800FF, 0x077B0127, 0x04810000, 0x019A0B55, 0x007800FF -glabel D_80992880 - .word 0x07710127, 0x04020000, 0x019A0A39, 0x007800FF, 0x07940127, 0x04170000, 0x02000A72, 0x007800FF, 0x077100DC, 0x04020000, 0x018C09B1, 0x007800FF, 0x079400DC, 0x04170000, 0x02000A00, 0x007800FF, 0x067A00DC, 0x04910000, 0x006509B7, 0x007800FF, 0x067A00DC, 0x04BF0000, 0x00000A00, 0x007800FF, 0x067A0127, 0x04910000, 0x00660A39, 0x007800FF, 0x067A0127, 0x04BF0000, 0x00000A72, 0x007800FF, 0x07B00127, 0x04940000, 0x02000B8E, 0x007800FF, 0x077B0127, 0x04810000, 0x019A0B55, 0x007800FF, 0x06E30127, 0x04D90000, 0x00660B55, 0x007800FF, 0x06D90127, 0x050F0000, 0x00000B8E, 0x007800FF, 0x03CD0334, 0xFCB10000, 0x0200F51C, 0x007800FF, 0x00CF0334, 0xFB760000, 0x003DF2CB, 0x007800FF, 0x03CD0208, 0xFCB10000, 0x0200F6AB, 0x007800FF, 0x008E0208, 0xFB5B0000, 0x0000F439, 0x007800FF, 0x045C0208, 0xFD820000, 0x0200F7C7, 0x007800FF, 0x03AB0208, 0xFF2F0000, 0x00C9FA84, 0x007800FF, 0x045C00DC, 0xFD820000, 0x0200F91C, 0x007800FF, 0x03AB00DC, 0xFF2F0000, 0x0187FA91, 0x007800FF, 0x051D00DC, 0x033F0000, 0x008F068F, 0x007800FF, 0x077300DC, 0x03980000, 0x0200091C, 0x007800FF, 0x074F00DC, 0x033F0000, 0x02000639, 0x007800FF, 0x04C700B1, 0x033F0000, 0x000006AB, 0x007800FF, 0x051D00DC, 0x038E0000, 0x0000071C, 0x007800FF, 0x078C00DC, 0x03F70000, 0x020009C7, 0x007800FF, 0x053C00DC, 0xFF2F0000, 0x0200FBC7, 0x007800FF, 0x066400DC, 0x04AA0000, 0x000009C7, 0x007800FF, 0x02B30208, 0xFF2F0000, 0x0000FA00, 0x007800FF, 0x03470208, 0xFF2F0000, 0x007FFA54, 0x007800FF, 0x077BFF38, 0x04810000, 0x019A1000, 0x007800FF, 0x07B0FF38, 0x04940000, 0x02001000, 0x007800FF -glabel D_80992A80 - .word 0x077B0127, 0x04810000, 0x019A0B55, 0x007800FF, 0x07B0FF38, 0x04940000, 0x02001000, 0x007800FF, 0x07B00127, 0x04940000, 0x02000B8E, 0x007800FF, 0x06E30127, 0x04D90000, 0x00660B55, 0x007800FF, 0x06E3FF38, 0x04D90000, 0x00661000, 0x007800FF, 0x077BFF38, 0x04810000, 0x019A1000, 0x007800FF, 0x06D90127, 0x050F0000, 0x00000B8E, 0x007800FF, 0x06D9FF38, 0x050F0000, 0x00001000, 0x007800FF, 0x053C03F4, 0xFF2F0000, 0x0200FE39, 0x007800FF, 0x03AB0208, 0xFF2F0000, 0x00C9FA84, 0x007800FF, 0x034703F4, 0xFF2F0000, 0x008FFD8E, 0x007800FF, 0x03470208, 0xFF2F0000, 0x007FFA54, 0x007800FF, 0x034702A4, 0x00770000, 0x0000FC39, 0x007800FF, 0x03470498, 0x00770000, 0x0000FEE4, 0x007800FF, 0x045C0208, 0xFD820000, 0x0200F7C7, 0x007800FF, 0x01D50334, 0xF8F90000, 0x0200F000, 0x007800FF, 0x00CF0334, 0xFB760000, 0x003DF2CB, 0x007800FF, 0x00CF0520, 0xFB760000, 0x00FBF2D8, 0x007800FF, 0x01D605D0, 0xF8F90000, 0x0200F155, 0x007800FF, 0x04C703F6, 0x033F0000, 0x00000355, 0x007800FF, 0x04C701F4, 0x033F0000, 0x00000555, 0x007800FF, 0x074F03F6, 0x033F0000, 0x02000355, 0x007800FF, 0x074F00DC, 0x033F0000, 0x02000639, 0x007800FF, 0x008E0208, 0xFB5B0000, 0x0000F439, 0x007800FF, 0x008E0334, 0xFB5B0000, 0x0000F2AB, 0x007800FF, 0xFFB40334, 0xF99F0000, 0x0000F000, 0x007800FF -glabel D_80992C20 - .word 0x067A0127, 0x04910000, 0x00CD051C, 0x007800FF, 0x06E30127, 0x04D90000, 0x00CD05AB, 0x007800FF, 0x077B0127, 0x04810000, 0x033305AB, 0x007800FF -glabel D_80992C50 - .word 0xFE7B0320, 0xF8A40000, 0x00661000, 0x2E0092FF, 0xFC230320, 0xF7AD0000, 0x02001000, 0x2E0092FF, 0xFE7B0520, 0xF8A40000, 0x00660E05, 0x2B2998FF, 0xFC230520, 0xF7AD0000, 0x02000C6F, 0x1C5EBCFF, 0xFA2D05F1, 0xF8A10000, 0x02000A74, 0x146BCFFF, 0xFA0A0625, 0xF9040000, 0x01B009E6, 0x0776EEFF, 0xFC400625, 0xF9ED0000, 0x00000B71, 0x0776EEFF, 0xFE510558, 0xF90A0000, 0x00000D9F, 0x146BCFFF, 0xF2210080, 0x07E10000, 0x0200DE11, 0x007800FF, 0xF2DE006E, 0x07150000, 0x0200DC49, 0x007800FF, 0xF1B100AB, 0x05350000, 0x0000DC49, 0x007800FF, 0xF64E0014, 0x04460000, 0x0000D8EB, 0x007800FF, 0xF04E00C9, 0x06E90000, 0x0000DE11, 0x007800FF, 0xEFA900D2, 0x0A360000, 0x0000E03F, 0x007800FF, 0xF1F40084, 0x09310000, 0x0200E03F, 0x007800FF, 0xF5A10014, 0x068E0000, 0x01FCD9E8, 0x007800FF, 0xEE220106, 0x0AE30000, 0x0000ED20, 0x007800FF, 0xEDB40115, 0x0A760000, 0x0000EDB9, 0x007800FF, 0xEBD00155, 0x0AB10000, 0x0200EE51, 0x007800FF, 0xEBB6015F, 0x081F0000, 0x0200F0E4, 0x007800FF, 0xEC7B013E, 0x0B9F0000, 0x0200ED20, 0x007800FF, 0xED9A011B, 0x076B0000, 0x0000EFE7, 0x007800FF, 0xEDD30123, 0x06C00000, 0x0000F0E4, 0x007800FF, 0xF8560014, 0x03DC0000, 0x0000D722, 0x007800FF, 0xF8E00014, 0x05EC0000, 0x0200D722, 0x007800FF, 0xFF8C0014, 0x038B0000, 0x0000D0FE, 0x007800FF, 0xFF030014, 0x038C0000, 0x0000D196, 0x007800FF, 0xFEFB0014, 0x05B40000, 0x0200D196, 0x007800FF, 0xFB5B0014, 0x05BA0000, 0x0200D48F, 0x007800FF, 0x00690014, 0x03890000, 0x0000D000, 0x007800FF, 0xFFD60014, 0x038A0000, 0x0000D098, 0x007800FF, 0x00700014, 0x04BB0000, 0x0100D000, 0x007800FF -glabel D_80992E50 - .word 0xFA370522, 0xF8AE0000, 0x02000A74, 0x4D561FFF, 0xF7930712, 0xF9ED0000, 0x0200067D, 0x495628FF, 0xF9540520, 0xFAE90000, 0x00B50828, 0x475331FF, 0xEFE10864, 0xFF330000, 0x0200FCFA, 0x2C5D3DFF, 0xED05072C, 0x02DE0000, 0x0200F975, 0x2C5D3DFF, 0xEEAF05CB, 0x04010000, 0x0000F86C, 0x2C5D3DFF, 0xEBC605BE, 0x06040000, 0x0200F6D0, 0x2C5D3DFF, 0xEBA604EC, 0x07800000, 0x0200F50D, 0x2C5D3DFF, 0xEBB4047D, 0x08200000, 0x0200F475, 0x2C5D3DFF, 0xEDD10464, 0x06C10000, 0x0000F475, 0x2C5D3DFF, 0xF67506C0, 0xFC8C0000, 0x00000384, 0x49552AFF, 0xF9310502, 0xFB550000, 0x00000715, 0x652F2CFF, 0xF9BF0208, 0xFB150000, 0x00000878, 0xD2006EFF, 0xF9BF0520, 0xFB150000, 0x00000943, 0xD52968FF, 0xF9540208, 0xFAE90000, 0x0056082A, 0xD2006EFF, 0xF9540520, 0xFAE90000, 0x00B50828, 0xD2006EFF, 0xF9540208, 0xFAE90000, 0x0056082A, 0x007800FF, 0xF9310208, 0xFB550000, 0x000007E0, 0x007800FF, 0xF9BF0208, 0xFB150000, 0x00000878, 0x007800FF, 0xFC400625, 0xF9ED0000, 0x00000B71, 0x0776EEFF, 0xFA0A0625, 0xF9040000, 0x01B009E6, 0x0776EEFF, 0xFE510320, 0xF90A0000, 0x00001000, 0x6E002EFF, 0xFE7B0520, 0xF8A40000, 0x00660E05, 0x6E002EFF, 0xFE510558, 0xF90A0000, 0x00000D9F, 0x6E002EFF, 0xFE7B0320, 0xF8A40000, 0x00661000, 0x6E002EFF, 0xF9540208, 0xFAE90000, 0x0056082A, 0x720025FF, 0xF9310208, 0xFB550000, 0x000007E0, 0x720025FF, 0xF5170894, 0xFB2D0000, 0x020002EC, 0x3B5A34FF, 0xF5E80702, 0xFCFA0000, 0x000002B9, 0x3B5A34FF, 0xF5630870, 0xFAF50000, 0x02000352, 0x48552AFF -glabel D_80993030 - .word 0xEBB4047D, 0x08200000, 0x0200F475, 0x007800FF, 0xEBB6015F, 0x081F0000, 0x0200F0E4, 0x007800FF, 0xEDD30123, 0x06C00000, 0x0000F0E4, 0x007800FF, 0xEDD10464, 0x06C10000, 0x0000F475, 0x007800FF, 0xEE220106, 0x0AE30000, 0x0000ED20, 0x007800FF, 0xEC7B013E, 0x0B9F0000, 0x0200ED20, 0x007800FF, 0xEC7B0470, 0x0B9F0000, 0x0200E95D, 0x007800FF, 0xEE220458, 0x0AE30000, 0x0000E95D, 0x007800FF, 0xF1F40421, 0x09310000, 0x0200E39E, 0x007800FF, 0xF1F40084, 0x09310000, 0x0200E03F, 0x007800FF, 0xEFA900D2, 0x0A360000, 0x0000E03F, 0x007800FF, 0xEFA90442, 0x0A360000, 0x0000E39E, 0x007800FF, 0xFB5B0014, 0x05BA0000, 0x0200D48F, 0x007800FF, 0xFB560014, 0x03920000, 0x0000D4C1, 0x007800FF, 0xF9D70014, 0x05BC0000, 0x0200D624, 0x007800FF, 0xFF030014, 0x038C0000, 0x0000D196, 0x007800FF, 0xF9B60014, 0x03950000, 0x0000D5F2, 0x007800FF, 0xF8560014, 0x03DC0000, 0x0000D722, 0x007800FF, 0xF8E00014, 0x05EC0000, 0x0200D722, 0x007800FF, 0xEEAF05CB, 0x04010000, 0x0000F86C, 0x2C5D3DFF, 0xF1A206D4, 0x00510000, 0x0000FD93, 0x2C5D3DFF, 0xEFE10864, 0xFF330000, 0x0200FCFA, 0x2C5D3DFF, 0xF1C708A9, 0xFD6F0000, 0x0200FF8E, 0x2C5D3DFF, 0xF5E80702, 0xFCFA0000, 0x000002B9, 0x3B5A34FF, 0xF5E80702, 0xFCFA0000, 0x000002B9, 0x3B5A34FF, 0xF5170894, 0xFB2D0000, 0x020002EC, 0x3B5A34FF, 0xEC7B0470, 0x0B9F0000, 0x0200E95D, 0x007800FF, 0xECF404FF, 0x0C470000, 0x0200E837, 0x007800FF, 0xEE220458, 0x0AE30000, 0x0000E95D, 0x007800FF, 0xEEA304A7, 0x0B2A0000, 0x0000E7ED, 0x007800FF, 0xEE7805EF, 0x0D200000, 0x0200E710, 0x007800FF -glabel D_80993220 - .word 0xEE7805EF, 0x0D200000, 0x0200E710, 0x007800FF, 0xF0740603, 0x0C860000, 0x0200E5EA, 0x007800FF, 0xEF4704A9, 0x0AF10000, 0x0000E67D, 0x007800FF, 0xEEA304A7, 0x0B2A0000, 0x0000E7ED, 0x007800FF, 0xF1C50539, 0x0AE10000, 0x0200E4C4, 0x007800FF, 0xEF95047F, 0x0A970000, 0x0000E50D, 0x007800FF, 0xF1F40421, 0x09310000, 0x0200E39E, 0x007800FF, 0xEFA90442, 0x0A360000, 0x0000E39E, 0x007800FF -glabel D_809932A0 - .word 0x00750014, 0x05B20000, 0x0400E800, 0x007800FF, 0x00700014, 0x04BB0000, 0x0200E800, 0x007800FF, 0xFEFB0014, 0x05B40000, 0x0400E8CB, 0x007800FF -glabel D_809932D0 - .word 0xE7000000, 0x00000000, 0xE3001001, 0x00000000, 0xD7000002, 0xFFFFFFFF, 0xFD900000 -.word D_80991680 -.word 0xF5900000, 0x0701C640, 0xE6000000, 0x00000000, 0xF3000000, 0x073FF400, 0xE7000000, 0x00000000, 0xF5880400, 0x0001C640, 0xF2000000, 0x0003C1FC, 0xFD900000 -.word D_80991E80 -.word 0xF5900100, 0x0701BC50, 0xE6000000, 0x00000000, 0xF3000000, 0x073FF200, 0xE7000000, 0x00000000, 0xF5880900, 0x0101BC50, 0xF2000000, 0x0107C0FC, 0xFC71ABFF, 0x5FFEE238, 0xE200001C, 0x0C1849D8, 0xD9F2FFFF, 0x00000000, 0xD9FFFFFF, 0x00020400, 0xFA000000, 0x003264FF, 0xFB000000, 0x32140080, 0xDF000000, 0x00000000 -glabel D_80993390 - .word 0x01020040 -.word D_80992680 -.word 0x06000204, 0x0006080A, 0x06080C0A, 0x000E1012, 0x06101412, 0x0016181A, 0x06181C1A, 0x001E2004, 0x06200004, 0x00220200, 0x060E2426, 0x00242826, 0x06282A26, 0x002C2E2A, 0x062E262A, 0x00303234, 0x0636383A, 0x00383C3A, 0x063A3C3E, 0x00343224, 0x01020040 -.word D_80992880 -.word 0x06000204, 0x00020604, 0x06080A0C, 0x000A0E0C, 0x06020010, 0x00001210, 0x060C0E14, 0x000E1614, 0x06181A1C, 0x001A1E1C, 0x06202224, 0x00222624, 0x06080428, 0x00042A28, 0x062A2C28, 0x002E3028, 0x06322A04, 0x00063204, 0x06342426, 0x00303628, 0x06360828, 0x00360A08, 0x06383A1E, 0x003A201E, 0x06201C1E, 0x00123C3E, 0x0101A034 -.word D_80992A80 -.word 0x06000204, 0x0006080A, 0x06060A00, 0x000C0E08, 0x060C0806, 0x00101214, 0x06121614, 0x0014181A, 0x061C1612, 0x001E2022, 0x061E2224, 0x0026282A, 0x06282C2A, 0x002E2030, 0x061E3220, 0x00323020, 0x01003006 -.word D_80992C20 -.word 0x05000204, 0x00000000, 0xDF000000, 0x00000000 -glabel D_809934B8 - .word 0x01020040 -.word D_80992C50 -.word 0x06000204, 0x00020604, 0x06080A06, 0x000A0C06, 0x060C0E06, 0x000E0406, 0x06101214, 0x00121614, 0x06141810, 0x00181A10, 0x061A1C10, 0x00121E16, 0x06202224, 0x00222624, 0x06242820, 0x00222A26, 0x062A2C26, 0x002E1630, 0x06161E30, 0x00323436, 0x06343836, 0x003A3C3E, 0x063E3C36, 0x003C3236, 0x01020040 -.word D_80992E50 -.word 0x06000204, 0x0006080A, 0x06080C0A, 0x000C0E0A, 0x060E100A, 0x0010120A, 0x06141602, 0x00160402, 0x06181A1C, 0x001A1E1C, 0x06202224, 0x00041A26, 0x06042628, 0x002A2C2E, 0x062A302C, 0x00163204, 0x06163432, 0x0036383A, 0x0638143A, 0x0014023A, 0x01020040 -.word D_80993030 -.word 0x06000204, 0x00000406, 0x06080A0C, 0x00080C0E, 0x06101214, 0x00101416, 0x06181A1C, 0x00181E1A, 0x061A201C, 0x0020221C, 0x0622241C, 0x0026282A, 0x06282C2A, 0x00282E2C, 0x0630322C, 0x00343638, 0x06363A38, 0x00363C3A, 0x01008010 -.word D_80993220 -.word 0x06000204, 0x00000406, 0x0602080A, 0x00020A04, 0x06080C0E, 0x00080E0A, 0x01003006 -.word D_809932A0 -.word 0x05000204, 0x00000000, 0xDF000000, 0x00000000 - diff --git a/data/overlays/actors/z_demo_shd.reloc.s b/data/overlays/actors/z_demo_shd.reloc.s deleted file mode 100644 index f437d3ef9f..0000000000 --- a/data/overlays/actors/z_demo_shd.reloc.s +++ /dev/null @@ -1,13 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_80993630 - .incbin "baserom/ovl_Demo_Shd", 0x2400, 0x00000090 diff --git a/data/overlays/actors/z_en_mag.data.s b/data/overlays/actors/z_en_mag.data.s deleted file mode 100644 index 89fd339ab2..0000000000 --- a/data/overlays/actors/z_en_mag.data.s +++ /dev/null @@ -1,32 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel En_Mag_InitVars - .word 0x01710600, 0x00000030, 0x014A0000, 0x0000E328 -.word EnMag_Init -.word EnMag_Destroy -.word EnMag_Update -.word EnMag_Draw -glabel D_80AA5EC0 - .word 0x00000000 -glabel D_80AA5EC4 - .word 0x00000000 -glabel D_80AA5EC8 - .word 0x00000000 -glabel D_80AA5ECC - .word 0x00000000 -glabel D_80AA5ED0 - .word 0x17180C18, 0x171D1B18, 0x15150E1B -glabel D_80AA5EDC - .word 0x191B0E1C, 0x1C1C1D0A, 0x1B1D0000 -glabel D_80AA5EE8 - .word 0x06020000, 0x06020800, 0x06021000, 0x06021800, 0x06022000, 0x06022800, 0x06023000, 0x06023800, 0x06024000, 0x00000000 - diff --git a/data/overlays/actors/z_en_mag.reloc.s b/data/overlays/actors/z_en_mag.reloc.s deleted file mode 100644 index 4a6e6e2928..0000000000 --- a/data/overlays/actors/z_en_mag.reloc.s +++ /dev/null @@ -1,13 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_80AA5F40 - .incbin "baserom/ovl_En_Mag", 0x2440, 0x00000110 diff --git a/data/overlays/actors/z_en_rd.data.s b/data/overlays/actors/z_en_rd.data.s deleted file mode 100644 index 05e3242629..0000000000 --- a/data/overlays/actors/z_en_rd.data.s +++ /dev/null @@ -1,40 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel En_Rd_InitVars - .word 0x00900500, 0x00000415, 0x00980000, 0x0000036C -.word EnRd_Init -.word EnRd_Destroy -.word EnRd_Update -.word EnRd_Draw -glabel D_80AE48C0 - .word 0x00000909, 0x10010000, 0x01000000, 0x00000000, 0x00000000, 0xFFCFFFFF, 0x00000000, 0x00050100, 0x00140046, 0x00000000, 0x00000000 -glabel D_80AE48EC - .word 0x00F20000, 0x0000F210, 0xF1F2F400, 0x00000000, 0x00E460D3, 0x0000F1F4, 0xF2F2F8F4, 0x0000F400 -glabel D_80AE490C - .word 0xB04C07D0, 0xC850000A, 0x386CF254 -glabel D_80AE4918 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80AE4924 - .word 0xC8C8FFFF -glabel D_80AE4928 - .word 0x0000FF00 -glabel D_80AE492C - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80AE4938 - .word 0xC8C8FFFF -glabel D_80AE493C - .word 0x0000FF00 -glabel D_80AE4940 - .word 0x43960000, 0x00000000, 0x00000000, 0x43960000, 0x00000000, 0x00000000 -glabel D_80AE4958 - .word 0x3E800000, 0x3E800000, 0x3E800000, 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_en_takara_man.data.s b/data/overlays/actors/z_en_takara_man.data.s deleted file mode 100644 index fb0e2176c1..0000000000 --- a/data/overlays/actors/z_en_takara_man.data.s +++ /dev/null @@ -1,22 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel En_Takara_Man_InitVars - .word 0x017C0400, 0x08000039, 0x01550000, 0x00000238 -.word EnTakaraMan_Init -.word EnTakaraMan_Destroy -.word EnTakaraMan_Update -.word EnTakaraMan_Draw -glabel D_80B17DD0 - .word 0x00000000 -glabel D_80B17DD4 - .word 0x06000970, 0x06000D70, 0x00000000 - diff --git a/data/overlays/actors/z_en_takara_man.reloc.s b/data/overlays/actors/z_en_takara_man.reloc.s deleted file mode 100644 index 5056106645..0000000000 --- a/data/overlays/actors/z_en_takara_man.reloc.s +++ /dev/null @@ -1,13 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_80B17E70 - .incbin "baserom/ovl_En_Takara_Man", 0x910, 0x000000C0 diff --git a/data/overlays/actors/z_obj_lightswitch.data.s b/data/overlays/actors/z_obj_lightswitch.data.s deleted file mode 100644 index ad18762e1e..0000000000 --- a/data/overlays/actors/z_obj_lightswitch.data.s +++ /dev/null @@ -1,33 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel Obj_Lightswitch_InitVars - .word 0x01500000, 0x00000010, 0x012A0000, 0x000001C4 -.word ObjLightswitch_Init -.word ObjLightswitch_Destroy -.word ObjLightswitch_Update -.word ObjLightswitch_Draw -glabel D_80B97F20 - .word 0x00000000, 0x00000000, 0x00000000, 0x00200000, 0x00000000, 0x00010100, 0x00000000, 0x00000000, 0x00130064 -glabel D_80B97F44 - .word 0x0A000939, 0x20000000, 0x00000001 -.word D_80B97F20 -glabel D_80B97F54 - .word 0x0000000C, 0x003CFF00 -glabel D_80B97F5C - .word 0x06000C20, 0x06000420, 0x06001420 -glabel D_80B97F68 - .word 0xC4D56000, 0x4452C000, 0xC3340000 -glabel D_80B97F74 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80B97F80 - .word 0xC8500064, 0xB0F403E8, 0xB0F801F4, 0x30FC03E8 - diff --git a/data/overlays/actors/z_obj_lightswitch.reloc.s b/data/overlays/actors/z_obj_lightswitch.reloc.s deleted file mode 100644 index 12e9744480..0000000000 --- a/data/overlays/actors/z_obj_lightswitch.reloc.s +++ /dev/null @@ -1,13 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_80B98100 - .incbin "baserom/ovl_Obj_Lightswitch", 0x1560, 0x00000170 diff --git a/include/functions.h b/include/functions.h index 418dcf5fcb..de9f438e28 100644 --- a/include/functions.h +++ b/include/functions.h @@ -328,6 +328,7 @@ void func_8002D9A4(Actor* actor, f32 arg1); s16 func_8002DA78(Actor* actorA, Actor* actorB); s16 func_8002DAC0(Actor* actor, Vec3f* arg1); f32 func_8002DB48(Actor* actorA, Actor* actorB); +f32 func_8002DB6C(Actor* actor, Vec3f* arg1); s16 func_8002DAE0(Actor* actorA, Actor* actorB); s16 func_8002DB28(Actor* actor, Vec3f* arg1); f32 func_8002DB8C(Actor* actorA, Actor* actorB); @@ -521,6 +522,7 @@ f32 func_8003C8EC(GlobalContext*, CollisionContext*, CollisionPoly**, Vec3f*); f32 func_8003C940(CollisionContext*, CollisionPoly**, s32*, Vec3f*); f32 func_8003C9A4(CollisionContext*, CollisionPoly**, UNK_PTR, Actor*, Vec3f*); f32 func_8003CA0C(GlobalContext*, CollisionContext*, CollisionPoly**, u32*, Actor*, Vec3f*); +f32 func_8003CA64(CollisionContext* colCtx, CollisionPoly** outPoly, s32* bgId, Actor* actor, Vec3f* pos, f32 chkDist); f32 func_8003CB30(CollisionContext*, CollisionPoly*, Vec3f*, MtxF*); f32 func_8003CCA4(CollisionContext*, CollisionPoly**, s32*, Vec3f*); // ? func_8003CDD4(?); @@ -624,6 +626,7 @@ s32 func_80043548(DynaPolyActor* dynaActor); s32 func_8004356C(DynaPolyActor* dynaActor); s32 func_80043590(DynaPolyActor* dynaActor); s32 func_800435B4(DynaPolyActor* dynaActor); +s32 func_800435D8(GlobalContext* globalCtx, DynaPolyActor* dyna, s16 arg2, s16 arg3, s16 arg4); f32 func_800437F0(f32, f32); // ? func_8004389C(?); // ? func_800438DC(?); @@ -924,6 +927,7 @@ void func_80073988(GlobalContext*, EnvironmentContext*, View*, GraphicsContext*, // ? func_80073A5C(?); f32 func_800746DC(); // ? func_80074704(?); +void func_80074CE8(GlobalContext* globalCtx, s32 arg1); // ? func_80074D6C(?); // ? func_80074FF4(?); // ? func_800750C0(?); @@ -1048,6 +1052,7 @@ Vec3f* OLib_Vec3fDiffRad(Vec3f* dest, Vec3f* a, Vec3f* b); s16 func_800800F8(GlobalContext* globalCtx, s16 arg1, s16 arg2, Actor* actor, s16 arg4); void func_800803F0(GlobalContext* globalCtx, s16 camId); // ? func_80080480(?); +UNK_TYPE func_800806BC(GlobalContext* globalCtx, Actor* actor, UNK_TYPE); void func_80080788(UNK_TYPE, UNK_TYPE); void Map_SavePlayerInitialInfo(GlobalContext* globalCtx); void Map_SetFloorPalettesData(GlobalContext* globalCtx, s16 floor); @@ -1192,6 +1197,7 @@ Gfx* func_800946E4(Gfx* gfx); Gfx* func_800947AC(Gfx* gfx); void func_80094A14(GraphicsContext* gfxCtx); void func_80094C50(GraphicsContext* gfxCtx); +void func_80094D28(Gfx** gfxp); Gfx* Gfx_BranchTexScroll(Gfx** gfxp, u32 x, u32 y, s32 width, s32 height); Gfx* func_80094E78(GraphicsContext* gfxCtx, u32 x, u32 y); Gfx* Gfx_TexScroll(GraphicsContext* gfxCtx, u32 x, u32 y, s32 width, s32 height); @@ -2176,7 +2182,7 @@ void func_800ED858(u8); // ? func_800F3990(?); // ? func_800F3A08(?); // ? func_800F3ED4(?); -// ? func_800F3F3C(?); +void func_800F3F3C(u8); // ? func_800F3F84(?); void func_800F4010(Vec3f*, u16, f32); void func_800F4138(Vec3f*, u16, f32); diff --git a/spec b/spec index 99c8dabaaf..bcfa674459 100644 --- a/spec +++ b/spec @@ -1087,8 +1087,7 @@ endseg beginseg name "ovl_Bg_Mizu_Water" include "build/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.o" - include "build/data/overlays/actors/z_bg_mizu_water.data.o" - include "build/data/overlays/actors/z_bg_mizu_water.reloc.o" + include "build/src/overlays/actors/ovl_Bg_Mizu_Water/ovl_Bg_Mizu_Water_reloc.o" endseg beginseg @@ -1100,8 +1099,7 @@ endseg beginseg name "ovl_Bg_Mori_Bigst" include "build/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.o" - include "build/data/overlays/actors/z_bg_mori_bigst.data.o" - include "build/data/overlays/actors/z_bg_mori_bigst.reloc.o" + include "build/src/overlays/actors/ovl_Bg_Mori_Bigst/ovl_Bg_Mori_Bigst_reloc.o" endseg beginseg @@ -1120,9 +1118,7 @@ endseg beginseg name "ovl_Bg_Mori_Hashira4" include "build/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.o" - include "build/data/overlays/actors/z_bg_mori_hashira4.data.o" - include "build/data/overlays/actors/z_bg_mori_hashira4.bss.o" - include "build/data/overlays/actors/z_bg_mori_hashira4.reloc.o" + include "build/src/overlays/actors/ovl_Bg_Mori_Hashira4/ovl_Bg_Mori_Hashira4_reloc.o" endseg beginseg @@ -1304,8 +1300,7 @@ endseg beginseg name "ovl_Bg_Spot15_Rrbox" include "build/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.o" - include "build/data/overlays/actors/z_bg_spot15_rrbox.data.o" - include "build/data/overlays/actors/z_bg_spot15_rrbox.reloc.o" + include "build/src/overlays/actors/ovl_Bg_Spot15_Rrbox/ovl_Bg_Spot15_Rrbox_reloc.o" endseg beginseg @@ -1317,8 +1312,7 @@ endseg beginseg name "ovl_Bg_Spot16_Bombstone" include "build/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.o" - include "build/data/overlays/actors/z_bg_spot16_bombstone.data.o" - include "build/data/overlays/actors/z_bg_spot16_bombstone.reloc.o" + include "build/src/overlays/actors/ovl_Bg_Spot16_Bombstone/ovl_Bg_Spot16_Bombstone_reloc.o" endseg beginseg @@ -1612,8 +1606,7 @@ endseg beginseg name "ovl_Demo_Shd" include "build/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.o" - include "build/data/overlays/actors/z_demo_shd.data.o" - include "build/data/overlays/actors/z_demo_shd.reloc.o" + include "build/src/overlays/actors/ovl_Demo_Shd/ovl_Demo_Shd_reloc.o" endseg beginseg @@ -2785,8 +2778,7 @@ endseg beginseg name "ovl_En_Mag" include "build/src/overlays/actors/ovl_En_Mag/z_en_mag.o" - include "build/data/overlays/actors/z_en_mag.data.o" - include "build/data/overlays/actors/z_en_mag.reloc.o" + include "build/src/overlays/actors/ovl_En_Mag/ovl_En_Mag_reloc.o" endseg beginseg @@ -2982,8 +2974,11 @@ endseg beginseg name "ovl_En_Rd" include "build/src/overlays/actors/ovl_En_Rd/z_en_rd.o" - include "build/data/overlays/actors/z_en_rd.data.o" +#ifdef NON_MATCHING + include "build/src/overlays/actors/ovl_En_Rd/ovl_En_Rd_reloc.o" +#else include "build/data/overlays/actors/z_en_rd.reloc.o" +#endif endseg beginseg @@ -3160,8 +3155,7 @@ endseg beginseg name "ovl_En_Takara_Man" include "build/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.o" - include "build/data/overlays/actors/z_en_takara_man.data.o" - include "build/data/overlays/actors/z_en_takara_man.reloc.o" + include "build/src/overlays/actors/ovl_En_Takara_Man/ovl_En_Takara_Man_reloc.o" endseg beginseg @@ -3566,8 +3560,7 @@ endseg beginseg name "ovl_Obj_Lightswitch" include "build/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.o" - include "build/data/overlays/actors/z_obj_lightswitch.data.o" - include "build/data/overlays/actors/z_obj_lightswitch.reloc.o" + include "build/src/overlays/actors/ovl_Obj_Lightswitch/ovl_Obj_Lightswitch_reloc.o" endseg beginseg diff --git a/src/code/z_rcp.c b/src/code/z_rcp.c index 4adc982fc3..93fb384696 100644 --- a/src/code/z_rcp.c +++ b/src/code/z_rcp.c @@ -1275,7 +1275,9 @@ void func_80094CBC(GraphicsContext* gfxCtx) { void func_80094D28(Gfx** gfxp) { Gfx* gfx = *gfxp; + gSPDisplayList(gfx++, &sSetupDL[6 * 0x38]); + *gfxp = gfx; } @@ -1293,6 +1295,7 @@ Gfx* Gfx_BranchTexScroll(Gfx** gfxp, u32 x, u32 y, s32 width, s32 height) { gDPTileSync(displayList); gDPSetTileSize(displayList + 1, 0, x, y, (x + ((width - 1) << 2)), (y + ((height - 1) << 2))); gSPEndDisplayList(displayList + 2); + return displayList; } diff --git a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c index d61f00c3df..e498b4c711 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c @@ -1,3 +1,9 @@ +/* + * File: z_bg_mizu_water.c + * Overlay: ovl_Bg_Mizu_Water + * Description: Water plane in Water Temple. Changes height based on switches 0x1C, 0x1D, 0x1E. + */ + #include "z_bg_mizu_water.h" #define FLAGS 0x00000030 @@ -9,7 +15,23 @@ void BgMizuWater_Destroy(Actor* thisx, GlobalContext* globalCtx); void BgMizuWater_Update(Actor* thisx, GlobalContext* globalCtx); void BgMizuWater_Draw(Actor* thisx, GlobalContext* globalCtx); -/* +void BgMizuWater_WaitForAction(BgMizuWater* this, GlobalContext* globalCtx); +void BgMizuWater_ChangeWaterLevel(BgMizuWater* this, GlobalContext* globalCtx); + +extern Gfx D_06004B20[]; + +typedef struct { + s32 switchFlag; + s32 yDiff; +} WaterLevel; + +static WaterLevel sWaterLevels[] = { + { 0x00, 0 }, + { 0x1E, 0 }, + { 0x1D, -320 }, + { 0x1C, -780 }, +}; + const ActorInit Bg_Mizu_Water_InitVars = { ACTOR_BG_MIZU_WATER, ACTORTYPE_BG, @@ -21,19 +43,307 @@ const ActorInit Bg_Mizu_Water_InitVars = { (ActorFunc)BgMizuWater_Update, (ActorFunc)BgMizuWater_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/func_8089F8B0.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/func_8089F9D0.s") +static f32 sUnused1 = 0; +static f32 sUnused2 = 110.0f; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/BgMizuWater_Init.s") +static u32 sWaterBoxIndexes[] = { 2, 3, 5, 7, 12, 20, 21, 22 }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/BgMizuWater_Destroy.s") +static InitChainEntry sInitChain[] = { + ICHAIN_VEC3F(scale, 1, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/func_8089FCF8.s") +u32 BgMizuWater_GetWaterLevelActionIndex(s16 switchFlag, GlobalContext* globalCtx) { + u32 ret; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/func_8089FEC4.s") + if (bREG(0) != 0) { + switch (bREG(1)) { + case 0: + Flags_SetSwitch(globalCtx, 0x1C); + break; + case 1: + Flags_SetSwitch(globalCtx, 0x1D); + break; + case 2: + Flags_SetSwitch(globalCtx, 0x1E); + break; + } + bREG(0) = 0; + } + if (Flags_GetSwitch(globalCtx, 0x1C) && (switchFlag != 0x1C)) { + ret = 3; + } else if (Flags_GetSwitch(globalCtx, 0x1D) && (switchFlag != 0x1D)) { + ret = 2; + } else if (Flags_GetSwitch(globalCtx, 0x1E) && (switchFlag != 0x1E)) { + ret = 1; + } else { + ret = 0; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/BgMizuWater_Update.s") + return ret; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/BgMizuWater_Draw.s") +void BgMizuWater_SetWaterBoxesHeight(WaterBox* waterBoxes, s16 height) { + u32 i; + + for (i = 0; i < 8; i++) { + waterBoxes[sWaterBoxIndexes[i]].unk_02 = height; + } +} + +void BgMizuWater_Init(Actor* thisx, GlobalContext* globalCtx) { + BgMizuWater* this = THIS; + f32 initialActorY; + WaterBox* waterBoxes; + s32 waterLevelActionIndex; + + waterBoxes = globalCtx->colCtx.stat.colHeader->waterBoxes; + this->type = this->actor.params & 0xFF; + this->switchFlag = (this->actor.params >> 8) & 0xFF; + Actor_ProcessInitChain(&this->actor, sInitChain); + initialActorY = this->actor.posRot.pos.y; + this->baseY = initialActorY; + this->targetY = initialActorY; + + switch (this->type) { + case 0: + if (bREG(15) == 0) { + osSyncPrintf("<コンストラクト>%x %x %x\n", Flags_GetSwitch(globalCtx, 0x1C), + Flags_GetSwitch(globalCtx, 0x1D), Flags_GetSwitch(globalCtx, 0x1E)); + } + waterLevelActionIndex = BgMizuWater_GetWaterLevelActionIndex(-1, globalCtx); + this->actor.posRot.pos.y = sWaterLevels[waterLevelActionIndex].yDiff + this->baseY; + BgMizuWater_SetWaterBoxesHeight(waterBoxes, this->actor.posRot.pos.y); + this->actor.params = sWaterLevels[waterLevelActionIndex].switchFlag; + Flags_UnsetSwitch(globalCtx, 0x1C); + Flags_UnsetSwitch(globalCtx, 0x1D); + Flags_UnsetSwitch(globalCtx, 0x1E); + + switch (this->actor.params) { + case 0x1E: + Flags_SetSwitch(globalCtx, 0x1E); + break; + case 0x1D: + Flags_SetSwitch(globalCtx, 0x1D); + break; + case 0x1C: + default: + Flags_SetSwitch(globalCtx, 0x1C); + break; + } + this->targetY = this->actor.posRot.pos.y; + break; + case 1: + break; + case 2: + if (Flags_GetSwitch(globalCtx, this->switchFlag)) { + this->actor.posRot.pos.y = this->baseY + 85.0f; + } + waterBoxes[6].unk_02 = this->actor.posRot.pos.y; + break; + case 3: + if (Flags_GetSwitch(globalCtx, this->switchFlag)) { + this->actor.posRot.pos.y = this->baseY + 110.0f; + if (1) {} + this->targetY = this->actor.posRot.pos.y; + } + waterBoxes[8].unk_02 = this->actor.posRot.pos.y; + break; + case 4: + if (Flags_GetSwitch(globalCtx, this->switchFlag)) { + this->actor.posRot.pos.y = this->baseY + 160.0f; + if (1) {} + this->targetY = this->actor.posRot.pos.y; + } + waterBoxes[16].unk_02 = this->actor.posRot.pos.y; + break; + } + + this->actionFunc = BgMizuWater_WaitForAction; +} + +void BgMizuWater_Destroy(Actor* thisx, GlobalContext* globalCtx) { +} + +void BgMizuWater_WaitForAction(BgMizuWater* this, GlobalContext* globalCtx) { + s32 pad; + s32 waterLevelActionIndex; + s16 prevSwitchFlag; + + switch (this->type) { + case 0: + prevSwitchFlag = this->actor.params; + waterLevelActionIndex = BgMizuWater_GetWaterLevelActionIndex(this->actor.params, globalCtx); + if (waterLevelActionIndex != 0) { + if (prevSwitchFlag != sWaterLevels[waterLevelActionIndex].switchFlag) { + func_800800F8(globalCtx, 0xC30, -0x64 - waterLevelActionIndex, 0, 0); + this->actor.params = sWaterLevels[waterLevelActionIndex].switchFlag; + this->targetY = sWaterLevels[waterLevelActionIndex].yDiff + this->baseY; + } + } + if ((prevSwitchFlag != this->actor.params) && (prevSwitchFlag != 0)) { + Flags_UnsetSwitch(globalCtx, prevSwitchFlag); + } + break; + case 1: + break; + case 2: + if (Flags_GetSwitch(globalCtx, this->switchFlag)) { + this->targetY = this->baseY + 85.0f; + } else { + this->targetY = this->baseY; + } + break; + case 3: + if (Flags_GetSwitch(globalCtx, this->switchFlag)) { + this->targetY = this->baseY + 110.0f; + } else { + this->targetY = this->baseY; + } + break; + case 4: + if (Flags_GetSwitch(globalCtx, this->switchFlag)) { + this->targetY = this->baseY + 160.0f; + } else { + this->targetY = this->baseY; + } + } + + if (this->targetY != this->actor.posRot.pos.y) { + this->actionFunc = BgMizuWater_ChangeWaterLevel; + } +} + +void BgMizuWater_ChangeWaterLevel(BgMizuWater* this, GlobalContext* globalCtx) { + s32 pad; + s16 prevSwitchFlag; + s32 waterLevelActionIndex; + WaterBox* waterBoxes; + + waterBoxes = globalCtx->colCtx.stat.colHeader->waterBoxes; + switch (this->type) { + case 0: + prevSwitchFlag = this->actor.params; + waterLevelActionIndex = BgMizuWater_GetWaterLevelActionIndex(this->actor.params, globalCtx); + if (waterLevelActionIndex != 0) { + if (prevSwitchFlag != sWaterLevels[waterLevelActionIndex].switchFlag) { + this->actor.params = sWaterLevels[waterLevelActionIndex].switchFlag; + this->targetY = sWaterLevels[waterLevelActionIndex].yDiff + this->baseY; + } + } + + if ((prevSwitchFlag != this->actor.params) && (prevSwitchFlag != 0)) { + Flags_UnsetSwitch(globalCtx, prevSwitchFlag); + } + + if (Math_ApproxF(&this->actor.posRot.pos.y, this->targetY, 5.0f)) { + globalCtx->unk_11D30[0] = 0; + this->actionFunc = BgMizuWater_WaitForAction; + func_80106CCC(globalCtx); + } + BgMizuWater_SetWaterBoxesHeight(globalCtx->colCtx.stat.colHeader->waterBoxes, this->actor.posRot.pos.y); + break; + case 1: + break; + case 2: + if (Flags_GetSwitch(globalCtx, this->switchFlag)) { + this->targetY = this->baseY + 85.0f; + } else { + this->targetY = this->baseY; + } + if (Math_ApproxF(&this->actor.posRot.pos.y, this->targetY, 1.0f)) { + globalCtx->unk_11D30[0] = 0; + this->actionFunc = BgMizuWater_WaitForAction; + } + waterBoxes[6].unk_02 = this->actor.posRot.pos.y; + break; + case 3: + if (Flags_GetSwitch(globalCtx, this->switchFlag)) { + this->targetY = this->baseY + 110.0f; + } else { + this->targetY = this->baseY; + } + if (Math_ApproxF(&this->actor.posRot.pos.y, this->targetY, 1.0f)) { + globalCtx->unk_11D30[0] = 0; + this->actionFunc = BgMizuWater_WaitForAction; + } + waterBoxes[8].unk_02 = this->actor.posRot.pos.y; + break; + case 4: + if (Flags_GetSwitch(globalCtx, this->switchFlag)) { + this->targetY = this->baseY + 160.0f; + } else { + this->targetY = this->baseY; + } + if (Math_ApproxF(&this->actor.posRot.pos.y, this->targetY, 1.0f)) { + globalCtx->unk_11D30[0] = 0; + this->actionFunc = BgMizuWater_WaitForAction; + } + waterBoxes[16].unk_02 = this->actor.posRot.pos.y; + break; + } + + if (this->targetY < this->actor.posRot.pos.y) { + func_800AA000(0.0f, 0x78, 0x14, 0xA); + func_8002F948(&this->actor, NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG); + } else if (this->targetY > this->actor.posRot.pos.y) { + func_800AA000(0.0f, 0x78, 0x14, 0xA); + func_8002F948(&this->actor, NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG); + } +} + +void BgMizuWater_Update(Actor* thisx, GlobalContext* globalCtx) { + BgMizuWater* this = THIS; + s32 posY; + s32 unk0; + s32 unk1; + s32 pad; + + if (bREG(15) == 0) { + osSyncPrintf("%x %x %x\n", Flags_GetSwitch(globalCtx, 0x1C), Flags_GetSwitch(globalCtx, 0x1D), + Flags_GetSwitch(globalCtx, 0x1E)); + } + + if (this->type == 0) { + posY = this->actor.posRot.pos.y; + unk0 = 0; + unk1 = 0; + if (posY < -15.0f) { + unk0 = 0; + unk1 = ((posY - -835.0f) / 820.0f) * 200.0f; + } else if (posY < 445.0f) { + unk0 = 1; + unk1 = 0xFF - (s32)(((posY - -15.0f) / 460.0f) * 95.0f); + } else if (posY <= 765.0f) { + unk0 = 2; + unk1 = 0xFF - (s32)(((posY - 445.0f) / 320.0f) * 95.0f); + } + globalCtx->unk_11D30[1] = ((u8)unk0 << 8) | (unk1 & 0xFF); + } + + this->actionFunc(this, globalCtx); +} + +void BgMizuWater_Draw(Actor* thisx, GlobalContext* globalCtx) { + BgMizuWater* this = THIS; + s32 gameplayFrames; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_mizu_water.c", 738); + gameplayFrames = globalCtx->gameplayFrames; + func_80093D84(globalCtx->state.gfxCtx); + + gSPSegment(oGfxCtx->polyXlu.p++, 0x0C, + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, -gameplayFrames * 1, gameplayFrames * 1, 32, 32, 1, 0, + -gameplayFrames * 1, 32, 32)); + + gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mizu_water.c", 749), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + + gDPSetEnvColor(oGfxCtx->polyXlu.p++, 255, 255, 255, 128); + + gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, 255, 255, 255, 102); + + gSPDisplayList(oGfxCtx->polyXlu.p++, D_06004B20); + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_mizu_water.c", 756); +} diff --git a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.h b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.h index bb4439e87a..a1f0b51889 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.h +++ b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.h @@ -6,9 +6,15 @@ struct BgMizuWater; +typedef void (*BgMizuWaterActionFunc)(struct BgMizuWater*, GlobalContext*); + typedef struct BgMizuWater { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x14]; + /* 0x014C */ BgMizuWaterActionFunc actionFunc; + /* 0x0150 */ s32 type; + /* 0x0154 */ f32 targetY; + /* 0x0158 */ f32 baseY; + /* 0x015C */ s32 switchFlag; // only used for types 2-4 } BgMizuWater; // size = 0x0160 extern const ActorInit Bg_Mizu_Water_InitVars; diff --git a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c index a769f40107..4b9042ea95 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c +++ b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c @@ -1,3 +1,9 @@ +/* + * File: z_bg_mori_bigst.c + * Overlay: ovl_Bg_Mori_Bigst + * Description: Forest Temple falling platform and Stalfos fight + */ + #include "z_bg_mori_bigst.h" #define FLAGS 0x00000010 @@ -7,8 +13,24 @@ void BgMoriBigst_Init(Actor* thisx, GlobalContext* globalCtx); void BgMoriBigst_Destroy(Actor* thisx, GlobalContext* globalCtx); void BgMoriBigst_Update(Actor* thisx, GlobalContext* globalCtx); +void BgMoriBigst_Draw(Actor* thisx, GlobalContext* globalCtx); + +void BgMoriBigst_SetupWaitForMoriTex(BgMoriBigst* this, GlobalContext* globalCtx); +void BgMoriBigst_WaitForMoriTex(BgMoriBigst* this, GlobalContext* globalCtx); +void BgMoriBigst_SetupNoop(BgMoriBigst* this, GlobalContext* globalCtx); +void BgMoriBigst_SetupStalfosFight(BgMoriBigst* this, GlobalContext* globalCtx); +void BgMoriBigst_StalfosFight(BgMoriBigst* this, GlobalContext* globalCtx); +void BgMoriBigst_SetupFall(BgMoriBigst* this, GlobalContext* globalCtx); +void BgMoriBigst_Fall(BgMoriBigst* this, GlobalContext* globalCtx); +void BgMoriBigst_SetupLanding(BgMoriBigst* this, GlobalContext* globalCtx); +void BgMoriBigst_Landing(BgMoriBigst* this, GlobalContext* globalCtx); +void BgMoriBigst_SetupStalfosPairFight(BgMoriBigst* this, GlobalContext* globalCtx); +void BgMoriBigst_StalfosPairFight(BgMoriBigst* this, GlobalContext* globalCtx); +void BgMoriBigst_SetupDone(BgMoriBigst* this, GlobalContext* globalCtx); + +extern ColHeader D_0600221C; +extern Gfx D_06001E50[]; -/* const ActorInit Bg_Mori_Bigst_InitVars = { ACTOR_BG_MORI_BIGST, ACTORTYPE_BG, @@ -20,39 +42,220 @@ const ActorInit Bg_Mori_Bigst_InitVars = { (ActorFunc)BgMoriBigst_Update, NULL, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0BC0.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0BC8.s") +static InitChainEntry sInitChain[] = { + ICHAIN_F32(uncullZoneForward, 3000, ICHAIN_CONTINUE), ICHAIN_F32(uncullZoneScale, 3000, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneDownward, 3000, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(gravity, -500, ICHAIN_CONTINUE), + ICHAIN_F32_DIV1000(minVelocityY, -12000, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/BgMoriBigst_Init.s") +void BgMoriBigst_SetupAction(BgMoriBigst* this, BgMoriBigstActionFunc actionFunc) { + this->actionFunc = actionFunc; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/BgMoriBigst_Destroy.s") +void BgMoriBigst_InitDynapoly(BgMoriBigst* this, GlobalContext* globalCtx, ColHeader* collision, s32 moveFlag) { + s32 pad; + ColHeader* colHeader = NULL; + s32 pad2; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0DDC.s") + DynaPolyInfo_SetActorMove(&this->dyna, moveFlag); + DynaPolyInfo_Alloc(collision, &colHeader); + this->dyna.dynaPolyId = + DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0E04.s") + if (this->dyna.dynaPolyId == 0x32) { + // Warning : move BG login failed + osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_mori_bigst.c", 190, + this->dyna.actor.id, this->dyna.actor.params); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0ED0.s") +void BgMoriBigst_Init(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + BgMoriBigst* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0EF4.s") + // mori (bigST.keyceiling) + osSyncPrintf("mori (bigST.鍵型天井)(arg : %04x)(sw %d)(noE %d)(roomC %d)(playerPosY %f)\n", this->dyna.actor.params, + Flags_GetSwitch(globalCtx, (this->dyna.actor.params >> 8) & 0x3F), + Flags_GetTempClear(globalCtx, this->dyna.actor.room), Flags_GetClear(globalCtx, this->dyna.actor.room), + PLAYER->actor.posRot.pos.y); + BgMoriBigst_InitDynapoly(this, globalCtx, &D_0600221C, DPM_UNK); + Actor_ProcessInitChain(&this->dyna.actor, sInitChain); + this->moriTexObjIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_MORI_TEX); + if (this->moriTexObjIndex < 0) { + // 【Big Stalfos key ceiling】 bank danger! + osSyncPrintf("【ビッグスタルフォス鍵型天井】 バンク危険！\n"); + osSyncPrintf("%s %d\n", "../z_bg_mori_bigst.c", 234); + Actor_Kill(&this->dyna.actor); + return; + } + if (Flags_GetSwitch(globalCtx, (this->dyna.actor.params >> 8) & 0x3F)) { + this->dyna.actor.posRot.pos.y = this->dyna.actor.initPosRot.pos.y; + } else { + this->dyna.actor.posRot.pos.y = this->dyna.actor.initPosRot.pos.y + 270.0f; + } + Actor_SetHeight(&this->dyna.actor, 50.0f); + BgMoriBigst_SetupWaitForMoriTex(this, globalCtx); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A0FB0.s") +void BgMoriBigst_Destroy(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + BgMoriBigst* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A1024.s") + DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A104C.s") +void BgMoriBigst_SetupWaitForMoriTex(BgMoriBigst* this, GlobalContext* globalCtx) { + BgMoriBigst_SetupAction(this, BgMoriBigst_WaitForMoriTex); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A10D4.s") +void BgMoriBigst_WaitForMoriTex(BgMoriBigst* this, GlobalContext* globalCtx) { + Actor* thisx = &this->dyna.actor; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A1164.s") + if (Object_IsLoaded(&globalCtx->objectCtx, this->moriTexObjIndex)) { + thisx->draw = BgMoriBigst_Draw; + if (Flags_GetClear(globalCtx, thisx->room) && (PLAYER->actor.posRot.pos.y > 700.0f)) { + if (Flags_GetSwitch(globalCtx, (thisx->params >> 8) & 0x3F)) { + BgMoriBigst_SetupDone(this, globalCtx); + } else { + BgMoriBigst_SetupStalfosFight(this, globalCtx); + } + } else { + BgMoriBigst_SetupNoop(this, globalCtx); + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A1190.s") +void BgMoriBigst_SetupNoop(BgMoriBigst* this, GlobalContext* globalCtx) { + BgMoriBigst_SetupAction(this, NULL); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A12C4.s") +void BgMoriBigst_SetupStalfosFight(BgMoriBigst* this, GlobalContext* globalCtx) { + Actor* stalfos; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A1320.s") + BgMoriBigst_SetupAction(this, BgMoriBigst_StalfosFight); + Flags_UnsetClear(globalCtx, this->dyna.actor.room); + stalfos = Actor_SpawnAsChild(&globalCtx->actorCtx, &this->dyna.actor, globalCtx, ACTOR_EN_TEST, 209.0f, 827.0f, + -3320.0f, 0, 0, 0, 1); + if (stalfos != NULL) { + this->dyna.actor.child = NULL; + this->dyna.actor.initPosRot.rot.z++; + } else { + // Second Stalfos failure + osSyncPrintf("Warning : 第２スタルフォス発生失敗\n"); + } + Flags_SetClear(globalCtx, this->dyna.actor.room); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/BgMoriBigst_Update.s") +void BgMoriBigst_StalfosFight(BgMoriBigst* this, GlobalContext* globalCtx) { + Player* player = PLAYER; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A13B4.s") + if ((this->dyna.actor.initPosRot.rot.z == 0) && + ((this->dyna.actor.initPosRot.pos.y - 5.0f) <= PLAYER->actor.posRot.pos.y)) { + BgMoriBigst_SetupFall(this, globalCtx); + func_800800F8(globalCtx, 0xC94, 0x48, &this->dyna.actor, 0); + } +} + +void BgMoriBigst_SetupFall(BgMoriBigst* this, GlobalContext* globalCtx) { + BgMoriBigst_SetupAction(this, BgMoriBigst_Fall); +} + +void BgMoriBigst_Fall(BgMoriBigst* this, GlobalContext* globalCtx) { + Actor_MoveForward(&this->dyna.actor); + if (this->dyna.actor.posRot.pos.y <= this->dyna.actor.initPosRot.pos.y) { + this->dyna.actor.posRot.pos.y = this->dyna.actor.initPosRot.pos.y; + BgMoriBigst_SetupLanding(this, globalCtx); + Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_STONE_BOUND); + func_800800F8(globalCtx, 0x3FC, 8, &this->dyna.actor, 0); + func_8002DF38(globalCtx, NULL, 0x3C); + } +} + +void BgMoriBigst_SetupLanding(BgMoriBigst* this, GlobalContext* globalCtx) { + s32 pad; + s32 quake; + + BgMoriBigst_SetupAction(this, BgMoriBigst_Landing); + this->waitTimer = 18; + quake = Quake_Add(ACTIVE_CAM, 3); + Quake_SetSpeed(quake, 25000); + Quake_SetQuakeValues(quake, 5, 0, 0, 0); + Quake_SetCountdown(quake, 16); +} + +void BgMoriBigst_Landing(BgMoriBigst* this, GlobalContext* globalCtx) { + if (this->waitTimer <= 0) { + BgMoriBigst_SetupStalfosPairFight(this, globalCtx); + } +} + +void BgMoriBigst_SetupStalfosPairFight(BgMoriBigst* this, GlobalContext* globalCtx) { + Actor* stalfos1; + Actor* stalfos2; + + BgMoriBigst_SetupAction(this, BgMoriBigst_StalfosPairFight); + Flags_UnsetClear(globalCtx, this->dyna.actor.room); + stalfos1 = + Actor_SpawnAsChild(&globalCtx->actorCtx, &this->dyna.actor, globalCtx, ACTOR_EN_TEST, 70.0f, 827.0f, -3383.0f, 0, 0, 0, 5); + if (stalfos1 != NULL) { + this->dyna.actor.child = NULL; + this->dyna.actor.initPosRot.rot.z++; + } else { + // Warning: 3-1 Stalfos failure + osSyncPrintf("Warning : 第３-1スタルフォス発生失敗\n"); + } + stalfos2 = + Actor_SpawnAsChild(&globalCtx->actorCtx, &this->dyna.actor, globalCtx, ACTOR_EN_TEST, 170.0f, 827.0f, -3260.0f, 0, 0, 0, 5); + if (stalfos2 != NULL) { + this->dyna.actor.child = NULL; + this->dyna.actor.initPosRot.rot.z++; + } else { + // Warning: 3-2 Stalfos failure + osSyncPrintf("Warning : 第３-2スタルフォス発生失敗\n"); + } + Flags_SetClear(globalCtx, this->dyna.actor.room); +} + +void BgMoriBigst_StalfosPairFight(BgMoriBigst* this, GlobalContext* globalCtx) { + if ((this->dyna.actor.initPosRot.rot.z == 0) && !Player_InCsMode(globalCtx)) { + Flags_SetSwitch(globalCtx, (this->dyna.actor.params >> 8) & 0x3F); + BgMoriBigst_SetupDone(this, globalCtx); + } +} + +void BgMoriBigst_SetupDone(BgMoriBigst* this, GlobalContext* globalCtx) { + BgMoriBigst_SetupAction(this, NULL); +} + +void BgMoriBigst_Update(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + BgMoriBigst* this = THIS; + + Actor_SetHeight(&this->dyna.actor, 50.0f); + if (this->waitTimer > 0) { + this->waitTimer--; + } + if (func_80043590(&this->dyna)) { + func_80074CE8(globalCtx, 6); + } + if (this->actionFunc != NULL) { + this->actionFunc(this, globalCtx); + } +} + +void BgMoriBigst_Draw(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + BgMoriBigst* this = THIS; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_mori_bigst.c", 541); + func_80093D18(globalCtx->state.gfxCtx); + + gSPSegment(oGfxCtx->polyOpa.p++, 0x08, globalCtx->objectCtx.status[this->moriTexObjIndex].segment); + + gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mori_bigst.c", 548), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + + gSPDisplayList(oGfxCtx->polyOpa.p++, D_06001E50); + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_mori_bigst.c", 553); +} diff --git a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.h b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.h index ea622b843c..0900447327 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.h +++ b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.h @@ -6,9 +6,13 @@ struct BgMoriBigst; +typedef void (*BgMoriBigstActionFunc)(struct BgMoriBigst*, GlobalContext*); + typedef struct BgMoriBigst { - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x20]; + /* 0x0000 */ DynaPolyActor dyna; + /* 0x0164 */ BgMoriBigstActionFunc actionFunc; + /* 0x0168 */ s16 waitTimer; + /* 0x016A */ s8 moriTexObjIndex; } BgMoriBigst; // size = 0x016C extern const ActorInit Bg_Mori_Bigst_InitVars; diff --git a/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c b/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c index ffd20f6ea7..df0102b39a 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c +++ b/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c @@ -1,3 +1,9 @@ +/* + * File: z_bg_mori_hashira4 + * Overlay: ovl_Bg_Mori_Hashira4 + * Description: Forest Temple gates and rotating pillars + */ + #include "z_bg_mori_hashira4.h" #define FLAGS 0x00000010 @@ -7,8 +13,18 @@ void BgMoriHashira4_Init(Actor* thisx, GlobalContext* globalCtx); void BgMoriHashira4_Destroy(Actor* thisx, GlobalContext* globalCtx); void BgMoriHashira4_Update(Actor* thisx, GlobalContext* globalCtx); +void BgMoriHashira4_Draw(Actor* thisx, GlobalContext* globalCtx); + +void BgMoriHashira4_SetupWaitForMoriTex(BgMoriHashira4* this); +void BgMoriHashira4_WaitForMoriTex(BgMoriHashira4* this, GlobalContext* globalCtx); +void BgMoriHashira4_SetupPillarsRotate(BgMoriHashira4* this); +void BgMoriHashira4_PillarsRotate(BgMoriHashira4* this, GlobalContext* globalCtx); +void BgMoriHashira4_GateWait(BgMoriHashira4* this, GlobalContext* globalCtx); +void BgMoriHashira4_GateOpen(BgMoriHashira4* this, GlobalContext* globalCtx); + +extern ColHeader D_06001AF8; +extern ColHeader D_060089E0; -/* const ActorInit Bg_Mori_Hashira4_InitVars = { ACTOR_BG_MORI_HASHIRA4, ACTORTYPE_BG, @@ -20,27 +36,143 @@ const ActorInit Bg_Mori_Hashira4_InitVars = { (ActorFunc)BgMoriHashira4_Update, NULL, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3060.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3068.s") +static InitChainEntry sInitChain[] = { + ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneScale, 700, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_CONTINUE), + ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/BgMoriHashira4_Init.s") +static Gfx* sDisplayLists[] = { 0x06001300, 0x06008840 }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/BgMoriHashira4_Destroy.s") +static s16 sUnkTimer; // seems to be unused -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A325C.s") +void BgMoriHashira4_SetupAction(BgMoriHashira4* this, BgMoriHashira4ActionFunc actionFunc) { + this->actionFunc = actionFunc; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3280.s") +void BgMoriHashira4_InitDynaPoly(BgMoriHashira4* this, GlobalContext* globalCtx, ColHeader* collision, s32 moveFlag) { + s32 pad; + ColHeader* colHeader; + s32 pad2; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A32F8.s") + colHeader = NULL; + DynaPolyInfo_SetActorMove(&this->dyna, moveFlag); + DynaPolyInfo_Alloc(collision, &colHeader); + this->dyna.dynaPolyId = + DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A331C.s") + if (this->dyna.dynaPolyId == 0x32) { + // Warning : move BG login failed + osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_mori_hashira4.c", 155, + this->dyna.actor.id, this->dyna.actor.params); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3354.s") +void BgMoriHashira4_Init(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + BgMoriHashira4* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3400.s") + this->switchFlag = (this->dyna.actor.params >> 8) & 0x3F; + this->dyna.actor.params &= 0xFF; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/BgMoriHashira4_Update.s") + if (this->dyna.actor.params == 0) { + BgMoriHashira4_InitDynaPoly(this, globalCtx, &D_06001AF8, DPM_UNK3); + } else { + BgMoriHashira4_InitDynaPoly(this, globalCtx, &D_060089E0, DPM_UNK); + } + Actor_ProcessInitChain(&this->dyna.actor, sInitChain); + this->moriTexObjIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_MORI_TEX); + if (this->moriTexObjIndex < 0) { + Actor_Kill(&this->dyna.actor); + // Bank danger! + osSyncPrintf("Error : バンク危険！(arg_data 0x%04x)(%s %d)\n", this->dyna.actor.params, + "../z_bg_mori_hashira4.c", 196); + return; + } + if ((this->dyna.actor.params != 0) && Flags_GetSwitch(globalCtx, this->switchFlag)) { + Actor_Kill(&this->dyna.actor); + return; + } + Actor_SetHeight(&this->dyna.actor, 50.0f); + BgMoriHashira4_SetupWaitForMoriTex(this); + // (4 pillars of the Forest Temple) Bank danger + osSyncPrintf("(森の神殿 ４本柱)(arg_data 0x%04x)\n", this->dyna.actor.params); + sUnkTimer = 0; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3484.s") +void BgMoriHashira4_Destroy(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + BgMoriHashira4* this = THIS; + + DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); +} + +void BgMoriHashira4_SetupWaitForMoriTex(BgMoriHashira4* this) { + BgMoriHashira4_SetupAction(this, BgMoriHashira4_WaitForMoriTex); +} + +void BgMoriHashira4_WaitForMoriTex(BgMoriHashira4* this, GlobalContext* globalCtx) { + if (Object_IsLoaded(&globalCtx->objectCtx, this->moriTexObjIndex)) { + this->gateTimer = 0; + if (this->dyna.actor.params == 0) { + BgMoriHashira4_SetupPillarsRotate(this); + } else { + BgMoriHashira4_SetupAction(this, BgMoriHashira4_GateWait); + } + this->dyna.actor.draw = BgMoriHashira4_Draw; + } +} + +void BgMoriHashira4_SetupPillarsRotate(BgMoriHashira4* this) { + BgMoriHashira4_SetupAction(this, BgMoriHashira4_PillarsRotate); +} + +void BgMoriHashira4_PillarsRotate(BgMoriHashira4* this, GlobalContext* globalCtx) { + this->dyna.actor.shape.rot.y = this->dyna.actor.posRot.rot.y += 0x96; + Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_ROLL_STAND_2 - SFX_FLAG); +} + +void BgMoriHashira4_GateWait(BgMoriHashira4* this, GlobalContext* globalCtx) { + if (Flags_GetSwitch(globalCtx, this->switchFlag) || (this->gateTimer != 0)) { + this->gateTimer++; + if (this->gateTimer > 30) { + Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_METALDOOR_OPEN); + BgMoriHashira4_SetupAction(this, BgMoriHashira4_GateOpen); + func_800800F8(globalCtx, 0x177A, 0x14, &this->dyna.actor, 0); + sUnkTimer++; + } + } +} + +void BgMoriHashira4_GateOpen(BgMoriHashira4* this, GlobalContext* globalCtx) { + if (Math_ApproxF(&this->dyna.actor.posRot.pos.y, this->dyna.actor.initPosRot.pos.y + 120.0f, 10.0f)) { + Actor_Kill(&this->dyna.actor); + } +} + +void BgMoriHashira4_Update(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + BgMoriHashira4* this = THIS; + + if (this->actionFunc != NULL) { + this->actionFunc(this, globalCtx); + } +} + +void BgMoriHashira4_Draw(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + BgMoriHashira4* this = THIS; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_mori_hashira4.c", 339); + func_80093D18(globalCtx->state.gfxCtx); + + gSPSegment(oGfxCtx->polyOpa.p++, 0x08, globalCtx->objectCtx.status[this->moriTexObjIndex].segment); + + gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mori_hashira4.c", 344), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + + gSPDisplayList(oGfxCtx->polyOpa.p++, sDisplayLists[this->dyna.actor.params]); + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_mori_hashira4.c", 348); +} diff --git a/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.h b/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.h index 3236c44a06..303c369ea6 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.h +++ b/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.h @@ -6,9 +6,14 @@ struct BgMoriHashira4; +typedef void (*BgMoriHashira4ActionFunc)(struct BgMoriHashira4*, GlobalContext*); + typedef struct BgMoriHashira4 { - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x20]; + /* 0x0000 */ DynaPolyActor dyna; + /* 0x0164 */ BgMoriHashira4ActionFunc actionFunc; + /* 0x0168 */ s8 moriTexObjIndex; + /* 0x0169 */ s8 switchFlag; + /* 0x016A */ s16 gateTimer; } BgMoriHashira4; // size = 0x016C extern const ActorInit Bg_Mori_Hashira4_InitVars; diff --git a/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c b/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c index 5897ccfbc2..b869a1b3ad 100644 --- a/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c +++ b/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c @@ -9,7 +9,20 @@ void BgSpot15Rrbox_Destroy(Actor* thisx, GlobalContext* globalCtx); void BgSpot15Rrbox_Update(Actor* thisx, GlobalContext* globalCtx); void BgSpot15Rrbox_Draw(Actor* thisx, GlobalContext* globalCtx); -/* +void func_808B4084(BgSpot15Rrbox* this, GlobalContext* globalCtx); +void func_808B40AC(BgSpot15Rrbox* this, GlobalContext* globalCtx); +void func_808B4194(BgSpot15Rrbox* this, GlobalContext* globalCtx); +void func_808B4380(BgSpot15Rrbox* this, GlobalContext* globalCtx); +void func_808B43D0(BgSpot15Rrbox* this, GlobalContext* globalCtx); +void func_808B44B8(BgSpot15Rrbox* this, GlobalContext* globalCtx); +void func_808B4178(BgSpot15Rrbox* this, GlobalContext* globalCtx); +void func_808B44CC(BgSpot15Rrbox* this, GlobalContext* globalCtx); + +s16 D_808B4590 = 0; + +extern UNK_TYPE D_06000348; +extern Gfx D_06000180[]; + const ActorInit Bg_Spot15_Rrbox_InitVars = { ACTOR_BG_SPOT15_RRBOX, ACTORTYPE_BG, @@ -21,45 +34,331 @@ const ActorInit Bg_Spot15_Rrbox_InitVars = { (ActorFunc)BgSpot15Rrbox_Update, (ActorFunc)BgSpot15Rrbox_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3960.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B39E8.s") +static InitChainEntry sInitChain[] = { + ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3A34.s") +Vec3f D_808B45C4[] = { + { 770.0f, 1490.0f, -299.0f }, + { 770.0f, 1550.0f, -299.0f }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3A40.s") +Vec3f D_808B45DC[] = { + { 29.99f, 0.01f, -29.99f }, { -29.99f, 0.01f, -29.99f }, { -29.99f, 0.01f, 29.99f }, + { 29.99f, 0.01f, 29.99f }, { 0.0f, 0.01f, 0.0f }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3AAC.s") +void func_808B3960(BgSpot15Rrbox* this, GlobalContext* globalCtx, UNK_TYPE* arg2, DynaPolyMoveFlag flags) { + s32 pad; + UNK_TYPE temp = 0; + u32 pad2; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/BgSpot15Rrbox_Init.s") + DynaPolyInfo_SetActorMove(&this->dyna, flags); + DynaPolyInfo_Alloc(arg2, &temp); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/BgSpot15Rrbox_Destroy.s") + this->dyna.dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, temp); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3CA0.s") + if (this->dyna.dynaPolyId == 0x32) { + osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_spot15_rrbox.c", 171, + this->dyna.actor.id, this->dyna.actor.params); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3DDC.s") +void func_808B39E8(Vec3f* arg0, Vec3f* arg1, f32 arg2, f32 arg3) { + arg0->x = (arg1->z * arg2) + (arg1->x * arg3); + arg0->y = arg1->y; + arg0->z = (arg1->z * arg3) - (arg1->x * arg2); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B3F58.s") +void func_808B3A34(BgSpot15Rrbox* this) { + this->bgId = 50; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B4010.s") +s32 func_808B3A40(BgSpot15Rrbox* this, GlobalContext* globalCtx) { + DynaPolyActor* dynaPolyActor = DynaPolyInfo_GetActor(&globalCtx->colCtx, this->bgId); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B4084.s") + if (dynaPolyActor != NULL && + Math3D_Dist2DSq(dynaPolyActor->actor.posRot.pos.x, dynaPolyActor->actor.posRot.pos.z, + this->dyna.actor.posRot.pos.x, this->dyna.actor.posRot.pos.z) < 0.01f) { + return true; + } + return false; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B40AC.s") +s32 func_808B3AAC(BgSpot15Rrbox* this, GlobalContext* globalCtx) { + s16 rotY; + Actor* actor = &this->dyna.actor; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B4178.s") + if (globalCtx->sceneNum == SCENE_SOUKO) { + return true; + } else if (func_808B3A40(this, globalCtx)) { + return false; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B4194.s") + if (actor->posRot.pos.x <= 930.0f && actor->posRot.pos.z >= -360.0f) { + if (this->dyna.unk_150 >= 0.0f) { + rotY = actor->posRot.rot.y; + } else { + rotY = actor->posRot.rot.y + 0x8000; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B4380.s") + if (rotY < 0x2000 && rotY > -0x6000) { + return gSaveContext.eventChkInf[1] & 0x10; + } + return true; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B43D0.s") + return true; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B44B8.s") +void BgSpot15Rrbox_Init(Actor* thisx, GlobalContext* globalCtx) { + BgSpot15Rrbox* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/func_808B44CC.s") + func_808B3960(this, globalCtx, &D_06000348, DPM_UNK); + Actor_ProcessInitChain(&this->dyna.actor, sInitChain); + func_808B3A34(this); + if (Flags_GetSwitch(globalCtx, (this->dyna.actor.params & 0x3F))) { + func_808B44B8(this, globalCtx); + this->dyna.actor.posRot.pos = D_808B45C4[D_808B4590]; + D_808B4590++; + } else { + func_808B4084(this, globalCtx); + } + osSyncPrintf("(spot15 ロンロン木箱)(arg_data 0x%04x)\n", this->dyna.actor.params); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/BgSpot15Rrbox_Update.s") +void BgSpot15Rrbox_Destroy(Actor* thisx, GlobalContext* globalCtx) { + BgSpot15Rrbox* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/BgSpot15Rrbox_Draw.s") + DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); + D_808B4590 = 0; +} + +s32 func_808B3CA0(BgSpot15Rrbox* this, GlobalContext* globalCtx, s32 arg2) { + f32 chkDist = 0.0f; + Vec3f actorPosition; + Vec3f actorScale; + + func_808B3A34(this); + + actorScale.x = D_808B45DC[arg2].x * (this->dyna.actor.scale.x * 10.0f); + actorScale.y = D_808B45DC[arg2].y * (this->dyna.actor.scale.y * 10.0f); + actorScale.z = D_808B45DC[arg2].z * (this->dyna.actor.scale.z * 10.0f); + + func_808B39E8(&actorPosition, &actorScale, this->unk_16C, this->unk_170); + + actorPosition.x += this->dyna.actor.posRot.pos.x; + actorPosition.y += this->dyna.actor.pos4.y; + actorPosition.z += this->dyna.actor.posRot.pos.z; + + this->dyna.actor.groundY = func_8003CA64(&globalCtx->colCtx, &this->dyna.actor.floorPoly, &this->bgId, + &this->dyna.actor, &actorPosition, chkDist); + + if ((this->dyna.actor.groundY - this->dyna.actor.posRot.pos.y) >= -0.001f) { + this->dyna.actor.posRot.pos.y = this->dyna.actor.groundY; + return true; + } + return false; +} + +f32 func_808B3DDC(BgSpot15Rrbox* this, GlobalContext* globalCtx) { + s32 i; + Vec3f position; + Vec3f scale; + Actor* actor = &this->dyna.actor; + f32 yIntersect; + f32 returnValue = -32000.0f; + s32 bgId; + + func_808B3A34(this); + for (i = 0; i < ARRAY_COUNT(D_808B45DC); i++) { + scale.x = D_808B45DC[i].x * (actor->scale.x * 10.0f); + scale.y = D_808B45DC[i].y * (actor->scale.y * 10.0f); + scale.z = D_808B45DC[i].z * (actor->scale.z * 10.0f); + + func_808B39E8(&position, &scale, this->unk_16C, this->unk_170); + + position.x += actor->posRot.pos.x; + position.y += actor->pos4.y; + position.z += actor->posRot.pos.z; + + yIntersect = func_8003CA64(&globalCtx->colCtx, &actor->floorPoly, &bgId, actor, &position, 0); + + if (returnValue < yIntersect) { + returnValue = yIntersect; + this->bgId = bgId; + } + } + return returnValue; +} + +s32 func_808B3F58(BgSpot15Rrbox* this, GlobalContext* globalCtx) { + if (func_808B3CA0(this, globalCtx, 0)) { + return true; + } + if (func_808B3CA0(this, globalCtx, 1)) { + return true; + } + if (func_808B3CA0(this, globalCtx, 2)) { + return true; + } + if (func_808B3CA0(this, globalCtx, 3)) { + return true; + } + if (func_808B3CA0(this, globalCtx, 4)) { + return true; + } + return false; +} + +s32 func_808B4010(BgSpot15Rrbox* this, GlobalContext* globalCtx) { + return !func_800435D8(globalCtx, &this->dyna, this->dyna.actor.scale.x * 290.0f, + this->dyna.actor.scale.x * 290.0f + 20.0f, 1.0f); +} + +void func_808B4084(BgSpot15Rrbox* this, GlobalContext* globalCtx) { + this->actionFunc = func_808B40AC; + this->dyna.actor.gravity = 0.0f; + this->dyna.actor.velocity.x = 0.0f; + this->dyna.actor.velocity.y = 0.0f; + this->dyna.actor.velocity.z = 0.0f; +} + +void func_808B40AC(BgSpot15Rrbox* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + if (this->unk_168 <= 0 && fabsf(this->dyna.unk_150) > 0.001f) { + if (func_808B3AAC(this, globalCtx) && !func_808B4010(this, globalCtx)) { + this->unk_17C = this->dyna.unk_150; + func_808B4178(this, globalCtx); + } else { + player->stateFlags2 &= ~0x10; + this->dyna.unk_150 = 0.0f; + } + } else { + player->stateFlags2 &= ~0x10; + this->dyna.unk_150 = 0.0f; + } +} + +void func_808B4178(BgSpot15Rrbox* this, GlobalContext* globalCtx) { + this->actionFunc = func_808B4194; + this->dyna.actor.gravity = 0.0f; +} + +void func_808B4194(BgSpot15Rrbox* this, GlobalContext* globalCtx) { + f32 sign; + Player* player = PLAYER; + f32 tempUnk178; + s32 approxFResult; + Actor* actor = &this->dyna.actor; + + this->unk_174 += 0.5f; + + this->unk_174 = CLAMP_MAX(this->unk_174, 2.0f); + + approxFResult = Math_ApproxF(&this->unk_178, 20.0f, this->unk_174); + + sign = this->unk_17C >= 0.0f ? 1.0f : -1.0f; + + tempUnk178 = (f32)sign * this->unk_178; + actor->posRot.pos.x = actor->initPosRot.pos.x + (tempUnk178 * this->unk_16C); + actor->posRot.pos.z = actor->initPosRot.pos.z + (tempUnk178 * this->unk_170); + + if (!func_808B3F58(this, globalCtx)) { + actor->initPosRot.pos.x = actor->posRot.pos.x; + actor->initPosRot.pos.z = actor->posRot.pos.z; + player->stateFlags2 &= ~0x10; + this->dyna.unk_150 = 0.0f; + this->unk_178 = 0.0f; + this->unk_174 = 0.0f; + func_808B4380(this, globalCtx); + } else if (approxFResult) { + player = PLAYER; + if (func_808B4010(this, globalCtx)) { + Audio_PlayActorSound2(actor, NA_SE_EV_WOOD_BOUND); + } + if (func_808B3A40(this, globalCtx)) { + func_80078884(NA_SE_SY_CORRECT_CHIME); + } + actor->initPosRot.pos.x = actor->posRot.pos.x; + actor->initPosRot.pos.z = actor->posRot.pos.z; + player->stateFlags2 &= ~0x10; + this->dyna.unk_150 = 0.0f; + this->unk_178 = 0.0f; + this->unk_174 = 0.0f; + this->unk_168 = 10; + func_808B4084(this, globalCtx); + } + Audio_PlayActorSound2(actor, NA_SE_EV_ROCK_SLIDE - SFX_FLAG); +} + +void func_808B4380(BgSpot15Rrbox* this, GlobalContext* globalCtx) { + this->dyna.actor.velocity.x = 0.0f; + this->dyna.actor.velocity.y = 0.0f; + this->dyna.actor.velocity.z = 0.0f; + this->dyna.actor.gravity = -1.0f; + this->dyna.actor.groundY = func_808B3DDC(this, globalCtx); + this->actionFunc = func_808B43D0; +} + +void func_808B43D0(BgSpot15Rrbox* this, GlobalContext* globalCtx) { + f32 groundY; + Player* player = PLAYER; + Actor* actor = &this->dyna.actor; + + if (fabsf(this->dyna.unk_150) > 0.001f) { + this->dyna.unk_150 = 0.0f; + player->stateFlags2 &= ~0x10; + } + + Actor_MoveForward(actor); + + if (actor->posRot.pos.y <= -31990.0f) { + osSyncPrintf("Warning : ロンロン木箱落ちすぎた(%s %d)(arg_data 0x%04x)\n", "../z_bg_spot15_rrbox.c", 599, + actor->params); + + Actor_Kill(actor); + + return; + } + + groundY = actor->groundY; + + if ((groundY - actor->posRot.pos.y) >= -0.001f) { + actor->posRot.pos.y = groundY; + func_808B4084(this, globalCtx); + Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_WOOD_BOUND); + } +} + +void func_808B44B8(BgSpot15Rrbox* this, GlobalContext* globalCtx) { + this->actionFunc = func_808B44CC; +} + +void func_808B44CC(BgSpot15Rrbox* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + player->stateFlags2 &= ~0x10; + this->dyna.unk_150 = 0.0f; +} + +void BgSpot15Rrbox_Update(Actor* thisx, GlobalContext* globalCtx) { + BgSpot15Rrbox* this = THIS; + + if (this->unk_168 > 0) { + this->unk_168--; + } + this->dyna.actor.posRot.rot.y = this->dyna.unk_158; + this->unk_16C = Math_Sins(this->dyna.actor.posRot.rot.y); + this->unk_170 = Math_Coss(this->dyna.actor.posRot.rot.y); + this->actionFunc(this, globalCtx); +} + +void BgSpot15Rrbox_Draw(Actor* thisx, GlobalContext* globalCtx) { + Gfx_DrawDListOpa(globalCtx, D_06000180); +} diff --git a/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.h b/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.h index 47401955cf..a2c1762df8 100644 --- a/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.h +++ b/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.h @@ -6,9 +6,18 @@ struct BgSpot15Rrbox; +typedef void (*BgSpot15RrboxActionFunc)(struct BgSpot15Rrbox*, GlobalContext*); + typedef struct BgSpot15Rrbox { - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x38]; + /* 0x0000 */ DynaPolyActor dyna; + /* 0x0164 */ BgSpot15RrboxActionFunc actionFunc; + /* 0x0168 */ s16 unk_168; + /* 0x016C */ f32 unk_16C; + /* 0x0170 */ f32 unk_170; + /* 0x0174 */ f32 unk_174; + /* 0x0178 */ f32 unk_178; + /* 0x017C */ f32 unk_17C; + /* 0x0180 */ s32 bgId; } BgSpot15Rrbox; // size = 0x0184 extern const ActorInit Bg_Spot15_Rrbox_InitVars; diff --git a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c index 0ad4fc413a..4996233d44 100644 --- a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c +++ b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c @@ -1,4 +1,5 @@ #include "z_bg_spot16_bombstone.h" +#include "overlays/actors/ovl_En_Bombf/z_en_bombf.h" #define FLAGS 0x00000010 @@ -9,7 +10,79 @@ void BgSpot16Bombstone_Destroy(Actor* thisx, GlobalContext* globalCtx); void BgSpot16Bombstone_Update(Actor* thisx, GlobalContext* globalCtx); void BgSpot16Bombstone_Draw(Actor* thisx, GlobalContext* globalCtx); -/* +void func_808B5A94(BgSpot16Bombstone* this, GlobalContext* globalCtx); +void func_808B5B04(BgSpot16Bombstone* this, GlobalContext* globalCtx); +void func_808B5B6C(BgSpot16Bombstone* this, GlobalContext* globalCtx); +void func_808B5B58(BgSpot16Bombstone* this); +void func_808B5950(BgSpot16Bombstone* this, GlobalContext* globalCtx); +void func_808B5934(BgSpot16Bombstone* this); +void func_808B5AF0(BgSpot16Bombstone* this); +void func_808B5A78(BgSpot16Bombstone* this); + +extern Gfx D_06000C20[]; +extern Gfx D_060009E0[]; + +static EnBombf* sPlayerBomb = NULL; + +static s16 sTimer = 0; + +s16 D_808B5DD8[][10] = { + { 0x0008, 0x0004, 0x0046, 0x07D0, 0xFCE0, 0x0000, 0x0064, 0x0000, 0x0000, 0x0000 }, + { 0x0006, 0x0003, 0x0032, 0x00C8, 0x0A28, 0xC350, 0x005A, 0x0000, 0x0000, 0x0000 }, + { 0x0005, 0x0003, 0x0028, 0xF63C, 0x0190, 0x30B0, 0x0032, 0x0000, 0x0000, 0x0000 }, + { 0x0003, 0x0001, 0x003C, 0x0258, 0xFF9C, 0xAFC8, 0x0032, 0x0000, 0x0000, 0x0000 }, + { 0x0003, 0x0001, 0x0028, 0xF2B8, 0xFF9C, 0x6590, 0x001E, 0x0000, 0x0000, 0x0000 }, + { 0x0006, 0x0009, 0x0028, 0x0000, 0x0BB8, 0xD8F0, 0x001E, 0x0000, 0x0000, 0x0000 }, +}; + +static ColliderJntSphItemInit sJntSphItemsInit[] = { + { + { 0x00, { 0x00000000, 0x00, 0x00 }, { 0x4FC1FFF6, 0x00, 0x00 }, 0x00, 0x01, 0x01 }, + { 0, { { 0, 50, 0 }, 288 }, 100 }, + }, +}; + +static ColliderJntSphInit sJntSphInit = { + { COLTYPE_UNK12, 0x00, 0x0D, 0x39, 0x20, COLSHAPE_JNTSPH }, + 1, + sJntSphItemsInit, +}; + +static ColliderCylinderInit sCylinderInit = { + { COLTYPE_UNK10, 0x00, 0x09, 0x00, 0x00, COLSHAPE_CYLINDER }, + { 0x00, { 0x00000000, 0x00, 0x00 }, { 0x00000008, 0x00, 0x00 }, 0x00, 0x01, 0x00 }, + { 190, 80, 0, { 10, 0, 50 } }, +}; + +static s16 D_808B5EB0[][7] = { + { 0x0000, 0x000A, 0x003C, 0xFFF6, 0x0104, 0x01E0, 0x0007 }, + { 0x0000, 0x0000, 0x0032, 0x0000, 0x0104, 0x017C, 0x000D }, + { 0x0001, 0x001E, 0x0014, 0x0014, 0x00A0, 0x0104, 0x000A }, + { 0x0002, 0x0014, 0x0028, 0x0014, 0x00C8, 0x0096, 0x0007 }, + { 0x0003, 0xFFD8, 0x0064, 0x001E, 0x00D2, 0x0064, 0x0007 }, + { 0x0004, 0x000A, 0x0078, 0x000A, 0x00A0, 0x0028, 0x000A }, + { 0x0005, 0xFFA7, 0x006E, 0x0041, 0x0096, 0x0118, 0x0007 }, + { 0x0006, 0xFFC4, 0x0070, 0x006D, 0x006E, 0x0082, 0x0007 }, + { 0x0007, 0xFFF2, 0x0050, 0x007F, 0x008C, 0x00D2, 0x0007 }, + { 0x0008, 0x0014, 0x0032, 0x001E, 0x008C, 0x00C8, 0x0007 }, + { 0x0009, 0xFFEC, 0x0014, 0x0028, 0x00C8, 0x00B4, 0x0007 }, + { 0x000A, 0x001E, 0x0028, 0xFFE2, 0x0064, 0x0078, 0x0007 }, + { 0x000A, 0xFF92, 0x001D, 0x0078, 0x008C, 0x0118, 0x000A }, + { 0x000B, 0x001E, 0x0014, 0x001E, 0x0050, 0x00C8, 0x0006 }, + { 0x000C, 0x0028, 0x001E, 0xFFE2, 0x00AA, 0x010E, 0x0011 }, + { 0x000D, 0xFFD8, 0x0032, 0xFFEC, 0x008C, 0x0056, 0x0006 }, + { 0x000D, 0x0032, 0x0032, 0x0032, 0x0096, 0x00C8, 0x000A }, + { 0x000E, 0x0028, 0x0028, 0xFFD8, 0x003C, 0x00A0, 0x0006 }, + { 0x000F, 0xFFE2, 0x0014, 0x0032, 0x00AA, 0x012C, 0x0006 }, + { 0x0010, 0x0028, 0x0032, 0x0014, 0x00AA, 0x0078, 0x0007 }, + { 0x0010, 0x001E, 0x0032, 0x003C, 0x0096, 0x00C8, 0x0006 }, + { 0x0011, 0x000A, 0x000A, 0x0000, 0x0082, 0x00DC, 0x0006 }, + { 0x0012, 0x000A, 0x0028, 0x0014, 0x00B4, 0x00DC, 0x000B }, + { 0x0013, 0x000A, 0x0005, 0x0000, 0x006E, 0x0046, 0x0011 }, + { 0x0013, 0xFFEC, 0x0032, 0xFFE2, 0x0096, 0x00C8, 0x0006 }, + { 0x0014, 0x0050, 0x0032, 0x0000, 0x0096, 0x00C8, 0x0008 }, +}; + const ActorInit Bg_Spot16_Bombstone_InitVars = { ACTOR_BG_SPOT16_BOMBSTONE, ACTORTYPE_PROP, @@ -21,49 +94,434 @@ const ActorInit Bg_Spot16_Bombstone_InitVars = { (ActorFunc)BgSpot16Bombstone_Update, (ActorFunc)BgSpot16Bombstone_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B4C30.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B4C4C.s") +static InitChainEntry sInitChainBoulder[] = { + ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B4D04.s") +static InitChainEntry sInitChainDebris[] = { + ICHAIN_F32(gravity, -1, ICHAIN_CONTINUE), + ICHAIN_F32(minVelocityY, -10, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneScale, 200, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B4D9C.s") +static Vec3f sVelocity = { 0.0f, 0.0f, 0.0f }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B4E58.s") +static Vec3f sAcceleration = { 0.0f, 0.4f, 0.0f }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/BgSpot16Bombstone_Init.s") +static f32 D_808B6074[] = { 66.0f, 51.0f, 48.0f, 36.0f, 21.0f }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/BgSpot16Bombstone_Destroy.s") +static s16 D_808B6088[] = { 0, 1, 2, 3, 4 }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B51A8.s") +void func_808B4C30(BgSpot16Bombstone* this) { + this->switchFlag = (this->actor.params >> 8) & 0x3F; + this->actor.params = this->actor.params & 0xFF; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5240.s") +void func_808B4C4C(BgSpot16Bombstone* this, GlobalContext* globalCtx) { + s32 pad; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B53A8.s") + Collider_InitJntSph(globalCtx, &this->colliderJntSph); + Collider_SetJntSph(globalCtx, &this->colliderJntSph, &this->actor, &sJntSphInit, this->colliderJntSphItems); + this->colliderJntSph.list->dim.worldSphere.center.x = this->actor.posRot.pos.x; + this->colliderJntSph.list->dim.worldSphere.center.y = this->actor.posRot.pos.y + 50.0f; + this->colliderJntSph.list->dim.worldSphere.center.z = this->actor.posRot.pos.z; + this->colliderJntSph.list->dim.worldSphere.radius = 120; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B561C.s") +void func_808B4D04(BgSpot16Bombstone* this, GlobalContext* globalCtx) { + s32 pad; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B56BC.s") + Collider_InitCylinder(globalCtx, &this->colliderCylinder); + Collider_SetCylinder(globalCtx, &this->colliderCylinder, &this->actor, &sCylinderInit); + this->colliderCylinder.dim.pos.x += (s16)this->actor.posRot.pos.x; + this->colliderCylinder.dim.pos.y += (s16)this->actor.posRot.pos.y; + this->colliderCylinder.dim.pos.z += (s16)this->actor.posRot.pos.z; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B57E0.s") +s32 func_808B4D9C(BgSpot16Bombstone* this, GlobalContext* globalCtx) { + if (Flags_GetSwitch(globalCtx, this->switchFlag)) { + osSyncPrintf("Spot16 obj 爆弾石 破壊済み\n"); + return false; + } + Actor_ProcessInitChain(&this->actor, sInitChainBoulder); + Actor_SetScale(&this->actor, 0.4f); + this->actor.colChkInfo.mass = 0xFF; + func_808B4C4C(this, globalCtx); + func_808B4D04(this, globalCtx); + this->sinRotation = Math_Sins(this->actor.shape.rot.y); + this->cosRotation = Math_Coss(this->actor.shape.rot.y); + this->unk_150 = D_06000C20; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5934.s") + func_808B5934(this); + return true; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5950.s") +s32 func_808B4E58(BgSpot16Bombstone* this, GlobalContext* globalctx) { + Actor* actor = &this->actor; + f32 scaleFactor = 1.0f / 600.0f; + f32 sinCosPosFactor = 50.0f; + f32 sinValue; + f32 cosValue; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5A78.s") + Actor_ProcessInitChain(actor, sInitChainDebris); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5A94.s") + actor->speedXZ = D_808B5DD8[actor->params][0]; + actor->velocity.y = D_808B5DD8[actor->params][1]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5AF0.s") + Actor_SetScale(actor, D_808B5DD8[actor->params][2] * scaleFactor); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5B04.s") + this->unk_210 = (f32)D_808B5DD8[actor->params][3]; + this->unk_212 = (f32)D_808B5DD8[actor->params][4]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5B58.s") + actor->posRot.rot.y = D_808B5DD8[actor->params][5]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B5B6C.s") + sinValue = Math_Sins(this->actor.posRot.rot.y); + cosValue = Math_Coss(this->actor.posRot.rot.y); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/BgSpot16Bombstone_Update.s") + actor->posRot.pos.x = (sinValue * sinCosPosFactor) + actor->initPosRot.pos.x; + actor->posRot.pos.y = D_808B5DD8[actor->params][6] + actor->initPosRot.pos.y; + actor->posRot.pos.z = (cosValue * sinCosPosFactor) + actor->initPosRot.pos.z; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/BgSpot16Bombstone_Draw.s") + actor->shape.rot.x = D_808B5DD8[actor->params][7]; + actor->shape.rot.y = D_808B5DD8[actor->params][8]; + actor->shape.rot.z = D_808B5DD8[actor->params][9]; + + this->unk_150 = D_060009E0; + this->bombiwaBankIndex = Object_GetIndex(&globalctx->objectCtx, OBJECT_BOMBIWA); + + if (this->bombiwaBankIndex < 0) { + osSyncPrintf("Error : バンク危険！(arg_data 0x%04x)(%s %d)\n", actor->params, "../z_bg_spot16_bombstone.c", + 589); + return false; + } + + func_808B5AF0(this); + return true; +} + +void BgSpot16Bombstone_Init(Actor* thisx, GlobalContext* globalCtx) { + BgSpot16Bombstone* this = THIS; + s16 shouldLive; + + func_808B4C30(this); + + switch (this->actor.params) { + case 0xFF: + // The boulder is intact + shouldLive = func_808B4D9C(thisx, globalCtx); + break; + case 0: + case 1: + case 2: + case 3: + case 4: + case 5: + // The boulder is debris + shouldLive = func_808B4E58(thisx, globalCtx); + break; + default: + osSyncPrintf("Error : arg_data おかしいな(%s %d)(arg_data 0x%04x)\n", "../z_bg_spot16_bombstone.c", 668, + this->actor.params); + shouldLive = false; + break; + } + + if (!shouldLive) { + Actor_Kill(thisx); + return; + } + osSyncPrintf("Spot16 obj 爆弾石 (scaleX %f)(arg_data 0x%04x)\n", this->actor.scale.x, this->actor.params); +} + +void BgSpot16Bombstone_Destroy(Actor* thisx, GlobalContext* globalCtx) { + BgSpot16Bombstone* this = THIS; + + if (this->actor.params == 0xFF) { + // Boulder is intact so remove its collider + Collider_DestroyJntSph(globalCtx, &this->colliderJntSph); + Collider_DestroyCylinder(globalCtx, &this->colliderCylinder); + } +} + +void func_808B51A8(BgSpot16Bombstone* this, GlobalContext* globalCtx) { + f32 scaleX1 = this->actor.scale.x * 150; + s16 scaleX2 = this->actor.scale.x * 250; + Vec3f posRot; + + posRot.x = this->actor.posRot.pos.x; + posRot.y = this->actor.posRot.pos.y + 50.0f; + posRot.z = this->actor.posRot.pos.z; + + func_80033480(globalCtx, &posRot, scaleX1, 2, scaleX2, 0xA0, 1); +} + +void func_808B5240(BgSpot16Bombstone* this, GlobalContext* globalCtx) { + f32 tempUnk6; + f32 tempUnk2; + s16 index; + Vec3f position; + Vec3f* actorPosition = &this->actor.posRot.pos; + + if (1) {} + + while (true) { + if (this->unk_158 >= ARRAY_COUNTU(D_808B5EB0) || this->unk_154 < D_808B5EB0[this->unk_158][0]) { + break; + } + + index = this->unk_158; + + tempUnk2 = D_808B5EB0[index][1]; + tempUnk6 = D_808B5EB0[index][3]; + + position.x = ((this->sinRotation * tempUnk6) + (tempUnk2 * this->cosRotation)) + actorPosition->x; + position.y = D_808B5EB0[index][2] + actorPosition->y; + position.z = ((this->cosRotation * tempUnk6) - (tempUnk2 * this->sinRotation)) + actorPosition->z; + + func_800287AC(globalCtx, &position, &sVelocity, &sAcceleration, D_808B5EB0[index][4], D_808B5EB0[index][5], + D_808B5EB0[index][6]); + + this->unk_158 += 1; + } +} + +void func_808B53A8(BgSpot16Bombstone* this, GlobalContext* globalCtx) { + f32 velocityYMultiplier = 1.3f; + Vec3f randomPosition; + Vec3f randomVelocity; + s32 index; + s16 scale; + + if (this->actor.params == 0) { + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_BG_SPOT16_BOMBSTONE, this->actor.posRot.pos.x, + this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, 0, 0, 5); + index = 3; + } else { + index = 0; + } + + if (index < ARRAY_COUNT(D_808B6074)) { + do { + randomPosition.x = ((Math_Rand_ZeroOne() - 0.5f) * 8.0f) + this->actor.posRot.pos.x; + randomPosition.y = ((Math_Rand_ZeroOne() * 5.0f) + this->actor.posRot.pos.y) + 8.0f; + randomPosition.z = ((Math_Rand_ZeroOne() - 0.5f) * 8.0f) + this->actor.posRot.pos.z; + + randomVelocity.x = (Math_Rand_ZeroOne() - 0.5f) * 16.0f; + randomVelocity.y = (Math_Rand_ZeroOne() * 14.0) + (fabsf(this->actor.velocity.y) * velocityYMultiplier); + randomVelocity.z = (Math_Rand_ZeroOne() - 0.5f) * 16.0f; + + scale = D_808B6074[index] * this->actor.scale.x * 3; + + func_80029E8C(globalCtx, &randomPosition, &randomVelocity, &this->actor.posRot.pos, -0x1A4, 0x31, 0xF, 0xF, + 0, scale, 2, 0x40, 0xA0, -1, OBJECT_BOMBIWA, D_060009E0); + index += 1; + } while (index != ARRAY_COUNT(D_808B6074)); + } +} + +void func_808B561C(BgSpot16Bombstone* this, GlobalContext* globalCtx) { + s32 index; + PosRot* posRot; + + posRot = &this->actor.posRot; + for (index = 0; index < ARRAY_COUNT(D_808B6088); index++) { + if (Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_BG_SPOT16_BOMBSTONE, posRot->pos.x, posRot->pos.y, + posRot->pos.z, 0, 0, 0, D_808B6088[index]) == NULL) { + break; + } + } +} + +void func_808B56BC(BgSpot16Bombstone* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + f32 sinValue; + s16 adjustedYawDiff; + s32 yawDiff; + s32 absYawDiff; + + if (this->actor.xzDistFromLink < 130.0f && this->actor.yDistFromLink < 160.0f && + this->actor.yDistFromLink >= -10.0f) { + yawDiff = this->actor.yawTowardsLink - this->actor.shape.rot.y; + absYawDiff = ABS(yawDiff); + + adjustedYawDiff = absYawDiff - 0x3FFF; + + if (adjustedYawDiff > 0) { + sinValue = Math_Sins(adjustedYawDiff) * this->actor.xzDistFromLink; + + if (sinValue >= 0.0f) { + player->actor.posRot.pos.x += sinValue * this->sinRotation; + player->actor.posRot.pos.z += sinValue * this->cosRotation; + } else { + osSyncPrintf("Error 補正出来ない(%s %d)(arg_data 0x%04x)(hosei_angY %x)\n", + "../z_bg_spot16_bombstone.c", 935, this->actor.params, adjustedYawDiff); + } + } + } +} + +void func_808B57E0(BgSpot16Bombstone* this, GlobalContext* globalCtx) { + Actor* playerHeldActor; + Player* player = PLAYER; + EnBombf* currentBomb; + + if (sTimer > 0) { + sTimer--; + } + + if (sPlayerBomb != NULL) { + if (sPlayerBomb->actor.update == NULL) { + sPlayerBomb = NULL; + } else if (sTimer <= 0 && sPlayerBomb->actor.posRot.pos.y < 1400.0f && + Math3D_Dist1DSq(sPlayerBomb->actor.posRot.pos.x + 1579.0f, + sPlayerBomb->actor.posRot.pos.z + 790.0f) < SQ(400.0f) && + sPlayerBomb->actor.params == 0) { + currentBomb = sPlayerBomb; + if (currentBomb->timer > 0) { + sTimer = currentBomb->timer + 20; + func_800800F8(globalCtx, 0x1054, sTimer, NULL, 0); + } + } + } else if (player->stateFlags1 & 0x800) { + playerHeldActor = player->heldActor; + if (playerHeldActor != NULL && playerHeldActor->type == ACTORTYPE_EXPLOSIVES && + playerHeldActor->id == ACTOR_EN_BOMBF) { + sPlayerBomb = playerHeldActor; + } + } +} + +void func_808B5934(BgSpot16Bombstone* this) { + this->actor.draw = BgSpot16Bombstone_Draw; + this->actionFunc = func_808B5950; +} + +void func_808B5950(BgSpot16Bombstone* this, GlobalContext* globalCtx) { + s32 pad; + + func_808B56BC(this, globalCtx); + func_808B57E0(this, globalCtx); + + if (globalCtx) {} + + if (this->colliderCylinder.base.acFlags & 2) { + this->colliderCylinder.base.acFlags &= ~2; + + func_808B561C(this, globalCtx); + + func_800800F8(globalCtx, 0x1054, 0x32, NULL, 0); + + Flags_SetSwitch(globalCtx, this->switchFlag); + gSaveContext.eventChkInf[2] |= 8; + + func_808B5A78(this); + } else { + CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->colliderCylinder); + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->colliderJntSph); + CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->colliderJntSph); + } + + if (mREG(64) == 1) { + func_808B561C(this, globalCtx); + mREG(64) = -10; + } else if (mREG(64) < 0) { + mREG(64)++; + } +} + +void func_808B5A78(BgSpot16Bombstone* this) { + this->unk_154 = 0; + this->unk_158 = 0; + this->actor.draw = NULL; + this->actionFunc = func_808B5A94; +} + +void func_808B5A94(BgSpot16Bombstone* this, GlobalContext* globalCtx) { + + func_808B5240(this, globalCtx); + + if (this->unk_154 == 56) { + func_80078884(NA_SE_SY_CORRECT_CHIME); + } + + if (this->unk_154 > 60) { + Actor_Kill(&this->actor); + } +} + +void func_808B5AF0(BgSpot16Bombstone* this) { + this->actionFunc = func_808B5B04; + this->actor.draw = NULL; +} + +void func_808B5B04(BgSpot16Bombstone* this, GlobalContext* globalCtx) { + if (Object_IsLoaded(&globalCtx->objectCtx, this->bombiwaBankIndex)) { + func_808B5B58(this); + this->actor.draw = BgSpot16Bombstone_Draw; + } +} + +void func_808B5B58(BgSpot16Bombstone* this) { + this->unk_154 = 0; + this->actionFunc = func_808B5B6C; +} + +void func_808B5B6C(BgSpot16Bombstone* this, GlobalContext* globalCtx) { + Actor* actor = &this->actor; + + Actor_MoveForward(actor); + actor->shape.rot.x += this->unk_210; + actor->shape.rot.z += this->unk_212; + + if (this->unk_154 > 60) { + Actor_Kill(actor); + return; + } + + if (actor->bgCheckFlags & 8 || (actor->bgCheckFlags & 1 && actor->velocity.y < 0.0f)) { + func_808B53A8(this, globalCtx); + func_808B51A8(this, globalCtx); + Audio_PlaySoundAtPosition(globalCtx, &actor->posRot, 20, NA_SE_EV_ROCK_BROKEN); + Actor_Kill(actor); + return; + } + + func_8002E4B4(globalCtx, actor, 17.5f, 35.0f, 0.0f, 5); +} + +void BgSpot16Bombstone_Update(Actor* thisx, GlobalContext* globalCtx) { + BgSpot16Bombstone* this = THIS; + + this->unk_154++; + if (this->actionFunc != NULL) { + this->actionFunc(this, globalCtx); + } +} + +void BgSpot16Bombstone_Draw(Actor* thisx, GlobalContext* globalCtx) { + BgSpot16Bombstone* this = THIS; + s32 pad; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot16_bombstone.c", 1253); + + func_80093D18(globalCtx->state.gfxCtx); + + gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot16_bombstone.c", 1257), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + + if (this->actor.params == 0xFF) { + // The boulder is intact + gSPDisplayList(oGfxCtx->polyOpa.p++, this->unk_150); + } else { + // The boulder is debris + gSPSegment(oGfxCtx->polyOpa.p++, 0x06, globalCtx->objectCtx.status[this->bombiwaBankIndex].segment); + gSPDisplayList(oGfxCtx->polyOpa.p++, this->unk_150); + } + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot16_bombstone.c", 1274); +} diff --git a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.h b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.h index 4f0c84229c..16b878ab32 100644 --- a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.h +++ b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.h @@ -6,9 +6,23 @@ struct BgSpot16Bombstone; +typedef void (*BgSpot16BombstoneActionFunc)(struct BgSpot16Bombstone*, GlobalContext*); + typedef struct BgSpot16Bombstone { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0xCC]; + /* 0x014C */ BgSpot16BombstoneActionFunc actionFunc; + /* 0x0150 */ Gfx* unk_150; + /* 0x0154 */ s16 unk_154; + /* 0x0156 */ s16 switchFlag; + /* 0x0158 */ s16 unk_158; + /* 0x015C */ f32 sinRotation; + /* 0x0160 */ f32 cosRotation; + /* 0x0164 */ ColliderJntSph colliderJntSph; + /* 0x0184 */ ColliderJntSphItem colliderJntSphItems[1]; + /* 0x01C4 */ ColliderCylinder colliderCylinder; + /* 0x0210 */ s16 unk_210; + /* 0x0212 */ s16 unk_212; + /* 0x0214 */ s8 bombiwaBankIndex; } BgSpot16Bombstone; // size = 0x0218 extern const ActorInit Bg_Spot16_Bombstone_InitVars; diff --git a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c index 197df9322a..518284760e 100644 --- a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c +++ b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c @@ -17,7 +17,6 @@ void DemoShd_Draw(Actor* thisx, GlobalContext* globalCtx); void func_80991298(DemoShd* this, GlobalContext* globalCtx); -/* const ActorInit Demo_Shd_InitVars = { ACTOR_DEMO_SHD, ACTORTYPE_ITEMACTION, @@ -29,16 +28,102 @@ const ActorInit Demo_Shd_InitVars = { (ActorFunc)DemoShd_Update, (ActorFunc)DemoShd_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Shd/DemoShd_SetupAction.s") +#include "z_demo_shd_gfxdata.c" -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Shd/DemoShd_Init.s") +void DemoShd_SetupAction(DemoShd* this, DemoShdActionFunc actionFunc) { + this->actionFunc = actionFunc; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Shd/DemoShd_Destroy.s") +void DemoShd_Init(Actor* thisx, GlobalContext* globalCtx) { + DemoShd* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Shd/func_80991298.s") + this->unk_14C = 0; + DemoShd_SetupAction(this, func_80991298); + Actor_SetScale(&this->actor, 0.4f); + this->actor.posRot.pos.y = 0.0f; + this->actor.posRot.pos.x = 0.0f; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Shd/DemoShd_Update.s") +void DemoShd_Destroy(Actor* thisx, GlobalContext* globalCtx) { +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Shd/DemoShd_Draw.s") +void func_80991298(DemoShd* this, GlobalContext* globalCtx) { + if ((globalCtx->csCtx.state != 0 && globalCtx->csCtx.npcActions[0] != NULL) || + (globalCtx->csCtx.state != 0 && globalCtx->csCtx.npcActions[1] != NULL)) { + if (globalCtx->csCtx.frames == 800) { + func_800F3F3C(9); + } + if (globalCtx->csCtx.frames == 1069) { + func_800F3F3C(8); + } + } + + if (globalCtx->csCtx.state != 0) { + CsCmdActorAction* npcAction0 = globalCtx->csCtx.npcActions[0]; + + if (npcAction0 != NULL) { + if (npcAction0->action == 2) { + if (!(this->unk_14C & 1)) { + this->unk_14E = npcAction0->startPos.x; + } + this->unk_14C |= 1; + } else { + this->unk_14C &= ~1; + } + } + } + + if (globalCtx->csCtx.state != 0) { + CsCmdActorAction* npcAction1 = globalCtx->csCtx.npcActions[1]; + + if (npcAction1 != NULL) { + if (npcAction1->action == 2) { + if (!(this->unk_14C & 2)) { + this->unk_14E = npcAction1->startPos.x; + } + this->unk_14C |= 2; + } else { + this->unk_14C &= ~2; + } + } + } + + this->unk_14E++; +} + +void DemoShd_Update(Actor* thisx, GlobalContext* globalCtx) { + DemoShd* this = THIS; + + this->actionFunc(this, globalCtx); +} + +void DemoShd_Draw(Actor* thisx, GlobalContext* globalCtx) { + DemoShd* this = THIS; + s32 pad; + u32 unk_14E = this->unk_14E; + + if (1) {}; // Necessary to match, can be anywhere in the function + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_shd.c", 726); + + func_80093D84(globalCtx->state.gfxCtx); + + gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_shd.c", 729), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(oGfxCtx->polyXlu.p++, D_809932D0); + + if (this->unk_14C & 1) { + gSPDisplayList(oGfxCtx->polyXlu.p++, + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0x3FF - ((unk_14E * 5) & 0x3FF), 16, 256, 1, 0, + 255 - ((unk_14E * 5) & 255), 32, 32)); + gSPDisplayList(oGfxCtx->polyXlu.p++, D_80993390); + } else if (this->unk_14C & 2) { + gSPDisplayList(oGfxCtx->polyXlu.p++, + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0x3FF - ((unk_14E * 5) & 0x3FF), 16, 256, 1, 0, + 255 - ((unk_14E * 5) & 255), 32, 32)); + gSPDisplayList(oGfxCtx->polyXlu.p++, D_809934B8); + } + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_shd.c", 762); +} diff --git a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.h b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.h index 826de4492f..3e09bcbc48 100644 --- a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.h +++ b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.h @@ -10,8 +10,8 @@ typedef void (*DemoShdActionFunc)(struct DemoShd*, GlobalContext*); typedef struct DemoShd { /* 0x0000 */ Actor actor; - /* 0x014C */ s16 unk_14C; - /* 0x014E */ s16 unk_14E; + /* 0x014C */ u16 unk_14C; + /* 0x014E */ u16 unk_14E; /* 0x0150 */ DemoShdActionFunc actionFunc; } DemoShd; // size = 0x0154 diff --git a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd_gfxdata.c b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd_gfxdata.c new file mode 100644 index 0000000000..71e4b692dc --- /dev/null +++ b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd_gfxdata.c @@ -0,0 +1,432 @@ +#include +#include + +UNK_TYPE D_80991680[] = { + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000005, 0x08000000, 0x00000000, 0x00000000, 0x00000524, 0x31090000, + 0x00000000, 0x00000000, 0x00041443, 0x4C120001, 0x03000000, 0x00000500, 0x072D5D88, 0x7C37100D, 0x12030000, + 0x00051808, 0x2479B9D7, 0xC37C4C3A, 0x2C060000, 0x00051A0D, 0x4ABEF1FC, 0xEEAE8D79, 0x4B0A0000, 0x00041612, + 0x68E0FEFF, 0xF5BBB8B6, 0x6D100000, 0x00031423, 0x84EEFFFF, 0xF4C4D1DB, 0x8A1D0300, 0x00041C3C, 0xA0F4FFFE, + 0xF1DAE7E9, 0x93200400, 0x00083154, 0xB6F7FFFA, 0xF4F7FBEA, 0x84140100, 0x000C4767, 0xC3F9FCEA, 0xEAFCFFED, + 0x7C0F0200, 0x000D4E77, 0xCCFAFBE5, 0xE3FAFFEE, 0x7D0F0200, 0x000A3F83, 0xD6FBFEF0, 0xE4F6FEF0, 0x84110200, + 0x00052688, 0xE5FDFDF0, 0xE6F9FFEF, 0x7F100200, 0x0002147E, 0xECFFFCE6, 0xDFFAFFEC, 0x710E0200, 0x00020C65, + 0xE2FEFAD9, 0xCFF7FFEA, 0x660B0200, 0x00020953, 0xD2FBFADA, 0xC9F5FFEB, 0x6B0D0200, 0x00020951, 0xCBFAFAE0, + 0xD4F6FFED, 0x750F0200, 0x00020C5C, 0xD4FAF1E2, 0xEBFCFFEB, 0x740F0100, 0x00010B60, 0xDEF8DDD7, 0xF6FFFEE9, + 0x690D0100, 0x00010B60, 0xE2F8D7CF, 0xF1FDFFE9, 0x5F0A0100, 0x00000C63, 0xDAFAE6D4, 0xE1F1FDE7, 0x5B0A0000, + 0x00000C5F, 0xC6F8F8E1, 0xDAE9FAD9, 0x52090000, 0x00000B59, 0xB4F0FBE0, 0xD1DDF4C0, 0x44070000, 0x00000A54, + 0xAFEFF3C6, 0xBBC0EDB0, 0x40070000, 0x00000B57, 0xB1E8DAA4, 0xA092DCA6, 0x45080000, 0x00000C5A, 0xAEDAB480, + 0x8C68BF92, 0x40080000, 0x00000C52, 0xA2C99264, 0x814FA06F, 0x23030000, 0x00010F48, 0x97BC7B4A, 0x75459760, + 0x0F000000, 0x00010E41, 0x95B46B36, 0x683E9663, 0x0D000000, 0x00000941, 0x9AAD602B, 0x5A328C64, 0x0E000000, + 0x00000841, 0x989E5524, 0x54347951, 0x0B000000, 0x0000073D, 0x88834C22, 0x4F3D6330, 0x07000000, 0x0000073B, + 0x73624726, 0x463E4B17, 0x0B010000, 0x00000941, 0x6748482C, 0x392A3413, 0x1C050000, 0x00000A46, 0x5D303B2E, + 0x3310211B, 0x2D070000, 0x00000941, 0x4B131B2C, 0x3F0D1821, 0x33080000, 0x0000093F, 0x4109092D, 0x490D0C20, + 0x32080000, 0x00000A43, 0x3F09062C, 0x450B061E, 0x2B070000, 0x00000B47, 0x410A0722, 0x3108081E, 0x20040000, + 0x00000838, 0x35090C19, 0x21050920, 0x20040000, 0x00000522, 0x1F060B0A, 0x1B04061E, 0x29060000, 0x00000313, + 0x0B020608, 0x28070319, 0x34090000, 0x0000020E, 0x03000108, 0x2F080214, 0x2F090000, 0x0000020D, 0x03000007, + 0x2407020C, 0x0B000000, 0x00000311, 0x06010001, 0x0D010413, 0x04000000, 0x0000051C, 0x0B010001, 0x0801020C, + 0x02000000, 0x00000623, 0x0D010003, 0x12030002, 0x00000000, 0x0000051D, 0x0A010005, 0x1B050000, 0x00000000, + 0x0000020C, 0x03000005, 0x18050000, 0x00000000, 0x00000002, 0x00000000, 0x05000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, +}; + +UNK_TYPE D_80991E80[] = { + 0x2F3E56AB, 0xA4582102, 0x10417AB0, 0x805C312A, 0x32376DD4, 0xA2633907, 0x0B387DA2, 0x6D81470C, 0x3C5C60AC, + 0xA5571801, 0x154C97B9, 0x68533236, 0x304276D6, 0x9B533108, 0x154A96B7, 0x7C9B400B, 0x3E756FAE, 0xAF5D1301, + 0x1D59B4BF, 0x53432C38, 0x2F487DCC, 0x8A4A2406, 0x1F5DB0C8, 0x90B55110, 0x408B7FAA, 0xB76D1503, 0x286ACCBE, + 0x43312030, 0x2B4C82BA, 0x77431607, 0x2B70C7D5, 0xA6B95B13, 0x409C93A6, 0xB87D1D08, 0x367FE1C1, 0x3C261629, + 0x2A508AAB, 0x69410C0C, 0x3986DDDB, 0xB5AE6316, 0x40A0A7A1, 0xAA7D2610, 0x4596F1CD, 0x47281E36, 0x365C97A3, + 0x63450713, 0x499DF0D8, 0xB49E721A, 0x409AB59F, 0x8A662D1C, 0x57AEFBDF, 0x6B404456, 0x536EA49B, 0x6A4D061E, + 0x5CB6FCC6, 0x9A8E7F20, 0x428EBEA0, 0x623F2E2A, 0x69C6FFF0, 0x9A686569, 0x6F83AC92, 0x7F5D0B2A, 0x70CDFFB2, + 0x77848D29, 0x4787C4A0, 0x401D2E3E, 0x7ED9FFFC, 0xC48F7973, 0x8598AE86, 0x9A701339, 0x85E1FFA6, 0x5E859534, + 0x5189C99B, 0x2C0B3455, 0x92E9FFFA, 0xDCAB8071, 0x94ACAD7A, 0xB1882249, 0x9AF1FFB0, 0x6A8F9746, 0x6394CD8D, + 0x290C416F, 0xA5EEFFF4, 0xDCB46B6D, 0xA1BFAD77, 0xB6A43A58, 0xAAF8FFC8, 0x84959963, 0x7BA4CE78, 0x351A588E, + 0xB5E3F9F1, 0xCFAC6077, 0xABCFAC77, 0xA8C05A6A, 0xB2F3FFE1, 0xA3959471, 0x94B9D065, 0x473274A9, 0xBDCDECEF, + 0xC2A05F86, 0xBADDAC78, 0x92D87C7D, 0xAFDEFDF1, 0xBC8C8971, 0xA6D2D45A, 0x584B95BB, 0xC1B3D5ED, 0xB8956697, + 0xC5E9A670, 0x7AE6978F, 0xA4BEF0EF, 0xB9797360, 0xB1E8DD5D, 0x5D5FAFC7, 0xC49CB8E3, 0xAF8C78A5, 0xCBF19D5F, + 0x6AE5A6A3, 0x9398DBE7, 0xB46A5841, 0xB8F2E871, 0x586DC1CD, 0xC78C9DD5, 0xAA878CB1, 0xD8F89249, 0x63DCABB3, + 0x8576C5D8, 0xA95E4430, 0xC0EBEE91, 0x5378CACE, 0xC58087C5, 0xA4859EAE, 0xE1FD8A36, 0x60D0ACBD, 0x7765B9C5, + 0x9C563A2B, 0xCED7E7B4, 0x5484C7CC, 0xB66F7CBB, 0x9F81A898, 0xE3FF8D2E, 0x63C8B0BA, 0x6D69B8B0, 0x93573B2E, + 0xE0C2CED2, 0x6898C0C3, 0x97587EBC, 0x9D749570, 0xDEFF9D36, 0x67C8B4A8, 0x6682BD9B, 0x93643E37, 0xF0B4A8DE, + 0x86A9B6B0, 0x70448BBE, 0x99617545, 0xD1FFB84E, 0x70CAB48C, 0x64A4BD8D, 0x96763D41, 0xFAAC82DA, 0xA7B6AE9A, + 0x4D359AC0, 0x90494F27, 0xC0FFD675, 0x80CCAD6D, 0x63C1B681, 0x9C85374E, 0xFFA069C9, 0xC1BAA785, 0x3936A4B6, + 0x7D342E18, 0xA9FFEEA5, 0x9AC59F56, 0x60D0A873, 0x9288315E, 0xFB8669B6, 0xD0B6A473, 0x3C47A39A, 0x6228241B, + 0x8BFFF6CD, 0xB7BB8F47, 0x57CFA169, 0x77782C6B, 0xE56478AA, 0xD6AC9E64, 0x4E61977C, 0x4B232428, 0x6FFFEBE5, + 0xD0AF813C, 0x44C2A266, 0x5B61296E, 0xC04188A8, 0xD4A09051, 0x5D788B61, 0x3E202234, 0x58F9D7DF, 0xDEA27332, + 0x31AE9A6C, 0x3E4B2F62, 0x902688B3, 0xD0937A3F, 0x5D7D8B58, 0x37241F35, 0x46F2C5BF, 0xD7956528, 0x1E918E76, + 0x3442424A, 0x601774C3, 0xCB8F6630, 0x48698261, 0x333C2729, 0x3CECBF95, 0xC2885420, 0x11717B78, 0x4952673A, + 0x3D1153CD, 0xC994602F, 0x2D496F6D, 0x31674418, 0x32E7CA6C, 0xA77D4318, 0x09526672, 0x6B6F963E, 0x2B1036D0, + 0xCAA26E3C, 0x1B2A5A7B, 0x3798700F, 0x2BDFD94D, 0x8C773712, 0x043C606C, 0x9086B955, 0x281225C9, 0xC7AD8954, + 0x141B4085, 0x53CB9C10, 0x26D3E63A, 0x757A3B11, 0x0131666F, 0xAB87BA6A, 0x2E151FBF, 0xC1AEA16A, 0x1721388C, + 0x81ECBB17, 0x23C1EE30, 0x6688561E, 0x02317381, 0xA36A9566, 0x3B171FB9, 0xB5A5AF7A, 0x1B384395, 0xABFBC81D, + 0x20AAEB28, 0x61987838, 0x05358299, 0x85405D4E, 0x45181FB5, 0xA695B083, 0x1C55569C, 0xCEFFCF1E, 0x1A8CDA24, + 0x62A39755, 0x0A398FAE, 0x601A2A2C, 0x49161FB1, 0x9A8BAC8A, 0x23736DA0, 0xE0FFD61E, 0x136BAF23, 0x70ABAD6D, + 0x143D95BD, 0x41030D16, 0x41151DAA, 0x938BAA94, 0x2E8A8BA7, 0xE6FFD921, 0x0C4A7D2D, 0x7CACAB70, 0x244093C3, + 0x38020F11, 0x2F151CA3, 0x9293ABA1, 0x3995AAB7, 0xEDF7D924, 0x072F5842, 0x83AE9C66, 0x3F498EC7, 0x420D2812, + 0x1E151F9B, 0x989CB0B2, 0x4697C5CE, 0xF5F0D626, 0x061B435B, 0x85B18A5B, 0x5F568BCD, 0x54245213, 0x12172593, + 0x9FA1BAC0, 0x5291D4E1, 0xFAF0D123, 0x0711416F, 0x82B2765B, 0x84668FCB, 0x684D8212, 0x1318308A, 0xA3A2C2C6, + 0x5F88D3EE, 0xFEF6C81B, 0x0B104276, 0x85B06A72, 0xA97896C3, 0x7C81AC19, 0x24194083, 0xA2A0C6C4, 0x6A82CCF1, + 0xFFFFB910, 0x14173E77, 0x8BAE6992, 0xC6879BB4, 0x92B3C933, 0x3C1D4F7D, 0x9DA2CCBE, 0x7381C6E6, 0xFFFFB111, + 0x26233975, 0x92AF6DAF, 0xDB949AA3, 0xADDBDD64, 0x5927597B, 0x99AAD4B9, 0x7687C6D5, 0xFCFFB736, 0x432D3A78, + 0x98B371BD, 0xE5A0989E, 0xCCF2EAA0, 0x753C5C80, 0x9DB9E3BC, 0x7896CFBF, 0xF6FFCB72, 0x64323F81, 0x9CBC70B4, + 0xE3AC9EAD, 0xE6FBF6CF, 0x8B5C5C85, 0xA7C8F4C2, 0x7AA6D9A3, 0xF0FFE2A9, 0x8032448D, 0xA4C970A0, 0xDBB5AAC6, + 0xF7FEFDE7, 0xA3806187, 0xB0D6FFC9, 0x7FB5D686, 0xE7FFF0D2, 0x8D2F4E98, 0xABD7768D, 0xCFB9B4E1, 0xF8F8FFE7, + 0xB29B7089, 0xB7E4FFCD, 0x8CB8BF65, 0xD5FFF0D7, 0x8D34609D, 0xB4E48385, 0xC3BAB0F1, 0xE2E8FEDC, 0xB5A07A8D, + 0xBDEFFFD0, 0x9AAB9543, 0xB9FFE9C3, 0x80447497, 0xC0EF9C90, 0xBDB997E5, 0xC2CCFBD4, 0xAB8F7387, 0xC8F8FFD4, + 0xA4936324, 0x98FFE5B3, 0x6F577E8A, 0xCEFABCA8, 0xC0BC71C7, 0x9EADF4D2, 0x916D5D7B, 0xD4FEFFD6, 0xA575390F, + 0x76FFE4A6, 0x656A7F7D, 0xDDFFDABF, 0xC8BF4CA1, 0x8095E8CC, 0x744A3B66, 0xDAFFFFD6, 0x9D5B1E04, 0x5DFDDF9A, + 0x6075787A, 0xECFFF1CD, 0xCEC42E7C, 0x7087D6BF, 0x5A311F49, 0xD4FFFFD0, 0x8E4B1100, 0x50F7D892, 0x68767788, + 0xF6FFFDCE, 0xCDC31E65, 0x6E88C3A8, 0x4922153A, 0xC3FFFDC4, 0x7F410B03, 0x4BEED08B, 0x747682A0, 0xFDFFFEBF, + 0xBCB61456, 0x7792B18B, 0x3E19153D, 0xB5FFF8B2, 0x733B0908, 0x4DE0C487, 0x827797BC, 0xFFFFF8AB, 0x9E9B0E50, + 0x869E9F6E, 0x3714184D, 0xB5FFF09E, 0x67380C11, 0x56CFB285, 0x8F7EADD4, 0xFFFFED96, 0x78730A53, 0x9CA98F57, + 0x310F1C69, 0xC8FFE18A, 0x5D35161D, 0x64BC9E84, 0x978BBFE7, 0xFFFFDD81, 0x5348075A, 0xB5B07F48, 0x290A2088, + 0xE1FFCF75, 0x5335272B, 0x74AD877F, 0x9C9DCFF3, 0xFFFEC86E, 0x35260864, 0xC6B16F3E, 0x200422A6, 0xF8FCB95F, + 0x47373A3C, 0x86A36F73, 0x9FB0D9FA, 0xFFF7B15B, 0x21110E70, 0xCDAB6139, 0x160027C1, 0xFFF09F4C, 0x3B3A4B4D, + 0x989D5B5D, 0x9DB5D9FE, 0xFFEA994C, 0x1509177B, 0xC8A15C3C, 0x0E022BD1, 0xFFE1873B, 0x2F3E5460, 0xA8954F44, + 0x96A6CEFF, 0xFFD7823C, 0x0C0A2784, 0xB9956343, 0x0B0731DB, 0xFFCE722C, 0x22415672, 0xB58C4A31, 0x8A88BAFF, + 0xFAC56E2E, 0x060F398F, 0xA989764A, 0x0A0C3AE1, 0xFFB85F20, 0x17425787, 0xBF824826, 0x775FA3FF, 0xF1B66121, + 0x03164B98, 0x9A818E4A, 0x0A1040D4, 0xE8974D14, 0x11405495, 0xBB74401F, 0x603D86F1, 0xD7A35414, 0x02195694, + 0x8476943E, 0x171A46C5, 0xCC7D3D0C, 0x0D3E599E, 0xAE6C371C, 0x4A2D72E3, 0xC38F4C0E, 0x03205F96, 0x766A792A, + 0x242B4FB8, 0xB66A2E06, 0x0D3E66AA, 0x9B663322, 0x3B2D6CDD, 0xB47B450A, 0x062B6E9C, 0x6E705D17, +}; + +Vtx D_80992680[] = { + VTX(405, 1572, -1643, 401, -3470, 0x00, 0x78, 0x00, 0xFF), + VTX(470, 1488, -1799, 512, -3755, 0x00, 0x78, 0x00, 0xFF), + VTX(207, 1312, -1162, 251, -3368, 0x00, 0x78, 0x00, 0xFF), + VTX(207, 820, -1162, 61, -3381, 0x00, 0x78, 0x00, 0xFF), + VTX(973, 820, -847, 512, -2788, 0x00, 0x78, 0x00, 0xFF), + VTX(207, 1312, -1162, 252, -3368, 0x00, 0x78, 0x00, 0xFF), + VTX(973, 1312, -847, 512, -3015, 0x00, 0x78, 0x00, 0xFF), + VTX(1340, 1012, -209, 512, -455, 0x00, 0x78, 0x00, 0xFF), + VTX(1340, 220, -209, 512, -1081, 0x00, 0x78, 0x00, 0xFF), + VTX(939, 520, -209, 201, -1404, 0x00, 0x78, 0x00, 0xFF), + VTX(939, 220, -209, 391, -1391, 0x00, 0x78, 0x00, 0xFF), + VTX(1223, 177, 831, 0, 1707, 0x00, 0x78, 0x00, 0xFF), + VTX(1309, 220, 831, 143, 1679, 0x00, 0x78, 0x00, 0xFF), + VTX(1223, 500, 831, 0, 1365, 0x00, 0x78, 0x00, 0xFF), + VTX(1871, 220, 831, 512, 1593, 0x00, 0x78, 0x00, 0xFF), + VTX(973, 1312, -847, 512, -3015, 0x00, 0x78, 0x00, 0xFF), + VTX(612, 1572, -1558, 512, -3300, 0x00, 0x78, 0x00, 0xFF), + VTX(612, 1572, -1558, 512, -3300, 0x00, 0x78, 0x00, 0xFF), + VTX(839, 1012, -209, 143, -626, 0x00, 0x78, 0x00, 0xFF), + VTX(1602, 1272, 312, 512, 284, 0x00, 0x78, 0x00, 0xFF), + VTX(839, 1176, 119, 0, -284, 0x00, 0x78, 0x00, 0xFF), + VTX(953, 1272, 312, 0, 114, 0x00, 0x78, 0x00, 0xFF), + VTX(1223, 1014, 831, 0, 853, 0x00, 0x78, 0x00, 0xFF), + VTX(1871, 1014, 831, 512, 853, 0x00, 0x78, 0x00, 0xFF), + VTX(691, 520, -209, 0, -1536, 0x00, 0x78, 0x00, 0xFF), + VTX(839, 676, 119, 0, -967, 0x00, 0x78, 0x00, 0xFF), + VTX(839, 520, -209, 127, -1452, 0x00, 0x78, 0x00, 0xFF), + VTX(1905, 220, 1026, 396, 2481, 0x00, 0x78, 0x00, 0xFF), + VTX(1658, 220, 1169, 101, 2487, 0x00, 0x78, 0x00, 0xFF), + VTX(1905, 295, 1026, 410, 2617, 0x00, 0x78, 0x00, 0xFF), + VTX(1658, 295, 1169, 102, 2617, 0x00, 0x78, 0x00, 0xFF), + VTX(1915, 295, 1153, 410, 2901, 0x00, 0x78, 0x00, 0xFF), +}; + +Vtx D_80992880[] = { + VTX(1905, 295, 1026, 410, 2617, 0x00, 0x78, 0x00, 0xFF), VTX(1940, 295, 1047, 512, 2674, 0x00, 0x78, 0x00, 0xFF), + VTX(1905, 220, 1026, 396, 2481, 0x00, 0x78, 0x00, 0xFF), VTX(1940, 220, 1047, 512, 2560, 0x00, 0x78, 0x00, 0xFF), + VTX(1658, 220, 1169, 101, 2487, 0x00, 0x78, 0x00, 0xFF), VTX(1658, 220, 1215, 0, 2560, 0x00, 0x78, 0x00, 0xFF), + VTX(1658, 295, 1169, 102, 2617, 0x00, 0x78, 0x00, 0xFF), VTX(1658, 295, 1215, 0, 2674, 0x00, 0x78, 0x00, 0xFF), + VTX(1968, 295, 1172, 512, 2958, 0x00, 0x78, 0x00, 0xFF), VTX(1915, 295, 1153, 410, 2901, 0x00, 0x78, 0x00, 0xFF), + VTX(1763, 295, 1241, 102, 2901, 0x00, 0x78, 0x00, 0xFF), VTX(1753, 295, 1295, 0, 2958, 0x00, 0x78, 0x00, 0xFF), + VTX(973, 820, -847, 512, -2788, 0x00, 0x78, 0x00, 0xFF), VTX(207, 820, -1162, 61, -3381, 0x00, 0x78, 0x00, 0xFF), + VTX(973, 520, -847, 512, -2389, 0x00, 0x78, 0x00, 0xFF), VTX(142, 520, -1189, 0, -3015, 0x00, 0x78, 0x00, 0xFF), + VTX(1116, 520, -638, 512, -2105, 0x00, 0x78, 0x00, 0xFF), VTX(939, 520, -209, 201, -1404, 0x00, 0x78, 0x00, 0xFF), + VTX(1116, 220, -638, 512, -1764, 0x00, 0x78, 0x00, 0xFF), VTX(939, 220, -209, 391, -1391, 0x00, 0x78, 0x00, 0xFF), + VTX(1309, 220, 831, 143, 1679, 0x00, 0x78, 0x00, 0xFF), VTX(1907, 220, 920, 512, 2332, 0x00, 0x78, 0x00, 0xFF), + VTX(1871, 220, 831, 512, 1593, 0x00, 0x78, 0x00, 0xFF), VTX(1223, 177, 831, 0, 1707, 0x00, 0x78, 0x00, 0xFF), + VTX(1309, 220, 910, 0, 1820, 0x00, 0x78, 0x00, 0xFF), VTX(1932, 220, 1015, 512, 2503, 0x00, 0x78, 0x00, 0xFF), + VTX(1340, 220, -209, 512, -1081, 0x00, 0x78, 0x00, 0xFF), VTX(1636, 220, 1194, 0, 2503, 0x00, 0x78, 0x00, 0xFF), + VTX(691, 520, -209, 0, -1536, 0x00, 0x78, 0x00, 0xFF), VTX(839, 520, -209, 127, -1452, 0x00, 0x78, 0x00, 0xFF), + VTX(1915, -200, 1153, 410, 4096, 0x00, 0x78, 0x00, 0xFF), VTX(1968, -200, 1172, 512, 4096, 0x00, 0x78, 0x00, 0xFF), +}; + +Vtx D_80992A80[] = { + VTX(1915, 295, 1153, 410, 2901, 0x00, 0x78, 0x00, 0xFF), + VTX(1968, -200, 1172, 512, 4096, 0x00, 0x78, 0x00, 0xFF), + VTX(1968, 295, 1172, 512, 2958, 0x00, 0x78, 0x00, 0xFF), + VTX(1763, 295, 1241, 102, 2901, 0x00, 0x78, 0x00, 0xFF), + VTX(1763, -200, 1241, 102, 4096, 0x00, 0x78, 0x00, 0xFF), + VTX(1915, -200, 1153, 410, 4096, 0x00, 0x78, 0x00, 0xFF), + VTX(1753, 295, 1295, 0, 2958, 0x00, 0x78, 0x00, 0xFF), + VTX(1753, -200, 1295, 0, 4096, 0x00, 0x78, 0x00, 0xFF), + VTX(1340, 1012, -209, 512, -455, 0x00, 0x78, 0x00, 0xFF), + VTX(939, 520, -209, 201, -1404, 0x00, 0x78, 0x00, 0xFF), + VTX(839, 1012, -209, 143, -626, 0x00, 0x78, 0x00, 0xFF), + VTX(839, 520, -209, 127, -1452, 0x00, 0x78, 0x00, 0xFF), + VTX(839, 676, 119, 0, -967, 0x00, 0x78, 0x00, 0xFF), + VTX(839, 1176, 119, 0, -284, 0x00, 0x78, 0x00, 0xFF), + VTX(1116, 520, -638, 512, -2105, 0x00, 0x78, 0x00, 0xFF), + VTX(469, 820, -1799, 512, -4096, 0x00, 0x78, 0x00, 0xFF), + VTX(207, 820, -1162, 61, -3381, 0x00, 0x78, 0x00, 0xFF), + VTX(207, 1312, -1162, 251, -3368, 0x00, 0x78, 0x00, 0xFF), + VTX(470, 1488, -1799, 512, -3755, 0x00, 0x78, 0x00, 0xFF), + VTX(1223, 1014, 831, 0, 853, 0x00, 0x78, 0x00, 0xFF), + VTX(1223, 500, 831, 0, 1365, 0x00, 0x78, 0x00, 0xFF), + VTX(1871, 1014, 831, 512, 853, 0x00, 0x78, 0x00, 0xFF), + VTX(1871, 220, 831, 512, 1593, 0x00, 0x78, 0x00, 0xFF), + VTX(142, 520, -1189, 0, -3015, 0x00, 0x78, 0x00, 0xFF), + VTX(142, 820, -1189, 0, -3413, 0x00, 0x78, 0x00, 0xFF), + VTX(-76, 820, -1633, 0, -4096, 0x00, 0x78, 0x00, 0xFF), +}; + +Vtx D_80992C20[] = { + VTX(1658, 295, 1169, 205, 1308, 0x00, 0x78, 0x00, 0xFF), + VTX(1763, 295, 1241, 205, 1451, 0x00, 0x78, 0x00, 0xFF), + VTX(1915, 295, 1153, 819, 1451, 0x00, 0x78, 0x00, 0xFF), +}; + +Vtx D_80992C50[] = { + VTX(-389, 800, -1884, 102, 4096, 0x2E, 0x00, 0x92, 0xFF), + VTX(-989, 800, -2131, 512, 4096, 0x2E, 0x00, 0x92, 0xFF), + VTX(-389, 1312, -1884, 102, 3589, 0x2B, 0x29, 0x98, 0xFF), + VTX(-989, 1312, -2131, 512, 3183, 0x1C, 0x5E, 0xBC, 0xFF), + VTX(-1491, 1521, -1887, 512, 2676, 0x14, 0x6B, 0xCF, 0xFF), + VTX(-1526, 1573, -1788, 432, 2534, 0x07, 0x76, 0xEE, 0xFF), + VTX(-960, 1573, -1555, 0, 2929, 0x07, 0x76, 0xEE, 0xFF), + VTX(-431, 1368, -1782, 0, 3487, 0x14, 0x6B, 0xCF, 0xFF), + VTX(-3551, 128, 2017, 512, -8687, 0x00, 0x78, 0x00, 0xFF), + VTX(-3362, 110, 1813, 512, -9143, 0x00, 0x78, 0x00, 0xFF), + VTX(-3663, 171, 1333, 0, -9143, 0x00, 0x78, 0x00, 0xFF), + VTX(-2482, 20, 1094, 0, -10005, 0x00, 0x78, 0x00, 0xFF), + VTX(-4018, 201, 1769, 0, -8687, 0x00, 0x78, 0x00, 0xFF), + VTX(-4183, 210, 2614, 0, -8129, 0x00, 0x78, 0x00, 0xFF), + VTX(-3596, 132, 2353, 512, -8129, 0x00, 0x78, 0x00, 0xFF), + VTX(-2655, 20, 1678, 508, -9752, 0x00, 0x78, 0x00, 0xFF), + VTX(-4574, 262, 2787, 0, -4832, 0x00, 0x78, 0x00, 0xFF), + VTX(-4684, 277, 2678, 0, -4679, 0x00, 0x78, 0x00, 0xFF), + VTX(-5168, 341, 2737, 512, -4527, 0x00, 0x78, 0x00, 0xFF), + VTX(-5194, 351, 2079, 512, -3868, 0x00, 0x78, 0x00, 0xFF), + VTX(-4997, 318, 2975, 512, -4832, 0x00, 0x78, 0x00, 0xFF), + VTX(-4710, 283, 1899, 0, -4121, 0x00, 0x78, 0x00, 0xFF), + VTX(-4653, 291, 1728, 0, -3868, 0x00, 0x78, 0x00, 0xFF), + VTX(-1962, 20, 988, 0, -10462, 0x00, 0x78, 0x00, 0xFF), + VTX(-1824, 20, 1516, 512, -10462, 0x00, 0x78, 0x00, 0xFF), + VTX(-116, 20, 907, 0, -12034, 0x00, 0x78, 0x00, 0xFF), + VTX(-253, 20, 908, 0, -11882, 0x00, 0x78, 0x00, 0xFF), + VTX(-261, 20, 1460, 512, -11882, 0x00, 0x78, 0x00, 0xFF), + VTX(-1189, 20, 1466, 512, -11121, 0x00, 0x78, 0x00, 0xFF), + VTX(105, 20, 905, 0, -12288, 0x00, 0x78, 0x00, 0xFF), + VTX(-42, 20, 906, 0, -12136, 0x00, 0x78, 0x00, 0xFF), + VTX(112, 20, 1211, 256, -12288, 0x00, 0x78, 0x00, 0xFF), +}; + +Vtx D_80992E50[] = { + VTX(-1481, 1314, -1874, 512, 2676, 0x4D, 0x56, 0x1F, 0xFF), + VTX(-2157, 1810, -1555, 512, 1661, 0x49, 0x56, 0x28, 0xFF), + VTX(-1708, 1312, -1303, 181, 2088, 0x47, 0x53, 0x31, 0xFF), + VTX(-4127, 2148, -205, 512, -774, 0x2C, 0x5D, 0x3D, 0xFF), + VTX(-4859, 1836, 734, 512, -1675, 0x2C, 0x5D, 0x3D, 0xFF), + VTX(-4433, 1483, 1025, 0, -1940, 0x2C, 0x5D, 0x3D, 0xFF), + VTX(-5178, 1470, 1540, 512, -2352, 0x2C, 0x5D, 0x3D, 0xFF), + VTX(-5210, 1260, 1920, 512, -2803, 0x2C, 0x5D, 0x3D, 0xFF), + VTX(-5196, 1149, 2080, 512, -2955, 0x2C, 0x5D, 0x3D, 0xFF), + VTX(-4655, 1124, 1729, 0, -2955, 0x2C, 0x5D, 0x3D, 0xFF), + VTX(-2443, 1728, -884, 0, 900, 0x49, 0x55, 0x2A, 0xFF), + VTX(-1743, 1282, -1195, 0, 1813, 0x65, 0x2F, 0x2C, 0xFF), + VTX(-1601, 520, -1259, 0, 2168, 0xD2, 0x00, 0x6E, 0xFF), + VTX(-1601, 1312, -1259, 0, 2371, 0xD5, 0x29, 0x68, 0xFF), + VTX(-1708, 520, -1303, 86, 2090, 0xD2, 0x00, 0x6E, 0xFF), + VTX(-1708, 1312, -1303, 181, 2088, 0xD2, 0x00, 0x6E, 0xFF), + VTX(-1708, 520, -1303, 86, 2090, 0x00, 0x78, 0x00, 0xFF), + VTX(-1743, 520, -1195, 0, 2016, 0x00, 0x78, 0x00, 0xFF), + VTX(-1601, 520, -1259, 0, 2168, 0x00, 0x78, 0x00, 0xFF), + VTX(-960, 1573, -1555, 0, 2929, 0x07, 0x76, 0xEE, 0xFF), + VTX(-1526, 1573, -1788, 432, 2534, 0x07, 0x76, 0xEE, 0xFF), + VTX(-431, 800, -1782, 0, 4096, 0x6E, 0x00, 0x2E, 0xFF), + VTX(-389, 1312, -1884, 102, 3589, 0x6E, 0x00, 0x2E, 0xFF), + VTX(-431, 1368, -1782, 0, 3487, 0x6E, 0x00, 0x2E, 0xFF), + VTX(-389, 800, -1884, 102, 4096, 0x6E, 0x00, 0x2E, 0xFF), + VTX(-1708, 520, -1303, 86, 2090, 0x72, 0x00, 0x25, 0xFF), + VTX(-1743, 520, -1195, 0, 2016, 0x72, 0x00, 0x25, 0xFF), + VTX(-2793, 2196, -1235, 512, 748, 0x3B, 0x5A, 0x34, 0xFF), + VTX(-2584, 1794, -774, 0, 697, 0x3B, 0x5A, 0x34, 0xFF), + VTX(-2717, 2160, -1291, 512, 850, 0x48, 0x55, 0x2A, 0xFF), +}; + +Vtx D_80993030[] = { + VTX(-5196, 1149, 2080, 512, -2955, 0x00, 0x78, 0x00, 0xFF), + VTX(-5194, 351, 2079, 512, -3868, 0x00, 0x78, 0x00, 0xFF), + VTX(-4653, 291, 1728, 0, -3868, 0x00, 0x78, 0x00, 0xFF), + VTX(-4655, 1124, 1729, 0, -2955, 0x00, 0x78, 0x00, 0xFF), + VTX(-4574, 262, 2787, 0, -4832, 0x00, 0x78, 0x00, 0xFF), + VTX(-4997, 318, 2975, 512, -4832, 0x00, 0x78, 0x00, 0xFF), + VTX(-4997, 1136, 2975, 512, -5795, 0x00, 0x78, 0x00, 0xFF), + VTX(-4574, 1112, 2787, 0, -5795, 0x00, 0x78, 0x00, 0xFF), + VTX(-3596, 1057, 2353, 512, -7266, 0x00, 0x78, 0x00, 0xFF), + VTX(-3596, 132, 2353, 512, -8129, 0x00, 0x78, 0x00, 0xFF), + VTX(-4183, 210, 2614, 0, -8129, 0x00, 0x78, 0x00, 0xFF), + VTX(-4183, 1090, 2614, 0, -7266, 0x00, 0x78, 0x00, 0xFF), + VTX(-1189, 20, 1466, 512, -11121, 0x00, 0x78, 0x00, 0xFF), + VTX(-1194, 20, 914, 0, -11071, 0x00, 0x78, 0x00, 0xFF), + VTX(-1577, 20, 1468, 512, -10716, 0x00, 0x78, 0x00, 0xFF), + VTX(-253, 20, 908, 0, -11882, 0x00, 0x78, 0x00, 0xFF), + VTX(-1610, 20, 917, 0, -10766, 0x00, 0x78, 0x00, 0xFF), + VTX(-1962, 20, 988, 0, -10462, 0x00, 0x78, 0x00, 0xFF), + VTX(-1824, 20, 1516, 512, -10462, 0x00, 0x78, 0x00, 0xFF), + VTX(-4433, 1483, 1025, 0, -1940, 0x2C, 0x5D, 0x3D, 0xFF), + VTX(-3678, 1748, 81, 0, -621, 0x2C, 0x5D, 0x3D, 0xFF), + VTX(-4127, 2148, -205, 512, -774, 0x2C, 0x5D, 0x3D, 0xFF), + VTX(-3641, 2217, -657, 512, -114, 0x2C, 0x5D, 0x3D, 0xFF), + VTX(-2584, 1794, -774, 0, 697, 0x3B, 0x5A, 0x34, 0xFF), + VTX(-2584, 1794, -774, 0, 697, 0x3B, 0x5A, 0x34, 0xFF), + VTX(-2793, 2196, -1235, 512, 748, 0x3B, 0x5A, 0x34, 0xFF), + VTX(-4997, 1136, 2975, 512, -5795, 0x00, 0x78, 0x00, 0xFF), + VTX(-4876, 1279, 3143, 512, -6089, 0x00, 0x78, 0x00, 0xFF), + VTX(-4574, 1112, 2787, 0, -5795, 0x00, 0x78, 0x00, 0xFF), + VTX(-4445, 1191, 2858, 0, -6163, 0x00, 0x78, 0x00, 0xFF), + VTX(-4488, 1519, 3360, 512, -6384, 0x00, 0x78, 0x00, 0xFF), +}; + +Vtx D_80993220[] = { + VTX(-4488, 1519, 3360, 512, -6384, 0x00, 0x78, 0x00, 0xFF), + VTX(-3980, 1539, 3206, 512, -6678, 0x00, 0x78, 0x00, 0xFF), + VTX(-4281, 1193, 2801, 0, -6531, 0x00, 0x78, 0x00, 0xFF), + VTX(-4445, 1191, 2858, 0, -6163, 0x00, 0x78, 0x00, 0xFF), + VTX(-3643, 1337, 2785, 512, -6972, 0x00, 0x78, 0x00, 0xFF), + VTX(-4203, 1151, 2711, 0, -6899, 0x00, 0x78, 0x00, 0xFF), + VTX(-3596, 1057, 2353, 512, -7266, 0x00, 0x78, 0x00, 0xFF), + VTX(-4183, 1090, 2614, 0, -7266, 0x00, 0x78, 0x00, 0xFF), +}; + +Vtx D_809932A0[] = { + VTX(117, 20, 1458, 1024, -6144, 0x00, 0x78, 0x00, 0xFF), + VTX(112, 20, 1211, 512, -6144, 0x00, 0x78, 0x00, 0xFF), + VTX(-261, 20, 1460, 1024, -5941, 0x00, 0x78, 0x00, 0xFF), +}; + +Gfx D_809932D0[] = { + gsDPPipeSync(), + gsDPSetTextureLUT(G_TT_NONE), + gsSPTexture(65535, 65535, 0, G_TX_RENDERTILE, G_ON), + gsDPLoadTextureBlock(D_80991680, G_IM_FMT_I, G_IM_SIZ_8b, 16, 128, 0, G_TX_NOMIRROR | G_TX_CLAMP, + G_TX_NOMIRROR | G_TX_WRAP, 4, 7, G_TX_NOLOD, 1), + gsDPLoadMultiBlock(D_80991E80, 0x0100, 1, G_IM_FMT_I, G_IM_SIZ_8b, 32, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, + G_TX_NOMIRROR | G_TX_WRAP, 5, 6, G_TX_NOLOD, 15), + gsDPSetCombineLERP(NOISE, ENVIRONMENT, PRIMITIVE, ENVIRONMENT, TEXEL1, 1, ENVIRONMENT, TEXEL0, 0, 0, 0, COMBINED, 0, + 0, 0, COMBINED), + gsDPSetRenderMode(G_RM_PASS, G_RM_AA_ZB_XLU_SURF2), + gsSPClearGeometryMode(G_FOG | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR), + gsSPSetGeometryMode(G_CULL_BACK | G_LIGHTING), + gsDPSetPrimColor(0, 0, 0x00, 0x32, 0x64, 0xFF), + gsDPSetEnvColor(0x32, 0x14, 0x00, 0x80), + gsSPEndDisplayList(), +}; + +Gfx D_80993390[] = { + gsSPVertex(D_80992680, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), + gsSP2Triangles(4, 6, 5, 0, 7, 8, 9, 0), + gsSP2Triangles(8, 10, 9, 0, 11, 12, 13, 0), + gsSP2Triangles(12, 14, 13, 0, 15, 16, 2, 0), + gsSP2Triangles(16, 0, 2, 0, 17, 1, 0, 0), + gsSP2Triangles(7, 18, 19, 0, 18, 20, 19, 0), + gsSP2Triangles(20, 21, 19, 0, 22, 23, 21, 0), + gsSP2Triangles(23, 19, 21, 0, 24, 25, 26, 0), + gsSP2Triangles(27, 28, 29, 0, 28, 30, 29, 0), + gsSP2Triangles(29, 30, 31, 0, 26, 25, 18, 0), + gsSPVertex(D_80992880, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0), + gsSP2Triangles(4, 5, 6, 0, 5, 7, 6, 0), + gsSP2Triangles(1, 0, 8, 0, 0, 9, 8, 0), + gsSP2Triangles(6, 7, 10, 0, 7, 11, 10, 0), + gsSP2Triangles(12, 13, 14, 0, 13, 15, 14, 0), + gsSP2Triangles(16, 17, 18, 0, 17, 19, 18, 0), + gsSP2Triangles(4, 2, 20, 0, 2, 21, 20, 0), + gsSP2Triangles(21, 22, 20, 0, 23, 24, 20, 0), + gsSP2Triangles(25, 21, 2, 0, 3, 25, 2, 0), + gsSP2Triangles(26, 18, 19, 0, 24, 27, 20, 0), + gsSP2Triangles(27, 4, 20, 0, 27, 5, 4, 0), + gsSP2Triangles(28, 29, 15, 0, 29, 16, 15, 0), + gsSP2Triangles(16, 14, 15, 0, 9, 30, 31, 0), + gsSPVertex(D_80992A80, 26, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), + gsSP2Triangles(3, 5, 0, 0, 6, 7, 4, 0), + gsSP2Triangles(6, 4, 3, 0, 8, 9, 10, 0), + gsSP2Triangles(9, 11, 10, 0, 10, 12, 13, 0), + gsSP2Triangles(14, 11, 9, 0, 15, 16, 17, 0), + gsSP2Triangles(15, 17, 18, 0, 19, 20, 21, 0), + gsSP2Triangles(20, 22, 21, 0, 23, 16, 24, 0), + gsSP2Triangles(15, 25, 16, 0, 25, 24, 16, 0), + gsSPVertex(D_80992C20, 3, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSPEndDisplayList(), +}; + +Gfx D_809934B8[] = { + gsSPVertex(D_80992C50, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0), + gsSP2Triangles(4, 5, 3, 0, 5, 6, 3, 0), + gsSP2Triangles(6, 7, 3, 0, 7, 2, 3, 0), + gsSP2Triangles(8, 9, 10, 0, 9, 11, 10, 0), + gsSP2Triangles(10, 12, 8, 0, 12, 13, 8, 0), + gsSP2Triangles(13, 14, 8, 0, 9, 15, 11, 0), + gsSP2Triangles(16, 17, 18, 0, 17, 19, 18, 0), + gsSP2Triangles(18, 20, 16, 0, 17, 21, 19, 0), + gsSP2Triangles(21, 22, 19, 0, 23, 11, 24, 0), + gsSP2Triangles(11, 15, 24, 0, 25, 26, 27, 0), + gsSP2Triangles(26, 28, 27, 0, 29, 30, 31, 0), + gsSP2Triangles(31, 30, 27, 0, 30, 25, 27, 0), + gsSPVertex(D_80992E50, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), + gsSP2Triangles(4, 6, 5, 0, 6, 7, 5, 0), + gsSP2Triangles(7, 8, 5, 0, 8, 9, 5, 0), + gsSP2Triangles(10, 11, 1, 0, 11, 2, 1, 0), + gsSP2Triangles(12, 13, 14, 0, 13, 15, 14, 0), + gsSP2Triangles(16, 17, 18, 0, 2, 13, 19, 0), + gsSP2Triangles(2, 19, 20, 0, 21, 22, 23, 0), + gsSP2Triangles(21, 24, 22, 0, 11, 25, 2, 0), + gsSP2Triangles(11, 26, 25, 0, 27, 28, 29, 0), + gsSP2Triangles(28, 10, 29, 0, 10, 1, 29, 0), + gsSPVertex(D_80993030, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 15, 13, 0), + gsSP2Triangles(13, 16, 14, 0, 16, 17, 14, 0), + gsSP2Triangles(17, 18, 14, 0, 19, 20, 21, 0), + gsSP2Triangles(20, 22, 21, 0, 20, 23, 22, 0), + gsSP2Triangles(24, 25, 22, 0, 26, 27, 28, 0), + gsSP2Triangles(27, 29, 28, 0, 27, 30, 29, 0), + gsSPVertex(D_80993220, 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0), + gsSP2Triangles(4, 6, 7, 0, 4, 7, 5, 0), + gsSPVertex(D_809932A0, 3, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSPEndDisplayList(), +}; diff --git a/src/overlays/actors/ovl_En_Mag/z_en_mag.c b/src/overlays/actors/ovl_En_Mag/z_en_mag.c index 07d32aa372..d282c0a519 100644 --- a/src/overlays/actors/ovl_En_Mag/z_en_mag.c +++ b/src/overlays/actors/ovl_En_Mag/z_en_mag.c @@ -1,7 +1,7 @@ /* * File: z_en_mag.c * Overlay: ovl_En_Mag - * Description: Title Screen Actor + * Description: Title Screen Manager & Logo */ #include "z_en_mag.h" @@ -15,7 +15,13 @@ void EnMag_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnMag_Update(Actor* thisx, GlobalContext* globalCtx); void EnMag_Draw(Actor* thisx, GlobalContext* globalCtx); -/* +extern u8 D_06000000[]; // Main Logo +extern u8 D_06019A00[]; // Copyright Notice +extern u8 D_0601A400[]; // Master Quest Sub Title +extern u8 D_06024800[]; // Logo Flame Effect +extern u8 D_06024C00[]; // "The Legend of" +extern u8 D_06024E40[]; // "Ocarina of Time" + const ActorInit En_Mag_InitVars = { ACTOR_EN_MAG, ACTORTYPE_PROP, @@ -27,21 +33,553 @@ const ActorInit En_Mag_InitVars = { (ActorFunc)EnMag_Update, (ActorFunc)EnMag_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Mag/EnMag_Init.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Mag/EnMag_Destroy.s") +static s16 sDelayTimer = 0; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Mag/EnMag_Update.s") +void EnMag_Init(Actor* thisx, GlobalContext* globalCtx) { + EnMag* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Mag/func_80AA447C.s") + YREG(1) = 63; + YREG(3) = 80; + YREG(4) = 255; + YREG(5) = 30; + YREG(6) = 30; + YREG(7) = 119; + YREG(8) = 7; + YREG(9) = 5; + YREG(10) = 3; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Mag/func_80AA46A0.s") + VREG(4) = 1; + VREG(5) = 6; + VREG(6) = 2; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Mag/func_80AA4AD4.s") + this->copyrightAlphaStep = 6; + this->fadeOutAlphaStep = 10; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Mag/func_80AA4EB8.s") + VREG(19) = 99; + VREG(21) = 9; + VREG(23) = 10; + VREG(24) = 8; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Mag/func_80AA507C.s") + this->effectScroll = 0; + this->unk_E30C = 0; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Mag/EnMag_Draw.s") + this->effectPrimColor[0] = 0.0f; + this->effectPrimColor[1] = 100.0f; + this->effectPrimColor[2] = 170.0f; + this->effectEnvColor[0] = 0.0f; + this->effectEnvColor[1] = 100.0f; + this->effectEnvColor[2] = 0.0f; + + this->effectFadeInTimer = 40; + + this->effectFadeInState = this->effectPrimLodFrac = this->globalState = this->effectAlpha = this->mainAlpha = + this->subAlpha = this->copyrightAlpha = 0.0f; + + if (gSaveContext.unk_13E7 != 0) { + this->mainAlpha = 210; + this->subAlpha = 255; + this->copyrightAlpha = 255; + + this->effectPrimLodFrac = 128.0f; + this->effectAlpha = 255.0f; + + this->effectPrimColor[0] = 170; + this->effectPrimColor[1] = 255.0f; + this->effectPrimColor[2] = 255.0f; + this->effectEnvColor[0] = 200.0f; + this->effectEnvColor[1] = 255.0f; + this->effectEnvColor[2] = 0; + + gSaveContext.unk_13E7 = 0; + this->globalState = MAG_STATE_DISPLAY; + sDelayTimer = 20; + gSaveContext.fadeDuration = 1; + gSaveContext.unk_1419 = 255; + } + + func_8006EF10(&this->unk_150); + + this->unk_E316 = 0; + this->unk_E318 = 0; + this->unk_E31C = 0; + this->unk_E320 = 0; +} + +void EnMag_Destroy(Actor* thisx, GlobalContext* globalCtx) { +} + +void EnMag_Update(Actor* thisx, GlobalContext* globalCtx) { + s32 pad[2]; + EnMag* this = THIS; + + if (gSaveContext.fileNum != 0xFEDC) { + if (this->globalState < MAG_STATE_DISPLAY) { + if (CHECK_PAD(globalCtx->state.input[0].press, START_BUTTON) || + CHECK_PAD(globalCtx->state.input[0].press, A_BUTTON) || + CHECK_PAD(globalCtx->state.input[0].press, B_BUTTON)) { + + Audio_PlaySoundGeneral(NA_SE_SY_PIECE_OF_HEART, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + + this->mainAlpha = 210; + this->subAlpha = 255; + this->copyrightAlpha = 255; + + this->effectPrimLodFrac = 128.0f; + this->effectAlpha = 255.0f; + + this->effectPrimColor[0] = 170; + this->effectPrimColor[1] = 255.0f; + this->effectPrimColor[2] = 255.0f; + this->effectEnvColor[0] = 200.0f; + this->effectEnvColor[1] = 255.0f; + this->effectEnvColor[2] = 0; + + this->globalState = MAG_STATE_DISPLAY; + sDelayTimer = 20; + gSaveContext.fadeDuration = 1; + gSaveContext.unk_1419 = 255; + } + } else if (this->globalState >= MAG_STATE_DISPLAY) { + if (sDelayTimer == 0) { + if (CHECK_PAD(globalCtx->state.input[0].press, START_BUTTON) || + CHECK_PAD(globalCtx->state.input[0].press, A_BUTTON) || + CHECK_PAD(globalCtx->state.input[0].press, B_BUTTON)) { + + if (globalCtx->sceneLoadFlag != 20) { + func_800F68BC(0); + + Audio_PlaySoundGeneral(NA_SE_SY_PIECE_OF_HEART, &D_801333D4, 4, &D_801333E0, &D_801333E0, + &D_801333E8); + + gSaveContext.gameMode = 2; + globalCtx->sceneLoadFlag = 20; + globalCtx->fadeTransition = 2; + } + + this->copyrightAlphaStep = 15; + this->fadeOutAlphaStep = 25; + this->globalState = MAG_STATE_FADE_OUT; + } + } else { + sDelayTimer--; + } + } + } + + if (this->globalState == MAG_STATE_FADE_IN) { + if (this->effectFadeInState == 0) { + this->effectAlpha += 6.375f; + this->effectPrimLodFrac += 0.8f; + + this->effectPrimColor[0] += 6.375f; + this->effectPrimColor[1] += 3.875f; + this->effectPrimColor[2] += 2.125f; + this->effectEnvColor[0] += 6.375f; + this->effectEnvColor[1] += 3.875f; + + this->effectFadeInTimer--; + + if (this->effectFadeInTimer == 0) { + this->effectPrimLodFrac = 32.0f; + this->effectAlpha = 255.0f; + + this->effectPrimColor[0] = 255.0f; + this->effectPrimColor[1] = 255.0f; + this->effectPrimColor[2] = 255.0f; + this->effectEnvColor[0] = 255.0f; + this->effectEnvColor[1] = 255.0f; + + this->effectFadeInTimer = 40; + this->effectFadeInState = 1; + } + } else if (this->effectFadeInState == 1) { + this->effectPrimColor[0] += -2.125f; + this->effectEnvColor[0] += -1.375f; + + this->effectPrimLodFrac += 2.4f; + + this->effectFadeInTimer--; + + if (this->effectFadeInTimer == 0) { + this->effectPrimLodFrac = 128.0f; + + this->effectPrimColor[0] = 170.0f; + this->effectEnvColor[0] = 200.0f; + + this->effectFadeInTimer = 32; + this->effectFadeInState = 2; + } + } + + if (this->effectAlpha > 160) { + this->mainAlpha += VREG(5); + if (this->mainAlpha >= 210.0f) { + this->mainAlpha = 210.0f; + } + + if (this->mainAlpha >= 210) { + this->subAlpha += VREG(6); + if (this->subAlpha >= 255.0f) { + this->subAlpha = 255.0f; + } + + if (this->subAlpha >= 200) { + this->copyrightAlpha += this->copyrightAlphaStep; + if (this->copyrightAlpha >= 255.0f) { + this->copyrightAlpha = 255.0f; + this->globalState = MAG_STATE_DISPLAY; + sDelayTimer = 20; + } + } + } + } + } else if (this->globalState == MAG_STATE_FADE_OUT) { + this->effectAlpha -= this->fadeOutAlphaStep; + if (this->effectAlpha < 0.0f) { + this->effectAlpha = 0.0f; + } + + this->mainAlpha -= this->fadeOutAlphaStep; + if (this->mainAlpha < 0.0f) { + this->mainAlpha = 0.0f; + } + + this->subAlpha -= this->fadeOutAlphaStep; + if (this->subAlpha < 0.0f) { + this->subAlpha = 0.0f; + } + + this->copyrightAlpha -= this->copyrightAlphaStep; + if (this->copyrightAlpha < 0.0f) { + this->copyrightAlpha = 0.0f; + this->globalState = MAG_STATE_POST_DISPLAY; + } + } + + if (this->globalState == MAG_STATE_INITIAL) { + if (Flags_GetEnv(globalCtx, 3)) { + this->effectFadeInTimer = 40; + this->globalState = MAG_STATE_FADE_IN; + } + } else if (this->globalState == MAG_STATE_DISPLAY) { + if (Flags_GetEnv(globalCtx, 4)) { + this->globalState = MAG_STATE_FADE_OUT; + } + } +} + +void EnMag_DrawTextureI8(Gfx** gfxp, void* texture, s16 texWidth, s16 texHeight, s16 rectLeft, s16 rectTop, + s16 rectWidth, s16 rectHeight, u16 dsdx, u16 dtdy) { + Gfx* gfx = *gfxp; + + gDPLoadTextureBlock(gfx++, texture, G_IM_FMT_I, G_IM_SIZ_8b, texWidth, texHeight, 0, G_TX_NOMIRROR | G_TX_WRAP, + G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); + + gSPTextureRectangle(gfx++, rectLeft << 2, rectTop << 2, (rectLeft + rectWidth) << 2, (rectTop + rectHeight) << 2, + G_TX_RENDERTILE, 0, 0, dsdx, dtdy); + + *gfxp = gfx; +} + +void EnMag_DrawEffectTextures(Gfx** gfxp, void* maskTex, void* effectTex, s16 maskWidth, s16 maskHeight, + s16 effectWidth, s16 effectHeight, s16 rectLeft, s16 rectTop, s16 rectWidth, + s16 rectHeight, u16 dsdx, u16 dtdy, u16 shifts, u16 shiftt, u16 flag, EnMag* this) { + Gfx* gfx = *gfxp; + + gDPLoadMultiBlock_4b(gfx++, maskTex, 0x0000, 0, G_IM_FMT_I, maskWidth, maskHeight, 0, G_TX_NOMIRROR | G_TX_WRAP, + G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); + + if (1) {} + + if (!flag) { + gDPLoadMultiBlock(gfx++, effectTex, 0x0100, 1, G_IM_FMT_I, G_IM_SIZ_8b, effectWidth, effectHeight, 0, + G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, 5, shifts, shiftt); + + gDPSetTileSize(gfx++, 1, 0, this->effectScroll & 0x7F, 0x7C, (this->effectScroll & 0x7F) + 0x7C); + } + + gSPTextureRectangle(gfx++, rectLeft << 2, rectTop << 2, (rectLeft + rectWidth) << 2, (rectTop + rectHeight) << 2, + G_TX_RENDERTILE, 0, 0, dsdx, dtdy); + + *gfxp = gfx; +} + +void EnMag_DrawImageRGBA32(Gfx** gfxp, s16 centerX, s16 centerY, u8* source, u32 width, u32 height) { + Gfx* gfx = *gfxp; + u8* curTexture; + s32 textureCount; + u32 rectLeft; + u32 rectTop; + u32 textureHeight; + s32 remainingSize; + s32 textureSize; + s32 pad; + s32 i; + + func_80094D28(&gfx); + + curTexture = source; + rectLeft = centerX - (width / 2); + rectTop = centerY - (height / 2); + textureHeight = 4096 / (width << 2); + remainingSize = (width * height) << 2; + textureSize = (width * textureHeight) << 2; + textureCount = remainingSize / textureSize; + if ((remainingSize % textureSize) != 0) { + textureCount += 1; + } + + gSetTileCustom(gfx++, G_IM_FMT_RGBA, G_IM_SIZ_32b, width, textureHeight, 0, G_TX_NOMIRROR | G_TX_CLAMP, + G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); + + remainingSize -= textureSize; + + for (i = 0; i < textureCount; i++) { + gDPSetTextureImage(gfx++, G_IM_FMT_RGBA, G_IM_SIZ_32b, width, curTexture); + + gDPLoadSync(gfx++); + gDPLoadTile(gfx++, G_TX_LOADTILE, 0, 0, (width - 1) << 2, (textureHeight - 1) << 2); + + gSPTextureRectangle(gfx++, rectLeft << 2, rectTop << 2, (rectLeft + (s32)width) << 2, + (rectTop + textureHeight) << 2, G_TX_RENDERTILE, 0, 0, 1024, 1024); + + if (1) {} + + curTexture += textureSize; + rectTop += textureHeight; + + if ((remainingSize - textureSize) < 0) { + if (remainingSize > 0) { + textureHeight = remainingSize / (s32)(width << 2); + remainingSize -= textureSize; + + gSetTileCustom(gfx++, G_IM_FMT_RGBA, G_IM_SIZ_32b, width, textureHeight, 0, G_TX_NOMIRROR | G_TX_CLAMP, + G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); + } + } else { + remainingSize -= textureSize; + } + } + + *gfxp = gfx; +} + +void EnMag_DrawCharTexture(Gfx** gfxp, u8* texture, s32 rectLeft, s32 rectTop) { + Gfx* gfx = *gfxp; + + YREG(0) = 1024.0f / (YREG(1) / 100.0f); + YREG(2) = 16.0f * (YREG(1) / 100.0f); + + gDPLoadTextureBlock_4b(gfx++, texture, G_IM_FMT_I, 16, 16, 0, G_TX_NOMIRROR | G_TX_CLAMP, + G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); + + gSPTextureRectangle(gfx++, rectLeft << 2, rectTop << 2, (rectLeft + YREG(2)) << 2, (rectTop + YREG(2)) << 2, + G_TX_RENDERTILE, 0, 0, YREG(0), YREG(0)); + + *gfxp = gfx; +} + +void EnMag_DrawInner(Actor* thisx, GlobalContext* globalCtx, Gfx** gfxp) { + static s16 textAlpha = 0; + static s16 textFadeDirection = 0; + static s16 textFadeTimer = 0; + static u8 noControllerFontIndexes[] = { + 0x17, 0x18, 0x0C, 0x18, 0x17, 0x1D, 0x1B, 0x18, 0x15, 0x15, 0x0E, 0x1B, + }; + static u8 pressStartFontIndexes[] = { + 0x19, 0x1B, 0x0E, 0x1C, 0x1C, 0x1C, 0x1D, 0x0A, 0x1B, 0x1D, + }; + static u8* effectMaskTextures[] = { + 0x06020000, 0x06020800, 0x06021000, 0x06021800, 0x06022000, 0x06022800, 0x06023000, 0x06023800, 0x06024000, + }; + EnMag* this = THIS; + u8* buf = this->unk_150; + s32 pad; + Gfx* gfx = *gfxp; + u16 i, j, k; + u16 rectLeft; + u16 rectTop; + + gSPSegment(gfx++, 0x06, globalCtx->objectCtx.status[this->actor.objBankIndex].segment); + + func_8009457C(&gfx); + + this->effectScroll -= 2; + + gDPSetCycleType(gfx++, G_CYC_2CYCLE); + gDPSetAlphaCompare(gfx++, G_AC_THRESHOLD); + gDPSetRenderMode(gfx++, G_RM_PASS, G_RM_CLD_SURF2); + gDPSetCombineLERP(gfx++, TEXEL1, PRIMITIVE, PRIM_LOD_FRAC, TEXEL0, TEXEL1, 1, PRIM_LOD_FRAC, TEXEL0, PRIMITIVE, + ENVIRONMENT, COMBINED, ENVIRONMENT, COMBINED, 0, PRIMITIVE, 0); + + gDPSetPrimColor(gfx++, 0, (s16)this->effectPrimLodFrac, (s16)this->effectPrimColor[0], + (s16)this->effectPrimColor[1], (s16)this->effectPrimColor[2], (s16)this->effectAlpha); + gDPSetEnvColor(gfx++, (s16)this->effectEnvColor[0], (s16)this->effectEnvColor[1], (s16)this->effectEnvColor[2], + 255); + + if ((s16)this->effectPrimLodFrac != 0) { + for (k = 0, i = 0, rectTop = 0; i < 3; i++, rectTop += 64) { + for (j = 0, rectLeft = 56; j < 3; j++, k++, rectLeft += 64) { + EnMag_DrawEffectTextures(&gfx, effectMaskTextures[k], D_06024800, 64, 64, 32, 32, rectLeft, rectTop, 64, + 64, 1024, 1024, 1, 1, k, this); + } + } + } + + gDPSetPrimColor(gfx++, 0, 0, 255, 255, 255, (s16)this->mainAlpha); + + if ((s16)this->mainAlpha != 0) { + EnMag_DrawImageRGBA32(&gfx, 152, 100, D_06000000, 160, 160); + } + + func_8009457C(&gfx); + + gDPPipeSync(gfx++); + gDPSetAlphaCompare(gfx++, G_AC_NONE); + gDPSetCombineLERP(gfx++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE, + ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0); + + if ((s16)this->mainAlpha < 100) { + gDPSetRenderMode(gfx++, G_RM_CLD_SURF, G_RM_CLD_SURF2); + } else { + gDPSetRenderMode(gfx++, G_RM_XLU_SURF, G_RM_XLU_SURF2); + } + + gDPSetPrimColor(gfx++, 0, 0, 0, 0, 0, (s16)this->mainAlpha); + gDPSetEnvColor(gfx++, 0, 0, 100, 255); + + if ((s16)this->mainAlpha != 0) { + EnMag_DrawTextureI8(&gfx, D_06024C00, 72, 8, 146, 73, 72, 8, 1024, 1024); + EnMag_DrawTextureI8(&gfx, D_06024E40, 96, 8, 144, 127, 96, 8, 1024, 1024); + + gDPPipeSync(gfx++); + gDPSetPrimColor(gfx++, 0, 0, 100, 150, 255, (s16)this->mainAlpha); + gDPSetEnvColor(gfx++, 20, 80, 160, 255); + + EnMag_DrawTextureI8(&gfx, D_06024C00, 72, 8, 145, 72, 72, 8, 1024, 1024); + EnMag_DrawTextureI8(&gfx, D_06024E40, 96, 8, 143, 126, 96, 8, 1024, 1024); + + gDPPipeSync(gfx++); + gDPSetPrimColor(gfx++, 0, 0, 255, 255, 255, (s16)this->subAlpha); + + EnMag_DrawImageRGBA32(&gfx, 174, 145, D_0601A400, 128, 32); + } + + func_8009457C(&gfx); + + gDPSetAlphaCompare(gfx++, G_AC_NONE); + gDPSetCombineMode(gfx++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); + + gDPSetPrimColor(gfx++, 0, 0, (s16)this->copyrightAlpha, (s16)this->copyrightAlpha, (s16)this->copyrightAlpha, + (s16)this->copyrightAlpha); + + if ((s16)this->copyrightAlpha != 0) { + gDPLoadTextureBlock(gfx++, D_06019A00, G_IM_FMT_IA, G_IM_SIZ_8b, 160, 16, 0, G_TX_NOMIRROR | G_TX_CLAMP, + G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); + + gSPTextureRectangle(gfx++, 312, 792, 952, 856, G_TX_RENDERTILE, 0, 0, 1024, 1024); + } + + if (gSaveContext.fileNum == 0xFEDC) { + // Draw "NO CONTROLLER" Text + textAlpha = textFadeTimer * 10; + if (textAlpha >= 255) { + textAlpha = 255; + } + + // Text Shadow + gDPPipeSync(gfx++); + gDPSetCombineLERP(gfx++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, + 0); + gDPSetPrimColor(gfx++, 0, 0, 0, 0, 0, textAlpha); + + rectLeft = VREG(19) + 1; + for (i = 0; i < ARRAY_COUNT(noControllerFontIndexes); i++) { + EnMag_DrawCharTexture(&gfx, buf + 0x3C88 + (noControllerFontIndexes[i] * 0x80), rectLeft, YREG(10) + 172); + rectLeft += VREG(21); + if (i == 1) { + rectLeft += VREG(23); + } + } + + // Actual Text + gDPPipeSync(gfx++); + gDPSetPrimColor(gfx++, 0, 0, 100, 255, 255, textAlpha); + + rectLeft = VREG(19); + for (i = 0; i < ARRAY_COUNT(noControllerFontIndexes); i++) { + EnMag_DrawCharTexture(&gfx, buf + 0x3C88 + (noControllerFontIndexes[i] * 0x80), rectLeft, YREG(10) + 171); + rectLeft += VREG(21); + if (i == 1) { + rectLeft += VREG(23); + } + } + } else if (this->copyrightAlpha >= 200.0f) { + // Draw "PRESS START" Text + textAlpha = textFadeTimer * 10; + if (textAlpha >= 255) { + textAlpha = 255; + } + + // Text Shadow + gDPPipeSync(gfx++); + gDPSetCombineLERP(gfx++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, + 0); + gDPSetPrimColor(gfx++, 0, 0, 0, 0, 0, textAlpha); + + rectLeft = YREG(7) + 1; + for (i = 0; i < ARRAY_COUNT(pressStartFontIndexes); i++) { + EnMag_DrawCharTexture(&gfx, buf + 0x3C88 + (pressStartFontIndexes[i] * 0x80), rectLeft, YREG(10) + 172); + rectLeft += YREG(8); + if (i == 4) { + rectLeft += YREG(9); + } + } + + // Actual Text + gDPPipeSync(gfx++); + gDPSetPrimColor(gfx++, 0, 0, YREG(4), YREG(5), YREG(6), textAlpha); + + rectLeft = YREG(7); + for (i = 0; i < ARRAY_COUNT(pressStartFontIndexes); i++) { + EnMag_DrawCharTexture(&gfx, buf + 0x3C88 + (pressStartFontIndexes[i] * 0x80), rectLeft, YREG(10) + 171); + rectLeft += YREG(8); + if (i == 4) { + rectLeft += YREG(9); + } + } + } + + if (textFadeDirection != 0) { + if (--textFadeTimer == 0) { + textFadeDirection = 0; + } + } else { + if (++textFadeTimer >= 26) { + textFadeDirection = 1; + } + } + + *gfxp = gfx; +} + +void EnMag_Draw(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + Gfx* gfx; + Gfx* gfxRef; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_mag.c", 1151); + + gfxRef = oGfxCtx->polyOpa.p; + gfx = Graph_GfxPlusOne(gfxRef); + gSPDisplayList(oGfxCtx->overlay.p++, gfx); + + EnMag_DrawInner(thisx, globalCtx, &gfx); + + gSPEndDisplayList(gfx++); + Graph_BranchDlist(gfxRef, gfx); + oGfxCtx->polyOpa.p = gfx; + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_mag.c", 1161); +} diff --git a/src/overlays/actors/ovl_En_Mag/z_en_mag.h b/src/overlays/actors/ovl_En_Mag/z_en_mag.h index 94879d0cb9..9ce947ffe7 100644 --- a/src/overlays/actors/ovl_En_Mag/z_en_mag.h +++ b/src/overlays/actors/ovl_En_Mag/z_en_mag.h @@ -8,9 +8,51 @@ struct EnMag; typedef struct EnMag { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0xE1DC]; + /* 0x014C */ char unk_14C[0x0004]; + /* 0x0150 */ u8 unk_150[0xE188]; // kanfont struct/buffer + /* 0xE2D8 */ s16 effectFadeInState; + /* 0xE2DA */ s16 effectFadeInTimer; + /* 0xE2DC */ s16 globalState; + /* 0xE2E0 */ f32 effectPrimLodFrac; + /* 0xE2E4 */ f32 effectPrimColor[3]; + /* 0xE2F0 */ f32 effectEnvColor[3]; + /* 0xE2FC */ f32 effectAlpha; + /* 0xE300 */ f32 mainAlpha; + /* 0xE304 */ f32 subAlpha; + /* 0xE308 */ f32 copyrightAlpha; + /* 0xE30C */ s16 unk_E30C; + /* 0xE30E */ s16 effectScroll; + /* 0xE310 */ char unk_E310[0x0002]; + /* 0xE312 */ s16 copyrightAlphaStep; + /* 0xE314 */ s16 fadeOutAlphaStep; + /* 0xE316 */ s16 unk_E316; + /* 0xE318 */ s16 unk_E318; + /* 0xE31C */ s32 unk_E31C; + /* 0xE320 */ s32 unk_E320; + /* 0xE324 */ char unk_E324[0x0004]; } EnMag; // size = 0xE328 extern const ActorInit En_Mag_InitVars; +typedef enum { + /* 0x00 */ MAG_STATE_INITIAL, + /* 0x01 */ MAG_STATE_FADE_IN, + /* 0x02 */ MAG_STATE_DISPLAY, + /* 0x03 */ MAG_STATE_FADE_OUT, + /* 0x04 */ MAG_STATE_POST_DISPLAY +} EnMagGlobalState; + +#define gSetTileCustom(pkt, fmt, siz, width, height, pal, cms, cmt, masks, maskt, shifts, shiftt) \ + do { \ + gDPPipeSync(pkt); \ + gDPTileSync(pkt); \ + gDPSetTile(pkt, fmt, siz, (((width)*siz##_TILE_BYTES) + 7) >> 3, 0, G_TX_LOADTILE, 0, cmt, maskt, shiftt, cms, \ + masks, shifts); \ + gDPTileSync(pkt); \ + gDPSetTile(pkt, fmt, siz, (((width)*siz##_TILE_BYTES) + 7) >> 3, 0, G_TX_RENDERTILE, pal, cmt, maskt, shiftt, \ + cms, masks, shifts); \ + gDPSetTileSize(pkt, G_TX_RENDERTILE, 0, 0, ((width)-1) << G_TEXTURE_IMAGE_FRAC, \ + ((height)-1) << G_TEXTURE_IMAGE_FRAC); \ + } while (0); + #endif diff --git a/src/overlays/actors/ovl_En_Rd/z_en_rd.c b/src/overlays/actors/ovl_En_Rd/z_en_rd.c index 9e550d3739..22f1744e52 100644 --- a/src/overlays/actors/ovl_En_Rd/z_en_rd.c +++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.c @@ -9,7 +9,27 @@ void EnRd_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnRd_Update(Actor* thisx, GlobalContext* globalCtx); void EnRd_Draw(Actor* thisx, GlobalContext* globalCtx); -/* +void func_80AE269C(EnRd* this); +void func_80AE2744(EnRd* this, GlobalContext* globalCtx); +void func_80AE2970(EnRd* this); +void func_80AE2A10(EnRd* this, GlobalContext* globalCtx); +void func_80AE2C1C(EnRd* this, GlobalContext* globalCtx); +void func_80AE2F50(EnRd* this, GlobalContext* globalCtx); +void func_80AE2FD0(EnRd* this, GlobalContext* globalCtx); +void func_80AE31DC(EnRd* this); +void func_80AE3260(EnRd* this, GlobalContext* globalCtx); +void func_80AE33F0(EnRd* this); +void func_80AE392C(EnRd* this); +void func_80AE39D4(EnRd* this); +void func_80AE3454(EnRd* this, GlobalContext* globalCtx); +void func_80AE37BC(EnRd* this); +void func_80AE3834(EnRd* this, GlobalContext* globalCtx); +void func_80AE3978(EnRd* this, GlobalContext* globalCtx); +void func_80AE3A54(EnRd* this, GlobalContext* globalCtx); +void func_80AE3B18(EnRd* this, GlobalContext* globalCtx); +void func_80AE3C98(EnRd* this, GlobalContext* globalCtx); +void func_80AE3ECC(EnRd* this, GlobalContext* globalCtx); + const ActorInit En_Rd_InitVars = { ACTOR_EN_RD, ACTORTYPE_ENEMY, @@ -21,71 +41,871 @@ const ActorInit En_Rd_InitVars = { (ActorFunc)EnRd_Update, (ActorFunc)EnRd_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2400.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Init.s") +static ColliderCylinderInit sCylinderInit = { + { COLTYPE_UNK0, 0x00, 0x09, 0x09, 0x10, COLSHAPE_CYLINDER }, + { 0x01, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, 0x00, 0x05, 0x01 }, + { 20, 70, 0, { 0, 0, 0 } }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Destroy.s") +static DamageTable sDamageTable = { + 0x00, 0xF2, 0x00, 0x00, 0x00, 0x00, 0xF2, 0x10, 0xF1, 0xF2, 0xF4, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0xE4, 0x60, 0xD3, 0x00, 0x00, 0xF1, 0xF4, 0xF2, 0xF2, 0xF8, 0xF4, 0x00, 0x00, 0xF4, 0x00, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2630.s") +static InitChainEntry sInitChain[] = { + ICHAIN_F32(unk_4C, 2000, ICHAIN_CONTINUE), + ICHAIN_VEC3F_DIV1000(scale, 10, ICHAIN_CONTINUE), + ICHAIN_F32_DIV1000(gravity, -3500, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE269C.s") +static Vec3f D_80AE4918 = { 0.0f, 0.0f, 0.0f }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2744.s") +// I'm guessing these are primitive and environment colors that go unused +static Color_RGBA8_n D_80AE4924 = { 200, 200, 255, 255 }; +static Color_RGBA8_n D_80AE4928 = { 0, 0, 255, 0 }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2970.s") +static Vec3f D_80AE492C = { 0.0f, 0.0f, 0.0f }; +static Color_RGBA8_n D_80AE4938 = { 200, 200, 255, 255 }; +static Color_RGBA8_n D_80AE493C = { 0, 0, 255, 0 }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2A10.s") +static Vec3f D_80AE4940 = { 300.0f, 0.0f, 0.0f }; +static Vec3f D_80AE494C = { 300.0f, 0.0f, 0.0f }; +static Vec3f D_80AE4958 = { 0.25f, 0.25f, 0.25f }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2B90.s") +extern SkeletonHeader D_06003DD8; +extern AnimationHeader D_06004268; +extern AnimationHeader D_060046F8; +extern AnimationHeader D_06004ADC; +extern AnimationHeader D_06004F94; +extern AnimationHeader D_060057AC; +extern AnimationHeader D_06005D98; +extern AnimationHeader D_06006E88; +extern AnimationHeader D_060074F0; +extern AnimationHeader D_06008040; +extern AnimationHeader D_060087D0; +extern SkeletonHeader D_0600E778; +extern AnimationHeader D_0600EFDC; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2C1C.s") +void EnRd_SetupAction(EnRd* this, EnRdActionFunc actionFunc) { + this->actionFunc = actionFunc; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2F50.s") +void EnRd_Init(Actor* thisx, GlobalContext* globalCtx) { + EnRd* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2FD0.s") + Actor_ProcessInitChain(thisx, sInitChain); + thisx->unk_1F = 0; + thisx->colChkInfo.damageTable = &sDamageTable; + ActorShape_Init(&thisx->shape, 0.0f, NULL, 0.0f); + this->unk_310 = this->unk_30E = 0; + thisx->posRot2.pos = thisx->posRot.pos; + thisx->posRot2.pos.y += 50.0f; + thisx->colChkInfo.mass = 0xFE; + thisx->colChkInfo.health = 8; + this->unk_314 = this->unk_31D = 0xFF; + this->unk_312 = (thisx->params & 0xFF00) >> 8; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE31DC.s") + if (thisx->params & 0x80) { + thisx->params |= 0xFF00; + } else { + thisx->params &= 0xFF; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3260.s") + if (thisx->params >= -1) { + SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_0600E778, &D_060087D0, this->limbDrawTable, + this->transitionDrawTable, 26); + thisx->naviEnemyId = 42; + } else { + SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_06003DD8, &D_060087D0, this->limbDrawTable, + this->transitionDrawTable, 26); + thisx->naviEnemyId = 45; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE33F0.s") + Collider_InitCylinder(globalCtx, &this->collider); + Collider_SetCylinder(globalCtx, &this->collider, thisx, &sCylinderInit); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3454.s") + if (thisx->params >= -2) { + func_80AE269C(this); + } else { + func_80AE2970(this); + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE37BC.s") + SkelAnime_FrameUpdateMatrix(&this->skelAnime); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3834.s") + if (thisx->params == 3) { + thisx->flags |= 0x80; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE392C.s") +void EnRd_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnRd* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3978.s") + if (gSaveContext.unk_1422 != 0) { + gSaveContext.unk_1422 = 0; + } + Collider_DestroyCylinder(globalCtx, &this->collider); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE39D4.s") +void func_80AE2630(GlobalContext* globalCtx, Actor* thisx, s32 arg2) { + Actor* enemyIt = globalCtx->actorCtx.actorList[ACTORTYPE_ENEMY].first; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3A54.s") + while (enemyIt != NULL) { + if ((enemyIt->id != ACTOR_EN_RD) || (enemyIt == thisx) || (enemyIt->params < 0)) { + enemyIt = enemyIt->next; + continue; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3A8C.s") + if (arg2 != 0) { + enemyIt->parent = thisx; + } else if (enemyIt->parent == thisx) { + enemyIt->parent = NULL; + } + enemyIt = enemyIt->next; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3B18.s") +void func_80AE269C(EnRd* this) { + if (this->actor.params != 2) { + SkelAnime_ChangeAnimTransitionRepeat(&this->skelAnime, &D_060087D0, -6.0f); + } else { + SkelAnime_ChangeAnimDefaultRepeat(&this->skelAnime, &D_06005D98); + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3C20.s") + this->unk_31B = 0; + this->unk_30C = (Math_Rand_ZeroOne() * 10.0f) + 5.0f; + this->actor.speedXZ = 0.0f; + this->actor.posRot.rot.y = this->actor.shape.rot.y; + EnRd_SetupAction(this, func_80AE2744); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3C98.s") +void func_80AE2744(EnRd* this, GlobalContext* globalCtx) { + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + Math_SmoothScaleMaxMinS(&this->unk_30E, 0, 1, 0x64, 0); + Math_SmoothScaleMaxMinS(&this->unk_310, 0, 1, 0x64, 0); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3DE4.s") + if ((this->actor.params == 2) && (0.0f == this->skelAnime.animCurrentFrame)) { + if (Math_Rand_ZeroOne() >= 0.5f) { + SkelAnime_ChangeAnimDefaultRepeat(&this->skelAnime, &D_06005D98); + } else { + SkelAnime_ChangeAnimDefaultRepeat(&this->skelAnime, &D_060057AC); + } + } else { + this->unk_30C--; + if (this->unk_30C == 0) { + this->unk_30C = (Math_Rand_ZeroOne() * 10.0f) + 10.0f; + this->skelAnime.animCurrentFrame = 0.0f; + } + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3ECC.s") + if (this->actor.parent != NULL) { + if (this->unk_305 == 0) { + if (this->actor.params != 2) { + func_80AE31DC(this); + } else { + func_80AE392C(this); + } + } + } else { + if (this->unk_305 != 0) { + if (this->actor.params != 2) { + func_80AE37BC(this); + } else { + func_80AE392C(this); + } + } + this->unk_305 = 0; + if ((this->actor.xzDistFromLink <= 150.0f) && func_8002DDE4(globalCtx)) { + if ((this->actor.params != 2) && (this->unk_305 == 0)) { + func_80AE37BC(this); + } else { + func_80AE392C(this); + } + } + } + + if ((globalCtx->gameplayFrames & 95) == 0) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_REDEAD_CRY); + } +} + +void func_80AE2970(EnRd* this) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_060087D0, 0, 0, SkelAnime_GetFrameCount(&D_060087D0.genericHeader), 0, + -6.0f); + this->unk_31B = 0xB; + this->unk_30C = 6; + this->actor.shape.rot.x = -0x4000; + this->actor.gravity = 0.0f; + this->actor.shape.unk_08 = 0.0f; + this->actor.speedXZ = 0.0f; + EnRd_SetupAction(this, func_80AE2A10); +} + +// Rising out of coffin +void func_80AE2A10(EnRd* this, GlobalContext* globalCtx) { + if (this->actor.shape.rot.x != -0x4000) { + Math_SmoothScaleMaxMinS(&this->actor.shape.rot.x, 0, 1, 0x7D0, 0); + if (Math_SmoothScaleMaxMinF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y, 0.3f, 2.0f, 0.3f) == + 0.0f) { + this->actor.gravity = -3.5f; + func_80AE269C(this); + } + } else { + if (this->actor.posRot.pos.y == this->actor.initPosRot.pos.y) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_REDEAD_CRY); + } + if (Math_SmoothScaleMaxMinF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y + 50.0f, 0.3f, 2.0f, + 0.3f) == 0.0f) { + if (this->unk_30C != 0) { + this->unk_30C--; + Math_SmoothScaleMaxMinF(&this->actor.speedXZ, 6.0f, 0.3f, 1.0f, 0.3f); + } else if (Math_SmoothScaleMaxMinF(&this->actor.speedXZ, 0.0f, 0.3f, 1.0f, 0.3f) == 0.0f) { + Math_SmoothScaleMaxMinS(&this->actor.shape.rot.x, 0, 1, 0x7D0, 0); + } + } + } +} + +void func_80AE2B90(EnRd* this, GlobalContext* globalCtx) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_0600EFDC, 1.0f, 4.0f, SkelAnime_GetFrameCount(&D_0600EFDC.genericHeader), + 1, -4.0f); + this->actor.speedXZ = 0.4f; + this->unk_31B = 4; + EnRd_SetupAction(this, func_80AE2C1C); +} + +void func_80AE2C1C(EnRd* this, GlobalContext* globalCtx) { + Vec3f sp44 = D_80AE4918; + Color_RGBA8_n sp40 = D_80AE4924; + Color_RGBA8_n sp3C = D_80AE4928; + Player* player = PLAYER; + s32 pad; + s16 sp32 = this->actor.yawTowardsLink - this->actor.shape.rot.y - this->unk_30E - this->unk_310; + + this->skelAnime.animPlaybackSpeed = this->actor.speedXZ; + Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 1, 0xFA, 0); + Math_SmoothScaleMaxMinS(&this->unk_30E, 0, 1, 0x64, 0); + Math_SmoothScaleMaxMinS(&this->unk_310, 0, 1, 0x64, 0); + this->actor.posRot.rot.y = this->actor.shape.rot.y; + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + + if (func_8002DB6C(&player->actor, &this->actor.initPosRot.pos) >= 150.0f) { + func_80AE2F50(this, globalCtx); + } + + if ((ABS(sp32) < 0x1554) && (func_8002DB48(&this->actor, &player->actor) <= 150.0f)) { + if (!(player->stateFlags1 & 0x2C6080) && !(player->stateFlags2 & 0x80)) { + if (this->unk_306 == 0) { + if (!(this->unk_312 & 0x80)) { + player->actor.freezeTimer = 40; + func_8008EEAC(globalCtx, &this->actor); + PLAYER->unk_684 = &this->actor; + func_800AA000(this->actor.xzDistFromLink, 0xFF, 0x14, 0x96); + } + this->unk_306 = 0x3C; + Audio_PlayActorSound2(&this->actor, NA_SE_EN_REDEAD_AIM); + } + } else { + func_80AE2F50(this, globalCtx); + } + } + + DECR(this->unk_307); + + if ((this->unk_307 == 0) && (func_8002DB48(&this->actor, &player->actor) <= 45.0f) && + (func_8002E084(&this->actor, 0x38E3))) { + player->actor.freezeTimer = 0; + if (globalCtx->grabPlayer(globalCtx, &player->actor) != 0) { + this->actor.flags &= ~1; + func_80AE33F0(this); + } + } else if (this->actor.params > 0) { + if (this->actor.parent != NULL) { + func_80AE31DC(this); + } else { + this->unk_305 = 0; + } + } + + if ((this->skelAnime.animCurrentFrame == 10.0f) || (this->skelAnime.animCurrentFrame == 22.0f)) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_RIZA_WALK); + } else if ((globalCtx->gameplayFrames & 95) == 0) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_REDEAD_CRY); + } +} + +void func_80AE2F50(EnRd* this, GlobalContext* globalCtx) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_0600EFDC, 0.5f, 0, SkelAnime_GetFrameCount(&D_0600EFDC.genericHeader), 1, + -4.0f); + this->unk_31B = 2; + EnRd_SetupAction(this, func_80AE2FD0); +} + +void func_80AE2FD0(EnRd* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + s32 pad; + s16 targetY = func_8002DAC0(&this->actor, &this->actor.initPosRot.pos); + + if (func_8002DB6C(&this->actor, &this->actor.initPosRot.pos) >= 5.0f) { + Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, targetY, 1, 0x1C2, 0); + } else { + this->actor.speedXZ = 0.0f; + if (Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, this->actor.initPosRot.rot.y, 1, 0x1C2, 0) == 0) { + if (this->actor.params != 2) { + func_80AE269C(this); + } else { + func_80AE39D4(this); + } + } + } + + Math_SmoothScaleMaxMinS(&this->unk_30E, 0, 1, 0x64, 0); + Math_SmoothScaleMaxMinS(&this->unk_310, 0, 1, 0x64, 0); + this->actor.posRot.rot.y = this->actor.shape.rot.y; + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + + if (!(player->stateFlags1 & 0x2C6080) && !(player->stateFlags2 & 0x80) && + (func_8002DB6C(&player->actor, &this->actor.initPosRot.pos) < 150.0f)) { + this->actor.unk_1F = 0; + func_80AE2B90(this, globalCtx); + } else if (this->actor.params > 0) { + if (this->actor.parent != NULL) { + func_80AE31DC(this); + } else { + this->unk_305 = 0; + } + } + + if (this->skelAnime.animCurrentFrame == 10.0f || this->skelAnime.animCurrentFrame == 22.0f) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_RIZA_WALK); + } else if ((globalCtx->gameplayFrames & 95) == 0) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_REDEAD_CRY); + } +} + +void func_80AE31DC(EnRd* this) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_0600EFDC, 0.5f, 0, SkelAnime_GetFrameCount(&D_0600EFDC.genericHeader), 1, + -4.0f); + this->unk_31B = 3; + this->unk_305 = 1; + EnRd_SetupAction(this, func_80AE3260); +} + +void func_80AE3260(EnRd* this, GlobalContext* globalCtx) { + if (this->actor.parent != NULL) { + s32 pad; + s16 targetY; + Vec3f thisPos = this->actor.parent->posRot.pos; + + targetY = func_8002DAC0(&this->actor, &thisPos); + + Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, targetY, 1, 0xFA, 0); + + if (func_8002DB6C(&this->actor, &thisPos) >= 45.0f) { + this->actor.speedXZ = 0.4f; + } else { + this->actor.speedXZ = 0.0f; + + if (this->actor.params != 2) { + func_80AE269C(this); + } else { + func_80AE39D4(this); + } + } + + Math_SmoothScaleMaxMinS(&this->unk_30E, 0, 1, 0x64, 0); + Math_SmoothScaleMaxMinS(&this->unk_310, 0, 1, 0x64, 0); + } else { + func_80AE2B90(this, globalCtx); + } + + this->actor.posRot.rot.y = this->actor.shape.rot.y; + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + + if (this->skelAnime.animCurrentFrame == 10.0f || this->skelAnime.animCurrentFrame == 22.0f) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_RIZA_WALK); + } else if ((globalCtx->gameplayFrames & 95) == 0) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_REDEAD_CRY); + } +} + +void func_80AE33F0(EnRd* this) { + SkelAnime_ChangeAnimDefaultStop(&this->skelAnime, &D_06004ADC); + this->unk_30C = this->unk_304 = 0; + this->unk_319 = 0xC8; + this->unk_31B = 8; + this->actor.speedXZ = 0.0f; + EnRd_SetupAction(this, func_80AE3454); +} + +void func_80AE3454(EnRd* this, GlobalContext* globalCtx) { + s32 pad; + Player* player = PLAYER; + + if (SkelAnime_FrameUpdateMatrix(&this->skelAnime)) { + this->unk_304++; + } + + switch (this->unk_304) { + case 1: + SkelAnime_ChangeAnimDefaultRepeat(&this->skelAnime, &D_06004268); + this->unk_304++; + globalCtx->damagePlayer(globalCtx, -8); + func_800AA000(this->actor.xzDistFromLink, 0xFF, 1, 0xC); + this->unk_319 = 0x14; + case 0: + Math_SmoothScaleMaxMinS(&this->unk_30E, 0, 1, 0x5DC, 0); + Math_SmoothScaleMaxMinS(&this->unk_310, 0, 1, 0x5DC, 0); + case 2: + if (!(player->stateFlags2 & 0x80)) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_060046F8, 0.5f, 0.0f, + SkelAnime_GetFrameCount(&D_060046F8.genericHeader), 3, 0.0f); + this->unk_304++; + this->unk_31B = 4; + return; + } + + if (LINK_IS_CHILD) { + Math_SmoothScaleMaxMinF(&this->actor.shape.unk_08, -1500.0f, 1.0f, 150.0f, 0.0f); + } + + Math_SmoothScaleMaxMinF(&this->actor.posRot.pos.x, + (Math_Sins(player->actor.shape.rot.y) * -25.0f) + player->actor.posRot.pos.x, 1.0f, + 10.0f, 0.0f); + Math_SmoothScaleMaxMinF(&this->actor.posRot.pos.y, player->actor.posRot.pos.y, 1.0f, 10.0f, 0.0f); + Math_SmoothScaleMaxMinF(&this->actor.posRot.pos.z, + (Math_Coss(player->actor.shape.rot.y) * -25.0f) + player->actor.posRot.pos.z, 1.0f, + 10.0f, 0.0f); + Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, player->actor.shape.rot.y, 1, 0x1770, 0); + + if (this->skelAnime.animCurrentFrame == 0.0f) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_REDEAD_ATTACK); + } + this->unk_319--; + + if (this->unk_319 == 0) { + globalCtx->damagePlayer(globalCtx, -8); + func_800AA000(this->actor.xzDistFromLink, 0xF0, 1, 0xC); + this->unk_319 = 0x14; + func_8002F7DC(&player->actor, NA_SE_VO_LI_DAMAGE_S + player->ageProperties->unk_92); + } + break; + case 3: + if (LINK_IS_CHILD) { + Math_SmoothScaleMaxMinF(&this->actor.shape.unk_08, 0, 1.0f, 400.0f, 0.0f); + } + break; + case 4: + if (LINK_IS_CHILD) { + Math_SmoothScaleMaxMinF(&this->actor.shape.unk_08, 0, 1.0f, 400.0f, 0.0f); + } + this->actor.unk_1F = 0; + this->actor.flags |= 1; + this->unk_306 = 0xA; + this->unk_307 = 0xF; + func_80AE2B90(this, globalCtx); + break; + } +} + +void func_80AE37BC(EnRd* this) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_06004F94, 0.0f, 0.0f, SkelAnime_GetFrameCount(&D_06004F94.genericHeader), + 2, 0.0f); + this->unk_31B = 7; + EnRd_SetupAction(this, func_80AE3834); +} + +void func_80AE3834(EnRd* this, GlobalContext* globalCtx) { + Vec3f sp34 = D_80AE492C; + Color_RGBA8_n sp30 = D_80AE4938; + Color_RGBA8_n sp2C = D_80AE493C; + Player* player = PLAYER; + s16 temp_v0 = this->actor.yawTowardsLink - this->actor.shape.rot.y - this->unk_30E - this->unk_310; + + if (ABS(temp_v0) < 0x2008) { + if (!(this->unk_312 & 0x80)) { + player->actor.freezeTimer = 60; + func_800AA000(this->actor.xzDistFromLink, 0xFF, 0x14, 0x96); + func_8008EEAC(globalCtx, &this->actor); + } + Audio_PlayActorSound2(&this->actor, NA_SE_EN_REDEAD_AIM); + func_80AE2B90(this, globalCtx); + } +} + +void func_80AE392C(EnRd* this) { + SkelAnime_ChangeAnimTransitionStop(&this->skelAnime, &D_06008040, -4.0f); + this->unk_31B = 5; + EnRd_SetupAction(this, func_80AE3978); +} + +void func_80AE3978(EnRd* this, GlobalContext* globalCtx) { + if (SkelAnime_FrameUpdateMatrix(&this->skelAnime)) { + if (this->actor.parent != NULL) { + func_80AE31DC(this); + } else { + func_80AE37BC(this); + } + } +} + +void func_80AE39D4(EnRd* this) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_06008040, -1.0f, SkelAnime_GetFrameCount(&D_06008040.genericHeader), 0.0f, + 2, -4.0f); + this->unk_31B = 6; + EnRd_SetupAction(this, func_80AE3A54); +} + +void func_80AE3A54(EnRd* this, GlobalContext* globalCtx) { + if (SkelAnime_FrameUpdateMatrix(&this->skelAnime)) { + func_80AE269C(this); + } +} + +void func_80AE3A8C(EnRd* this) { + SkelAnime_ChangeAnimTransitionStop(&this->skelAnime, &D_060074F0, -6.0f); + + if (this->actor.bgCheckFlags & 1) { + this->actor.speedXZ = -2.0f; + } + + this->actor.flags |= 1; + Audio_PlayActorSound2(&this->actor, NA_SE_EN_REDEAD_DAMAGE); + this->unk_31B = 9; + EnRd_SetupAction(this, func_80AE3B18); +} + +void func_80AE3B18(EnRd* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + if (this->actor.speedXZ < 0.0f) { + this->actor.speedXZ += 0.15f; + } + + this->actor.posRot.rot.y = this->actor.yawTowardsLink; + Math_SmoothScaleMaxMinS(&this->unk_30E, 0, 1, 0x12C, 0); + Math_SmoothScaleMaxMinS(&this->unk_310, 0, 1, 0x12C, 0); + if (SkelAnime_FrameUpdateMatrix(&this->skelAnime)) { + this->actor.posRot.rot.y = this->actor.shape.rot.y; + + if (this->actor.parent != NULL) { + func_80AE31DC(this); + } else if (func_8002DB6C(&player->actor, &this->actor.initPosRot.pos) >= 150.0f) { + func_80AE2F50(this, globalCtx); + } else { + func_80AE2B90(this, globalCtx); + } + + this->unk_31D = 0xFF; + } +} + +void func_80AE3C20(EnRd* this) { + SkelAnime_ChangeAnimTransitionStop(&this->skelAnime, &D_06006E88, -1.0f); + this->unk_31B = 0xA; + this->unk_30C = 0x12C; + this->actor.flags &= ~1; + this->actor.speedXZ = 0.0f; + Audio_PlayActorSound2(&this->actor, NA_SE_EN_REDEAD_DEAD); + EnRd_SetupAction(this, func_80AE3C98); +} + +void func_80AE3C98(EnRd* this, GlobalContext* globalCtx) { + if (this->actor.type != ACTORTYPE_PROP) { + Actor_ChangeType(globalCtx, &globalCtx->actorCtx, &this->actor, ACTORTYPE_PROP); + } + + Math_SmoothScaleMaxMinS(&this->unk_30E, 0, 1, 0x7D0, 0); + Math_SmoothScaleMaxMinS(&this->unk_310, 0, 1, 0x7D0, 0); + + if (SkelAnime_FrameUpdateMatrix(&this->skelAnime)) { + if (this->unk_30C == 0) { + if (!Flags_GetSwitch(globalCtx, this->unk_312 & 0x7F)) { + Flags_SetSwitch(globalCtx, this->unk_312 & 0x7F); + } + if (this->unk_314 != 0) { + if (this->unk_314 == 0xB4) { + func_80AE2630(globalCtx, &this->actor, 0); + } + this->actor.scale.y -= 0.000075f; + this->unk_314 -= 5; + } else { + Actor_Kill(&this->actor); + } + } else { + this->unk_30C--; + } + } else if (((s32)this->skelAnime.animCurrentFrame == 33) || ((s32)this->skelAnime.animCurrentFrame == 40)) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_RIZA_DOWN); + } +} + +void func_80AE3DE4(EnRd* this) { + this->unk_31B = 1; + this->actor.speedXZ = 0.0f; + this->actor.posRot.rot.y = this->actor.shape.rot.y; + if (gSaveContext.unk_1422 != 0) { + this->unk_318 = 1; + this->unk_316 = 0x258; + Audio_PlayActorSound2(&this->actor, NA_SE_EN_LIGHT_ARROW_HIT); + func_8003426C(&this->actor, -0x8000, -0x7F38, 0, 0xFF); + } else if (this->unk_31C == 1) { + func_8003426C(&this->actor, 0, 0xC8, 0, 0x50); + } else { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_LIGHT_ARROW_HIT); + func_8003426C(&this->actor, -0x8000, 0xC8, 0, 0x50); + } + EnRd_SetupAction(this, func_80AE3ECC); +} + +void func_80AE3ECC(EnRd* this, GlobalContext* globalCtx) { + if ((this->unk_318 != 0) && (this->unk_316 != 0)) { + this->unk_316--; + if (this->unk_316 >= 0xFF) { + func_8003426C(&this->actor, -0x8000, 0xC8, 0, 0xFF); + } + if (this->unk_316 == 0) { + this->unk_318 = 0; + gSaveContext.unk_1422 = 0; + } + } + + if (this->actor.dmgEffectTimer == 0) { + if (this->actor.colChkInfo.health == 0) { + func_80AE2630(globalCtx, &this->actor, 1); + func_80AE3C20(this); + Item_DropCollectibleRandom(globalCtx, &this->actor, &this->actor.posRot.pos, 0x90); + } else { + func_80AE3A8C(this); + } + } +} + +// Regalloc..I can get the score lower by using permuter suggestions, but they all seem silly +#ifdef NON_MATCHING +void func_80AE3F9C(EnRd* this, GlobalContext* globalCtx) { + s16 unk_310; + s16 shapeRotY; + s16 yawTowardsLink; + s16 new_var; + s16 temp_v0; + s16 phi_a3; + s16 phi_v0; + + unk_310 = this->unk_310; + shapeRotY = this->actor.shape.rot.y; + yawTowardsLink = this->actor.yawTowardsLink; + new_var = unk_310 + shapeRotY; + + temp_v0 = yawTowardsLink - new_var; + phi_a3 = CLAMP(temp_v0, -500, 500); + + temp_v0 -= this->unk_30E; + phi_v0 = CLAMP(temp_v0, -500, 500); + + if ((s16)(yawTowardsLink - shapeRotY) >= 0) { + this->unk_310 += ABS(phi_a3); + this->unk_30E += ABS(phi_v0); + } else { + this->unk_310 -= ABS(phi_a3); + this->unk_30E -= ABS(phi_v0); + } + + this->unk_310 = CLAMP(this->unk_310, -18783, 18783); + this->unk_30E = CLAMP(this->unk_30E, -9583, 9583); +} +#else #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3F9C.s") +#endif -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE4114.s") +void func_80AE4114(EnRd* this, GlobalContext* globalCtx) { + s32 pad; + Player* player = PLAYER; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Update.s") + if ((gSaveContext.unk_1422 != 0) && (this->actor.shape.rot.x == 0) && (this->unk_318 == 0) && + (this->unk_31B != 9) && (this->unk_31B != 0xA) && (this->unk_31B != 1)) { + func_80AE3DE4(this); + return; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE44C4.s") + if (this->collider.base.acFlags & 2) { + this->collider.base.acFlags &= ~2; + this->unk_31C = this->actor.colChkInfo.damageEffect; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE4520.s") + if (this->unk_31B != 11) { + func_80035650(&this->actor, &this->collider.body, 1); + if (player->unk_844 != 0) { + this->unk_31D = player->unk_845; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Draw.s") + if ((this->unk_31C != 0) && (this->unk_31C != 6)) { + if (((this->unk_31C == 1) || (this->unk_31C == 13)) && (this->unk_31B != 1)) { + Actor_ApplyDamage(&this->actor); + func_80AE3DE4(this); + return; + } + + this->unk_318 = 0; + this->unk_316 = 0; + + if (this->unk_31C == 0xE) { + func_8003426C(&this->actor, 0x4000, 0xFF, 0, 0x50); + this->unk_31A = 0x28; + } else { + func_8003426C(&this->actor, 0x4000, 0xFF, 0, 8); + } + + Actor_ApplyDamage(&this->actor); + if (this->actor.colChkInfo.health == 0) { + func_80AE2630(globalCtx, &this->actor, 1); + func_80AE3C20(this); + Item_DropCollectibleRandom(globalCtx, 0, &this->actor.posRot.pos, 0x90); + } else { + func_80AE3A8C(this); + } + } + } + } +} + +void EnRd_Update(Actor* thisx, GlobalContext* globalCtx) { + EnRd* this = THIS; + CollisionCheckContext* colChkCtx = &globalCtx->colChkCtx; + Player* player = PLAYER; + ColliderCylinder* collider = &this->collider; + + func_80AE4114(this, globalCtx); + + if (gSaveContext.unk_1422 != 0 && this->unk_318 == 0) { + gSaveContext.unk_1422 = 0; + } + + if (this->unk_31C != 6 && ((this->unk_31B != 11) || (this->unk_31C != 14))) { + if (this->unk_306 != 0) { + this->unk_306--; + } + + this->actionFunc(this, globalCtx); + if (this->unk_31B != 8 && this->actor.speedXZ != 0.0f) { + Actor_MoveForward(&this->actor); + } + + if ((this->actor.shape.rot.x == 0) && (this->unk_31B != 8) && (this->actor.speedXZ != 0.0f)) { + func_8002E4B4(globalCtx, &this->actor, 30.0f, 20.0f, 35.0f, 0x1D); + } + + if (this->unk_31B == 7) { + func_80AE3F9C(this, globalCtx); + } + } + + this->actor.posRot2.pos = this->actor.posRot.pos; + this->actor.posRot2.pos.y += 50.0f; + + if ((this->actor.colChkInfo.health > 0) && (this->unk_31B != 8)) { + Collider_CylinderUpdate(&this->actor, collider); + CollisionCheck_SetOC(globalCtx, colChkCtx, &collider->base); + if ((this->unk_31B != 9) || ((player->unk_844 != 0) && (player->unk_845 != this->unk_31D))) { + CollisionCheck_SetAC(globalCtx, colChkCtx, &collider->base); + } + } +} + +s32 EnRd_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx, + Gfx** gfx) { + EnRd* this = THIS; + + if (limbIndex == 23) { + rot->y += this->unk_30E; + } else if (limbIndex == 12) { + rot->y += this->unk_310; + } + return 0; +} + +void EnRd_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx, Gfx** gfx) { + Vec3f sp2C = D_80AE4940; + EnRd* this = THIS; + s32 idx = -1; + Vec3f destPos; + + if ((this->unk_31A != 0) || ((this->actor.dmgEffectTimer != 0) && (this->actor.dmgEffectParams & 0x4000))) { + switch (limbIndex - 1) { + case 23: + idx = 0; + break; + case 0: + idx = 1; + break; + case 21: + idx = 2; + break; + case 17: + idx = 3; + break; + case 13: + idx = 4; + break; + case 24: + idx = 5; + break; + case 8: + idx = 6; + break; + case 3: + idx = 7; + break; + case 10: + idx = 8; + break; + case 5: + idx = 9; + break; + } + + if (idx >= 0) { + Matrix_MultVec3f(&sp2C, &destPos); + this->unkFire[idx].x = destPos.x; + this->unkFire[idx].y = destPos.y; + this->unkFire[idx].z = destPos.z; + } + } +} + +void EnRd_Draw(Actor* thisx, GlobalContext* globalCtx) { + EnRd* this = THIS; + s32 pad; + Vec3f thisPos = this->actor.posRot.pos; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_rd.c", 1679); + + if (this->unk_314 == 0xFF) { + func_80093D18(globalCtx->state.gfxCtx); + gDPSetEnvColor(oGfxCtx->polyOpa.p++, 0, 0, 0, this->unk_314); + gSPSegment(oGfxCtx->polyOpa.p++, 8, &D_80116280[2]); + oGfxCtx->polyOpa.p = SkelAnime_DrawSV2(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, + this->skelAnime.dListCount, EnRd_OverrideLimbDraw, EnRd_PostLimbDraw, + &this->actor, oGfxCtx->polyOpa.p); + func_80033C30(&thisPos, &D_80AE4958, 255, globalCtx); + if (this->unk_31A != 0) { + this->actor.dmgEffectTimer++; + THIS->unk_31A--; + if (this->unk_31A % 4 == 0) { + func_8002A54C(globalCtx, &this->actor, &this->unkFire[this->unk_31A >> 2], 0x4B, 0, 0, + (this->unk_31A >> 2)); + } + } + } else { + func_80093D84(globalCtx->state.gfxCtx); + gDPSetEnvColor(oGfxCtx->polyXlu.p++, 0, 0, 0, this->unk_314); + gSPSegment(oGfxCtx->polyXlu.p++, 8, &D_80116280[0]); + oGfxCtx->polyXlu.p = SkelAnime_DrawSV2(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, + this->skelAnime.dListCount, EnRd_OverrideLimbDraw, NULL, &this->actor, + oGfxCtx->polyXlu.p); + + func_80033C30(&thisPos, &D_80AE4958, this->unk_314, globalCtx); + } + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_rd.c", 1735); +} diff --git a/src/overlays/actors/ovl_En_Rd/z_en_rd.h b/src/overlays/actors/ovl_En_Rd/z_en_rd.h index a85982958e..71faf98a92 100644 --- a/src/overlays/actors/ovl_En_Rd/z_en_rd.h +++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.h @@ -6,9 +6,32 @@ struct EnRd; +typedef void (*EnRdActionFunc)(struct EnRd*, GlobalContext*); + typedef struct EnRd { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x220]; + /* 0x014C */ Vec3s unkFire[10]; + /* 0x0188 */ SkelAnime skelAnime; + /* 0x01CC */ Vec3s limbDrawTable[26]; + /* 0x0268 */ Vec3s transitionDrawTable[26]; + /* 0x0304 */ u8 unk_304; + /* 0x0305 */ u8 unk_305; + /* 0x0306 */ u8 unk_306; + /* 0x0307 */ u8 unk_307; + /* 0x0308 */ EnRdActionFunc actionFunc; + /* 0x030C */ s16 unk_30C; + /* 0x030E */ s16 unk_30E; + /* 0x0310 */ s16 unk_310; + /* 0x0312 */ s16 unk_312; + /* 0x0314 */ s16 unk_314; + /* 0x0316 */ s16 unk_316; + /* 0x0318 */ u8 unk_318; + /* 0x0319 */ u8 unk_319; + /* 0x031A */ u8 unk_31A; + /* 0x031B */ u8 unk_31B; + /* 0x031C */ u8 unk_31C; + /* 0x031D */ u8 unk_31D; + /* 0x0320 */ ColliderCylinder collider; } EnRd; // size = 0x036C extern const ActorInit En_Rd_InitVars; diff --git a/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c b/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c index 684fcfba46..ed105c4c9b 100644 --- a/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c +++ b/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c @@ -5,6 +5,7 @@ */ #include "z_en_takara_man.h" +#include #define FLAGS 0x08000039 @@ -15,7 +16,13 @@ void EnTakaraMan_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnTakaraMan_Update(Actor* thisx, GlobalContext* globalCtx); void EnTakaraMan_Draw(Actor* thisx, GlobalContext* globalCtx); -/* +void func_80B176E0(EnTakaraMan* this, GlobalContext* globalCtx); +void func_80B1778C(EnTakaraMan* this, GlobalContext* globalCtx); +void func_80B17B14(EnTakaraMan* this, GlobalContext* globalCtx); +void func_80B17934(EnTakaraMan* this, GlobalContext* globalCtx); +void func_80B17A6C(EnTakaraMan* this, GlobalContext* globalCtx); +void func_80B17AC4(EnTakaraMan* this, GlobalContext* globalCtx); + const ActorInit En_Takara_Man_InitVars = { ACTOR_EN_TAKARA_MAN, ACTORTYPE_NPC, @@ -27,25 +34,201 @@ const ActorInit En_Takara_Man_InitVars = { (ActorFunc)EnTakaraMan_Update, (ActorFunc)EnTakaraMan_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Destroy.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Init.s") +static u8 sTakaraIsInitialized = false; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B176E0.s") +extern SkeletonHeader D_06004FE0; +extern AnimationHeader D_06000498; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B1778C.s") +void EnTakaraMan_Destroy(Actor* thisx, GlobalContext* globalCtx) { +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B17934.s") +void EnTakaraMan_Init(Actor* thisx, GlobalContext* globalCtx) { + EnTakaraMan* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B17A6C.s") + if (sTakaraIsInitialized) { + Actor_Kill(&this->actor); + osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ もういてる原 ☆☆☆☆☆ \n" VT_RST); // "Already initialized" + return; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B17AC4.s") + sTakaraIsInitialized = true; + osSyncPrintf("\n\n"); + osSyncPrintf(VT_FGCOL(PURPLE) "☆☆☆☆☆ ばぅん！ ☆☆☆☆☆ %x\n" VT_RST, + globalCtx->actorCtx.flags.chest); // "Bun! %x" (needs a better translation) + globalCtx->actorCtx.flags.chest = 0; + gSaveContext.dungeonKeys[gSaveContext.mapIndex] = -1; + SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_06004FE0, &D_06000498, this->limbDrawTbl, this->transitionDrawTbl, + 10); + thisx->posRot2.pos = thisx->posRot.pos; + this->pos = thisx->posRot.pos; + thisx->posRot.pos.x = 133.0f; + thisx->posRot.pos.y = -12.0f; + thisx->posRot.pos.z = 102.0f; + Actor_SetScale(&this->actor, 0.013f); + this->height = 90.0f; + this->originalRoomNum = thisx->room; + thisx->room = -1; + thisx->posRot.rot.y = thisx->shape.rot.y = -0x4E20; + thisx->unk_1F = 1; + this->actionFunc = func_80B176E0; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B17B14.s") +void func_80B176E0(EnTakaraMan* this, GlobalContext* globalCtx) { + f32 frameCount = SkelAnime_GetFrameCount(&D_06000498.genericHeader); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Update.s") + SkelAnime_ChangeAnim(&this->skelAnime, &D_06000498, 1.0f, 0.0f, (s16)frameCount, 0, -10.0f); + if (!this->unk_214) { + this->actor.textId = 0x6D; // "Open the chest and..Surprise! ... 10 Rupees to play .. Yes/No" + this->dialogState = 4; + } + this->actionFunc = func_80B1778C; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B17C4C.s") +void func_80B1778C(EnTakaraMan* this, GlobalContext* globalCtx) { + s16 absYawDiff; + s16 yawDiff; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Draw.s") + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + if (func_8002F194(&this->actor, globalCtx) && this->dialogState != 6) { + if (!this->unk_214) { + this->actionFunc = func_80B17934; + } else { + this->actionFunc = func_80B17B14; + } + } else { + yawDiff = this->actor.yawTowardsLink - this->actor.shape.rot.y; + if (globalCtx->roomCtx.curRoom.num == 6 && !this->unk_21A) { + this->actor.textId = 0x6E; // "Great! You are a real gambler!" + this->unk_21A = 1; + this->dialogState = 6; + } + + if (!this->unk_21A && this->unk_214) { + if (Flags_GetSwitch(globalCtx, 0x32)) { + this->actor.textId = 0x84; // "Thanks a lot!" + this->dialogState = 5; + } else { + this->actor.textId = 0x704C; // "With that key, proceed to the room ahead. Go, go!" + this->dialogState = 6; + } + } + + absYawDiff = ABS(yawDiff); + if (absYawDiff < 0x4300) { + if (globalCtx->roomCtx.curRoom.num != this->originalRoomNum) { + this->actor.flags &= ~1; + this->unk_218 = 0; + } else { + if (!this->unk_218) { + this->actor.flags |= 1; + this->unk_218 = 1; + } + func_8002F2CC(&this->actor, globalCtx, 100.0f); + } + } + } +} + +void func_80B17934(EnTakaraMan* this, GlobalContext* globalCtx) { + if (this->dialogState == func_8010BDBC(&globalCtx->msgCtx) && func_80106BC8(globalCtx)) { + switch (globalCtx->msgCtx.choiceIndex) { + case 0: // Yes + if (gSaveContext.rupees >= 10) { + func_80106CCC(globalCtx); + Rupees_ChangeBy(-10); + this->unk_214 = 1; + this->actor.parent = NULL; + func_8002F434(&this->actor, globalCtx, GI_DOOR_KEY, 2000.0f, 1000.0f); + this->actionFunc = func_80B17A6C; + } else { + func_80106CCC(globalCtx); + this->actor.textId = 0x85; // "You don't have enough Rupees!" + func_8010B720(globalCtx, this->actor.textId); + this->dialogState = 5; + this->actionFunc = func_80B17B14; + } + break; + case 1: // No + func_80106CCC(globalCtx); + this->actor.textId = 0x2D; // "All right. You don't have to play if you don't want to." + func_8010B720(globalCtx, this->actor.textId); + this->dialogState = 5; + this->actionFunc = func_80B17B14; + break; + } + } +} + +void func_80B17A6C(EnTakaraMan* this, GlobalContext* globalCtx) { + if (Actor_HasParent(&this->actor, globalCtx)) { + this->actionFunc = func_80B17AC4; + } else { + func_8002F434(&this->actor, globalCtx, GI_DOOR_KEY, 2000.0f, 1000.0f); + } +} + +void func_80B17AC4(EnTakaraMan* this, GlobalContext* globalCtx) { + if (func_8010BDBC(&globalCtx->msgCtx) == 6 && func_80106BC8(globalCtx)) { + this->actionFunc = func_80B176E0; + } +} + +void func_80B17B14(EnTakaraMan* this, GlobalContext* globalCtx) { + if (this->dialogState == func_8010BDBC(&globalCtx->msgCtx) && func_80106BC8(globalCtx)) { + func_80106CCC(globalCtx); + this->actionFunc = func_80B176E0; + } +} + +void EnTakaraMan_Update(Actor* thisx, GlobalContext* globalCtx) { + EnTakaraMan* this = THIS; + + if (this->eyeTimer != 0) { + this->eyeTimer--; + } + + Actor_SetHeight(&this->actor, this->height); + func_80038290(globalCtx, &this->actor, &this->unk_22C, &this->unk_232, this->actor.posRot2.pos); + if (this->eyeTimer == 0) { + this->eyeTextureIdx++; + if (this->eyeTextureIdx >= 2) { + this->eyeTextureIdx = 0; + this->eyeTimer = (s16)Math_Rand_ZeroFloat(60.0f) + 20; + } + } + this->unk_212++; + this->actionFunc(this, globalCtx); +} + +s32 EnTakaraMan_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, + Actor* thisx) { + EnTakaraMan* this = THIS; + + if (limbIndex == 1) { + rot->x += this->unk_232.y; + } + if (limbIndex == 8) { + rot->x += this->unk_22C.y; + rot->z += this->unk_22C.z; + } + return 0; +} + +void EnTakaraMan_Draw(Actor* thisx, GlobalContext* globalCtx) { + static UNK_PTR sTakaraEyeTextures[] = { + 0x06000970, + 0x06000D70, + }; + + EnTakaraMan* this = THIS; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_takara_man.c", 528); + + func_80093D18(globalCtx->state.gfxCtx); + gSPSegment(oGfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(sTakaraEyeTextures[this->eyeTextureIdx])); + SkelAnime_DrawSV(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, this->skelAnime.dListCount, + EnTakaraMan_OverrideLimbDraw, NULL, &this->actor); + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_takara_man.c", 544); +} diff --git a/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.h b/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.h index cfd162e0a3..ba63a57a06 100644 --- a/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.h +++ b/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.h @@ -6,9 +6,26 @@ struct EnTakaraMan; +typedef void (*EnTakaraManActionFunc)(struct EnTakaraMan*, GlobalContext*); + typedef struct EnTakaraMan { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0xEC]; + /* 0x014C */ EnTakaraManActionFunc actionFunc; + /* 0x0150 */ SkelAnime skelAnime; + /* 0x0194 */ Vec3s limbDrawTbl[10]; + /* 0x01D0 */ Vec3s transitionDrawTbl[10]; + /* 0x020C */ s16 dialogState; + /* 0x020E */ s16 eyeTextureIdx; + /* 0x0210 */ s16 eyeTimer; + /* 0x0212 */ s16 unk_212; + /* 0x0214 */ s16 unk_214; + /* 0x0216 */ s16 originalRoomNum; + /* 0x0218 */ s16 unk_218; + /* 0x021A */ s16 unk_21A; + /* 0x022C */ f32 height; + /* 0x0220 */ Vec3f pos; + /* 0x022C */ Vec3s unk_22C; + /* 0x0232 */ Vec3s unk_232; } EnTakaraMan; // size = 0x0238 extern const ActorInit En_Takara_Man_InitVars; diff --git a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c index a44f8bdc30..a25f295a15 100644 --- a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c +++ b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c @@ -5,17 +5,43 @@ */ #include "z_obj_lightswitch.h" +#include #define FLAGS 0x00000010 #define THIS ((ObjLightswitch*)thisx) +typedef enum { + /* 0x00 */ FACE_EYES_CLOSED, + /* 0x01 */ FACE_EYES_OPEN, + /* 0x02 */ FACE_EYES_OPEN_SMILING +} FaceTextureIndex; + void ObjLightswitch_Init(Actor* thisx, GlobalContext* globalCtx); void ObjLightswitch_Destroy(Actor* thisx, GlobalContext* globalCtx); void ObjLightswitch_Update(Actor* thisx, GlobalContext* globalCtx); void ObjLightswitch_Draw(Actor* thisx, GlobalContext* globalCtx); -/* +void ObjLightswitch_SetupOff(ObjLightswitch* this); +void ObjLightswitch_Off(ObjLightswitch* this, GlobalContext* globalCtx); +void ObjLightswitch_SetupTurnOn(ObjLightswitch* this); +void ObjLightswitch_TurnOn(ObjLightswitch* this, GlobalContext* globalCtx); +void ObjLightswitch_SetupOn(ObjLightswitch* this); +void ObjLightswitch_On(ObjLightswitch* this, GlobalContext* globalCtx); +void ObjLightswitch_SetupTurnOff(ObjLightswitch* this); +void ObjLightswitch_TurnOff(ObjLightswitch* this, GlobalContext* globalCtx); +void ObjLightswitch_SetupDisappearDelay(ObjLightswitch* this); +void ObjLightswitch_DisappearDelay(ObjLightswitch* this, GlobalContext* globalCtx); +void ObjLightswitch_SetupDisappear(ObjLightswitch* this); +void ObjLightswitch_Disappear(ObjLightswitch* this, GlobalContext* globalCtx); + +extern Gfx D_06000260[]; // face, uses rgba16 32x32 texture at 0x08000000, branches to dlist 0x09000000, uses env color +extern Gfx D_06000398[]; // flame ring, branches to dlist 0x09000000, uses env color +extern Gfx D_06000408[]; // a square, geometry only +extern UNK_TYPE D_06000420[]; // rgba16 32x32 eyes open +extern UNK_TYPE D_06000C20[]; // rgba16 32x32 eyes closed +extern UNK_TYPE D_06001420[]; // rgba16 32x32 eyes open, smiling + const ActorInit Obj_Lightswitch_InitVars = { ACTOR_OBJ_LIGHTSWITCH, ACTORTYPE_SWITCH, @@ -27,47 +53,433 @@ const ActorInit Obj_Lightswitch_InitVars = { (ActorFunc)ObjLightswitch_Update, (ActorFunc)ObjLightswitch_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B96BA0.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B96C3C.s") +static ColliderJntSphItemInit sColliderJntSphItemInit[] = { + { + { 0x00, { 0x00000000, 0x00, 0x00 }, { 0x00200000, 0x00, 0x00 }, 0x00, 0x01, 0x01 }, + { 0, { { 0, 0, 0 }, 19 }, 100 }, + }, +}; +static ColliderJntSphInit sColliderJntSphInit = { + { COLTYPE_UNK10, 0x00, 0x09, 0x39, 0x20, COLSHAPE_JNTSPH }, + 1, + sColliderJntSphItemInit, +}; +static CollisionCheckInfoInit sCollisionCheckInfoInit = { 0, 0xC, 0x3C, 0xFF }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B96D00.s") +static UNK_PTR faceTextures[] = { D_06000C20, D_06000420, D_06001420 }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B96D80.s") +static Vec3f D_80B97F68 = { -1707.0f, 843.0f, -180.0f }; +static Vec3f D_80B97F74 = { 0.0f, 0.0f, 0.0f }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/ObjLightswitch_Init.s") +static InitChainEntry sInitChain[] = { + ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/ObjLightswitch_Destroy.s") +void ObjLightswitch_InitCollider(ObjLightswitch* this, GlobalContext* globalCtx) { + s32 pad; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B971A8.s") + Collider_InitJntSph(globalCtx, &this->collider); + Collider_SetJntSph(globalCtx, &this->collider, &this->actor, &sColliderJntSphInit, this->colliderItems); + func_800D1694(this->actor.posRot.pos.x, this->actor.posRot.pos.y + (this->actor.shape.unk_08 * this->actor.scale.y), + this->actor.posRot.pos.z, &this->actor.shape.rot); + Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY); + func_800628A4(0, &this->collider); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B971D8.s") +void ObjLightswitch_SetSwitchFlag(ObjLightswitch* this, GlobalContext* globalCtx) { + Actor* thisx = &this->actor; // required + s32 type; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B972B8.s") + if (!Flags_GetSwitch(globalCtx, this->actor.params >> 8 & 0x3F)) { + type = this->actor.params >> 4 & 3; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B972D8.s") + Flags_SetSwitch(globalCtx, this->actor.params >> 8 & 0x3F); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B973C8.s") + if (type == OBJLIGHTSWITCH_TYPE_1) { + func_800806BC(globalCtx, thisx, 0x4807); + } else if (type == OBJLIGHTSWITCH_TYPE_BURN) { + func_800806BC(globalCtx, thisx, 0x4806); + } else { + func_800806BC(globalCtx, thisx, 0x4802); + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97400.s") +void ObjLightswitch_ClearSwitchFlag(ObjLightswitch* this, GlobalContext* globalCtx) { + if (Flags_GetSwitch(globalCtx, this->actor.params >> 8 & 0x3F)) { + Flags_UnsetSwitch(globalCtx, this->actor.params >> 8 & 0x3F); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97518.s") + if ((this->actor.params >> 4 & 3) == OBJLIGHTSWITCH_TYPE_1) { + func_800806BC(globalCtx, &this->actor, 0x4807); + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97540.s") +void ObjLightswitch_SpawnDisappearEffects(ObjLightswitch* this, GlobalContext* globalCtx) { + Vec3f pos; + f32 s = Math_Sins(this->actor.shape.rot.y); + f32 c = Math_Coss(this->actor.shape.rot.y); + f32 x; + f32 y; + f32 z; + s32 pad; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97630.s") + if (this->alpha >= (100 << 6)) { + x = (CLAMP_MAX((1.0f - 1.0f / (255 << 6) * this->alpha) * 400.0f, 60.0f) - 30.0f + 30.0f) * Math_Rand_ZeroOne(); + y = x - 30.0f; + if (x > 30.0f) { + x = 30.0f; + } else { + x = 900.0f - (y * y); + if (x < 100.0f) { + x = 100.0f; + } + x = sqrtf(x); + } + x = 2.0f * (x * (Math_Rand_ZeroOne() - 0.5f)); + z = (30.0f - fabsf(x)) * 0.5f + 10.0f * Math_Rand_ZeroOne(); + pos.x = this->actor.posRot.pos.x + ((z * s) + (x * c)); + pos.y = this->actor.posRot.pos.y + y + 10.0f; + pos.z = this->actor.posRot.pos.z + ((z * c) - (x * s)); + func_8002A6B8(globalCtx, &pos, &D_80B97F74, &D_80B97F74, 0x64, 0, 0xFF, 0xFF, 0xA0, 0xA0, 0xFF, 0, 0, 1, 9, 1); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97648.s") +void ObjLightswitch_Init(Actor* thisx, GlobalContext* globalCtx) { + ObjLightswitch* this = THIS; + s32 switchFlagSet = Flags_GetSwitch(globalCtx, this->actor.params >> 8 & 0x3F); + s32 removeSelf = false; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97690.s") + Actor_ProcessInitChain(&this->actor, sInitChain); + Actor_SetHeight(&this->actor, 0.0f); + if (switchFlagSet) { + if ((this->actor.params >> 4 & 3) == OBJLIGHTSWITCH_TYPE_BURN) { + removeSelf = true; + } else { + ObjLightswitch_SetupOn(this); + } + } else { + ObjLightswitch_SetupOff(this); + } + if ((this->actor.params & 1) == 1) { + if (switchFlagSet) { + Math_Vec3f_Copy(&this->actor.posRot.pos, &D_80B97F68); + Math_Vec3f_Copy(&this->actor.initPosRot.pos, &D_80B97F68); + } + this->actor.shape.rot.x = -0x4000; + this->actor.shape.rot.z = 0; + this->actor.posRot.rot.x = this->actor.initPosRot.rot.x = this->actor.shape.rot.x; + this->actor.posRot.rot.z = this->actor.initPosRot.rot.z = this->actor.shape.rot.z; + this->actor.flags |= 0x20; + if (!Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_OBJ_OSHIHIKI, + this->actor.initPosRot.pos.x, this->actor.initPosRot.pos.y, + this->actor.initPosRot.pos.z, 0, this->actor.initPosRot.rot.y, 0, 0xFF00)) { + osSyncPrintf(VT_COL(RED, WHITE)); + osSyncPrintf("押引ブロック発生失敗(%s %d)(arg_data 0x%04x)\n", "../z_obj_lightswitch.c", 452, + this->actor.params); + osSyncPrintf(VT_RST); + removeSelf = true; + } + } + ObjLightswitch_InitCollider(this, globalCtx); + func_80061ED4(&this->actor.colChkInfo, NULL, &sCollisionCheckInfoInit); + if (removeSelf) { + Actor_Kill(&this->actor); + } + osSyncPrintf("(光スイッチ)(arg_data 0x%04x)\n", this->actor.params); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B976A8.s") +void ObjLightswitch_Destroy(Actor* thisx, GlobalContext* globalCtx) { + Collider_DestroyJntSph(globalCtx, &THIS->collider); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/ObjLightswitch_Update.s") +void ObjLightswitch_SetupOff(ObjLightswitch* this) { + this->actionFunc = ObjLightswitch_Off; + this->faceTextureIndex = FACE_EYES_CLOSED; + this->color[0] = 155 << 6; + this->color[1] = 125 << 6; + this->color[2] = 255 << 6; + this->alpha = 255 << 6; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B977D0.s") +void ObjLightswitch_Off(ObjLightswitch* this, GlobalContext* globalCtx) { + switch (this->actor.params >> 4 & 3) { + case OBJLIGHTSWITCH_TYPE_STAY_ON: + case OBJLIGHTSWITCH_TYPE_2: + if (this->collider.base.acFlags & 2) { + ObjLightswitch_SetupTurnOn(this); + ObjLightswitch_SetSwitchFlag(this, globalCtx); + } + break; + case OBJLIGHTSWITCH_TYPE_1: + if ((this->collider.base.acFlags & 2) && !(this->prevFrameACflags & 2)) { + ObjLightswitch_SetupTurnOn(this); + ObjLightswitch_SetSwitchFlag(this, globalCtx); + } + break; + case OBJLIGHTSWITCH_TYPE_BURN: + if (this->collider.base.acFlags & 2) { + ObjLightswitch_SetupDisappearDelay(this); + ObjLightswitch_SetSwitchFlag(this, globalCtx); + } + break; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97B50.s") +void ObjLightswitch_SetupTurnOn(ObjLightswitch* this) { + this->actionFunc = ObjLightswitch_TurnOn; + this->toggleDelay = 100; + this->timer = 0; + this->faceTextureIndex = FACE_EYES_CLOSED; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/ObjLightswitch_Draw.s") +void ObjLightswitch_TurnOn(ObjLightswitch* this, GlobalContext* globalCtx) { + if (func_8005B198() == this->actor.type || this->toggleDelay <= 0) { + if (this->timer == 0) { + Audio_PlayActorSound2(&this->actor, NA_SE_EV_TRIFORCE_FLASH); + } + + this->timer++; + + Math_ApproxS(&this->flameRingRotSpeed, -0xAA, 0xA); + this->flameRingRot += this->flameRingRotSpeed; + + this->color[0] = this->timer * (((255 - 155) << 6) / 20) + (155 << 6); + this->color[1] = this->timer * (((255 - 125) << 6) / 20) + (125 << 6); + + if (this->timer >= 20) { + ObjLightswitch_SetupOn(this); + } else if (this->timer == 15) { + this->faceTextureIndex = FACE_EYES_OPEN; + Audio_PlayActorSound2(&this->actor, NA_SE_EV_FOOT_SWITCH); + } + } +} + +void ObjLightswitch_SetupOn(ObjLightswitch* this) { + this->actionFunc = ObjLightswitch_On; + this->faceTextureIndex = FACE_EYES_OPEN_SMILING; + + this->color[0] = 255 << 6; + this->color[1] = 255 << 6; + this->color[2] = 255 << 6; + this->alpha = 255 << 6; + + this->flameRingRotSpeed = -0xAA; + this->timer = 0; +} + +void ObjLightswitch_On(ObjLightswitch* this, GlobalContext* globalCtx) { + switch (this->actor.params >> 4 & 3) { + case OBJLIGHTSWITCH_TYPE_STAY_ON: + if (!Flags_GetSwitch(globalCtx, this->actor.params >> 8 & 0x3F)) { + ObjLightswitch_SetupTurnOff(this); + } + break; + case OBJLIGHTSWITCH_TYPE_1: + if (this->collider.base.acFlags & 2 && !(this->prevFrameACflags & 2)) { + ObjLightswitch_SetupTurnOff(this); + ObjLightswitch_ClearSwitchFlag(this, globalCtx); + } + break; + case OBJLIGHTSWITCH_TYPE_2: + if (!(this->collider.base.acFlags & 2)) { + if (this->timer >= 7) { + ObjLightswitch_SetupTurnOff(this); + ObjLightswitch_ClearSwitchFlag(this, globalCtx); + } else { + this->timer++; + } + } else { + this->timer = 0; + } + break; + } + this->flameRingRot += this->flameRingRotSpeed; +} + +void ObjLightswitch_SetupTurnOff(ObjLightswitch* this) { + this->actionFunc = ObjLightswitch_TurnOff; + this->toggleDelay = 100; + this->timer = 20; + this->faceTextureIndex = FACE_EYES_OPEN; +} + +void ObjLightswitch_TurnOff(ObjLightswitch* this, GlobalContext* globalCtx) { + if ((this->actor.params >> 4 & 3) != OBJLIGHTSWITCH_TYPE_1 || func_8005B198() == this->actor.type || + this->toggleDelay <= 0) { + this->timer--; + + Math_ApproxS(&this->flameRingRotSpeed, 0, 0xA); + this->flameRingRot += this->flameRingRotSpeed; + + this->color[0] = this->timer * (((255 - 155) << 6) / 20) + (155 << 6); + this->color[1] = this->timer * (((255 - 125) << 6) / 20) + (125 << 6); + + if (this->timer <= 0) { + ObjLightswitch_SetupOff(this); + } else if (this->timer == 15) { + this->faceTextureIndex = FACE_EYES_CLOSED; + Audio_PlayActorSound2(&this->actor, NA_SE_EV_FOOT_SWITCH); + } + } +} + +void ObjLightswitch_SetupDisappearDelay(ObjLightswitch* this) { + this->actionFunc = ObjLightswitch_DisappearDelay; + this->toggleDelay = 100; +} + +void ObjLightswitch_DisappearDelay(ObjLightswitch* this, GlobalContext* globalCtx) { + if (func_8005B198() == this->actor.type || this->toggleDelay <= 0) { + ObjLightswitch_SetupDisappear(this); + } +} + +void ObjLightswitch_SetupDisappear(ObjLightswitch* this) { + this->actionFunc = ObjLightswitch_Disappear; + this->alpha = 255 << 6; +} + +void ObjLightswitch_Disappear(ObjLightswitch* this, GlobalContext* globalCtx) { + this->alpha -= 200; + ObjLightswitch_SpawnDisappearEffects(this, globalCtx); + if (this->alpha < 0) { + Actor_Kill(&this->actor); + } +} + +void ObjLightswitch_Update(Actor* thisx, GlobalContext* globalCtx) { + ObjLightswitch* this = THIS; + GlobalContext* globalCtx2 = globalCtx; + + if (this->toggleDelay > 0) { + this->toggleDelay--; + } + + this->actionFunc(this, globalCtx2); + + if (this->actor.update != NULL) { + if ((this->actor.params & 1) == 1) { + this->actor.posRot.pos.x = this->actor.child->posRot.pos.x; + this->actor.posRot.pos.y = this->actor.child->posRot.pos.y + 60.0f; + this->actor.posRot.pos.z = this->actor.child->posRot.pos.z; + Actor_SetHeight(&this->actor, 0.0f); + } + + this->prevFrameACflags = this->collider.base.acFlags; + this->collider.base.acFlags &= ~2; + CollisionCheck_SetOC(globalCtx2, &globalCtx2->colChkCtx, &this->collider.base); + CollisionCheck_SetAC(globalCtx2, &globalCtx2->colChkCtx, &this->collider.base); + } +} + +void ObjLightswitch_DrawOpa(ObjLightswitch* this, GlobalContext* globalCtx) { + Actor* child; + Vec3f pos; + Vec3s rot; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_obj_lightswitch.c", 809); + func_80093D18(globalCtx->state.gfxCtx); + + gDPSetEnvColor(oGfxCtx->polyOpa.p++, (u8)(this->color[0] >> 6), (u8)(this->color[1] >> 6), + (u8)(this->color[2] >> 6), (u8)(this->alpha >> 6)); + gSPSegment(oGfxCtx->polyOpa.p++, 0x09, &D_80116280[2]); + + if ((this->actor.params & 1) == 1) { + child = this->actor.child; + this->actor.posRot.pos.x = child->posRot.pos.x; + this->actor.posRot.pos.y = child->posRot.pos.y + 60.0f; + this->actor.posRot.pos.z = child->posRot.pos.z; + Math_Vec3f_Copy(&pos, &this->actor.posRot.pos); + func_800D1694(pos.x, pos.y, pos.z, &this->actor.shape.rot); + Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY); + } else { + pos.x = this->actor.posRot.pos.x; + pos.y = this->actor.posRot.pos.y + this->actor.shape.unk_08 * this->actor.scale.y; + pos.z = this->actor.posRot.pos.z; + } + + gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_lightswitch.c", 841), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPSegment(oGfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(faceTextures[this->faceTextureIndex])); + gSPDisplayList(oGfxCtx->polyOpa.p++, D_06000260); + + rot.x = this->actor.shape.rot.x; + rot.y = this->actor.shape.rot.y; + rot.z = this->actor.shape.rot.z + this->flameRingRot; + func_800D1694(pos.x, pos.y, pos.z, &rot); + Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY); + gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_lightswitch.c", 859), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(oGfxCtx->polyOpa.p++, D_06000398); + + rot.z = this->actor.shape.rot.z - this->flameRingRot; + func_800D1694(pos.x, pos.y, pos.z, &rot); + Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY); + gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_lightswitch.c", 873), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(oGfxCtx->polyOpa.p++, D_06000408); + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_obj_lightswitch.c", 878); +} + +void ObjLightswitch_DrawXlu(ObjLightswitch* this, GlobalContext* globalCtx) { + s32 pad; + Vec3f sp68; + Vec3s sp60; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_obj_lightswitch.c", 890); + func_80093D84(globalCtx->state.gfxCtx); + + gDPSetEnvColor(oGfxCtx->polyXlu.p++, (u8)(this->color[0] >> 6), (u8)(this->color[1] >> 6), + (u8)(this->color[2] >> 6), (u8)(this->alpha >> 6)); + gSPSegment(oGfxCtx->polyXlu.p++, 0x09, D_80116280); + + sp68.x = this->actor.posRot.pos.x; + sp68.y = this->actor.posRot.pos.y + (this->actor.shape.unk_08 * this->actor.scale.y); + sp68.z = this->actor.posRot.pos.z; + + gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_lightswitch.c", 912), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(faceTextures[this->faceTextureIndex])); + gSPDisplayList(oGfxCtx->polyXlu.p++, D_06000260); + + sp60.x = this->actor.shape.rot.x; + sp60.y = this->actor.shape.rot.y; + sp60.z = this->actor.shape.rot.z + this->flameRingRot; + + func_800D1694(sp68.x, sp68.y, sp68.z, &sp60); + Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY); + gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_lightswitch.c", 930), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(oGfxCtx->polyXlu.p++, D_06000398); + + sp60.z = this->actor.shape.rot.z - this->flameRingRot; + func_800D1694(sp68.x, sp68.y, sp68.z, &sp60); + Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY); + gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_lightswitch.c", 944), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(oGfxCtx->polyXlu.p++, D_06000408); + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_obj_lightswitch.c", 949); +} + +void ObjLightswitch_Draw(Actor* thisx, GlobalContext* globalCtx) { + ObjLightswitch* this = THIS; + s32 alpha = this->alpha >> 6 & 0xFF; + + if ((this->actor.params & 1) == 1) { + func_800628A4(0, &this->collider); + } + + if ((this->actor.params >> 4 & 3) == OBJLIGHTSWITCH_TYPE_BURN && (alpha > 0 || alpha < 255)) { + ObjLightswitch_DrawXlu(this, globalCtx); + } else { + ObjLightswitch_DrawOpa(this, globalCtx); + } +} diff --git a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.h b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.h index e24e38c6e3..11d67f1f49 100644 --- a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.h +++ b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.h @@ -6,9 +6,28 @@ struct ObjLightswitch; +typedef void (*ObjLightswitchActionFunc)(struct ObjLightswitch*, GlobalContext*); + +typedef enum { + /* 0 */ OBJLIGHTSWITCH_TYPE_STAY_ON, // doesn't turn off unless the switch flag is cleared some other way + /* 1 */ OBJLIGHTSWITCH_TYPE_1, // turns on and off + /* 2 */ OBJLIGHTSWITCH_TYPE_2, // turns on and off + /* 3 */ OBJLIGHTSWITCH_TYPE_BURN // disappears when turned on +} ObjLightswitch_Type; + typedef struct ObjLightswitch { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x78]; + /* 0x014C */ ObjLightswitchActionFunc actionFunc; + /* 0x0150 */ ColliderJntSph collider; + /* 0x0170 */ ColliderJntSphItem colliderItems[1]; + /* 0x01B0 */ s16 timer; // collision-related threshold and controls animation/logic when turning on/off + /* 0x01B2 */ s16 toggleDelay; // timer ticking down used for delaying tuning on/off or disappearing, can be bypassed + /* 0x01B4 */ s16 faceTextureIndex; // texture used by the center part of the sun + /* 0x01B6 */ s16 color[3]; // rgb, (0-255 color component) << 6 + /* 0x01BC */ s16 alpha; // (0-255 alpha) << 6 + /* 0x01BE */ s16 flameRingRot; + /* 0x01C0 */ s16 flameRingRotSpeed; + /* 0x01C2 */ u8 prevFrameACflags; } ObjLightswitch; // size = 0x01C4 extern const ActorInit Obj_Lightswitch_InitVars; diff --git a/tools/assist.py b/tools/assist.py new file mode 100755 index 0000000000..8deabc8f6a --- /dev/null +++ b/tools/assist.py @@ -0,0 +1,177 @@ +#!/usr/bin/python3 + +import argparse +from collections import OrderedDict +import os +import re +import pickle +import sys + +script_dir = os.path.dirname(os.path.realpath(__file__)) +root_dir = script_dir + "/../" +asm_dir = root_dir + "asm/non_matchings/overlays/actors" +build_dir = root_dir + "build/" + +def read_rom(): + with open("baserom.z64", "rb") as f: + return f.read() + + +def find_dir(query): + for root, dirs, files in os.walk(asm_dir): + for d in dirs: + if d == query: + return os.path.join(root, d) + return None + + +def get_all_s_files(): + ret = set() + for root, dirs, files in os.walk(asm_dir): + for f in files: + if f.endswith(".s"): + ret.add(f[:-2]) + return ret + + +def get_symbol_bytes(offsets, func): + if func not in offsets or "start" not in offsets[func] or "end" not in offsets[func]: + return None + start = offsets[func]["start"] + end = offsets[func]["end"] + return list(rom_bytes[start:end]) + + +def parse_map(fname): + ram_offset = None + cur_file = "" + syms = {} + prev_sym = None + prev_line = "" + with open(fname) as f: + for line in f: + if "load address" in line: + if "noload" in line or "noload" in prev_line: + ram_offset = None + continue + ram = int(line[16 : 16 + 18], 0) + rom = int(line[59 : 59 + 18], 0) + ram_offset = ram - rom + continue + prev_line = line + + if ( + ram_offset is None + or "=" in line + or "*fill*" in line + or " 0x" not in line + ): + continue + ram = int(line[16 : 16 + 18], 0) + rom = ram - ram_offset + fn = line.split()[-1] + if "0x" in fn: + ram_offset = None + elif "/" in fn: + cur_file = fn + else: + syms[fn] = (rom, cur_file, prev_sym, ram) + prev_sym = fn + return syms + + +def get_map_offsets(syms): + offsets = {} + for sym in syms: + prev_sym = syms[sym][2] + if sym not in offsets: + offsets[sym] = {} + if prev_sym not in offsets: + offsets[prev_sym] = {} + offsets[sym]["start"] = syms[sym][0] + offsets[prev_sym]["end"] = syms[sym][0] + return offsets + + +def diff_syms(qb, tb): + if len(tb) < 8: + return 0 + + if len(qb) > len(tb): + larger = qb + smaller = tb + else: + larger = tb + smaller = qb + + len_ratio = len(smaller) / len(larger) + + n_bytes = len(smaller) + matches = 0 + for i in range(0, n_bytes, 4): + if smaller[i] == larger[i]: + matches += 4 + return (matches / n_bytes) * len_ratio + + +def get_matches(query): + query_bytes = get_symbol_bytes(map_offsets, query) + if query_bytes is None: + sys.exit("Symbol '" + query + "' not found") + + ret = {} + for symbol in map_offsets: + if symbol is not None and query != symbol: + target_bytes = get_symbol_bytes(map_offsets, symbol) + if target_bytes is not None: + score = diff_syms(query_bytes, target_bytes) + if score >= args.threshold: + ret[symbol] = score + return OrderedDict(sorted(ret.items(), key=lambda kv: kv[1], reverse=True)) + + +def do_query(query): + matches = get_matches(query) + num_matches = len(matches) + + if num_matches == 0: + print(query + " - found no matches") + return + + i = 0 + more_str = ":" + if args.num_out < num_matches: + more_str = " (showing only " + str(args.num_out) + "):" + + print(query + " - found " + str(num_matches) + " matches total" + more_str) + for match in matches: + if i == args.num_out: + break + match_str = "{:.2f} - {}".format(matches[match], match) + if match not in s_files: + match_str += " (decompiled)" + print(match_str) + i += 1 + print() + +parser = argparse.ArgumentParser(description="Tools to assist with decomp") +parser.add_argument("query", help="function or file") +parser.add_argument("--threshold", help="score threshold between 0 and 1 (higher is more restrictive)", type=float, default=0.95, required=False) +parser.add_argument("--num-out", help="number of functions to display", type=int, default=10, required=False) + +args = parser.parse_args() + +rom_bytes = read_rom() +map_syms = parse_map(build_dir + "z64.map") +map_offsets = get_map_offsets(map_syms) + +s_files = get_all_s_files() + +query_dir = find_dir(args.query) + +if query_dir is not None: + files = os.listdir(query_dir) + for f_name in files: + do_query(f_name[:-2]) +else: + do_query(args.query) diff --git a/tools/permuter_settings.toml b/tools/permuter_settings.toml index e3ea3594fc..11ef7d726e 100644 --- a/tools/permuter_settings.toml +++ b/tools/permuter_settings.toml @@ -2,10 +2,11 @@ "g[DS]P.*" = "void" "gDma.*" = "void" "G_IM_SIZ_.*" = "int" -"G_[AC]CMUX.*" = "int" +"G_[AC]C.*" = "int" LOG = "void" SET_FULLSCREEN_VIEWPORT = "void" OPEN_DISPS = "void" CLOSE_DISPS = "void" ABS = "int" SQ = "int" +CLAMP = "int" diff --git a/undefined_syms.txt b/undefined_syms.txt index a0b6acb0f5..efaf91cb3c 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -317,6 +317,10 @@ D_060011EC = 0x060011EC; D_06002260 = 0x06002260; D_0600238C = 0x0600238C; +// z_bg_spot15_rrbox +D_06000348 = 0x06000348; +D_06000180 = 0x06000180; + // z_bg_spot18_futa D_06000368 = 0x06000368; D_06000150 = 0x06000150; @@ -394,6 +398,9 @@ D_06003C64 = 0x06003C64; // z_bg_mizu_uzu D_060074EC = 0x060074EC; +// z_bg_mizu_water +D_06004B20 = 0x06004B20; + // z_bg_mori_elevator D_060035F8 = 0x060035F8; D_06002AD0 = 0x06002AD0; @@ -404,7 +411,7 @@ D_06002590 = 0x06002590; // z_bg_spot08_bakudankabe D_060039D4 = 0x060039D4; -D_06003898 = 0x06003898; +D_06003898 = 0x06003898; D_0500A880 = 0x0500A880; // z_bg_ydan_hasi @@ -417,6 +424,14 @@ D_060066A8 = 0x060066A8; D_06008D88 = 0x06008D88; D_06006570 = 0x06006570; +// z_en_mag +D_06000000 = 0x06000000; +D_06019A00 = 0x06019A00; +D_0601A400 = 0x0601A400; +D_06024800 = 0x06024800; +D_06024C00 = 0x06024C00; +D_06024E40 = 0x06024E40; + // z_en_ma1 D_06000820 = 0x06000820; D_06008460 = 0x06008460; @@ -493,6 +508,21 @@ D_06007564 = 0x06007564; D_06001F10 = 0x06001F10; D_06000B70 = 0x06000B70; +// z_en_rd +D_06004268 = 0x06004268; +D_060046F8 = 0x060046F8; +D_06004ADC = 0x06004ADC; +D_06004F94 = 0x06004F94; +D_060057AC = 0x060057AC; +D_06005D98 = 0x06005D98; +D_06006E88 = 0x06006E88; +D_060074F0 = 0x060074F0; +D_06008040 = 0x06008040; +D_060087D0 = 0x060087D0; +D_0600E778 = 0x0600E778; +D_0600EFDC = 0x0600EFDC; +D_06003DD8 = 0x06003DD8; + // z_eff_ss_extra D_06000DC0 = 0x06000DC0; @@ -720,6 +750,14 @@ D_06005810 = 0x06005810; D_06000180 = 0x06000180; D_06000360 = 0x06000360; +// z_obj_lightswitch +D_06000260 = 0x06000260; +D_06000398 = 0x06000398; +D_06000408 = 0x06000408; +D_06000420 = 0x06000420; +D_06000C20 = 0x06000C20; +D_06001420 = 0x06001420; + // z_en_pu_box D_06000380 = 0x06000380; D_060006D0 = 0x060006D0; @@ -950,6 +988,10 @@ D_06000530 = 0x06000530; // z_eff_ss_dust D_04010050 = 0x04010050; +// z_Bg_Spot16_Bombstone +D_06000C20 = 0x06000C20; +D_060009E0 = 0x060009E0; + // z_Bg_Spot16_Doughnut D_06000660 = 0x06000660; D_06000FC0 = 0x06000FC0; @@ -1021,7 +1063,7 @@ D_06006078 = 0x06006078; D_04049FE0 = 0x04049FE0; D_06000AE8 = 0x06000AE8; D_06001678 = 0x06001678; - + // z_bg_haka_tubo D_060108B8 = 0x060108B8; D_0600FE40 = 0x0600FE40; @@ -1054,7 +1096,7 @@ D_06000970 = 0x06000970; // z_bg_jya_goroiwa D_060006B0 = 0x060006B0; -// z_en_js +// z_en_js D_0600045C = 0x0600045C; D_06005EA0 = 0x06005EA0; D_0600018C = 0x0600018C; @@ -1074,5 +1116,17 @@ D_060055A8 = 0x060055A8; D_0601BFB0 = 0x0601BFB0; D_0601C160 = 0x0601C160; +// z_en_takara_man +D_06004FE0 = 0x06004FE0; +D_06000498 = 0x06000498; + // z_bg_menkuri_eye D_06002D20 = 0x06002D20; + +// z_bg_mori_bigst +D_0600221C = 0x0600221C; +D_06001E50 = 0x06001E50; + +// z_bg_mori_hashira4 +D_06001AF8 = 0x06001AF8; +D_060089E0 = 0x060089E0;