From 2d11436367b4ce5eaeb02e5b2f387f5ea95b5533 Mon Sep 17 00:00:00 2001 From: shawlucas Date: Wed, 1 Apr 2020 17:32:20 -0700 Subject: [PATCH] Decompiled ovl_Bg_Spot05_Soko --- .../ovl_Bg_Spot05_Soko/BgSpot05Soko_Destroy.s | 16 ---- .../ovl_Bg_Spot05_Soko/BgSpot05Soko_Draw.s | 19 ----- .../ovl_Bg_Spot05_Soko/BgSpot05Soko_Init.s | 82 ------------------- .../ovl_Bg_Spot05_Soko/BgSpot05Soko_Update.s | 12 --- .../actors/ovl_Bg_Spot05_Soko/func_808AE5A8.s | 6 -- .../actors/ovl_Bg_Spot05_Soko/func_808AE5B4.s | 38 --------- .../actors/ovl_Bg_Spot05_Soko/func_808AE630.s | 33 -------- data/overlays/actors/z_bg_spot05_soko.data.s | 20 ----- data/overlays/actors/z_bg_spot05_soko.reloc.s | 11 --- 9 files changed, 237 deletions(-) delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/BgSpot05Soko_Destroy.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/BgSpot05Soko_Draw.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/BgSpot05Soko_Init.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/BgSpot05Soko_Update.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/func_808AE5A8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/func_808AE5B4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/func_808AE630.s delete mode 100644 data/overlays/actors/z_bg_spot05_soko.data.s delete mode 100644 data/overlays/actors/z_bg_spot05_soko.reloc.s diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/BgSpot05Soko_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/BgSpot05Soko_Destroy.s deleted file mode 100644 index 079cd08691..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/BgSpot05Soko_Destroy.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel BgSpot05Soko_Destroy -/* 00108 808AE578 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0010C 808AE57C AFA40018 */ sw $a0, 0x0018($sp) -/* 00110 808AE580 8FAE0018 */ lw $t6, 0x0018($sp) -/* 00114 808AE584 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00118 808AE588 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0011C 808AE58C 24A50810 */ addiu $a1, $a1, 0x0810 ## $a1 = 00000810 -/* 00120 808AE590 0C00FB56 */ jal DynaPolyInfo_Free - ## DynaPolyInfo_delReserve -/* 00124 808AE594 8DC6014C */ lw $a2, 0x014C($t6) ## 0000014C -/* 00128 808AE598 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0012C 808AE59C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00130 808AE5A0 03E00008 */ jr $ra -/* 00134 808AE5A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/BgSpot05Soko_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/BgSpot05Soko_Draw.s deleted file mode 100644 index 338886aa6d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/BgSpot05Soko_Draw.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel BgSpot05Soko_Draw -/* 00250 808AE6C0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00254 808AE6C4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00258 808AE6C8 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 0025C 808AE6CC 84EE001C */ lh $t6, 0x001C($a3) ## 0000001C -/* 00260 808AE6D0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00264 808AE6D4 3C05808B */ lui $a1, %hi(D_808AE724) ## $a1 = 808B0000 -/* 00268 808AE6D8 000E7880 */ sll $t7, $t6, 2 -/* 0026C 808AE6DC 00AF2821 */ addu $a1, $a1, $t7 -/* 00270 808AE6E0 0C00D498 */ jal Gfx_DrawDListOpa - -/* 00274 808AE6E4 8CA5E724 */ lw $a1, %lo(D_808AE724)($a1) -/* 00278 808AE6E8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0027C 808AE6EC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00280 808AE6F0 03E00008 */ jr $ra -/* 00284 808AE6F4 00000000 */ nop -/* 00288 808AE6F8 00000000 */ nop -/* 0028C 808AE6FC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/BgSpot05Soko_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/BgSpot05Soko_Init.s deleted file mode 100644 index efc5c4244b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/BgSpot05Soko_Init.s +++ /dev/null @@ -1,82 +0,0 @@ -glabel BgSpot05Soko_Init -/* 00000 808AE470 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00004 808AE474 AFA50034 */ sw $a1, 0x0034($sp) -/* 00008 808AE478 AFBF001C */ sw $ra, 0x001C($sp) -/* 0000C 808AE47C AFB00018 */ sw $s0, 0x0018($sp) -/* 00010 808AE480 3C05808B */ lui $a1, %hi(D_808AE720) ## $a1 = 808B0000 -/* 00014 808AE484 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00018 808AE488 AFA00024 */ sw $zero, 0x0024($sp) -/* 0001C 808AE48C 0C01E037 */ jal Actor_ProcessInitChain - -/* 00020 808AE490 24A5E720 */ addiu $a1, $a1, %lo(D_808AE720) ## $a1 = 808AE720 -/* 00024 808AE494 860E001C */ lh $t6, 0x001C($s0) ## 0000001C -/* 00028 808AE498 8619001C */ lh $t9, 0x001C($s0) ## 0000001C -/* 0002C 808AE49C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00030 808AE4A0 000E7A03 */ sra $t7, $t6, 8 -/* 00034 808AE4A4 31F800FF */ andi $t8, $t7, 0x00FF ## $t8 = 00000000 -/* 00038 808AE4A8 332800FF */ andi $t0, $t9, 0x00FF ## $t0 = 00000000 -/* 0003C 808AE4AC AE180168 */ sw $t8, 0x0168($s0) ## 00000168 -/* 00040 808AE4B0 A608001C */ sh $t0, 0x001C($s0) ## 0000001C -/* 00044 808AE4B4 0C010D20 */ jal DynaPolyInfo_SetActorMove - -/* 00048 808AE4B8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0004C 808AE4BC 8609001C */ lh $t1, 0x001C($s0) ## 0000001C -/* 00050 808AE4C0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00054 808AE4C4 27A50024 */ addiu $a1, $sp, 0x0024 ## $a1 = FFFFFFF4 -/* 00058 808AE4C8 15200010 */ bne $t1, $zero, .L808AE50C -/* 0005C 808AE4CC 248412C0 */ addiu $a0, $a0, 0x12C0 ## $a0 = 060012C0 -/* 00060 808AE4D0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00064 808AE4D4 0C010620 */ jal DynaPolyInfo_Alloc - -/* 00068 808AE4D8 24840918 */ addiu $a0, $a0, 0x0918 ## $a0 = 06000918 -/* 0006C 808AE4DC 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 -/* 00070 808AE4E0 8D4AE664 */ lw $t2, -0x199C($t2) ## 8015E664 -/* 00074 808AE4E4 3C0B808B */ lui $t3, %hi(func_808AE5A8) ## $t3 = 808B0000 -/* 00078 808AE4E8 256BE5A8 */ addiu $t3, $t3, %lo(func_808AE5A8) ## $t3 = 808AE5A8 -/* 0007C 808AE4EC 15400005 */ bne $t2, $zero, .L808AE504 -/* 00080 808AE4F0 00000000 */ nop -/* 00084 808AE4F4 0C00B55C */ jal Actor_Kill - -/* 00088 808AE4F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0008C 808AE4FC 10000014 */ beq $zero, $zero, .L808AE550 -/* 00090 808AE500 8FA40034 */ lw $a0, 0x0034($sp) -.L808AE504: -/* 00094 808AE504 10000011 */ beq $zero, $zero, .L808AE54C -/* 00098 808AE508 AE0B0164 */ sw $t3, 0x0164($s0) ## 00000164 -.L808AE50C: -/* 0009C 808AE50C 0C010620 */ jal DynaPolyInfo_Alloc - -/* 000A0 808AE510 27A50024 */ addiu $a1, $sp, 0x0024 ## $a1 = FFFFFFF4 -/* 000A4 808AE514 8FA40034 */ lw $a0, 0x0034($sp) -/* 000A8 808AE518 0C00B2D0 */ jal Flags_GetSwitch - -/* 000AC 808AE51C 8E050168 */ lw $a1, 0x0168($s0) ## 00000168 -/* 000B0 808AE520 10400005 */ beq $v0, $zero, .L808AE538 -/* 000B4 808AE524 3C0C808B */ lui $t4, %hi(func_808AE5B4) ## $t4 = 808B0000 -/* 000B8 808AE528 0C00B55C */ jal Actor_Kill - -/* 000BC 808AE52C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000C0 808AE530 10000007 */ beq $zero, $zero, .L808AE550 -/* 000C4 808AE534 8FA40034 */ lw $a0, 0x0034($sp) -.L808AE538: -/* 000C8 808AE538 8E0D0004 */ lw $t5, 0x0004($s0) ## 00000004 -/* 000CC 808AE53C 258CE5B4 */ addiu $t4, $t4, %lo(func_808AE5B4) ## $t4 = FFFFE5B4 -/* 000D0 808AE540 AE0C0164 */ sw $t4, 0x0164($s0) ## 00000164 -/* 000D4 808AE544 35AE0010 */ ori $t6, $t5, 0x0010 ## $t6 = 00000010 -/* 000D8 808AE548 AE0E0004 */ sw $t6, 0x0004($s0) ## 00000004 -.L808AE54C: -/* 000DC 808AE54C 8FA40034 */ lw $a0, 0x0034($sp) -.L808AE550: -/* 000E0 808AE550 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 000E4 808AE554 8FA70024 */ lw $a3, 0x0024($sp) -/* 000E8 808AE558 0C00FA9D */ jal DynaPolyInfo_RegisterActor - ## DynaPolyInfo_setActor -/* 000EC 808AE55C 24850810 */ addiu $a1, $a0, 0x0810 ## $a1 = 00000810 -/* 000F0 808AE560 AE02014C */ sw $v0, 0x014C($s0) ## 0000014C -/* 000F4 808AE564 8FBF001C */ lw $ra, 0x001C($sp) -/* 000F8 808AE568 8FB00018 */ lw $s0, 0x0018($sp) -/* 000FC 808AE56C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00100 808AE570 03E00008 */ jr $ra -/* 00104 808AE574 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/BgSpot05Soko_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/BgSpot05Soko_Update.s deleted file mode 100644 index f4e14b2486..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/BgSpot05Soko_Update.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel BgSpot05Soko_Update -/* 0022C 808AE69C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00230 808AE6A0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00234 808AE6A4 8C990164 */ lw $t9, 0x0164($a0) ## 00000164 -/* 00238 808AE6A8 0320F809 */ jalr $ra, $t9 -/* 0023C 808AE6AC 00000000 */ nop -/* 00240 808AE6B0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00244 808AE6B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00248 808AE6B8 03E00008 */ jr $ra -/* 0024C 808AE6BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/func_808AE5A8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/func_808AE5A8.s deleted file mode 100644 index c2c475fc36..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/func_808AE5A8.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_808AE5A8 -/* 00138 808AE5A8 AFA40000 */ sw $a0, 0x0000($sp) -/* 0013C 808AE5AC 03E00008 */ jr $ra -/* 00140 808AE5B0 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/func_808AE5B4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/func_808AE5B4.s deleted file mode 100644 index 1c52374e33..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/func_808AE5B4.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_808AE5B4 -/* 00144 808AE5B4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00148 808AE5B8 AFB00018 */ sw $s0, 0x0018($sp) -/* 0014C 808AE5BC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00150 808AE5C0 AFBF001C */ sw $ra, 0x001C($sp) -/* 00154 808AE5C4 AFA50024 */ sw $a1, 0x0024($sp) -/* 00158 808AE5C8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0015C 808AE5CC 0C00B2D0 */ jal Flags_GetSwitch - -/* 00160 808AE5D0 8E050168 */ lw $a1, 0x0168($s0) ## 00000168 -/* 00164 808AE5D4 10400011 */ beq $v0, $zero, .L808AE61C -/* 00168 808AE5D8 8FA40024 */ lw $a0, 0x0024($sp) -/* 0016C 808AE5DC 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 00170 808AE5E0 2406001E */ addiu $a2, $zero, 0x001E ## $a2 = 0000001E -/* 00174 808AE5E4 0C01AEB6 */ jal Audio_PlaySoundAtPosition - -/* 00178 808AE5E8 2407285A */ addiu $a3, $zero, 0x285A ## $a3 = 0000285A -/* 0017C 808AE5EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00180 808AE5F0 0C00B56E */ jal Actor_SetHeight - -/* 00184 808AE5F4 3C054248 */ lui $a1, 0x4248 ## $a1 = 42480000 -/* 00188 808AE5F8 8FA40024 */ lw $a0, 0x0024($sp) -/* 0018C 808AE5FC 0C020120 */ jal func_80080480 -/* 00190 808AE600 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00194 808AE604 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00198 808AE608 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 0019C 808AE60C 3C0E808B */ lui $t6, %hi(func_808AE630) ## $t6 = 808B0000 -/* 001A0 808AE610 25CEE630 */ addiu $t6, $t6, %lo(func_808AE630) ## $t6 = 808AE630 -/* 001A4 808AE614 AE0E0164 */ sw $t6, 0x0164($s0) ## 00000164 -/* 001A8 808AE618 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -.L808AE61C: -/* 001AC 808AE61C 8FBF001C */ lw $ra, 0x001C($sp) -/* 001B0 808AE620 8FB00018 */ lw $s0, 0x0018($sp) -/* 001B4 808AE624 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 001B8 808AE628 03E00008 */ jr $ra -/* 001BC 808AE62C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/func_808AE630.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/func_808AE630.s deleted file mode 100644 index c9504af5e0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/func_808AE630.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_808AE630 -/* 001C0 808AE630 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 001C4 808AE634 AFBF0014 */ sw $ra, 0x0014($sp) -/* 001C8 808AE638 AFA5001C */ sw $a1, 0x001C($sp) -/* 001CC 808AE63C 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 001D0 808AE640 44813000 */ mtc1 $at, $f6 ## $f6 = 1.50 -/* 001D4 808AE644 C4840068 */ lwc1 $f4, 0x0068($a0) ## 00000068 -/* 001D8 808AE648 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 001DC 808AE64C 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 -/* 001E0 808AE650 46062202 */ mul.s $f8, $f4, $f6 -/* 001E4 808AE654 44818000 */ mtc1 $at, $f16 ## $f16 = 120.00 -/* 001E8 808AE658 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 -/* 001EC 808AE65C E4880040 */ swc1 $f8, 0x0040($a0) ## 00000068 -/* 001F0 808AE660 C4EA000C */ lwc1 $f10, 0x000C($a3) ## 0000000C -/* 001F4 808AE664 8CE60068 */ lw $a2, 0x0068($a3) ## 00000068 -/* 001F8 808AE668 AFA70018 */ sw $a3, 0x0018($sp) -/* 001FC 808AE66C 46105481 */ sub.s $f18, $f10, $f16 -/* 00200 808AE670 44059000 */ mfc1 $a1, $f18 -/* 00204 808AE674 0C01DE80 */ jal Math_ApproxF - -/* 00208 808AE678 00000000 */ nop -/* 0020C 808AE67C 10400003 */ beq $v0, $zero, .L808AE68C -/* 00210 808AE680 8FA70018 */ lw $a3, 0x0018($sp) -/* 00214 808AE684 0C00B55C */ jal Actor_Kill - -/* 00218 808AE688 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -.L808AE68C: -/* 0021C 808AE68C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00220 808AE690 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00224 808AE694 03E00008 */ jr $ra -/* 00228 808AE698 00000000 */ nop - - diff --git a/data/overlays/actors/z_bg_spot05_soko.data.s b/data/overlays/actors/z_bg_spot05_soko.data.s deleted file mode 100644 index 8022c06c6e..0000000000 --- a/data/overlays/actors/z_bg_spot05_soko.data.s +++ /dev/null @@ -1,20 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .data - -glabel Bg_Spot05_Soko_InitVars - .word 0x018D0600, 0x00000000, 0x01610000, 0x0000016C -.word BgSpot05Soko_Init -.word BgSpot05Soko_Destroy -.word BgSpot05Soko_Update -.word BgSpot05Soko_Draw -glabel D_808AE720 - .word 0x48500064 -glabel D_808AE724 - .word 0x06000840, 0x06001190, 0x00000000 - diff --git a/data/overlays/actors/z_bg_spot05_soko.reloc.s b/data/overlays/actors/z_bg_spot05_soko.reloc.s deleted file mode 100644 index 05766685f3..0000000000 --- a/data/overlays/actors/z_bg_spot05_soko.reloc.s +++ /dev/null @@ -1,11 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata -glabel D_808AE730 - -.incbin "baserom/ovl_Bg_Spot05_Soko", 0x2C0, 0x00000050