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/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/spec b/spec index ecd4b63afb..360afe5ae7 100644 --- a/spec +++ b/spec @@ -1313,8 +1313,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 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/undefined_syms.txt b/undefined_syms.txt index 9acf3e8c36..6149ee68b3 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -972,6 +972,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;