diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Destroy.s deleted file mode 100644 index 7023d911ff..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Destroy.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel BgHidanCurtain_Destroy -/* 0026C 8088540C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00270 80885410 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00274 80885414 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00278 80885418 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0027C 8088541C 0C0170EB */ jal Collider_DestroyCylinder - -/* 00280 80885420 24C50158 */ addiu $a1, $a2, 0x0158 ## $a1 = 00000158 -/* 00284 80885424 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00288 80885428 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0028C 8088542C 03E00008 */ jr $ra -/* 00290 80885430 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Draw.s deleted file mode 100644 index 98e47a5ad2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Draw.s +++ /dev/null @@ -1,112 +0,0 @@ -.rdata -glabel D_80885CCC - .asciz "../z_bg_hidan_curtain.c" - .balign 4 - -glabel D_80885CE4 - .asciz "../z_bg_hidan_curtain.c" - .balign 4 - -glabel D_80885CFC - .asciz "../z_bg_hidan_curtain.c" - .balign 4 - -.text -glabel BgHidanCurtain_Draw -/* 0084C 808859EC 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 00850 808859F0 AFB10038 */ sw $s1, 0x0038($sp) -/* 00854 808859F4 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00858 808859F8 AFBF003C */ sw $ra, 0x003C($sp) -/* 0085C 808859FC AFB00034 */ sw $s0, 0x0034($sp) -/* 00860 80885A00 AFA40070 */ sw $a0, 0x0070($sp) -/* 00864 80885A04 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 00868 80885A08 3C068088 */ lui $a2, %hi(D_80885CCC) ## $a2 = 80880000 -/* 0086C 80885A0C 24C65CCC */ addiu $a2, $a2, %lo(D_80885CCC) ## $a2 = 80885CCC -/* 00870 80885A10 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 -/* 00874 80885A14 240702AD */ addiu $a3, $zero, 0x02AD ## $a3 = 000002AD -/* 00878 80885A18 0C031AB1 */ jal Graph_OpenDisps -/* 0087C 80885A1C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00880 80885A20 0C024F61 */ jal func_80093D84 -/* 00884 80885A24 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 00888 80885A28 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 0088C 80885A2C 8FA90070 */ lw $t1, 0x0070($sp) -/* 00890 80885A30 3C0FFA00 */ lui $t7, 0xFA00 ## $t7 = FA000000 -/* 00894 80885A34 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 00898 80885A38 AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 -/* 0089C 80885A3C 35EF8080 */ ori $t7, $t7, 0x8080 ## $t7 = FA008080 -/* 008A0 80885A40 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 008A4 80885A44 91390153 */ lbu $t9, 0x0153($t1) ## 00000153 -/* 008A8 80885A48 3C01FFDC */ lui $at, 0xFFDC ## $at = FFDC0000 -/* 008AC 80885A4C 3C0CFB00 */ lui $t4, 0xFB00 ## $t4 = FB000000 -/* 008B0 80885A50 03215025 */ or $t2, $t9, $at ## $t2 = FFDC0000 -/* 008B4 80885A54 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 -/* 008B8 80885A58 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 008BC 80885A5C 3C0DFF00 */ lui $t5, 0xFF00 ## $t5 = FF000000 -/* 008C0 80885A60 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 008C4 80885A64 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 008C8 80885A68 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 -/* 008CC 80885A6C AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 008D0 80885A70 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 008D4 80885A74 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 008D8 80885A78 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 -/* 008DC 80885A7C 240D0020 */ addiu $t5, $zero, 0x0020 ## $t5 = 00000020 -/* 008E0 80885A80 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 008E4 80885A84 AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 -/* 008E8 80885A88 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 008EC 80885A8C 85230156 */ lh $v1, 0x0156($t1) ## 00000156 -/* 008F0 80885A90 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 008F4 80885A94 240E0040 */ addiu $t6, $zero, 0x0040 ## $t6 = 00000040 -/* 008F8 80885A98 00030823 */ subu $at, $zero, $v1 -/* 008FC 80885A9C 00015900 */ sll $t3, $at, 4 -/* 00900 80885AA0 01615823 */ subu $t3, $t3, $at -/* 00904 80885AA4 316C00FF */ andi $t4, $t3, 0x00FF ## $t4 = 00000008 -/* 00908 80885AA8 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 0090C 80885AAC 24190040 */ addiu $t9, $zero, 0x0040 ## $t9 = 00000040 -/* 00910 80885AB0 24180020 */ addiu $t8, $zero, 0x0020 ## $t8 = 00000020 -/* 00914 80885AB4 AFB80010 */ sw $t8, 0x0010($sp) -/* 00918 80885AB8 AFB90014 */ sw $t9, 0x0014($sp) -/* 0091C 80885ABC AFAA0018 */ sw $t2, 0x0018($sp) -/* 00920 80885AC0 AFAC0020 */ sw $t4, 0x0020($sp) -/* 00924 80885AC4 AFAE0028 */ sw $t6, 0x0028($sp) -/* 00928 80885AC8 AFAD0024 */ sw $t5, 0x0024($sp) -/* 0092C 80885ACC AFA0001C */ sw $zero, 0x001C($sp) -/* 00930 80885AD0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00934 80885AD4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00938 80885AD8 AFA2004C */ sw $v0, 0x004C($sp) -/* 0093C 80885ADC 0C0253D0 */ jal Gfx_TwoTexScroll -/* 00940 80885AE0 3066007F */ andi $a2, $v1, 0x007F ## $a2 = 00000000 -/* 00944 80885AE4 8FA8004C */ lw $t0, 0x004C($sp) -/* 00948 80885AE8 3C18DA38 */ lui $t8, 0xDA38 ## $t8 = DA380000 -/* 0094C 80885AEC 37180003 */ ori $t8, $t8, 0x0003 ## $t8 = DA380003 -/* 00950 80885AF0 AD020004 */ sw $v0, 0x0004($t0) ## 00000004 -/* 00954 80885AF4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00958 80885AF8 3C058088 */ lui $a1, %hi(D_80885CE4) ## $a1 = 80880000 -/* 0095C 80885AFC 24A55CE4 */ addiu $a1, $a1, %lo(D_80885CE4) ## $a1 = 80885CE4 -/* 00960 80885B00 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 00964 80885B04 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 -/* 00968 80885B08 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 0096C 80885B0C 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 00970 80885B10 240602BA */ addiu $a2, $zero, 0x02BA ## $a2 = 000002BA -/* 00974 80885B14 0C0346A2 */ jal Matrix_NewMtx -/* 00978 80885B18 AFA20048 */ sw $v0, 0x0048($sp) -/* 0097C 80885B1C 8FA30048 */ lw $v1, 0x0048($sp) -/* 00980 80885B20 3C0B0402 */ lui $t3, 0x0402 ## $t3 = 04020000 -/* 00984 80885B24 256B84B0 */ addiu $t3, $t3, 0x84B0 ## $t3 = 040184B0 -/* 00988 80885B28 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 0098C 80885B2C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00990 80885B30 3C0ADE00 */ lui $t2, 0xDE00 ## $t2 = DE000000 -/* 00994 80885B34 3C068088 */ lui $a2, %hi(D_80885CFC) ## $a2 = 80880000 -/* 00998 80885B38 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 0099C 80885B3C AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0 -/* 009A0 80885B40 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 009A4 80885B44 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 009A8 80885B48 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 009AC 80885B4C 24C65CFC */ addiu $a2, $a2, %lo(D_80885CFC) ## $a2 = 80885CFC -/* 009B0 80885B50 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 -/* 009B4 80885B54 0C031AD5 */ jal Graph_CloseDisps -/* 009B8 80885B58 240702BE */ addiu $a3, $zero, 0x02BE ## $a3 = 000002BE -/* 009BC 80885B5C 8FBF003C */ lw $ra, 0x003C($sp) -/* 009C0 80885B60 8FB00034 */ lw $s0, 0x0034($sp) -/* 009C4 80885B64 8FB10038 */ lw $s1, 0x0038($sp) -/* 009C8 80885B68 03E00008 */ jr $ra -/* 009CC 80885B6C 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Init.s deleted file mode 100644 index 8fb3fd963f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Init.s +++ /dev/null @@ -1,206 +0,0 @@ -.rdata -glabel D_80885BF0 - .asciz "Curtain (arg_data 0x%04x)\n" - .balign 4 - -glabel D_80885C0C - .asciz "Error : object のタイプが設定されていない(%s %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_80885C50 - .asciz "../z_bg_hidan_curtain.c" - .balign 4 - -glabel D_80885C68 - .asciz "Warning : object のセーブビットが設定されていない(%s %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_80885CB4 - .asciz "../z_bg_hidan_curtain.c" - .balign 4 - -.text -glabel BgHidanCurtain_Init -/* 00000 808851A0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00004 808851A4 AFB00018 */ sw $s0, 0x0018($sp) -/* 00008 808851A8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0000C 808851AC AFBF001C */ sw $ra, 0x001C($sp) -/* 00010 808851B0 AFA50034 */ sw $a1, 0x0034($sp) -/* 00014 808851B4 3C048088 */ lui $a0, %hi(D_80885BF0) ## $a0 = 80880000 -/* 00018 808851B8 24845BF0 */ addiu $a0, $a0, %lo(D_80885BF0) ## $a0 = 80885BF0 -/* 0001C 808851BC 0C00084C */ jal osSyncPrintf - -/* 00020 808851C0 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 00024 808851C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00028 808851C8 0C00B56E */ jal Actor_SetHeight - -/* 0002C 808851CC 3C0541A0 */ lui $a1, 0x41A0 ## $a1 = 41A00000 -/* 00030 808851D0 860E001C */ lh $t6, 0x001C($s0) ## 0000001C -/* 00034 808851D4 000E7B03 */ sra $t7, $t6, 12 -/* 00038 808851D8 31F8000F */ andi $t8, $t7, 0x000F ## $t8 = 00000000 -/* 0003C 808851DC 330200FF */ andi $v0, $t8, 0x00FF ## $v0 = 00000000 -/* 00040 808851E0 28410007 */ slti $at, $v0, 0x0007 -/* 00044 808851E4 1420000C */ bne $at, $zero, .L80885218 -/* 00048 808851E8 A2180150 */ sb $t8, 0x0150($s0) ## 00000150 -/* 0004C 808851EC 3C048088 */ lui $a0, %hi(D_80885C0C) ## $a0 = 80880000 -/* 00050 808851F0 3C058088 */ lui $a1, %hi(D_80885C50) ## $a1 = 80880000 -/* 00054 808851F4 24A55C50 */ addiu $a1, $a1, %lo(D_80885C50) ## $a1 = 80885C50 -/* 00058 808851F8 24845C0C */ addiu $a0, $a0, %lo(D_80885C0C) ## $a0 = 80885C0C -/* 0005C 808851FC 24060160 */ addiu $a2, $zero, 0x0160 ## $a2 = 00000160 -/* 00060 80885200 0C00084C */ jal osSyncPrintf - -/* 00064 80885204 8607001C */ lh $a3, 0x001C($s0) ## 0000001C -/* 00068 80885208 0C00B55C */ jal Actor_Kill - -/* 0006C 8088520C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00070 80885210 1000007A */ beq $zero, $zero, .L808853FC -/* 00074 80885214 8FBF001C */ lw $ra, 0x001C($sp) -.L80885218: -/* 00078 80885218 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0007C 8088521C 10410002 */ beq $v0, $at, .L80885228 -/* 00080 80885220 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00084 80885224 14410003 */ bne $v0, $at, .L80885234 -.L80885228: -/* 00088 80885228 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 0008C 8088522C 10000002 */ beq $zero, $zero, .L80885238 -/* 00090 80885230 A2190152 */ sb $t9, 0x0152($s0) ## 00000152 -.L80885234: -/* 00094 80885234 A2000152 */ sb $zero, 0x0152($s0) ## 00000152 -.L80885238: -/* 00098 80885238 92080152 */ lbu $t0, 0x0152($s0) ## 00000152 -/* 0009C 8088523C 3C0A8088 */ lui $t2, %hi(D_80885BA4) ## $t2 = 80880000 -/* 000A0 80885240 254A5BA4 */ addiu $t2, $t2, %lo(D_80885BA4) ## $t2 = 80885BA4 -/* 000A4 80885244 00084900 */ sll $t1, $t0, 4 -/* 000A8 80885248 012A5821 */ addu $t3, $t1, $t2 -/* 000AC 8088524C AFAB0024 */ sw $t3, 0x0024($sp) -/* 000B0 80885250 860F001C */ lh $t7, 0x001C($s0) ## 0000001C -/* 000B4 80885254 860C001C */ lh $t4, 0x001C($s0) ## 0000001C -/* 000B8 80885258 3C048088 */ lui $a0, %hi(D_80885C68) ## $a0 = 80880000 -/* 000BC 8088525C 31F8003F */ andi $t8, $t7, 0x003F ## $t8 = 00000000 -/* 000C0 80885260 A618001C */ sh $t8, 0x001C($s0) ## 0000001C -/* 000C4 80885264 8607001C */ lh $a3, 0x001C($s0) ## 0000001C -/* 000C8 80885268 000C6983 */ sra $t5, $t4, 6 -/* 000CC 8088526C 31AE003F */ andi $t6, $t5, 0x003F ## $t6 = 00000000 -/* 000D0 80885270 04E00003 */ bltz $a3, .L80885280 -/* 000D4 80885274 A20E0151 */ sb $t6, 0x0151($s0) ## 00000151 -/* 000D8 80885278 28E10040 */ slti $at, $a3, 0x0040 -/* 000DC 8088527C 14200005 */ bne $at, $zero, .L80885294 -.L80885280: -/* 000E0 80885280 3C058088 */ lui $a1, %hi(D_80885CB4) ## $a1 = 80880000 -/* 000E4 80885284 24A55CB4 */ addiu $a1, $a1, %lo(D_80885CB4) ## $a1 = 80885CB4 -/* 000E8 80885288 24845C68 */ addiu $a0, $a0, %lo(D_80885C68) ## $a0 = 80885C68 -/* 000EC 8088528C 0C00084C */ jal osSyncPrintf - -/* 000F0 80885290 24060175 */ addiu $a2, $zero, 0x0175 ## $a2 = 00000175 -.L80885294: -/* 000F4 80885294 8FB90024 */ lw $t9, 0x0024($sp) -/* 000F8 80885298 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000FC 8088529C 0C00B58B */ jal Actor_SetScale - -/* 00100 808852A0 8F250004 */ lw $a1, 0x0004($t9) ## 00000004 -/* 00104 808852A4 26050158 */ addiu $a1, $s0, 0x0158 ## $a1 = 00000158 -/* 00108 808852A8 AFA50020 */ sw $a1, 0x0020($sp) -/* 0010C 808852AC 0C0170D9 */ jal Collider_InitCylinder - -/* 00110 808852B0 8FA40034 */ lw $a0, 0x0034($sp) -/* 00114 808852B4 3C078088 */ lui $a3, %hi(D_80885B70) ## $a3 = 80880000 -/* 00118 808852B8 24E75B70 */ addiu $a3, $a3, %lo(D_80885B70) ## $a3 = 80885B70 -/* 0011C 808852BC 8FA40034 */ lw $a0, 0x0034($sp) -/* 00120 808852C0 8FA50020 */ lw $a1, 0x0020($sp) -/* 00124 808852C4 0C01712B */ jal Collider_SetCylinder - -/* 00128 808852C8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 0012C 808852CC C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 00130 808852D0 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 00134 808852D4 C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C -/* 00138 808852D8 4600218D */ trunc.w.s $f6, $f4 -/* 0013C 808852DC 8FA30024 */ lw $v1, 0x0024($sp) -/* 00140 808852E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00144 808852E4 4600428D */ trunc.w.s $f10, $f8 -/* 00148 808852E8 44093000 */ mfc1 $t1, $f6 -/* 0014C 808852EC 4600848D */ trunc.w.s $f18, $f16 -/* 00150 808852F0 440B5000 */ mfc1 $t3, $f10 -/* 00154 808852F4 A609019E */ sh $t1, 0x019E($s0) ## 0000019E -/* 00158 808852F8 440D9000 */ mfc1 $t5, $f18 -/* 0015C 808852FC A60B01A0 */ sh $t3, 0x01A0($s0) ## 000001A0 -/* 00160 80885300 A60D01A2 */ sh $t5, 0x01A2($s0) ## 000001A2 -/* 00164 80885304 846E0000 */ lh $t6, 0x0000($v1) ## 00000000 -/* 00168 80885308 A60E0198 */ sh $t6, 0x0198($s0) ## 00000198 -/* 0016C 8088530C 846F0002 */ lh $t7, 0x0002($v1) ## 00000002 -/* 00170 80885310 A60F019A */ sh $t7, 0x019A($s0) ## 0000019A -/* 00174 80885314 0C0189B7 */ jal Collider_CylinderUpdate - -/* 00178 80885318 8FA50020 */ lw $a1, 0x0020($sp) -/* 0017C 8088531C 3C068088 */ lui $a2, %hi(D_80885B9C) ## $a2 = 80880000 -/* 00180 80885320 24C65B9C */ addiu $a2, $a2, %lo(D_80885B9C) ## $a2 = 80885B9C -/* 00184 80885324 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 00188 80885328 0C0187B5 */ jal func_80061ED4 -/* 0018C 8088532C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00190 80885330 92020150 */ lbu $v0, 0x0150($s0) ## 00000150 -/* 00194 80885334 3C198088 */ lui $t9, %hi(func_80885434) ## $t9 = 80880000 -/* 00198 80885338 27395434 */ addiu $t9, $t9, %lo(func_80885434) ## $t9 = 80885434 -/* 0019C 8088533C 14400006 */ bne $v0, $zero, .L80885358 -/* 001A0 80885340 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 001A4 80885344 3C188088 */ lui $t8, %hi(func_80885514) ## $t8 = 80880000 -/* 001A8 80885348 27185514 */ addiu $t8, $t8, %lo(func_80885514) ## $t8 = 80885514 -/* 001AC 8088534C AE18014C */ sw $t8, 0x014C($s0) ## 0000014C -/* 001B0 80885350 1000000C */ beq $zero, $zero, .L80885384 -/* 001B4 80885354 92020150 */ lbu $v0, 0x0150($s0) ## 00000150 -.L80885358: -/* 001B8 80885358 10410004 */ beq $v0, $at, .L8088536C -/* 001BC 8088535C AE19014C */ sw $t9, 0x014C($s0) ## 0000014C -/* 001C0 80885360 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 001C4 80885364 54410008 */ bnel $v0, $at, .L80885388 -/* 001C8 80885368 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -.L8088536C: -/* 001CC 8088536C 8FA80024 */ lw $t0, 0x0024($sp) -/* 001D0 80885370 C604000C */ lwc1 $f4, 0x000C($s0) ## 0000000C -/* 001D4 80885374 92020150 */ lbu $v0, 0x0150($s0) ## 00000150 -/* 001D8 80885378 C5060008 */ lwc1 $f6, 0x0008($t0) ## 00000008 -/* 001DC 8088537C 46062201 */ sub.s $f8, $f4, $f6 -/* 001E0 80885380 E6080028 */ swc1 $f8, 0x0028($s0) ## 00000028 -.L80885384: -/* 001E4 80885384 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -.L80885388: -/* 001E8 80885388 14410006 */ bne $v0, $at, .L808853A4 -/* 001EC 8088538C 8FA40034 */ lw $a0, 0x0034($sp) -/* 001F0 80885390 0C00B32C */ jal Flags_GetTreasure - -/* 001F4 80885394 92050151 */ lbu $a1, 0x0151($s0) ## 00000151 -/* 001F8 80885398 1440000B */ bne $v0, $zero, .L808853C8 -/* 001FC 8088539C 00000000 */ nop -/* 00200 808853A0 92020150 */ lbu $v0, 0x0150($s0) ## 00000150 -.L808853A4: -/* 00204 808853A4 10400003 */ beq $v0, $zero, .L808853B4 -/* 00208 808853A8 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 0020C 808853AC 14410008 */ bne $v0, $at, .L808853D0 -/* 00210 808853B0 00000000 */ nop -.L808853B4: -/* 00214 808853B4 8FA40034 */ lw $a0, 0x0034($sp) -/* 00218 808853B8 0C00B337 */ jal Flags_GetClear - -/* 0021C 808853BC 82050003 */ lb $a1, 0x0003($s0) ## 00000003 -/* 00220 808853C0 10400003 */ beq $v0, $zero, .L808853D0 -/* 00224 808853C4 00000000 */ nop -.L808853C8: -/* 00228 808853C8 0C00B55C */ jal Actor_Kill - -/* 0022C 808853CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L808853D0: -/* 00230 808853D0 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00234 808853D4 00000000 */ nop -/* 00238 808853D8 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -/* 0023C 808853DC 44815000 */ mtc1 $at, $f10 ## $f10 = 15.00 -/* 00240 808853E0 00000000 */ nop -/* 00244 808853E4 460A0402 */ mul.s $f16, $f0, $f10 -/* 00248 808853E8 4600848D */ trunc.w.s $f18, $f16 -/* 0024C 808853EC 440A9000 */ mfc1 $t2, $f18 -/* 00250 808853F0 00000000 */ nop -/* 00254 808853F4 A60A0156 */ sh $t2, 0x0156($s0) ## 00000156 -/* 00258 808853F8 8FBF001C */ lw $ra, 0x001C($sp) -.L808853FC: -/* 0025C 808853FC 8FB00018 */ lw $s0, 0x0018($sp) -/* 00260 80885400 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00264 80885404 03E00008 */ jr $ra -/* 00268 80885408 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Update.s deleted file mode 100644 index 73c1161ea2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Update.s +++ /dev/null @@ -1,183 +0,0 @@ -glabel BgHidanCurtain_Update -/* 005B8 80885758 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 005BC 8088575C AFBF0024 */ sw $ra, 0x0024($sp) -/* 005C0 80885760 AFB10020 */ sw $s1, 0x0020($sp) -/* 005C4 80885764 AFB0001C */ sw $s0, 0x001C($sp) -/* 005C8 80885768 8CB90790 */ lw $t9, 0x0790($a1) ## 00000790 -/* 005CC 8088576C 908E0152 */ lbu $t6, 0x0152($a0) ## 00000152 -/* 005D0 80885770 3C188088 */ lui $t8, %hi(D_80885BA4) ## $t8 = 80880000 -/* 005D4 80885774 87220142 */ lh $v0, 0x0142($t9) ## 00000142 -/* 005D8 80885778 27185BA4 */ addiu $t8, $t8, %lo(D_80885BA4) ## $t8 = 80885BA4 -/* 005DC 8088577C 24010028 */ addiu $at, $zero, 0x0028 ## $at = 00000028 -/* 005E0 80885780 000E7900 */ sll $t7, $t6, 4 -/* 005E4 80885784 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 005E8 80885788 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 005EC 8088578C 10410004 */ beq $v0, $at, .L808857A0 -/* 005F0 80885790 01F81821 */ addu $v1, $t7, $t8 -/* 005F4 80885794 24010038 */ addiu $at, $zero, 0x0038 ## $at = 00000038 -/* 005F8 80885798 54410006 */ bnel $v0, $at, .L808857B4 -/* 005FC 8088579C 92020168 */ lbu $v0, 0x0168($s0) ## 00000168 -.L808857A0: -/* 00600 808857A0 92080168 */ lbu $t0, 0x0168($s0) ## 00000168 -/* 00604 808857A4 3109FFFD */ andi $t1, $t0, 0xFFFD ## $t1 = 00000000 -/* 00608 808857A8 1000008B */ beq $zero, $zero, .L808859D8 -/* 0060C 808857AC A2090168 */ sb $t1, 0x0168($s0) ## 00000168 -/* 00610 808857B0 92020168 */ lbu $v0, 0x0168($s0) ## 00000168 -.L808857B4: -/* 00614 808857B4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00618 808857B8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0061C 808857BC 304A0002 */ andi $t2, $v0, 0x0002 ## $t2 = 00000000 -/* 00620 808857C0 1140000A */ beq $t2, $zero, .L808857EC -/* 00624 808857C4 304BFFFD */ andi $t3, $v0, 0xFFFD ## $t3 = 00000000 -/* 00628 808857C8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0062C 808857CC 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 00630 808857D0 A20B0168 */ sb $t3, 0x0168($s0) ## 00000168 -/* 00634 808857D4 8607008A */ lh $a3, 0x008A($s0) ## 0000008A -/* 00638 808857D8 AFA30034 */ sw $v1, 0x0034($sp) -/* 0063C 808857DC 3C0640A0 */ lui $a2, 0x40A0 ## $a2 = 40A00000 -/* 00640 808857E0 0C00BDC7 */ jal func_8002F71C -/* 00644 808857E4 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00648 808857E8 8FA30034 */ lw $v1, 0x0034($sp) -.L808857EC: -/* 0064C 808857EC 92020150 */ lbu $v0, 0x0150($s0) ## 00000150 -/* 00650 808857F0 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00654 808857F4 10410003 */ beq $v0, $at, .L80885804 -/* 00658 808857F8 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 0065C 808857FC 54410009 */ bnel $v0, $at, .L80885824 -/* 00660 80885800 AFA30034 */ sw $v1, 0x0034($sp) -.L80885804: -/* 00664 80885804 C600000C */ lwc1 $f0, 0x000C($s0) ## 0000000C -/* 00668 80885808 C4680008 */ lwc1 $f8, 0x0008($v1) ## 00000008 -/* 0066C 8088580C C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 00670 80885810 46000180 */ add.s $f6, $f0, $f0 -/* 00674 80885814 46083281 */ sub.s $f10, $f6, $f8 -/* 00678 80885818 46105481 */ sub.s $f18, $f10, $f16 -/* 0067C 8088581C E6120028 */ swc1 $f18, 0x0028($s0) ## 00000028 -/* 00680 80885820 AFA30034 */ sw $v1, 0x0034($sp) -.L80885824: -/* 00684 80885824 8E19014C */ lw $t9, 0x014C($s0) ## 0000014C -/* 00688 80885828 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0068C 8088582C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00690 80885830 0320F809 */ jalr $ra, $t9 -/* 00694 80885834 00000000 */ nop -/* 00698 80885838 92020150 */ lbu $v0, 0x0150($s0) ## 00000150 -/* 0069C 8088583C 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 006A0 80885840 8FA30034 */ lw $v1, 0x0034($sp) -/* 006A4 80885844 10410003 */ beq $v0, $at, .L80885854 -/* 006A8 80885848 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 006AC 8088584C 54410009 */ bnel $v0, $at, .L80885874 -/* 006B0 80885850 C612000C */ lwc1 $f18, 0x000C($s0) ## 0000000C -.L80885854: -/* 006B4 80885854 C600000C */ lwc1 $f0, 0x000C($s0) ## 0000000C -/* 006B8 80885858 C4660008 */ lwc1 $f6, 0x0008($v1) ## 00000008 -/* 006BC 8088585C C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 -/* 006C0 80885860 46000100 */ add.s $f4, $f0, $f0 -/* 006C4 80885864 46062201 */ sub.s $f8, $f4, $f6 -/* 006C8 80885868 460A4401 */ sub.s $f16, $f8, $f10 -/* 006CC 8088586C E6100028 */ swc1 $f16, 0x0028($s0) ## 00000028 -/* 006D0 80885870 C612000C */ lwc1 $f18, 0x000C($s0) ## 0000000C -.L80885874: -/* 006D4 80885874 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 006D8 80885878 C4600008 */ lwc1 $f0, 0x0008($v1) ## 00000008 -/* 006DC 8088587C 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 006E0 80885880 46049181 */ sub.s $f6, $f18, $f4 -/* 006E4 80885884 44815000 */ mtc1 $at, $f10 ## $f10 = 255.00 -/* 006E8 80885888 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 006EC 8088588C 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 006F0 80885890 46060201 */ sub.s $f8, $f0, $f6 -/* 006F4 80885894 46004083 */ div.s $f2, $f8, $f0 -/* 006F8 80885898 46025402 */ mul.s $f16, $f10, $f2 -/* 006FC 8088589C 444CF800 */ cfc1 $t4, $31 -/* 00700 808858A0 44CDF800 */ ctc1 $t5, $31 -/* 00704 808858A4 00000000 */ nop -/* 00708 808858A8 460084A4 */ cvt.w.s $f18, $f16 -/* 0070C 808858AC 444DF800 */ cfc1 $t5, $31 -/* 00710 808858B0 00000000 */ nop -/* 00714 808858B4 31AD0078 */ andi $t5, $t5, 0x0078 ## $t5 = 00000000 -/* 00718 808858B8 51A00013 */ beql $t5, $zero, .L80885908 -/* 0071C 808858BC 440D9000 */ mfc1 $t5, $f18 -/* 00720 808858C0 44819000 */ mtc1 $at, $f18 ## $f18 = 2147483648.00 -/* 00724 808858C4 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 00728 808858C8 46128481 */ sub.s $f18, $f16, $f18 -/* 0072C 808858CC 44CDF800 */ ctc1 $t5, $31 -/* 00730 808858D0 00000000 */ nop -/* 00734 808858D4 460094A4 */ cvt.w.s $f18, $f18 -/* 00738 808858D8 444DF800 */ cfc1 $t5, $31 -/* 0073C 808858DC 00000000 */ nop -/* 00740 808858E0 31AD0078 */ andi $t5, $t5, 0x0078 ## $t5 = 00000000 -/* 00744 808858E4 15A00005 */ bne $t5, $zero, .L808858FC -/* 00748 808858E8 00000000 */ nop -/* 0074C 808858EC 440D9000 */ mfc1 $t5, $f18 -/* 00750 808858F0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00754 808858F4 10000007 */ beq $zero, $zero, .L80885914 -/* 00758 808858F8 01A16825 */ or $t5, $t5, $at ## $t5 = 80000000 -.L808858FC: -/* 0075C 808858FC 10000005 */ beq $zero, $zero, .L80885914 -/* 00760 80885900 240DFFFF */ addiu $t5, $zero, 0xFFFF ## $t5 = FFFFFFFF -/* 00764 80885904 440D9000 */ mfc1 $t5, $f18 -.L80885908: -/* 00768 80885908 00000000 */ nop -/* 0076C 8088590C 05A0FFFB */ bltz $t5, .L808858FC -/* 00770 80885910 00000000 */ nop -.L80885914: -/* 00774 80885914 31AE00FF */ andi $t6, $t5, 0x00FF ## $t6 = 000000FF -/* 00778 80885918 44CCF800 */ ctc1 $t4, $31 -/* 0077C 8088591C 29C10033 */ slti $at, $t6, 0x0033 -/* 00780 80885920 1420001F */ bne $at, $zero, .L808859A0 -/* 00784 80885924 A20D0153 */ sb $t5, 0x0153($s0) ## 00000153 -/* 00788 80885928 846F0002 */ lh $t7, 0x0002($v1) ## 00000002 -/* 0078C 8088592C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00790 80885930 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 00794 80885934 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 00798 80885938 02212821 */ addu $a1, $s1, $at -/* 0079C 8088593C 26060158 */ addiu $a2, $s0, 0x0158 ## $a2 = 00000158 -/* 007A0 80885940 468021A0 */ cvt.s.w $f6, $f4 -/* 007A4 80885944 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 007A8 80885948 46023202 */ mul.s $f8, $f6, $f2 -/* 007AC 8088594C 4600428D */ trunc.w.s $f10, $f8 -/* 007B0 80885950 44085000 */ mfc1 $t0, $f10 -/* 007B4 80885954 00000000 */ nop -/* 007B8 80885958 A608019A */ sh $t0, 0x019A($s0) ## 0000019A -/* 007BC 8088595C AFA60028 */ sw $a2, 0x0028($sp) -/* 007C0 80885960 0C0175E7 */ jal CollisionCheck_SetAT - ## CollisionCheck_setAT -/* 007C4 80885964 AFA5002C */ sw $a1, 0x002C($sp) -/* 007C8 80885968 8FA5002C */ lw $a1, 0x002C($sp) -/* 007CC 8088596C 8FA60028 */ lw $a2, 0x0028($sp) -/* 007D0 80885970 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOT -/* 007D4 80885974 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 007D8 80885978 3C098016 */ lui $t1, %hi(gSaveContext+0x1360) -/* 007DC 8088597C 8D29F9C0 */ lw $t1, %lo(gSaveContext+0x1360)($t1) -/* 007E0 80885980 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 007E4 80885984 29210004 */ slti $at, $t1, 0x0004 -/* 007E8 80885988 50200011 */ beql $at, $zero, .L808859D0 -/* 007EC 8088598C 860B0156 */ lh $t3, 0x0156($s0) ## 00000156 -/* 007F0 80885990 0C00BE5D */ jal func_8002F974 -/* 007F4 80885994 240520A3 */ addiu $a1, $zero, 0x20A3 ## $a1 = 000020A3 -/* 007F8 80885998 1000000D */ beq $zero, $zero, .L808859D0 -/* 007FC 8088599C 860B0156 */ lh $t3, 0x0156($s0) ## 00000156 -.L808859A0: -/* 00800 808859A0 920A0150 */ lbu $t2, 0x0150($s0) ## 00000150 -/* 00804 808859A4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00808 808859A8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0080C 808859AC 55410008 */ bnel $t2, $at, .L808859D0 -/* 00810 808859B0 860B0156 */ lh $t3, 0x0156($s0) ## 00000156 -/* 00814 808859B4 0C00B32C */ jal Flags_GetTreasure - -/* 00818 808859B8 92050151 */ lbu $a1, 0x0151($s0) ## 00000151 -/* 0081C 808859BC 50400004 */ beql $v0, $zero, .L808859D0 -/* 00820 808859C0 860B0156 */ lh $t3, 0x0156($s0) ## 00000156 -/* 00824 808859C4 0C00B55C */ jal Actor_Kill - -/* 00828 808859C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0082C 808859CC 860B0156 */ lh $t3, 0x0156($s0) ## 00000156 -.L808859D0: -/* 00830 808859D0 25790001 */ addiu $t9, $t3, 0x0001 ## $t9 = 00000001 -/* 00834 808859D4 A6190156 */ sh $t9, 0x0156($s0) ## 00000156 -.L808859D8: -/* 00838 808859D8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0083C 808859DC 8FB0001C */ lw $s0, 0x001C($sp) -/* 00840 808859E0 8FB10020 */ lw $s1, 0x0020($sp) -/* 00844 808859E4 03E00008 */ jr $ra -/* 00848 808859E8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_80885434.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_80885434.s deleted file mode 100644 index 1667413af6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_80885434.s +++ /dev/null @@ -1,50 +0,0 @@ -glabel func_80885434 -/* 00294 80885434 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00298 80885438 AFB00020 */ sw $s0, 0x0020($sp) -/* 0029C 8088543C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 002A0 80885440 AFBF0024 */ sw $ra, 0x0024($sp) -/* 002A4 80885444 AFA5002C */ sw $a1, 0x002C($sp) -/* 002A8 80885448 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 002AC 8088544C 0C00B2D0 */ jal Flags_GetSwitch - -/* 002B0 80885450 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 002B4 80885454 1040001F */ beq $v0, $zero, .L808854D4 -/* 002B8 80885458 8FA4002C */ lw $a0, 0x002C($sp) -/* 002BC 8088545C 92020150 */ lbu $v0, 0x0150($s0) ## 00000150 -/* 002C0 80885460 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 002C4 80885464 3C0E8088 */ lui $t6, %hi(func_808854E8) ## $t6 = 80880000 -/* 002C8 80885468 1441000A */ bne $v0, $at, .L80885494 -/* 002CC 8088546C 25CE54E8 */ addiu $t6, $t6, %lo(func_808854E8) ## $t6 = 808854E8 -/* 002D0 80885470 AE0E014C */ sw $t6, 0x014C($s0) ## 0000014C -/* 002D4 80885474 AFA00010 */ sw $zero, 0x0010($sp) -/* 002D8 80885478 24050D16 */ addiu $a1, $zero, 0x0D16 ## $a1 = 00000D16 -/* 002DC 8088547C 2406FF9D */ addiu $a2, $zero, 0xFF9D ## $a2 = FFFFFF9D -/* 002E0 80885480 0C02003E */ jal func_800800F8 -/* 002E4 80885484 02003825 */ or $a3, $s0, $zero ## $a3 = 00000000 -/* 002E8 80885488 240F0032 */ addiu $t7, $zero, 0x0032 ## $t7 = 00000032 -/* 002EC 8088548C 10000011 */ beq $zero, $zero, .L808854D4 -/* 002F0 80885490 A60F0154 */ sh $t7, 0x0154($s0) ## 00000154 -.L80885494: -/* 002F4 80885494 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 002F8 80885498 1441000C */ bne $v0, $at, .L808854CC -/* 002FC 8088549C 3C088088 */ lui $t0, %hi(func_80885604) ## $t0 = 80880000 -/* 00300 808854A0 3C188088 */ lui $t8, %hi(func_808854E8) ## $t8 = 80880000 -/* 00304 808854A4 271854E8 */ addiu $t8, $t8, %lo(func_808854E8) ## $t8 = 808854E8 -/* 00308 808854A8 AE18014C */ sw $t8, 0x014C($s0) ## 0000014C -/* 0030C 808854AC AFA00010 */ sw $zero, 0x0010($sp) -/* 00310 808854B0 24050D20 */ addiu $a1, $zero, 0x0D20 ## $a1 = 00000D20 -/* 00314 808854B4 2406003C */ addiu $a2, $zero, 0x003C ## $a2 = 0000003C -/* 00318 808854B8 0C02003E */ jal func_800800F8 -/* 0031C 808854BC 02003825 */ or $a3, $s0, $zero ## $a3 = 00000000 -/* 00320 808854C0 2419001E */ addiu $t9, $zero, 0x001E ## $t9 = 0000001E -/* 00324 808854C4 10000003 */ beq $zero, $zero, .L808854D4 -/* 00328 808854C8 A6190154 */ sh $t9, 0x0154($s0) ## 00000154 -.L808854CC: -/* 0032C 808854CC 25085604 */ addiu $t0, $t0, %lo(func_80885604) ## $t0 = 00005604 -/* 00330 808854D0 AE08014C */ sw $t0, 0x014C($s0) ## 0000014C -.L808854D4: -/* 00334 808854D4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00338 808854D8 8FB00020 */ lw $s0, 0x0020($sp) -/* 0033C 808854DC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00340 808854E0 03E00008 */ jr $ra -/* 00344 808854E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_808854E8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_808854E8.s deleted file mode 100644 index c1505b6202..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_808854E8.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_808854E8 -/* 00348 808854E8 AFA50004 */ sw $a1, 0x0004($sp) -/* 0034C 808854EC 84830154 */ lh $v1, 0x0154($a0) ## 00000154 -/* 00350 808854F0 3C0F8088 */ lui $t7, %hi(func_80885604) ## $t7 = 80880000 -/* 00354 808854F4 25EF5604 */ addiu $t7, $t7, %lo(func_80885604) ## $t7 = 80885604 -/* 00358 808854F8 2C620001 */ sltiu $v0, $v1, 0x0001 -/* 0035C 808854FC 246EFFFF */ addiu $t6, $v1, 0xFFFF ## $t6 = FFFFFFFF -/* 00360 80885500 10400002 */ beq $v0, $zero, .L8088550C -/* 00364 80885504 A48E0154 */ sh $t6, 0x0154($a0) ## 00000154 -/* 00368 80885508 AC8F014C */ sw $t7, 0x014C($a0) ## 0000014C -.L8088550C: -/* 0036C 8088550C 03E00008 */ jr $ra -/* 00370 80885510 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_80885514.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_80885514.s deleted file mode 100644 index c6b57b6f76..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_80885514.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80885514 -/* 00374 80885514 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00378 80885518 AFA40018 */ sw $a0, 0x0018($sp) -/* 0037C 8088551C 8FAE0018 */ lw $t6, 0x0018($sp) -/* 00380 80885520 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00384 80885524 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00388 80885528 0C00B337 */ jal Flags_GetClear - -/* 0038C 8088552C 81C50003 */ lb $a1, 0x0003($t6) ## 00000003 -/* 00390 80885530 10400004 */ beq $v0, $zero, .L80885544 -/* 00394 80885534 8FB80018 */ lw $t8, 0x0018($sp) -/* 00398 80885538 3C0F8088 */ lui $t7, %hi(func_80885604) ## $t7 = 80880000 -/* 0039C 8088553C 25EF5604 */ addiu $t7, $t7, %lo(func_80885604) ## $t7 = 80885604 -/* 003A0 80885540 AF0F014C */ sw $t7, 0x014C($t8) ## 0000014C -.L80885544: -/* 003A4 80885544 8FBF0014 */ lw $ra, 0x0014($sp) -/* 003A8 80885548 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 003AC 8088554C 03E00008 */ jr $ra -/* 003B0 80885550 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_80885554.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_80885554.s deleted file mode 100644 index 52b8380577..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_80885554.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80885554 -/* 003B4 80885554 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 003B8 80885558 AFA40018 */ sw $a0, 0x0018($sp) -/* 003BC 8088555C 8FAE0018 */ lw $t6, 0x0018($sp) -/* 003C0 80885560 AFBF0014 */ sw $ra, 0x0014($sp) -/* 003C4 80885564 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 003C8 80885568 0C00B2D0 */ jal Flags_GetSwitch - -/* 003CC 8088556C 85C5001C */ lh $a1, 0x001C($t6) ## 0000001C -/* 003D0 80885570 14400004 */ bne $v0, $zero, .L80885584 -/* 003D4 80885574 8FB80018 */ lw $t8, 0x0018($sp) -/* 003D8 80885578 3C0F8088 */ lui $t7, %hi(func_80885594) ## $t7 = 80880000 -/* 003DC 8088557C 25EF5594 */ addiu $t7, $t7, %lo(func_80885594) ## $t7 = 80885594 -/* 003E0 80885580 AF0F014C */ sw $t7, 0x014C($t8) ## 0000014C -.L80885584: -/* 003E4 80885584 8FBF0014 */ lw $ra, 0x0014($sp) -/* 003E8 80885588 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 003EC 8088558C 03E00008 */ jr $ra -/* 003F0 80885590 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_80885594.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_80885594.s deleted file mode 100644 index 6929f16e28..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_80885594.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_80885594 -/* 003F4 80885594 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 003F8 80885598 AFBF0014 */ sw $ra, 0x0014($sp) -/* 003FC 8088559C AFA5001C */ sw $a1, 0x001C($sp) -/* 00400 808855A0 908E0152 */ lbu $t6, 0x0152($a0) ## 00000152 -/* 00404 808855A4 3C018088 */ lui $at, %hi(D_80885BB0) ## $at = 80880000 -/* 00408 808855A8 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 0040C 808855AC 000E7900 */ sll $t7, $t6, 4 -/* 00410 808855B0 002F0821 */ addu $at, $at, $t7 -/* 00414 808855B4 C4205BB0 */ lwc1 $f0, %lo(D_80885BB0)($at) -/* 00418 808855B8 8CE5000C */ lw $a1, 0x000C($a3) ## 0000000C -/* 0041C 808855BC AFA70018 */ sw $a3, 0x0018($sp) -/* 00420 808855C0 44060000 */ mfc1 $a2, $f0 -/* 00424 808855C4 0C01DE80 */ jal Math_ApproxF - -/* 00428 808855C8 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 -/* 0042C 808855CC 10400009 */ beq $v0, $zero, .L808855F4 -/* 00430 808855D0 8FA70018 */ lw $a3, 0x0018($sp) -/* 00434 808855D4 84E5001C */ lh $a1, 0x001C($a3) ## 0000001C -/* 00438 808855D8 AFA70018 */ sw $a3, 0x0018($sp) -/* 0043C 808855DC 0C00B2ED */ jal Flags_UnsetSwitch - -/* 00440 808855E0 8FA4001C */ lw $a0, 0x001C($sp) -/* 00444 808855E4 8FA70018 */ lw $a3, 0x0018($sp) -/* 00448 808855E8 3C188088 */ lui $t8, %hi(func_80885434) ## $t8 = 80880000 -/* 0044C 808855EC 27185434 */ addiu $t8, $t8, %lo(func_80885434) ## $t8 = 80885434 -/* 00450 808855F0 ACF8014C */ sw $t8, 0x014C($a3) ## 0000014C -.L808855F4: -/* 00454 808855F4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00458 808855F8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0045C 808855FC 03E00008 */ jr $ra -/* 00460 80885600 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_80885604.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_80885604.s deleted file mode 100644 index e2f6731a38..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_80885604.s +++ /dev/null @@ -1,72 +0,0 @@ -glabel func_80885604 -/* 00464 80885604 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00468 80885608 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0046C 8088560C AFA5001C */ sw $a1, 0x001C($sp) -/* 00470 80885610 908E0152 */ lbu $t6, 0x0152($a0) ## 00000152 -/* 00474 80885614 3C188088 */ lui $t8, %hi(D_80885BA4) ## $t8 = 80880000 -/* 00478 80885618 27185BA4 */ addiu $t8, $t8, %lo(D_80885BA4) ## $t8 = 80885BA4 -/* 0047C 8088561C 000E7900 */ sll $t7, $t6, 4 -/* 00480 80885620 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00484 80885624 01F81021 */ addu $v0, $t7, $t8 -/* 00488 80885628 C4460008 */ lwc1 $f6, 0x0008($v0) ## 00000008 -/* 0048C 8088562C C4E4000C */ lwc1 $f4, 0x000C($a3) ## 0000000C -/* 00490 80885630 8C46000C */ lw $a2, 0x000C($v0) ## 0000000C -/* 00494 80885634 AFA70018 */ sw $a3, 0x0018($sp) -/* 00498 80885638 46062201 */ sub.s $f8, $f4, $f6 -/* 0049C 8088563C 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 -/* 004A0 80885640 44054000 */ mfc1 $a1, $f8 -/* 004A4 80885644 0C01DE80 */ jal Math_ApproxF - -/* 004A8 80885648 00000000 */ nop -/* 004AC 8088564C 10400025 */ beq $v0, $zero, .L808856E4 -/* 004B0 80885650 8FA70018 */ lw $a3, 0x0018($sp) -/* 004B4 80885654 90E20150 */ lbu $v0, 0x0150($a3) ## 00000150 -/* 004B8 80885658 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 004BC 8088565C 10400003 */ beq $v0, $zero, .L8088566C -/* 004C0 80885660 00000000 */ nop -/* 004C4 80885664 54410006 */ bnel $v0, $at, .L80885680 -/* 004C8 80885668 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -.L8088566C: -/* 004CC 8088566C 0C00B55C */ jal Actor_Kill - -/* 004D0 80885670 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 004D4 80885674 1000001C */ beq $zero, $zero, .L808856E8 -/* 004D8 80885678 8FBF0014 */ lw $ra, 0x0014($sp) -/* 004DC 8088567C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -.L80885680: -/* 004E0 80885680 14410005 */ bne $v0, $at, .L80885698 -/* 004E4 80885684 3C0C8088 */ lui $t4, %hi(func_808856F4) ## $t4 = 80880000 -/* 004E8 80885688 3C198088 */ lui $t9, %hi(func_80885554) ## $t9 = 80880000 -/* 004EC 8088568C 27395554 */ addiu $t9, $t9, %lo(func_80885554) ## $t9 = 80885554 -/* 004F0 80885690 10000014 */ beq $zero, $zero, .L808856E4 -/* 004F4 80885694 ACF9014C */ sw $t9, 0x014C($a3) ## 0000014C -.L80885698: -/* 004F8 80885698 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 004FC 8088569C 14410004 */ bne $v0, $at, .L808856B0 -/* 00500 808856A0 258C56F4 */ addiu $t4, $t4, %lo(func_808856F4) ## $t4 = 808856F4 -/* 00504 808856A4 24080190 */ addiu $t0, $zero, 0x0190 ## $t0 = 00000190 -/* 00508 808856A8 1000000D */ beq $zero, $zero, .L808856E0 -/* 0050C 808856AC A4E80154 */ sh $t0, 0x0154($a3) ## 00000154 -.L808856B0: -/* 00510 808856B0 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00514 808856B4 14410003 */ bne $v0, $at, .L808856C4 -/* 00518 808856B8 240900C8 */ addiu $t1, $zero, 0x00C8 ## $t1 = 000000C8 -/* 0051C 808856BC 10000008 */ beq $zero, $zero, .L808856E0 -/* 00520 808856C0 A4E90154 */ sh $t1, 0x0154($a3) ## 00000154 -.L808856C4: -/* 00524 808856C4 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00528 808856C8 14410004 */ bne $v0, $at, .L808856DC -/* 0052C 808856CC 240B012C */ addiu $t3, $zero, 0x012C ## $t3 = 0000012C -/* 00530 808856D0 240A00A0 */ addiu $t2, $zero, 0x00A0 ## $t2 = 000000A0 -/* 00534 808856D4 10000002 */ beq $zero, $zero, .L808856E0 -/* 00538 808856D8 A4EA0154 */ sh $t2, 0x0154($a3) ## 00000154 -.L808856DC: -/* 0053C 808856DC A4EB0154 */ sh $t3, 0x0154($a3) ## 00000154 -.L808856E0: -/* 00540 808856E0 ACEC014C */ sw $t4, 0x014C($a3) ## 0000014C -.L808856E4: -/* 00544 808856E4 8FBF0014 */ lw $ra, 0x0014($sp) -.L808856E8: -/* 00548 808856E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0054C 808856EC 03E00008 */ jr $ra -/* 00550 808856F0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_808856F4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_808856F4.s deleted file mode 100644 index 053200f93f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_808856F4.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_808856F4 -/* 00554 808856F4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00558 808856F8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0055C 808856FC AFA5001C */ sw $a1, 0x001C($sp) -/* 00560 80885700 84820154 */ lh $v0, 0x0154($a0) ## 00000154 -/* 00564 80885704 3C0F8088 */ lui $t7, %hi(func_80885594) ## $t7 = 80880000 -/* 00568 80885708 25EF5594 */ addiu $t7, $t7, %lo(func_80885594) ## $t7 = 80885594 -/* 0056C 8088570C 10400003 */ beq $v0, $zero, .L8088571C -/* 00570 80885710 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 00574 80885714 A48E0154 */ sh $t6, 0x0154($a0) ## 00000154 -/* 00578 80885718 84820154 */ lh $v0, 0x0154($a0) ## 00000154 -.L8088571C: -/* 0057C 8088571C 54400003 */ bnel $v0, $zero, .L8088572C -/* 00580 80885720 90820150 */ lbu $v0, 0x0150($a0) ## 00000150 -/* 00584 80885724 AC8F014C */ sw $t7, 0x014C($a0) ## 0000014C -/* 00588 80885728 90820150 */ lbu $v0, 0x0150($a0) ## 00000150 -.L8088572C: -/* 0058C 8088572C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00590 80885730 10410003 */ beq $v0, $at, .L80885740 -/* 00594 80885734 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00598 80885738 54410004 */ bnel $v0, $at, .L8088574C -/* 0059C 8088573C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80885740: -/* 005A0 80885740 0C00BE65 */ jal func_8002F994 -/* 005A4 80885744 84850154 */ lh $a1, 0x0154($a0) ## 00000154 -/* 005A8 80885748 8FBF0014 */ lw $ra, 0x0014($sp) -.L8088574C: -/* 005AC 8088574C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 005B0 80885750 03E00008 */ jr $ra -/* 005B4 80885754 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/BgMoriKaitenkabe_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/BgMoriKaitenkabe_Destroy.s deleted file mode 100644 index 13f007871e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/BgMoriKaitenkabe_Destroy.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel BgMoriKaitenkabe_Destroy -/* 0014C 808A4F0C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00150 808A4F10 AFA40018 */ sw $a0, 0x0018($sp) -/* 00154 808A4F14 8FAE0018 */ lw $t6, 0x0018($sp) -/* 00158 808A4F18 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0015C 808A4F1C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00160 808A4F20 24A50810 */ addiu $a1, $a1, 0x0810 ## $a1 = 00000810 -/* 00164 808A4F24 0C00FB56 */ jal DynaPolyInfo_Free - ## DynaPolyInfo_delReserve -/* 00168 808A4F28 8DC6014C */ lw $a2, 0x014C($t6) ## 0000014C -/* 0016C 808A4F2C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00170 808A4F30 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00174 808A4F34 03E00008 */ jr $ra -/* 00178 808A4F38 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/BgMoriKaitenkabe_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/BgMoriKaitenkabe_Init.s deleted file mode 100644 index f1b3cd44bb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/BgMoriKaitenkabe_Init.s +++ /dev/null @@ -1,80 +0,0 @@ -.rdata -glabel D_808A53E0 - .asciz "◯◯◯森の神殿オブジェクト【回転壁(arg_data : 0x%04x)】出現 \n" - .balign 4 - -glabel D_808A5420 - .asciz "【回転壁】 バンク危険！(%s %d)\n" - .balign 4 - -glabel D_808A5440 - .asciz "../z_bg_mori_kaitenkabe.c" - .balign 4 - -.text -glabel BgMoriKaitenkabe_Init -/* 00070 808A4E30 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00074 808A4E34 AFB00018 */ sw $s0, 0x0018($sp) -/* 00078 808A4E38 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0007C 808A4E3C AFBF001C */ sw $ra, 0x001C($sp) -/* 00080 808A4E40 AFA50034 */ sw $a1, 0x0034($sp) -/* 00084 808A4E44 AFA00024 */ sw $zero, 0x0024($sp) -/* 00088 808A4E48 3C04808A */ lui $a0, %hi(D_808A53E0) ## $a0 = 808A0000 -/* 0008C 808A4E4C 248453E0 */ addiu $a0, $a0, %lo(D_808A53E0) ## $a0 = 808A53E0 -/* 00090 808A4E50 0C00084C */ jal osSyncPrintf - -/* 00094 808A4E54 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 00098 808A4E58 3C05808A */ lui $a1, %hi(D_808A53D0) ## $a1 = 808A0000 -/* 0009C 808A4E5C 24A553D0 */ addiu $a1, $a1, %lo(D_808A53D0) ## $a1 = 808A53D0 -/* 000A0 808A4E60 0C01E037 */ jal Actor_ProcessInitChain - -/* 000A4 808A4E64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000A8 808A4E68 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000AC 808A4E6C 0C010D20 */ jal DynaPolyInfo_SetActorMove - -/* 000B0 808A4E70 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 000B4 808A4E74 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 000B8 808A4E78 248463B8 */ addiu $a0, $a0, 0x63B8 ## $a0 = 060063B8 -/* 000BC 808A4E7C 0C010620 */ jal DynaPolyInfo_Alloc - -/* 000C0 808A4E80 27A50024 */ addiu $a1, $sp, 0x0024 ## $a1 = FFFFFFF4 -/* 000C4 808A4E84 8FA40034 */ lw $a0, 0x0034($sp) -/* 000C8 808A4E88 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 000CC 808A4E8C 8FA70024 */ lw $a3, 0x0024($sp) -/* 000D0 808A4E90 0C00FA9D */ jal DynaPolyInfo_RegisterActor - ## DynaPolyInfo_setActor -/* 000D4 808A4E94 24850810 */ addiu $a1, $a0, 0x0810 ## $a1 = 00000810 -/* 000D8 808A4E98 AE02014C */ sw $v0, 0x014C($s0) ## 0000014C -/* 000DC 808A4E9C 8FA40034 */ lw $a0, 0x0034($sp) -/* 000E0 808A4EA0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 000E4 808A4EA4 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 000E8 808A4EA8 24050073 */ addiu $a1, $zero, 0x0073 ## $a1 = 00000073 -/* 000EC 808A4EAC 0C02604B */ jal Object_GetIndex - ## ObjectIndex -/* 000F0 808A4EB0 00812021 */ addu $a0, $a0, $at -/* 000F4 808A4EB4 A2020184 */ sb $v0, 0x0184($s0) ## 00000184 -/* 000F8 808A4EB8 820E0184 */ lb $t6, 0x0184($s0) ## 00000184 -/* 000FC 808A4EBC 3C0F808A */ lui $t7, %hi(func_808A4F3C) ## $t7 = 808A0000 -/* 00100 808A4EC0 25EF4F3C */ addiu $t7, $t7, %lo(func_808A4F3C) ## $t7 = 808A4F3C -/* 00104 808A4EC4 05C3000C */ bgezl $t6, .L808A4EF8 -/* 00108 808A4EC8 AE0F0164 */ sw $t7, 0x0164($s0) ## 00000164 -/* 0010C 808A4ECC 0C00B55C */ jal Actor_Kill - -/* 00110 808A4ED0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00114 808A4ED4 3C04808A */ lui $a0, %hi(D_808A5420) ## $a0 = 808A0000 -/* 00118 808A4ED8 3C05808A */ lui $a1, %hi(D_808A5440) ## $a1 = 808A0000 -/* 0011C 808A4EDC 24A55440 */ addiu $a1, $a1, %lo(D_808A5440) ## $a1 = 808A5440 -/* 00120 808A4EE0 24845420 */ addiu $a0, $a0, %lo(D_808A5420) ## $a0 = 808A5420 -/* 00124 808A4EE4 0C00084C */ jal osSyncPrintf - -/* 00128 808A4EE8 240600B0 */ addiu $a2, $zero, 0x00B0 ## $a2 = 000000B0 -/* 0012C 808A4EEC 10000003 */ beq $zero, $zero, .L808A4EFC -/* 00130 808A4EF0 8FBF001C */ lw $ra, 0x001C($sp) -/* 00134 808A4EF4 AE0F0164 */ sw $t7, 0x0164($s0) ## 00000164 -.L808A4EF8: -/* 00138 808A4EF8 8FBF001C */ lw $ra, 0x001C($sp) -.L808A4EFC: -/* 0013C 808A4EFC 8FB00018 */ lw $s0, 0x0018($sp) -/* 00140 808A4F00 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00144 808A4F04 03E00008 */ jr $ra -/* 00148 808A4F08 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/BgMoriKaitenkabe_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/BgMoriKaitenkabe_Update.s deleted file mode 100644 index 29de6bd183..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/BgMoriKaitenkabe_Update.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel BgMoriKaitenkabe_Update -/* 004C8 808A5288 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 004CC 808A528C AFBF0014 */ sw $ra, 0x0014($sp) -/* 004D0 808A5290 8C990164 */ lw $t9, 0x0164($a0) ## 00000164 -/* 004D4 808A5294 0320F809 */ jalr $ra, $t9 -/* 004D8 808A5298 00000000 */ nop -/* 004DC 808A529C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 004E0 808A52A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 004E4 808A52A4 03E00008 */ jr $ra -/* 004E8 808A52A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A4DC0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A4DC0.s deleted file mode 100644 index 4ddc048513..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A4DC0.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_808A4DC0 -/* 00000 808A4DC0 C4A40004 */ lwc1 $f4, 0x0004($a1) ## 00000004 -/* 00004 808A4DC4 C4C60008 */ lwc1 $f6, 0x0008($a2) ## 00000008 -/* 00008 808A4DC8 C4AA0008 */ lwc1 $f10, 0x0008($a1) ## 00000008 -/* 0000C 808A4DCC C4D00004 */ lwc1 $f16, 0x0004($a2) ## 00000004 -/* 00010 808A4DD0 46062202 */ mul.s $f8, $f4, $f6 -/* 00014 808A4DD4 00000000 */ nop -/* 00018 808A4DD8 46105482 */ mul.s $f18, $f10, $f16 -/* 0001C 808A4DDC 46124101 */ sub.s $f4, $f8, $f18 -/* 00020 808A4DE0 E4840000 */ swc1 $f4, 0x0000($a0) ## 00000000 -/* 00024 808A4DE4 C4CA0000 */ lwc1 $f10, 0x0000($a2) ## 00000000 -/* 00028 808A4DE8 C4A60008 */ lwc1 $f6, 0x0008($a1) ## 00000008 -/* 0002C 808A4DEC C4A80000 */ lwc1 $f8, 0x0000($a1) ## 00000000 -/* 00030 808A4DF0 C4D20008 */ lwc1 $f18, 0x0008($a2) ## 00000008 -/* 00034 808A4DF4 460A3402 */ mul.s $f16, $f6, $f10 -/* 00038 808A4DF8 00000000 */ nop -/* 0003C 808A4DFC 46124102 */ mul.s $f4, $f8, $f18 -/* 00040 808A4E00 46048181 */ sub.s $f6, $f16, $f4 -/* 00044 808A4E04 E4860004 */ swc1 $f6, 0x0004($a0) ## 00000004 -/* 00048 808A4E08 C4C80004 */ lwc1 $f8, 0x0004($a2) ## 00000004 -/* 0004C 808A4E0C C4AA0000 */ lwc1 $f10, 0x0000($a1) ## 00000000 -/* 00050 808A4E10 C4C40000 */ lwc1 $f4, 0x0000($a2) ## 00000000 -/* 00054 808A4E14 C4B00004 */ lwc1 $f16, 0x0004($a1) ## 00000004 -/* 00058 808A4E18 46085482 */ mul.s $f18, $f10, $f8 -/* 0005C 808A4E1C 00000000 */ nop -/* 00060 808A4E20 46048182 */ mul.s $f6, $f16, $f4 -/* 00064 808A4E24 46069281 */ sub.s $f10, $f18, $f6 -/* 00068 808A4E28 03E00008 */ jr $ra -/* 0006C 808A4E2C E48A0008 */ swc1 $f10, 0x0008($a0) ## 00000008 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A4F3C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A4F3C.s deleted file mode 100644 index 2351b18c4f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A4F3C.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_808A4F3C -/* 0017C 808A4F3C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00180 808A4F40 AFA40018 */ sw $a0, 0x0018($sp) -/* 00184 808A4F44 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00188 808A4F48 8FAE0018 */ lw $t6, 0x0018($sp) -/* 0018C 808A4F4C 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 00190 808A4F50 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00194 808A4F54 00A12021 */ addu $a0, $a1, $at -/* 00198 808A4F58 0C026062 */ jal Object_IsLoaded - -/* 0019C 808A4F5C 81C50184 */ lb $a1, 0x0184($t6) ## 00000184 -/* 001A0 808A4F60 50400008 */ beql $v0, $zero, .L808A4F84 -/* 001A4 808A4F64 8FBF0014 */ lw $ra, 0x0014($sp) -/* 001A8 808A4F68 0C2293E4 */ jal func_808A4F90 -/* 001AC 808A4F6C 8FA40018 */ lw $a0, 0x0018($sp) -/* 001B0 808A4F70 8FB80018 */ lw $t8, 0x0018($sp) -/* 001B4 808A4F74 3C0F808A */ lui $t7, %hi(func_808A52AC) ## $t7 = 808A0000 -/* 001B8 808A4F78 25EF52AC */ addiu $t7, $t7, %lo(func_808A52AC) ## $t7 = 808A52AC -/* 001BC 808A4F7C AF0F0134 */ sw $t7, 0x0134($t8) ## 00000134 -/* 001C0 808A4F80 8FBF0014 */ lw $ra, 0x0014($sp) -.L808A4F84: -/* 001C4 808A4F84 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 001C8 808A4F88 03E00008 */ jr $ra -/* 001CC 808A4F8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A4F90.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A4F90.s deleted file mode 100644 index f9e20668f4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A4F90.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_808A4F90 -/* 001D0 808A4F90 3C0E808A */ lui $t6, %hi(func_808A4FA4) ## $t6 = 808A0000 -/* 001D4 808A4F94 25CE4FA4 */ addiu $t6, $t6, %lo(func_808A4FA4) ## $t6 = 808A4FA4 -/* 001D8 808A4F98 AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 -/* 001DC 808A4F9C 03E00008 */ jr $ra -/* 001E0 808A4FA0 AC800168 */ sw $zero, 0x0168($a0) ## 00000168 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A4FA4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A4FA4.s deleted file mode 100644 index 3b5ad1af97..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A4FA4.s +++ /dev/null @@ -1,104 +0,0 @@ -.late_rodata -glabel D_808A54B0 - .float 0.001 - -glabel D_808A54B4 - .float 0.001 - -.text -glabel func_808A4FA4 -/* 001E4 808A4FA4 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 001E8 808A4FA8 AFBF001C */ sw $ra, 0x001C($sp) -/* 001EC 808A4FAC AFB10018 */ sw $s1, 0x0018($sp) -/* 001F0 808A4FB0 AFB00014 */ sw $s0, 0x0014($sp) -/* 001F4 808A4FB4 3C01808A */ lui $at, %hi(D_808A54B0) ## $at = 808A0000 -/* 001F8 808A4FB8 C42454B0 */ lwc1 $f4, %lo(D_808A54B0)($at) -/* 001FC 808A4FBC C4860150 */ lwc1 $f6, 0x0150($a0) ## 00000150 -/* 00200 808A4FC0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00204 808A4FC4 8CB11C44 */ lw $s1, 0x1C44($a1) ## 00001C44 -/* 00208 808A4FC8 4606203C */ c.lt.s $f4, $f6 -/* 0020C 808A4FCC 00000000 */ nop -/* 00210 808A4FD0 45020039 */ bc1fl .L808A50B8 -/* 00214 808A4FD4 AE000168 */ sw $zero, 0x0168($s0) ## 00000168 -/* 00218 808A4FD8 8C8E0168 */ lw $t6, 0x0168($a0) ## 00000168 -/* 0021C 808A4FDC 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 00220 808A4FE0 29E1001D */ slti $at, $t7, 0x001D -/* 00224 808A4FE4 14200034 */ bne $at, $zero, .L808A50B8 -/* 00228 808A4FE8 AC8F0168 */ sw $t7, 0x0168($a0) ## 00000168 -/* 0022C 808A4FEC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00230 808A4FF0 0C023A62 */ jal Player_InCsMode -/* 00234 808A4FF4 AFA5004C */ sw $a1, 0x004C($sp) -/* 00238 808A4FF8 54400030 */ bnel $v0, $zero, .L808A50BC -/* 0023C 808A4FFC C6000150 */ lwc1 $f0, 0x0150($s0) ## 00000150 -/* 00240 808A5000 0C229441 */ jal func_808A5104 -/* 00244 808A5004 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00248 808A5008 8FA4004C */ lw $a0, 0x004C($sp) -/* 0024C 808A500C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00250 808A5010 0C00B7D5 */ jal func_8002DF54 -/* 00254 808A5014 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 00258 808A5018 26040178 */ addiu $a0, $s0, 0x0178 ## $a0 = 00000178 -/* 0025C 808A501C 0C01DF90 */ jal Math_Vec3f_Copy - ## Vec3f_Copy -/* 00260 808A5020 26250024 */ addiu $a1, $s1, 0x0024 ## $a1 = 00000024 -/* 00264 808A5024 0C01DE1C */ jal Math_Sins - ## sins? -/* 00268 808A5028 86040158 */ lh $a0, 0x0158($s0) ## 00000158 -/* 0026C 808A502C 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 00270 808A5030 E7A0003C */ swc1 $f0, 0x003C($sp) -/* 00274 808A5034 E7A80040 */ swc1 $f8, 0x0040($sp) -/* 00278 808A5038 0C01DE0D */ jal Math_Coss - ## coss? -/* 0027C 808A503C 86040158 */ lh $a0, 0x0158($s0) ## 00000158 -/* 00280 808A5040 E7A00044 */ swc1 $f0, 0x0044($sp) -/* 00284 808A5044 C6300024 */ lwc1 $f16, 0x0024($s1) ## 00000024 -/* 00288 808A5048 C60A0024 */ lwc1 $f10, 0x0024($s0) ## 00000024 -/* 0028C 808A504C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00290 808A5050 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFDC -/* 00294 808A5054 46105481 */ sub.s $f18, $f10, $f16 -/* 00298 808A5058 E7A40034 */ swc1 $f4, 0x0034($sp) -/* 0029C 808A505C 27A5003C */ addiu $a1, $sp, 0x003C ## $a1 = FFFFFFF4 -/* 002A0 808A5060 27A60030 */ addiu $a2, $sp, 0x0030 ## $a2 = FFFFFFE8 -/* 002A4 808A5064 E7B20030 */ swc1 $f18, 0x0030($sp) -/* 002A8 808A5068 C628002C */ lwc1 $f8, 0x002C($s1) ## 0000002C -/* 002AC 808A506C C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C -/* 002B0 808A5070 46083281 */ sub.s $f10, $f6, $f8 -/* 002B4 808A5074 0C229370 */ jal func_808A4DC0 -/* 002B8 808A5078 E7AA0038 */ swc1 $f10, 0x0038($sp) -/* 002BC 808A507C 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 002C0 808A5080 C7B20028 */ lwc1 $f18, 0x0028($sp) -/* 002C4 808A5084 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 002C8 808A5088 4612803C */ c.lt.s $f16, $f18 -/* 002CC 808A508C 00000000 */ nop -/* 002D0 808A5090 45020006 */ bc1fl .L808A50AC -/* 002D4 808A5094 44813000 */ mtc1 $at, $f6 ## $f6 = -1.00 -/* 002D8 808A5098 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 002DC 808A509C 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 002E0 808A50A0 10000005 */ beq $zero, $zero, .L808A50B8 -/* 002E4 808A50A4 E604016C */ swc1 $f4, 0x016C($s0) ## 0000016C -/* 002E8 808A50A8 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -.L808A50AC: -/* 002EC 808A50AC 10000002 */ beq $zero, $zero, .L808A50B8 -/* 002F0 808A50B0 E606016C */ swc1 $f6, 0x016C($s0) ## 0000016C -/* 002F4 808A50B4 AE000168 */ sw $zero, 0x0168($s0) ## 00000168 -.L808A50B8: -/* 002F8 808A50B8 C6000150 */ lwc1 $f0, 0x0150($s0) ## 00000150 -.L808A50BC: -/* 002FC 808A50BC 3C01808A */ lui $at, %hi(D_808A54B4) ## $at = 808A0000 -/* 00300 808A50C0 C42854B4 */ lwc1 $f8, %lo(D_808A54B4)($at) -/* 00304 808A50C4 46000005 */ abs.s $f0, $f0 -/* 00308 808A50C8 4600403C */ c.lt.s $f8, $f0 -/* 0030C 808A50CC 00000000 */ nop -/* 00310 808A50D0 45020008 */ bc1fl .L808A50F4 -/* 00314 808A50D4 8FBF001C */ lw $ra, 0x001C($sp) -/* 00318 808A50D8 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 0031C 808A50DC 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF -/* 00320 808A50E0 E60A0150 */ swc1 $f10, 0x0150($s0) ## 00000150 -/* 00324 808A50E4 8E390680 */ lw $t9, 0x0680($s1) ## 00000680 -/* 00328 808A50E8 03214024 */ and $t0, $t9, $at -/* 0032C 808A50EC AE280680 */ sw $t0, 0x0680($s1) ## 00000680 -/* 00330 808A50F0 8FBF001C */ lw $ra, 0x001C($sp) -.L808A50F4: -/* 00334 808A50F4 8FB00014 */ lw $s0, 0x0014($sp) -/* 00338 808A50F8 8FB10018 */ lw $s1, 0x0018($sp) -/* 0033C 808A50FC 03E00008 */ jr $ra -/* 00340 808A5100 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A5104.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A5104.s deleted file mode 100644 index 9d59d0beb4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A5104.s +++ /dev/null @@ -1,8 +0,0 @@ -glabel func_808A5104 -/* 00344 808A5104 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00348 808A5108 3C0E808A */ lui $t6, %hi(func_808A5120) ## $t6 = 808A0000 -/* 0034C 808A510C 25CE5120 */ addiu $t6, $t6, %lo(func_808A5120) ## $t6 = 808A5120 -/* 00350 808A5110 AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 -/* 00354 808A5114 E4800170 */ swc1 $f0, 0x0170($a0) ## 00000170 -/* 00358 808A5118 03E00008 */ jr $ra -/* 0035C 808A511C E4800174 */ swc1 $f0, 0x0174($a0) ## 00000174 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A5120.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A5120.s deleted file mode 100644 index 0998508ca4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A5120.s +++ /dev/null @@ -1,106 +0,0 @@ -.late_rodata -glabel D_808A54B8 - .word 0x43360B61 -glabel D_808A54BC - .float 0.001 - -.text -glabel func_808A5120 -/* 00360 808A5120 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00364 808A5124 AFBF001C */ sw $ra, 0x001C($sp) -/* 00368 808A5128 AFB00018 */ sw $s0, 0x0018($sp) -/* 0036C 808A512C AFA5002C */ sw $a1, 0x002C($sp) -/* 00370 808A5130 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 00374 808A5134 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00378 808A5138 3C053F19 */ lui $a1, 0x3F19 ## $a1 = 3F190000 -/* 0037C 808A513C 3C063CA3 */ lui $a2, 0x3CA3 ## $a2 = 3CA30000 -/* 00380 808A5140 34C6D70A */ ori $a2, $a2, 0xD70A ## $a2 = 3CA3D70A -/* 00384 808A5144 34A5999A */ ori $a1, $a1, 0x999A ## $a1 = 3F19999A -/* 00388 808A5148 24840170 */ addiu $a0, $a0, 0x0170 ## $a0 = 00000170 -/* 0038C 808A514C 0C01DE80 */ jal Math_ApproxF - -/* 00390 808A5150 AFAF0024 */ sw $t7, 0x0024($sp) -/* 00394 808A5154 3C014234 */ lui $at, 0x4234 ## $at = 42340000 -/* 00398 808A5158 44813000 */ mtc1 $at, $f6 ## $f6 = 45.00 -/* 0039C 808A515C C604016C */ lwc1 $f4, 0x016C($s0) ## 0000016C -/* 003A0 808A5160 26040174 */ addiu $a0, $s0, 0x0174 ## $a0 = 00000174 -/* 003A4 808A5164 8E060170 */ lw $a2, 0x0170($s0) ## 00000170 -/* 003A8 808A5168 46062202 */ mul.s $f8, $f4, $f6 -/* 003AC 808A516C 44054000 */ mfc1 $a1, $f8 -/* 003B0 808A5170 0C01DE80 */ jal Math_ApproxF - -/* 003B4 808A5174 00000000 */ nop -/* 003B8 808A5178 1040001B */ beq $v0, $zero, .L808A51E8 -/* 003BC 808A517C 3C01808A */ lui $at, %hi(D_808A54B8) ## $at = 808A0000 -/* 003C0 808A5180 0C2293E4 */ jal func_808A4F90 -/* 003C4 808A5184 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 003C8 808A5188 8FA4002C */ lw $a0, 0x002C($sp) -/* 003CC 808A518C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 003D0 808A5190 0C00B7D5 */ jal func_8002DF54 -/* 003D4 808A5194 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 003D8 808A5198 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 003DC 808A519C C610016C */ lwc1 $f16, 0x016C($s0) ## 0000016C -/* 003E0 808A51A0 4610503C */ c.lt.s $f10, $f16 -/* 003E4 808A51A4 00000000 */ nop -/* 003E8 808A51A8 45020006 */ bc1fl .L808A51C4 -/* 003EC 808A51AC 86080016 */ lh $t0, 0x0016($s0) ## 00000016 -/* 003F0 808A51B0 86180016 */ lh $t8, 0x0016($s0) ## 00000016 -/* 003F4 808A51B4 27192000 */ addiu $t9, $t8, 0x2000 ## $t9 = 00002000 -/* 003F8 808A51B8 10000004 */ beq $zero, $zero, .L808A51CC -/* 003FC 808A51BC A6190016 */ sh $t9, 0x0016($s0) ## 00000016 -/* 00400 808A51C0 86080016 */ lh $t0, 0x0016($s0) ## 00000016 -.L808A51C4: -/* 00404 808A51C4 2509E000 */ addiu $t1, $t0, 0xE000 ## $t1 = FFFFE000 -/* 00408 808A51C8 A6090016 */ sh $t1, 0x0016($s0) ## 00000016 -.L808A51CC: -/* 0040C 808A51CC 86020016 */ lh $v0, 0x0016($s0) ## 00000016 -/* 00410 808A51D0 24042893 */ addiu $a0, $zero, 0x2893 ## $a0 = 00002893 -/* 00414 808A51D4 A60200B6 */ sh $v0, 0x00B6($s0) ## 000000B6 -/* 00418 808A51D8 0C01E233 */ jal func_800788CC -/* 0041C 808A51DC A6020032 */ sh $v0, 0x0032($s0) ## 00000032 -/* 00420 808A51E0 10000012 */ beq $zero, $zero, .L808A522C -/* 00424 808A51E4 C6000150 */ lwc1 $f0, 0x0150($s0) ## 00000150 -.L808A51E8: -/* 00428 808A51E8 C6120174 */ lwc1 $f18, 0x0174($s0) ## 00000174 -/* 0042C 808A51EC C42454B8 */ lwc1 $f4, %lo(D_808A54B8)($at) -/* 00430 808A51F0 860B0016 */ lh $t3, 0x0016($s0) ## 00000016 -/* 00434 808A51F4 24042083 */ addiu $a0, $zero, 0x2083 ## $a0 = 00002083 -/* 00438 808A51F8 46049182 */ mul.s $f6, $f18, $f4 -/* 0043C 808A51FC 4600320D */ trunc.w.s $f8, $f6 -/* 00440 808A5200 44034000 */ mfc1 $v1, $f8 -/* 00444 808A5204 00000000 */ nop -/* 00448 808A5208 00031C00 */ sll $v1, $v1, 16 -/* 0044C 808A520C 00031C03 */ sra $v1, $v1, 16 -/* 00450 808A5210 01631021 */ addu $v0, $t3, $v1 -/* 00454 808A5214 00021400 */ sll $v0, $v0, 16 -/* 00458 808A5218 00021403 */ sra $v0, $v0, 16 -/* 0045C 808A521C A60200B6 */ sh $v0, 0x00B6($s0) ## 000000B6 -/* 00460 808A5220 0C01E233 */ jal func_800788CC -/* 00464 808A5224 A6020032 */ sh $v0, 0x0032($s0) ## 00000032 -/* 00468 808A5228 C6000150 */ lwc1 $f0, 0x0150($s0) ## 00000150 -.L808A522C: -/* 0046C 808A522C 3C01808A */ lui $at, %hi(D_808A54BC) ## $at = 808A0000 -/* 00470 808A5230 C42A54BC */ lwc1 $f10, %lo(D_808A54BC)($at) -/* 00474 808A5234 46000005 */ abs.s $f0, $f0 -/* 00478 808A5238 4600503C */ c.lt.s $f10, $f0 -/* 0047C 808A523C 00000000 */ nop -/* 00480 808A5240 45020009 */ bc1fl .L808A5268 -/* 00484 808A5244 8FA20024 */ lw $v0, 0x0024($sp) -/* 00488 808A5248 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 0048C 808A524C 8FA20024 */ lw $v0, 0x0024($sp) -/* 00490 808A5250 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF -/* 00494 808A5254 E6100150 */ swc1 $f16, 0x0150($s0) ## 00000150 -/* 00498 808A5258 8C4C0680 */ lw $t4, 0x0680($v0) ## 00000680 -/* 0049C 808A525C 01816824 */ and $t5, $t4, $at -/* 004A0 808A5260 AC4D0680 */ sw $t5, 0x0680($v0) ## 00000680 -/* 004A4 808A5264 8FA20024 */ lw $v0, 0x0024($sp) -.L808A5268: -/* 004A8 808A5268 26050178 */ addiu $a1, $s0, 0x0178 ## $a1 = 00000178 -/* 004AC 808A526C 0C01DF90 */ jal Math_Vec3f_Copy - ## Vec3f_Copy -/* 004B0 808A5270 24440024 */ addiu $a0, $v0, 0x0024 ## $a0 = 00000024 -/* 004B4 808A5274 8FBF001C */ lw $ra, 0x001C($sp) -/* 004B8 808A5278 8FB00018 */ lw $s0, 0x0018($sp) -/* 004BC 808A527C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 004C0 808A5280 03E00008 */ jr $ra -/* 004C4 808A5284 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A52AC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A52AC.s deleted file mode 100644 index e8479a8f99..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A52AC.s +++ /dev/null @@ -1,80 +0,0 @@ -.rdata -glabel D_808A545C - .asciz "../z_bg_mori_kaitenkabe.c" - .balign 4 - -glabel D_808A5478 - .asciz "../z_bg_mori_kaitenkabe.c" - .balign 4 - -glabel D_808A5494 - .asciz "../z_bg_mori_kaitenkabe.c" - .balign 4 - -.text -glabel func_808A52AC -/* 004EC 808A52AC 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 004F0 808A52B0 AFB10018 */ sw $s1, 0x0018($sp) -/* 004F4 808A52B4 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 004F8 808A52B8 AFBF001C */ sw $ra, 0x001C($sp) -/* 004FC 808A52BC AFB00014 */ sw $s0, 0x0014($sp) -/* 00500 808A52C0 AFA40050 */ sw $a0, 0x0050($sp) -/* 00504 808A52C4 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 00508 808A52C8 3C06808A */ lui $a2, %hi(D_808A545C) ## $a2 = 808A0000 -/* 0050C 808A52CC 24C6545C */ addiu $a2, $a2, %lo(D_808A545C) ## $a2 = 808A545C -/* 00510 808A52D0 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 -/* 00514 808A52D4 2407015B */ addiu $a3, $zero, 0x015B ## $a3 = 0000015B -/* 00518 808A52D8 0C031AB1 */ jal Graph_OpenDisps -/* 0051C 808A52DC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00520 808A52E0 0C024F46 */ jal func_80093D18 -/* 00524 808A52E4 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 00528 808A52E8 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 0052C 808A52EC 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 00530 808A52F0 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 -/* 00534 808A52F4 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 00538 808A52F8 AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 -/* 0053C 808A52FC AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 00540 808A5300 8FB80050 */ lw $t8, 0x0050($sp) -/* 00544 808A5304 3C0A0001 */ lui $t2, 0x0001 ## $t2 = 00010000 -/* 00548 808A5308 3C0CDA38 */ lui $t4, 0xDA38 ## $t4 = DA380000 -/* 0054C 808A530C 83190184 */ lb $t9, 0x0184($t8) ## 00000184 -/* 00550 808A5310 358C0003 */ ori $t4, $t4, 0x0003 ## $t4 = DA380003 -/* 00554 808A5314 3C05808A */ lui $a1, %hi(D_808A5478) ## $a1 = 808A0000 -/* 00558 808A5318 00194100 */ sll $t0, $t9, 4 -/* 0055C 808A531C 01194021 */ addu $t0, $t0, $t9 -/* 00560 808A5320 00084080 */ sll $t0, $t0, 2 -/* 00564 808A5324 02284821 */ addu $t1, $s1, $t0 -/* 00568 808A5328 01495021 */ addu $t2, $t2, $t1 -/* 0056C 808A532C 8D4A17B4 */ lw $t2, 0x17B4($t2) ## 000117B4 -/* 00570 808A5330 24A55478 */ addiu $a1, $a1, %lo(D_808A5478) ## $a1 = 808A5478 -/* 00574 808A5334 24060160 */ addiu $a2, $zero, 0x0160 ## $a2 = 00000160 -/* 00578 808A5338 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 -/* 0057C 808A533C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 00580 808A5340 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 00584 808A5344 AE0B02C0 */ sw $t3, 0x02C0($s0) ## 000002C0 -/* 00588 808A5348 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 0058C 808A534C 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 00590 808A5350 0C0346A2 */ jal Matrix_NewMtx -/* 00594 808A5354 AFA2002C */ sw $v0, 0x002C($sp) -/* 00598 808A5358 8FA3002C */ lw $v1, 0x002C($sp) -/* 0059C 808A535C 3C0F0600 */ lui $t7, 0x0600 ## $t7 = 06000000 -/* 005A0 808A5360 25EF56B0 */ addiu $t7, $t7, 0x56B0 ## $t7 = 060056B0 -/* 005A4 808A5364 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 005A8 808A5368 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 005AC 808A536C 3C0EDE00 */ lui $t6, 0xDE00 ## $t6 = DE000000 -/* 005B0 808A5370 3C06808A */ lui $a2, %hi(D_808A5494) ## $a2 = 808A0000 -/* 005B4 808A5374 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 005B8 808A5378 AE0D02C0 */ sw $t5, 0x02C0($s0) ## 000002C0 -/* 005BC 808A537C AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 005C0 808A5380 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 005C4 808A5384 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 005C8 808A5388 24C65494 */ addiu $a2, $a2, %lo(D_808A5494) ## $a2 = 808A5494 -/* 005CC 808A538C 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 -/* 005D0 808A5390 0C031AD5 */ jal Graph_CloseDisps -/* 005D4 808A5394 24070164 */ addiu $a3, $zero, 0x0164 ## $a3 = 00000164 -/* 005D8 808A5398 8FBF001C */ lw $ra, 0x001C($sp) -/* 005DC 808A539C 8FB00014 */ lw $s0, 0x0014($sp) -/* 005E0 808A53A0 8FB10018 */ lw $s1, 0x0018($sp) -/* 005E4 808A53A4 03E00008 */ jr $ra -/* 005E8 808A53A8 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 005EC 808A53AC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/BgMoriRakkatenjo_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/BgMoriRakkatenjo_Destroy.s deleted file mode 100644 index 00a5a5afce..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/BgMoriRakkatenjo_Destroy.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel BgMoriRakkatenjo_Destroy -/* 00184 808A56F4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00188 808A56F8 AFA40018 */ sw $a0, 0x0018($sp) -/* 0018C 808A56FC 8FAE0018 */ lw $t6, 0x0018($sp) -/* 00190 808A5700 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00194 808A5704 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00198 808A5708 24A50810 */ addiu $a1, $a1, 0x0810 ## $a1 = 00000810 -/* 0019C 808A570C 0C00FB56 */ jal DynaPolyInfo_Free - ## DynaPolyInfo_delReserve -/* 001A0 808A5710 8DC6014C */ lw $a2, 0x014C($t6) ## 0000014C -/* 001A4 808A5714 8FBF0014 */ lw $ra, 0x0014($sp) -/* 001A8 808A5718 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 001AC 808A571C 03E00008 */ jr $ra -/* 001B0 808A5720 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/BgMoriRakkatenjo_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/BgMoriRakkatenjo_Init.s deleted file mode 100644 index c89b4baffe..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/BgMoriRakkatenjo_Init.s +++ /dev/null @@ -1,146 +0,0 @@ -.rdata -glabel D_808A5EA0 - .asciz "森の神殿 obj. 落下天井 (home posY %f)\n" - .balign 4 - -glabel D_808A5EC8 - .asciz "Warning : セット位置が変更されています。プログラムを修正しましょう。\n" - .balign 4 - -glabel D_808A5F10 - .asciz "Warning : セット Angle が変更されています。プログラムを修正しましょう。\n" - .balign 4 - -glabel D_808A5F5C - .asciz "Error : 森の神殿 obj 落下天井 バンク危険！(%s %d)\n" - .balign 4 - -glabel D_808A5F90 - .asciz "../z_bg_mori_rakkatenjo.c" - .balign 4 - -.late_rodata -glabel D_808A604C - .float 0.001 - -glabel D_808A6050 - .word 0x44F8E000 -glabel D_808A6054 - .word 0x442AC000 -glabel D_808A6058 - .word 0xC51D8000 - -.text -glabel BgMoriRakkatenjo_Init -/* 00000 808A5570 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00004 808A5574 AFBF001C */ sw $ra, 0x001C($sp) -/* 00008 808A5578 AFB00018 */ sw $s0, 0x0018($sp) -/* 0000C 808A557C AFA50034 */ sw $a1, 0x0034($sp) -/* 00010 808A5580 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00014 808A5584 AFA00024 */ sw $zero, 0x0024($sp) -/* 00018 808A5588 0C010D20 */ jal DynaPolyInfo_SetActorMove - -/* 0001C 808A558C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00020 808A5590 C604000C */ lwc1 $f4, 0x000C($s0) ## 0000000C -/* 00024 808A5594 3C04808A */ lui $a0, %hi(D_808A5EA0) ## $a0 = 808A0000 -/* 00028 808A5598 24845EA0 */ addiu $a0, $a0, %lo(D_808A5EA0) ## $a0 = 808A5EA0 -/* 0002C 808A559C 460021A1 */ cvt.d.s $f6, $f4 -/* 00030 808A55A0 44073000 */ mfc1 $a3, $f6 -/* 00034 808A55A4 44063800 */ mfc1 $a2, $f7 -/* 00038 808A55A8 0C00084C */ jal osSyncPrintf - -/* 0003C 808A55AC 00000000 */ nop -/* 00040 808A55B0 3C01808A */ lui $at, %hi(D_808A604C) ## $at = 808A0000 -/* 00044 808A55B4 C422604C */ lwc1 $f2, %lo(D_808A604C)($at) -/* 00048 808A55B8 3C01808A */ lui $at, %hi(D_808A6050) ## $at = 808A0000 -/* 0004C 808A55BC C4286050 */ lwc1 $f8, %lo(D_808A6050)($at) -/* 00050 808A55C0 C60A0008 */ lwc1 $f10, 0x0008($s0) ## 00000008 -/* 00054 808A55C4 3C01808A */ lui $at, %hi(D_808A6054) ## $at = 808A0000 -/* 00058 808A55C8 3C04808A */ lui $a0, %hi(D_808A5EC8) ## $a0 = 808A0000 -/* 0005C 808A55CC 460A4001 */ sub.s $f0, $f8, $f10 -/* 00060 808A55D0 46000005 */ abs.s $f0, $f0 -/* 00064 808A55D4 4600103C */ c.lt.s $f2, $f0 -/* 00068 808A55D8 00000000 */ nop -/* 0006C 808A55DC 45010012 */ bc1t .L808A5628 -/* 00070 808A55E0 00000000 */ nop -/* 00074 808A55E4 C4306054 */ lwc1 $f16, %lo(D_808A6054)($at) -/* 00078 808A55E8 C612000C */ lwc1 $f18, 0x000C($s0) ## 0000000C -/* 0007C 808A55EC 3C01808A */ lui $at, %hi(D_808A6058) ## $at = 808A0000 -/* 00080 808A55F0 46128001 */ sub.s $f0, $f16, $f18 -/* 00084 808A55F4 46000005 */ abs.s $f0, $f0 -/* 00088 808A55F8 4600103C */ c.lt.s $f2, $f0 -/* 0008C 808A55FC 00000000 */ nop -/* 00090 808A5600 45010009 */ bc1t .L808A5628 -/* 00094 808A5604 00000000 */ nop -/* 00098 808A5608 C4246058 */ lwc1 $f4, %lo(D_808A6058)($at) -/* 0009C 808A560C C6060010 */ lwc1 $f6, 0x0010($s0) ## 00000010 -/* 000A0 808A5610 46062001 */ sub.s $f0, $f4, $f6 -/* 000A4 808A5614 46000005 */ abs.s $f0, $f0 -/* 000A8 808A5618 4600103C */ c.lt.s $f2, $f0 -/* 000AC 808A561C 00000000 */ nop -/* 000B0 808A5620 45020004 */ bc1fl .L808A5634 -/* 000B4 808A5624 860E0016 */ lh $t6, 0x0016($s0) ## 00000016 -.L808A5628: -/* 000B8 808A5628 0C00084C */ jal osSyncPrintf - -/* 000BC 808A562C 24845EC8 */ addiu $a0, $a0, %lo(D_808A5EC8) ## $a0 = 808A5EC8 -/* 000C0 808A5630 860E0016 */ lh $t6, 0x0016($s0) ## 00000016 -.L808A5634: -/* 000C4 808A5634 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 000C8 808A5638 3C04808A */ lui $a0, %hi(D_808A5F10) ## $a0 = 808A0000 -/* 000CC 808A563C 51C10004 */ beql $t6, $at, .L808A5650 -/* 000D0 808A5640 8FA40034 */ lw $a0, 0x0034($sp) -/* 000D4 808A5644 0C00084C */ jal osSyncPrintf - -/* 000D8 808A5648 24845F10 */ addiu $a0, $a0, %lo(D_808A5F10) ## $a0 = 808A5F10 -/* 000DC 808A564C 8FA40034 */ lw $a0, 0x0034($sp) -.L808A5650: -/* 000E0 808A5650 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 000E4 808A5654 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 000E8 808A5658 24050073 */ addiu $a1, $zero, 0x0073 ## $a1 = 00000073 -/* 000EC 808A565C 0C02604B */ jal Object_GetIndex - ## ObjectIndex -/* 000F0 808A5660 00812021 */ addu $a0, $a0, $at -/* 000F4 808A5664 A2020174 */ sb $v0, 0x0174($s0) ## 00000174 -/* 000F8 808A5668 820F0174 */ lb $t7, 0x0174($s0) ## 00000174 -/* 000FC 808A566C 240600CD */ addiu $a2, $zero, 0x00CD ## $a2 = 000000CD -/* 00100 808A5670 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00104 808A5674 05E1000A */ bgez $t7, .L808A56A0 -/* 00108 808A5678 3C05808A */ lui $a1, %hi(D_808A5E84) ## $a1 = 808A0000 -/* 0010C 808A567C 3C04808A */ lui $a0, %hi(D_808A5F5C) ## $a0 = 808A0000 -/* 00110 808A5680 3C05808A */ lui $a1, %hi(D_808A5F90) ## $a1 = 808A0000 -/* 00114 808A5684 24A55F90 */ addiu $a1, $a1, %lo(D_808A5F90) ## $a1 = 808A5F90 -/* 00118 808A5688 0C00084C */ jal osSyncPrintf - -/* 0011C 808A568C 24845F5C */ addiu $a0, $a0, %lo(D_808A5F5C) ## $a0 = 808A5F5C -/* 00120 808A5690 0C00B55C */ jal Actor_Kill - -/* 00124 808A5694 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00128 808A5698 10000012 */ beq $zero, $zero, .L808A56E4 -/* 0012C 808A569C 8FBF001C */ lw $ra, 0x001C($sp) -.L808A56A0: -/* 00130 808A56A0 0C01E037 */ jal Actor_ProcessInitChain - -/* 00134 808A56A4 24A55E84 */ addiu $a1, $a1, %lo(D_808A5E84) ## $a1 = 00005E84 -/* 00138 808A56A8 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 0013C 808A56AC 248487AC */ addiu $a0, $a0, 0x87AC ## $a0 = 060087AC -/* 00140 808A56B0 0C010620 */ jal DynaPolyInfo_Alloc - -/* 00144 808A56B4 27A50024 */ addiu $a1, $sp, 0x0024 ## $a1 = FFFFFFF4 -/* 00148 808A56B8 8FA40034 */ lw $a0, 0x0034($sp) -/* 0014C 808A56BC 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00150 808A56C0 8FA70024 */ lw $a3, 0x0024($sp) -/* 00154 808A56C4 0C00FA9D */ jal DynaPolyInfo_RegisterActor - ## DynaPolyInfo_setActor -/* 00158 808A56C8 24850810 */ addiu $a1, $a0, 0x0810 ## $a1 = 00000810 -/* 0015C 808A56CC AE02014C */ sw $v0, 0x014C($s0) ## 0000014C -/* 00160 808A56D0 0C229621 */ jal func_808A5884 -/* 00164 808A56D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00168 808A56D8 3C01808A */ lui $at, %hi(D_808A5E60) ## $at = 808A0000 -/* 0016C 808A56DC A4205E60 */ sh $zero, %lo(D_808A5E60)($at) -/* 00170 808A56E0 8FBF001C */ lw $ra, 0x001C($sp) -.L808A56E4: -/* 00174 808A56E4 8FB00018 */ lw $s0, 0x0018($sp) -/* 00178 808A56E8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0017C 808A56EC 03E00008 */ jr $ra -/* 00180 808A56F0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/BgMoriRakkatenjo_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/BgMoriRakkatenjo_Update.s deleted file mode 100644 index e31e924aa9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/BgMoriRakkatenjo_Update.s +++ /dev/null @@ -1,76 +0,0 @@ -.rdata -glabel D_808A5FAC - .asciz "camera changed (mori rakka tenjyo) ... \n" - .balign 4 - -glabel D_808A5FD8 - .asciz "camera changed (previous) ... \n" - .balign 4 - -.text -glabel BgMoriRakkatenjo_Update -/* 00700 808A5C70 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00704 808A5C74 AFBF002C */ sw $ra, 0x002C($sp) -/* 00708 808A5C78 AFB10028 */ sw $s1, 0x0028($sp) -/* 0070C 808A5C7C AFB00024 */ sw $s0, 0x0024($sp) -/* 00710 808A5C80 8C820168 */ lw $v0, 0x0168($a0) ## 00000168 -/* 00714 808A5C84 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00718 808A5C88 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 0071C 808A5C8C 18400002 */ blez $v0, .L808A5C98 -/* 00720 808A5C90 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 00724 808A5C94 AC8E0168 */ sw $t6, 0x0168($a0) ## 00000168 -.L808A5C98: -/* 00728 808A5C98 8E190164 */ lw $t9, 0x0164($s0) ## 00000164 -/* 0072C 808A5C9C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00730 808A5CA0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00734 808A5CA4 0320F809 */ jalr $ra, $t9 -/* 00738 808A5CA8 00000000 */ nop -/* 0073C 808A5CAC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00740 808A5CB0 0C2295C9 */ jal func_808A5724 -/* 00744 808A5CB4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00748 808A5CB8 10400018 */ beq $v0, $zero, .L808A5D1C -/* 0074C 808A5CBC 3C0F808A */ lui $t7, %hi(D_808A5E60) ## $t7 = 808A0000 -/* 00750 808A5CC0 85EF5E60 */ lh $t7, %lo(D_808A5E60)($t7) -/* 00754 808A5CC4 3C04808A */ lui $a0, %hi(D_808A5FAC) ## $a0 = 808A0000 -/* 00758 808A5CC8 55E00021 */ bnel $t7, $zero, .L808A5D50 -/* 0075C 808A5CCC 8FBF002C */ lw $ra, 0x002C($sp) -/* 00760 808A5CD0 0C00084C */ jal osSyncPrintf - -/* 00764 808A5CD4 24845FAC */ addiu $a0, $a0, %lo(D_808A5FAC) ## $a0 = 808A5FAC -/* 00768 808A5CD8 8E380790 */ lw $t8, 0x0790($s1) ## 00000790 -/* 0076C 808A5CDC 3C01808A */ lui $at, %hi(D_808A5E60) ## $at = 808A0000 -/* 00770 808A5CE0 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00774 808A5CE4 87080142 */ lh $t0, 0x0142($t8) ## 00000142 -/* 00778 808A5CE8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 0077C 808A5CEC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00780 808A5CF0 A4285E60 */ sh $t0, %lo(D_808A5E60)($at) -/* 00784 808A5CF4 8E240790 */ lw $a0, 0x0790($s1) ## 00000790 -/* 00788 808A5CF8 AFA00018 */ sw $zero, 0x0018($sp) -/* 0078C 808A5CFC AFA00014 */ sw $zero, 0x0014($sp) -/* 00790 808A5D00 0C016BF5 */ jal Camera_SetCameraData ## setCameraData -/* 00794 808A5D04 AFA00010 */ sw $zero, 0x0010($sp) -/* 00798 808A5D08 8E240790 */ lw $a0, 0x0790($s1) ## 00000790 -/* 0079C 808A5D0C 0C0169DF */ jal func_8005A77C -/* 007A0 808A5D10 24050027 */ addiu $a1, $zero, 0x0027 ## $a1 = 00000027 -/* 007A4 808A5D14 1000000E */ beq $zero, $zero, .L808A5D50 -/* 007A8 808A5D18 8FBF002C */ lw $ra, 0x002C($sp) -.L808A5D1C: -/* 007AC 808A5D1C 3C10808A */ lui $s0, %hi(D_808A5E60) ## $s0 = 808A0000 -/* 007B0 808A5D20 26105E60 */ addiu $s0, $s0, %lo(D_808A5E60) ## $s0 = 808A5E60 -/* 007B4 808A5D24 86090000 */ lh $t1, 0x0000($s0) ## 808A5E60 -/* 007B8 808A5D28 3C04808A */ lui $a0, %hi(D_808A5FD8) ## $a0 = 808A0000 -/* 007BC 808A5D2C 51200008 */ beql $t1, $zero, .L808A5D50 -/* 007C0 808A5D30 8FBF002C */ lw $ra, 0x002C($sp) -/* 007C4 808A5D34 0C00084C */ jal osSyncPrintf - -/* 007C8 808A5D38 24845FD8 */ addiu $a0, $a0, %lo(D_808A5FD8) ## $a0 = 808A5FD8 -/* 007CC 808A5D3C 8E240790 */ lw $a0, 0x0790($s1) ## 00000790 -/* 007D0 808A5D40 0C0169DF */ jal func_8005A77C -/* 007D4 808A5D44 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 007D8 808A5D48 A6000000 */ sh $zero, 0x0000($s0) ## 808A5E60 -/* 007DC 808A5D4C 8FBF002C */ lw $ra, 0x002C($sp) -.L808A5D50: -/* 007E0 808A5D50 8FB00024 */ lw $s0, 0x0024($sp) -/* 007E4 808A5D54 8FB10028 */ lw $s1, 0x0028($sp) -/* 007E8 808A5D58 03E00008 */ jr $ra -/* 007EC 808A5D5C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5724.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5724.s deleted file mode 100644 index 82b2ce259a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5724.s +++ /dev/null @@ -1,58 +0,0 @@ -.late_rodata -glabel D_808A605C - .word 0xC54E4000 -glabel D_808A6060 - .word 0x44DFE000 -glabel D_808A6064 - .word 0x4508F000 - -.text -glabel func_808A5724 -/* 001B4 808A5724 AFA40000 */ sw $a0, 0x0000($sp) -/* 001B8 808A5728 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 -/* 001BC 808A572C 3C01808A */ lui $at, %hi(D_808A605C) ## $at = 808A0000 -/* 001C0 808A5730 C424605C */ lwc1 $f4, %lo(D_808A605C)($at) -/* 001C4 808A5734 C460002C */ lwc1 $f0, 0x002C($v1) ## 0000002C -/* 001C8 808A5738 3C01C4E6 */ lui $at, 0xC4E6 ## $at = C4E60000 -/* 001CC 808A573C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 001D0 808A5740 4600203C */ c.lt.s $f4, $f0 -/* 001D4 808A5744 24630024 */ addiu $v1, $v1, 0x0024 ## $v1 = 00000024 -/* 001D8 808A5748 45000002 */ bc1f .L808A5754 -/* 001DC 808A574C 00000000 */ nop -/* 001E0 808A5750 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L808A5754: -/* 001E4 808A5754 1040001D */ beq $v0, $zero, .L808A57CC -/* 001E8 808A5758 00000000 */ nop -/* 001EC 808A575C 44813000 */ mtc1 $at, $f6 ## $f6 = -1840.00 -/* 001F0 808A5760 3C01808A */ lui $at, %hi(D_808A6060) ## $at = 808A0000 -/* 001F4 808A5764 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 001F8 808A5768 4606003C */ c.lt.s $f0, $f6 -/* 001FC 808A576C 00000000 */ nop -/* 00200 808A5770 45000002 */ bc1f .L808A577C -/* 00204 808A5774 00000000 */ nop -/* 00208 808A5778 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L808A577C: -/* 0020C 808A577C 10400013 */ beq $v0, $zero, .L808A57CC -/* 00210 808A5780 00000000 */ nop -/* 00214 808A5784 C4600000 */ lwc1 $f0, 0x0000($v1) ## 00000024 -/* 00218 808A5788 C4286060 */ lwc1 $f8, %lo(D_808A6060)($at) -/* 0021C 808A578C 3C01808A */ lui $at, %hi(D_808A6064) ## $at = 808A0000 -/* 00220 808A5790 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00224 808A5794 4600403C */ c.lt.s $f8, $f0 -/* 00228 808A5798 00000000 */ nop -/* 0022C 808A579C 45000002 */ bc1f .L808A57A8 -/* 00230 808A57A0 00000000 */ nop -/* 00234 808A57A4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L808A57A8: -/* 00238 808A57A8 10400008 */ beq $v0, $zero, .L808A57CC -/* 0023C 808A57AC 00000000 */ nop -/* 00240 808A57B0 C42A6064 */ lwc1 $f10, %lo(D_808A6064)($at) -/* 00244 808A57B4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00248 808A57B8 460A003C */ c.lt.s $f0, $f10 -/* 0024C 808A57BC 00000000 */ nop -/* 00250 808A57C0 45000002 */ bc1f .L808A57CC -/* 00254 808A57C4 00000000 */ nop -/* 00258 808A57C8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L808A57CC: -/* 0025C 808A57CC 03E00008 */ jr $ra -/* 00260 808A57D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A57D4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A57D4.s deleted file mode 100644 index c6b620ad1d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A57D4.s +++ /dev/null @@ -1,56 +0,0 @@ -.late_rodata -glabel D_808A6068 - .word 0x44DFE000 -glabel D_808A606C - .word 0x4508F000 - -.text -glabel func_808A57D4 -/* 00264 808A57D4 AFA40000 */ sw $a0, 0x0000($sp) -/* 00268 808A57D8 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 -/* 0026C 808A57DC 3C01C552 */ lui $at, 0xC552 ## $at = C5520000 -/* 00270 808A57E0 44812000 */ mtc1 $at, $f4 ## $f4 = -3360.00 -/* 00274 808A57E4 C460002C */ lwc1 $f0, 0x002C($v1) ## 0000002C -/* 00278 808A57E8 3C01C4E6 */ lui $at, 0xC4E6 ## $at = C4E60000 -/* 0027C 808A57EC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00280 808A57F0 4600203C */ c.lt.s $f4, $f0 -/* 00284 808A57F4 24630024 */ addiu $v1, $v1, 0x0024 ## $v1 = 00000024 -/* 00288 808A57F8 45000002 */ bc1f .L808A5804 -/* 0028C 808A57FC 00000000 */ nop -/* 00290 808A5800 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L808A5804: -/* 00294 808A5804 1040001D */ beq $v0, $zero, .L808A587C -/* 00298 808A5808 00000000 */ nop -/* 0029C 808A580C 44813000 */ mtc1 $at, $f6 ## $f6 = -1840.00 -/* 002A0 808A5810 3C01808A */ lui $at, %hi(D_808A6068) ## $at = 808A0000 -/* 002A4 808A5814 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 002A8 808A5818 4606003C */ c.lt.s $f0, $f6 -/* 002AC 808A581C 00000000 */ nop -/* 002B0 808A5820 45000002 */ bc1f .L808A582C -/* 002B4 808A5824 00000000 */ nop -/* 002B8 808A5828 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L808A582C: -/* 002BC 808A582C 10400013 */ beq $v0, $zero, .L808A587C -/* 002C0 808A5830 00000000 */ nop -/* 002C4 808A5834 C4600000 */ lwc1 $f0, 0x0000($v1) ## 00000024 -/* 002C8 808A5838 C4286068 */ lwc1 $f8, %lo(D_808A6068)($at) -/* 002CC 808A583C 3C01808A */ lui $at, %hi(D_808A606C) ## $at = 808A0000 -/* 002D0 808A5840 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 002D4 808A5844 4600403C */ c.lt.s $f8, $f0 -/* 002D8 808A5848 00000000 */ nop -/* 002DC 808A584C 45000002 */ bc1f .L808A5858 -/* 002E0 808A5850 00000000 */ nop -/* 002E4 808A5854 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L808A5858: -/* 002E8 808A5858 10400008 */ beq $v0, $zero, .L808A587C -/* 002EC 808A585C 00000000 */ nop -/* 002F0 808A5860 C42A606C */ lwc1 $f10, %lo(D_808A606C)($at) -/* 002F4 808A5864 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 002F8 808A5868 460A003C */ c.lt.s $f0, $f10 -/* 002FC 808A586C 00000000 */ nop -/* 00300 808A5870 45000002 */ bc1f .L808A587C -/* 00304 808A5874 00000000 */ nop -/* 00308 808A5878 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L808A587C: -/* 0030C 808A587C 03E00008 */ jr $ra -/* 00310 808A5880 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5884.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5884.s deleted file mode 100644 index 506bf423b5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5884.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_808A5884 -/* 00314 808A5884 3C0E808A */ lui $t6, %hi(func_808A5894) ## $t6 = 808A0000 -/* 00318 808A5888 25CE5894 */ addiu $t6, $t6, %lo(func_808A5894) ## $t6 = 808A5894 -/* 0031C 808A588C 03E00008 */ jr $ra -/* 00320 808A5890 AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5894.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5894.s deleted file mode 100644 index 1da1d1b85f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5894.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_808A5894 -/* 00324 808A5894 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00328 808A5898 AFA40018 */ sw $a0, 0x0018($sp) -/* 0032C 808A589C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00330 808A58A0 8FAE0018 */ lw $t6, 0x0018($sp) -/* 00334 808A58A4 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 00338 808A58A8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0033C 808A58AC 00A12021 */ addu $a0, $a1, $at -/* 00340 808A58B0 0C026062 */ jal Object_IsLoaded - -/* 00344 808A58B4 81C50174 */ lb $a1, 0x0174($t6) ## 00000174 -/* 00348 808A58B8 50400008 */ beql $v0, $zero, .L808A58DC -/* 0034C 808A58BC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00350 808A58C0 0C22963A */ jal func_808A58E8 -/* 00354 808A58C4 8FA40018 */ lw $a0, 0x0018($sp) -/* 00358 808A58C8 8FB80018 */ lw $t8, 0x0018($sp) -/* 0035C 808A58CC 3C0F808A */ lui $t7, %hi(func_808A5D60) ## $t7 = 808A0000 -/* 00360 808A58D0 25EF5D60 */ addiu $t7, $t7, %lo(func_808A5D60) ## $t7 = 808A5D60 -/* 00364 808A58D4 AF0F0134 */ sw $t7, 0x0134($t8) ## 00000134 -/* 00368 808A58D8 8FBF0014 */ lw $ra, 0x0014($sp) -.L808A58DC: -/* 0036C 808A58DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00370 808A58E0 03E00008 */ jr $ra -/* 00374 808A58E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A58E8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A58E8.s deleted file mode 100644 index 81f35a7360..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A58E8.s +++ /dev/null @@ -1,22 +0,0 @@ -.late_rodata -glabel D_808A6070 - .word 0x442AC000 - -.text -glabel func_808A58E8 -/* 00378 808A58E8 8C8E0170 */ lw $t6, 0x0170($a0) ## 00000170 -/* 0037C 808A58EC 3C19808A */ lui $t9, %hi(func_808A5920) ## $t9 = 808A0000 -/* 00380 808A58F0 3C01808A */ lui $at, %hi(D_808A6070) ## $at = 808A0000 -/* 00384 808A58F4 19C00004 */ blez $t6, .L808A5908 -/* 00388 808A58F8 27395920 */ addiu $t9, $t9, %lo(func_808A5920) ## $t9 = 808A5920 -/* 0038C 808A58FC 240F0064 */ addiu $t7, $zero, 0x0064 ## $t7 = 00000064 -/* 00390 808A5900 10000003 */ beq $zero, $zero, .L808A5910 -/* 00394 808A5904 AC8F0168 */ sw $t7, 0x0168($a0) ## 00000168 -.L808A5908: -/* 00398 808A5908 24180015 */ addiu $t8, $zero, 0x0015 ## $t8 = 00000015 -/* 0039C 808A590C AC980168 */ sw $t8, 0x0168($a0) ## 00000168 -.L808A5910: -/* 003A0 808A5910 C4246070 */ lwc1 $f4, %lo(D_808A6070)($at) -/* 003A4 808A5914 AC990164 */ sw $t9, 0x0164($a0) ## 00000164 -/* 003A8 808A5918 03E00008 */ jr $ra -/* 003AC 808A591C E4840028 */ swc1 $f4, 0x0028($a0) ## 00000028 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5920.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5920.s deleted file mode 100644 index 9925b3a403..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5920.s +++ /dev/null @@ -1,60 +0,0 @@ -glabel func_808A5920 -/* 003B0 808A5920 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 003B4 808A5924 AFBF001C */ sw $ra, 0x001C($sp) -/* 003B8 808A5928 AFB00018 */ sw $s0, 0x0018($sp) -/* 003BC 808A592C 8C8E0170 */ lw $t6, 0x0170($a0) ## 00000170 -/* 003C0 808A5930 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 003C4 808A5934 15C00013 */ bne $t6, $zero, .L808A5984 -/* 003C8 808A5938 00000000 */ nop -/* 003CC 808A593C 0C2295F5 */ jal func_808A57D4 -/* 003D0 808A5940 00000000 */ nop -/* 003D4 808A5944 54400007 */ bnel $v0, $zero, .L808A5964 -/* 003D8 808A5948 8E020168 */ lw $v0, 0x0168($s0) ## 00000168 -/* 003DC 808A594C 8E0F0168 */ lw $t7, 0x0168($s0) ## 00000168 -/* 003E0 808A5950 24020015 */ addiu $v0, $zero, 0x0015 ## $v0 = 00000015 -/* 003E4 808A5954 29E10014 */ slti $at, $t7, 0x0014 -/* 003E8 808A5958 10200008 */ beq $at, $zero, .L808A597C -/* 003EC 808A595C 00000000 */ nop -/* 003F0 808A5960 8E020168 */ lw $v0, 0x0168($s0) ## 00000168 -.L808A5964: -/* 003F4 808A5964 5C400019 */ bgtzl $v0, .L808A59CC -/* 003F8 808A5968 28410014 */ slti $at, $v0, 0x0014 -/* 003FC 808A596C 0C22967C */ jal func_808A59F0 -/* 00400 808A5970 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00404 808A5974 10000014 */ beq $zero, $zero, .L808A59C8 -/* 00408 808A5978 8E020168 */ lw $v0, 0x0168($s0) ## 00000168 -.L808A597C: -/* 0040C 808A597C 10000012 */ beq $zero, $zero, .L808A59C8 -/* 00410 808A5980 AE020168 */ sw $v0, 0x0168($s0) ## 00000168 -.L808A5984: -/* 00414 808A5984 0C2295C9 */ jal func_808A5724 -/* 00418 808A5988 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0041C 808A598C 54400007 */ bnel $v0, $zero, .L808A59AC -/* 00420 808A5990 8E020168 */ lw $v0, 0x0168($s0) ## 00000168 -/* 00424 808A5994 8E190168 */ lw $t9, 0x0168($s0) ## 00000168 -/* 00428 808A5998 24020064 */ addiu $v0, $zero, 0x0064 ## $v0 = 00000064 -/* 0042C 808A599C 2B210014 */ slti $at, $t9, 0x0014 -/* 00430 808A59A0 50200009 */ beql $at, $zero, .L808A59C8 -/* 00434 808A59A4 AE020168 */ sw $v0, 0x0168($s0) ## 00000168 -/* 00438 808A59A8 8E020168 */ lw $v0, 0x0168($s0) ## 00000168 -.L808A59AC: -/* 0043C 808A59AC 5C400007 */ bgtzl $v0, .L808A59CC -/* 00440 808A59B0 28410014 */ slti $at, $v0, 0x0014 -/* 00444 808A59B4 0C22967C */ jal func_808A59F0 -/* 00448 808A59B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0044C 808A59BC 10000002 */ beq $zero, $zero, .L808A59C8 -/* 00450 808A59C0 8E020168 */ lw $v0, 0x0168($s0) ## 00000168 -/* 00454 808A59C4 AE020168 */ sw $v0, 0x0168($s0) ## 00000168 -.L808A59C8: -/* 00458 808A59C8 28410014 */ slti $at, $v0, 0x0014 -.L808A59CC: -/* 0045C 808A59CC 50200004 */ beql $at, $zero, .L808A59E0 -/* 00460 808A59D0 8FBF001C */ lw $ra, 0x001C($sp) -/* 00464 808A59D4 0C01E233 */ jal func_800788CC -/* 00468 808A59D8 2404205C */ addiu $a0, $zero, 0x205C ## $a0 = 0000205C -/* 0046C 808A59DC 8FBF001C */ lw $ra, 0x001C($sp) -.L808A59E0: -/* 00470 808A59E0 8FB00018 */ lw $s0, 0x0018($sp) -/* 00474 808A59E4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00478 808A59E8 03E00008 */ jr $ra -/* 0047C 808A59EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A59F0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A59F0.s deleted file mode 100644 index 64873ca9a0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A59F0.s +++ /dev/null @@ -1,8 +0,0 @@ -glabel func_808A59F0 -/* 00480 808A59F0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00484 808A59F4 3C0E808A */ lui $t6, %hi(func_808A5A0C) ## $t6 = 808A0000 -/* 00488 808A59F8 25CE5A0C */ addiu $t6, $t6, %lo(func_808A5A0C) ## $t6 = 808A5A0C -/* 0048C 808A59FC AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 -/* 00490 808A5A00 AC80016C */ sw $zero, 0x016C($a0) ## 0000016C -/* 00494 808A5A04 03E00008 */ jr $ra -/* 00498 808A5A08 E4840060 */ swc1 $f4, 0x0060($a0) ## 00000060 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5A0C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5A0C.s deleted file mode 100644 index adf52e33f9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5A0C.s +++ /dev/null @@ -1,105 +0,0 @@ -.late_rodata -glabel D_808A6074 - .word 0x43C98000 -glabel D_808A6078 - .word 0x43C98000 - -.text -glabel func_808A5A0C -/* 0049C 808A5A0C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 004A0 808A5A10 AFBF0024 */ sw $ra, 0x0024($sp) -/* 004A4 808A5A14 AFB00020 */ sw $s0, 0x0020($sp) -/* 004A8 808A5A18 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 004AC 808A5A1C 0C00B638 */ jal Actor_MoveForward - -/* 004B0 808A5A20 AFA5003C */ sw $a1, 0x003C($sp) -/* 004B4 808A5A24 C60C0060 */ lwc1 $f12, 0x0060($s0) ## 00000060 -/* 004B8 808A5A28 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 004BC 808A5A2C 3C01808A */ lui $at, %hi(D_808A6074) ## $at = 808A0000 -/* 004C0 808A5A30 4604603C */ c.lt.s $f12, $f4 -/* 004C4 808A5A34 00000000 */ nop -/* 004C8 808A5A38 4502004D */ bc1fl .L808A5B70 -/* 004CC 808A5A3C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 004D0 808A5A40 C42E6074 */ lwc1 $f14, %lo(D_808A6074)($at) -/* 004D4 808A5A44 C6020028 */ lwc1 $f2, 0x0028($s0) ## 00000028 -/* 004D8 808A5A48 460E103E */ c.le.s $f2, $f14 -/* 004DC 808A5A4C 00000000 */ nop -/* 004E0 808A5A50 45020047 */ bc1fl .L808A5B70 -/* 004E4 808A5A54 8FBF0024 */ lw $ra, 0x0024($sp) -/* 004E8 808A5A58 8E02016C */ lw $v0, 0x016C($s0) ## 0000016C -/* 004EC 808A5A5C 28410004 */ slti $at, $v0, 0x0004 -/* 004F0 808A5A60 14200005 */ bne $at, $zero, .L808A5A78 -/* 004F4 808A5A64 00000000 */ nop -/* 004F8 808A5A68 0C2296E0 */ jal func_808A5B80 -/* 004FC 808A5A6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00500 808A5A70 1000003F */ beq $zero, $zero, .L808A5B70 -/* 00504 808A5A74 8FBF0024 */ lw $ra, 0x0024($sp) -.L808A5A78: -/* 00508 808A5A78 14400011 */ bne $v0, $zero, .L808A5AC0 -/* 0050C 808A5A7C 00000000 */ nop -/* 00510 808A5A80 8E0E0170 */ lw $t6, 0x0170($s0) ## 00000170 -/* 00514 808A5A84 2404281D */ addiu $a0, $zero, 0x281D ## $a0 = 0000281D -/* 00518 808A5A88 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 0051C 808A5A8C 0C01E233 */ jal func_800788CC -/* 00520 808A5A90 AE0F0170 */ sw $t7, 0x0170($s0) ## 00000170 -/* 00524 808A5A94 C6000094 */ lwc1 $f0, 0x0094($s0) ## 00000094 -/* 00528 808A5A98 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF -/* 0052C 808A5A9C 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 00530 808A5AA0 46000302 */ mul.s $f12, $f0, $f0 -/* 00534 808A5AA4 0C02A800 */ jal func_800AA000 -/* 00538 808A5AA8 24070096 */ addiu $a3, $zero, 0x0096 ## $a3 = 00000096 -/* 0053C 808A5AAC 3C01808A */ lui $at, %hi(D_808A6078) ## $at = 808A0000 -/* 00540 808A5AB0 C42E6078 */ lwc1 $f14, %lo(D_808A6078)($at) -/* 00544 808A5AB4 8E02016C */ lw $v0, 0x016C($s0) ## 0000016C -/* 00548 808A5AB8 C60C0060 */ lwc1 $f12, 0x0060($s0) ## 00000060 -/* 0054C 808A5ABC C6020028 */ lwc1 $f2, 0x0028($s0) ## 00000028 -.L808A5AC0: -/* 00550 808A5AC0 3C03808A */ lui $v1, %hi(D_808A5E90) ## $v1 = 808A0000 -/* 00554 808A5AC4 24635E90 */ addiu $v1, $v1, %lo(D_808A5E90) ## $v1 = 808A5E90 -/* 00558 808A5AC8 0002C080 */ sll $t8, $v0, 2 -/* 0055C 808A5ACC 460E1181 */ sub.s $f6, $f2, $f14 -/* 00560 808A5AD0 0078C821 */ addu $t9, $v1, $t8 -/* 00564 808A5AD4 C7280000 */ lwc1 $f8, 0x0000($t9) ## 00000000 -/* 00568 808A5AD8 46006005 */ abs.s $f0, $f12 -/* 0056C 808A5ADC 8E08016C */ lw $t0, 0x016C($s0) ## 0000016C -/* 00570 808A5AE0 46083282 */ mul.s $f10, $f6, $f8 -/* 00574 808A5AE4 8FA6003C */ lw $a2, 0x003C($sp) -/* 00578 808A5AE8 00084880 */ sll $t1, $t0, 2 -/* 0057C 808A5AEC 8E0B016C */ lw $t3, 0x016C($s0) ## 0000016C -/* 00580 808A5AF0 00695021 */ addu $t2, $v1, $t1 -/* 00584 808A5AF4 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 00588 808A5AF8 256C0001 */ addiu $t4, $t3, 0x0001 ## $t4 = 00000001 -/* 0058C 808A5AFC 46005403 */ div.s $f16, $f10, $f0 -/* 00590 808A5B00 46107481 */ sub.s $f18, $f14, $f16 -/* 00594 808A5B04 E6120028 */ swc1 $f18, 0x0028($s0) ## 00000028 -/* 00598 808A5B08 C5440000 */ lwc1 $f4, 0x0000($t2) ## 00000000 -/* 0059C 808A5B0C AE0C016C */ sw $t4, 0x016C($s0) ## 0000016C -/* 005A0 808A5B10 E6040060 */ swc1 $f4, 0x0060($s0) ## 00000060 -/* 005A4 808A5B14 84CD07A0 */ lh $t5, 0x07A0($a2) ## 000007A0 -/* 005A8 808A5B18 000D7080 */ sll $t6, $t5, 2 -/* 005AC 808A5B1C 00CE7821 */ addu $t7, $a2, $t6 -/* 005B0 808A5B20 0C024BE2 */ jal Quake_Add -/* 005B4 808A5B24 8DE40790 */ lw $a0, 0x0790($t7) ## 00000790 -/* 005B8 808A5B28 00022400 */ sll $a0, $v0, 16 -/* 005BC 808A5B2C AFA2002C */ sw $v0, 0x002C($sp) -/* 005C0 808A5B30 00042403 */ sra $a0, $a0, 16 -/* 005C4 808A5B34 0C024B6B */ jal Quake_SetSpeed -/* 005C8 808A5B38 2405C350 */ addiu $a1, $zero, 0xC350 ## $a1 = FFFFC350 -/* 005CC 808A5B3C 87B0002E */ lh $s0, 0x002E($sp) -/* 005D0 808A5B40 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 -/* 005D4 808A5B44 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 005D8 808A5B48 00102400 */ sll $a0, $s0, 16 -/* 005DC 808A5B4C 00042403 */ sra $a0, $a0, 16 -/* 005E0 808A5B50 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 005E4 808A5B54 0C024B9C */ jal Quake_SetQuakeValues -/* 005E8 808A5B58 AFA00010 */ sw $zero, 0x0010($sp) -/* 005EC 808A5B5C 00102400 */ sll $a0, $s0, 16 -/* 005F0 808A5B60 00042403 */ sra $a0, $a0, 16 -/* 005F4 808A5B64 0C024B7C */ jal Quake_SetCountdown -/* 005F8 808A5B68 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 -/* 005FC 808A5B6C 8FBF0024 */ lw $ra, 0x0024($sp) -.L808A5B70: -/* 00600 808A5B70 8FB00020 */ lw $s0, 0x0020($sp) -/* 00604 808A5B74 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00608 808A5B78 03E00008 */ jr $ra -/* 0060C 808A5B7C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5B80.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5B80.s deleted file mode 100644 index 6a028bdc9f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5B80.s +++ /dev/null @@ -1,15 +0,0 @@ -.late_rodata -glabel D_808A607C - .word 0x43C98000 - -.text -glabel func_808A5B80 -/* 00610 808A5B80 3C0E808A */ lui $t6, %hi(func_808A5BA4) ## $t6 = 808A0000 -/* 00614 808A5B84 25CE5BA4 */ addiu $t6, $t6, %lo(func_808A5BA4) ## $t6 = 808A5BA4 -/* 00618 808A5B88 AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 -/* 0061C 808A5B8C 3C01808A */ lui $at, %hi(D_808A607C) ## $at = 808A0000 -/* 00620 808A5B90 C424607C */ lwc1 $f4, %lo(D_808A607C)($at) -/* 00624 808A5B94 240F0014 */ addiu $t7, $zero, 0x0014 ## $t7 = 00000014 -/* 00628 808A5B98 AC8F0168 */ sw $t7, 0x0168($a0) ## 00000168 -/* 0062C 808A5B9C 03E00008 */ jr $ra -/* 00630 808A5BA0 E4840028 */ swc1 $f4, 0x0028($a0) ## 00000028 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5BA4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5BA4.s deleted file mode 100644 index 26e92bb398..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5BA4.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_808A5BA4 -/* 00634 808A5BA4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00638 808A5BA8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0063C 808A5BAC AFA5001C */ sw $a1, 0x001C($sp) -/* 00640 808A5BB0 8C8E0168 */ lw $t6, 0x0168($a0) ## 00000168 -/* 00644 808A5BB4 5DC00004 */ bgtzl $t6, .L808A5BC8 -/* 00648 808A5BB8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0064C 808A5BBC 0C2296F5 */ jal func_808A5BD4 -/* 00650 808A5BC0 00000000 */ nop -/* 00654 808A5BC4 8FBF0014 */ lw $ra, 0x0014($sp) -.L808A5BC8: -/* 00658 808A5BC8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0065C 808A5BCC 03E00008 */ jr $ra -/* 00660 808A5BD0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5BD4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5BD4.s deleted file mode 100644 index b8ff4d0d4d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5BD4.s +++ /dev/null @@ -1,13 +0,0 @@ -.late_rodata -glabel D_808A6080 - .word 0xBDCCCCCD - -.text -glabel func_808A5BD4 -/* 00664 808A5BD4 3C0E808A */ lui $t6, %hi(func_808A5BF0) ## $t6 = 808A0000 -/* 00668 808A5BD8 25CE5BF0 */ addiu $t6, $t6, %lo(func_808A5BF0) ## $t6 = 808A5BF0 -/* 0066C 808A5BDC AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 -/* 00670 808A5BE0 3C01808A */ lui $at, %hi(D_808A6080) ## $at = 808A0000 -/* 00674 808A5BE4 C4246080 */ lwc1 $f4, %lo(D_808A6080)($at) -/* 00678 808A5BE8 03E00008 */ jr $ra -/* 0067C 808A5BEC E4840060 */ swc1 $f4, 0x0060($a0) ## 00000060 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5BF0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5BF0.s deleted file mode 100644 index 0f469f71ac..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5BF0.s +++ /dev/null @@ -1,40 +0,0 @@ -.late_rodata -glabel D_808A6084 - .word 0x442AC000, 0x00000000, 0x00000000 - -.text -glabel func_808A5BF0 -/* 00680 808A5BF0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00684 808A5BF4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00688 808A5BF8 AFB00020 */ sw $s0, 0x0020($sp) -/* 0068C 808A5BFC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00690 808A5C00 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00694 808A5C04 AFA5002C */ sw $a1, 0x002C($sp) -/* 00698 808A5C08 3C063D75 */ lui $a2, 0x3D75 ## $a2 = 3D750000 -/* 0069C 808A5C0C 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 -/* 006A0 808A5C10 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD -/* 006A4 808A5C14 34C6C28F */ ori $a2, $a2, 0xC28F ## $a2 = 3D75C28F -/* 006A8 808A5C18 3C0540A0 */ lui $a1, 0x40A0 ## $a1 = 40A00000 -/* 006AC 808A5C1C 24840060 */ addiu $a0, $a0, 0x0060 ## $a0 = 00000060 -/* 006B0 808A5C20 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 006B4 808A5C24 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 006B8 808A5C28 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 006BC 808A5C2C C6080060 */ lwc1 $f8, 0x0060($s0) ## 00000060 -/* 006C0 808A5C30 3C01808A */ lui $at, %hi(D_808A6084) ## $at = 808A0000 -/* 006C4 808A5C34 46083280 */ add.s $f10, $f6, $f8 -/* 006C8 808A5C38 E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 -/* 006CC 808A5C3C C4326084 */ lwc1 $f18, %lo(D_808A6084)($at) -/* 006D0 808A5C40 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 006D4 808A5C44 4610903E */ c.le.s $f18, $f16 -/* 006D8 808A5C48 00000000 */ nop -/* 006DC 808A5C4C 45020004 */ bc1fl .L808A5C60 -/* 006E0 808A5C50 8FBF0024 */ lw $ra, 0x0024($sp) -/* 006E4 808A5C54 0C22963A */ jal func_808A58E8 -/* 006E8 808A5C58 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 006EC 808A5C5C 8FBF0024 */ lw $ra, 0x0024($sp) -.L808A5C60: -/* 006F0 808A5C60 8FB00020 */ lw $s0, 0x0020($sp) -/* 006F4 808A5C64 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 006F8 808A5C68 03E00008 */ jr $ra -/* 006FC 808A5C6C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5D60.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5D60.s deleted file mode 100644 index b43096733e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5D60.s +++ /dev/null @@ -1,79 +0,0 @@ -.rdata -glabel D_808A5FF8 - .asciz "../z_bg_mori_rakkatenjo.c" - .balign 4 - -glabel D_808A6014 - .asciz "../z_bg_mori_rakkatenjo.c" - .balign 4 - -glabel D_808A6030 - .asciz "../z_bg_mori_rakkatenjo.c" - .balign 4 - -.text -glabel func_808A5D60 -/* 007F0 808A5D60 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 007F4 808A5D64 AFB10018 */ sw $s1, 0x0018($sp) -/* 007F8 808A5D68 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 007FC 808A5D6C AFBF001C */ sw $ra, 0x001C($sp) -/* 00800 808A5D70 AFB00014 */ sw $s0, 0x0014($sp) -/* 00804 808A5D74 AFA40050 */ sw $a0, 0x0050($sp) -/* 00808 808A5D78 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 0080C 808A5D7C 3C06808A */ lui $a2, %hi(D_808A5FF8) ## $a2 = 808A0000 -/* 00810 808A5D80 24C65FF8 */ addiu $a2, $a2, %lo(D_808A5FF8) ## $a2 = 808A5FF8 -/* 00814 808A5D84 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 -/* 00818 808A5D88 240701F1 */ addiu $a3, $zero, 0x01F1 ## $a3 = 000001F1 -/* 0081C 808A5D8C 0C031AB1 */ jal Graph_OpenDisps -/* 00820 808A5D90 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00824 808A5D94 0C024F46 */ jal func_80093D18 -/* 00828 808A5D98 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 0082C 808A5D9C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 00830 808A5DA0 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 00834 808A5DA4 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 -/* 00838 808A5DA8 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 0083C 808A5DAC AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 -/* 00840 808A5DB0 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 00844 808A5DB4 8FB80050 */ lw $t8, 0x0050($sp) -/* 00848 808A5DB8 3C0A0001 */ lui $t2, 0x0001 ## $t2 = 00010000 -/* 0084C 808A5DBC 3C0CDA38 */ lui $t4, 0xDA38 ## $t4 = DA380000 -/* 00850 808A5DC0 83190174 */ lb $t9, 0x0174($t8) ## 00000174 -/* 00854 808A5DC4 358C0003 */ ori $t4, $t4, 0x0003 ## $t4 = DA380003 -/* 00858 808A5DC8 3C05808A */ lui $a1, %hi(D_808A6014) ## $a1 = 808A0000 -/* 0085C 808A5DCC 00194100 */ sll $t0, $t9, 4 -/* 00860 808A5DD0 01194021 */ addu $t0, $t0, $t9 -/* 00864 808A5DD4 00084080 */ sll $t0, $t0, 2 -/* 00868 808A5DD8 02284821 */ addu $t1, $s1, $t0 -/* 0086C 808A5DDC 01495021 */ addu $t2, $t2, $t1 -/* 00870 808A5DE0 8D4A17B4 */ lw $t2, 0x17B4($t2) ## 000117B4 -/* 00874 808A5DE4 24A56014 */ addiu $a1, $a1, %lo(D_808A6014) ## $a1 = 808A6014 -/* 00878 808A5DE8 240601F6 */ addiu $a2, $zero, 0x01F6 ## $a2 = 000001F6 -/* 0087C 808A5DEC AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 -/* 00880 808A5DF0 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 00884 808A5DF4 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 00888 808A5DF8 AE0B02C0 */ sw $t3, 0x02C0($s0) ## 000002C0 -/* 0088C 808A5DFC AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 00890 808A5E00 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 00894 808A5E04 0C0346A2 */ jal Matrix_NewMtx -/* 00898 808A5E08 AFA2002C */ sw $v0, 0x002C($sp) -/* 0089C 808A5E0C 8FA3002C */ lw $v1, 0x002C($sp) -/* 008A0 808A5E10 3C0F0600 */ lui $t7, 0x0600 ## $t7 = 06000000 -/* 008A4 808A5E14 25EF7690 */ addiu $t7, $t7, 0x7690 ## $t7 = 06007690 -/* 008A8 808A5E18 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 008AC 808A5E1C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 008B0 808A5E20 3C0EDE00 */ lui $t6, 0xDE00 ## $t6 = DE000000 -/* 008B4 808A5E24 3C06808A */ lui $a2, %hi(D_808A6030) ## $a2 = 808A0000 -/* 008B8 808A5E28 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 008BC 808A5E2C AE0D02C0 */ sw $t5, 0x02C0($s0) ## 000002C0 -/* 008C0 808A5E30 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 008C4 808A5E34 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 008C8 808A5E38 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 008CC 808A5E3C 24C66030 */ addiu $a2, $a2, %lo(D_808A6030) ## $a2 = 808A6030 -/* 008D0 808A5E40 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 -/* 008D4 808A5E44 0C031AD5 */ jal Graph_CloseDisps -/* 008D8 808A5E48 240701FA */ addiu $a3, $zero, 0x01FA ## $a3 = 000001FA -/* 008DC 808A5E4C 8FBF001C */ lw $ra, 0x001C($sp) -/* 008E0 808A5E50 8FB00014 */ lw $s0, 0x0014($sp) -/* 008E4 808A5E54 8FB10018 */ lw $s1, 0x0018($sp) -/* 008E8 808A5E58 03E00008 */ jr $ra -/* 008EC 808A5E5C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Destroy.s deleted file mode 100644 index 04c17b21b1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Destroy.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel BgPoEvent_Destroy -/* 00638 808A6848 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0063C 808A684C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00640 808A6850 AFA5001C */ sw $a1, 0x001C($sp) -/* 00644 808A6854 908E0168 */ lbu $t6, 0x0168($a0) ## 00000168 -/* 00648 808A6858 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 0064C 808A685C 8FA4001C */ lw $a0, 0x001C($sp) -/* 00650 808A6860 29C10002 */ slti $at, $t6, 0x0002 -/* 00654 808A6864 54200007 */ bnel $at, $zero, .L808A6884 -/* 00658 808A6868 8CE6014C */ lw $a2, 0x014C($a3) ## 0000014C -/* 0065C 808A686C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00660 808A6870 0C017232 */ jal Collider_DestroyTris -/* 00664 808A6874 24E50170 */ addiu $a1, $a3, 0x0170 ## $a1 = 00000170 -/* 00668 808A6878 10000012 */ beq $zero, $zero, .L808A68C4 -/* 0066C 808A687C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00670 808A6880 8CE6014C */ lw $a2, 0x014C($a3) ## 0000014C -.L808A6884: -/* 00674 808A6884 AFA70018 */ sw $a3, 0x0018($sp) -/* 00678 808A6888 0C00FB56 */ jal DynaPolyInfo_Free - ## DynaPolyInfo_delReserve -/* 0067C 808A688C 24850810 */ addiu $a1, $a0, 0x0810 ## $a1 = 00000810 -/* 00680 808A6890 8FA70018 */ lw $a3, 0x0018($sp) -/* 00684 808A6894 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00688 808A6898 3C028016 */ lui $v0, %hi(gSaveContext) -/* 0068C 808A689C 90F80168 */ lbu $t8, 0x0168($a3) ## 00000168 -/* 00690 808A68A0 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00694 808A68A4 57010007 */ bnel $t8, $at, .L808A68C4 -/* 00698 808A68A8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0069C 808A68AC 845913D0 */ lh $t9, 0x13D0($v0) ## 8015FA30 -/* 006A0 808A68B0 2408000A */ addiu $t0, $zero, 0x000A ## $t0 = 0000000A -/* 006A4 808A68B4 5B200003 */ blezl $t9, .L808A68C4 -/* 006A8 808A68B8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 006AC 808A68BC A44813CE */ sh $t0, 0x13CE($v0) ## 8015FA2E -/* 006B0 808A68C0 8FBF0014 */ lw $ra, 0x0014($sp) -.L808A68C4: -/* 006B4 808A68C4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 006B8 808A68C8 03E00008 */ jr $ra -/* 006BC 808A68CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Draw.s deleted file mode 100644 index fe934a8819..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Draw.s +++ /dev/null @@ -1,202 +0,0 @@ -.rdata -glabel D_808A7DB0 - .asciz "../z_bg_po_event.c" - .balign 4 - -glabel D_808A7DC4 - .asciz "../z_bg_po_event.c" - .balign 4 - -glabel D_808A7DD8 - .asciz "../z_bg_po_event.c" - .balign 4 - -.late_rodata -glabel D_808A7E00 - .word 0x44504000 -glabel D_808A7E04 - .float 0.0025 - -glabel D_808A7E08 - .float 0.3 - -glabel D_808A7E0C - .float 0.4 - -.text -glabel BgPoEvent_Draw -/* 0180C 808A7A1C 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 01810 808A7A20 AFBF001C */ sw $ra, 0x001C($sp) -/* 01814 808A7A24 AFB00018 */ sw $s0, 0x0018($sp) -/* 01818 808A7A28 AFA50074 */ sw $a1, 0x0074($sp) -/* 0181C 808A7A2C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 01820 808A7A30 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01824 808A7A34 3C06808A */ lui $a2, %hi(D_808A7DB0) ## $a2 = 808A0000 -/* 01828 808A7A38 24C67DB0 */ addiu $a2, $a2, %lo(D_808A7DB0) ## $a2 = 808A7DB0 -/* 0182C 808A7A3C 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFC0 -/* 01830 808A7A40 240705C9 */ addiu $a3, $zero, 0x05C9 ## $a3 = 000005C9 -/* 01834 808A7A44 0C031AB1 */ jal Graph_OpenDisps -/* 01838 808A7A48 AFA50040 */ sw $a1, 0x0040($sp) -/* 0183C 808A7A4C 8FAF0074 */ lw $t7, 0x0074($sp) -/* 01840 808A7A50 0C024F46 */ jal func_80093D18 -/* 01844 808A7A54 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 01848 808A7A58 92020168 */ lbu $v0, 0x0168($s0) ## 00000168 -/* 0184C 808A7A5C 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 01850 808A7A60 8FA80040 */ lw $t0, 0x0040($sp) -/* 01854 808A7A64 10410004 */ beq $v0, $at, .L808A7A78 -/* 01858 808A7A68 3C0EDA38 */ lui $t6, 0xDA38 ## $t6 = DA380000 -/* 0185C 808A7A6C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01860 808A7A70 54410018 */ bnel $v0, $at, .L808A7AD4 -/* 01864 808A7A74 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -.L808A7A78: -/* 01868 808A7A78 8E020164 */ lw $v0, 0x0164($s0) ## 00000164 -/* 0186C 808A7A7C 3C18808A */ lui $t8, %hi(func_808A7500) ## $t8 = 808A0000 -/* 01870 808A7A80 27187500 */ addiu $t8, $t8, %lo(func_808A7500) ## $t8 = 808A7500 -/* 01874 808A7A84 17020003 */ bne $t8, $v0, .L808A7A94 -/* 01878 808A7A88 3C0AFB00 */ lui $t2, 0xFB00 ## $t2 = FB000000 -/* 0187C 808A7A8C 10000008 */ beq $zero, $zero, .L808A7AB0 -/* 01880 808A7A90 240400FF */ addiu $a0, $zero, 0x00FF ## $a0 = 000000FF -.L808A7A94: -/* 01884 808A7A94 3C19808A */ lui $t9, %hi(func_808A75B8) ## $t9 = 808A0000 -/* 01888 808A7A98 273975B8 */ addiu $t9, $t9, %lo(func_808A75B8) ## $t9 = 808A75B8 -/* 0188C 808A7A9C 57220004 */ bnel $t9, $v0, .L808A7AB0 -/* 01890 808A7AA0 9204016D */ lbu $a0, 0x016D($s0) ## 0000016D -/* 01894 808A7AA4 10000002 */ beq $zero, $zero, .L808A7AB0 -/* 01898 808A7AA8 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 -/* 0189C 808A7AAC 9204016D */ lbu $a0, 0x016D($s0) ## 0000016D -.L808A7AB0: -/* 018A0 808A7AB0 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 018A4 808A7AB4 308B00FF */ andi $t3, $a0, 0x00FF ## $t3 = 00000000 -/* 018A8 808A7AB8 2401FF00 */ addiu $at, $zero, 0xFF00 ## $at = FFFFFF00 -/* 018AC 808A7ABC 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 018B0 808A7AC0 AD0902C0 */ sw $t1, 0x02C0($t0) ## 000002C0 -/* 018B4 808A7AC4 01616025 */ or $t4, $t3, $at ## $t4 = FFFFFF00 -/* 018B8 808A7AC8 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 018BC 808A7ACC AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 018C0 808A7AD0 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -.L808A7AD4: -/* 018C4 808A7AD4 35CE0003 */ ori $t6, $t6, 0x0003 ## $t6 = DA380003 -/* 018C8 808A7AD8 3C05808A */ lui $a1, %hi(D_808A7DC4) ## $a1 = 808A0000 -/* 018CC 808A7ADC 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 018D0 808A7AE0 AD0D02C0 */ sw $t5, 0x02C0($t0) ## 000002C0 -/* 018D4 808A7AE4 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 018D8 808A7AE8 8FAF0074 */ lw $t7, 0x0074($sp) -/* 018DC 808A7AEC 24A57DC4 */ addiu $a1, $a1, %lo(D_808A7DC4) ## $a1 = 808A7DC4 -/* 018E0 808A7AF0 240605DD */ addiu $a2, $zero, 0x05DD ## $a2 = 000005DD -/* 018E4 808A7AF4 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 018E8 808A7AF8 AFA80040 */ sw $t0, 0x0040($sp) -/* 018EC 808A7AFC 0C0346A2 */ jal Matrix_NewMtx -/* 018F0 808A7B00 AFA20028 */ sw $v0, 0x0028($sp) -/* 018F4 808A7B04 8FA30028 */ lw $v1, 0x0028($sp) -/* 018F8 808A7B08 8FA80040 */ lw $t0, 0x0040($sp) -/* 018FC 808A7B0C 3C19DE00 */ lui $t9, 0xDE00 ## $t9 = DE000000 -/* 01900 808A7B10 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 01904 808A7B14 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 01908 808A7B18 3C0B808A */ lui $t3, %hi(D_808A7D94) ## $t3 = 808A0000 -/* 0190C 808A7B1C 3C06808A */ lui $a2, %hi(D_808A7DD8) ## $a2 = 808A0000 -/* 01910 808A7B20 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 01914 808A7B24 AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 -/* 01918 808A7B28 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 0191C 808A7B2C 92090168 */ lbu $t1, 0x0168($s0) ## 00000168 -/* 01920 808A7B30 24C67DD8 */ addiu $a2, $a2, %lo(D_808A7DD8) ## $a2 = 808A7DD8 -/* 01924 808A7B34 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFC0 -/* 01928 808A7B38 00095080 */ sll $t2, $t1, 2 -/* 0192C 808A7B3C 016A5821 */ addu $t3, $t3, $t2 -/* 01930 808A7B40 8D6B7D94 */ lw $t3, %lo(D_808A7D94)($t3) -/* 01934 808A7B44 240705E4 */ addiu $a3, $zero, 0x05E4 ## $a3 = 000005E4 -/* 01938 808A7B48 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 0193C 808A7B4C 8FAC0074 */ lw $t4, 0x0074($sp) -/* 01940 808A7B50 0C031AD5 */ jal Graph_CloseDisps -/* 01944 808A7B54 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 01948 808A7B58 92020168 */ lbu $v0, 0x0168($s0) ## 00000168 -/* 0194C 808A7B5C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01950 808A7B60 50400003 */ beql $v0, $zero, .L808A7B70 -/* 01954 808A7B64 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01958 808A7B68 1441004A */ bne $v0, $at, .L808A7C94 -/* 0195C 808A7B6C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -.L808A7B70: -/* 01960 808A7B70 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 01964 808A7B74 3C01808A */ lui $at, %hi(D_808A7E00) ## $at = 808A0000 -/* 01968 808A7B78 C4247E00 */ lwc1 $f4, %lo(D_808A7E00)($at) -/* 0196C 808A7B7C C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 01970 808A7B80 3C01808A */ lui $at, %hi(D_808A7E04) ## $at = 808A0000 -/* 01974 808A7B84 C42A7E04 */ lwc1 $f10, %lo(D_808A7E04)($at) -/* 01978 808A7B88 46062201 */ sub.s $f8, $f4, $f6 -/* 0197C 808A7B8C 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 01980 808A7B90 460A4002 */ mul.s $f0, $f8, $f10 -/* 01984 808A7B94 4600103C */ c.lt.s $f2, $f0 -/* 01988 808A7B98 00000000 */ nop -/* 0198C 808A7B9C 4503003E */ bc1tl .L808A7C98 -/* 01990 808A7BA0 8FBF001C */ lw $ra, 0x001C($sp) -/* 01994 808A7BA4 C6100024 */ lwc1 $f16, 0x0024($s0) ## 00000024 -/* 01998 808A7BA8 44812000 */ mtc1 $at, $f4 ## $f4 = 30.00 -/* 0199C 808A7BAC 3C01808A */ lui $at, %hi(D_808A7E08) ## $at = 808A0000 -/* 019A0 808A7BB0 E7B00058 */ swc1 $f16, 0x0058($sp) -/* 019A4 808A7BB4 C6120028 */ lwc1 $f18, 0x0028($s0) ## 00000028 -/* 019A8 808A7BB8 C42A7E08 */ lwc1 $f10, %lo(D_808A7E08)($at) -/* 019AC 808A7BBC 3C01808A */ lui $at, %hi(D_808A7E0C) ## $at = 808A0000 -/* 019B0 808A7BC0 46049181 */ sub.s $f6, $f18, $f4 -/* 019B4 808A7BC4 C4327E0C */ lwc1 $f18, %lo(D_808A7E0C)($at) -/* 019B8 808A7BC8 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 019BC 808A7BCC 460A0402 */ mul.s $f16, $f0, $f10 -/* 019C0 808A7BD0 E7A6005C */ swc1 $f6, 0x005C($sp) -/* 019C4 808A7BD4 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 019C8 808A7BD8 44813000 */ mtc1 $at, $f6 ## $f6 = 100.00 -/* 019CC 808A7BDC 3C01431B */ lui $at, 0x431B ## $at = 431B0000 -/* 019D0 808A7BE0 E7A80060 */ swc1 $f8, 0x0060($sp) -/* 019D4 808A7BE4 46060202 */ mul.s $f8, $f0, $f6 -/* 019D8 808A7BE8 44815000 */ mtc1 $at, $f10 ## $f10 = 155.00 -/* 019DC 808A7BEC 46128100 */ add.s $f4, $f16, $f18 -/* 019E0 808A7BF0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 019E4 808A7BF4 E7A20050 */ swc1 $f2, 0x0050($sp) -/* 019E8 808A7BF8 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 019EC 808A7BFC E7A40054 */ swc1 $f4, 0x0054($sp) -/* 019F0 808A7C00 460A4400 */ add.s $f16, $f8, $f10 -/* 019F4 808A7C04 E7A4004C */ swc1 $f4, 0x004C($sp) -/* 019F8 808A7C08 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 -/* 019FC 808A7C0C 27A5004C */ addiu $a1, $sp, 0x004C ## $a1 = FFFFFFDC -/* 01A00 808A7C10 444DF800 */ cfc1 $t5, $31 -/* 01A04 808A7C14 44C6F800 */ ctc1 $a2, $31 -/* 01A08 808A7C18 8FA70074 */ lw $a3, 0x0074($sp) -/* 01A0C 808A7C1C 460084A4 */ cvt.w.s $f18, $f16 -/* 01A10 808A7C20 4446F800 */ cfc1 $a2, $31 -/* 01A14 808A7C24 00000000 */ nop -/* 01A18 808A7C28 30C60078 */ andi $a2, $a2, 0x0078 ## $a2 = 00000000 -/* 01A1C 808A7C2C 50C00013 */ beql $a2, $zero, .L808A7C7C -/* 01A20 808A7C30 44069000 */ mfc1 $a2, $f18 -/* 01A24 808A7C34 44819000 */ mtc1 $at, $f18 ## $f18 = 2147483648.00 -/* 01A28 808A7C38 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01A2C 808A7C3C 46128481 */ sub.s $f18, $f16, $f18 -/* 01A30 808A7C40 44C6F800 */ ctc1 $a2, $31 -/* 01A34 808A7C44 00000000 */ nop -/* 01A38 808A7C48 460094A4 */ cvt.w.s $f18, $f18 -/* 01A3C 808A7C4C 4446F800 */ cfc1 $a2, $31 -/* 01A40 808A7C50 00000000 */ nop -/* 01A44 808A7C54 30C60078 */ andi $a2, $a2, 0x0078 ## $a2 = 00000000 -/* 01A48 808A7C58 14C00005 */ bne $a2, $zero, .L808A7C70 -/* 01A4C 808A7C5C 00000000 */ nop -/* 01A50 808A7C60 44069000 */ mfc1 $a2, $f18 -/* 01A54 808A7C64 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01A58 808A7C68 10000007 */ beq $zero, $zero, .L808A7C88 -/* 01A5C 808A7C6C 00C13025 */ or $a2, $a2, $at ## $a2 = 80000000 -.L808A7C70: -/* 01A60 808A7C70 10000005 */ beq $zero, $zero, .L808A7C88 -/* 01A64 808A7C74 2406FFFF */ addiu $a2, $zero, 0xFFFF ## $a2 = FFFFFFFF -/* 01A68 808A7C78 44069000 */ mfc1 $a2, $f18 -.L808A7C7C: -/* 01A6C 808A7C7C 00000000 */ nop -/* 01A70 808A7C80 04C0FFFB */ bltz $a2, .L808A7C70 -/* 01A74 808A7C84 00000000 */ nop -.L808A7C88: -/* 01A78 808A7C88 44CDF800 */ ctc1 $t5, $31 -/* 01A7C 808A7C8C 0C00CF0C */ jal func_80033C30 -/* 01A80 808A7C90 30C600FF */ andi $a2, $a2, 0x00FF ## $a2 = 000000FF -.L808A7C94: -/* 01A84 808A7C94 8FBF001C */ lw $ra, 0x001C($sp) -.L808A7C98: -/* 01A88 808A7C98 8FB00018 */ lw $s0, 0x0018($sp) -/* 01A8C 808A7C9C 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 -/* 01A90 808A7CA0 03E00008 */ jr $ra -/* 01A94 808A7CA4 00000000 */ nop -/* 01A98 808A7CA8 00000000 */ nop -/* 01A9C 808A7CAC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Init.s deleted file mode 100644 index c46a71c9b7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Init.s +++ /dev/null @@ -1,78 +0,0 @@ -glabel BgPoEvent_Init -/* 0052C 808A673C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00530 808A6740 AFB10020 */ sw $s1, 0x0020($sp) -/* 00534 808A6744 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00538 808A6748 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0053C 808A674C AFB0001C */ sw $s0, 0x001C($sp) -/* 00540 808A6750 3C05808A */ lui $a1, %hi(D_808A7D88) ## $a1 = 808A0000 -/* 00544 808A6754 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00548 808A6758 0C01E037 */ jal Actor_ProcessInitChain - -/* 0054C 808A675C 24A57D88 */ addiu $a1, $a1, %lo(D_808A7D88) ## $a1 = 808A7D88 -/* 00550 808A6760 860E001C */ lh $t6, 0x001C($s0) ## 0000001C -/* 00554 808A6764 8619001C */ lh $t9, 0x001C($s0) ## 0000001C -/* 00558 808A6768 860A001C */ lh $t2, 0x001C($s0) ## 0000001C -/* 0055C 808A676C 000E7A03 */ sra $t7, $t6, 8 -/* 00560 808A6770 31F8000F */ andi $t8, $t7, 0x000F ## $t8 = 00000000 -/* 00564 808A6774 330C00FF */ andi $t4, $t8, 0x00FF ## $t4 = 00000000 -/* 00568 808A6778 00194303 */ sra $t0, $t9, 12 -/* 0056C 808A677C 3109000F */ andi $t1, $t0, 0x000F ## $t1 = 00000000 -/* 00570 808A6780 29810002 */ slti $at, $t4, 0x0002 -/* 00574 808A6784 314B003F */ andi $t3, $t2, 0x003F ## $t3 = 00000000 -/* 00578 808A6788 A2180168 */ sb $t8, 0x0168($s0) ## 00000168 -/* 0057C 808A678C A2090169 */ sb $t1, 0x0169($s0) ## 00000169 -/* 00580 808A6790 1420001A */ bne $at, $zero, .L808A67FC -/* 00584 808A6794 A60B001C */ sh $t3, 0x001C($s0) ## 0000001C -/* 00588 808A6798 26050170 */ addiu $a1, $s0, 0x0170 ## $a1 = 00000170 -/* 0058C 808A679C AFA5002C */ sw $a1, 0x002C($sp) -/* 00590 808A67A0 0C0171F8 */ jal Collider_InitTris -/* 00594 808A67A4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00598 808A67A8 3C07808A */ lui $a3, %hi(D_808A7D48) ## $a3 = 808A0000 -/* 0059C 808A67AC 260D0190 */ addiu $t5, $s0, 0x0190 ## $t5 = 00000190 -/* 005A0 808A67B0 8FA5002C */ lw $a1, 0x002C($sp) -/* 005A4 808A67B4 AFAD0010 */ sw $t5, 0x0010($sp) -/* 005A8 808A67B8 24E77D48 */ addiu $a3, $a3, %lo(D_808A7D48) ## $a3 = 808A7D48 -/* 005AC 808A67BC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 005B0 808A67C0 0C0172EB */ jal Collider_SetTris -/* 005B4 808A67C4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 005B8 808A67C8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 005BC 808A67CC 0C00B2D0 */ jal Flags_GetSwitch - -/* 005C0 808A67D0 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 005C4 808A67D4 10400005 */ beq $v0, $zero, .L808A67EC -/* 005C8 808A67D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 005CC 808A67DC 0C00B55C */ jal Actor_Kill - -/* 005D0 808A67E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 005D4 808A67E4 10000014 */ beq $zero, $zero, .L808A6838 -/* 005D8 808A67E8 8FBF0024 */ lw $ra, 0x0024($sp) -.L808A67EC: -/* 005DC 808A67EC 0C229884 */ jal func_808A6210 -/* 005E0 808A67F0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 005E4 808A67F4 10000010 */ beq $zero, $zero, .L808A6838 -/* 005E8 808A67F8 8FBF0024 */ lw $ra, 0x0024($sp) -.L808A67FC: -/* 005EC 808A67FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 005F0 808A6800 0C010D20 */ jal DynaPolyInfo_SetActorMove - -/* 005F4 808A6804 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 005F8 808A6808 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 005FC 808A680C 0C00B2D0 */ jal Flags_GetSwitch - -/* 00600 808A6810 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 00604 808A6814 10400005 */ beq $v0, $zero, .L808A682C -/* 00608 808A6818 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0060C 808A681C 0C00B55C */ jal Actor_Kill - -/* 00610 808A6820 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00614 808A6824 10000004 */ beq $zero, $zero, .L808A6838 -/* 00618 808A6828 8FBF0024 */ lw $ra, 0x0024($sp) -.L808A682C: -/* 0061C 808A682C 0C229963 */ jal func_808A658C -/* 00620 808A6830 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00624 808A6834 8FBF0024 */ lw $ra, 0x0024($sp) -.L808A6838: -/* 00628 808A6838 8FB0001C */ lw $s0, 0x001C($sp) -/* 0062C 808A683C 8FB10020 */ lw $s1, 0x0020($sp) -/* 00630 808A6840 03E00008 */ jr $ra -/* 00634 808A6844 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Update.s deleted file mode 100644 index 5bb9ae61f7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Update.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel BgPoEvent_Update -/* 017A8 808A79B8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 017AC 808A79BC AFBF0014 */ sw $ra, 0x0014($sp) -/* 017B0 808A79C0 AFA5001C */ sw $a1, 0x001C($sp) -/* 017B4 808A79C4 AFA40018 */ sw $a0, 0x0018($sp) -/* 017B8 808A79C8 8C990164 */ lw $t9, 0x0164($a0) ## 00000164 -/* 017BC 808A79CC 0320F809 */ jalr $ra, $t9 -/* 017C0 808A79D0 00000000 */ nop -/* 017C4 808A79D4 8FA70018 */ lw $a3, 0x0018($sp) -/* 017C8 808A79D8 3C0E808A */ lui $t6, %hi(func_808A72AC) ## $t6 = 808A0000 -/* 017CC 808A79DC 25CE72AC */ addiu $t6, $t6, %lo(func_808A72AC) ## $t6 = 808A72AC -/* 017D0 808A79E0 8CE20164 */ lw $v0, 0x0164($a3) ## 00000164 -/* 017D4 808A79E4 3C0F808A */ lui $t7, %hi(func_808A75B8) ## $t7 = 808A0000 -/* 017D8 808A79E8 8FA4001C */ lw $a0, 0x001C($sp) -/* 017DC 808A79EC 11C20002 */ beq $t6, $v0, .L808A79F8 -/* 017E0 808A79F0 25EF75B8 */ addiu $t7, $t7, %lo(func_808A75B8) ## $t7 = 808A75B8 -/* 017E4 808A79F4 15E20005 */ bne $t7, $v0, .L808A7A0C -.L808A79F8: -/* 017E8 808A79F8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 017EC 808A79FC 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 017F0 808A7A00 00812821 */ addu $a1, $a0, $at -/* 017F4 808A7A04 0C01767D */ jal CollisionCheck_SetAC - ## CollisionCheck_setAC -/* 017F8 808A7A08 24E60170 */ addiu $a2, $a3, 0x0170 ## $a2 = 00000170 -.L808A7A0C: -/* 017FC 808A7A0C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01800 808A7A10 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01804 808A7A14 03E00008 */ jr $ra -/* 01808 808A7A18 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A6210.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A6210.s deleted file mode 100644 index 58f970d081..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A6210.s +++ /dev/null @@ -1,252 +0,0 @@ -.late_rodata -glabel D_808A7DEC - .word 0x4019999A -glabel D_808A7DF0 - .word 0x3FE8B439 - -.text -glabel func_808A6210 -/* 00000 808A6210 27BDFF30 */ addiu $sp, $sp, 0xFF30 ## $sp = FFFFFF30 -/* 00004 808A6214 AFB00050 */ sw $s0, 0x0050($sp) -/* 00008 808A6218 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0000C 808A621C AFBF0074 */ sw $ra, 0x0074($sp) -/* 00010 808A6220 AFBE0070 */ sw $s8, 0x0070($sp) -/* 00014 808A6224 AFB7006C */ sw $s7, 0x006C($sp) -/* 00018 808A6228 AFB60068 */ sw $s6, 0x0068($sp) -/* 0001C 808A622C AFB50064 */ sw $s5, 0x0064($sp) -/* 00020 808A6230 AFB40060 */ sw $s4, 0x0060($sp) -/* 00024 808A6234 AFB3005C */ sw $s3, 0x005C($sp) -/* 00028 808A6238 AFB20058 */ sw $s2, 0x0058($sp) -/* 0002C 808A623C AFB10054 */ sw $s1, 0x0054($sp) -/* 00030 808A6240 F7B80048 */ sdc1 $f24, 0x0048($sp) -/* 00034 808A6244 F7B60040 */ sdc1 $f22, 0x0040($sp) -/* 00038 808A6248 F7B40038 */ sdc1 $f20, 0x0038($sp) -/* 0003C 808A624C AFA500D4 */ sw $a1, 0x00D4($sp) -/* 00040 808A6250 0C01DE1C */ jal Math_Sins - ## sins? -/* 00044 808A6254 848400B6 */ lh $a0, 0x00B6($a0) ## 000000B6 -/* 00048 808A6258 46000506 */ mov.s $f20, $f0 -/* 0004C 808A625C 0C01DE0D */ jal Math_Coss - ## coss? -/* 00050 808A6260 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 00054 808A6264 92080168 */ lbu $t0, 0x0168($s0) ## 00000168 -/* 00058 808A6268 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 0005C 808A626C 46000586 */ mov.s $f22, $f0 -/* 00060 808A6270 1501000A */ bne $t0, $at, .L808A629C -/* 00064 808A6274 3C14808A */ lui $s4, %hi(D_808A7D48) ## $s4 = 808A0000 -/* 00068 808A6278 3C01808A */ lui $at, %hi(D_808A7DEC) ## $at = 808A0000 -/* 0006C 808A627C C4227DEC */ lwc1 $f2, %lo(D_808A7DEC)($at) -/* 00070 808A6280 3C01808A */ lui $at, %hi(D_808A7DF0) ## $at = 808A0000 -/* 00074 808A6284 C4387DF0 */ lwc1 $f24, %lo(D_808A7DF0)($at) -/* 00078 808A6288 4602A502 */ mul.s $f20, $f20, $f2 -/* 0007C 808A628C 00000000 */ nop -/* 00080 808A6290 46020582 */ mul.s $f22, $f0, $f2 -/* 00084 808A6294 10000004 */ beq $zero, $zero, .L808A62A8 -/* 00088 808A6298 00000000 */ nop -.L808A629C: -/* 0008C 808A629C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00090 808A62A0 4481C000 */ mtc1 $at, $f24 ## $f24 = 1.00 -/* 00094 808A62A4 00000000 */ nop -.L808A62A8: -/* 00098 808A62A8 26947D48 */ addiu $s4, $s4, %lo(D_808A7D48) ## $s4 = 808A7D48 -/* 0009C 808A62AC 8E8E0008 */ lw $t6, 0x0008($s4) ## 808A7D50 -/* 000A0 808A62B0 00009025 */ or $s2, $zero, $zero ## $s2 = 00000000 -/* 000A4 808A62B4 00009825 */ or $s3, $zero, $zero ## $s3 = 00000000 -/* 000A8 808A62B8 19C00046 */ blez $t6, .L808A63D4 -/* 000AC 808A62BC 26150170 */ addiu $s5, $s0, 0x0170 ## $s5 = 00000170 -/* 000B0 808A62C0 27BE00B4 */ addiu $s8, $sp, 0x00B4 ## $s8 = FFFFFFE4 -/* 000B4 808A62C4 27B700A8 */ addiu $s7, $sp, 0x00A8 ## $s7 = FFFFFFD8 -/* 000B8 808A62C8 27B6009C */ addiu $s6, $sp, 0x009C ## $s6 = FFFFFFCC -/* 000BC 808A62CC 27B100C0 */ addiu $s1, $sp, 0x00C0 ## $s1 = FFFFFFF0 -/* 000C0 808A62D0 8E8F000C */ lw $t7, 0x000C($s4) ## 808A7D54 -.L808A62D4: -/* 000C4 808A62D4 27A3009C */ addiu $v1, $sp, 0x009C ## $v1 = FFFFFFCC -/* 000C8 808A62D8 026F1021 */ addu $v0, $s3, $t7 -/* 000CC 808A62DC C44A0020 */ lwc1 $f10, 0x0020($v0) ## 00000020 -/* 000D0 808A62E0 2463000C */ addiu $v1, $v1, 0x000C ## $v1 = FFFFFFD8 -/* 000D4 808A62E4 C6120008 */ lwc1 $f18, 0x0008($s0) ## 00000008 -/* 000D8 808A62E8 460AA402 */ mul.s $f16, $f20, $f10 -/* 000DC 808A62EC 1071001A */ beq $v1, $s1, .L808A6358 -/* 000E0 808A62F0 C44E0018 */ lwc1 $f14, 0x0018($v0) ## 00000018 -.L808A62F4: -/* 000E4 808A62F4 46167302 */ mul.s $f12, $f14, $f22 -/* 000E8 808A62F8 46109280 */ add.s $f10, $f18, $f16 -/* 000EC 808A62FC 2463000C */ addiu $v1, $v1, 0x000C ## $v1 = FFFFFFE4 -/* 000F0 808A6300 2442000C */ addiu $v0, $v0, 0x000C ## $v0 = 0000000C -/* 000F4 808A6304 460A6280 */ add.s $f10, $f12, $f10 -/* 000F8 808A6308 E46AFFE8 */ swc1 $f10, -0x0018($v1) ## FFFFFFCC -/* 000FC 808A630C C44A0010 */ lwc1 $f10, 0x0010($v0) ## 0000001C -/* 00100 808A6310 C60C000C */ lwc1 $f12, 0x000C($s0) ## 0000000C -/* 00104 808A6314 46185282 */ mul.s $f10, $f10, $f24 -/* 00108 808A6318 460C5300 */ add.s $f12, $f10, $f12 -/* 0010C 808A631C E46CFFEC */ swc1 $f12, -0x0014($v1) ## FFFFFFD0 -/* 00110 808A6320 C44C0014 */ lwc1 $f12, 0x0014($v0) ## 00000020 -/* 00114 808A6324 C44A000C */ lwc1 $f10, 0x000C($v0) ## 00000018 -/* 00118 808A6328 C6080010 */ lwc1 $f8, 0x0010($s0) ## 00000010 -/* 0011C 808A632C 460CB302 */ mul.s $f12, $f22, $f12 -/* 00120 808A6330 460C4300 */ add.s $f12, $f8, $f12 -/* 00124 808A6334 46145282 */ mul.s $f10, $f10, $f20 -/* 00128 808A6338 460A6281 */ sub.s $f10, $f12, $f10 -/* 0012C 808A633C E46AFFF0 */ swc1 $f10, -0x0010($v1) ## FFFFFFD4 -/* 00130 808A6340 C44A0020 */ lwc1 $f10, 0x0020($v0) ## 0000002C -/* 00134 808A6344 C6120008 */ lwc1 $f18, 0x0008($s0) ## 00000008 -/* 00138 808A6348 C44E0018 */ lwc1 $f14, 0x0018($v0) ## 00000024 -/* 0013C 808A634C 460AA402 */ mul.s $f16, $f20, $f10 -/* 00140 808A6350 1471FFE8 */ bne $v1, $s1, .L808A62F4 -/* 00144 808A6354 00000000 */ nop -.L808A6358: -/* 00148 808A6358 46167302 */ mul.s $f12, $f14, $f22 -/* 0014C 808A635C 46109280 */ add.s $f10, $f18, $f16 -/* 00150 808A6360 2442000C */ addiu $v0, $v0, 0x000C ## $v0 = 00000018 -/* 00154 808A6364 460A6280 */ add.s $f10, $f12, $f10 -/* 00158 808A6368 E46AFFF4 */ swc1 $f10, -0x000C($v1) ## FFFFFFD8 -/* 0015C 808A636C C44A0010 */ lwc1 $f10, 0x0010($v0) ## 00000028 -/* 00160 808A6370 C60C000C */ lwc1 $f12, 0x000C($s0) ## 0000000C -/* 00164 808A6374 46185282 */ mul.s $f10, $f10, $f24 -/* 00168 808A6378 460C5300 */ add.s $f12, $f10, $f12 -/* 0016C 808A637C E46CFFF8 */ swc1 $f12, -0x0008($v1) ## FFFFFFDC -/* 00170 808A6380 C44C0014 */ lwc1 $f12, 0x0014($v0) ## 0000002C -/* 00174 808A6384 C44A000C */ lwc1 $f10, 0x000C($v0) ## 00000024 -/* 00178 808A6388 C6080010 */ lwc1 $f8, 0x0010($s0) ## 00000010 -/* 0017C 808A638C 460CB302 */ mul.s $f12, $f22, $f12 -/* 00180 808A6390 460C4300 */ add.s $f12, $f8, $f12 -/* 00184 808A6394 46145282 */ mul.s $f10, $f10, $f20 -/* 00188 808A6398 460A6281 */ sub.s $f10, $f12, $f10 -/* 0018C 808A639C E46AFFFC */ swc1 $f10, -0x0004($v1) ## FFFFFFE0 -/* 00190 808A63A0 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000170 -/* 00194 808A63A4 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 00198 808A63A8 02C03025 */ or $a2, $s6, $zero ## $a2 = FFFFFFCC -/* 0019C 808A63AC 02E03825 */ or $a3, $s7, $zero ## $a3 = FFFFFFD8 -/* 001A0 808A63B0 0C0189E8 */ jal func_800627A0 -/* 001A4 808A63B4 AFBE0010 */ sw $s8, 0x0010($sp) -/* 001A8 808A63B8 8E980008 */ lw $t8, 0x0008($s4) ## 808A7D50 -/* 001AC 808A63BC 26520001 */ addiu $s2, $s2, 0x0001 ## $s2 = 00000001 -/* 001B0 808A63C0 2673003C */ addiu $s3, $s3, 0x003C ## $s3 = 0000003C -/* 001B4 808A63C4 0258082A */ slt $at, $s2, $t8 -/* 001B8 808A63C8 5420FFC2 */ bnel $at, $zero, .L808A62D4 -/* 001BC 808A63CC 8E8F000C */ lw $t7, 0x000C($s4) ## 808A7D54 -/* 001C0 808A63D0 92080168 */ lbu $t0, 0x0168($s0) ## 00000168 -.L808A63D4: -/* 001C4 808A63D4 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 001C8 808A63D8 51010044 */ beql $t0, $at, .L808A64EC -/* 001CC 808A63DC 92190168 */ lbu $t9, 0x0168($s0) ## 00000168 -/* 001D0 808A63E0 92090169 */ lbu $t1, 0x0169($s0) ## 00000169 -/* 001D4 808A63E4 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 -/* 001D8 808A63E8 8FA600D4 */ lw $a2, 0x00D4($sp) -/* 001DC 808A63EC 1049003E */ beq $v0, $t1, .L808A64E8 -/* 001E0 808A63F0 01201825 */ or $v1, $t1, $zero ## $v1 = 00000000 -/* 001E4 808A63F4 14480003 */ bne $v0, $t0, .L808A6404 -/* 001E8 808A63F8 3C0B808A */ lui $t3, %hi(D_808A7D68) ## $t3 = 808A0000 -/* 001EC 808A63FC 10000002 */ beq $zero, $zero, .L808A6408 -/* 001F0 808A6400 00605025 */ or $t2, $v1, $zero ## $t2 = 00000000 -.L808A6404: -/* 001F4 808A6404 246A0002 */ addiu $t2, $v1, 0x0002 ## $t2 = 00000002 -.L808A6408: -/* 001F8 808A6408 000AC840 */ sll $t9, $t2, 1 -/* 001FC 808A640C 01795821 */ addu $t3, $t3, $t9 -/* 00200 808A6410 856B7D68 */ lh $t3, %lo(D_808A7D68)($t3) -/* 00204 808A6414 00091040 */ sll $v0, $t1, 1 -/* 00208 808A6418 3C0C808A */ lui $t4, %hi(D_808A7D70) ## $t4 = 808A0000 -/* 0020C 808A641C 448BC000 */ mtc1 $t3, $f24 ## $f24 = -0.00 -/* 00210 808A6420 01826021 */ addu $t4, $t4, $v0 -/* 00214 808A6424 858C7D70 */ lh $t4, %lo(D_808A7D70)($t4) -/* 00218 808A6428 4680C620 */ cvt.s.w $f24, $f24 -/* 0021C 808A642C 3C0D808A */ lui $t5, %hi(D_808A7D74) ## $t5 = 808A0000 -/* 00220 808A6430 448CB000 */ mtc1 $t4, $f22 ## $f22 = -0.00 -/* 00224 808A6434 01A26821 */ addu $t5, $t5, $v0 -/* 00228 808A6438 85AD7D74 */ lh $t5, %lo(D_808A7D74)($t5) -/* 0022C 808A643C 4680B5A0 */ cvt.s.w $f22, $f22 -/* 00230 808A6440 E7B80010 */ swc1 $f24, 0x0010($sp) -/* 00234 808A6444 448DC000 */ mtc1 $t5, $f24 ## $f24 = -0.00 -/* 00238 808A6448 AFA0001C */ sw $zero, 0x001C($sp) -/* 0023C 808A644C 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 00240 808A6450 4680C620 */ cvt.s.w $f24, $f24 -/* 00244 808A6454 E7B60014 */ swc1 $f22, 0x0014($sp) -/* 00248 808A6458 24780001 */ addiu $t8, $v1, 0x0001 ## $t8 = 00000001 -/* 0024C 808A645C 0018CB00 */ sll $t9, $t8, 12 -/* 00250 808A6460 00085A00 */ sll $t3, $t0, 8 -/* 00254 808A6464 032B6021 */ addu $t4, $t9, $t3 -/* 00258 808A6468 E7B80018 */ swc1 $f24, 0x0018($sp) -/* 0025C 808A646C 860E00B6 */ lh $t6, 0x00B6($s0) ## 000000B6 -/* 00260 808A6470 AFA00024 */ sw $zero, 0x0024($sp) -/* 00264 808A6474 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 00268 808A6478 01C17821 */ addu $t7, $t6, $at -/* 0026C 808A647C AFAF0020 */ sw $t7, 0x0020($sp) -/* 00270 808A6480 860D001C */ lh $t5, 0x001C($s0) ## 0000001C -/* 00274 808A6484 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00278 808A6488 24070093 */ addiu $a3, $zero, 0x0093 ## $a3 = 00000093 -/* 0027C 808A648C 018D7021 */ addu $t6, $t4, $t5 -/* 00280 808A6490 0C00C916 */ jal Actor_SpawnAsChild - -/* 00284 808A6494 AFAE0028 */ sw $t6, 0x0028($sp) -/* 00288 808A6498 54400006 */ bnel $v0, $zero, .L808A64B4 -/* 0028C 808A649C 920F0169 */ lbu $t7, 0x0169($s0) ## 00000169 -/* 00290 808A64A0 0C00B55C */ jal Actor_Kill - -/* 00294 808A64A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00298 808A64A8 1000002A */ beq $zero, $zero, .L808A6554 -/* 0029C 808A64AC 8FBF0074 */ lw $ra, 0x0074($sp) -/* 002A0 808A64B0 920F0169 */ lbu $t7, 0x0169($s0) ## 00000169 -.L808A64B4: -/* 002A4 808A64B4 55E0000D */ bnel $t7, $zero, .L808A64EC -/* 002A8 808A64B8 92190168 */ lbu $t9, 0x0168($s0) ## 00000168 -/* 002AC 808A64BC 8E02011C */ lw $v0, 0x011C($s0) ## 0000011C -/* 002B0 808A64C0 8C43011C */ lw $v1, 0x011C($v0) ## 0000011C -/* 002B4 808A64C4 54600006 */ bnel $v1, $zero, .L808A64E0 -/* 002B8 808A64C8 AE030118 */ sw $v1, 0x0118($s0) ## 00000118 -/* 002BC 808A64CC 0C00B55C */ jal Actor_Kill - -/* 002C0 808A64D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 002C4 808A64D4 1000001F */ beq $zero, $zero, .L808A6554 -/* 002C8 808A64D8 8FBF0074 */ lw $ra, 0x0074($sp) -/* 002CC 808A64DC AE030118 */ sw $v1, 0x0118($s0) ## 00000118 -.L808A64E0: -/* 002D0 808A64E0 8C58011C */ lw $t8, 0x011C($v0) ## 0000011C -/* 002D4 808A64E4 AF10011C */ sw $s0, 0x011C($t8) ## 0000011C -.L808A64E8: -/* 002D8 808A64E8 92190168 */ lbu $t9, 0x0168($s0) ## 00000168 -.L808A64EC: -/* 002DC 808A64EC 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 002E0 808A64F0 A600016C */ sh $zero, 0x016C($s0) ## 0000016C -/* 002E4 808A64F4 17210006 */ bne $t9, $at, .L808A6510 -/* 002E8 808A64F8 3C0B808A */ lui $t3, %hi(func_808A72AC) ## $t3 = 808A0000 -/* 002EC 808A64FC 3C01808B */ lui $at, %hi(D_808A80A0) ## $at = 808B0000 -/* 002F0 808A6500 A02080A0 */ sb $zero, %lo(D_808A80A0)($at) -/* 002F4 808A6504 256B72AC */ addiu $t3, $t3, %lo(func_808A72AC) ## $t3 = 808A72AC -/* 002F8 808A6508 10000011 */ beq $zero, $zero, .L808A6550 -/* 002FC 808A650C AE0B0164 */ sw $t3, 0x0164($s0) ## 00000164 -.L808A6510: -/* 00300 808A6510 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00304 808A6514 00000000 */ nop -/* 00308 808A6518 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 0030C 808A651C 44815000 */ mtc1 $at, $f10 ## $f10 = 3.00 -/* 00310 808A6520 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00314 808A6524 3C0F808A */ lui $t7, %hi(func_808A7500) ## $t7 = 808A0000 -/* 00318 808A6528 460A0102 */ mul.s $f4, $f0, $f10 -/* 0031C 808A652C 25EF7500 */ addiu $t7, $t7, %lo(func_808A7500) ## $t7 = 808A7500 -/* 00320 808A6530 4600240D */ trunc.w.s $f16, $f4 -/* 00324 808A6534 440D8000 */ mfc1 $t5, $f16 -/* 00328 808A6538 00000000 */ nop -/* 0032C 808A653C 01A1001A */ div $zero, $t5, $at -/* 00330 808A6540 00007010 */ mfhi $t6 -/* 00334 808A6544 3C01808B */ lui $at, %hi(D_808A80A0) ## $at = 808B0000 -/* 00338 808A6548 A02E80A0 */ sb $t6, %lo(D_808A80A0)($at) -/* 0033C 808A654C AE0F0164 */ sw $t7, 0x0164($s0) ## 00000164 -.L808A6550: -/* 00340 808A6550 8FBF0074 */ lw $ra, 0x0074($sp) -.L808A6554: -/* 00344 808A6554 D7B40038 */ ldc1 $f20, 0x0038($sp) -/* 00348 808A6558 D7B60040 */ ldc1 $f22, 0x0040($sp) -/* 0034C 808A655C D7B80048 */ ldc1 $f24, 0x0048($sp) -/* 00350 808A6560 8FB00050 */ lw $s0, 0x0050($sp) -/* 00354 808A6564 8FB10054 */ lw $s1, 0x0054($sp) -/* 00358 808A6568 8FB20058 */ lw $s2, 0x0058($sp) -/* 0035C 808A656C 8FB3005C */ lw $s3, 0x005C($sp) -/* 00360 808A6570 8FB40060 */ lw $s4, 0x0060($sp) -/* 00364 808A6574 8FB50064 */ lw $s5, 0x0064($sp) -/* 00368 808A6578 8FB60068 */ lw $s6, 0x0068($sp) -/* 0036C 808A657C 8FB7006C */ lw $s7, 0x006C($sp) -/* 00370 808A6580 8FBE0070 */ lw $s8, 0x0070($sp) -/* 00374 808A6584 03E00008 */ jr $ra -/* 00378 808A6588 27BD00D0 */ addiu $sp, $sp, 0x00D0 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A658C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A658C.s deleted file mode 100644 index bef0319366..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A658C.s +++ /dev/null @@ -1,126 +0,0 @@ -.late_rodata -glabel D_808A7DF4 - .word 0x44504000 - -.text -glabel func_808A658C -/* 0037C 808A658C 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 -/* 00380 808A6590 AFBF003C */ sw $ra, 0x003C($sp) -/* 00384 808A6594 AFB10038 */ sw $s1, 0x0038($sp) -/* 00388 808A6598 AFB00034 */ sw $s0, 0x0034($sp) -/* 0038C 808A659C AFA00058 */ sw $zero, 0x0058($sp) -/* 00390 808A65A0 8C8E0004 */ lw $t6, 0x0004($a0) ## 00000004 -/* 00394 808A65A4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00398 808A65A8 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 0039C 808A65AC 35CF0030 */ ori $t7, $t6, 0x0030 ## $t7 = 00000030 -/* 003A0 808A65B0 AC8F0004 */ sw $t7, 0x0004($a0) ## 00000004 -/* 003A4 808A65B4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 003A8 808A65B8 24847860 */ addiu $a0, $a0, 0x7860 ## $a0 = 06007860 -/* 003AC 808A65BC 0C010620 */ jal DynaPolyInfo_Alloc - -/* 003B0 808A65C0 27A50058 */ addiu $a1, $sp, 0x0058 ## $a1 = FFFFFFF8 -/* 003B4 808A65C4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 003B8 808A65C8 26250810 */ addiu $a1, $s1, 0x0810 ## $a1 = 00000810 -/* 003BC 808A65CC 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 003C0 808A65D0 0C00FA9D */ jal DynaPolyInfo_RegisterActor - ## DynaPolyInfo_setActor -/* 003C4 808A65D4 8FA70058 */ lw $a3, 0x0058($sp) -/* 003C8 808A65D8 92030168 */ lbu $v1, 0x0168($s0) ## 00000168 -/* 003CC 808A65DC AE02014C */ sw $v0, 0x014C($s0) ## 0000014C -/* 003D0 808A65E0 14600043 */ bne $v1, $zero, .L808A66F0 -/* 003D4 808A65E4 00000000 */ nop -/* 003D8 808A65E8 92080169 */ lbu $t0, 0x0169($s0) ## 00000169 -/* 003DC 808A65EC 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 003E0 808A65F0 3C18808A */ lui $t8, %hi(D_808A7D78) ## $t8 = 808A0000 -/* 003E4 808A65F4 1101003E */ beq $t0, $at, .L808A66F0 -/* 003E8 808A65F8 00081040 */ sll $v0, $t0, 1 -/* 003EC 808A65FC 0302C021 */ addu $t8, $t8, $v0 -/* 003F0 808A6600 87187D78 */ lh $t8, %lo(D_808A7D78)($t8) -/* 003F4 808A6604 3C19808A */ lui $t9, %hi(D_808A7D80) ## $t9 = 808A0000 -/* 003F8 808A6608 0322C821 */ addu $t9, $t9, $v0 -/* 003FC 808A660C 44982000 */ mtc1 $t8, $f4 ## $f4 = -0.00 -/* 00400 808A6610 87397D80 */ lh $t9, %lo(D_808A7D80)($t9) -/* 00404 808A6614 250D0001 */ addiu $t5, $t0, 0x0001 ## $t5 = 00000001 -/* 00408 808A6618 468021A0 */ cvt.s.w $f6, $f4 -/* 0040C 808A661C 44995000 */ mtc1 $t9, $f10 ## $f10 = -0.00 -/* 00410 808A6620 000D7300 */ sll $t6, $t5, 12 -/* 00414 808A6624 00037A00 */ sll $t7, $v1, 8 -/* 00418 808A6628 01CFC021 */ addu $t8, $t6, $t7 -/* 0041C 808A662C 46805420 */ cvt.s.w $f16, $f10 -/* 00420 808A6630 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00424 808A6634 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 00428 808A6638 AFA0001C */ sw $zero, 0x001C($sp) -/* 0042C 808A663C 26241C24 */ addiu $a0, $s1, 0x1C24 ## $a0 = 00001C24 -/* 00430 808A6640 E7A80014 */ swc1 $f8, 0x0014($sp) -/* 00434 808A6644 E7B00018 */ swc1 $f16, 0x0018($sp) -/* 00438 808A6648 860A00B6 */ lh $t2, 0x00B6($s0) ## 000000B6 -/* 0043C 808A664C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00440 808A6650 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 -/* 00444 808A6654 AFAA0020 */ sw $t2, 0x0020($sp) -/* 00448 808A6658 860B00B8 */ lh $t3, 0x00B8($s0) ## 000000B8 -/* 0044C 808A665C 24070093 */ addiu $a3, $zero, 0x0093 ## $a3 = 00000093 -/* 00450 808A6660 256CC000 */ addiu $t4, $t3, 0xC000 ## $t4 = FFFFC000 -/* 00454 808A6664 AFAC0024 */ sw $t4, 0x0024($sp) -/* 00458 808A6668 8619001C */ lh $t9, 0x001C($s0) ## 0000001C -/* 0045C 808A666C 03195021 */ addu $t2, $t8, $t9 -/* 00460 808A6670 0C00C916 */ jal Actor_SpawnAsChild - -/* 00464 808A6674 AFAA0028 */ sw $t2, 0x0028($sp) -/* 00468 808A6678 54400006 */ bnel $v0, $zero, .L808A6694 -/* 0046C 808A667C 920B0169 */ lbu $t3, 0x0169($s0) ## 00000169 -/* 00470 808A6680 0C00B55C */ jal Actor_Kill - -/* 00474 808A6684 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00478 808A6688 10000028 */ beq $zero, $zero, .L808A672C -/* 0047C 808A668C 8FBF003C */ lw $ra, 0x003C($sp) -/* 00480 808A6690 920B0169 */ lbu $t3, 0x0169($s0) ## 00000169 -.L808A6694: -/* 00484 808A6694 15600016 */ bne $t3, $zero, .L808A66F0 -/* 00488 808A6698 00000000 */ nop -/* 0048C 808A669C 8E02011C */ lw $v0, 0x011C($s0) ## 0000011C -/* 00490 808A66A0 8C43011C */ lw $v1, 0x011C($v0) ## 0000011C -/* 00494 808A66A4 54600006 */ bnel $v1, $zero, .L808A66C0 -/* 00498 808A66A8 8C64011C */ lw $a0, 0x011C($v1) ## 0000011C -/* 0049C 808A66AC 0C00B55C */ jal Actor_Kill - -/* 004A0 808A66B0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 004A4 808A66B4 1000001D */ beq $zero, $zero, .L808A672C -/* 004A8 808A66B8 8FBF003C */ lw $ra, 0x003C($sp) -/* 004AC 808A66BC 8C64011C */ lw $a0, 0x011C($v1) ## 0000011C -.L808A66C0: -/* 004B0 808A66C0 54800008 */ bnel $a0, $zero, .L808A66E4 -/* 004B4 808A66C4 AE040118 */ sw $a0, 0x0118($s0) ## 00000118 -/* 004B8 808A66C8 0C00B55C */ jal Actor_Kill - -/* 004BC 808A66CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 004C0 808A66D0 0C00B55C */ jal Actor_Kill - -/* 004C4 808A66D4 8E04011C */ lw $a0, 0x011C($s0) ## 0000011C -/* 004C8 808A66D8 10000014 */ beq $zero, $zero, .L808A672C -/* 004CC 808A66DC 8FBF003C */ lw $ra, 0x003C($sp) -/* 004D0 808A66E0 AE040118 */ sw $a0, 0x0118($s0) ## 00000118 -.L808A66E4: -/* 004D4 808A66E4 8C4C011C */ lw $t4, 0x011C($v0) ## 0000011C -/* 004D8 808A66E8 8D8D011C */ lw $t5, 0x011C($t4) ## 0000011C -/* 004DC 808A66EC ADB0011C */ sw $s0, 0x011C($t5) ## 0000011C -.L808A66F0: -/* 004E0 808A66F0 3C01808A */ lui $at, %hi(D_808A7DF4) ## $at = 808A0000 -/* 004E4 808A66F4 C4327DF4 */ lwc1 $f18, %lo(D_808A7DF4)($at) -/* 004E8 808A66F8 260E0024 */ addiu $t6, $s0, 0x0024 ## $t6 = 00000024 -/* 004EC 808A66FC 262407C0 */ addiu $a0, $s1, 0x07C0 ## $a0 = 000007C0 -/* 004F0 808A6700 E6120028 */ swc1 $f18, 0x0028($s0) ## 00000028 -/* 004F4 808A6704 AFAE0010 */ sw $t6, 0x0010($sp) -/* 004F8 808A6708 26050078 */ addiu $a1, $s0, 0x0078 ## $a1 = 00000078 -/* 004FC 808A670C 27A60054 */ addiu $a2, $sp, 0x0054 ## $a2 = FFFFFFF4 -/* 00500 808A6710 0C00F269 */ jal func_8003C9A4 -/* 00504 808A6714 02003825 */ or $a3, $s0, $zero ## $a3 = 00000000 -/* 00508 808A6718 3C0F808A */ lui $t7, %hi(func_808A68D0) ## $t7 = 808A0000 -/* 0050C 808A671C 25EF68D0 */ addiu $t7, $t7, %lo(func_808A68D0) ## $t7 = 808A68D0 -/* 00510 808A6720 E6000080 */ swc1 $f0, 0x0080($s0) ## 00000080 -/* 00514 808A6724 AE0F0164 */ sw $t7, 0x0164($s0) ## 00000164 -/* 00518 808A6728 8FBF003C */ lw $ra, 0x003C($sp) -.L808A672C: -/* 0051C 808A672C 8FB00034 */ lw $s0, 0x0034($sp) -/* 00520 808A6730 8FB10038 */ lw $s1, 0x0038($sp) -/* 00524 808A6734 03E00008 */ jr $ra -/* 00528 808A6738 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A68D0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A68D0.s deleted file mode 100644 index c930e52355..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A68D0.s +++ /dev/null @@ -1,78 +0,0 @@ -.late_rodata -glabel D_808A7DF8 - .word 0x44504000 - -.text -glabel func_808A68D0 -/* 006C0 808A68D0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 006C4 808A68D4 3C01808A */ lui $at, %hi(D_808A7DF8) ## $at = 808A0000 -/* 006C8 808A68D8 C4247DF8 */ lwc1 $f4, %lo(D_808A7DF8)($at) -/* 006CC 808A68DC AFBF0024 */ sw $ra, 0x0024($sp) -/* 006D0 808A68E0 AFB00020 */ sw $s0, 0x0020($sp) -/* 006D4 808A68E4 AFA5002C */ sw $a1, 0x002C($sp) -/* 006D8 808A68E8 3C03808B */ lui $v1, %hi(D_808A80A0) ## $v1 = 808B0000 -/* 006DC 808A68EC 246380A0 */ addiu $v1, $v1, %lo(D_808A80A0) ## $v1 = 808A80A0 -/* 006E0 808A68F0 E4840028 */ swc1 $f4, 0x0028($a0) ## 00000028 -/* 006E4 808A68F4 90620000 */ lbu $v0, 0x0000($v1) ## 808A80A0 -/* 006E8 808A68F8 2401003F */ addiu $at, $zero, 0x003F ## $at = 0000003F -/* 006EC 808A68FC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 006F0 808A6900 54410011 */ bnel $v0, $at, .L808A6948 -/* 006F4 808A6904 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 006F8 808A6908 908E0168 */ lbu $t6, 0x0168($a0) ## 00000168 -/* 006FC 808A690C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00700 808A6910 8FA4002C */ lw $a0, 0x002C($sp) -/* 00704 808A6914 15C10005 */ bne $t6, $at, .L808A692C -/* 00708 808A6918 24050C4E */ addiu $a1, $zero, 0x0C4E ## $a1 = 00000C4E -/* 0070C 808A691C 24060041 */ addiu $a2, $zero, 0x0041 ## $a2 = 00000041 -/* 00710 808A6920 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00714 808A6924 0C02003E */ jal func_800800F8 -/* 00718 808A6928 AFA00010 */ sw $zero, 0x0010($sp) -.L808A692C: -/* 0071C 808A692C 3C18808A */ lui $t8, %hi(func_808A69DC) ## $t8 = 808A0000 -/* 00720 808A6930 240F002D */ addiu $t7, $zero, 0x002D ## $t7 = 0000002D -/* 00724 808A6934 271869DC */ addiu $t8, $t8, %lo(func_808A69DC) ## $t8 = 808A69DC -/* 00728 808A6938 A60F016C */ sh $t7, 0x016C($s0) ## 0000016C -/* 0072C 808A693C 10000022 */ beq $zero, $zero, .L808A69C8 -/* 00730 808A6940 AE180164 */ sw $t8, 0x0164($s0) ## 00000164 -/* 00734 808A6944 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -.L808A6948: -/* 00738 808A6948 44813000 */ mtc1 $at, $f6 ## $f6 = 50.00 -/* 0073C 808A694C C6080090 */ lwc1 $f8, 0x0090($s0) ## 00000090 -/* 00740 808A6950 4608303C */ c.lt.s $f6, $f8 -/* 00744 808A6954 00000000 */ nop -/* 00748 808A6958 4502000F */ bc1fl .L808A6998 -/* 0074C 808A695C 920D0168 */ lbu $t5, 0x0168($s0) ## 00000168 -/* 00750 808A6960 92190168 */ lbu $t9, 0x0168($s0) ## 00000168 -/* 00754 808A6964 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00758 808A6968 344C0010 */ ori $t4, $v0, 0x0010 ## $t4 = 00000010 -/* 0075C 808A696C 13210007 */ beq $t9, $at, .L808A698C -/* 00760 808A6970 00000000 */ nop -/* 00764 808A6974 92080169 */ lbu $t0, 0x0169($s0) ## 00000169 -/* 00768 808A6978 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 0076C 808A697C 01095004 */ sllv $t2, $t1, $t0 -/* 00770 808A6980 004A5825 */ or $t3, $v0, $t2 ## $t3 = 00000000 -/* 00774 808A6984 10000010 */ beq $zero, $zero, .L808A69C8 -/* 00778 808A6988 A06B0000 */ sb $t3, 0x0000($v1) ## 00000000 -.L808A698C: -/* 0077C 808A698C 1000000E */ beq $zero, $zero, .L808A69C8 -/* 00780 808A6990 A06C0000 */ sb $t4, 0x0000($v1) ## 00000000 -/* 00784 808A6994 920D0168 */ lbu $t5, 0x0168($s0) ## 00000168 -.L808A6998: -/* 00788 808A6998 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0078C 808A699C 3048FFEF */ andi $t0, $v0, 0xFFEF ## $t0 = 00000000 -/* 00790 808A69A0 51A10009 */ beql $t5, $at, .L808A69C8 -/* 00794 808A69A4 A0680000 */ sb $t0, 0x0000($v1) ## 00000000 -/* 00798 808A69A8 920E0169 */ lbu $t6, 0x0169($s0) ## 00000169 -/* 0079C 808A69AC 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 007A0 808A69B0 01CFC004 */ sllv $t8, $t7, $t6 -/* 007A4 808A69B4 0300C827 */ nor $t9, $t8, $zero -/* 007A8 808A69B8 00594824 */ and $t1, $v0, $t9 -/* 007AC 808A69BC 10000002 */ beq $zero, $zero, .L808A69C8 -/* 007B0 808A69C0 A0690000 */ sb $t1, 0x0000($v1) ## 00000000 -/* 007B4 808A69C4 A0680000 */ sb $t0, 0x0000($v1) ## 00000000 -.L808A69C8: -/* 007B8 808A69C8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 007BC 808A69CC 8FB00020 */ lw $s0, 0x0020($sp) -/* 007C0 808A69D0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 007C4 808A69D4 03E00008 */ jr $ra -/* 007C8 808A69D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A69DC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A69DC.s deleted file mode 100644 index 3a982a6d10..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A69DC.s +++ /dev/null @@ -1,52 +0,0 @@ -glabel func_808A69DC -/* 007CC 808A69DC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 007D0 808A69E0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 007D4 808A69E4 AFA5001C */ sw $a1, 0x001C($sp) -/* 007D8 808A69E8 8482016C */ lh $v0, 0x016C($a0) ## 0000016C -/* 007DC 808A69EC 10400003 */ beq $v0, $zero, .L808A69FC -/* 007E0 808A69F0 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 007E4 808A69F4 A48E016C */ sh $t6, 0x016C($a0) ## 0000016C -/* 007E8 808A69F8 8482016C */ lh $v0, 0x016C($a0) ## 0000016C -.L808A69FC: -/* 007EC 808A69FC 2841000F */ slti $at, $v0, 0x000F -/* 007F0 808A6A00 10200016 */ beq $at, $zero, .L808A6A5C -/* 007F4 808A6A04 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 007F8 808A6A08 0041001A */ div $zero, $v0, $at -/* 007FC 808A6A0C 00007810 */ mfhi $t7 -/* 00800 808A6A10 25F8FFFF */ addiu $t8, $t7, 0xFFFF ## $t8 = FFFFFFFF -/* 00804 808A6A14 44982000 */ mtc1 $t8, $f4 ## $f4 = NaN -/* 00808 808A6A18 C4860008 */ lwc1 $f6, 0x0008($a0) ## 00000008 -/* 0080C 808A6A1C 24052838 */ addiu $a1, $zero, 0x2838 ## $a1 = 00002838 -/* 00810 808A6A20 46802020 */ cvt.s.w $f0, $f4 -/* 00814 808A6A24 46000200 */ add.s $f8, $f0, $f0 -/* 00818 808A6A28 46083280 */ add.s $f10, $f6, $f8 -/* 0081C 808A6A2C E48A0024 */ swc1 $f10, 0x0024($a0) ## 00000024 -/* 00820 808A6A30 04410004 */ bgez $v0, .L808A6A44 -/* 00824 808A6A34 30590003 */ andi $t9, $v0, 0x0003 ## $t9 = 00000000 -/* 00828 808A6A38 13200002 */ beq $t9, $zero, .L808A6A44 -/* 0082C 808A6A3C 00000000 */ nop -/* 00830 808A6A40 2739FFFC */ addiu $t9, $t9, 0xFFFC ## $t9 = FFFFFFFC -.L808A6A44: -/* 00834 808A6A44 17200005 */ bne $t9, $zero, .L808A6A5C -/* 00838 808A6A48 00000000 */ nop -/* 0083C 808A6A4C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00840 808A6A50 AFA40018 */ sw $a0, 0x0018($sp) -/* 00844 808A6A54 8FA40018 */ lw $a0, 0x0018($sp) -/* 00848 808A6A58 8482016C */ lh $v0, 0x016C($a0) ## 0000016C -.L808A6A5C: -/* 0084C 808A6A5C 14400009 */ bne $v0, $zero, .L808A6A84 -/* 00850 808A6A60 3C01808B */ lui $at, %hi(D_808A80A0) ## $at = 808B0000 -/* 00854 808A6A64 C4900008 */ lwc1 $f16, 0x0008($a0) ## 00000008 -/* 00858 808A6A68 3C09808A */ lui $t1, %hi(func_808A6BC8) ## $t1 = 808A0000 -/* 0085C 808A6A6C 2408003C */ addiu $t0, $zero, 0x003C ## $t0 = 0000003C -/* 00860 808A6A70 E4900024 */ swc1 $f16, 0x0024($a0) ## 00000024 -/* 00864 808A6A74 A02080A0 */ sb $zero, %lo(D_808A80A0)($at) -/* 00868 808A6A78 25296BC8 */ addiu $t1, $t1, %lo(func_808A6BC8) ## $t1 = 808A6BC8 -/* 0086C 808A6A7C A488016C */ sh $t0, 0x016C($a0) ## 0000016C -/* 00870 808A6A80 AC890164 */ sw $t1, 0x0164($a0) ## 00000164 -.L808A6A84: -/* 00874 808A6A84 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00878 808A6A88 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0087C 808A6A8C 03E00008 */ jr $ra -/* 00880 808A6A90 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A6A94.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A6A94.s deleted file mode 100644 index 9a53c2badb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A6A94.s +++ /dev/null @@ -1,84 +0,0 @@ -glabel func_808A6A94 -/* 00884 808A6A94 90820169 */ lbu $v0, 0x0169($a0) ## 00000169 -/* 00888 808A6A98 24070003 */ addiu $a3, $zero, 0x0003 ## $a3 = 00000003 -/* 0088C 808A6A9C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00890 808A6AA0 10E20003 */ beq $a3, $v0, .L808A6AB0 -/* 00894 808A6AA4 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 00898 808A6AA8 5441001B */ bnel $v0, $at, .L808A6B18 -/* 0089C 808A6AAC 8C86011C */ lw $a2, 0x011C($a0) ## 0000011C -.L808A6AB0: -/* 008A0 808A6AB0 8C86011C */ lw $a2, 0x011C($a0) ## 0000011C -/* 008A4 808A6AB4 C484002C */ lwc1 $f4, 0x002C($a0) ## 0000002C -/* 008A8 808A6AB8 C4C8002C */ lwc1 $f8, 0x002C($a2) ## 0000002C -/* 008AC 808A6ABC 4600218D */ trunc.w.s $f6, $f4 -/* 008B0 808A6AC0 4600428D */ trunc.w.s $f10, $f8 -/* 008B4 808A6AC4 44033000 */ mfc1 $v1, $f6 -/* 008B8 808A6AC8 44055000 */ mfc1 $a1, $f10 -/* 008BC 808A6ACC 54E2000A */ bnel $a3, $v0, .L808A6AF8 -/* 008C0 808A6AD0 C4C80024 */ lwc1 $f8, 0x0024($a2) ## 00000024 -/* 008C4 808A6AD4 C4900024 */ lwc1 $f16, 0x0024($a0) ## 00000024 -/* 008C8 808A6AD8 C4C40024 */ lwc1 $f4, 0x0024($a2) ## 00000024 -/* 008CC 808A6ADC 4600848D */ trunc.w.s $f18, $f16 -/* 008D0 808A6AE0 4600218D */ trunc.w.s $f6, $f4 -/* 008D4 808A6AE4 44079000 */ mfc1 $a3, $f18 -/* 008D8 808A6AE8 44083000 */ mfc1 $t0, $f6 -/* 008DC 808A6AEC 10000021 */ beq $zero, $zero, .L808A6B74 -/* 008E0 808A6AF0 00000000 */ nop -/* 008E4 808A6AF4 C4C80024 */ lwc1 $f8, 0x0024($a2) ## 00000024 -.L808A6AF8: -/* 008E8 808A6AF8 C4900024 */ lwc1 $f16, 0x0024($a0) ## 00000024 -/* 008EC 808A6AFC 4600428D */ trunc.w.s $f10, $f8 -/* 008F0 808A6B00 4600848D */ trunc.w.s $f18, $f16 -/* 008F4 808A6B04 44075000 */ mfc1 $a3, $f10 -/* 008F8 808A6B08 44089000 */ mfc1 $t0, $f18 -/* 008FC 808A6B0C 10000019 */ beq $zero, $zero, .L808A6B74 -/* 00900 808A6B10 00000000 */ nop -/* 00904 808A6B14 8C86011C */ lw $a2, 0x011C($a0) ## 0000011C -.L808A6B18: -/* 00908 808A6B18 C4840024 */ lwc1 $f4, 0x0024($a0) ## 00000024 -/* 0090C 808A6B1C C4C80024 */ lwc1 $f8, 0x0024($a2) ## 00000024 -/* 00910 808A6B20 4600218D */ trunc.w.s $f6, $f4 -/* 00914 808A6B24 4600428D */ trunc.w.s $f10, $f8 -/* 00918 808A6B28 44033000 */ mfc1 $v1, $f6 -/* 0091C 808A6B2C 44055000 */ mfc1 $a1, $f10 -/* 00920 808A6B30 5440000A */ bnel $v0, $zero, .L808A6B5C -/* 00924 808A6B34 C4C8002C */ lwc1 $f8, 0x002C($a2) ## 0000002C -/* 00928 808A6B38 C490002C */ lwc1 $f16, 0x002C($a0) ## 0000002C -/* 0092C 808A6B3C C4C4002C */ lwc1 $f4, 0x002C($a2) ## 0000002C -/* 00930 808A6B40 4600848D */ trunc.w.s $f18, $f16 -/* 00934 808A6B44 4600218D */ trunc.w.s $f6, $f4 -/* 00938 808A6B48 44079000 */ mfc1 $a3, $f18 -/* 0093C 808A6B4C 44083000 */ mfc1 $t0, $f6 -/* 00940 808A6B50 10000008 */ beq $zero, $zero, .L808A6B74 -/* 00944 808A6B54 00000000 */ nop -/* 00948 808A6B58 C4C8002C */ lwc1 $f8, 0x002C($a2) ## 0000002C -.L808A6B5C: -/* 0094C 808A6B5C C490002C */ lwc1 $f16, 0x002C($a0) ## 0000002C -/* 00950 808A6B60 4600428D */ trunc.w.s $f10, $f8 -/* 00954 808A6B64 4600848D */ trunc.w.s $f18, $f16 -/* 00958 808A6B68 44075000 */ mfc1 $a3, $f10 -/* 0095C 808A6B6C 44089000 */ mfc1 $t0, $f18 -/* 00960 808A6B70 00000000 */ nop -.L808A6B74: -/* 00964 808A6B74 1465000B */ bne $v1, $a1, .L808A6BA4 -/* 00968 808A6B78 0107C823 */ subu $t9, $t0, $a3 -/* 0096C 808A6B7C 2401003C */ addiu $at, $zero, 0x003C ## $at = 0000003C -/* 00970 808A6B80 17210008 */ bne $t9, $at, .L808A6BA4 -/* 00974 808A6B84 3C03808B */ lui $v1, %hi(D_808A80A0) ## $v1 = 808B0000 -/* 00978 808A6B88 246380A0 */ addiu $v1, $v1, %lo(D_808A80A0) ## $v1 = 808A80A0 -/* 0097C 808A6B8C 90690000 */ lbu $t1, 0x0000($v1) ## 808A80A0 -/* 00980 808A6B90 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 00984 808A6B94 004A5804 */ sllv $t3, $t2, $v0 -/* 00988 808A6B98 012B6025 */ or $t4, $t1, $t3 ## $t4 = 00000000 -/* 0098C 808A6B9C 03E00008 */ jr $ra -/* 00990 808A6BA0 A06C0000 */ sb $t4, 0x0000($v1) ## 808A80A0 -.L808A6BA4: -/* 00994 808A6BA4 3C03808B */ lui $v1, %hi(D_808A80A0) ## $v1 = 808B0000 -/* 00998 808A6BA8 246380A0 */ addiu $v1, $v1, %lo(D_808A80A0) ## $v1 = 808A80A0 -/* 0099C 808A6BAC 906D0000 */ lbu $t5, 0x0000($v1) ## 808A80A0 -/* 009A0 808A6BB0 004E7804 */ sllv $t7, $t6, $v0 -/* 009A4 808A6BB4 01E0C027 */ nor $t8, $t7, $zero -/* 009A8 808A6BB8 01B8C824 */ and $t9, $t5, $t8 -/* 009AC 808A6BBC A0790000 */ sb $t9, 0x0000($v1) ## 808A80A0 -/* 009B0 808A6BC0 03E00008 */ jr $ra -/* 009B4 808A6BC4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A6BC8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A6BC8.s deleted file mode 100644 index 466f35f5a9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A6BC8.s +++ /dev/null @@ -1,72 +0,0 @@ -glabel func_808A6BC8 -/* 009B8 808A6BC8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 009BC 808A6BCC AFBF001C */ sw $ra, 0x001C($sp) -/* 009C0 808A6BD0 AFB00018 */ sw $s0, 0x0018($sp) -/* 009C4 808A6BD4 AFA50024 */ sw $a1, 0x0024($sp) -/* 009C8 808A6BD8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 009CC 808A6BDC 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 009D0 808A6BE0 C4840060 */ lwc1 $f4, 0x0060($a0) ## 00000060 -/* 009D4 808A6BE4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 009D8 808A6BE8 3C0543D8 */ lui $a1, 0x43D8 ## $a1 = 43D80000 -/* 009DC 808A6BEC 46062200 */ add.s $f8, $f4, $f6 -/* 009E0 808A6BF0 34A58000 */ ori $a1, $a1, 0x8000 ## $a1 = 43D88000 -/* 009E4 808A6BF4 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 -/* 009E8 808A6BF8 E4880038 */ swc1 $f8, 0x0038($a0) ## 00000060 -/* 009EC 808A6BFC 0C01DE80 */ jal Math_ApproxF - -/* 009F0 808A6C00 8E060060 */ lw $a2, 0x0060($s0) ## 00000060 -/* 009F4 808A6C04 1040002C */ beq $v0, $zero, .L808A6CB8 -/* 009F8 808A6C08 2401FFDF */ addiu $at, $zero, 0xFFDF ## $at = FFFFFFDF -/* 009FC 808A6C0C 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 -/* 00A00 808A6C10 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 00A04 808A6C14 3C02808A */ lui $v0, %hi(D_808A7D58) ## $v0 = 808A0000 -/* 00A08 808A6C18 01C17824 */ and $t7, $t6, $at -/* 00A0C 808A6C1C 24427D58 */ addiu $v0, $v0, %lo(D_808A7D58) ## $v0 = 808A7D58 -/* 00A10 808A6C20 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 -/* 00A14 808A6C24 E60A0060 */ swc1 $f10, 0x0060($s0) ## 00000060 -/* 00A18 808A6C28 90580000 */ lbu $t8, 0x0000($v0) ## 808A7D58 -/* 00A1C 808A6C2C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00A20 808A6C30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A24 808A6C34 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 00A28 808A6C38 A0590000 */ sb $t9, 0x0000($v0) ## 808A7D58 -/* 00A2C 808A6C3C 92080168 */ lbu $t0, 0x0168($s0) ## 00000168 -/* 00A30 808A6C40 11010005 */ beq $t0, $at, .L808A6C58 -/* 00A34 808A6C44 00000000 */ nop -/* 00A38 808A6C48 0C229AA5 */ jal func_808A6A94 -/* 00A3C 808A6C4C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A40 808A6C50 10000015 */ beq $zero, $zero, .L808A6CA8 -/* 00A44 808A6C54 00000000 */ nop -.L808A6C58: -/* 00A48 808A6C58 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00A4C 808A6C5C 2405281D */ addiu $a1, $zero, 0x281D ## $a1 = 0000281D -/* 00A50 808A6C60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A54 808A6C64 8FA50024 */ lw $a1, 0x0024($sp) -/* 00A58 808A6C68 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 00A5C 808A6C6C 0C00CFA2 */ jal func_80033E88 -/* 00A60 808A6C70 24070005 */ addiu $a3, $zero, 0x0005 ## $a3 = 00000005 -/* 00A64 808A6C74 0C0222CD */ jal func_80088B34 -/* 00A68 808A6C78 8604016C */ lh $a0, 0x016C($s0) ## 0000016C -/* 00A6C 808A6C7C 3C09808A */ lui $t1, %hi(D_808A7D8C) ## $t1 = 808A0000 -/* 00A70 808A6C80 8D297D8C */ lw $t1, %lo(D_808A7D8C)($t1) -/* 00A74 808A6C84 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 00A78 808A6C88 8FA40024 */ lw $a0, 0x0024($sp) -/* 00A7C 808A6C8C 15200004 */ bne $t1, $zero, .L808A6CA0 -/* 00A80 808A6C90 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 00A84 808A6C94 3C01808A */ lui $at, %hi(D_808A7D8C) ## $at = 808A0000 -/* 00A88 808A6C98 10000003 */ beq $zero, $zero, .L808A6CA8 -/* 00A8C 808A6C9C AC2A7D8C */ sw $t2, %lo(D_808A7D8C)($at) -.L808A6CA0: -/* 00A90 808A6CA0 0C00B7D5 */ jal func_8002DF54 -/* 00A94 808A6CA4 8C851C44 */ lw $a1, 0x1C44($a0) ## 00001C44 -.L808A6CA8: -/* 00A98 808A6CA8 3C0C808A */ lui $t4, %hi(func_808A6CCC) ## $t4 = 808A0000 -/* 00A9C 808A6CAC 258C6CCC */ addiu $t4, $t4, %lo(func_808A6CCC) ## $t4 = 808A6CCC -/* 00AA0 808A6CB0 A200016A */ sb $zero, 0x016A($s0) ## 0000016A -/* 00AA4 808A6CB4 AE0C0164 */ sw $t4, 0x0164($s0) ## 00000164 -.L808A6CB8: -/* 00AA8 808A6CB8 8FBF001C */ lw $ra, 0x001C($sp) -/* 00AAC 808A6CBC 8FB00018 */ lw $s0, 0x0018($sp) -/* 00AB0 808A6CC0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00AB4 808A6CC4 03E00008 */ jr $ra -/* 00AB8 808A6CC8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A6CCC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A6CCC.s deleted file mode 100644 index 1a081d16a2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A6CCC.s +++ /dev/null @@ -1,187 +0,0 @@ -glabel func_808A6CCC -/* 00ABC 808A6CCC 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00AC0 808A6CD0 3C03808B */ lui $v1, %hi(D_808A80A0) ## $v1 = 808B0000 -/* 00AC4 808A6CD4 246380A0 */ addiu $v1, $v1, %lo(D_808A80A0) ## $v1 = 808A80A0 -/* 00AC8 808A6CD8 90620000 */ lbu $v0, 0x0000($v1) ## 808A80A0 -/* 00ACC 808A6CDC AFBF0034 */ sw $ra, 0x0034($sp) -/* 00AD0 808A6CE0 AFB00030 */ sw $s0, 0x0030($sp) -/* 00AD4 808A6CE4 AFA50044 */ sw $a1, 0x0044($sp) -/* 00AD8 808A6CE8 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 00ADC 808A6CEC 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 00AE0 808A6CF0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00AE4 808A6CF4 1441002C */ bne $v0, $at, .L808A6DA8 -/* 00AE8 808A6CF8 AFAF003C */ sw $t7, 0x003C($sp) -/* 00AEC 808A6CFC 90990168 */ lbu $t9, 0x0168($a0) ## 00000168 -/* 00AF0 808A6D00 3C18808A */ lui $t8, %hi(func_808A7238) ## $t8 = 808A0000 -/* 00AF4 808A6D04 27187238 */ addiu $t8, $t8, %lo(func_808A7238) ## $t8 = 808A7238 -/* 00AF8 808A6D08 17200097 */ bne $t9, $zero, .L808A6F68 -/* 00AFC 808A6D0C AC980164 */ sw $t8, 0x0164($a0) ## 00000164 -/* 00B00 808A6D10 90880169 */ lbu $t0, 0x0169($a0) ## 00000169 -/* 00B04 808A6D14 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 00B08 808A6D18 55000094 */ bnel $t0, $zero, .L808A6F6C -/* 00B0C 808A6D1C 8FBF0034 */ lw $ra, 0x0034($sp) -/* 00B10 808A6D20 44810000 */ mtc1 $at, $f0 ## $f0 = 30.00 -/* 00B14 808A6D24 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 00B18 808A6D28 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 00B1C 808A6D2C 8FA50044 */ lw $a1, 0x0044($sp) -/* 00B20 808A6D30 46004281 */ sub.s $f10, $f8, $f0 -/* 00B24 808A6D34 24060091 */ addiu $a2, $zero, 0x0091 ## $a2 = 00000091 -/* 00B28 808A6D38 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 00001C24 -/* 00B2C 808A6D3C 46002180 */ add.s $f6, $f4, $f0 -/* 00B30 808A6D40 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 00B34 808A6D44 C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C -/* 00B38 808A6D48 AFA00018 */ sw $zero, 0x0018($sp) -/* 00B3C 808A6D4C 44073000 */ mfc1 $a3, $f6 -/* 00B40 808A6D50 46008480 */ add.s $f18, $f16, $f0 -/* 00B44 808A6D54 E7B20014 */ swc1 $f18, 0x0014($sp) -/* 00B48 808A6D58 860A00B6 */ lh $t2, 0x00B6($s0) ## 000000B6 -/* 00B4C 808A6D5C AFA00020 */ sw $zero, 0x0020($sp) -/* 00B50 808A6D60 AFAA001C */ sw $t2, 0x001C($sp) -/* 00B54 808A6D64 860B001C */ lh $t3, 0x001C($s0) ## 0000001C -/* 00B58 808A6D68 256C0300 */ addiu $t4, $t3, 0x0300 ## $t4 = 00000300 -/* 00B5C 808A6D6C 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 00B60 808A6D70 AFAC0024 */ sw $t4, 0x0024($sp) -/* 00B64 808A6D74 10400006 */ beq $v0, $zero, .L808A6D90 -/* 00B68 808A6D78 00403825 */ or $a3, $v0, $zero ## $a3 = 00000000 -/* 00B6C 808A6D7C 8FA40044 */ lw $a0, 0x0044($sp) -/* 00B70 808A6D80 24050C62 */ addiu $a1, $zero, 0x0C62 ## $a1 = 00000C62 -/* 00B74 808A6D84 2406001E */ addiu $a2, $zero, 0x001E ## $a2 = 0000001E -/* 00B78 808A6D88 0C02003E */ jal func_800800F8 -/* 00B7C 808A6D8C AFA00010 */ sw $zero, 0x0010($sp) -.L808A6D90: -/* 00B80 808A6D90 0C01E221 */ jal func_80078884 -/* 00B84 808A6D94 24044802 */ addiu $a0, $zero, 0x4802 ## $a0 = 00004802 -/* 00B88 808A6D98 240D000A */ addiu $t5, $zero, 0x000A ## $t5 = 0000000A -/* 00B8C 808A6D9C 3C018016 */ lui $at, %hi(gSaveContext+0x13ce) -/* 00B90 808A6DA0 10000071 */ beq $zero, $zero, .L808A6F68 -/* 00B94 808A6DA4 A42DFA2E */ sh $t5, %lo(gSaveContext+0x13ce)($at) -.L808A6DA8: -/* 00B98 808A6DA8 3C0E8016 */ lui $t6, %hi(gSaveContext+0x13d0) -/* 00B9C 808A6DAC 85CEFA30 */ lh $t6, %lo(gSaveContext+0x13d0)($t6) -/* 00BA0 808A6DB0 3C0F808A */ lui $t7, %hi(D_808A7D58) ## $t7 = 808A0000 -/* 00BA4 808A6DB4 55C00010 */ bnel $t6, $zero, .L808A6DF8 -/* 00BA8 808A6DB8 24010040 */ addiu $at, $zero, 0x0040 ## $at = 00000040 -/* 00BAC 808A6DBC 91EF7D58 */ lbu $t7, %lo(D_808A7D58)($t7) -/* 00BB0 808A6DC0 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00BB4 808A6DC4 8FB8003C */ lw $t8, 0x003C($sp) -/* 00BB8 808A6DC8 55E1000B */ bnel $t7, $at, .L808A6DF8 -/* 00BBC 808A6DCC 24010040 */ addiu $at, $zero, 0x0040 ## $at = 00000040 -/* 00BC0 808A6DD0 8F190680 */ lw $t9, 0x0680($t8) ## 00000680 -/* 00BC4 808A6DD4 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF -/* 00BC8 808A6DD8 24090010 */ addiu $t1, $zero, 0x0010 ## $t1 = 00000010 -/* 00BCC 808A6DDC 03214024 */ and $t0, $t9, $at -/* 00BD0 808A6DE0 AF080680 */ sw $t0, 0x0680($t8) ## 00000680 -/* 00BD4 808A6DE4 A0690000 */ sb $t1, 0x0000($v1) ## 00000000 -/* 00BD8 808A6DE8 3C01808A */ lui $at, %hi(D_808A7D58) ## $at = 808A0000 -/* 00BDC 808A6DEC A0207D58 */ sb $zero, %lo(D_808A7D58)($at) -/* 00BE0 808A6DF0 90620000 */ lbu $v0, 0x0000($v1) ## 00000000 -/* 00BE4 808A6DF4 24010040 */ addiu $at, $zero, 0x0040 ## $at = 00000040 -.L808A6DF8: -/* 00BE8 808A6DF8 10410008 */ beq $v0, $at, .L808A6E1C -/* 00BEC 808A6DFC 24010010 */ addiu $at, $zero, 0x0010 ## $at = 00000010 -/* 00BF0 808A6E00 5441001A */ bnel $v0, $at, .L808A6E6C -/* 00BF4 808A6E04 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00BF8 808A6E08 0C023A62 */ jal Player_InCsMode -/* 00BFC 808A6E0C 8FA40044 */ lw $a0, 0x0044($sp) -/* 00C00 808A6E10 3C03808B */ lui $v1, %hi(D_808A80A0) ## $v1 = 808B0000 -/* 00C04 808A6E14 14400014 */ bne $v0, $zero, .L808A6E68 -/* 00C08 808A6E18 246380A0 */ addiu $v1, $v1, %lo(D_808A80A0) ## $v1 = 808A80A0 -.L808A6E1C: -/* 00C0C 808A6E1C 860A00B8 */ lh $t2, 0x00B8($s0) ## 000000B8 -/* 00C10 808A6E20 3C0B808A */ lui $t3, %hi(func_808A7138) ## $t3 = 808A0000 -/* 00C14 808A6E24 256B7138 */ addiu $t3, $t3, %lo(func_808A7138) ## $t3 = 808A7138 -/* 00C18 808A6E28 AE0B0164 */ sw $t3, 0x0164($s0) ## 00000164 -/* 00C1C 808A6E2C A60A0034 */ sh $t2, 0x0034($s0) ## 00000034 -/* 00C20 808A6E30 906C0000 */ lbu $t4, 0x0000($v1) ## 808A80A0 -/* 00C24 808A6E34 24010010 */ addiu $at, $zero, 0x0010 ## $at = 00000010 -/* 00C28 808A6E38 240D0040 */ addiu $t5, $zero, 0x0040 ## $t5 = 00000040 -/* 00C2C 808A6E3C 1581004A */ bne $t4, $at, .L808A6F68 -/* 00C30 808A6E40 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C34 808A6E44 A06D0000 */ sb $t5, 0x0000($v1) ## 808A80A0 -/* 00C38 808A6E48 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00C3C 808A6E4C 240528A4 */ addiu $a1, $zero, 0x28A4 ## $a1 = 000028A4 -/* 00C40 808A6E50 8FA40044 */ lw $a0, 0x0044($sp) -/* 00C44 808A6E54 8FA5003C */ lw $a1, 0x003C($sp) -/* 00C48 808A6E58 0C00B7D5 */ jal func_8002DF54 -/* 00C4C 808A6E5C 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 00C50 808A6E60 10000042 */ beq $zero, $zero, .L808A6F6C -/* 00C54 808A6E64 8FBF0034 */ lw $ra, 0x0034($sp) -.L808A6E68: -/* 00C58 808A6E68 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -.L808A6E6C: -/* 00C5C 808A6E6C C6040150 */ lwc1 $f4, 0x0150($s0) ## 00000150 -/* 00C60 808A6E70 46040032 */ c.eq.s $f0, $f4 -/* 00C64 808A6E74 00000000 */ nop -/* 00C68 808A6E78 4503003B */ bc1tl .L808A6F68 -/* 00C6C 808A6E7C A200016A */ sb $zero, 0x016A($s0) ## 0000016A -/* 00C70 808A6E80 820E016A */ lb $t6, 0x016A($s0) ## 0000016A -/* 00C74 808A6E84 8FA40044 */ lw $a0, 0x0044($sp) -/* 00C78 808A6E88 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00C7C 808A6E8C 15C0002B */ bne $t6, $zero, .L808A6F3C -/* 00C80 808A6E90 8FB9003C */ lw $t9, 0x003C($sp) -/* 00C84 808A6E94 240FFFEC */ addiu $t7, $zero, 0xFFEC ## $t7 = FFFFFFEC -/* 00C88 808A6E98 AFAF0010 */ sw $t7, 0x0010($sp) -/* 00C8C 808A6E9C 2406001E */ addiu $a2, $zero, 0x001E ## $a2 = 0000001E -/* 00C90 808A6EA0 0C010D76 */ jal func_800435D8 -/* 00C94 808A6EA4 24070032 */ addiu $a3, $zero, 0x0032 ## $a3 = 00000032 -/* 00C98 808A6EA8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00C9C 808A6EAC 1040001D */ beq $v0, $zero, .L808A6F24 -/* 00CA0 808A6EB0 8FAD003C */ lw $t5, 0x003C($sp) -/* 00CA4 808A6EB4 3C19808A */ lui $t9, %hi(D_808A7D58) ## $t9 = 808A0000 -/* 00CA8 808A6EB8 93397D58 */ lbu $t9, %lo(D_808A7D58)($t9) -/* 00CAC 808A6EBC 3C01808A */ lui $at, %hi(D_808A7D58) ## $at = 808A0000 -/* 00CB0 808A6EC0 3C0C808A */ lui $t4, %hi(func_808A6F7C) ## $t4 = 808A0000 -/* 00CB4 808A6EC4 2728FFFF */ addiu $t0, $t9, 0xFFFF ## $t0 = 8089FFFF -/* 00CB8 808A6EC8 A0287D58 */ sb $t0, %lo(D_808A7D58)($at) -/* 00CBC 808A6ECC C6060150 */ lwc1 $f6, 0x0150($s0) ## 00000150 -/* 00CC0 808A6ED0 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 00CC4 808A6ED4 258C6F7C */ addiu $t4, $t4, %lo(func_808A6F7C) ## $t4 = 808A6F7C -/* 00CC8 808A6ED8 4606003E */ c.le.s $f0, $f6 -/* 00CCC 808A6EDC 00000000 */ nop -/* 00CD0 808A6EE0 45020009 */ bc1fl .L808A6F08 -/* 00CD4 808A6EE4 44818000 */ mtc1 $at, $f16 ## $f16 = -1.00 -/* 00CD8 808A6EE8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00CDC 808A6EEC 44814000 */ mtc1 $at, $f8 ## $f8 = 1.00 -/* 00CE0 808A6EF0 00000000 */ nop -/* 00CE4 808A6EF4 4600428D */ trunc.w.s $f10, $f8 -/* 00CE8 808A6EF8 44095000 */ mfc1 $t1, $f10 -/* 00CEC 808A6EFC 10000007 */ beq $zero, $zero, .L808A6F1C -/* 00CF0 808A6F00 A209016A */ sb $t1, 0x016A($s0) ## 0000016A -/* 00CF4 808A6F04 44818000 */ mtc1 $at, $f16 ## $f16 = 1.00 -.L808A6F08: -/* 00CF8 808A6F08 00000000 */ nop -/* 00CFC 808A6F0C 4600848D */ trunc.w.s $f18, $f16 -/* 00D00 808A6F10 440B9000 */ mfc1 $t3, $f18 -/* 00D04 808A6F14 00000000 */ nop -/* 00D08 808A6F18 A20B016A */ sb $t3, 0x016A($s0) ## 0000016A -.L808A6F1C: -/* 00D0C 808A6F1C 10000012 */ beq $zero, $zero, .L808A6F68 -/* 00D10 808A6F20 AE0C0164 */ sw $t4, 0x0164($s0) ## 00000164 -.L808A6F24: -/* 00D14 808A6F24 8DAE0680 */ lw $t6, 0x0680($t5) ## 00000680 -/* 00D18 808A6F28 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF -/* 00D1C 808A6F2C 01C17824 */ and $t7, $t6, $at -/* 00D20 808A6F30 ADAF0680 */ sw $t7, 0x0680($t5) ## 00000680 -/* 00D24 808A6F34 1000000C */ beq $zero, $zero, .L808A6F68 -/* 00D28 808A6F38 E6000150 */ swc1 $f0, 0x0150($s0) ## 00000150 -.L808A6F3C: -/* 00D2C 808A6F3C 8F280680 */ lw $t0, 0x0680($t9) ## 808A0680 -/* 00D30 808A6F40 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF -/* 00D34 808A6F44 0101C024 */ and $t8, $t0, $at -/* 00D38 808A6F48 AF380680 */ sw $t8, 0x0680($t9) ## 808A0680 -/* 00D3C 808A6F4C 8202016A */ lb $v0, 0x016A($s0) ## 0000016A -/* 00D40 808A6F50 E6000150 */ swc1 $f0, 0x0150($s0) ## 00000150 -/* 00D44 808A6F54 10400004 */ beq $v0, $zero, .L808A6F68 -/* 00D48 808A6F58 2449FFFF */ addiu $t1, $v0, 0xFFFF ## $t1 = FFFFFFFF -/* 00D4C 808A6F5C 10000002 */ beq $zero, $zero, .L808A6F68 -/* 00D50 808A6F60 A209016A */ sb $t1, 0x016A($s0) ## 0000016A -/* 00D54 808A6F64 A200016A */ sb $zero, 0x016A($s0) ## 0000016A -.L808A6F68: -/* 00D58 808A6F68 8FBF0034 */ lw $ra, 0x0034($sp) -.L808A6F6C: -/* 00D5C 808A6F6C 8FB00030 */ lw $s0, 0x0030($sp) -/* 00D60 808A6F70 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00D64 808A6F74 03E00008 */ jr $ra -/* 00D68 808A6F78 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A6F7C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A6F7C.s deleted file mode 100644 index b5bcec66d0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A6F7C.s +++ /dev/null @@ -1,126 +0,0 @@ -.late_rodata -glabel D_808A7DFC - .float 0.1 - -.text -glabel func_808A6F7C -/* 00D6C 808A6F7C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00D70 808A6F80 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00D74 808A6F84 AFB00020 */ sw $s0, 0x0020($sp) -/* 00D78 808A6F88 AFA5003C */ sw $a1, 0x003C($sp) -/* 00D7C 808A6F8C 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 00D80 808A6F90 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 00D84 808A6F94 44811000 */ mtc1 $at, $f2 ## $f2 = 2.00 -/* 00D88 808A6F98 3C01808A */ lui $at, %hi(D_808A7DFC) ## $at = 808A0000 -/* 00D8C 808A6F9C AFAF002C */ sw $t7, 0x002C($sp) -/* 00D90 808A6FA0 C4840068 */ lwc1 $f4, 0x0068($a0) ## 00000068 -/* 00D94 808A6FA4 C4267DFC */ lwc1 $f6, %lo(D_808A7DFC)($at) -/* 00D98 808A6FA8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00D9C 808A6FAC 3C0541A0 */ lui $a1, 0x41A0 ## $a1 = 41A00000 -/* 00DA0 808A6FB0 46062200 */ add.s $f8, $f4, $f6 -/* 00DA4 808A6FB4 E4880068 */ swc1 $f8, 0x0068($a0) ## 00000068 -/* 00DA8 808A6FB8 C4800068 */ lwc1 $f0, 0x0068($a0) ## 00000068 -/* 00DAC 808A6FBC 4600103C */ c.lt.s $f2, $f0 -/* 00DB0 808A6FC0 00000000 */ nop -/* 00DB4 808A6FC4 45020004 */ bc1fl .L808A6FD8 -/* 00DB8 808A6FC8 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 00DBC 808A6FCC 10000002 */ beq $zero, $zero, .L808A6FD8 -/* 00DC0 808A6FD0 E4820068 */ swc1 $f2, 0x0068($a0) ## 00000068 -/* 00DC4 808A6FD4 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -.L808A6FD8: -/* 00DC8 808A6FD8 3C04808A */ lui $a0, %hi(D_808A7D90) ## $a0 = 808A0000 -/* 00DCC 808A6FDC 24847D90 */ addiu $a0, $a0, %lo(D_808A7D90) ## $a0 = 808A7D90 -/* 00DD0 808A6FE0 0C01DE80 */ jal Math_ApproxF - -/* 00DD4 808A6FE4 8E060068 */ lw $a2, 0x0068($s0) ## 00000068 -/* 00DD8 808A6FE8 AFA20030 */ sw $v0, 0x0030($sp) -/* 00DDC 808A6FEC 8218016A */ lb $t8, 0x016A($s0) ## 0000016A -/* 00DE0 808A6FF0 3C01808A */ lui $at, %hi(D_808A7D90) ## $at = 808A0000 -/* 00DE4 808A6FF4 C4327D90 */ lwc1 $f18, %lo(D_808A7D90)($at) -/* 00DE8 808A6FF8 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 -/* 00DEC 808A6FFC 00000000 */ nop -/* 00DF0 808A7000 46805420 */ cvt.s.w $f16, $f10 -/* 00DF4 808A7004 46128102 */ mul.s $f4, $f16, $f18 -/* 00DF8 808A7008 E7A40034 */ swc1 $f4, 0x0034($sp) -/* 00DFC 808A700C 0C01DE1C */ jal Math_Sins - ## sins? -/* 00E00 808A7010 86040158 */ lh $a0, 0x0158($s0) ## 00000158 -/* 00E04 808A7014 C7A60034 */ lwc1 $f6, 0x0034($sp) -/* 00E08 808A7018 C60A0008 */ lwc1 $f10, 0x0008($s0) ## 00000008 -/* 00E0C 808A701C 86040158 */ lh $a0, 0x0158($s0) ## 00000158 -/* 00E10 808A7020 46060202 */ mul.s $f8, $f0, $f6 -/* 00E14 808A7024 460A4400 */ add.s $f16, $f8, $f10 -/* 00E18 808A7028 0C01DE0D */ jal Math_Coss - ## coss? -/* 00E1C 808A702C E6100024 */ swc1 $f16, 0x0024($s0) ## 00000024 -/* 00E20 808A7030 C7B20034 */ lwc1 $f18, 0x0034($sp) -/* 00E24 808A7034 C6060010 */ lwc1 $f6, 0x0010($s0) ## 00000010 -/* 00E28 808A7038 46120102 */ mul.s $f4, $f0, $f18 -/* 00E2C 808A703C 46062200 */ add.s $f8, $f4, $f6 -/* 00E30 808A7040 E608002C */ swc1 $f8, 0x002C($s0) ## 0000002C -/* 00E34 808A7044 8FB90030 */ lw $t9, 0x0030($sp) -/* 00E38 808A7048 8FA2002C */ lw $v0, 0x002C($sp) -/* 00E3C 808A704C 53200033 */ beql $t9, $zero, .L808A711C -/* 00E40 808A7050 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E44 808A7054 8C480680 */ lw $t0, 0x0680($v0) ## 00000680 -/* 00E48 808A7058 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF -/* 00E4C 808A705C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00E50 808A7060 01014824 */ and $t1, $t0, $at -/* 00E54 808A7064 AC490680 */ sw $t1, 0x0680($v0) ## 00000680 -/* 00E58 808A7068 C60A0150 */ lwc1 $f10, 0x0150($s0) ## 00000150 -/* 00E5C 808A706C 8FA4003C */ lw $a0, 0x003C($sp) -/* 00E60 808A7070 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00E64 808A7074 460A003C */ c.lt.s $f0, $f10 -/* 00E68 808A7078 2406001E */ addiu $a2, $zero, 0x001E ## $a2 = 0000001E -/* 00E6C 808A707C 24070032 */ addiu $a3, $zero, 0x0032 ## $a3 = 00000032 -/* 00E70 808A7080 240AFFEC */ addiu $t2, $zero, 0xFFEC ## $t2 = FFFFFFEC -/* 00E74 808A7084 4502000B */ bc1fl .L808A70B4 -/* 00E78 808A7088 C6100024 */ lwc1 $f16, 0x0024($s0) ## 00000024 -/* 00E7C 808A708C 0C010D76 */ jal func_800435D8 -/* 00E80 808A7090 AFAA0010 */ sw $t2, 0x0010($sp) -/* 00E84 808A7094 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00E88 808A7098 14400005 */ bne $v0, $zero, .L808A70B0 -/* 00E8C 808A709C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E90 808A70A0 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00E94 808A70A4 24052835 */ addiu $a1, $zero, 0x2835 ## $a1 = 00002835 -/* 00E98 808A70A8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00E9C 808A70AC 00000000 */ nop -.L808A70B0: -/* 00EA0 808A70B0 C6100024 */ lwc1 $f16, 0x0024($s0) ## 00000024 -.L808A70B4: -/* 00EA4 808A70B4 C612002C */ lwc1 $f18, 0x002C($s0) ## 0000002C -/* 00EA8 808A70B8 E6000150 */ swc1 $f0, 0x0150($s0) ## 00000150 -/* 00EAC 808A70BC 3C01808A */ lui $at, %hi(D_808A7D90) ## $at = 808A0000 -/* 00EB0 808A70C0 E6100008 */ swc1 $f16, 0x0008($s0) ## 00000008 -/* 00EB4 808A70C4 E6120010 */ swc1 $f18, 0x0010($s0) ## 00000010 -/* 00EB8 808A70C8 E4207D90 */ swc1 $f0, %lo(D_808A7D90)($at) -/* 00EBC 808A70CC 3C02808A */ lui $v0, %hi(D_808A7D58) ## $v0 = 808A0000 -/* 00EC0 808A70D0 240B0005 */ addiu $t3, $zero, 0x0005 ## $t3 = 00000005 -/* 00EC4 808A70D4 24427D58 */ addiu $v0, $v0, %lo(D_808A7D58) ## $v0 = 808A7D58 -/* 00EC8 808A70D8 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 00ECC 808A70DC A20B016A */ sb $t3, 0x016A($s0) ## 0000016A -/* 00ED0 808A70E0 904C0000 */ lbu $t4, 0x0000($v0) ## 808A7D58 -/* 00ED4 808A70E4 3C0E808A */ lui $t6, %hi(func_808A6CCC) ## $t6 = 808A0000 -/* 00ED8 808A70E8 25CE6CCC */ addiu $t6, $t6, %lo(func_808A6CCC) ## $t6 = 808A6CCC -/* 00EDC 808A70EC 258D0001 */ addiu $t5, $t4, 0x0001 ## $t5 = 00000001 -/* 00EE0 808A70F0 A04D0000 */ sb $t5, 0x0000($v0) ## 808A7D58 -/* 00EE4 808A70F4 920F0168 */ lbu $t7, 0x0168($s0) ## 00000168 -/* 00EE8 808A70F8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00EEC 808A70FC AE0E0164 */ sw $t6, 0x0164($s0) ## 00000164 -/* 00EF0 808A7100 51E10009 */ beql $t7, $at, .L808A7128 -/* 00EF4 808A7104 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00EF8 808A7108 0C229AA5 */ jal func_808A6A94 -/* 00EFC 808A710C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F00 808A7110 0C229AA5 */ jal func_808A6A94 -/* 00F04 808A7114 8E040118 */ lw $a0, 0x0118($s0) ## 00000118 -/* 00F08 808A7118 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L808A711C: -/* 00F0C 808A711C 0C00BE5D */ jal func_8002F974 -/* 00F10 808A7120 2405200A */ addiu $a1, $zero, 0x200A ## $a1 = 0000200A -/* 00F14 808A7124 8FBF0024 */ lw $ra, 0x0024($sp) -.L808A7128: -/* 00F18 808A7128 8FB00020 */ lw $s0, 0x0020($sp) -/* 00F1C 808A712C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00F20 808A7130 03E00008 */ jr $ra -/* 00F24 808A7134 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7138.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7138.s deleted file mode 100644 index 4bff161ed4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7138.s +++ /dev/null @@ -1,71 +0,0 @@ -glabel func_808A7138 -/* 00F28 808A7138 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00F2C 808A713C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00F30 808A7140 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00F34 808A7144 C4840150 */ lwc1 $f4, 0x0150($a0) ## 00000150 -/* 00F38 808A7148 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 00F3C 808A714C 3C0543F6 */ lui $a1, 0x43F6 ## $a1 = 43F60000 -/* 00F40 808A7150 46040032 */ c.eq.s $f0, $f4 -/* 00F44 808A7154 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00F48 808A7158 34A58000 */ ori $a1, $a1, 0x8000 ## $a1 = 43F68000 -/* 00F4C 808A715C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00F50 808A7160 45030007 */ bc1tl .L808A7180 -/* 00F54 808A7164 24E40028 */ addiu $a0, $a3, 0x0028 ## $a0 = 00000028 -/* 00F58 808A7168 8C4E0680 */ lw $t6, 0x0680($v0) ## 00000680 -/* 00F5C 808A716C 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF -/* 00F60 808A7170 01C17824 */ and $t7, $t6, $at -/* 00F64 808A7174 AC4F0680 */ sw $t7, 0x0680($v0) ## 00000680 -/* 00F68 808A7178 E4800150 */ swc1 $f0, 0x0150($a0) ## 00000178 -/* 00F6C 808A717C 24E40028 */ addiu $a0, $a3, 0x0028 ## $a0 = 00000028 -.L808A7180: -/* 00F70 808A7180 0C01DE80 */ jal Math_ApproxF - -/* 00F74 808A7184 AFA70018 */ sw $a3, 0x0018($sp) -/* 00F78 808A7188 10400027 */ beq $v0, $zero, .L808A7228 -/* 00F7C 808A718C 8FA70018 */ lw $a3, 0x0018($sp) -/* 00F80 808A7190 84E50034 */ lh $a1, 0x0034($a3) ## 00000034 -/* 00F84 808A7194 AFA70018 */ sw $a3, 0x0018($sp) -/* 00F88 808A7198 24E400B8 */ addiu $a0, $a3, 0x00B8 ## $a0 = 000000B8 -/* 00F8C 808A719C 24A5C000 */ addiu $a1, $a1, 0xC000 ## $a1 = FFFFC000 -/* 00F90 808A71A0 00052C00 */ sll $a1, $a1, 16 -/* 00F94 808A71A4 00052C03 */ sra $a1, $a1, 16 -/* 00F98 808A71A8 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 00F9C 808A71AC 24060400 */ addiu $a2, $zero, 0x0400 ## $a2 = 00000400 -/* 00FA0 808A71B0 1040001D */ beq $v0, $zero, .L808A7228 -/* 00FA4 808A71B4 8FA70018 */ lw $a3, 0x0018($sp) -/* 00FA8 808A71B8 90F80169 */ lbu $t8, 0x0169($a3) ## 00000169 -/* 00FAC 808A71BC 3C09808A */ lui $t1, %hi(func_808A6BC8) ## $t1 = 808A0000 -/* 00FB0 808A71C0 25296BC8 */ addiu $t1, $t1, %lo(func_808A6BC8) ## $t1 = 808A6BC8 -/* 00FB4 808A71C4 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 00FB8 808A71C8 07210004 */ bgez $t9, .L808A71DC -/* 00FBC 808A71CC 33280003 */ andi $t0, $t9, 0x0003 ## $t0 = 00000001 -/* 00FC0 808A71D0 11000002 */ beq $t0, $zero, .L808A71DC -/* 00FC4 808A71D4 00000000 */ nop -/* 00FC8 808A71D8 2508FFFC */ addiu $t0, $t0, 0xFFFC ## $t0 = FFFFFFFD -.L808A71DC: -/* 00FCC 808A71DC A0E80169 */ sb $t0, 0x0169($a3) ## 00000169 -/* 00FD0 808A71E0 ACE90164 */ sw $t1, 0x0164($a3) ## 00000164 -/* 00FD4 808A71E4 3C01808B */ lui $at, %hi(D_808A80A0) ## $at = 808B0000 -/* 00FD8 808A71E8 A02080A0 */ sb $zero, %lo(D_808A80A0)($at) -/* 00FDC 808A71EC 90EA0168 */ lbu $t2, 0x0168($a3) ## 00000168 -/* 00FE0 808A71F0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00FE4 808A71F4 5541000D */ bnel $t2, $at, .L808A722C -/* 00FE8 808A71F8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00FEC 808A71FC 84EB016C */ lh $t3, 0x016C($a3) ## 0000016C -/* 00FF0 808A7200 240D0078 */ addiu $t5, $zero, 0x0078 ## $t5 = 00000078 -/* 00FF4 808A7204 256C000A */ addiu $t4, $t3, 0x000A ## $t4 = 0000000A -/* 00FF8 808A7208 A4EC016C */ sh $t4, 0x016C($a3) ## 0000016C -/* 00FFC 808A720C 84E2016C */ lh $v0, 0x016C($a3) ## 0000016C -/* 01000 808A7210 28410079 */ slti $at, $v0, 0x0079 -/* 01004 808A7214 54200004 */ bnel $at, $zero, .L808A7228 -/* 01008 808A7218 A4E2016C */ sh $v0, 0x016C($a3) ## 0000016C -/* 0100C 808A721C 10000002 */ beq $zero, $zero, .L808A7228 -/* 01010 808A7220 A4ED016C */ sh $t5, 0x016C($a3) ## 0000016C -/* 01014 808A7224 A4E2016C */ sh $v0, 0x016C($a3) ## 0000016C -.L808A7228: -/* 01018 808A7228 8FBF0014 */ lw $ra, 0x0014($sp) -.L808A722C: -/* 0101C 808A722C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01020 808A7230 03E00008 */ jr $ra -/* 01024 808A7234 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7238.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7238.s deleted file mode 100644 index c3cfbea6af..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7238.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_808A7238 -/* 01028 808A7238 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0102C 808A723C AFBF0014 */ sw $ra, 0x0014($sp) -/* 01030 808A7240 C4860150 */ lwc1 $f6, 0x0150($a0) ## 00000150 -/* 01034 808A7244 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01038 808A7248 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 0103C 808A724C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 01040 808A7250 46062032 */ c.eq.s $f4, $f6 -/* 01044 808A7254 3C0543B8 */ lui $a1, 0x43B8 ## $a1 = 43B80000 -/* 01048 808A7258 34A58000 */ ori $a1, $a1, 0x8000 ## $a1 = 43B88000 -/* 0104C 808A725C 24E40028 */ addiu $a0, $a3, 0x0028 ## $a0 = 00000028 -/* 01050 808A7260 45010005 */ bc1t .L808A7278 -/* 01054 808A7264 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 -/* 01058 808A7268 8C4E0680 */ lw $t6, 0x0680($v0) ## 00000680 -/* 0105C 808A726C 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF -/* 01060 808A7270 01C17824 */ and $t7, $t6, $at -/* 01064 808A7274 AC4F0680 */ sw $t7, 0x0680($v0) ## 00000680 -.L808A7278: -/* 01068 808A7278 0C01DE80 */ jal Math_ApproxF - -/* 0106C 808A727C AFA70018 */ sw $a3, 0x0018($sp) -/* 01070 808A7280 10400006 */ beq $v0, $zero, .L808A729C -/* 01074 808A7284 8FA70018 */ lw $a3, 0x0018($sp) -/* 01078 808A7288 24180020 */ addiu $t8, $zero, 0x0020 ## $t8 = 00000020 -/* 0107C 808A728C 3C01808B */ lui $at, %hi(D_808A80A0) ## $at = 808B0000 -/* 01080 808A7290 A03880A0 */ sb $t8, %lo(D_808A80A0)($at) -/* 01084 808A7294 0C00B55C */ jal Actor_Kill - -/* 01088 808A7298 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -.L808A729C: -/* 0108C 808A729C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01090 808A72A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01094 808A72A4 03E00008 */ jr $ra -/* 01098 808A72A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A72AC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A72AC.s deleted file mode 100644 index 833fcc39c3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A72AC.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_808A72AC -/* 0109C 808A72AC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 010A0 808A72B0 AFBF001C */ sw $ra, 0x001C($sp) -/* 010A4 808A72B4 AFA50024 */ sw $a1, 0x0024($sp) -/* 010A8 808A72B8 908E0181 */ lbu $t6, 0x0181($a0) ## 00000181 -/* 010AC 808A72BC 3C02808B */ lui $v0, %hi(D_808A80A0) ## $v0 = 808B0000 -/* 010B0 808A72C0 244280A0 */ addiu $v0, $v0, %lo(D_808A80A0) ## $v0 = 808A80A0 -/* 010B4 808A72C4 31CF0002 */ andi $t7, $t6, 0x0002 ## $t7 = 00000000 -/* 010B8 808A72C8 11E00013 */ beq $t7, $zero, .L808A7318 -/* 010BC 808A72CC 24080005 */ addiu $t0, $zero, 0x0005 ## $t0 = 00000005 -/* 010C0 808A72D0 90580000 */ lbu $t8, 0x0000($v0) ## 808A80A0 -/* 010C4 808A72D4 24090005 */ addiu $t1, $zero, 0x0005 ## $t1 = 00000005 -/* 010C8 808A72D8 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 -/* 010CC 808A72DC 37190020 */ ori $t9, $t8, 0x0020 ## $t9 = 00000020 -/* 010D0 808A72E0 A0590000 */ sb $t9, 0x0000($v0) ## 808A80A0 -/* 010D4 808A72E4 A488016C */ sh $t0, 0x016C($a0) ## 0000016C -/* 010D8 808A72E8 AFA40020 */ sw $a0, 0x0020($sp) -/* 010DC 808A72EC AFA90010 */ sw $t1, 0x0010($sp) -/* 010E0 808A72F0 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 010E4 808A72F4 0C00D09B */ jal func_8003426C -/* 010E8 808A72F8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 010EC 808A72FC 8FA40020 */ lw $a0, 0x0020($sp) -/* 010F0 808A7300 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 010F4 808A7304 240538EF */ addiu $a1, $zero, 0x38EF ## $a1 = 000038EF -/* 010F8 808A7308 8FA40020 */ lw $a0, 0x0020($sp) -/* 010FC 808A730C 3C0A808A */ lui $t2, %hi(func_808A7328) ## $t2 = 808A0000 -/* 01100 808A7310 254A7328 */ addiu $t2, $t2, %lo(func_808A7328) ## $t2 = 808A7328 -/* 01104 808A7314 AC8A0164 */ sw $t2, 0x0164($a0) ## 00000164 -.L808A7318: -/* 01108 808A7318 8FBF001C */ lw $ra, 0x001C($sp) -/* 0110C 808A731C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01110 808A7320 03E00008 */ jr $ra -/* 01114 808A7324 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7328.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7328.s deleted file mode 100644 index 21f6d32c24..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7328.s +++ /dev/null @@ -1,79 +0,0 @@ -glabel func_808A7328 -/* 01118 808A7328 3C02808B */ lui $v0, %hi(D_808A80A0) ## $v0 = 808B0000 -/* 0111C 808A732C 904280A0 */ lbu $v0, %lo(D_808A80A0)($v0) -/* 01120 808A7330 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 -/* 01124 808A7334 AFB00048 */ sw $s0, 0x0048($sp) -/* 01128 808A7338 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 0112C 808A733C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01130 808A7340 AFBF004C */ sw $ra, 0x004C($sp) -/* 01134 808A7344 1441002F */ bne $v0, $at, .L808A7404 -/* 01138 808A7348 AFA50064 */ sw $a1, 0x0064($sp) -/* 0113C 808A734C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 01140 808A7350 44813000 */ mtc1 $at, $f6 ## $f6 = 5.00 -/* 01144 808A7354 C4840024 */ lwc1 $f4, 0x0024($a0) ## 00000024 -/* 01148 808A7358 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 -/* 0114C 808A735C 44816000 */ mtc1 $at, $f12 ## $f12 = 120.00 -/* 01150 808A7360 46062201 */ sub.s $f8, $f4, $f6 -/* 01154 808A7364 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 01158 808A7368 E7A80054 */ swc1 $f8, 0x0054($sp) -/* 0115C 808A736C C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 -/* 01160 808A7370 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 -/* 01164 808A7374 44816000 */ mtc1 $at, $f12 ## $f12 = 120.00 -/* 01168 808A7378 460A0400 */ add.s $f16, $f0, $f10 -/* 0116C 808A737C 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 01170 808A7380 E7B00058 */ swc1 $f16, 0x0058($sp) -/* 01174 808A7384 C612002C */ lwc1 $f18, 0x002C($s0) ## 0000002C -/* 01178 808A7388 3C06808A */ lui $a2, %hi(D_808A7D5C) ## $a2 = 808A0000 -/* 0117C 808A738C 24C67D5C */ addiu $a2, $a2, %lo(D_808A7D5C) ## $a2 = 808A7D5C -/* 01180 808A7390 46120100 */ add.s $f4, $f0, $f18 -/* 01184 808A7394 240E00AA */ addiu $t6, $zero, 0x00AA ## $t6 = 000000AA -/* 01188 808A7398 240F00C8 */ addiu $t7, $zero, 0x00C8 ## $t7 = 000000C8 -/* 0118C 808A739C 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 01190 808A73A0 24190064 */ addiu $t9, $zero, 0x0064 ## $t9 = 00000064 -/* 01194 808A73A4 240800AA */ addiu $t0, $zero, 0x00AA ## $t0 = 000000AA -/* 01198 808A73A8 240900FF */ addiu $t1, $zero, 0x00FF ## $t1 = 000000FF -/* 0119C 808A73AC 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 011A0 808A73B0 240B0009 */ addiu $t3, $zero, 0x0009 ## $t3 = 00000009 -/* 011A4 808A73B4 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 011A8 808A73B8 E7A4005C */ swc1 $f4, 0x005C($sp) -/* 011AC 808A73BC AFAC003C */ sw $t4, 0x003C($sp) -/* 011B0 808A73C0 AFAB0038 */ sw $t3, 0x0038($sp) -/* 011B4 808A73C4 AFAA0034 */ sw $t2, 0x0034($sp) -/* 011B8 808A73C8 AFA9002C */ sw $t1, 0x002C($sp) -/* 011BC 808A73CC AFA80024 */ sw $t0, 0x0024($sp) -/* 011C0 808A73D0 AFB90020 */ sw $t9, 0x0020($sp) -/* 011C4 808A73D4 AFB8001C */ sw $t8, 0x001C($sp) -/* 011C8 808A73D8 AFAF0018 */ sw $t7, 0x0018($sp) -/* 011CC 808A73DC AFAE0010 */ sw $t6, 0x0010($sp) -/* 011D0 808A73E0 00C03825 */ or $a3, $a2, $zero ## $a3 = 808A7D5C -/* 011D4 808A73E4 AFA00030 */ sw $zero, 0x0030($sp) -/* 011D8 808A73E8 AFA00028 */ sw $zero, 0x0028($sp) -/* 011DC 808A73EC AFA00014 */ sw $zero, 0x0014($sp) -/* 011E0 808A73F0 8FA40064 */ lw $a0, 0x0064($sp) -/* 011E4 808A73F4 0C00A9AE */ jal EffectSsDeadDb_Spawn -/* 011E8 808A73F8 27A50054 */ addiu $a1, $sp, 0x0054 ## $a1 = FFFFFFF4 -/* 011EC 808A73FC 1000000D */ beq $zero, $zero, .L808A7434 -/* 011F0 808A7400 8FBF004C */ lw $ra, 0x004C($sp) -.L808A7404: -/* 011F4 808A7404 24010020 */ addiu $at, $zero, 0x0020 ## $at = 00000020 -/* 011F8 808A7408 54410006 */ bnel $v0, $at, .L808A7424 -/* 011FC 808A740C 8602016C */ lh $v0, 0x016C($s0) ## 0000016C -/* 01200 808A7410 0C00B55C */ jal Actor_Kill - -/* 01204 808A7414 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01208 808A7418 10000006 */ beq $zero, $zero, .L808A7434 -/* 0120C 808A741C 8FBF004C */ lw $ra, 0x004C($sp) -/* 01210 808A7420 8602016C */ lh $v0, 0x016C($s0) ## 0000016C -.L808A7424: -/* 01214 808A7424 10400002 */ beq $v0, $zero, .L808A7430 -/* 01218 808A7428 244DFFFF */ addiu $t5, $v0, 0xFFFF ## $t5 = FFFFFFFF -/* 0121C 808A742C A60D016C */ sh $t5, 0x016C($s0) ## 0000016C -.L808A7430: -/* 01220 808A7430 8FBF004C */ lw $ra, 0x004C($sp) -.L808A7434: -/* 01224 808A7434 8FB00048 */ lw $s0, 0x0048($sp) -/* 01228 808A7438 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 -/* 0122C 808A743C 03E00008 */ jr $ra -/* 01230 808A7440 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7444.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7444.s deleted file mode 100644 index 59ba9224e6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7444.s +++ /dev/null @@ -1,55 +0,0 @@ -glabel func_808A7444 -/* 01234 808A7444 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01238 808A7448 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0123C 808A744C 8C820118 */ lw $v0, 0x0118($a0) ## 00000118 -/* 01240 808A7450 10400017 */ beq $v0, $zero, .L808A74B0 -/* 01244 808A7454 00000000 */ nop -/* 01248 808A7458 8C8E011C */ lw $t6, 0x011C($a0) ## 0000011C -/* 0124C 808A745C 11C00014 */ beq $t6, $zero, .L808A74B0 -/* 01250 808A7460 00000000 */ nop -/* 01254 808A7464 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 01258 808A7468 AFA40018 */ sw $a0, 0x0018($sp) -/* 0125C 808A746C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 01260 808A7470 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 01264 808A7474 8FA40018 */ lw $a0, 0x0018($sp) -/* 01268 808A7478 4604003C */ c.lt.s $f0, $f4 -/* 0126C 808A747C 00000000 */ nop -/* 01270 808A7480 45020007 */ bc1fl .L808A74A0 -/* 01274 808A7484 8C99011C */ lw $t9, 0x011C($a0) ## 0000011C -/* 01278 808A7488 8C8F0118 */ lw $t7, 0x0118($a0) ## 00000118 -/* 0127C 808A748C 3C01808B */ lui $at, %hi(D_808A80A0) ## $at = 808B0000 -/* 01280 808A7490 91F80169 */ lbu $t8, 0x0169($t7) ## 00000169 -/* 01284 808A7494 10000015 */ beq $zero, $zero, .L808A74EC -/* 01288 808A7498 A03880A0 */ sb $t8, %lo(D_808A80A0)($at) -/* 0128C 808A749C 8C99011C */ lw $t9, 0x011C($a0) ## 0000011C -.L808A74A0: -/* 01290 808A74A0 3C01808B */ lui $at, %hi(D_808A80A0) ## $at = 808B0000 -/* 01294 808A74A4 93280169 */ lbu $t0, 0x0169($t9) ## 00000169 -/* 01298 808A74A8 10000010 */ beq $zero, $zero, .L808A74EC -/* 0129C 808A74AC A02880A0 */ sb $t0, %lo(D_808A80A0)($at) -.L808A74B0: -/* 012A0 808A74B0 50400006 */ beql $v0, $zero, .L808A74CC -/* 012A4 808A74B4 8C82011C */ lw $v0, 0x011C($a0) ## 0000011C -/* 012A8 808A74B8 90490169 */ lbu $t1, 0x0169($v0) ## 00000169 -/* 012AC 808A74BC 3C01808B */ lui $at, %hi(D_808A80A0) ## $at = 808B0000 -/* 012B0 808A74C0 1000000A */ beq $zero, $zero, .L808A74EC -/* 012B4 808A74C4 A02980A0 */ sb $t1, %lo(D_808A80A0)($at) -/* 012B8 808A74C8 8C82011C */ lw $v0, 0x011C($a0) ## 0000011C -.L808A74CC: -/* 012BC 808A74CC 10400005 */ beq $v0, $zero, .L808A74E4 -/* 012C0 808A74D0 00000000 */ nop -/* 012C4 808A74D4 904A0169 */ lbu $t2, 0x0169($v0) ## 00000169 -/* 012C8 808A74D8 3C01808B */ lui $at, %hi(D_808A80A0) ## $at = 808B0000 -/* 012CC 808A74DC 10000003 */ beq $zero, $zero, .L808A74EC -/* 012D0 808A74E0 A02A80A0 */ sb $t2, %lo(D_808A80A0)($at) -.L808A74E4: -/* 012D4 808A74E4 10000002 */ beq $zero, $zero, .L808A74F0 -/* 012D8 808A74E8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L808A74EC: -/* 012DC 808A74EC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L808A74F0: -/* 012E0 808A74F0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 012E4 808A74F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 012E8 808A74F8 03E00008 */ jr $ra -/* 012EC 808A74FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7500.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7500.s deleted file mode 100644 index 594a1d9aea..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7500.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_808A7500 -/* 012F0 808A7500 AFA50004 */ sw $a1, 0x0004($sp) -/* 012F4 808A7504 3C0F808B */ lui $t7, %hi(D_808A80A0) ## $t7 = 808B0000 -/* 012F8 808A7508 91EF80A0 */ lbu $t7, %lo(D_808A80A0)($t7) -/* 012FC 808A750C 908E0169 */ lbu $t6, 0x0169($a0) ## 00000169 -/* 01300 808A7510 3C19808A */ lui $t9, %hi(func_808A7530) ## $t9 = 808A0000 -/* 01304 808A7514 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 01308 808A7518 15CF0003 */ bne $t6, $t7, .L808A7528 -/* 0130C 808A751C 27397530 */ addiu $t9, $t9, %lo(func_808A7530) ## $t9 = 808A7530 -/* 01310 808A7520 A498016C */ sh $t8, 0x016C($a0) ## 0000016C -/* 01314 808A7524 AC990164 */ sw $t9, 0x0164($a0) ## 00000164 -.L808A7528: -/* 01318 808A7528 03E00008 */ jr $ra -/* 0131C 808A752C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7530.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7530.s deleted file mode 100644 index b3f66ed41b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7530.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_808A7530 -/* 01320 808A7530 AFA50004 */ sw $a1, 0x0004($sp) -/* 01324 808A7534 848E016C */ lh $t6, 0x016C($a0) ## 0000016C -/* 01328 808A7538 3C08808A */ lui $t0, %hi(func_808A75B8) ## $t0 = 808A0000 -/* 0132C 808A753C 241903E8 */ addiu $t9, $zero, 0x03E8 ## $t9 = 000003E8 -/* 01330 808A7540 25CFFFEC */ addiu $t7, $t6, 0xFFEC ## $t7 = FFFFFFEC -/* 01334 808A7544 A48F016C */ sh $t7, 0x016C($a0) ## 0000016C -/* 01338 808A7548 8498016C */ lh $t8, 0x016C($a0) ## 0000016C -/* 0133C 808A754C 250875B8 */ addiu $t0, $t0, %lo(func_808A75B8) ## $t0 = 808A75B8 -/* 01340 808A7550 1F000003 */ bgtz $t8, .L808A7560 -/* 01344 808A7554 00000000 */ nop -/* 01348 808A7558 A499016C */ sh $t9, 0x016C($a0) ## 0000016C -/* 0134C 808A755C AC880164 */ sw $t0, 0x0164($a0) ## 00000164 -.L808A7560: -/* 01350 808A7560 03E00008 */ jr $ra -/* 01354 808A7564 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7568.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7568.s deleted file mode 100644 index 9be0bfdbad..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7568.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_808A7568 -/* 01358 808A7568 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0135C 808A756C AFBF0014 */ sw $ra, 0x0014($sp) -/* 01360 808A7570 AFA5001C */ sw $a1, 0x001C($sp) -/* 01364 808A7574 848E016C */ lh $t6, 0x016C($a0) ## 0000016C -/* 01368 808A7578 25CF0014 */ addiu $t7, $t6, 0x0014 ## $t7 = 00000014 -/* 0136C 808A757C A48F016C */ sh $t7, 0x016C($a0) ## 0000016C -/* 01370 808A7580 8498016C */ lh $t8, 0x016C($a0) ## 0000016C -/* 01374 808A7584 2B0100FF */ slti $at, $t8, 0x00FF -/* 01378 808A7588 54200008 */ bnel $at, $zero, .L808A75AC -/* 0137C 808A758C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01380 808A7590 0C229D11 */ jal func_808A7444 -/* 01384 808A7594 AFA40018 */ sw $a0, 0x0018($sp) -/* 01388 808A7598 8FA40018 */ lw $a0, 0x0018($sp) -/* 0138C 808A759C 3C19808A */ lui $t9, %hi(func_808A7500) ## $t9 = 808A0000 -/* 01390 808A75A0 27397500 */ addiu $t9, $t9, %lo(func_808A7500) ## $t9 = 808A7500 -/* 01394 808A75A4 AC990164 */ sw $t9, 0x0164($a0) ## 00000164 -/* 01398 808A75A8 8FBF0014 */ lw $ra, 0x0014($sp) -.L808A75AC: -/* 0139C 808A75AC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 013A0 808A75B0 03E00008 */ jr $ra -/* 013A4 808A75B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A75B8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A75B8.s deleted file mode 100644 index a9ecba0327..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A75B8.s +++ /dev/null @@ -1,168 +0,0 @@ -glabel func_808A75B8 -/* 013A8 808A75B8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 013AC 808A75BC AFBF0034 */ sw $ra, 0x0034($sp) -/* 013B0 808A75C0 AFB00030 */ sw $s0, 0x0030($sp) -/* 013B4 808A75C4 AFA5003C */ sw $a1, 0x003C($sp) -/* 013B8 808A75C8 8482016C */ lh $v0, 0x016C($a0) ## 0000016C -/* 013BC 808A75CC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 013C0 808A75D0 8CA61C44 */ lw $a2, 0x1C44($a1) ## 00001C44 -/* 013C4 808A75D4 10400003 */ beq $v0, $zero, .L808A75E4 -/* 013C8 808A75D8 244FFFFF */ addiu $t7, $v0, 0xFFFF ## $t7 = FFFFFFFF -/* 013CC 808A75DC A48F016C */ sh $t7, 0x016C($a0) ## 0000016C -/* 013D0 808A75E0 8482016C */ lh $v0, 0x016C($a0) ## 0000016C -.L808A75E4: -/* 013D4 808A75E4 10400038 */ beq $v0, $zero, .L808A76C8 -/* 013D8 808A75E8 3C014316 */ lui $at, 0x4316 ## $at = 43160000 -/* 013DC 808A75EC C6040090 */ lwc1 $f4, 0x0090($s0) ## 00000090 -/* 013E0 808A75F0 44813000 */ mtc1 $at, $f6 ## $f6 = 150.00 -/* 013E4 808A75F4 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 013E8 808A75F8 4606203C */ c.lt.s $f4, $f6 -/* 013EC 808A75FC 00000000 */ nop -/* 013F0 808A7600 45000008 */ bc1f .L808A7624 -/* 013F4 808A7604 00000000 */ nop -/* 013F8 808A7608 C6080094 */ lwc1 $f8, 0x0094($s0) ## 00000094 -/* 013FC 808A760C 44815000 */ mtc1 $at, $f10 ## $f10 = 50.00 -/* 01400 808A7610 00000000 */ nop -/* 01404 808A7614 460A403C */ c.lt.s $f8, $f10 -/* 01408 808A7618 00000000 */ nop -/* 0140C 808A761C 4503002B */ bc1tl .L808A76CC -/* 01410 808A7620 8E190118 */ lw $t9, 0x0118($s0) ## 00000118 -.L808A7624: -/* 01414 808A7624 0C00B75E */ jal func_8002DD78 -/* 01418 808A7628 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 0141C 808A762C 10400034 */ beq $v0, $zero, .L808A7700 -/* 01420 808A7630 3C0143A0 */ lui $at, 0x43A0 ## $at = 43A00000 -/* 01424 808A7634 C6100090 */ lwc1 $f16, 0x0090($s0) ## 00000090 -/* 01428 808A7638 44819000 */ mtc1 $at, $f18 ## $f18 = 320.00 -/* 0142C 808A763C 00000000 */ nop -/* 01430 808A7640 4612803C */ c.lt.s $f16, $f18 -/* 01434 808A7644 00000000 */ nop -/* 01438 808A7648 4502002E */ bc1fl .L808A7704 -/* 0143C 808A764C 920A0181 */ lbu $t2, 0x0181($s0) ## 00000181 -/* 01440 808A7650 92180169 */ lbu $t8, 0x0169($s0) ## 00000169 -/* 01444 808A7654 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01448 808A7658 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0144C 808A765C 1301000C */ beq $t8, $at, .L808A7690 -/* 01450 808A7660 24052000 */ addiu $a1, $zero, 0x2000 ## $a1 = 00002000 -/* 01454 808A7664 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 01458 808A7668 44813000 */ mtc1 $at, $f6 ## $f6 = 100.00 -/* 0145C 808A766C C6040094 */ lwc1 $f4, 0x0094($s0) ## 00000094 -/* 01460 808A7670 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 01464 808A7674 4606203C */ c.lt.s $f4, $f6 -/* 01468 808A7678 00000000 */ nop -/* 0146C 808A767C 4500000C */ bc1f .L808A76B0 -/* 01470 808A7680 00000000 */ nop -/* 01474 808A7684 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 01478 808A7688 10000009 */ beq $zero, $zero, .L808A76B0 -/* 0147C 808A768C 00000000 */ nop -.L808A7690: -/* 01480 808A7690 C6080094 */ lwc1 $f8, 0x0094($s0) ## 00000094 -/* 01484 808A7694 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 01488 808A7698 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0148C 808A769C 460A403C */ c.lt.s $f8, $f10 -/* 01490 808A76A0 00000000 */ nop -/* 01494 808A76A4 45000002 */ bc1f .L808A76B0 -/* 01498 808A76A8 00000000 */ nop -/* 0149C 808A76AC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L808A76B0: -/* 014A0 808A76B0 50400014 */ beql $v0, $zero, .L808A7704 -/* 014A4 808A76B4 920A0181 */ lbu $t2, 0x0181($s0) ## 00000181 -/* 014A8 808A76B8 0C00B7F2 */ jal func_8002DFC8 -/* 014AC 808A76BC 8FA6003C */ lw $a2, 0x003C($sp) -/* 014B0 808A76C0 50400010 */ beql $v0, $zero, .L808A7704 -/* 014B4 808A76C4 920A0181 */ lbu $t2, 0x0181($s0) ## 00000181 -.L808A76C8: -/* 014B8 808A76C8 8E190118 */ lw $t9, 0x0118($s0) ## 00000118 -.L808A76CC: -/* 014BC 808A76CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 014C0 808A76D0 240538EC */ addiu $a1, $zero, 0x38EC ## $a1 = 000038EC -/* 014C4 808A76D4 17200004 */ bne $t9, $zero, .L808A76E8 -/* 014C8 808A76D8 00000000 */ nop -/* 014CC 808A76DC 8E08011C */ lw $t0, 0x011C($s0) ## 0000011C -/* 014D0 808A76E0 51000008 */ beql $t0, $zero, .L808A7704 -/* 014D4 808A76E4 920A0181 */ lbu $t2, 0x0181($s0) ## 00000181 -.L808A76E8: -/* 014D8 808A76E8 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 014DC 808A76EC A600016C */ sh $zero, 0x016C($s0) ## 0000016C -/* 014E0 808A76F0 3C09808A */ lui $t1, %hi(func_808A7568) ## $t1 = 808A0000 -/* 014E4 808A76F4 25297568 */ addiu $t1, $t1, %lo(func_808A7568) ## $t1 = 808A7568 -/* 014E8 808A76F8 1000003F */ beq $zero, $zero, .L808A77F8 -/* 014EC 808A76FC AE090164 */ sw $t1, 0x0164($s0) ## 00000164 -.L808A7700: -/* 014F0 808A7700 920A0181 */ lbu $t2, 0x0181($s0) ## 00000181 -.L808A7704: -/* 014F4 808A7704 314B0002 */ andi $t3, $t2, 0x0002 ## $t3 = 00000000 -/* 014F8 808A7708 5160003C */ beql $t3, $zero, .L808A77FC -/* 014FC 808A770C 8FBF0034 */ lw $ra, 0x0034($sp) -/* 01500 808A7710 0C229D11 */ jal func_808A7444 -/* 01504 808A7714 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01508 808A7718 14400021 */ bne $v0, $zero, .L808A77A0 -/* 0150C 808A771C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01510 808A7720 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 01514 808A7724 44819000 */ mtc1 $at, $f18 ## $f18 = 40.00 -/* 01518 808A7728 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 0151C 808A772C 8E070024 */ lw $a3, 0x0024($s0) ## 00000024 -/* 01520 808A7730 8FA5003C */ lw $a1, 0x003C($sp) -/* 01524 808A7734 46128101 */ sub.s $f4, $f16, $f18 -/* 01528 808A7738 24060091 */ addiu $a2, $zero, 0x0091 ## $a2 = 00000091 -/* 0152C 808A773C 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 00001C24 -/* 01530 808A7740 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 01534 808A7744 C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C -/* 01538 808A7748 AFA00018 */ sw $zero, 0x0018($sp) -/* 0153C 808A774C E7A60014 */ swc1 $f6, 0x0014($sp) -/* 01540 808A7750 860C00B6 */ lh $t4, 0x00B6($s0) ## 000000B6 -/* 01544 808A7754 AFA00020 */ sw $zero, 0x0020($sp) -/* 01548 808A7758 AFAC001C */ sw $t4, 0x001C($sp) -/* 0154C 808A775C 920E0168 */ lbu $t6, 0x0168($s0) ## 00000168 -/* 01550 808A7760 860D001C */ lh $t5, 0x001C($s0) ## 0000001C -/* 01554 808A7764 25CFFFFF */ addiu $t7, $t6, 0xFFFF ## $t7 = FFFFFFFF -/* 01558 808A7768 000FC200 */ sll $t8, $t7, 8 -/* 0155C 808A776C 01B8C821 */ addu $t9, $t5, $t8 -/* 01560 808A7770 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 01564 808A7774 AFB90024 */ sw $t9, 0x0024($sp) -/* 01568 808A7778 8FA4003C */ lw $a0, 0x003C($sp) -/* 0156C 808A777C 24050C58 */ addiu $a1, $zero, 0x0C58 ## $a1 = 00000C58 -/* 01570 808A7780 24060050 */ addiu $a2, $zero, 0x0050 ## $a2 = 00000050 -/* 01574 808A7784 02003825 */ or $a3, $s0, $zero ## $a3 = 00000000 -/* 01578 808A7788 0C02003E */ jal func_800800F8 -/* 0157C 808A778C AFA00010 */ sw $zero, 0x0010($sp) -/* 01580 808A7790 0C01E221 */ jal func_80078884 -/* 01584 808A7794 24044802 */ addiu $a0, $zero, 0x4802 ## $a0 = 00004802 -/* 01588 808A7798 1000000A */ beq $zero, $zero, .L808A77C4 -/* 0158C 808A779C 8E020118 */ lw $v0, 0x0118($s0) ## 00000118 -.L808A77A0: -/* 01590 808A77A0 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01594 808A77A4 240538EF */ addiu $a1, $zero, 0x38EF ## $a1 = 000038EF -/* 01598 808A77A8 8FA4003C */ lw $a0, 0x003C($sp) -/* 0159C 808A77AC 24050C58 */ addiu $a1, $zero, 0x0C58 ## $a1 = 00000C58 -/* 015A0 808A77B0 24060023 */ addiu $a2, $zero, 0x0023 ## $a2 = 00000023 -/* 015A4 808A77B4 02003825 */ or $a3, $s0, $zero ## $a3 = 00000000 -/* 015A8 808A77B8 0C02003E */ jal func_800800F8 -/* 015AC 808A77BC AFA00010 */ sw $zero, 0x0010($sp) -/* 015B0 808A77C0 8E020118 */ lw $v0, 0x0118($s0) ## 00000118 -.L808A77C4: -/* 015B4 808A77C4 3C09808A */ lui $t1, %hi(func_808A780C) ## $t1 = 808A0000 -/* 015B8 808A77C8 24080014 */ addiu $t0, $zero, 0x0014 ## $t0 = 00000014 -/* 015BC 808A77CC 10400003 */ beq $v0, $zero, .L808A77DC -/* 015C0 808A77D0 2529780C */ addiu $t1, $t1, %lo(func_808A780C) ## $t1 = 808A780C -/* 015C4 808A77D4 AC40011C */ sw $zero, 0x011C($v0) ## 0000011C -/* 015C8 808A77D8 AE000118 */ sw $zero, 0x0118($s0) ## 00000118 -.L808A77DC: -/* 015CC 808A77DC 8E02011C */ lw $v0, 0x011C($s0) ## 0000011C -/* 015D0 808A77E0 50400004 */ beql $v0, $zero, .L808A77F4 -/* 015D4 808A77E4 A608016C */ sh $t0, 0x016C($s0) ## 0000016C -/* 015D8 808A77E8 AC400118 */ sw $zero, 0x0118($v0) ## 00000118 -/* 015DC 808A77EC AE00011C */ sw $zero, 0x011C($s0) ## 0000011C -/* 015E0 808A77F0 A608016C */ sh $t0, 0x016C($s0) ## 0000016C -.L808A77F4: -/* 015E4 808A77F4 AE090164 */ sw $t1, 0x0164($s0) ## 00000164 -.L808A77F8: -/* 015E8 808A77F8 8FBF0034 */ lw $ra, 0x0034($sp) -.L808A77FC: -/* 015EC 808A77FC 8FB00030 */ lw $s0, 0x0030($sp) -/* 015F0 808A7800 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 015F4 808A7804 03E00008 */ jr $ra -/* 015F8 808A7808 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A780C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A780C.s deleted file mode 100644 index 54b106bae8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A780C.s +++ /dev/null @@ -1,116 +0,0 @@ -glabel func_808A780C -/* 015FC 808A780C 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 -/* 01600 808A7810 AFBF004C */ sw $ra, 0x004C($sp) -/* 01604 808A7814 AFB00048 */ sw $s0, 0x0048($sp) -/* 01608 808A7818 AFA50064 */ sw $a1, 0x0064($sp) -/* 0160C 808A781C 848E016C */ lh $t6, 0x016C($a0) ## 0000016C -/* 01610 808A7820 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01614 808A7824 25CFFFFF */ addiu $t7, $t6, 0xFFFF ## $t7 = FFFFFFFF -/* 01618 808A7828 A48F016C */ sh $t7, 0x016C($a0) ## 0000016C -/* 0161C 808A782C 0C01DE1C */ jal Math_Sins - ## sins? -/* 01620 808A7830 848400B6 */ lh $a0, 0x00B6($a0) ## 000000B6 -/* 01624 808A7834 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 01628 808A7838 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 -/* 0162C 808A783C C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 -/* 01630 808A7840 3C014284 */ lui $at, 0x4284 ## $at = 42840000 -/* 01634 808A7844 46040182 */ mul.s $f6, $f0, $f4 -/* 01638 808A7848 44816000 */ mtc1 $at, $f12 ## $f12 = 66.00 -/* 0163C 808A784C 46083280 */ add.s $f10, $f6, $f8 -/* 01640 808A7850 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 01644 808A7854 E7AA0054 */ swc1 $f10, 0x0054($sp) -/* 01648 808A7858 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 0164C 808A785C 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 01650 808A7860 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 -/* 01654 808A7864 46100480 */ add.s $f18, $f0, $f16 -/* 01658 808A7868 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 0165C 808A786C E7B20058 */ swc1 $f18, 0x0058($sp) -/* 01660 808A7870 C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C -/* 01664 808A7874 46040180 */ add.s $f6, $f0, $f4 -/* 01668 808A7878 E7A6005C */ swc1 $f6, 0x005C($sp) -/* 0166C 808A787C 8602016C */ lh $v0, 0x016C($s0) ## 0000016C -/* 01670 808A7880 0440003F */ bltz $v0, .L808A7980 -/* 01674 808A7884 00000000 */ nop -/* 01678 808A7888 92180168 */ lbu $t8, 0x0168($s0) ## 00000168 -/* 0167C 808A788C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01680 808A7890 3C06808A */ lui $a2, %hi(D_808A7D5C) ## $a2 = 808A0000 -/* 01684 808A7894 1701001E */ bne $t8, $at, .L808A7910 -/* 01688 808A7898 24C67D5C */ addiu $a2, $a2, %lo(D_808A7D5C) ## $a2 = 808A7D5C -/* 0168C 808A789C 3C06808A */ lui $a2, %hi(D_808A7D5C) ## $a2 = 808A0000 -/* 01690 808A78A0 24C67D5C */ addiu $a2, $a2, %lo(D_808A7D5C) ## $a2 = 808A7D5C -/* 01694 808A78A4 24190064 */ addiu $t9, $zero, 0x0064 ## $t9 = 00000064 -/* 01698 808A78A8 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF -/* 0169C 808A78AC 240900FF */ addiu $t1, $zero, 0x00FF ## $t1 = 000000FF -/* 016A0 808A78B0 240A0096 */ addiu $t2, $zero, 0x0096 ## $t2 = 00000096 -/* 016A4 808A78B4 240B00AA */ addiu $t3, $zero, 0x00AA ## $t3 = 000000AA -/* 016A8 808A78B8 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF -/* 016AC 808A78BC 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 016B0 808A78C0 240E0009 */ addiu $t6, $zero, 0x0009 ## $t6 = 00000009 -/* 016B4 808A78C4 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 016B8 808A78C8 AFAF003C */ sw $t7, 0x003C($sp) -/* 016BC 808A78CC AFAE0038 */ sw $t6, 0x0038($sp) -/* 016C0 808A78D0 AFAD0034 */ sw $t5, 0x0034($sp) -/* 016C4 808A78D4 AFAC0028 */ sw $t4, 0x0028($sp) -/* 016C8 808A78D8 AFAB0024 */ sw $t3, 0x0024($sp) -/* 016CC 808A78DC AFAA0020 */ sw $t2, 0x0020($sp) -/* 016D0 808A78E0 AFA9001C */ sw $t1, 0x001C($sp) -/* 016D4 808A78E4 AFA80018 */ sw $t0, 0x0018($sp) -/* 016D8 808A78E8 AFB90010 */ sw $t9, 0x0010($sp) -/* 016DC 808A78EC 00C03825 */ or $a3, $a2, $zero ## $a3 = 808A7D5C -/* 016E0 808A78F0 8FA40064 */ lw $a0, 0x0064($sp) -/* 016E4 808A78F4 27A50054 */ addiu $a1, $sp, 0x0054 ## $a1 = FFFFFFF4 -/* 016E8 808A78F8 AFA00014 */ sw $zero, 0x0014($sp) -/* 016EC 808A78FC AFA0002C */ sw $zero, 0x002C($sp) -/* 016F0 808A7900 0C00A9AE */ jal EffectSsDeadDb_Spawn -/* 016F4 808A7904 AFA00030 */ sw $zero, 0x0030($sp) -/* 016F8 808A7908 1000001D */ beq $zero, $zero, .L808A7980 -/* 016FC 808A790C 8602016C */ lh $v0, 0x016C($s0) ## 0000016C -.L808A7910: -/* 01700 808A7910 24180064 */ addiu $t8, $zero, 0x0064 ## $t8 = 00000064 -/* 01704 808A7914 AFB80010 */ sw $t8, 0x0010($sp) -/* 01708 808A7918 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 0170C 808A791C 241900C8 */ addiu $t9, $zero, 0x00C8 ## $t9 = 000000C8 -/* 01710 808A7920 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF -/* 01714 808A7924 240900FF */ addiu $t1, $zero, 0x00FF ## $t1 = 000000FF -/* 01718 808A7928 240A00AA */ addiu $t2, $zero, 0x00AA ## $t2 = 000000AA -/* 0171C 808A792C 240B0032 */ addiu $t3, $zero, 0x0032 ## $t3 = 00000032 -/* 01720 808A7930 240C0064 */ addiu $t4, $zero, 0x0064 ## $t4 = 00000064 -/* 01724 808A7934 240D00FF */ addiu $t5, $zero, 0x00FF ## $t5 = 000000FF -/* 01728 808A7938 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 0172C 808A793C 240F0009 */ addiu $t7, $zero, 0x0009 ## $t7 = 00000009 -/* 01730 808A7940 AFAF0038 */ sw $t7, 0x0038($sp) -/* 01734 808A7944 AFAE0034 */ sw $t6, 0x0034($sp) -/* 01738 808A7948 AFAD0030 */ sw $t5, 0x0030($sp) -/* 0173C 808A794C AFAC002C */ sw $t4, 0x002C($sp) -/* 01740 808A7950 AFAB0028 */ sw $t3, 0x0028($sp) -/* 01744 808A7954 AFAA0024 */ sw $t2, 0x0024($sp) -/* 01748 808A7958 AFA90020 */ sw $t1, 0x0020($sp) -/* 0174C 808A795C AFA8001C */ sw $t0, 0x001C($sp) -/* 01750 808A7960 AFB90018 */ sw $t9, 0x0018($sp) -/* 01754 808A7964 AFB8003C */ sw $t8, 0x003C($sp) -/* 01758 808A7968 8FA40064 */ lw $a0, 0x0064($sp) -/* 0175C 808A796C 27A50054 */ addiu $a1, $sp, 0x0054 ## $a1 = FFFFFFF4 -/* 01760 808A7970 00C03825 */ or $a3, $a2, $zero ## $a3 = 00000000 -/* 01764 808A7974 0C00A9AE */ jal EffectSsDeadDb_Spawn -/* 01768 808A7978 AFA00014 */ sw $zero, 0x0014($sp) -/* 0176C 808A797C 8602016C */ lh $v0, 0x016C($s0) ## 0000016C -.L808A7980: -/* 01770 808A7980 54400004 */ bnel $v0, $zero, .L808A7994 -/* 01774 808A7984 2841FFC4 */ slti $at, $v0, 0xFFC4 -/* 01778 808A7988 AE000134 */ sw $zero, 0x0134($s0) ## 00000134 -/* 0177C 808A798C 8602016C */ lh $v0, 0x016C($s0) ## 0000016C -/* 01780 808A7990 2841FFC4 */ slti $at, $v0, 0xFFC4 -.L808A7994: -/* 01784 808A7994 50200004 */ beql $at, $zero, .L808A79A8 -/* 01788 808A7998 8FBF004C */ lw $ra, 0x004C($sp) -/* 0178C 808A799C 0C00B55C */ jal Actor_Kill - -/* 01790 808A79A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01794 808A79A4 8FBF004C */ lw $ra, 0x004C($sp) -.L808A79A8: -/* 01798 808A79A8 8FB00048 */ lw $s0, 0x0048($sp) -/* 0179C 808A79AC 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 -/* 017A0 808A79B0 03E00008 */ jr $ra -/* 017A4 808A79B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/BgSpot03Taki_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/BgSpot03Taki_Destroy.s deleted file mode 100644 index 0abb0266ef..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/BgSpot03Taki_Destroy.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel BgSpot03Taki_Destroy -/* 003E0 808ADEC0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 003E4 808ADEC4 AFA40018 */ sw $a0, 0x0018($sp) -/* 003E8 808ADEC8 8FAE0018 */ lw $t6, 0x0018($sp) -/* 003EC 808ADECC AFBF0014 */ sw $ra, 0x0014($sp) -/* 003F0 808ADED0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 003F4 808ADED4 24A50810 */ addiu $a1, $a1, 0x0810 ## $a1 = 00000810 -/* 003F8 808ADED8 0C00FB56 */ jal DynaPolyInfo_Free - ## DynaPolyInfo_delReserve -/* 003FC 808ADEDC 8DC6014C */ lw $a2, 0x014C($t6) ## 0000014C -/* 00400 808ADEE0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00404 808ADEE4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00408 808ADEE8 03E00008 */ jr $ra -/* 0040C 808ADEEC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/BgSpot03Taki_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/BgSpot03Taki_Draw.s deleted file mode 100644 index 9d933019c8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/BgSpot03Taki_Draw.s +++ /dev/null @@ -1,190 +0,0 @@ -.rdata -glabel D_808AE3C0 - .asciz "../z_bg_spot03_taki.c" - .balign 4 - -glabel D_808AE3D8 - .asciz "../z_bg_spot03_taki.c" - .balign 4 - -glabel D_808AE3F0 - .asciz "../z_bg_spot03_taki.c" - .balign 4 - -.text -glabel BgSpot03Taki_Draw -/* 00604 808AE0E4 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 -/* 00608 808AE0E8 AFBF003C */ sw $ra, 0x003C($sp) -/* 0060C 808AE0EC AFB00038 */ sw $s0, 0x0038($sp) -/* 00610 808AE0F0 AFA40088 */ sw $a0, 0x0088($sp) -/* 00614 808AE0F4 AFA5008C */ sw $a1, 0x008C($sp) -/* 00618 808AE0F8 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 0061C 808AE0FC 3C06808B */ lui $a2, %hi(D_808AE3C0) ## $a2 = 808B0000 -/* 00620 808AE100 24C6E3C0 */ addiu $a2, $a2, %lo(D_808AE3C0) ## $a2 = 808AE3C0 -/* 00624 808AE104 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFE0 -/* 00628 808AE108 24070141 */ addiu $a3, $zero, 0x0141 ## $a3 = 00000141 -/* 0062C 808AE10C 0C031AB1 */ jal Graph_OpenDisps -/* 00630 808AE110 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00634 808AE114 8FA7008C */ lw $a3, 0x008C($sp) -/* 00638 808AE118 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 0063C 808AE11C 3C080001 */ lui $t0, 0x0001 ## $t0 = 00010000 -/* 00640 808AE120 01074021 */ addu $t0, $t0, $a3 -/* 00644 808AE124 8D081DE4 */ lw $t0, 0x1DE4($t0) ## 00011DE4 -/* 00648 808AE128 3C18DA38 */ lui $t8, 0xDA38 ## $t8 = DA380000 -/* 0064C 808AE12C 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 00650 808AE130 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 -/* 00654 808AE134 37180003 */ ori $t8, $t8, 0x0003 ## $t8 = DA380003 -/* 00658 808AE138 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 0065C 808AE13C 3C05808B */ lui $a1, %hi(D_808AE3D8) ## $a1 = 808B0000 -/* 00660 808AE140 8CE40000 */ lw $a0, 0x0000($a3) ## 00000000 -/* 00664 808AE144 24A5E3D8 */ addiu $a1, $a1, %lo(D_808AE3D8) ## $a1 = 808AE3D8 -/* 00668 808AE148 24060145 */ addiu $a2, $zero, 0x0145 ## $a2 = 00000145 -/* 0066C 808AE14C AFA20064 */ sw $v0, 0x0064($sp) -/* 00670 808AE150 0C0346A2 */ jal Matrix_NewMtx -/* 00674 808AE154 AFA8007C */ sw $t0, 0x007C($sp) -/* 00678 808AE158 8FA30064 */ lw $v1, 0x0064($sp) -/* 0067C 808AE15C 8FA8007C */ lw $t0, 0x007C($sp) -/* 00680 808AE160 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00684 808AE164 8FB9008C */ lw $t9, 0x008C($sp) -/* 00688 808AE168 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 -/* 0068C 808AE16C 0C024F61 */ jal func_80093D84 -/* 00690 808AE170 AFA8007C */ sw $t0, 0x007C($sp) -/* 00694 808AE174 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00698 808AE178 8FA8007C */ lw $t0, 0x007C($sp) -/* 0069C 808AE17C 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 -/* 006A0 808AE180 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 006A4 808AE184 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 -/* 006A8 808AE188 358C0020 */ ori $t4, $t4, 0x0020 ## $t4 = DB060020 -/* 006AC 808AE18C AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 006B0 808AE190 8FAD008C */ lw $t5, 0x008C($sp) -/* 006B4 808AE194 00083880 */ sll $a3, $t0, 2 -/* 006B8 808AE198 240B0040 */ addiu $t3, $zero, 0x0040 ## $t3 = 00000040 -/* 006BC 808AE19C 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 -/* 006C0 808AE1A0 240E0040 */ addiu $t6, $zero, 0x0040 ## $t6 = 00000040 -/* 006C4 808AE1A4 240F0040 */ addiu $t7, $zero, 0x0040 ## $t7 = 00000040 -/* 006C8 808AE1A8 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 006CC 808AE1AC 24190040 */ addiu $t9, $zero, 0x0040 ## $t9 = 00000040 -/* 006D0 808AE1B0 00E83821 */ addu $a3, $a3, $t0 -/* 006D4 808AE1B4 AFA70020 */ sw $a3, 0x0020($sp) -/* 006D8 808AE1B8 AFB90024 */ sw $t9, 0x0024($sp) -/* 006DC 808AE1BC AFB80018 */ sw $t8, 0x0018($sp) -/* 006E0 808AE1C0 AFAF0014 */ sw $t7, 0x0014($sp) -/* 006E4 808AE1C4 AFAE0010 */ sw $t6, 0x0010($sp) -/* 006E8 808AE1C8 AFAB0028 */ sw $t3, 0x0028($sp) -/* 006EC 808AE1CC AFA0001C */ sw $zero, 0x001C($sp) -/* 006F0 808AE1D0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 006F4 808AE1D4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 006F8 808AE1D8 AFA20060 */ sw $v0, 0x0060($sp) -/* 006FC 808AE1DC 0C0253D0 */ jal Gfx_TwoTexScroll -/* 00700 808AE1E0 AFA8007C */ sw $t0, 0x007C($sp) -/* 00704 808AE1E4 8FA30060 */ lw $v1, 0x0060($sp) -/* 00708 808AE1E8 8FA8007C */ lw $t0, 0x007C($sp) -/* 0070C 808AE1EC 8FA90088 */ lw $t1, 0x0088($sp) -/* 00710 808AE1F0 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00714 808AE1F4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00718 808AE1F8 3C0D0600 */ lui $t5, 0x0600 ## $t5 = 06000000 -/* 0071C 808AE1FC 25AD0B20 */ addiu $t5, $t5, 0x0B20 ## $t5 = 06000B20 -/* 00720 808AE200 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 00724 808AE204 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 -/* 00728 808AE208 3C0ADE00 */ lui $t2, 0xDE00 ## $t2 = DE000000 -/* 0072C 808AE20C AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 00730 808AE210 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 00734 808AE214 912E0174 */ lbu $t6, 0x0174($t1) ## 00000174 -/* 00738 808AE218 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0073C 808AE21C 01003025 */ or $a2, $t0, $zero ## $a2 = 00000000 -/* 00740 808AE220 15C0000B */ bne $t6, $zero, .L808AE250 -/* 00744 808AE224 00083880 */ sll $a3, $t0, 2 -/* 00748 808AE228 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 0074C 808AE22C 3C180101 */ lui $t8, 0x0101 ## $t8 = 01010000 -/* 00750 808AE230 3C190600 */ lui $t9, 0x0600 ## $t9 = 06000000 -/* 00754 808AE234 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 00758 808AE238 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 -/* 0075C 808AE23C 27390800 */ addiu $t9, $t9, 0x0800 ## $t9 = 06000800 -/* 00760 808AE240 37189032 */ ori $t8, $t8, 0x9032 ## $t8 = 01019032 -/* 00764 808AE244 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 00768 808AE248 1000000A */ beq $zero, $zero, .L808AE274 -/* 0076C 808AE24C AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -.L808AE250: -/* 00770 808AE250 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00774 808AE254 3C0C0101 */ lui $t4, 0x0101 ## $t4 = 01010000 -/* 00778 808AE258 3C0D0600 */ lui $t5, 0x0600 ## $t5 = 06000000 -/* 0077C 808AE25C 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 00780 808AE260 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 -/* 00784 808AE264 25AD0990 */ addiu $t5, $t5, 0x0990 ## $t5 = 06000990 -/* 00788 808AE268 358C9032 */ ori $t4, $t4, 0x9032 ## $t4 = 01019032 -/* 0078C 808AE26C AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 00790 808AE270 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -.L808AE274: -/* 00794 808AE274 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00798 808AE278 3C0F0600 */ lui $t7, 0x0600 ## $t7 = 06000000 -/* 0079C 808AE27C 25EF0BC0 */ addiu $t7, $t7, 0x0BC0 ## $t7 = 06000BC0 -/* 007A0 808AE280 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 007A4 808AE284 AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 -/* 007A8 808AE288 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 007AC 808AE28C AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 007B0 808AE290 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 007B4 808AE294 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 -/* 007B8 808AE298 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 -/* 007BC 808AE29C 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 007C0 808AE2A0 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 007C4 808AE2A4 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 007C8 808AE2A8 8FAB008C */ lw $t3, 0x008C($sp) -/* 007CC 808AE2AC 24190040 */ addiu $t9, $zero, 0x0040 ## $t9 = 00000040 -/* 007D0 808AE2B0 24180040 */ addiu $t8, $zero, 0x0040 ## $t8 = 00000040 -/* 007D4 808AE2B4 8D640000 */ lw $a0, 0x0000($t3) ## 00000008 -/* 007D8 808AE2B8 00087823 */ subu $t7, $zero, $t0 -/* 007DC 808AE2BC 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 007E0 808AE2C0 00E83823 */ subu $a3, $a3, $t0 -/* 007E4 808AE2C4 240C0040 */ addiu $t4, $zero, 0x0040 ## $t4 = 00000040 -/* 007E8 808AE2C8 240D0040 */ addiu $t5, $zero, 0x0040 ## $t5 = 00000040 -/* 007EC 808AE2CC AFAD0014 */ sw $t5, 0x0014($sp) -/* 007F0 808AE2D0 AFAC0010 */ sw $t4, 0x0010($sp) -/* 007F4 808AE2D4 AFA70020 */ sw $a3, 0x0020($sp) -/* 007F8 808AE2D8 AFAE0018 */ sw $t6, 0x0018($sp) -/* 007FC 808AE2DC AFAF001C */ sw $t7, 0x001C($sp) -/* 00800 808AE2E0 AFB90028 */ sw $t9, 0x0028($sp) -/* 00804 808AE2E4 AFB80024 */ sw $t8, 0x0024($sp) -/* 00808 808AE2E8 0C0253D0 */ jal Gfx_TwoTexScroll -/* 0080C 808AE2EC AFA2004C */ sw $v0, 0x004C($sp) -/* 00810 808AE2F0 8FA3004C */ lw $v1, 0x004C($sp) -/* 00814 808AE2F4 3C0C0600 */ lui $t4, 0x0600 ## $t4 = 06000000 -/* 00818 808AE2F8 3C0ADE00 */ lui $t2, 0xDE00 ## $t2 = DE000000 -/* 0081C 808AE2FC AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00820 808AE300 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00824 808AE304 258C1580 */ addiu $t4, $t4, 0x1580 ## $t4 = 06001580 -/* 00828 808AE308 3C06808B */ lui $a2, %hi(D_808AE3F0) ## $a2 = 808B0000 -/* 0082C 808AE30C 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 00830 808AE310 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 -/* 00834 808AE314 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 00838 808AE318 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 0083C 808AE31C 8FAD008C */ lw $t5, 0x008C($sp) -/* 00840 808AE320 24C6E3F0 */ addiu $a2, $a2, %lo(D_808AE3F0) ## $a2 = 808AE3F0 -/* 00844 808AE324 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFE0 -/* 00848 808AE328 24070166 */ addiu $a3, $zero, 0x0166 ## $a3 = 00000166 -/* 0084C 808AE32C 0C031AD5 */ jal Graph_CloseDisps -/* 00850 808AE330 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 -/* 00854 808AE334 8FA90088 */ lw $t1, 0x0088($sp) -/* 00858 808AE338 912E0174 */ lbu $t6, 0x0174($t1) ## 00000174 -/* 0085C 808AE33C 9122016A */ lbu $v0, 0x016A($t1) ## 0000016A -/* 00860 808AE340 252400E4 */ addiu $a0, $t1, 0x00E4 ## $a0 = 000000E4 -/* 00864 808AE344 2DCF0001 */ sltiu $t7, $t6, 0x0001 -/* 00868 808AE348 18400008 */ blez $v0, .L808AE36C -/* 0086C 808AE34C A12F0174 */ sb $t7, 0x0174($t1) ## 00000174 -/* 00870 808AE350 28410004 */ slti $at, $v0, 0x0004 -/* 00874 808AE354 10200005 */ beq $at, $zero, .L808AE36C -/* 00878 808AE358 3C053F00 */ lui $a1, 0x3F00 ## $a1 = 3F000000 -/* 0087C 808AE35C 0C03D1B8 */ jal func_800F46E0 -/* 00880 808AE360 252400E4 */ addiu $a0, $t1, 0x00E4 ## $a0 = 000000E4 -/* 00884 808AE364 10000004 */ beq $zero, $zero, .L808AE378 -/* 00888 808AE368 8FBF003C */ lw $ra, 0x003C($sp) -.L808AE36C: -/* 0088C 808AE36C 0C03D1B8 */ jal func_800F46E0 -/* 00890 808AE370 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 00894 808AE374 8FBF003C */ lw $ra, 0x003C($sp) -.L808AE378: -/* 00898 808AE378 8FB00038 */ lw $s0, 0x0038($sp) -/* 0089C 808AE37C 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 -/* 008A0 808AE380 03E00008 */ jr $ra -/* 008A4 808AE384 00000000 */ nop -/* 008A8 808AE388 00000000 */ nop -/* 008AC 808AE38C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/BgSpot03Taki_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/BgSpot03Taki_Init.s deleted file mode 100644 index 34a9523e0f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/BgSpot03Taki_Init.s +++ /dev/null @@ -1,48 +0,0 @@ -glabel BgSpot03Taki_Init -/* 00334 808ADE14 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00338 808ADE18 AFBF001C */ sw $ra, 0x001C($sp) -/* 0033C 808ADE1C AFB00018 */ sw $s0, 0x0018($sp) -/* 00340 808ADE20 AFA50034 */ sw $a1, 0x0034($sp) -/* 00344 808ADE24 AFA00024 */ sw $zero, 0x0024($sp) -/* 00348 808ADE28 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 0034C 808ADE2C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00350 808ADE30 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00354 808ADE34 31CF003F */ andi $t7, $t6, 0x003F ## $t7 = 00000000 -/* 00358 808ADE38 0C010D20 */ jal DynaPolyInfo_SetActorMove - -/* 0035C 808ADE3C A48F016C */ sh $t7, 0x016C($a0) ## 0000016C -/* 00360 808ADE40 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00364 808ADE44 24840C98 */ addiu $a0, $a0, 0x0C98 ## $a0 = 06000C98 -/* 00368 808ADE48 0C010620 */ jal DynaPolyInfo_Alloc - -/* 0036C 808ADE4C 27A50024 */ addiu $a1, $sp, 0x0024 ## $a1 = FFFFFFF4 -/* 00370 808ADE50 8FA40034 */ lw $a0, 0x0034($sp) -/* 00374 808ADE54 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00378 808ADE58 8FA70024 */ lw $a3, 0x0024($sp) -/* 0037C 808ADE5C 0C00FA9D */ jal DynaPolyInfo_RegisterActor - ## DynaPolyInfo_setActor -/* 00380 808ADE60 24850810 */ addiu $a1, $a0, 0x0810 ## $a1 = 00000810 -/* 00384 808ADE64 3C05808B */ lui $a1, %hi(D_808AE3B0) ## $a1 = 808B0000 -/* 00388 808ADE68 AE02014C */ sw $v0, 0x014C($s0) ## 0000014C -/* 0038C 808ADE6C 24A5E3B0 */ addiu $a1, $a1, %lo(D_808AE3B0) ## $a1 = 808AE3B0 -/* 00390 808ADE70 0C01E037 */ jal Actor_ProcessInitChain - -/* 00394 808ADE74 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00398 808ADE78 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 0039C 808ADE7C 44812000 */ mtc1 $at, $f4 ## $f4 = 255.00 -/* 003A0 808ADE80 A2000174 */ sb $zero, 0x0174($s0) ## 00000174 -/* 003A4 808ADE84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 003A8 808ADE88 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 003AC 808ADE8C 0C22B6B8 */ jal func_808ADAE0 -/* 003B0 808ADE90 E6040170 */ swc1 $f4, 0x0170($s0) ## 00000170 -/* 003B4 808ADE94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 003B8 808ADE98 0C22B6B8 */ jal func_808ADAE0 -/* 003BC 808ADE9C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 003C0 808ADEA0 3C18808B */ lui $t8, %hi(func_808ADEF0) ## $t8 = 808B0000 -/* 003C4 808ADEA4 2718DEF0 */ addiu $t8, $t8, %lo(func_808ADEF0) ## $t8 = 808ADEF0 -/* 003C8 808ADEA8 AE180164 */ sw $t8, 0x0164($s0) ## 00000164 -/* 003CC 808ADEAC 8FBF001C */ lw $ra, 0x001C($sp) -/* 003D0 808ADEB0 8FB00018 */ lw $s0, 0x0018($sp) -/* 003D4 808ADEB4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 003D8 808ADEB8 03E00008 */ jr $ra -/* 003DC 808ADEBC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/BgSpot03Taki_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/BgSpot03Taki_Update.s deleted file mode 100644 index 518a5c9763..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/BgSpot03Taki_Update.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel BgSpot03Taki_Update -/* 005E0 808AE0C0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 005E4 808AE0C4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 005E8 808AE0C8 8C990164 */ lw $t9, 0x0164($a0) ## 00000164 -/* 005EC 808AE0CC 0320F809 */ jalr $ra, $t9 -/* 005F0 808AE0D0 00000000 */ nop -/* 005F4 808AE0D4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 005F8 808AE0D8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 005FC 808AE0DC 03E00008 */ jr $ra -/* 00600 808AE0E0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/func_808ADAE0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/func_808ADAE0.s deleted file mode 100644 index a3686397d3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/func_808ADAE0.s +++ /dev/null @@ -1,223 +0,0 @@ -glabel func_808ADAE0 -/* 00000 808ADAE0 14A00010 */ bne $a1, $zero, .L808ADB24 -/* 00004 808ADAE4 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00008 808ADAE8 3C030600 */ lui $v1, 0x0600 ## $v1 = 06000000 -/* 0000C 808ADAEC 24630800 */ addiu $v1, $v1, 0x0800 ## $v1 = 06000800 -/* 00010 808ADAF0 00037100 */ sll $t6, $v1, 4 -/* 00014 808ADAF4 000E7F02 */ srl $t7, $t6, 28 -/* 00018 808ADAF8 000FC080 */ sll $t8, $t7, 2 -/* 0001C 808ADAFC 3C198016 */ lui $t9, %hi(gSegments) -/* 00020 808ADB00 0338C821 */ addu $t9, $t9, $t8 -/* 00024 808ADB04 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00028 808ADB08 8F396FA8 */ lw $t9, %lo(gSegments)($t9) -/* 0002C 808ADB0C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00030 808ADB10 00614024 */ and $t0, $v1, $at -/* 00034 808ADB14 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00038 808ADB18 03281021 */ addu $v0, $t9, $t0 -/* 0003C 808ADB1C 1000000F */ beq $zero, $zero, .L808ADB5C -/* 00040 808ADB20 00411021 */ addu $v0, $v0, $at -.L808ADB24: -/* 00044 808ADB24 3C030600 */ lui $v1, 0x0600 ## $v1 = 06000000 -/* 00048 808ADB28 24630990 */ addiu $v1, $v1, 0x0990 ## $v1 = 06000990 -/* 0004C 808ADB2C 00034900 */ sll $t1, $v1, 4 -/* 00050 808ADB30 00095702 */ srl $t2, $t1, 28 -/* 00054 808ADB34 000A5880 */ sll $t3, $t2, 2 -/* 00058 808ADB38 3C0C8016 */ lui $t4, %hi(gSegments) -/* 0005C 808ADB3C 018B6021 */ addu $t4, $t4, $t3 -/* 00060 808ADB40 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00064 808ADB44 8D8C6FA8 */ lw $t4, %lo(gSegments)($t4) -/* 00068 808ADB48 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 0006C 808ADB4C 00616824 */ and $t5, $v1, $at -/* 00070 808ADB50 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00074 808ADB54 018D1021 */ addu $v0, $t4, $t5 -/* 00078 808ADB58 00411021 */ addu $v0, $v0, $at -.L808ADB5C: -/* 0007C 808ADB5C 444EF800 */ cfc1 $t6, $31 -/* 00080 808ADB60 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 00084 808ADB64 44CFF800 */ ctc1 $t7, $31 -/* 00088 808ADB68 C4C40170 */ lwc1 $f4, 0x0170($a2) ## 00000170 -/* 0008C 808ADB6C 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 00090 808ADB70 460021A4 */ cvt.w.s $f6, $f4 -/* 00094 808ADB74 444FF800 */ cfc1 $t7, $31 -/* 00098 808ADB78 00000000 */ nop -/* 0009C 808ADB7C 31EF0078 */ andi $t7, $t7, 0x0078 ## $t7 = 00000000 -/* 000A0 808ADB80 51E00013 */ beql $t7, $zero, .L808ADBD0 -/* 000A4 808ADB84 440F3000 */ mfc1 $t7, $f6 -/* 000A8 808ADB88 44813000 */ mtc1 $at, $f6 ## $f6 = 2147483648.00 -/* 000AC 808ADB8C 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 000B0 808ADB90 46062181 */ sub.s $f6, $f4, $f6 -/* 000B4 808ADB94 44CFF800 */ ctc1 $t7, $31 -/* 000B8 808ADB98 00000000 */ nop -/* 000BC 808ADB9C 460031A4 */ cvt.w.s $f6, $f6 -/* 000C0 808ADBA0 444FF800 */ cfc1 $t7, $31 -/* 000C4 808ADBA4 00000000 */ nop -/* 000C8 808ADBA8 31EF0078 */ andi $t7, $t7, 0x0078 ## $t7 = 00000000 -/* 000CC 808ADBAC 15E00005 */ bne $t7, $zero, .L808ADBC4 -/* 000D0 808ADBB0 00000000 */ nop -/* 000D4 808ADBB4 440F3000 */ mfc1 $t7, $f6 -/* 000D8 808ADBB8 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 000DC 808ADBBC 10000007 */ beq $zero, $zero, .L808ADBDC -/* 000E0 808ADBC0 01E17825 */ or $t7, $t7, $at ## $t7 = 80000000 -.L808ADBC4: -/* 000E4 808ADBC4 10000005 */ beq $zero, $zero, .L808ADBDC -/* 000E8 808ADBC8 240FFFFF */ addiu $t7, $zero, 0xFFFF ## $t7 = FFFFFFFF -/* 000EC 808ADBCC 440F3000 */ mfc1 $t7, $f6 -.L808ADBD0: -/* 000F0 808ADBD0 00000000 */ nop -/* 000F4 808ADBD4 05E0FFFB */ bltz $t7, .L808ADBC4 -/* 000F8 808ADBD8 00000000 */ nop -.L808ADBDC: -/* 000FC 808ADBDC 44CEF800 */ ctc1 $t6, $31 -/* 00100 808ADBE0 A04F00AF */ sb $t7, 0x00AF($v0) ## 000000AF -/* 00104 808ADBE4 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 00108 808ADBE8 C4C80170 */ lwc1 $f8, 0x0170($a2) ## 00000170 -/* 0010C 808ADBEC 4459F800 */ cfc1 $t9, $31 -/* 00110 808ADBF0 44C8F800 */ ctc1 $t0, $31 -/* 00114 808ADBF4 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 00118 808ADBF8 0003C100 */ sll $t8, $v1, 4 -/* 0011C 808ADBFC 460042A4 */ cvt.w.s $f10, $f8 -/* 00120 808ADC00 00582021 */ addu $a0, $v0, $t8 -/* 00124 808ADC04 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 00128 808ADC08 4448F800 */ cfc1 $t0, $31 -/* 0012C 808ADC0C 00000000 */ nop -/* 00130 808ADC10 31080078 */ andi $t0, $t0, 0x0078 ## $t0 = 00000000 -/* 00134 808ADC14 51000013 */ beql $t0, $zero, .L808ADC64 -/* 00138 808ADC18 44085000 */ mfc1 $t0, $f10 -/* 0013C 808ADC1C 44815000 */ mtc1 $at, $f10 ## $f10 = 2147483648.00 -/* 00140 808ADC20 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 00144 808ADC24 460A4281 */ sub.s $f10, $f8, $f10 -/* 00148 808ADC28 44C8F800 */ ctc1 $t0, $31 -/* 0014C 808ADC2C 00000000 */ nop -/* 00150 808ADC30 460052A4 */ cvt.w.s $f10, $f10 -/* 00154 808ADC34 4448F800 */ cfc1 $t0, $31 -/* 00158 808ADC38 00000000 */ nop -/* 0015C 808ADC3C 31080078 */ andi $t0, $t0, 0x0078 ## $t0 = 00000000 -/* 00160 808ADC40 15000005 */ bne $t0, $zero, .L808ADC58 -/* 00164 808ADC44 00000000 */ nop -/* 00168 808ADC48 44085000 */ mfc1 $t0, $f10 -/* 0016C 808ADC4C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00170 808ADC50 10000007 */ beq $zero, $zero, .L808ADC70 -/* 00174 808ADC54 01014025 */ or $t0, $t0, $at ## $t0 = 80000000 -.L808ADC58: -/* 00178 808ADC58 10000005 */ beq $zero, $zero, .L808ADC70 -/* 0017C 808ADC5C 2408FFFF */ addiu $t0, $zero, 0xFFFF ## $t0 = FFFFFFFF -/* 00180 808ADC60 44085000 */ mfc1 $t0, $f10 -.L808ADC64: -/* 00184 808ADC64 00000000 */ nop -/* 00188 808ADC68 0500FFFB */ bltz $t0, .L808ADC58 -/* 0018C 808ADC6C 00000000 */ nop -.L808ADC70: -/* 00190 808ADC70 44D9F800 */ ctc1 $t9, $31 -/* 00194 808ADC74 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 00198 808ADC78 A08800AF */ sb $t0, 0x00AF($a0) ## 000000AF -/* 0019C 808ADC7C C4D00170 */ lwc1 $f16, 0x0170($a2) ## 00000170 -/* 001A0 808ADC80 4449F800 */ cfc1 $t1, $31 -/* 001A4 808ADC84 44CAF800 */ ctc1 $t2, $31 -/* 001A8 808ADC88 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 001AC 808ADC8C 460084A4 */ cvt.w.s $f18, $f16 -/* 001B0 808ADC90 444AF800 */ cfc1 $t2, $31 -/* 001B4 808ADC94 00000000 */ nop -/* 001B8 808ADC98 314A0078 */ andi $t2, $t2, 0x0078 ## $t2 = 00000000 -/* 001BC 808ADC9C 51400013 */ beql $t2, $zero, .L808ADCEC -/* 001C0 808ADCA0 440A9000 */ mfc1 $t2, $f18 -/* 001C4 808ADCA4 44819000 */ mtc1 $at, $f18 ## $f18 = 2147483648.00 -/* 001C8 808ADCA8 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 001CC 808ADCAC 46128481 */ sub.s $f18, $f16, $f18 -/* 001D0 808ADCB0 44CAF800 */ ctc1 $t2, $31 -/* 001D4 808ADCB4 00000000 */ nop -/* 001D8 808ADCB8 460094A4 */ cvt.w.s $f18, $f18 -/* 001DC 808ADCBC 444AF800 */ cfc1 $t2, $31 -/* 001E0 808ADCC0 00000000 */ nop -/* 001E4 808ADCC4 314A0078 */ andi $t2, $t2, 0x0078 ## $t2 = 00000000 -/* 001E8 808ADCC8 15400005 */ bne $t2, $zero, .L808ADCE0 -/* 001EC 808ADCCC 00000000 */ nop -/* 001F0 808ADCD0 440A9000 */ mfc1 $t2, $f18 -/* 001F4 808ADCD4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 001F8 808ADCD8 10000007 */ beq $zero, $zero, .L808ADCF8 -/* 001FC 808ADCDC 01415025 */ or $t2, $t2, $at ## $t2 = 80000000 -.L808ADCE0: -/* 00200 808ADCE0 10000005 */ beq $zero, $zero, .L808ADCF8 -/* 00204 808ADCE4 240AFFFF */ addiu $t2, $zero, 0xFFFF ## $t2 = FFFFFFFF -/* 00208 808ADCE8 440A9000 */ mfc1 $t2, $f18 -.L808ADCEC: -/* 0020C 808ADCEC 00000000 */ nop -/* 00210 808ADCF0 0540FFFB */ bltz $t2, .L808ADCE0 -/* 00214 808ADCF4 00000000 */ nop -.L808ADCF8: -/* 00218 808ADCF8 44C9F800 */ ctc1 $t1, $31 -/* 0021C 808ADCFC A08A00BF */ sb $t2, 0x00BF($a0) ## 000000BF -/* 00220 808ADD00 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 00224 808ADD04 C4C40170 */ lwc1 $f4, 0x0170($a2) ## 00000170 -/* 00228 808ADD08 444BF800 */ cfc1 $t3, $31 -/* 0022C 808ADD0C 44CCF800 */ ctc1 $t4, $31 -/* 00230 808ADD10 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 00234 808ADD14 460021A4 */ cvt.w.s $f6, $f4 -/* 00238 808ADD18 444CF800 */ cfc1 $t4, $31 -/* 0023C 808ADD1C 00000000 */ nop -/* 00240 808ADD20 318C0078 */ andi $t4, $t4, 0x0078 ## $t4 = 00000000 -/* 00244 808ADD24 51800013 */ beql $t4, $zero, .L808ADD74 -/* 00248 808ADD28 440C3000 */ mfc1 $t4, $f6 -/* 0024C 808ADD2C 44813000 */ mtc1 $at, $f6 ## $f6 = 2147483648.00 -/* 00250 808ADD30 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 00254 808ADD34 46062181 */ sub.s $f6, $f4, $f6 -/* 00258 808ADD38 44CCF800 */ ctc1 $t4, $31 -/* 0025C 808ADD3C 00000000 */ nop -/* 00260 808ADD40 460031A4 */ cvt.w.s $f6, $f6 -/* 00264 808ADD44 444CF800 */ cfc1 $t4, $31 -/* 00268 808ADD48 00000000 */ nop -/* 0026C 808ADD4C 318C0078 */ andi $t4, $t4, 0x0078 ## $t4 = 00000000 -/* 00270 808ADD50 15800005 */ bne $t4, $zero, .L808ADD68 -/* 00274 808ADD54 00000000 */ nop -/* 00278 808ADD58 440C3000 */ mfc1 $t4, $f6 -/* 0027C 808ADD5C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00280 808ADD60 10000007 */ beq $zero, $zero, .L808ADD80 -/* 00284 808ADD64 01816025 */ or $t4, $t4, $at ## $t4 = 80000000 -.L808ADD68: -/* 00288 808ADD68 10000005 */ beq $zero, $zero, .L808ADD80 -/* 0028C 808ADD6C 240CFFFF */ addiu $t4, $zero, 0xFFFF ## $t4 = FFFFFFFF -/* 00290 808ADD70 440C3000 */ mfc1 $t4, $f6 -.L808ADD74: -/* 00294 808ADD74 00000000 */ nop -/* 00298 808ADD78 0580FFFB */ bltz $t4, .L808ADD68 -/* 0029C 808ADD7C 00000000 */ nop -.L808ADD80: -/* 002A0 808ADD80 44CBF800 */ ctc1 $t3, $31 -/* 002A4 808ADD84 A08C00CF */ sb $t4, 0x00CF($a0) ## 000000CF -/* 002A8 808ADD88 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 002AC 808ADD8C C4C80170 */ lwc1 $f8, 0x0170($a2) ## 00000170 -/* 002B0 808ADD90 444DF800 */ cfc1 $t5, $31 -/* 002B4 808ADD94 44CEF800 */ ctc1 $t6, $31 -/* 002B8 808ADD98 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 002BC 808ADD9C 460042A4 */ cvt.w.s $f10, $f8 -/* 002C0 808ADDA0 444EF800 */ cfc1 $t6, $31 -/* 002C4 808ADDA4 00000000 */ nop -/* 002C8 808ADDA8 31CE0078 */ andi $t6, $t6, 0x0078 ## $t6 = 00000000 -/* 002CC 808ADDAC 51C00013 */ beql $t6, $zero, .L808ADDFC -/* 002D0 808ADDB0 440E5000 */ mfc1 $t6, $f10 -/* 002D4 808ADDB4 44815000 */ mtc1 $at, $f10 ## $f10 = 2147483648.00 -/* 002D8 808ADDB8 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 002DC 808ADDBC 460A4281 */ sub.s $f10, $f8, $f10 -/* 002E0 808ADDC0 44CEF800 */ ctc1 $t6, $31 -/* 002E4 808ADDC4 00000000 */ nop -/* 002E8 808ADDC8 460052A4 */ cvt.w.s $f10, $f10 -/* 002EC 808ADDCC 444EF800 */ cfc1 $t6, $31 -/* 002F0 808ADDD0 00000000 */ nop -/* 002F4 808ADDD4 31CE0078 */ andi $t6, $t6, 0x0078 ## $t6 = 00000000 -/* 002F8 808ADDD8 15C00005 */ bne $t6, $zero, .L808ADDF0 -/* 002FC 808ADDDC 00000000 */ nop -/* 00300 808ADDE0 440E5000 */ mfc1 $t6, $f10 -/* 00304 808ADDE4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00308 808ADDE8 10000007 */ beq $zero, $zero, .L808ADE08 -/* 0030C 808ADDEC 01C17025 */ or $t6, $t6, $at ## $t6 = 80000000 -.L808ADDF0: -/* 00310 808ADDF0 10000005 */ beq $zero, $zero, .L808ADE08 -/* 00314 808ADDF4 240EFFFF */ addiu $t6, $zero, 0xFFFF ## $t6 = FFFFFFFF -/* 00318 808ADDF8 440E5000 */ mfc1 $t6, $f10 -.L808ADDFC: -/* 0031C 808ADDFC 00000000 */ nop -/* 00320 808ADE00 05C0FFFB */ bltz $t6, .L808ADDF0 -/* 00324 808ADE04 00000000 */ nop -.L808ADE08: -/* 00328 808ADE08 44CDF800 */ ctc1 $t5, $31 -/* 0032C 808ADE0C 03E00008 */ jr $ra -/* 00330 808ADE10 A08E00DF */ sb $t6, 0x00DF($a0) ## 000000DF diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/func_808ADEF0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/func_808ADEF0.s deleted file mode 100644 index 6cffe18e40..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/func_808ADEF0.s +++ /dev/null @@ -1,125 +0,0 @@ -glabel func_808ADEF0 -/* 00410 808ADEF0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00414 808ADEF4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00418 808ADEF8 AFB00020 */ sw $s0, 0x0020($sp) -/* 0041C 808ADEFC 9082016A */ lbu $v0, 0x016A($a0) ## 0000016A -/* 00420 808ADF00 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00424 808ADF04 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 00428 808ADF08 14400012 */ bne $v0, $zero, .L808ADF54 -/* 0042C 808ADF0C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00430 808ADF10 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00434 808ADF14 9605016C */ lhu $a1, 0x016C($s0) ## 0000016C -/* 00438 808ADF18 0C00B2D0 */ jal Flags_GetSwitch - -/* 0043C 808ADF1C AFA7002C */ sw $a3, 0x002C($sp) -/* 00440 808ADF20 1040005F */ beq $v0, $zero, .L808AE0A0 -/* 00444 808ADF24 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00448 808ADF28 240F0028 */ addiu $t7, $zero, 0x0028 ## $t7 = 00000028 -/* 0044C 808ADF2C A20E016A */ sb $t6, 0x016A($s0) ## 0000016A -/* 00450 808ADF30 A60F0168 */ sh $t7, 0x0168($s0) ## 00000168 -/* 00454 808ADF34 AFA00010 */ sw $zero, 0x0010($sp) -/* 00458 808ADF38 8FA4002C */ lw $a0, 0x002C($sp) -/* 0045C 808ADF3C 24051004 */ addiu $a1, $zero, 0x1004 ## $a1 = 00001004 -/* 00460 808ADF40 2406FF9D */ addiu $a2, $zero, 0xFF9D ## $a2 = FFFFFF9D -/* 00464 808ADF44 0C02003E */ jal func_800800F8 -/* 00468 808ADF48 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0046C 808ADF4C 10000055 */ beq $zero, $zero, .L808AE0A4 -/* 00470 808ADF50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L808ADF54: -/* 00474 808ADF54 5441000B */ bnel $v0, $at, .L808ADF84 -/* 00478 808ADF58 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0047C 808ADF5C 86180168 */ lh $t8, 0x0168($s0) ## 00000168 -/* 00480 808ADF60 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 00484 808ADF64 2719FFFF */ addiu $t9, $t8, 0xFFFF ## $t9 = FFFFFFFF -/* 00488 808ADF68 A6190168 */ sh $t9, 0x0168($s0) ## 00000168 -/* 0048C 808ADF6C 86080168 */ lh $t0, 0x0168($s0) ## 00000168 -/* 00490 808ADF70 0503004C */ bgezl $t0, .L808AE0A4 -/* 00494 808ADF74 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00498 808ADF78 10000049 */ beq $zero, $zero, .L808AE0A0 -/* 0049C 808ADF7C A209016A */ sb $t1, 0x016A($s0) ## 0000016A -/* 004A0 808ADF80 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -.L808ADF84: -/* 004A4 808ADF84 5441001D */ bnel $v0, $at, .L808ADFFC -/* 004A8 808ADF88 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 004AC 808ADF8C C6000170 */ lwc1 $f0, 0x0170($s0) ## 00000170 -/* 004B0 808ADF90 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 004B4 808ADF94 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 004B8 808ADF98 4600203C */ c.lt.s $f4, $f0 -/* 004BC 808ADF9C 00000000 */ nop -/* 004C0 808ADFA0 45020040 */ bc1fl .L808AE0A4 -/* 004C4 808ADFA4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 004C8 808ADFA8 44813000 */ mtc1 $at, $f6 ## $f6 = 5.00 -/* 004CC 808ADFAC 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 004D0 808ADFB0 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 004D4 808ADFB4 46060201 */ sub.s $f8, $f0, $f6 -/* 004D8 808ADFB8 24E50810 */ addiu $a1, $a3, 0x0810 ## $a1 = 00000810 -/* 004DC 808ADFBC E6080170 */ swc1 $f8, 0x0170($s0) ## 00000170 -/* 004E0 808ADFC0 C6100170 */ lwc1 $f16, 0x0170($s0) ## 00000170 -/* 004E4 808ADFC4 460A803E */ c.le.s $f16, $f10 -/* 004E8 808ADFC8 00000000 */ nop -/* 004EC 808ADFCC 45020035 */ bc1fl .L808AE0A4 -/* 004F0 808ADFD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 004F4 808ADFD4 0C00FAFE */ jal func_8003EBF8 -/* 004F8 808ADFD8 8E06014C */ lw $a2, 0x014C($s0) ## 0000014C -/* 004FC 808ADFDC 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 00500 808ADFE0 240A0190 */ addiu $t2, $zero, 0x0190 ## $t2 = 00000190 -/* 00504 808ADFE4 240B0003 */ addiu $t3, $zero, 0x0003 ## $t3 = 00000003 -/* 00508 808ADFE8 A60A0168 */ sh $t2, 0x0168($s0) ## 00000168 -/* 0050C 808ADFEC A20B016A */ sb $t3, 0x016A($s0) ## 0000016A -/* 00510 808ADFF0 1000002B */ beq $zero, $zero, .L808AE0A0 -/* 00514 808ADFF4 E6120170 */ swc1 $f18, 0x0170($s0) ## 00000170 -/* 00518 808ADFF8 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -.L808ADFFC: -/* 0051C 808ADFFC 5441000B */ bnel $v0, $at, .L808AE02C -/* 00520 808AE000 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00524 808AE004 860C0168 */ lh $t4, 0x0168($s0) ## 00000168 -/* 00528 808AE008 240F0004 */ addiu $t7, $zero, 0x0004 ## $t7 = 00000004 -/* 0052C 808AE00C 258DFFFF */ addiu $t5, $t4, 0xFFFF ## $t5 = FFFFFFFF -/* 00530 808AE010 A60D0168 */ sh $t5, 0x0168($s0) ## 00000168 -/* 00534 808AE014 860E0168 */ lh $t6, 0x0168($s0) ## 00000168 -/* 00538 808AE018 05C30022 */ bgezl $t6, .L808AE0A4 -/* 0053C 808AE01C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00540 808AE020 1000001F */ beq $zero, $zero, .L808AE0A0 -/* 00544 808AE024 A20F016A */ sb $t7, 0x016A($s0) ## 0000016A -/* 00548 808AE028 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -.L808AE02C: -/* 0054C 808AE02C 1441001C */ bne $v0, $at, .L808AE0A0 -/* 00550 808AE030 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 00554 808AE034 44811000 */ mtc1 $at, $f2 ## $f2 = 255.00 -/* 00558 808AE038 C6000170 */ lwc1 $f0, 0x0170($s0) ## 00000170 -/* 0055C 808AE03C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 00560 808AE040 4602003C */ c.lt.s $f0, $f2 -/* 00564 808AE044 00000000 */ nop -/* 00568 808AE048 45020016 */ bc1fl .L808AE0A4 -/* 0056C 808AE04C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00570 808AE050 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 -/* 00574 808AE054 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00578 808AE058 24E50810 */ addiu $a1, $a3, 0x0810 ## $a1 = 00000810 -/* 0057C 808AE05C 46040180 */ add.s $f6, $f0, $f4 -/* 00580 808AE060 E6060170 */ swc1 $f6, 0x0170($s0) ## 00000170 -/* 00584 808AE064 C6080170 */ lwc1 $f8, 0x0170($s0) ## 00000170 -/* 00588 808AE068 4608103E */ c.le.s $f2, $f8 -/* 0058C 808AE06C 00000000 */ nop -/* 00590 808AE070 4502000C */ bc1fl .L808AE0A4 -/* 00594 808AE074 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00598 808AE078 8E06014C */ lw $a2, 0x014C($s0) ## 0000014C -/* 0059C 808AE07C 0C00FB14 */ jal func_8003EC50 -/* 005A0 808AE080 AFA7002C */ sw $a3, 0x002C($sp) -/* 005A4 808AE084 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 005A8 808AE088 44811000 */ mtc1 $at, $f2 ## $f2 = 255.00 -/* 005AC 808AE08C A200016A */ sb $zero, 0x016A($s0) ## 0000016A -/* 005B0 808AE090 9605016C */ lhu $a1, 0x016C($s0) ## 0000016C -/* 005B4 808AE094 E6020170 */ swc1 $f2, 0x0170($s0) ## 00000170 -/* 005B8 808AE098 0C00B2ED */ jal Flags_UnsetSwitch - -/* 005BC 808AE09C 8FA4002C */ lw $a0, 0x002C($sp) -.L808AE0A0: -/* 005C0 808AE0A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L808AE0A4: -/* 005C4 808AE0A4 0C22B6B8 */ jal func_808ADAE0 -/* 005C8 808AE0A8 92050174 */ lbu $a1, 0x0174($s0) ## 00000174 -/* 005CC 808AE0AC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 005D0 808AE0B0 8FB00020 */ lw $s0, 0x0020($sp) -/* 005D4 808AE0B4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 005D8 808AE0B8 03E00008 */ jr $ra -/* 005DC 808AE0BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/EnIceHono_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/EnIceHono_Destroy.s deleted file mode 100644 index 9056268fa3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/EnIceHono_Destroy.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel EnIceHono_Destroy -/* 003A0 80A73390 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 003A4 80A73394 AFBF0014 */ sw $ra, 0x0014($sp) -/* 003A8 80A73398 AFA5001C */ sw $a1, 0x001C($sp) -/* 003AC 80A7339C 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 003B0 80A733A0 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 003B4 80A733A4 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 003B8 80A733A8 10410003 */ beq $v0, $at, .L80A733B8 -/* 003BC 80A733AC 8FA4001C */ lw $a0, 0x001C($sp) -/* 003C0 80A733B0 5440000A */ bnel $v0, $zero, .L80A733DC -/* 003C4 80A733B4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A733B8: -/* 003C8 80A733B8 8CE601A8 */ lw $a2, 0x01A8($a3) ## 000001A8 -/* 003CC 80A733BC AFA70018 */ sw $a3, 0x0018($sp) -/* 003D0 80A733C0 0C01E9F1 */ jal LightContext_RemoveLight - -/* 003D4 80A733C4 248507A8 */ addiu $a1, $a0, 0x07A8 ## $a1 = 000007A8 -/* 003D8 80A733C8 8FA70018 */ lw $a3, 0x0018($sp) -/* 003DC 80A733CC 8FA4001C */ lw $a0, 0x001C($sp) -/* 003E0 80A733D0 0C0170EB */ jal Collider_DestroyCylinder - -/* 003E4 80A733D4 24E5015C */ addiu $a1, $a3, 0x015C ## $a1 = 0000015C -/* 003E8 80A733D8 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A733DC: -/* 003EC 80A733DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 003F0 80A733E0 03E00008 */ jr $ra -/* 003F4 80A733E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/EnIceHono_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/EnIceHono_Draw.s deleted file mode 100644 index 4c9d856c08..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/EnIceHono_Draw.s +++ /dev/null @@ -1,140 +0,0 @@ -.rdata -glabel D_80A740D8 - .asciz "../z_en_ice_hono.c" - .balign 4 - -glabel D_80A740EC - .asciz "../z_en_ice_hono.c" - .balign 4 - -glabel D_80A74100 - .asciz "../z_en_ice_hono.c" - .balign 4 - -.late_rodata -glabel D_80A74174 - .float 9.58738019108e-05 - -.text -glabel EnIceHono_Draw -/* 00E1C 80A73E0C 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 00E20 80A73E10 AFB10038 */ sw $s1, 0x0038($sp) -/* 00E24 80A73E14 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00E28 80A73E18 AFBF003C */ sw $ra, 0x003C($sp) -/* 00E2C 80A73E1C AFB00034 */ sw $s0, 0x0034($sp) -/* 00E30 80A73E20 AFA40078 */ sw $a0, 0x0078($sp) -/* 00E34 80A73E24 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 00E38 80A73E28 3C0680A7 */ lui $a2, %hi(D_80A740D8) ## $a2 = 80A70000 -/* 00E3C 80A73E2C 24C640D8 */ addiu $a2, $a2, %lo(D_80A740D8) ## $a2 = 80A740D8 -/* 00E40 80A73E30 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFE4 -/* 00E44 80A73E34 240702B7 */ addiu $a3, $zero, 0x02B7 ## $a3 = 000002B7 -/* 00E48 80A73E38 0C031AB1 */ jal Graph_OpenDisps -/* 00E4C 80A73E3C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00E50 80A73E40 0C024F61 */ jal func_80093D84 -/* 00E54 80A73E44 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 00E58 80A73E48 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00E5C 80A73E4C 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 00E60 80A73E50 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 -/* 00E64 80A73E54 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 00E68 80A73E58 AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 -/* 00E6C 80A73E5C AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 00E70 80A73E60 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 00E74 80A73E64 24180020 */ addiu $t8, $zero, 0x0020 ## $t8 = 00000020 -/* 00E78 80A73E68 24190040 */ addiu $t9, $zero, 0x0040 ## $t9 = 00000040 -/* 00E7C 80A73E6C 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 00E80 80A73E70 AFA80018 */ sw $t0, 0x0018($sp) -/* 00E84 80A73E74 AFB90014 */ sw $t9, 0x0014($sp) -/* 00E88 80A73E78 AFB80010 */ sw $t8, 0x0010($sp) -/* 00E8C 80A73E7C AFA0001C */ sw $zero, 0x001C($sp) -/* 00E90 80A73E80 8E29009C */ lw $t1, 0x009C($s1) ## 0000009C -/* 00E94 80A73E84 240C0020 */ addiu $t4, $zero, 0x0020 ## $t4 = 00000020 -/* 00E98 80A73E88 240D0080 */ addiu $t5, $zero, 0x0080 ## $t5 = 00000080 -/* 00E9C 80A73E8C 00090823 */ subu $at, $zero, $t1 -/* 00EA0 80A73E90 00015080 */ sll $t2, $at, 2 -/* 00EA4 80A73E94 01415021 */ addu $t2, $t2, $at -/* 00EA8 80A73E98 000A5080 */ sll $t2, $t2, 2 -/* 00EAC 80A73E9C 314B01FF */ andi $t3, $t2, 0x01FF ## $t3 = 00000000 -/* 00EB0 80A73EA0 AFAB0020 */ sw $t3, 0x0020($sp) -/* 00EB4 80A73EA4 AFAD0028 */ sw $t5, 0x0028($sp) -/* 00EB8 80A73EA8 AFAC0024 */ sw $t4, 0x0024($sp) -/* 00EBC 80A73EAC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00EC0 80A73EB0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00EC4 80A73EB4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00EC8 80A73EB8 0C0253D0 */ jal Gfx_TwoTexScroll -/* 00ECC 80A73EBC AFA20058 */ sw $v0, 0x0058($sp) -/* 00ED0 80A73EC0 8FA30058 */ lw $v1, 0x0058($sp) -/* 00ED4 80A73EC4 3C0FFA00 */ lui $t7, 0xFA00 ## $t7 = FA000000 -/* 00ED8 80A73EC8 35EF8080 */ ori $t7, $t7, 0x8080 ## $t7 = FA008080 -/* 00EDC 80A73ECC AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00EE0 80A73ED0 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00EE4 80A73ED4 3C01AAFF */ lui $at, 0xAAFF ## $at = AAFF0000 -/* 00EE8 80A73ED8 3421FF00 */ ori $at, $at, 0xFF00 ## $at = AAFFFF00 -/* 00EEC 80A73EDC 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 00EF0 80A73EE0 AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 -/* 00EF4 80A73EE4 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 00EF8 80A73EE8 8FB80078 */ lw $t8, 0x0078($sp) -/* 00EFC 80A73EEC 3C0C0096 */ lui $t4, 0x0096 ## $t4 = 00960000 -/* 00F00 80A73EF0 358CFF00 */ ori $t4, $t4, 0xFF00 ## $t4 = 0096FF00 -/* 00F04 80A73EF4 87190150 */ lh $t9, 0x0150($t8) ## 00000150 -/* 00F08 80A73EF8 3C0BFB00 */ lui $t3, 0xFB00 ## $t3 = FB000000 -/* 00F0C 80A73EFC 332800FF */ andi $t0, $t9, 0x00FF ## $t0 = 00000000 -/* 00F10 80A73F00 01014825 */ or $t1, $t0, $at ## $t1 = AAFFFF00 -/* 00F14 80A73F04 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 00F18 80A73F08 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00F1C 80A73F0C 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 00F20 80A73F10 AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 -/* 00F24 80A73F14 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 00F28 80A73F18 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 00F2C 80A73F1C 862D07A0 */ lh $t5, 0x07A0($s1) ## 000007A0 -/* 00F30 80A73F20 000D7080 */ sll $t6, $t5, 2 -/* 00F34 80A73F24 022E7821 */ addu $t7, $s1, $t6 -/* 00F38 80A73F28 0C016A7D */ jal func_8005A9F4 -/* 00F3C 80A73F2C 8DE40790 */ lw $a0, 0x0790($t7) ## FA008810 -/* 00F40 80A73F30 8FB80078 */ lw $t8, 0x0078($sp) -/* 00F44 80A73F34 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 00F48 80A73F38 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00F4C 80A73F3C 871900B6 */ lh $t9, 0x00B6($t8) ## 000000B6 -/* 00F50 80A73F40 00594023 */ subu $t0, $v0, $t9 -/* 00F54 80A73F44 01014821 */ addu $t1, $t0, $at -/* 00F58 80A73F48 00095400 */ sll $t2, $t1, 16 -/* 00F5C 80A73F4C 000A5C03 */ sra $t3, $t2, 16 -/* 00F60 80A73F50 448B2000 */ mtc1 $t3, $f4 ## $f4 = 0.00 -/* 00F64 80A73F54 3C0180A7 */ lui $at, %hi(D_80A74174) ## $at = 80A70000 -/* 00F68 80A73F58 C4284174 */ lwc1 $f8, %lo(D_80A74174)($at) -/* 00F6C 80A73F5C 468021A0 */ cvt.s.w $f6, $f4 -/* 00F70 80A73F60 46083302 */ mul.s $f12, $f6, $f8 -/* 00F74 80A73F64 0C034348 */ jal Matrix_RotateY -/* 00F78 80A73F68 00000000 */ nop -/* 00F7C 80A73F6C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00F80 80A73F70 3C0DDA38 */ lui $t5, 0xDA38 ## $t5 = DA380000 -/* 00F84 80A73F74 35AD0003 */ ori $t5, $t5, 0x0003 ## $t5 = DA380003 -/* 00F88 80A73F78 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 00F8C 80A73F7C AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 -/* 00F90 80A73F80 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 00F94 80A73F84 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 00F98 80A73F88 3C0580A7 */ lui $a1, %hi(D_80A740EC) ## $a1 = 80A70000 -/* 00F9C 80A73F8C 24A540EC */ addiu $a1, $a1, %lo(D_80A740EC) ## $a1 = 80A740EC -/* 00FA0 80A73F90 240602CE */ addiu $a2, $zero, 0x02CE ## $a2 = 000002CE -/* 00FA4 80A73F94 0C0346A2 */ jal Matrix_NewMtx -/* 00FA8 80A73F98 AFA2004C */ sw $v0, 0x004C($sp) -/* 00FAC 80A73F9C 8FA3004C */ lw $v1, 0x004C($sp) -/* 00FB0 80A73FA0 3C180405 */ lui $t8, 0x0405 ## $t8 = 04050000 -/* 00FB4 80A73FA4 2718D4E0 */ addiu $t8, $t8, 0xD4E0 ## $t8 = 0404D4E0 -/* 00FB8 80A73FA8 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00FBC 80A73FAC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00FC0 80A73FB0 3C0FDE00 */ lui $t7, 0xDE00 ## $t7 = DE000000 -/* 00FC4 80A73FB4 3C0680A7 */ lui $a2, %hi(D_80A74100) ## $a2 = 80A70000 -/* 00FC8 80A73FB8 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 00FCC 80A73FBC AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 -/* 00FD0 80A73FC0 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 00FD4 80A73FC4 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 00FD8 80A73FC8 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 00FDC 80A73FCC 24C64100 */ addiu $a2, $a2, %lo(D_80A74100) ## $a2 = 80A74100 -/* 00FE0 80A73FD0 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFE4 -/* 00FE4 80A73FD4 0C031AD5 */ jal Graph_CloseDisps -/* 00FE8 80A73FD8 240702D2 */ addiu $a3, $zero, 0x02D2 ## $a3 = 000002D2 -/* 00FEC 80A73FDC 8FBF003C */ lw $ra, 0x003C($sp) -/* 00FF0 80A73FE0 8FB00034 */ lw $s0, 0x0034($sp) -/* 00FF4 80A73FE4 8FB10038 */ lw $s1, 0x0038($sp) -/* 00FF8 80A73FE8 03E00008 */ jr $ra -/* 00FFC 80A73FEC 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/EnIceHono_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/EnIceHono_Init.s deleted file mode 100644 index b42ca4240e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/EnIceHono_Init.s +++ /dev/null @@ -1,115 +0,0 @@ -.rdata -glabel D_80A740A0 - .asciz "(ice 炎)(arg_data 0x%04x)\n" - .balign 4 - -.late_rodata -glabel D_80A7412C - .word 0x477FFF80 -glabel D_80A74130 - .word 0x477FFF80 - -.text -glabel EnIceHono_Init -/* 00238 80A73228 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 0023C 80A7322C AFBF002C */ sw $ra, 0x002C($sp) -/* 00240 80A73230 AFB00028 */ sw $s0, 0x0028($sp) -/* 00244 80A73234 AFA50044 */ sw $a1, 0x0044($sp) -/* 00248 80A73238 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 0024C 80A7323C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00250 80A73240 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 00254 80A73244 1041000B */ beq $v0, $at, .L80A73274 -/* 00258 80A73248 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0025C 80A7324C 1040000D */ beq $v0, $zero, .L80A73284 -/* 00260 80A73250 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00264 80A73254 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00268 80A73258 1041000E */ beq $v0, $at, .L80A73294 -/* 0026C 80A7325C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00270 80A73260 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00274 80A73264 1041000B */ beq $v0, $at, .L80A73294 -/* 00278 80A73268 00000000 */ nop -/* 0027C 80A7326C 1000000D */ beq $zero, $zero, .L80A732A4 -/* 00280 80A73270 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -.L80A73274: -/* 00284 80A73274 0C29CC07 */ jal func_80A7301C -/* 00288 80A73278 8FA50044 */ lw $a1, 0x0044($sp) -/* 0028C 80A7327C 10000008 */ beq $zero, $zero, .L80A732A0 -/* 00290 80A73280 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -.L80A73284: -/* 00294 80A73284 0C29CC2F */ jal func_80A730BC -/* 00298 80A73288 8FA50044 */ lw $a1, 0x0044($sp) -/* 0029C 80A7328C 10000004 */ beq $zero, $zero, .L80A732A0 -/* 002A0 80A73290 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -.L80A73294: -/* 002A4 80A73294 0C29CC70 */ jal func_80A731C0 -/* 002A8 80A73298 8FA50044 */ lw $a1, 0x0044($sp) -/* 002AC 80A7329C 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -.L80A732A0: -/* 002B0 80A732A0 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -.L80A732A4: -/* 002B4 80A732A4 10410003 */ beq $v0, $at, .L80A732B4 -/* 002B8 80A732A8 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -/* 002BC 80A732AC 54400034 */ bnel $v0, $zero, .L80A73380 -/* 002C0 80A732B0 8FBF002C */ lw $ra, 0x002C($sp) -.L80A732B4: -/* 002C4 80A732B4 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 002C8 80A732B8 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 002CC 80A732BC C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C -/* 002D0 80A732C0 4600428D */ trunc.w.s $f10, $f8 -/* 002D4 80A732C4 2419009B */ addiu $t9, $zero, 0x009B ## $t9 = 0000009B -/* 002D8 80A732C8 240800D2 */ addiu $t0, $zero, 0x00D2 ## $t0 = 000000D2 -/* 002DC 80A732CC 4600218D */ trunc.w.s $f6, $f4 -/* 002E0 80A732D0 44065000 */ mfc1 $a2, $f10 -/* 002E4 80A732D4 240900FF */ addiu $t1, $zero, 0x00FF ## $t1 = 000000FF -/* 002E8 80A732D8 4600848D */ trunc.w.s $f18, $f16 -/* 002EC 80A732DC 44053000 */ mfc1 $a1, $f6 -/* 002F0 80A732E0 00063400 */ sll $a2, $a2, 16 -/* 002F4 80A732E4 00063403 */ sra $a2, $a2, 16 -/* 002F8 80A732E8 44079000 */ mfc1 $a3, $f18 -/* 002FC 80A732EC 24C6000A */ addiu $a2, $a2, 0x000A ## $a2 = 0000000A -/* 00300 80A732F0 00063400 */ sll $a2, $a2, 16 -/* 00304 80A732F4 00052C00 */ sll $a1, $a1, 16 -/* 00308 80A732F8 00073C00 */ sll $a3, $a3, 16 -/* 0030C 80A732FC 00073C03 */ sra $a3, $a3, 16 -/* 00310 80A73300 00052C03 */ sra $a1, $a1, 16 -/* 00314 80A73304 00063403 */ sra $a2, $a2, 16 -/* 00318 80A73308 AFA90018 */ sw $t1, 0x0018($sp) -/* 0031C 80A7330C AFA80014 */ sw $t0, 0x0014($sp) -/* 00320 80A73310 AFB90010 */ sw $t9, 0x0010($sp) -/* 00324 80A73314 AFA40030 */ sw $a0, 0x0030($sp) -/* 00328 80A73318 0C01E763 */ jal Lights_PointNoGlowSetInfo - -/* 0032C 80A7331C AFA0001C */ sw $zero, 0x001C($sp) -/* 00330 80A73320 8FA40044 */ lw $a0, 0x0044($sp) -/* 00334 80A73324 8FA60030 */ lw $a2, 0x0030($sp) -/* 00338 80A73328 0C01E9D9 */ jal LightContext_InsertLight - -/* 0033C 80A7332C 248507A8 */ addiu $a1, $a0, 0x07A8 ## $a1 = 000007A8 -/* 00340 80A73330 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00344 80A73334 AE0201A8 */ sw $v0, 0x01A8($s0) ## 000001A8 -/* 00348 80A73338 3C0180A7 */ lui $at, %hi(D_80A7412C) ## $at = 80A70000 -/* 0034C 80A7333C C424412C */ lwc1 $f4, %lo(D_80A7412C)($at) -/* 00350 80A73340 46040182 */ mul.s $f6, $f0, $f4 -/* 00354 80A73344 4600320D */ trunc.w.s $f8, $f6 -/* 00358 80A73348 440C4000 */ mfc1 $t4, $f8 -/* 0035C 80A7334C 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00360 80A73350 A60C0154 */ sh $t4, 0x0154($s0) ## 00000154 -/* 00364 80A73354 3C0180A7 */ lui $at, %hi(D_80A74130) ## $at = 80A70000 -/* 00368 80A73358 C42A4130 */ lwc1 $f10, %lo(D_80A74130)($at) -/* 0036C 80A7335C 3C0480A7 */ lui $a0, %hi(D_80A740A0) ## $a0 = 80A70000 -/* 00370 80A73360 248440A0 */ addiu $a0, $a0, %lo(D_80A740A0) ## $a0 = 80A740A0 -/* 00374 80A73364 460A0402 */ mul.s $f16, $f0, $f10 -/* 00378 80A73368 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 0037C 80A7336C 4600848D */ trunc.w.s $f18, $f16 -/* 00380 80A73370 440E9000 */ mfc1 $t6, $f18 -/* 00384 80A73374 0C00084C */ jal osSyncPrintf - -/* 00388 80A73378 A60E0156 */ sh $t6, 0x0156($s0) ## 00000156 -/* 0038C 80A7337C 8FBF002C */ lw $ra, 0x002C($sp) -.L80A73380: -/* 00390 80A73380 8FB00028 */ lw $s0, 0x0028($sp) -/* 00394 80A73384 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00398 80A73388 03E00008 */ jr $ra -/* 0039C 80A7338C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/EnIceHono_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/EnIceHono_Update.s deleted file mode 100644 index f04463cc73..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/EnIceHono_Update.s +++ /dev/null @@ -1,155 +0,0 @@ -.rdata -glabel D_80A740BC - .asciz "ありえない値(ratio = %f)\n" - .balign 4 - -.late_rodata -glabel D_80A74160 - .float 0.1 - -glabel D_80A74164 - .float 0.05 - -glabel D_80A74168 - .word 0x3ED9999A -glabel D_80A7416C - .float 0.7 - -glabel D_80A74170 - .float 0.2 - -.text -glabel EnIceHono_Update -/* 00C38 80A73C28 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 00C3C 80A73C2C AFBF002C */ sw $ra, 0x002C($sp) -/* 00C40 80A73C30 AFB00028 */ sw $s0, 0x0028($sp) -/* 00C44 80A73C34 AFA5004C */ sw $a1, 0x004C($sp) -/* 00C48 80A73C38 84820152 */ lh $v0, 0x0152($a0) ## 00000152 -/* 00C4C 80A73C3C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00C50 80A73C40 24051048 */ addiu $a1, $zero, 0x1048 ## $a1 = 00001048 -/* 00C54 80A73C44 18400002 */ blez $v0, .L80A73C50 -/* 00C58 80A73C48 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 00C5C 80A73C4C A48E0152 */ sh $t6, 0x0152($a0) ## 00000152 -.L80A73C50: -/* 00C60 80A73C50 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 00C64 80A73C54 54400005 */ bnel $v0, $zero, .L80A73C6C -/* 00C68 80A73C58 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 00C6C 80A73C5C 0C00BE3C */ jal func_8002F8F0 -/* 00C70 80A73C60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C74 80A73C64 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 00C78 80A73C68 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -.L80A73C6C: -/* 00C7C 80A73C6C 50410004 */ beql $v0, $at, .L80A73C80 -/* 00C80 80A73C70 86190156 */ lh $t9, 0x0156($s0) ## 00000156 -/* 00C84 80A73C74 5440005B */ bnel $v0, $zero, .L80A73DE4 -/* 00C88 80A73C78 8E02014C */ lw $v0, 0x014C($s0) ## 0000014C -/* 00C8C 80A73C7C 86190156 */ lh $t9, 0x0156($s0) ## 00000156 -.L80A73C80: -/* 00C90 80A73C80 860F0154 */ lh $t7, 0x0154($s0) ## 00000154 -/* 00C94 80A73C84 27284000 */ addiu $t0, $t9, 0x4000 ## $t0 = 00004000 -/* 00C98 80A73C88 A6080156 */ sh $t0, 0x0156($s0) ## 00000156 -/* 00C9C 80A73C8C 25F81111 */ addiu $t8, $t7, 0x1111 ## $t8 = 00001111 -/* 00CA0 80A73C90 A6180154 */ sh $t8, 0x0154($s0) ## 00000154 -/* 00CA4 80A73C94 0C01DE1C */ jal Math_Sins - ## sins? -/* 00CA8 80A73C98 86040156 */ lh $a0, 0x0156($s0) ## 00000156 -/* 00CAC 80A73C9C E7A00030 */ swc1 $f0, 0x0030($sp) -/* 00CB0 80A73CA0 0C01DE1C */ jal Math_Sins - ## sins? -/* 00CB4 80A73CA4 86040154 */ lh $a0, 0x0154($s0) ## 00000154 -/* 00CB8 80A73CA8 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00CBC 80A73CAC E7A00034 */ swc1 $f0, 0x0034($sp) -/* 00CC0 80A73CB0 3C013E00 */ lui $at, 0x3E00 ## $at = 3E000000 -/* 00CC4 80A73CB4 44813000 */ mtc1 $at, $f6 ## $f6 = 0.12 -/* 00CC8 80A73CB8 C7A40034 */ lwc1 $f4, 0x0034($sp) -/* 00CCC 80A73CBC 3C0180A7 */ lui $at, %hi(D_80A74160) ## $at = 80A70000 -/* 00CD0 80A73CC0 C4304160 */ lwc1 $f16, %lo(D_80A74160)($at) -/* 00CD4 80A73CC4 46062202 */ mul.s $f8, $f4, $f6 -/* 00CD8 80A73CC8 C7AA0030 */ lwc1 $f10, 0x0030($sp) -/* 00CDC 80A73CCC 3C0180A7 */ lui $at, %hi(D_80A74164) ## $at = 80A70000 -/* 00CE0 80A73CD0 C4264164 */ lwc1 $f6, %lo(D_80A74164)($at) -/* 00CE4 80A73CD4 46105482 */ mul.s $f18, $f10, $f16 -/* 00CE8 80A73CD8 3C0180A7 */ lui $at, %hi(D_80A74168) ## $at = 80A70000 -/* 00CEC 80A73CDC 3C0480A7 */ lui $a0, %hi(D_80A740BC) ## $a0 = 80A70000 -/* 00CF0 80A73CE0 46060282 */ mul.s $f10, $f0, $f6 -/* 00CF4 80A73CE4 46124100 */ add.s $f4, $f8, $f18 -/* 00CF8 80A73CE8 C4284168 */ lwc1 $f8, %lo(D_80A74168)($at) -/* 00CFC 80A73CEC 3C0180A7 */ lui $at, %hi(D_80A7416C) ## $at = 80A70000 -/* 00D00 80A73CF0 C432416C */ lwc1 $f18, %lo(D_80A7416C)($at) -/* 00D04 80A73CF4 46045400 */ add.s $f16, $f10, $f4 -/* 00D08 80A73CF8 3C0180A7 */ lui $at, %hi(D_80A74170) ## $at = 80A70000 -/* 00D0C 80A73CFC 46088080 */ add.s $f2, $f16, $f8 -/* 00D10 80A73D00 4602903C */ c.lt.s $f18, $f2 -/* 00D14 80A73D04 46001306 */ mov.s $f12, $f2 -/* 00D18 80A73D08 45030007 */ bc1tl .L80A73D28 -/* 00D1C 80A73D0C 460062A1 */ cvt.d.s $f10, $f12 -/* 00D20 80A73D10 C4264170 */ lwc1 $f6, %lo(D_80A74170)($at) -/* 00D24 80A73D14 4606103C */ c.lt.s $f2, $f6 -/* 00D28 80A73D18 00000000 */ nop -/* 00D2C 80A73D1C 45020009 */ bc1fl .L80A73D44 -/* 00D30 80A73D20 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 00D34 80A73D24 460062A1 */ cvt.d.s $f10, $f12 -.L80A73D28: -/* 00D38 80A73D28 248440BC */ addiu $a0, $a0, %lo(D_80A740BC) ## $a0 = 80A740BC -/* 00D3C 80A73D2C 44075000 */ mfc1 $a3, $f10 -/* 00D40 80A73D30 44065800 */ mfc1 $a2, $f11 -/* 00D44 80A73D34 0C00084C */ jal osSyncPrintf - -/* 00D48 80A73D38 E7AC003C */ swc1 $f12, 0x003C($sp) -/* 00D4C 80A73D3C C7AC003C */ lwc1 $f12, 0x003C($sp) -/* 00D50 80A73D40 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -.L80A73D44: -/* 00D54 80A73D44 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 00D58 80A73D48 3C01431B */ lui $at, 0x431B ## $at = 431B0000 -/* 00D5C 80A73D4C 4600240D */ trunc.w.s $f16, $f4 -/* 00D60 80A73D50 44812000 */ mtc1 $at, $f4 ## $f4 = 155.00 -/* 00D64 80A73D54 C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C -/* 00D68 80A73D58 4600448D */ trunc.w.s $f18, $f8 -/* 00D6C 80A73D5C 44058000 */ mfc1 $a1, $f16 -/* 00D70 80A73D60 460C2402 */ mul.s $f16, $f4, $f12 -/* 00D74 80A73D64 3C014352 */ lui $at, 0x4352 ## $at = 43520000 -/* 00D78 80A73D68 44069000 */ mfc1 $a2, $f18 -/* 00D7C 80A73D6C 44819000 */ mtc1 $at, $f18 ## $f18 = 210.00 -/* 00D80 80A73D70 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 00D84 80A73D74 44812000 */ mtc1 $at, $f4 ## $f4 = 255.00 -/* 00D88 80A73D78 4600328D */ trunc.w.s $f10, $f6 -/* 00D8C 80A73D7C 460C9182 */ mul.s $f6, $f18, $f12 -/* 00D90 80A73D80 00063400 */ sll $a2, $a2, 16 -/* 00D94 80A73D84 00063403 */ sra $a2, $a2, 16 -/* 00D98 80A73D88 44075000 */ mfc1 $a3, $f10 -/* 00D9C 80A73D8C 24C6000A */ addiu $a2, $a2, 0x000A ## $a2 = 0000000A -/* 00DA0 80A73D90 00063400 */ sll $a2, $a2, 16 -/* 00DA4 80A73D94 4600820D */ trunc.w.s $f8, $f16 -/* 00DA8 80A73D98 460C2402 */ mul.s $f16, $f4, $f12 -/* 00DAC 80A73D9C 24080578 */ addiu $t0, $zero, 0x0578 ## $t0 = 00000578 -/* 00DB0 80A73DA0 00052C00 */ sll $a1, $a1, 16 -/* 00DB4 80A73DA4 440D4000 */ mfc1 $t5, $f8 -/* 00DB8 80A73DA8 00073C00 */ sll $a3, $a3, 16 -/* 00DBC 80A73DAC 00073C03 */ sra $a3, $a3, 16 -/* 00DC0 80A73DB0 4600328D */ trunc.w.s $f10, $f6 -/* 00DC4 80A73DB4 00052C03 */ sra $a1, $a1, 16 -/* 00DC8 80A73DB8 AFA8001C */ sw $t0, 0x001C($sp) -/* 00DCC 80A73DBC 4600820D */ trunc.w.s $f8, $f16 -/* 00DD0 80A73DC0 440F5000 */ mfc1 $t7, $f10 -/* 00DD4 80A73DC4 00063403 */ sra $a2, $a2, 16 -/* 00DD8 80A73DC8 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -/* 00DDC 80A73DCC 44194000 */ mfc1 $t9, $f8 -/* 00DE0 80A73DD0 AFAD0010 */ sw $t5, 0x0010($sp) -/* 00DE4 80A73DD4 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00DE8 80A73DD8 0C01E763 */ jal Lights_PointNoGlowSetInfo - -/* 00DEC 80A73DDC AFB90018 */ sw $t9, 0x0018($sp) -/* 00DF0 80A73DE0 8E02014C */ lw $v0, 0x014C($s0) ## 0000014C -.L80A73DE4: -/* 00DF4 80A73DE4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00DF8 80A73DE8 50400004 */ beql $v0, $zero, .L80A73DFC -/* 00DFC 80A73DEC 8FBF002C */ lw $ra, 0x002C($sp) -/* 00E00 80A73DF0 0040F809 */ jalr $ra, $v0 -/* 00E04 80A73DF4 8FA5004C */ lw $a1, 0x004C($sp) -/* 00E08 80A73DF8 8FBF002C */ lw $ra, 0x002C($sp) -.L80A73DFC: -/* 00E0C 80A73DFC 8FB00028 */ lw $s0, 0x0028($sp) -/* 00E10 80A73E00 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 00E14 80A73E04 03E00008 */ jr $ra -/* 00E18 80A73E08 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A72FF0.s b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A72FF0.s deleted file mode 100644 index ab2b38337a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A72FF0.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_80A72FF0 -/* 00000 80A72FF0 C4840000 */ lwc1 $f4, 0x0000($a0) ## 00000000 -/* 00004 80A72FF4 C4A60000 */ lwc1 $f6, 0x0000($a1) ## 00000000 -/* 00008 80A72FF8 C4880008 */ lwc1 $f8, 0x0008($a0) ## 00000008 -/* 0000C 80A72FFC C4AA0008 */ lwc1 $f10, 0x0008($a1) ## 00000008 -/* 00010 80A73000 46062081 */ sub.s $f2, $f4, $f6 -/* 00014 80A73004 460A4301 */ sub.s $f12, $f8, $f10 -/* 00018 80A73008 46021402 */ mul.s $f16, $f2, $f2 -/* 0001C 80A7300C 00000000 */ nop -/* 00020 80A73010 460C6482 */ mul.s $f18, $f12, $f12 -/* 00024 80A73014 03E00008 */ jr $ra -/* 00028 80A73018 46128000 */ add.s $f0, $f16, $f18 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A7301C.s b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A7301C.s deleted file mode 100644 index 815070c6b6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A7301C.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_80A7301C -/* 0002C 80A7301C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00030 80A73020 AFA5002C */ sw $a1, 0x002C($sp) -/* 00034 80A73024 AFBF001C */ sw $ra, 0x001C($sp) -/* 00038 80A73028 AFB00018 */ sw $s0, 0x0018($sp) -/* 0003C 80A7302C 3C0580A7 */ lui $a1, %hi(D_80A74068) ## $a1 = 80A70000 -/* 00040 80A73030 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00044 80A73034 0C01E037 */ jal Actor_ProcessInitChain - -/* 00048 80A73038 24A54068 */ addiu $a1, $a1, %lo(D_80A74068) ## $a1 = 80A74068 -/* 0004C 80A7303C 3C053BF2 */ lui $a1, 0x3BF2 ## $a1 = 3BF20000 -/* 00050 80A73040 34A57BB3 */ ori $a1, $a1, 0x7BB3 ## $a1 = 3BF27BB3 -/* 00054 80A73044 0C00B58B */ jal Actor_SetScale - -/* 00058 80A73048 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0005C 80A7304C 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 -/* 00060 80A73050 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00064 80A73054 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 -/* 00068 80A73058 35CF0001 */ ori $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 0006C 80A7305C 0C00B56E */ jal Actor_SetHeight - -/* 00070 80A73060 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 -/* 00074 80A73064 2605015C */ addiu $a1, $s0, 0x015C ## $a1 = 0000015C -/* 00078 80A73068 AFA50020 */ sw $a1, 0x0020($sp) -/* 0007C 80A7306C 0C0170D9 */ jal Collider_InitCylinder - -/* 00080 80A73070 8FA4002C */ lw $a0, 0x002C($sp) -/* 00084 80A73074 3C0780A7 */ lui $a3, %hi(D_80A74010) ## $a3 = 80A70000 -/* 00088 80A73078 24E74010 */ addiu $a3, $a3, %lo(D_80A74010) ## $a3 = 80A74010 -/* 0008C 80A7307C 8FA4002C */ lw $a0, 0x002C($sp) -/* 00090 80A73080 8FA50020 */ lw $a1, 0x0020($sp) -/* 00094 80A73084 0C01712B */ jal Collider_SetCylinder - -/* 00098 80A73088 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 0009C 80A7308C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000A0 80A73090 0C0189B7 */ jal Collider_CylinderUpdate - -/* 000A4 80A73094 8FA50020 */ lw $a1, 0x0020($sp) -/* 000A8 80A73098 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 000AC 80A7309C A21800AE */ sb $t8, 0x00AE($s0) ## 000000AE -/* 000B0 80A730A0 0C29CD35 */ jal func_80A734D4 -/* 000B4 80A730A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000B8 80A730A8 8FBF001C */ lw $ra, 0x001C($sp) -/* 000BC 80A730AC 8FB00018 */ lw $s0, 0x0018($sp) -/* 000C0 80A730B0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 000C4 80A730B4 03E00008 */ jr $ra -/* 000C8 80A730B8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A730BC.s b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A730BC.s deleted file mode 100644 index 3c608b0591..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A730BC.s +++ /dev/null @@ -1,81 +0,0 @@ -.late_rodata -glabel D_80A74114 - .word 0x37A7C5AC -glabel D_80A74118 - .word 0xBE99999A -glabel D_80A7411C - .word 0x457A0666 -glabel D_80A74120 - .word 0x45FA019A - -.text -glabel func_80A730BC -/* 000CC 80A730BC 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 000D0 80A730C0 AFA5003C */ sw $a1, 0x003C($sp) -/* 000D4 80A730C4 AFBF001C */ sw $ra, 0x001C($sp) -/* 000D8 80A730C8 AFB00018 */ sw $s0, 0x0018($sp) -/* 000DC 80A730CC 3C0580A7 */ lui $a1, %hi(D_80A7407C) ## $a1 = 80A70000 -/* 000E0 80A730D0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 000E4 80A730D4 0C01E037 */ jal Actor_ProcessInitChain - -/* 000E8 80A730D8 24A5407C */ addiu $a1, $a1, %lo(D_80A7407C) ## $a1 = 80A7407C -/* 000EC 80A730DC 3C0180A7 */ lui $at, %hi(D_80A74114) ## $at = 80A70000 -/* 000F0 80A730E0 C4204114 */ lwc1 $f0, %lo(D_80A74114)($at) -/* 000F4 80A730E4 3C0180A7 */ lui $at, %hi(D_80A74118) ## $at = 80A70000 -/* 000F8 80A730E8 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 000FC 80A730EC E6000054 */ swc1 $f0, 0x0054($s0) ## 00000054 -/* 00100 80A730F0 E6000058 */ swc1 $f0, 0x0058($s0) ## 00000058 -/* 00104 80A730F4 E6000050 */ swc1 $f0, 0x0050($s0) ## 00000050 -/* 00108 80A730F8 C4244118 */ lwc1 $f4, %lo(D_80A74118)($at) -/* 0010C 80A730FC A6000034 */ sh $zero, 0x0034($s0) ## 00000034 -/* 00110 80A73100 86020034 */ lh $v0, 0x0034($s0) ## 00000034 -/* 00114 80A73104 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 -/* 00118 80A73108 44813000 */ mtc1 $at, $f6 ## $f6 = -4.00 -/* 0011C 80A7310C 2605015C */ addiu $a1, $s0, 0x015C ## $a1 = 0000015C -/* 00120 80A73110 E60800BC */ swc1 $f8, 0x00BC($s0) ## 000000BC -/* 00124 80A73114 E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C -/* 00128 80A73118 A6020032 */ sh $v0, 0x0032($s0) ## 00000032 -/* 0012C 80A7311C A6020030 */ sh $v0, 0x0030($s0) ## 00000030 -/* 00130 80A73120 A60200B8 */ sh $v0, 0x00B8($s0) ## 000000B8 -/* 00134 80A73124 A60200B6 */ sh $v0, 0x00B6($s0) ## 000000B6 -/* 00138 80A73128 A60200B4 */ sh $v0, 0x00B4($s0) ## 000000B4 -/* 0013C 80A7312C E6060070 */ swc1 $f6, 0x0070($s0) ## 00000070 -/* 00140 80A73130 AFA50024 */ sw $a1, 0x0024($sp) -/* 00144 80A73134 0C0170D9 */ jal Collider_InitCylinder - -/* 00148 80A73138 8FA4003C */ lw $a0, 0x003C($sp) -/* 0014C 80A7313C 3C0780A7 */ lui $a3, %hi(D_80A7403C) ## $a3 = 80A70000 -/* 00150 80A73140 24E7403C */ addiu $a3, $a3, %lo(D_80A7403C) ## $a3 = 80A7403C -/* 00154 80A73144 8FA4003C */ lw $a0, 0x003C($sp) -/* 00158 80A73148 8FA50024 */ lw $a1, 0x0024($sp) -/* 0015C 80A7314C 0C01712B */ jal Collider_SetCylinder - -/* 00160 80A73150 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00164 80A73154 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00168 80A73158 0C0189B7 */ jal Collider_CylinderUpdate - -/* 0016C 80A7315C 8FA50024 */ lw $a1, 0x0024($sp) -/* 00170 80A73160 3C0180A7 */ lui $at, %hi(D_80A7411C) ## $at = 80A70000 -/* 00174 80A73164 C430411C */ lwc1 $f16, %lo(D_80A7411C)($at) -/* 00178 80A73168 C60A0050 */ lwc1 $f10, 0x0050($s0) ## 00000050 -/* 0017C 80A7316C 3C0180A7 */ lui $at, %hi(D_80A74120) ## $at = 80A70000 -/* 00180 80A73170 C6060054 */ lwc1 $f6, 0x0054($s0) ## 00000054 -/* 00184 80A73174 46105482 */ mul.s $f18, $f10, $f16 -/* 00188 80A73178 240800FD */ addiu $t0, $zero, 0x00FD ## $t0 = 000000FD -/* 0018C 80A7317C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00190 80A73180 4600910D */ trunc.w.s $f4, $f18 -/* 00194 80A73184 440F2000 */ mfc1 $t7, $f4 -/* 00198 80A73188 00000000 */ nop -/* 0019C 80A7318C A60F019C */ sh $t7, 0x019C($s0) ## 0000019C -/* 001A0 80A73190 C4284120 */ lwc1 $f8, %lo(D_80A74120)($at) -/* 001A4 80A73194 A20800AE */ sb $t0, 0x00AE($s0) ## 000000AE -/* 001A8 80A73198 46083282 */ mul.s $f10, $f6, $f8 -/* 001AC 80A7319C 4600540D */ trunc.w.s $f16, $f10 -/* 001B0 80A731A0 44198000 */ mfc1 $t9, $f16 -/* 001B4 80A731A4 0C29CD68 */ jal func_80A735A0 -/* 001B8 80A731A8 A619019E */ sh $t9, 0x019E($s0) ## 0000019E -/* 001BC 80A731AC 8FBF001C */ lw $ra, 0x001C($sp) -/* 001C0 80A731B0 8FB00018 */ lw $s0, 0x0018($sp) -/* 001C4 80A731B4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 001C8 80A731B8 03E00008 */ jr $ra -/* 001CC 80A731BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A731C0.s b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A731C0.s deleted file mode 100644 index 4e4cf58df3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A731C0.s +++ /dev/null @@ -1,35 +0,0 @@ -.late_rodata -glabel D_80A74124 - .word 0x3A51B717 -glabel D_80A74128 - .word 0xBE99999A - -.text -glabel func_80A731C0 -/* 001D0 80A731C0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 001D4 80A731C4 AFA5001C */ sw $a1, 0x001C($sp) -/* 001D8 80A731C8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 001DC 80A731CC 3C0580A7 */ lui $a1, %hi(D_80A74088) ## $a1 = 80A70000 -/* 001E0 80A731D0 24A54088 */ addiu $a1, $a1, %lo(D_80A74088) ## $a1 = 80A74088 -/* 001E4 80A731D4 0C01E037 */ jal Actor_ProcessInitChain - -/* 001E8 80A731D8 AFA40018 */ sw $a0, 0x0018($sp) -/* 001EC 80A731DC 3C0180A7 */ lui $at, %hi(D_80A74124) ## $at = 80A70000 -/* 001F0 80A731E0 C4204124 */ lwc1 $f0, %lo(D_80A74124)($at) -/* 001F4 80A731E4 8FA40018 */ lw $a0, 0x0018($sp) -/* 001F8 80A731E8 3C0180A7 */ lui $at, %hi(D_80A74128) ## $at = 80A70000 -/* 001FC 80A731EC 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 00200 80A731F0 E4800054 */ swc1 $f0, 0x0054($a0) ## 00000054 -/* 00204 80A731F4 E4800058 */ swc1 $f0, 0x0058($a0) ## 00000058 -/* 00208 80A731F8 E4800050 */ swc1 $f0, 0x0050($a0) ## 00000050 -/* 0020C 80A731FC C4244128 */ lwc1 $f4, %lo(D_80A74128)($at) -/* 00210 80A73200 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 -/* 00214 80A73204 44813000 */ mtc1 $at, $f6 ## $f6 = -4.00 -/* 00218 80A73208 E48800BC */ swc1 $f8, 0x00BC($a0) ## 000000BC -/* 0021C 80A7320C E484006C */ swc1 $f4, 0x006C($a0) ## 0000006C -/* 00220 80A73210 0C29CE7F */ jal func_80A739FC -/* 00224 80A73214 E4860070 */ swc1 $f6, 0x0070($a0) ## 00000070 -/* 00228 80A73218 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0022C 80A7321C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00230 80A73220 03E00008 */ jr $ra -/* 00234 80A73224 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A733E8.s b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A733E8.s deleted file mode 100644 index ae16ceccf3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A733E8.s +++ /dev/null @@ -1,63 +0,0 @@ -glabel func_80A733E8 -/* 003F8 80A733E8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 003FC 80A733EC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00400 80A733F0 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 00404 80A733F4 44813000 */ mtc1 $at, $f6 ## $f6 = 60.00 -/* 00408 80A733F8 C4840090 */ lwc1 $f4, 0x0090($a0) ## 00000090 -/* 0040C 80A733FC 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00410 80A73400 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 00414 80A73404 4606203C */ c.lt.s $f4, $f6 -/* 00418 80A73408 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 0041C 80A7340C 4502002D */ bc1fl .L80A734C4 -/* 00420 80A73410 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00424 80A73414 8484008A */ lh $a0, 0x008A($a0) ## 0000008A -/* 00428 80A73418 AFA60028 */ sw $a2, 0x0028($sp) -/* 0042C 80A7341C AFA20024 */ sw $v0, 0x0024($sp) -/* 00430 80A73420 00812021 */ addu $a0, $a0, $at -/* 00434 80A73424 00042400 */ sll $a0, $a0, 16 -/* 00438 80A73428 0C01DE1C */ jal Math_Sins - ## sins? -/* 0043C 80A7342C 00042403 */ sra $a0, $a0, 16 -/* 00440 80A73430 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 00444 80A73434 44814000 */ mtc1 $at, $f8 ## $f8 = 40.00 -/* 00448 80A73438 8FA20024 */ lw $v0, 0x0024($sp) -/* 0044C 80A7343C 8FAE0028 */ lw $t6, 0x0028($sp) -/* 00450 80A73440 46080282 */ mul.s $f10, $f0, $f8 -/* 00454 80A73444 C4500024 */ lwc1 $f16, 0x0024($v0) ## 00000024 -/* 00458 80A73448 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 0045C 80A7344C 46105480 */ add.s $f18, $f10, $f16 -/* 00460 80A73450 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 00464 80A73454 C4440028 */ lwc1 $f4, 0x0028($v0) ## 00000028 -/* 00468 80A73458 E7A4001C */ swc1 $f4, 0x001C($sp) -/* 0046C 80A7345C 85C4008A */ lh $a0, 0x008A($t6) ## 0000008A -/* 00470 80A73460 00812021 */ addu $a0, $a0, $at -/* 00474 80A73464 00042400 */ sll $a0, $a0, 16 -/* 00478 80A73468 0C01DE0D */ jal Math_Coss - ## coss? -/* 0047C 80A7346C 00042403 */ sra $a0, $a0, 16 -/* 00480 80A73470 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 00484 80A73474 44813000 */ mtc1 $at, $f6 ## $f6 = 40.00 -/* 00488 80A73478 8FA20024 */ lw $v0, 0x0024($sp) -/* 0048C 80A7347C 8FA50028 */ lw $a1, 0x0028($sp) -/* 00490 80A73480 46060202 */ mul.s $f8, $f0, $f6 -/* 00494 80A73484 C44A002C */ lwc1 $f10, 0x002C($v0) ## 0000002C -/* 00498 80A73488 27A40018 */ addiu $a0, $sp, 0x0018 ## $a0 = FFFFFFF0 -/* 0049C 80A7348C 24A50024 */ addiu $a1, $a1, 0x0024 ## $a1 = 00000024 -/* 004A0 80A73490 460A4400 */ add.s $f16, $f8, $f10 -/* 004A4 80A73494 0C29CBFC */ jal func_80A72FF0 -/* 004A8 80A73498 E7B00020 */ swc1 $f16, 0x0020($sp) -/* 004AC 80A7349C 3C0144C8 */ lui $at, 0x44C8 ## $at = 44C80000 -/* 004B0 80A734A0 44819000 */ mtc1 $at, $f18 ## $f18 = 1600.00 -/* 004B4 80A734A4 00000000 */ nop -/* 004B8 80A734A8 4612003E */ c.le.s $f0, $f18 -/* 004BC 80A734AC 00000000 */ nop -/* 004C0 80A734B0 45020004 */ bc1fl .L80A734C4 -/* 004C4 80A734B4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 004C8 80A734B8 10000002 */ beq $zero, $zero, .L80A734C4 -/* 004CC 80A734BC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 004D0 80A734C0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A734C4: -/* 004D4 80A734C4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 004D8 80A734C8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 004DC 80A734CC 03E00008 */ jr $ra -/* 004E0 80A734D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A734D4.s b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A734D4.s deleted file mode 100644 index f7772bb875..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A734D4.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80A734D4 -/* 004E4 80A734D4 3C01C47A */ lui $at, 0xC47A ## $at = C47A0000 -/* 004E8 80A734D8 44812000 */ mtc1 $at, $f4 ## $f4 = -1000.00 -/* 004EC 80A734DC 3C0E80A7 */ lui $t6, %hi(func_80A734F8) ## $t6 = 80A70000 -/* 004F0 80A734E0 25CE34F8 */ addiu $t6, $t6, %lo(func_80A734F8) ## $t6 = 80A734F8 -/* 004F4 80A734E4 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF -/* 004F8 80A734E8 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 004FC 80A734EC A48F0150 */ sh $t7, 0x0150($a0) ## 00000150 -/* 00500 80A734F0 03E00008 */ jr $ra -/* 00504 80A734F4 E48400BC */ swc1 $f4, 0x00BC($a0) ## 000000BC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A734F8.s b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A734F8.s deleted file mode 100644 index 038f30e311..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A734F8.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_80A734F8 -/* 00508 80A734F8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0050C 80A734FC AFBF0024 */ sw $ra, 0x0024($sp) -/* 00510 80A73500 AFB10020 */ sw $s1, 0x0020($sp) -/* 00514 80A73504 AFB0001C */ sw $s0, 0x001C($sp) -/* 00518 80A73508 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0051C 80A7350C 0C00BD04 */ jal Actor_HasParent -/* 00520 80A73510 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00524 80A73514 10400003 */ beq $v0, $zero, .L80A73524 -/* 00528 80A73518 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0052C 80A7351C 1000000C */ beq $zero, $zero, .L80A73550 -/* 00530 80A73520 AE000118 */ sw $zero, 0x0118($s0) ## 00000118 -.L80A73524: -/* 00534 80A73524 0C29CCFA */ jal func_80A733E8 -/* 00538 80A73528 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0053C 80A7352C 10400008 */ beq $v0, $zero, .L80A73550 -/* 00540 80A73530 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00544 80A73534 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 00548 80A73538 44812000 */ mtc1 $at, $f4 ## $f4 = 100.00 -/* 0054C 80A7353C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00550 80A73540 2406007E */ addiu $a2, $zero, 0x007E ## $a2 = 0000007E -/* 00554 80A73544 3C074270 */ lui $a3, 0x4270 ## $a3 = 42700000 -/* 00558 80A73548 0C00BD0D */ jal func_8002F434 -/* 0055C 80A7354C E7A40010 */ swc1 $f4, 0x0010($sp) -.L80A73550: -/* 00560 80A73550 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 00564 80A73554 44814000 */ mtc1 $at, $f8 ## $f8 = 200.00 -/* 00568 80A73558 C6060090 */ lwc1 $f6, 0x0090($s0) ## 00000090 -/* 0056C 80A7355C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00570 80A73560 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 00574 80A73564 4608303C */ c.lt.s $f6, $f8 -/* 00578 80A73568 02212821 */ addu $a1, $s1, $at -/* 0057C 80A7356C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00580 80A73570 45020004 */ bc1fl .L80A73584 -/* 00584 80A73574 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00588 80A73578 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOT -/* 0058C 80A7357C 2606015C */ addiu $a2, $s0, 0x015C ## $a2 = 0000015C -/* 00590 80A73580 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A73584: -/* 00594 80A73584 0C00BE3C */ jal func_8002F8F0 -/* 00598 80A73588 240520A3 */ addiu $a1, $zero, 0x20A3 ## $a1 = 000020A3 -/* 0059C 80A7358C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 005A0 80A73590 8FB0001C */ lw $s0, 0x001C($sp) -/* 005A4 80A73594 8FB10020 */ lw $s1, 0x0020($sp) -/* 005A8 80A73598 03E00008 */ jr $ra -/* 005AC 80A7359C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A735A0.s b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A735A0.s deleted file mode 100644 index f55f435d4f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A735A0.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80A735A0 -/* 005B0 80A735A0 3C0E80A7 */ lui $t6, %hi(func_80A735C0) ## $t6 = 80A70000 -/* 005B4 80A735A4 25CE35C0 */ addiu $t6, $t6, %lo(func_80A735C0) ## $t6 = 80A735C0 -/* 005B8 80A735A8 240F00C8 */ addiu $t7, $zero, 0x00C8 ## $t7 = 000000C8 -/* 005BC 80A735AC 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 005C0 80A735B0 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 005C4 80A735B4 A48F0152 */ sh $t7, 0x0152($a0) ## 00000152 -/* 005C8 80A735B8 03E00008 */ jr $ra -/* 005CC 80A735BC A4980150 */ sh $t8, 0x0150($a0) ## 00000150 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A735C0.s b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A735C0.s deleted file mode 100644 index 0b4b72b4ab..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A735C0.s +++ /dev/null @@ -1,131 +0,0 @@ -.late_rodata -glabel D_80A74134 - .word 0x3ADED289 -glabel D_80A74138 - .word 0x455AC000 - -.text -glabel func_80A735C0 -/* 005D0 80A735C0 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 005D4 80A735C4 F7B40030 */ sdc1 $f20, 0x0030($sp) -/* 005D8 80A735C8 3C0180A7 */ lui $at, %hi(D_80A74134) ## $at = 80A70000 -/* 005DC 80A735CC C4344134 */ lwc1 $f20, %lo(D_80A74134)($at) -/* 005E0 80A735D0 AFB40048 */ sw $s4, 0x0048($sp) -/* 005E4 80A735D4 AFBF004C */ sw $ra, 0x004C($sp) -/* 005E8 80A735D8 AFB30044 */ sw $s3, 0x0044($sp) -/* 005EC 80A735DC AFB20040 */ sw $s2, 0x0040($sp) -/* 005F0 80A735E0 AFB1003C */ sw $s1, 0x003C($sp) -/* 005F4 80A735E4 AFB00038 */ sw $s0, 0x0038($sp) -/* 005F8 80A735E8 94900088 */ lhu $s0, 0x0088($a0) ## 00000088 -/* 005FC 80A735EC 00A0A025 */ or $s4, $a1, $zero ## $s4 = 00000000 -/* 00600 80A735F0 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 00604 80A735F4 3C0638A7 */ lui $a2, 0x38A7 ## $a2 = 38A70000 -/* 00608 80A735F8 4405A000 */ mfc1 $a1, $f20 -/* 0060C 80A735FC 34C6C5AC */ ori $a2, $a2, 0xC5AC ## $a2 = 38A7C5AC -/* 00610 80A73600 24840050 */ addiu $a0, $a0, 0x0050 ## $a0 = 00000050 -/* 00614 80A73604 0C01DE80 */ jal Math_ApproxF - -/* 00618 80A73608 32100001 */ andi $s0, $s0, 0x0001 ## $s0 = 00000000 -/* 0061C 80A7360C C6240050 */ lwc1 $f4, 0x0050($s1) ## 00000050 -/* 00620 80A73610 4405A000 */ mfc1 $a1, $f20 -/* 00624 80A73614 3C0638A7 */ lui $a2, 0x38A7 ## $a2 = 38A70000 -/* 00628 80A73618 34C6C5AC */ ori $a2, $a2, 0xC5AC ## $a2 = 38A7C5AC -/* 0062C 80A7361C 26240054 */ addiu $a0, $s1, 0x0054 ## $a0 = 00000054 -/* 00630 80A73620 0C01DE80 */ jal Math_ApproxF - -/* 00634 80A73624 E6240058 */ swc1 $f4, 0x0058($s1) ## 00000058 -/* 00638 80A73628 1200001F */ beq $s0, $zero, .L80A736A8 -/* 0063C 80A7362C 26921C24 */ addiu $s2, $s4, 0x1C24 ## $s2 = 00001C24 -/* 00640 80A73630 3C01447A */ lui $at, 0x447A ## $at = 447A0000 -/* 00644 80A73634 4481A000 */ mtc1 $at, $f20 ## $f20 = 1000.00 -/* 00648 80A73638 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 -/* 0064C 80A7363C 3C130001 */ lui $s3, 0x0001 ## $s3 = 00010000 -.L80A73640: -/* 00650 80A73640 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00654 80A73644 00000000 */ nop -/* 00658 80A73648 46140282 */ mul.s $f10, $f0, $f20 -/* 0065C 80A7364C C6260028 */ lwc1 $f6, 0x0028($s1) ## 00000028 -/* 00660 80A73650 8E270024 */ lw $a3, 0x0024($s1) ## 00000024 -/* 00664 80A73654 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 00668 80A73658 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 0066C 80A7365C C628002C */ lwc1 $f8, 0x002C($s1) ## 0000002C -/* 00670 80A73660 AFA80024 */ sw $t0, 0x0024($sp) -/* 00674 80A73664 4600540D */ trunc.w.s $f16, $f10 -/* 00678 80A73668 AFA00020 */ sw $zero, 0x0020($sp) -/* 0067C 80A7366C AFA00018 */ sw $zero, 0x0018($sp) -/* 00680 80A73670 02402025 */ or $a0, $s2, $zero ## $a0 = 00001C24 -/* 00684 80A73674 440F8000 */ mfc1 $t7, $f16 -/* 00688 80A73678 02802825 */ or $a1, $s4, $zero ## $a1 = 00000000 -/* 0068C 80A7367C 240600F0 */ addiu $a2, $zero, 0x00F0 ## $a2 = 000000F0 -/* 00690 80A73680 01F0C021 */ addu $t8, $t7, $s0 -/* 00694 80A73684 2719FE0C */ addiu $t9, $t8, 0xFE0C ## $t9 = FFFFFE0C -/* 00698 80A73688 AFB9001C */ sw $t9, 0x001C($sp) -/* 0069C 80A7368C 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 006A0 80A73690 E7A80014 */ swc1 $f8, 0x0014($sp) -/* 006A4 80A73694 26102000 */ addiu $s0, $s0, 0x2000 ## $s0 = 00002000 -/* 006A8 80A73698 1613FFE9 */ bne $s0, $s3, .L80A73640 -/* 006AC 80A7369C 00000000 */ nop -/* 006B0 80A736A0 0C29CDE0 */ jal func_80A73780 -/* 006B4 80A736A4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -.L80A736A8: -/* 006B8 80A736A8 0C00B638 */ jal Actor_MoveForward - -/* 006BC 80A736AC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 006C0 80A736B0 3C0180A7 */ lui $at, %hi(D_80A74138) ## $at = 80A70000 -/* 006C4 80A736B4 C4244138 */ lwc1 $f4, %lo(D_80A74138)($at) -/* 006C8 80A736B8 C6320050 */ lwc1 $f18, 0x0050($s1) ## 00000050 -/* 006CC 80A736BC 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 006D0 80A736C0 24090005 */ addiu $t1, $zero, 0x0005 ## $t1 = 00000005 -/* 006D4 80A736C4 46049182 */ mul.s $f6, $f18, $f4 -/* 006D8 80A736C8 AFA90014 */ sw $t1, 0x0014($sp) -/* 006DC 80A736CC 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 006E0 80A736D0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 006E4 80A736D4 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 -/* 006E8 80A736D8 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 006EC 80A736DC 44073000 */ mfc1 $a3, $f6 -/* 006F0 80A736E0 0C00B92D */ jal func_8002E4B4 -/* 006F4 80A736E4 00000000 */ nop -/* 006F8 80A736E8 2630015C */ addiu $s0, $s1, 0x015C ## $s0 = 0000015C -/* 006FC 80A736EC 02002825 */ or $a1, $s0, $zero ## $a1 = 0000015C -/* 00700 80A736F0 0C0189B7 */ jal Collider_CylinderUpdate - -/* 00704 80A736F4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00708 80A736F8 3C01457A */ lui $at, 0x457A ## $at = 457A0000 -/* 0070C 80A736FC 44818000 */ mtc1 $at, $f16 ## $f16 = 4000.00 -/* 00710 80A73700 C62A0050 */ lwc1 $f10, 0x0050($s1) ## 00000050 -/* 00714 80A73704 3C0145FA */ lui $at, 0x45FA ## $at = 45FA0000 -/* 00718 80A73708 44814000 */ mtc1 $at, $f8 ## $f8 = 8000.00 -/* 0071C 80A7370C 46105482 */ mul.s $f18, $f10, $f16 -/* 00720 80A73710 C6260054 */ lwc1 $f6, 0x0054($s1) ## 00000054 -/* 00724 80A73714 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00728 80A73718 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 0072C 80A7371C 46083282 */ mul.s $f10, $f6, $f8 -/* 00730 80A73720 02812821 */ addu $a1, $s4, $at -/* 00734 80A73724 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 00738 80A73728 02003025 */ or $a2, $s0, $zero ## $a2 = 0000015C -/* 0073C 80A7372C 4600910D */ trunc.w.s $f4, $f18 -/* 00740 80A73730 4600540D */ trunc.w.s $f16, $f10 -/* 00744 80A73734 440B2000 */ mfc1 $t3, $f4 -/* 00748 80A73738 440D8000 */ mfc1 $t5, $f16 -/* 0074C 80A7373C A62B019C */ sh $t3, 0x019C($s1) ## 0000019C -/* 00750 80A73740 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOT -/* 00754 80A73744 A62D019E */ sh $t5, 0x019E($s1) ## 0000019E -/* 00758 80A73748 862E0152 */ lh $t6, 0x0152($s1) ## 00000152 -/* 0075C 80A7374C 5DC00004 */ bgtzl $t6, .L80A73760 -/* 00760 80A73750 8FBF004C */ lw $ra, 0x004C($sp) -/* 00764 80A73754 0C00B55C */ jal Actor_Kill - -/* 00768 80A73758 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0076C 80A7375C 8FBF004C */ lw $ra, 0x004C($sp) -.L80A73760: -/* 00770 80A73760 D7B40030 */ ldc1 $f20, 0x0030($sp) -/* 00774 80A73764 8FB00038 */ lw $s0, 0x0038($sp) -/* 00778 80A73768 8FB1003C */ lw $s1, 0x003C($sp) -/* 0077C 80A7376C 8FB20040 */ lw $s2, 0x0040($sp) -/* 00780 80A73770 8FB30044 */ lw $s3, 0x0044($sp) -/* 00784 80A73774 8FB40048 */ lw $s4, 0x0048($sp) -/* 00788 80A73778 03E00008 */ jr $ra -/* 0078C 80A7377C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A73780.s b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A73780.s deleted file mode 100644 index 7851d71856..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A73780.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80A73780 -/* 00790 80A73780 3C0E80A7 */ lui $t6, %hi(func_80A737A0) ## $t6 = 80A70000 -/* 00794 80A73784 25CE37A0 */ addiu $t6, $t6, %lo(func_80A737A0) ## $t6 = 80A737A0 -/* 00798 80A73788 240F003C */ addiu $t7, $zero, 0x003C ## $t7 = 0000003C -/* 0079C 80A7378C 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 007A0 80A73790 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 007A4 80A73794 A48F0152 */ sh $t7, 0x0152($a0) ## 00000152 -/* 007A8 80A73798 03E00008 */ jr $ra -/* 007AC 80A7379C A4980150 */ sh $t8, 0x0150($a0) ## 00000150 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A737A0.s b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A737A0.s deleted file mode 100644 index adf1a5ce11..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A737A0.s +++ /dev/null @@ -1,181 +0,0 @@ -.late_rodata -glabel D_80A7413C - .word 0x38D1B717 -glabel D_80A74140 - .word 0x455AC000 -glabel D_80A74144 - .float 6000.0 - -.text -glabel func_80A737A0 -/* 007B0 80A737A0 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 007B4 80A737A4 AFBF004C */ sw $ra, 0x004C($sp) -/* 007B8 80A737A8 AFB40048 */ sw $s4, 0x0048($sp) -/* 007BC 80A737AC AFB30044 */ sw $s3, 0x0044($sp) -/* 007C0 80A737B0 AFB20040 */ sw $s2, 0x0040($sp) -/* 007C4 80A737B4 AFB1003C */ sw $s1, 0x003C($sp) -/* 007C8 80A737B8 AFB00038 */ sw $s0, 0x0038($sp) -/* 007CC 80A737BC F7B40030 */ sdc1 $f20, 0x0030($sp) -/* 007D0 80A737C0 848E0152 */ lh $t6, 0x0152($a0) ## 00000152 -/* 007D4 80A737C4 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 007D8 80A737C8 00A0A025 */ or $s4, $a1, $zero ## $s4 = 00000000 -/* 007DC 80A737CC 29C10015 */ slti $at, $t6, 0x0015 -/* 007E0 80A737D0 1420000E */ bne $at, $zero, .L80A7380C -/* 007E4 80A737D4 24840050 */ addiu $a0, $a0, 0x0050 ## $a0 = 00000050 -/* 007E8 80A737D8 3C053C34 */ lui $a1, 0x3C34 ## $a1 = 3C340000 -/* 007EC 80A737DC 3C063912 */ lui $a2, 0x3912 ## $a2 = 39120000 -/* 007F0 80A737E0 34C6CCF7 */ ori $a2, $a2, 0xCCF7 ## $a2 = 3912CCF7 -/* 007F4 80A737E4 0C01DE80 */ jal Math_ApproxF - -/* 007F8 80A737E8 34A53958 */ ori $a1, $a1, 0x3958 ## $a1 = 3C343958 -/* 007FC 80A737EC 3C053BC4 */ lui $a1, 0x3BC4 ## $a1 = 3BC40000 -/* 00800 80A737F0 3C0638FB */ lui $a2, 0x38FB ## $a2 = 38FB0000 -/* 00804 80A737F4 34C6A882 */ ori $a2, $a2, 0xA882 ## $a2 = 38FBA882 -/* 00808 80A737F8 34A59BA6 */ ori $a1, $a1, 0x9BA6 ## $a1 = 3BC49BA6 -/* 0080C 80A737FC 0C01DE80 */ jal Math_ApproxF - -/* 00810 80A73800 26240054 */ addiu $a0, $s1, 0x0054 ## $a0 = 00000054 -/* 00814 80A73804 1000000E */ beq $zero, $zero, .L80A73840 -/* 00818 80A73808 C6240050 */ lwc1 $f4, 0x0050($s1) ## 00000050 -.L80A7380C: -/* 0081C 80A7380C 3C0180A7 */ lui $at, %hi(D_80A7413C) ## $at = 80A70000 -/* 00820 80A73810 C434413C */ lwc1 $f20, %lo(D_80A7413C)($at) -/* 00824 80A73814 3C06391D */ lui $a2, 0x391D ## $a2 = 391D0000 -/* 00828 80A73818 34C64952 */ ori $a2, $a2, 0x4952 ## $a2 = 391D4952 -/* 0082C 80A7381C 4405A000 */ mfc1 $a1, $f20 -/* 00830 80A73820 0C01DE80 */ jal Math_ApproxF - -/* 00834 80A73824 26240050 */ addiu $a0, $s1, 0x0050 ## $a0 = 00000050 -/* 00838 80A73828 4405A000 */ mfc1 $a1, $f20 -/* 0083C 80A7382C 3C06391D */ lui $a2, 0x391D ## $a2 = 391D0000 -/* 00840 80A73830 34C64952 */ ori $a2, $a2, 0x4952 ## $a2 = 391D4952 -/* 00844 80A73834 0C01DE80 */ jal Math_ApproxF - -/* 00848 80A73838 26240054 */ addiu $a0, $s1, 0x0054 ## $a0 = 00000054 -/* 0084C 80A7383C C6240050 */ lwc1 $f4, 0x0050($s1) ## 00000050 -.L80A73840: -/* 00850 80A73840 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00854 80A73844 0C00B638 */ jal Actor_MoveForward - -/* 00858 80A73848 E6240058 */ swc1 $f4, 0x0058($s1) ## 00000058 -/* 0085C 80A7384C 3C0180A7 */ lui $at, %hi(D_80A74140) ## $at = 80A70000 -/* 00860 80A73850 C4284140 */ lwc1 $f8, %lo(D_80A74140)($at) -/* 00864 80A73854 C6260050 */ lwc1 $f6, 0x0050($s1) ## 00000050 -/* 00868 80A73858 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 0086C 80A7385C 240F0004 */ addiu $t7, $zero, 0x0004 ## $t7 = 00000004 -/* 00870 80A73860 46083282 */ mul.s $f10, $f6, $f8 -/* 00874 80A73864 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00878 80A73868 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 0087C 80A7386C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00880 80A73870 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 -/* 00884 80A73874 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 00888 80A73878 44075000 */ mfc1 $a3, $f10 -/* 0088C 80A7387C 0C00B92D */ jal func_8002E4B4 -/* 00890 80A73880 00000000 */ nop -/* 00894 80A73884 86220152 */ lh $v0, 0x0152($s1) ## 00000152 -/* 00898 80A73888 28410019 */ slti $at, $v0, 0x0019 -/* 0089C 80A7388C 50200011 */ beql $at, $zero, .L80A738D4 -/* 008A0 80A73890 86280150 */ lh $t0, 0x0150($s1) ## 00000150 -/* 008A4 80A73894 86380150 */ lh $t8, 0x0150($s1) ## 00000150 -/* 008A8 80A73898 2719FFF6 */ addiu $t9, $t8, 0xFFF6 ## $t9 = FFFFFFF6 -/* 008AC 80A7389C A6390150 */ sh $t9, 0x0150($s1) ## 00000150 -/* 008B0 80A738A0 86220150 */ lh $v0, 0x0150($s1) ## 00000150 -/* 008B4 80A738A4 04410004 */ bgez $v0, .L80A738B8 -/* 008B8 80A738A8 28410100 */ slti $at, $v0, 0x0100 -/* 008BC 80A738AC A6200150 */ sh $zero, 0x0150($s1) ## 00000150 -/* 008C0 80A738B0 10000007 */ beq $zero, $zero, .L80A738D0 -/* 008C4 80A738B4 86220152 */ lh $v0, 0x0152($s1) ## 00000152 -.L80A738B8: -/* 008C8 80A738B8 14200003 */ bne $at, $zero, .L80A738C8 -/* 008CC 80A738BC 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -/* 008D0 80A738C0 10000001 */ beq $zero, $zero, .L80A738C8 -/* 008D4 80A738C4 240300FF */ addiu $v1, $zero, 0x00FF ## $v1 = 000000FF -.L80A738C8: -/* 008D8 80A738C8 A6230150 */ sh $v1, 0x0150($s1) ## 00000150 -/* 008DC 80A738CC 86220152 */ lh $v0, 0x0152($s1) ## 00000152 -.L80A738D0: -/* 008E0 80A738D0 86280150 */ lh $t0, 0x0150($s1) ## 00000150 -.L80A738D4: -/* 008E4 80A738D4 29010065 */ slti $at, $t0, 0x0065 -/* 008E8 80A738D8 1420001B */ bne $at, $zero, .L80A73948 -/* 008EC 80A738DC 28410028 */ slti $at, $v0, 0x0028 -/* 008F0 80A738E0 10200019 */ beq $at, $zero, .L80A73948 -/* 008F4 80A738E4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 008F8 80A738E8 2630015C */ addiu $s0, $s1, 0x015C ## $s0 = 0000015C -/* 008FC 80A738EC 0C0189B7 */ jal Collider_CylinderUpdate - -/* 00900 80A738F0 02002825 */ or $a1, $s0, $zero ## $a1 = 0000015C -/* 00904 80A738F4 3C0180A7 */ lui $at, %hi(D_80A74144) ## $at = 80A70000 -/* 00908 80A738F8 C4244144 */ lwc1 $f4, %lo(D_80A74144)($at) -/* 0090C 80A738FC C6320050 */ lwc1 $f18, 0x0050($s1) ## 00000050 -/* 00910 80A73900 3C0145FA */ lui $at, 0x45FA ## $at = 45FA0000 -/* 00914 80A73904 44818000 */ mtc1 $at, $f16 ## $f16 = 8000.00 -/* 00918 80A73908 46049182 */ mul.s $f6, $f18, $f4 -/* 0091C 80A7390C C62A0054 */ lwc1 $f10, 0x0054($s1) ## 00000054 -/* 00920 80A73910 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00924 80A73914 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 00928 80A73918 46105482 */ mul.s $f18, $f10, $f16 -/* 0092C 80A7391C 02812821 */ addu $a1, $s4, $at -/* 00930 80A73920 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 00934 80A73924 02003025 */ or $a2, $s0, $zero ## $a2 = 0000015C -/* 00938 80A73928 4600320D */ trunc.w.s $f8, $f6 -/* 0093C 80A7392C 4600910D */ trunc.w.s $f4, $f18 -/* 00940 80A73930 440A4000 */ mfc1 $t2, $f8 -/* 00944 80A73934 440C2000 */ mfc1 $t4, $f4 -/* 00948 80A73938 A62A019C */ sh $t2, 0x019C($s1) ## 0000019C -/* 0094C 80A7393C 0C0175E7 */ jal CollisionCheck_SetAT - ## CollisionCheck_setAT -/* 00950 80A73940 A62C019E */ sh $t4, 0x019E($s1) ## 0000019E -/* 00954 80A73944 86220152 */ lh $v0, 0x0152($s1) ## 00000152 -.L80A73948: -/* 00958 80A73948 2401002E */ addiu $at, $zero, 0x002E ## $at = 0000002E -/* 0095C 80A7394C 1441001E */ bne $v0, $at, .L80A739C8 -/* 00960 80A73950 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 -/* 00964 80A73954 3C01447A */ lui $at, 0x447A ## $at = 447A0000 -/* 00968 80A73958 4481A000 */ mtc1 $at, $f20 ## $f20 = 1000.00 -/* 0096C 80A7395C 26921C24 */ addiu $s2, $s4, 0x1C24 ## $s2 = 00001C24 -/* 00970 80A73960 3413FFFA */ ori $s3, $zero, 0xFFFA ## $s3 = 0000FFFA -.L80A73964: -/* 00974 80A73964 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00978 80A73968 00000000 */ nop -/* 0097C 80A7396C 46140282 */ mul.s $f10, $f0, $f20 -/* 00980 80A73970 C6260028 */ lwc1 $f6, 0x0028($s1) ## 00000028 -/* 00984 80A73974 8E270024 */ lw $a3, 0x0024($s1) ## 00000024 -/* 00988 80A73978 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 0098C 80A7397C E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00990 80A73980 C628002C */ lwc1 $f8, 0x002C($s1) ## 0000002C -/* 00994 80A73984 AFB90024 */ sw $t9, 0x0024($sp) -/* 00998 80A73988 4600540D */ trunc.w.s $f16, $f10 -/* 0099C 80A7398C AFA00020 */ sw $zero, 0x0020($sp) -/* 009A0 80A73990 AFA00018 */ sw $zero, 0x0018($sp) -/* 009A4 80A73994 02402025 */ or $a0, $s2, $zero ## $a0 = 00001C24 -/* 009A8 80A73998 440E8000 */ mfc1 $t6, $f16 -/* 009AC 80A7399C 02802825 */ or $a1, $s4, $zero ## $a1 = 00000000 -/* 009B0 80A739A0 240600F0 */ addiu $a2, $zero, 0x00F0 ## $a2 = 000000F0 -/* 009B4 80A739A4 01D07821 */ addu $t7, $t6, $s0 -/* 009B8 80A739A8 25F8FE0C */ addiu $t8, $t7, 0xFE0C ## $t8 = FFFFFE0C -/* 009BC 80A739AC AFB8001C */ sw $t8, 0x001C($sp) -/* 009C0 80A739B0 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 009C4 80A739B4 E7A80014 */ swc1 $f8, 0x0014($sp) -/* 009C8 80A739B8 26101999 */ addiu $s0, $s0, 0x1999 ## $s0 = 00001999 -/* 009CC 80A739BC 1613FFE9 */ bne $s0, $s3, .L80A73964 -/* 009D0 80A739C0 00000000 */ nop -/* 009D4 80A739C4 86220152 */ lh $v0, 0x0152($s1) ## 00000152 -.L80A739C8: -/* 009D8 80A739C8 5C400004 */ bgtzl $v0, .L80A739DC -/* 009DC 80A739CC 8FBF004C */ lw $ra, 0x004C($sp) -/* 009E0 80A739D0 0C00B55C */ jal Actor_Kill - -/* 009E4 80A739D4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 009E8 80A739D8 8FBF004C */ lw $ra, 0x004C($sp) -.L80A739DC: -/* 009EC 80A739DC D7B40030 */ ldc1 $f20, 0x0030($sp) -/* 009F0 80A739E0 8FB00038 */ lw $s0, 0x0038($sp) -/* 009F4 80A739E4 8FB1003C */ lw $s1, 0x003C($sp) -/* 009F8 80A739E8 8FB20040 */ lw $s2, 0x0040($sp) -/* 009FC 80A739EC 8FB30044 */ lw $s3, 0x0044($sp) -/* 00A00 80A739F0 8FB40048 */ lw $s4, 0x0048($sp) -/* 00A04 80A739F4 03E00008 */ jr $ra -/* 00A08 80A739F8 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A739FC.s b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A739FC.s deleted file mode 100644 index 6bd2ba9602..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A739FC.s +++ /dev/null @@ -1,76 +0,0 @@ -.late_rodata -glabel D_80A74148 - .float 0.005 - -glabel D_80A7414C - .word 0x3B83126F -glabel D_80A74150 - .float 1.6 - -glabel D_80A74154 - .float 0.005 - -glabel D_80A74158 - .word 0x3B449BA6 - -.text -glabel func_80A739FC -/* 00A0C 80A739FC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00A10 80A73A00 AFBF001C */ sw $ra, 0x001C($sp) -/* 00A14 80A73A04 AFB00018 */ sw $s0, 0x0018($sp) -/* 00A18 80A73A08 8499001C */ lh $t9, 0x001C($a0) ## 0000001C -/* 00A1C 80A73A0C 3C0E80A7 */ lui $t6, %hi(func_80A73AD0) ## $t6 = 80A70000 -/* 00A20 80A73A10 25CE3AD0 */ addiu $t6, $t6, %lo(func_80A73AD0) ## $t6 = 80A73AD0 -/* 00A24 80A73A14 240F002C */ addiu $t7, $zero, 0x002C ## $t7 = 0000002C -/* 00A28 80A73A18 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 00A2C 80A73A1C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00A30 80A73A20 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00A34 80A73A24 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 00A38 80A73A28 A48F0152 */ sh $t7, 0x0152($a0) ## 00000152 -/* 00A3C 80A73A2C 17210013 */ bne $t9, $at, .L80A73A7C -/* 00A40 80A73A30 A4980150 */ sh $t8, 0x0150($a0) ## 00000150 -/* 00A44 80A73A34 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00A48 80A73A38 00000000 */ nop -/* 00A4C 80A73A3C 3C0180A7 */ lui $at, %hi(D_80A74148) ## $at = 80A70000 -/* 00A50 80A73A40 C4244148 */ lwc1 $f4, %lo(D_80A74148)($at) -/* 00A54 80A73A44 3C0180A7 */ lui $at, %hi(D_80A7414C) ## $at = 80A70000 -/* 00A58 80A73A48 C428414C */ lwc1 $f8, %lo(D_80A7414C)($at) -/* 00A5C 80A73A4C 46040182 */ mul.s $f6, $f0, $f4 -/* 00A60 80A73A50 46083280 */ add.s $f10, $f6, $f8 -/* 00A64 80A73A54 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00A68 80A73A58 E60A0158 */ swc1 $f10, 0x0158($s0) ## 00000158 -/* 00A6C 80A73A5C 3C0180A7 */ lui $at, %hi(D_80A74150) ## $at = 80A70000 -/* 00A70 80A73A60 C4304150 */ lwc1 $f16, %lo(D_80A74150)($at) -/* 00A74 80A73A64 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00A78 80A73A68 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 00A7C 80A73A6C 46100482 */ mul.s $f18, $f0, $f16 -/* 00A80 80A73A70 46049180 */ add.s $f6, $f18, $f4 -/* 00A84 80A73A74 10000011 */ beq $zero, $zero, .L80A73ABC -/* 00A88 80A73A78 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 -.L80A73A7C: -/* 00A8C 80A73A7C 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00A90 80A73A80 00000000 */ nop -/* 00A94 80A73A84 3C0180A7 */ lui $at, %hi(D_80A74154) ## $at = 80A70000 -/* 00A98 80A73A88 C4284154 */ lwc1 $f8, %lo(D_80A74154)($at) -/* 00A9C 80A73A8C 3C0180A7 */ lui $at, %hi(D_80A74158) ## $at = 80A70000 -/* 00AA0 80A73A90 C4304158 */ lwc1 $f16, %lo(D_80A74158)($at) -/* 00AA4 80A73A94 46080282 */ mul.s $f10, $f0, $f8 -/* 00AA8 80A73A98 46105480 */ add.s $f18, $f10, $f16 -/* 00AAC 80A73A9C 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00AB0 80A73AA0 E6120158 */ swc1 $f18, 0x0158($s0) ## 00000158 -/* 00AB4 80A73AA4 46000100 */ add.s $f4, $f0, $f0 -/* 00AB8 80A73AA8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00ABC 80A73AAC 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 -/* 00AC0 80A73AB0 00000000 */ nop -/* 00AC4 80A73AB4 46062200 */ add.s $f8, $f4, $f6 -/* 00AC8 80A73AB8 E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 -.L80A73ABC: -/* 00ACC 80A73ABC 8FBF001C */ lw $ra, 0x001C($sp) -/* 00AD0 80A73AC0 8FB00018 */ lw $s0, 0x0018($sp) -/* 00AD4 80A73AC4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00AD8 80A73AC8 03E00008 */ jr $ra -/* 00ADC 80A73ACC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A73AD0.s b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A73AD0.s deleted file mode 100644 index abd9c13fa0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A73AD0.s +++ /dev/null @@ -1,105 +0,0 @@ -.late_rodata -glabel D_80A7415C - .word 0x3F2AC083 - -.text -glabel func_80A73AD0 -/* 00AE0 80A73AD0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00AE4 80A73AD4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00AE8 80A73AD8 AFB00020 */ sw $s0, 0x0020($sp) -/* 00AEC 80A73ADC AFA5002C */ sw $a1, 0x002C($sp) -/* 00AF0 80A73AE0 848E0152 */ lh $t6, 0x0152($a0) ## 00000152 -/* 00AF4 80A73AE4 3C0538D1 */ lui $a1, 0x38D1 ## $a1 = 38D10000 -/* 00AF8 80A73AE8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00AFC 80A73AEC 29C10015 */ slti $at, $t6, 0x0015 -/* 00B00 80A73AF0 14200013 */ bne $at, $zero, .L80A73B40 -/* 00B04 80A73AF4 34A5B717 */ ori $a1, $a1, 0xB717 ## $a1 = 38D1B717 -/* 00B08 80A73AF8 3C053BC4 */ lui $a1, 0x3BC4 ## $a1 = 3BC40000 -/* 00B0C 80A73AFC 3C063927 */ lui $a2, 0x3927 ## $a2 = 39270000 -/* 00B10 80A73B00 34C6C5AC */ ori $a2, $a2, 0xC5AC ## $a2 = 3927C5AC -/* 00B14 80A73B04 34A59BA6 */ ori $a1, $a1, 0x9BA6 ## $a1 = 3BC49BA6 -/* 00B18 80A73B08 0C01DE80 */ jal Math_ApproxF - -/* 00B1C 80A73B0C 24840050 */ addiu $a0, $a0, 0x0050 ## $a0 = 00000050 -/* 00B20 80A73B10 3C0180A7 */ lui $at, %hi(D_80A7415C) ## $at = 80A70000 -/* 00B24 80A73B14 C426415C */ lwc1 $f6, %lo(D_80A7415C)($at) -/* 00B28 80A73B18 C6040158 */ lwc1 $f4, 0x0158($s0) ## 00000158 -/* 00B2C 80A73B1C 3C063912 */ lui $a2, 0x3912 ## $a2 = 39120000 -/* 00B30 80A73B20 34C6CCF7 */ ori $a2, $a2, 0xCCF7 ## $a2 = 3912CCF7 -/* 00B34 80A73B24 46062202 */ mul.s $f8, $f4, $f6 -/* 00B38 80A73B28 26040054 */ addiu $a0, $s0, 0x0054 ## $a0 = 00000054 -/* 00B3C 80A73B2C 44054000 */ mfc1 $a1, $f8 -/* 00B40 80A73B30 0C01DE80 */ jal Math_ApproxF - -/* 00B44 80A73B34 00000000 */ nop -/* 00B48 80A73B38 1000000C */ beq $zero, $zero, .L80A73B6C -/* 00B4C 80A73B3C C60A0050 */ lwc1 $f10, 0x0050($s0) ## 00000050 -.L80A73B40: -/* 00B50 80A73B40 3C06391D */ lui $a2, 0x391D ## $a2 = 391D0000 -/* 00B54 80A73B44 34C64952 */ ori $a2, $a2, 0x4952 ## $a2 = 391D4952 -/* 00B58 80A73B48 0C01DE80 */ jal Math_ApproxF - -/* 00B5C 80A73B4C 26040050 */ addiu $a0, $s0, 0x0050 ## $a0 = 00000050 -/* 00B60 80A73B50 3C0538D1 */ lui $a1, 0x38D1 ## $a1 = 38D10000 -/* 00B64 80A73B54 3C06391D */ lui $a2, 0x391D ## $a2 = 391D0000 -/* 00B68 80A73B58 34C64952 */ ori $a2, $a2, 0x4952 ## $a2 = 391D4952 -/* 00B6C 80A73B5C 34A5B717 */ ori $a1, $a1, 0xB717 ## $a1 = 38D1B717 -/* 00B70 80A73B60 0C01DE80 */ jal Math_ApproxF - -/* 00B74 80A73B64 26040054 */ addiu $a0, $s0, 0x0054 ## $a0 = 00000054 -/* 00B78 80A73B68 C60A0050 */ lwc1 $f10, 0x0050($s0) ## 00000050 -.L80A73B6C: -/* 00B7C 80A73B6C 3C063D75 */ lui $a2, 0x3D75 ## $a2 = 3D750000 -/* 00B80 80A73B70 34C6C28F */ ori $a2, $a2, 0xC28F ## $a2 = 3D75C28F -/* 00B84 80A73B74 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 00B88 80A73B78 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 00B8C 80A73B7C 0C01DE80 */ jal Math_ApproxF - -/* 00B90 80A73B80 E60A0058 */ swc1 $f10, 0x0058($s0) ## 00000058 -/* 00B94 80A73B84 0C00B638 */ jal Actor_MoveForward - -/* 00B98 80A73B88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B9C 80A73B8C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00BA0 80A73B90 44810000 */ mtc1 $at, $f0 ## $f0 = 10.00 -/* 00BA4 80A73B94 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 00BA8 80A73B98 240F0005 */ addiu $t7, $zero, 0x0005 ## $t7 = 00000005 -/* 00BAC 80A73B9C 44060000 */ mfc1 $a2, $f0 -/* 00BB0 80A73BA0 44070000 */ mfc1 $a3, $f0 -/* 00BB4 80A73BA4 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00BB8 80A73BA8 8FA4002C */ lw $a0, 0x002C($sp) -/* 00BBC 80A73BAC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00BC0 80A73BB0 0C00B92D */ jal func_8002E4B4 -/* 00BC4 80A73BB4 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 00BC8 80A73BB8 86020152 */ lh $v0, 0x0152($s0) ## 00000152 -/* 00BCC 80A73BBC 28410019 */ slti $at, $v0, 0x0019 -/* 00BD0 80A73BC0 10200010 */ beq $at, $zero, .L80A73C04 -/* 00BD4 80A73BC4 00000000 */ nop -/* 00BD8 80A73BC8 86180150 */ lh $t8, 0x0150($s0) ## 00000150 -/* 00BDC 80A73BCC 2719FFF6 */ addiu $t9, $t8, 0xFFF6 ## $t9 = FFFFFFF6 -/* 00BE0 80A73BD0 A6190150 */ sh $t9, 0x0150($s0) ## 00000150 -/* 00BE4 80A73BD4 86020150 */ lh $v0, 0x0150($s0) ## 00000150 -/* 00BE8 80A73BD8 04410004 */ bgez $v0, .L80A73BEC -/* 00BEC 80A73BDC 28410100 */ slti $at, $v0, 0x0100 -/* 00BF0 80A73BE0 A6000150 */ sh $zero, 0x0150($s0) ## 00000150 -/* 00BF4 80A73BE4 10000007 */ beq $zero, $zero, .L80A73C04 -/* 00BF8 80A73BE8 86020152 */ lh $v0, 0x0152($s0) ## 00000152 -.L80A73BEC: -/* 00BFC 80A73BEC 14200003 */ bne $at, $zero, .L80A73BFC -/* 00C00 80A73BF0 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -/* 00C04 80A73BF4 10000001 */ beq $zero, $zero, .L80A73BFC -/* 00C08 80A73BF8 240300FF */ addiu $v1, $zero, 0x00FF ## $v1 = 000000FF -.L80A73BFC: -/* 00C0C 80A73BFC A6030150 */ sh $v1, 0x0150($s0) ## 00000150 -/* 00C10 80A73C00 86020152 */ lh $v0, 0x0152($s0) ## 00000152 -.L80A73C04: -/* 00C14 80A73C04 5C400004 */ bgtzl $v0, .L80A73C18 -/* 00C18 80A73C08 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00C1C 80A73C0C 0C00B55C */ jal Actor_Kill - -/* 00C20 80A73C10 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C24 80A73C14 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A73C18: -/* 00C28 80A73C18 8FB00020 */ lw $s0, 0x0020($sp) -/* 00C2C 80A73C1C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00C30 80A73C20 03E00008 */ jr $ra -/* 00C34 80A73C24 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/EnIshi_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/EnIshi_Destroy.s deleted file mode 100644 index 75658f8c70..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/EnIshi_Destroy.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel EnIshi_Destroy -/* 00C10 80A7F070 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00C14 80A7F074 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00C18 80A7F078 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00C1C 80A7F07C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00C20 80A7F080 0C0170EB */ jal Collider_DestroyCylinder - -/* 00C24 80A7F084 24E50150 */ addiu $a1, $a3, 0x0150 ## $a1 = 00000150 -/* 00C28 80A7F088 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00C2C 80A7F08C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00C30 80A7F090 03E00008 */ jr $ra -/* 00C34 80A7F094 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/EnIshi_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/EnIshi_Draw.s deleted file mode 100644 index 45ef749285..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/EnIshi_Draw.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel EnIshi_Draw -/* 01550 80A7F9B0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01554 80A7F9B4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01558 80A7F9B8 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 0155C 80A7F9BC 3C1980A8 */ lui $t9, %hi(D_80A873E4) ## $t9 = 80A80000 -/* 01560 80A7F9C0 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 01564 80A7F9C4 000FC080 */ sll $t8, $t7, 2 -/* 01568 80A7F9C8 0338C821 */ addu $t9, $t9, $t8 -/* 0156C 80A7F9CC 8F3973E4 */ lw $t9, %lo(D_80A873E4)($t9) -/* 01570 80A7F9D0 0320F809 */ jalr $ra, $t9 -/* 01574 80A7F9D4 00000000 */ nop -/* 01578 80A7F9D8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0157C 80A7F9DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01580 80A7F9E0 03E00008 */ jr $ra -/* 01584 80A7F9E4 00000000 */ nop -/* 01588 80A7F9E8 00000000 */ nop -/* 0158C 80A7F9EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/EnIshi_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/EnIshi_Init.s deleted file mode 100644 index dc4ff58c85..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/EnIshi_Init.s +++ /dev/null @@ -1,114 +0,0 @@ -glabel EnIshi_Init -/* 00A78 80A7EED8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00A7C 80A7EEDC AFBF001C */ sw $ra, 0x001C($sp) -/* 00A80 80A7EEE0 AFB00018 */ sw $s0, 0x0018($sp) -/* 00A84 80A7EEE4 AFA50034 */ sw $a1, 0x0034($sp) -/* 00A88 80A7EEE8 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 00A8C 80A7EEEC 3C0F80A8 */ lui $t7, %hi(D_80A873B8) ## $t7 = 80A80000 -/* 00A90 80A7EEF0 25EF73B8 */ addiu $t7, $t7, %lo(D_80A873B8) ## $t7 = 80A873B8 -/* 00A94 80A7EEF4 30420001 */ andi $v0, $v0, 0x0001 ## $v0 = 00000000 -/* 00A98 80A7EEF8 00021400 */ sll $v0, $v0, 16 -/* 00A9C 80A7EEFC 00021403 */ sra $v0, $v0, 16 -/* 00AA0 80A7EF00 00027080 */ sll $t6, $v0, 2 -/* 00AA4 80A7EF04 01C27021 */ addu $t6, $t6, $v0 -/* 00AA8 80A7EF08 000E7080 */ sll $t6, $t6, 2 -/* 00AAC 80A7EF0C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00AB0 80A7EF10 01CF2821 */ addu $a1, $t6, $t7 -/* 00AB4 80A7EF14 0C01E037 */ jal Actor_ProcessInitChain - -/* 00AB8 80A7EF18 A7A2002A */ sh $v0, 0x002A($sp) -/* 00ABC 80A7EF1C 8FB80034 */ lw $t8, 0x0034($sp) -/* 00AC0 80A7EF20 3C01447A */ lui $at, 0x447A ## $at = 447A0000 -/* 00AC4 80A7EF24 93191D6C */ lbu $t9, 0x1D6C($t8) ## 00001D6C -/* 00AC8 80A7EF28 53200007 */ beql $t9, $zero, .L80A7EF48 -/* 00ACC 80A7EF2C 860800B6 */ lh $t0, 0x00B6($s0) ## 000000B6 -/* 00AD0 80A7EF30 C60400F4 */ lwc1 $f4, 0x00F4($s0) ## 000000F4 -/* 00AD4 80A7EF34 44813000 */ mtc1 $at, $f6 ## $f6 = 1000.00 -/* 00AD8 80A7EF38 00000000 */ nop -/* 00ADC 80A7EF3C 46062200 */ add.s $f8, $f4, $f6 -/* 00AE0 80A7EF40 E60800F4 */ swc1 $f8, 0x00F4($s0) ## 000000F4 -/* 00AE4 80A7EF44 860800B6 */ lh $t0, 0x00B6($s0) ## 000000B6 -.L80A7EF48: -/* 00AE8 80A7EF48 3C014780 */ lui $at, 0x4780 ## $at = 47800000 -/* 00AEC 80A7EF4C 5500000A */ bnel $t0, $zero, .L80A7EF78 -/* 00AF0 80A7EF50 87A2002A */ lh $v0, 0x002A($sp) -/* 00AF4 80A7EF54 44816000 */ mtc1 $at, $f12 ## $f12 = 65536.00 -/* 00AF8 80A7EF58 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 00AFC 80A7EF5C 00000000 */ nop -/* 00B00 80A7EF60 4600028D */ trunc.w.s $f10, $f0 -/* 00B04 80A7EF64 44025000 */ mfc1 $v0, $f10 -/* 00B08 80A7EF68 00000000 */ nop -/* 00B0C 80A7EF6C A6020032 */ sh $v0, 0x0032($s0) ## 00000032 -/* 00B10 80A7EF70 A60200B6 */ sh $v0, 0x00B6($s0) ## 000000B6 -/* 00B14 80A7EF74 87A2002A */ lh $v0, 0x002A($sp) -.L80A7EF78: -/* 00B18 80A7EF78 3C0A80A8 */ lui $t2, %hi(D_80A7FA18) ## $t2 = 80A80000 -/* 00B1C 80A7EF7C 254AFA18 */ addiu $t2, $t2, %lo(D_80A7FA18) ## $t2 = 80A7FA18 -/* 00B20 80A7EF80 00021080 */ sll $v0, $v0, 2 -/* 00B24 80A7EF84 004A1821 */ addu $v1, $v0, $t2 -/* 00B28 80A7EF88 8C650000 */ lw $a1, 0x0000($v1) ## 00000000 -/* 00B2C 80A7EF8C AFA30020 */ sw $v1, 0x0020($sp) -/* 00B30 80A7EF90 AFA20024 */ sw $v0, 0x0024($sp) -/* 00B34 80A7EF94 0C00B58B */ jal Actor_SetScale - -/* 00B38 80A7EF98 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B3C 80A7EF9C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B40 80A7EFA0 0C29F918 */ jal func_80A7E460 -/* 00B44 80A7EFA4 8FA50034 */ lw $a1, 0x0034($sp) -/* 00B48 80A7EFA8 8FAB0020 */ lw $t3, 0x0020($sp) -/* 00B4C 80A7EFAC 3C0C80A8 */ lui $t4, %hi(D_80A7FA1C) ## $t4 = 80A80000 -/* 00B50 80A7EFB0 258CFA1C */ addiu $t4, $t4, %lo(D_80A7FA1C) ## $t4 = 80A7FA1C -/* 00B54 80A7EFB4 156C000F */ bne $t3, $t4, .L80A7EFF4 -/* 00B58 80A7EFB8 00000000 */ nop -/* 00B5C 80A7EFBC 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 00B60 80A7EFC0 8FA40034 */ lw $a0, 0x0034($sp) -/* 00B64 80A7EFC4 00026A83 */ sra $t5, $v0, 10 -/* 00B68 80A7EFC8 00027983 */ sra $t7, $v0, 6 -/* 00B6C 80A7EFCC 31F80003 */ andi $t8, $t7, 0x0003 ## $t8 = 00000000 -/* 00B70 80A7EFD0 31AE003C */ andi $t6, $t5, 0x003C ## $t6 = 00000000 -/* 00B74 80A7EFD4 0C00B2D0 */ jal Flags_GetSwitch - -/* 00B78 80A7EFD8 01D82825 */ or $a1, $t6, $t8 ## $a1 = 00000000 -/* 00B7C 80A7EFDC 10400005 */ beq $v0, $zero, .L80A7EFF4 -/* 00B80 80A7EFE0 00000000 */ nop -/* 00B84 80A7EFE4 0C00B55C */ jal Actor_Kill - -/* 00B88 80A7EFE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B8C 80A7EFEC 1000001C */ beq $zero, $zero, .L80A7F060 -/* 00B90 80A7EFF0 8FBF001C */ lw $ra, 0x001C($sp) -.L80A7EFF4: -/* 00B94 80A7EFF4 3C0680A8 */ lui $a2, %hi(D_80A87390) ## $a2 = 80A80000 -/* 00B98 80A7EFF8 24C67390 */ addiu $a2, $a2, %lo(D_80A87390) ## $a2 = 80A87390 -/* 00B9C 80A7EFFC 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 00BA0 80A7F000 0C0187B5 */ jal func_80061ED4 -/* 00BA4 80A7F004 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00BA8 80A7F008 8FB90024 */ lw $t9, 0x0024($sp) -/* 00BAC 80A7F00C 8608001C */ lh $t0, 0x001C($s0) ## 0000001C -/* 00BB0 80A7F010 3C0180A8 */ lui $at, %hi(D_80A7FA20) ## $at = 80A80000 -/* 00BB4 80A7F014 00390821 */ addu $at, $at, $t9 -/* 00BB8 80A7F018 C430FA20 */ lwc1 $f16, %lo(D_80A7FA20)($at) -/* 00BBC 80A7F01C 00084943 */ sra $t1, $t0, 5 -/* 00BC0 80A7F020 312A0001 */ andi $t2, $t1, 0x0001 ## $t2 = 00000000 -/* 00BC4 80A7F024 1540000B */ bne $t2, $zero, .L80A7F054 -/* 00BC8 80A7F028 E61000BC */ swc1 $f16, 0x00BC($s0) ## 000000BC -/* 00BCC 80A7F02C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00BD0 80A7F030 8FA50034 */ lw $a1, 0x0034($sp) -/* 00BD4 80A7F034 0C29F936 */ jal func_80A7E4D8 -/* 00BD8 80A7F038 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 00BDC 80A7F03C 14400005 */ bne $v0, $zero, .L80A7F054 -/* 00BE0 80A7F040 00000000 */ nop -/* 00BE4 80A7F044 0C00B55C */ jal Actor_Kill - -/* 00BE8 80A7F048 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00BEC 80A7F04C 10000004 */ beq $zero, $zero, .L80A7F060 -/* 00BF0 80A7F050 8FBF001C */ lw $ra, 0x001C($sp) -.L80A7F054: -/* 00BF4 80A7F054 0C29FC26 */ jal func_80A7F098 -/* 00BF8 80A7F058 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00BFC 80A7F05C 8FBF001C */ lw $ra, 0x001C($sp) -.L80A7F060: -/* 00C00 80A7F060 8FB00018 */ lw $s0, 0x0018($sp) -/* 00C04 80A7F064 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00C08 80A7F068 03E00008 */ jr $ra -/* 00C0C 80A7F06C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/EnIshi_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/EnIshi_Update.s deleted file mode 100644 index 0b3fcb3414..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/EnIshi_Update.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel EnIshi_Update -/* 0141C 80A7F87C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01420 80A7F880 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01424 80A7F884 8C99014C */ lw $t9, 0x014C($a0) ## 0000014C -/* 01428 80A7F888 0320F809 */ jalr $ra, $t9 -/* 0142C 80A7F88C 00000000 */ nop -/* 01430 80A7F890 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01434 80A7F894 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01438 80A7F898 03E00008 */ jr $ra -/* 0143C 80A7F89C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7E460.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7E460.s deleted file mode 100644 index 7062ce5f2d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7E460.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80A7E460 -/* 00000 80A7E460 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00004 80A7E464 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00008 80A7E468 AFA50024 */ sw $a1, 0x0024($sp) -/* 0000C 80A7E46C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00010 80A7E470 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00014 80A7E474 24C50150 */ addiu $a1, $a2, 0x0150 ## $a1 = 00000150 -/* 00018 80A7E478 AFA50018 */ sw $a1, 0x0018($sp) -/* 0001C 80A7E47C 0C0170D9 */ jal Collider_InitCylinder - -/* 00020 80A7E480 AFA60020 */ sw $a2, 0x0020($sp) -/* 00024 80A7E484 8FA60020 */ lw $a2, 0x0020($sp) -/* 00028 80A7E488 3C1980A8 */ lui $t9, %hi(D_80A87338) ## $t9 = 80A80000 -/* 0002C 80A7E48C 27397338 */ addiu $t9, $t9, %lo(D_80A87338) ## $t9 = 80A87338 -/* 00030 80A7E490 84CE001C */ lh $t6, 0x001C($a2) ## 0000001C -/* 00034 80A7E494 8FA40024 */ lw $a0, 0x0024($sp) -/* 00038 80A7E498 8FA50018 */ lw $a1, 0x0018($sp) -/* 0003C 80A7E49C 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 00040 80A7E4A0 000FC080 */ sll $t8, $t7, 2 -/* 00044 80A7E4A4 030FC023 */ subu $t8, $t8, $t7 -/* 00048 80A7E4A8 0018C080 */ sll $t8, $t8, 2 -/* 0004C 80A7E4AC 030FC023 */ subu $t8, $t8, $t7 -/* 00050 80A7E4B0 0018C080 */ sll $t8, $t8, 2 -/* 00054 80A7E4B4 0C01712B */ jal Collider_SetCylinder - -/* 00058 80A7E4B8 03193821 */ addu $a3, $t8, $t9 -/* 0005C 80A7E4BC 8FA40020 */ lw $a0, 0x0020($sp) -/* 00060 80A7E4C0 0C0189B7 */ jal Collider_CylinderUpdate - -/* 00064 80A7E4C4 8FA50018 */ lw $a1, 0x0018($sp) -/* 00068 80A7E4C8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0006C 80A7E4CC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00070 80A7E4D0 03E00008 */ jr $ra -/* 00074 80A7E4D4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7E4D8.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7E4D8.s deleted file mode 100644 index aebb635cd2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7E4D8.s +++ /dev/null @@ -1,77 +0,0 @@ -.rdata -glabel D_80A873F0 - .asciz "\x1b[43;30m" - .balign 4 - -glabel D_80A873FC - .asciz "地面に付着失敗(%s %d)\n" - .balign 4 - -glabel D_80A87414 - .asciz "../z_en_ishi.c" - .balign 4 - -glabel D_80A87424 - .asciz "\x1b[m" - .balign 4 - -.text -glabel func_80A7E4D8 -/* 00078 80A7E4D8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0007C 80A7E4DC AFBF001C */ sw $ra, 0x001C($sp) -/* 00080 80A7E4E0 AFA5003C */ sw $a1, 0x003C($sp) -/* 00084 80A7E4E4 AFA60040 */ sw $a2, 0x0040($sp) -/* 00088 80A7E4E8 C4840024 */ lwc1 $f4, 0x0024($a0) ## 00000024 -/* 0008C 80A7E4EC 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 00090 80A7E4F0 44814000 */ mtc1 $at, $f8 ## $f8 = 30.00 -/* 00094 80A7E4F4 E7A40028 */ swc1 $f4, 0x0028($sp) -/* 00098 80A7E4F8 C4860028 */ lwc1 $f6, 0x0028($a0) ## 00000028 -/* 0009C 80A7E4FC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 000A0 80A7E500 27AE0028 */ addiu $t6, $sp, 0x0028 ## $t6 = FFFFFFF0 -/* 000A4 80A7E504 46083280 */ add.s $f10, $f6, $f8 -/* 000A8 80A7E508 27A60024 */ addiu $a2, $sp, 0x0024 ## $a2 = FFFFFFEC -/* 000AC 80A7E50C E7AA002C */ swc1 $f10, 0x002C($sp) -/* 000B0 80A7E510 C490002C */ lwc1 $f16, 0x002C($a0) ## 0000002C -/* 000B4 80A7E514 24A407C0 */ addiu $a0, $a1, 0x07C0 ## $a0 = 000007C0 -/* 000B8 80A7E518 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFFC -/* 000BC 80A7E51C AFA70038 */ sw $a3, 0x0038($sp) -/* 000C0 80A7E520 AFAE0010 */ sw $t6, 0x0010($sp) -/* 000C4 80A7E524 0C00F269 */ jal func_8003C9A4 -/* 000C8 80A7E528 E7B00030 */ swc1 $f16, 0x0030($sp) -/* 000CC 80A7E52C 3C01C6FA */ lui $at, 0xC6FA ## $at = C6FA0000 -/* 000D0 80A7E530 44819000 */ mtc1 $at, $f18 ## $f18 = -32000.00 -/* 000D4 80A7E534 8FA70038 */ lw $a3, 0x0038($sp) -/* 000D8 80A7E538 C7A40040 */ lwc1 $f4, 0x0040($sp) -/* 000DC 80A7E53C 4600903C */ c.lt.s $f18, $f0 -/* 000E0 80A7E540 3C0480A8 */ lui $a0, %hi(D_80A873F0) ## $a0 = 80A80000 -/* 000E4 80A7E544 45000008 */ bc1f .L80A7E568 -/* 000E8 80A7E548 00000000 */ nop -/* 000EC 80A7E54C 46040180 */ add.s $f6, $f0, $f4 -/* 000F0 80A7E550 24E40008 */ addiu $a0, $a3, 0x0008 ## $a0 = 00000008 -/* 000F4 80A7E554 24E50024 */ addiu $a1, $a3, 0x0024 ## $a1 = 00000024 -/* 000F8 80A7E558 0C01DF90 */ jal Math_Vec3f_Copy - ## Vec3f_Copy -/* 000FC 80A7E55C E4E60028 */ swc1 $f6, 0x0028($a3) ## 00000028 -/* 00100 80A7E560 1000000D */ beq $zero, $zero, .L80A7E598 -/* 00104 80A7E564 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A7E568: -/* 00108 80A7E568 0C00084C */ jal osSyncPrintf - -/* 0010C 80A7E56C 248473F0 */ addiu $a0, $a0, %lo(D_80A873F0) ## $a0 = 000073F0 -/* 00110 80A7E570 3C0480A8 */ lui $a0, %hi(D_80A873FC) ## $a0 = 80A80000 -/* 00114 80A7E574 3C0580A8 */ lui $a1, %hi(D_80A87414) ## $a1 = 80A80000 -/* 00118 80A7E578 24A57414 */ addiu $a1, $a1, %lo(D_80A87414) ## $a1 = 80A87414 -/* 0011C 80A7E57C 248473FC */ addiu $a0, $a0, %lo(D_80A873FC) ## $a0 = 80A873FC -/* 00120 80A7E580 0C00084C */ jal osSyncPrintf - -/* 00124 80A7E584 24060184 */ addiu $a2, $zero, 0x0184 ## $a2 = 00000184 -/* 00128 80A7E588 3C0480A8 */ lui $a0, %hi(D_80A87424) ## $a0 = 80A80000 -/* 0012C 80A7E58C 0C00084C */ jal osSyncPrintf - -/* 00130 80A7E590 24847424 */ addiu $a0, $a0, %lo(D_80A87424) ## $a0 = 80A87424 -/* 00134 80A7E594 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A7E598: -/* 00138 80A7E598 8FBF001C */ lw $ra, 0x001C($sp) -/* 0013C 80A7E59C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00140 80A7E5A0 03E00008 */ jr $ra -/* 00144 80A7E5A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7E5A8.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7E5A8.s deleted file mode 100644 index bb9a55f2c6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7E5A8.s +++ /dev/null @@ -1,182 +0,0 @@ -.late_rodata -glabel D_80A87458 - .float -0.8 - -glabel D_80A8745C - .float 0.8 - -.text -glabel func_80A7E5A8 -/* 00148 80A7E5A8 27BDFF30 */ addiu $sp, $sp, 0xFF30 ## $sp = FFFFFF30 -/* 0014C 80A7E5AC F7BE0068 */ sdc1 $f30, 0x0068($sp) -/* 00150 80A7E5B0 3C014130 */ lui $at, 0x4130 ## $at = 41300000 -/* 00154 80A7E5B4 4481F000 */ mtc1 $at, $f30 ## $f30 = 11.00 -/* 00158 80A7E5B8 F7BC0060 */ sdc1 $f28, 0x0060($sp) -/* 0015C 80A7E5BC 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 00160 80A7E5C0 4481E000 */ mtc1 $at, $f28 ## $f28 = 5.00 -/* 00164 80A7E5C4 F7BA0058 */ sdc1 $f26, 0x0058($sp) -/* 00168 80A7E5C8 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 0016C 80A7E5CC 4481D000 */ mtc1 $at, $f26 ## $f26 = 8.00 -/* 00170 80A7E5D0 F7B80050 */ sdc1 $f24, 0x0050($sp) -/* 00174 80A7E5D4 3C0180A8 */ lui $at, %hi(D_80A87458) ## $at = 80A80000 -/* 00178 80A7E5D8 C4387458 */ lwc1 $f24, %lo(D_80A87458)($at) -/* 0017C 80A7E5DC F7B60048 */ sdc1 $f22, 0x0048($sp) -/* 00180 80A7E5E0 3C0180A8 */ lui $at, %hi(D_80A8745C) ## $at = 80A80000 -/* 00184 80A7E5E4 C436745C */ lwc1 $f22, %lo(D_80A8745C)($at) -/* 00188 80A7E5E8 AFB50088 */ sw $s5, 0x0088($sp) -/* 0018C 80A7E5EC AFB40084 */ sw $s4, 0x0084($sp) -/* 00190 80A7E5F0 AFB10078 */ sw $s1, 0x0078($sp) -/* 00194 80A7E5F4 F7B40040 */ sdc1 $f20, 0x0040($sp) -/* 00198 80A7E5F8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 0019C 80A7E5FC AFB70090 */ sw $s7, 0x0090($sp) -/* 001A0 80A7E600 AFB6008C */ sw $s6, 0x008C($sp) -/* 001A4 80A7E604 AFB30080 */ sw $s3, 0x0080($sp) -/* 001A8 80A7E608 AFB2007C */ sw $s2, 0x007C($sp) -/* 001AC 80A7E60C AFB00074 */ sw $s0, 0x0074($sp) -/* 001B0 80A7E610 3C1180A8 */ lui $s1, %hi(D_80A87398) ## $s1 = 80A80000 -/* 001B4 80A7E614 3C140501 */ lui $s4, 0x0501 ## $s4 = 05010000 -/* 001B8 80A7E618 3C1580A8 */ lui $s5, %hi(D_80A873A4) ## $s5 = 80A80000 -/* 001BC 80A7E61C 4481A000 */ mtc1 $at, $f20 ## $f20 = 0.50 -/* 001C0 80A7E620 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 001C4 80A7E624 00A0B825 */ or $s7, $a1, $zero ## $s7 = 00000000 -/* 001C8 80A7E628 AFBF0094 */ sw $ra, 0x0094($sp) -/* 001CC 80A7E62C 26B573A4 */ addiu $s5, $s5, %lo(D_80A873A4) ## $s5 = 80A873A4 -/* 001D0 80A7E630 2694A880 */ addiu $s4, $s4, 0xA880 ## $s4 = 0500A880 -/* 001D4 80A7E634 26317398 */ addiu $s1, $s1, %lo(D_80A87398) ## $s1 = 80A87398 -/* 001D8 80A7E638 27B200C0 */ addiu $s2, $sp, 0x00C0 ## $s2 = FFFFFFF0 -/* 001DC 80A7E63C 27B300B4 */ addiu $s3, $sp, 0x00B4 ## $s3 = FFFFFFE4 -/* 001E0 80A7E640 2496005C */ addiu $s6, $a0, 0x005C ## $s6 = 0000005C -.L80A7E644: -/* 001E4 80A7E644 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 001E8 80A7E648 00000000 */ nop -/* 001EC 80A7E64C 46140101 */ sub.s $f4, $f0, $f20 -/* 001F0 80A7E650 C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 -/* 001F4 80A7E654 461A2182 */ mul.s $f6, $f4, $f26 -/* 001F8 80A7E658 46083280 */ add.s $f10, $f6, $f8 -/* 001FC 80A7E65C 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00200 80A7E660 E7AA00B4 */ swc1 $f10, 0x00B4($sp) -/* 00204 80A7E664 461C0402 */ mul.s $f16, $f0, $f28 -/* 00208 80A7E668 C6120028 */ lwc1 $f18, 0x0028($s0) ## 00000028 -/* 0020C 80A7E66C 46128100 */ add.s $f4, $f16, $f18 -/* 00210 80A7E670 461C2180 */ add.s $f6, $f4, $f28 -/* 00214 80A7E674 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00218 80A7E678 E7A600B8 */ swc1 $f6, 0x00B8($sp) -/* 0021C 80A7E67C 46140201 */ sub.s $f8, $f0, $f20 -/* 00220 80A7E680 C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C -/* 00224 80A7E684 02402025 */ or $a0, $s2, $zero ## $a0 = FFFFFFF0 -/* 00228 80A7E688 02C02825 */ or $a1, $s6, $zero ## $a1 = 0000005C -/* 0022C 80A7E68C 461A4282 */ mul.s $f10, $f8, $f26 -/* 00230 80A7E690 46105480 */ add.s $f18, $f10, $f16 -/* 00234 80A7E694 0C01DF90 */ jal Math_Vec3f_Copy - ## Vec3f_Copy -/* 00238 80A7E698 E7B200BC */ swc1 $f18, 0x00BC($sp) -/* 0023C 80A7E69C 96020088 */ lhu $v0, 0x0088($s0) ## 00000088 -/* 00240 80A7E6A0 C7A400C0 */ lwc1 $f4, 0x00C0($sp) -/* 00244 80A7E6A4 304E0001 */ andi $t6, $v0, 0x0001 ## $t6 = 00000000 -/* 00248 80A7E6A8 11C0000B */ beq $t6, $zero, .L80A7E6D8 -/* 0024C 80A7E6AC 304F0008 */ andi $t7, $v0, 0x0008 ## $t7 = 00000000 -/* 00250 80A7E6B0 46162182 */ mul.s $f6, $f4, $f22 -/* 00254 80A7E6B4 C7A800C4 */ lwc1 $f8, 0x00C4($sp) -/* 00258 80A7E6B8 C7B000C8 */ lwc1 $f16, 0x00C8($sp) -/* 0025C 80A7E6BC 46184282 */ mul.s $f10, $f8, $f24 -/* 00260 80A7E6C0 00000000 */ nop -/* 00264 80A7E6C4 46168482 */ mul.s $f18, $f16, $f22 -/* 00268 80A7E6C8 E7A600C0 */ swc1 $f6, 0x00C0($sp) -/* 0026C 80A7E6CC E7AA00C4 */ swc1 $f10, 0x00C4($sp) -/* 00270 80A7E6D0 1000000C */ beq $zero, $zero, .L80A7E704 -/* 00274 80A7E6D4 E7B200C8 */ swc1 $f18, 0x00C8($sp) -.L80A7E6D8: -/* 00278 80A7E6D8 11E0000A */ beq $t7, $zero, .L80A7E704 -/* 0027C 80A7E6DC C7A400C0 */ lwc1 $f4, 0x00C0($sp) -/* 00280 80A7E6E0 46182182 */ mul.s $f6, $f4, $f24 -/* 00284 80A7E6E4 C7A800C4 */ lwc1 $f8, 0x00C4($sp) -/* 00288 80A7E6E8 C7B000C8 */ lwc1 $f16, 0x00C8($sp) -/* 0028C 80A7E6EC 46164282 */ mul.s $f10, $f8, $f22 -/* 00290 80A7E6F0 00000000 */ nop -/* 00294 80A7E6F4 46188482 */ mul.s $f18, $f16, $f24 -/* 00298 80A7E6F8 E7A600C0 */ swc1 $f6, 0x00C0($sp) -/* 0029C 80A7E6FC E7AA00C4 */ swc1 $f10, 0x00C4($sp) -/* 002A0 80A7E700 E7B200C8 */ swc1 $f18, 0x00C8($sp) -.L80A7E704: -/* 002A4 80A7E704 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 002A8 80A7E708 00000000 */ nop -/* 002AC 80A7E70C 46140181 */ sub.s $f6, $f0, $f20 -/* 002B0 80A7E710 C7A400C0 */ lwc1 $f4, 0x00C0($sp) -/* 002B4 80A7E714 461E3202 */ mul.s $f8, $f6, $f30 -/* 002B8 80A7E718 46082280 */ add.s $f10, $f4, $f8 -/* 002BC 80A7E71C 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 002C0 80A7E720 E7AA00C0 */ swc1 $f10, 0x00C0($sp) -/* 002C4 80A7E724 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 002C8 80A7E728 44819000 */ mtc1 $at, $f18 ## $f18 = 6.00 -/* 002CC 80A7E72C C7B000C4 */ lwc1 $f16, 0x00C4($sp) -/* 002D0 80A7E730 46120182 */ mul.s $f6, $f0, $f18 -/* 002D4 80A7E734 46068100 */ add.s $f4, $f16, $f6 -/* 002D8 80A7E738 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 002DC 80A7E73C E7A400C4 */ swc1 $f4, 0x00C4($sp) -/* 002E0 80A7E740 46140281 */ sub.s $f10, $f0, $f20 -/* 002E4 80A7E744 C7A800C8 */ lwc1 $f8, 0x00C8($sp) -/* 002E8 80A7E748 461E5482 */ mul.s $f18, $f10, $f30 -/* 002EC 80A7E74C 46124400 */ add.s $f16, $f8, $f18 -/* 002F0 80A7E750 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 002F4 80A7E754 E7B000C8 */ swc1 $f16, 0x00C8($sp) -/* 002F8 80A7E758 4614003C */ c.lt.s $f0, $f20 -/* 002FC 80A7E75C 02E02025 */ or $a0, $s7, $zero ## $a0 = 00000000 -/* 00300 80A7E760 02602825 */ or $a1, $s3, $zero ## $a1 = FFFFFFE4 -/* 00304 80A7E764 02403025 */ or $a2, $s2, $zero ## $a2 = FFFFFFF0 -/* 00308 80A7E768 45000003 */ bc1f .L80A7E778 -/* 0030C 80A7E76C 02603825 */ or $a3, $s3, $zero ## $a3 = FFFFFFE4 -/* 00310 80A7E770 10000002 */ beq $zero, $zero, .L80A7E77C -/* 00314 80A7E774 24020041 */ addiu $v0, $zero, 0x0041 ## $v0 = 00000041 -.L80A7E778: -/* 00318 80A7E778 24020021 */ addiu $v0, $zero, 0x0021 ## $v0 = 00000021 -.L80A7E77C: -/* 0031C 80A7E77C 86290000 */ lh $t1, 0x0000($s1) ## 80A87398 -/* 00320 80A7E780 2418FE5C */ addiu $t8, $zero, 0xFE5C ## $t8 = FFFFFE5C -/* 00324 80A7E784 2419001E */ addiu $t9, $zero, 0x001E ## $t9 = 0000001E -/* 00328 80A7E788 24080005 */ addiu $t0, $zero, 0x0005 ## $t0 = 00000005 -/* 0032C 80A7E78C 240A0003 */ addiu $t2, $zero, 0x0003 ## $t2 = 00000003 -/* 00330 80A7E790 240B000A */ addiu $t3, $zero, 0x000A ## $t3 = 0000000A -/* 00334 80A7E794 240C0028 */ addiu $t4, $zero, 0x0028 ## $t4 = 00000028 -/* 00338 80A7E798 240DFFFF */ addiu $t5, $zero, 0xFFFF ## $t5 = FFFFFFFF -/* 0033C 80A7E79C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00340 80A7E7A0 AFAE0038 */ sw $t6, 0x0038($sp) -/* 00344 80A7E7A4 AFAD0034 */ sw $t5, 0x0034($sp) -/* 00348 80A7E7A8 AFAC0030 */ sw $t4, 0x0030($sp) -/* 0034C 80A7E7AC AFAB002C */ sw $t3, 0x002C($sp) -/* 00350 80A7E7B0 AFAA0028 */ sw $t2, 0x0028($sp) -/* 00354 80A7E7B4 AFA8001C */ sw $t0, 0x001C($sp) -/* 00358 80A7E7B8 AFB90018 */ sw $t9, 0x0018($sp) -/* 0035C 80A7E7BC AFB80010 */ sw $t8, 0x0010($sp) -/* 00360 80A7E7C0 AFA20014 */ sw $v0, 0x0014($sp) -/* 00364 80A7E7C4 AFA00020 */ sw $zero, 0x0020($sp) -/* 00368 80A7E7C8 AFB4003C */ sw $s4, 0x003C($sp) -/* 0036C 80A7E7CC 0C00A7A3 */ jal EffectSsKakera_Spawn - -/* 00370 80A7E7D0 AFA90024 */ sw $t1, 0x0024($sp) -/* 00374 80A7E7D4 26310002 */ addiu $s1, $s1, 0x0002 ## $s1 = 80A8739A -/* 00378 80A7E7D8 1635FF9A */ bne $s1, $s5, .L80A7E644 -/* 0037C 80A7E7DC 00000000 */ nop -/* 00380 80A7E7E0 8FBF0094 */ lw $ra, 0x0094($sp) -/* 00384 80A7E7E4 D7B40040 */ ldc1 $f20, 0x0040($sp) -/* 00388 80A7E7E8 D7B60048 */ ldc1 $f22, 0x0048($sp) -/* 0038C 80A7E7EC D7B80050 */ ldc1 $f24, 0x0050($sp) -/* 00390 80A7E7F0 D7BA0058 */ ldc1 $f26, 0x0058($sp) -/* 00394 80A7E7F4 D7BC0060 */ ldc1 $f28, 0x0060($sp) -/* 00398 80A7E7F8 D7BE0068 */ ldc1 $f30, 0x0068($sp) -/* 0039C 80A7E7FC 8FB00074 */ lw $s0, 0x0074($sp) -/* 003A0 80A7E800 8FB10078 */ lw $s1, 0x0078($sp) -/* 003A4 80A7E804 8FB2007C */ lw $s2, 0x007C($sp) -/* 003A8 80A7E808 8FB30080 */ lw $s3, 0x0080($sp) -/* 003AC 80A7E80C 8FB40084 */ lw $s4, 0x0084($sp) -/* 003B0 80A7E810 8FB50088 */ lw $s5, 0x0088($sp) -/* 003B4 80A7E814 8FB6008C */ lw $s6, 0x008C($sp) -/* 003B8 80A7E818 8FB70090 */ lw $s7, 0x0090($sp) -/* 003BC 80A7E81C 03E00008 */ jr $ra -/* 003C0 80A7E820 27BD00D0 */ addiu $sp, $sp, 0x00D0 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7E824.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7E824.s deleted file mode 100644 index 0bc2f7fbe5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7E824.s +++ /dev/null @@ -1,222 +0,0 @@ -.late_rodata -glabel D_80A87460 - .float -0.9 - -glabel D_80A87464 - .float 0.9 - -glabel D_80A87468 - .float -0.8 - -glabel D_80A8746C - .float 0.8 - -glabel D_80A87470 - .float 0.7 - -.text -glabel func_80A7E824 -/* 003C4 80A7E824 27BDFF18 */ addiu $sp, $sp, 0xFF18 ## $sp = FFFFFF18 -/* 003C8 80A7E828 F7BE0070 */ sdc1 $f30, 0x0070($sp) -/* 003CC 80A7E82C 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 003D0 80A7E830 4481F000 */ mtc1 $at, $f30 ## $f30 = 40.00 -/* 003D4 80A7E834 F7BC0068 */ sdc1 $f28, 0x0068($sp) -/* 003D8 80A7E838 3C0180A8 */ lui $at, %hi(D_80A87460) ## $at = 80A80000 -/* 003DC 80A7E83C C43C7460 */ lwc1 $f28, %lo(D_80A87460)($at) -/* 003E0 80A7E840 F7BA0060 */ sdc1 $f26, 0x0060($sp) -/* 003E4 80A7E844 3C0180A8 */ lui $at, %hi(D_80A87464) ## $at = 80A80000 -/* 003E8 80A7E848 C43A7464 */ lwc1 $f26, %lo(D_80A87464)($at) -/* 003EC 80A7E84C AFB60090 */ sw $s6, 0x0090($sp) -/* 003F0 80A7E850 AFB30084 */ sw $s3, 0x0084($sp) -/* 003F4 80A7E854 F7B80058 */ sdc1 $f24, 0x0058($sp) -/* 003F8 80A7E858 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 003FC 80A7E85C AFBE0098 */ sw $s8, 0x0098($sp) -/* 00400 80A7E860 AFB70094 */ sw $s7, 0x0094($sp) -/* 00404 80A7E864 AFB5008C */ sw $s5, 0x008C($sp) -/* 00408 80A7E868 AFB40088 */ sw $s4, 0x0088($sp) -/* 0040C 80A7E86C AFB20080 */ sw $s2, 0x0080($sp) -/* 00410 80A7E870 AFB1007C */ sw $s1, 0x007C($sp) -/* 00414 80A7E874 AFB00078 */ sw $s0, 0x0078($sp) -/* 00418 80A7E878 3C1380A8 */ lui $s3, %hi(D_80A873A4) ## $s3 = 80A80000 -/* 0041C 80A7E87C 3C160501 */ lui $s6, 0x0501 ## $s6 = 05010000 -/* 00420 80A7E880 248E005C */ addiu $t6, $a0, 0x005C ## $t6 = 0000005C -/* 00424 80A7E884 4481C000 */ mtc1 $at, $f24 ## $f24 = 10.00 -/* 00428 80A7E888 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0042C 80A7E88C AFBF009C */ sw $ra, 0x009C($sp) -/* 00430 80A7E890 F7B60050 */ sdc1 $f22, 0x0050($sp) -/* 00434 80A7E894 F7B40048 */ sdc1 $f20, 0x0048($sp) -/* 00438 80A7E898 AFA500EC */ sw $a1, 0x00EC($sp) -/* 0043C 80A7E89C 24111000 */ addiu $s1, $zero, 0x1000 ## $s1 = 00001000 -/* 00440 80A7E8A0 AFAE00A4 */ sw $t6, 0x00A4($sp) -/* 00444 80A7E8A4 26D6A5E8 */ addiu $s6, $s6, 0xA5E8 ## $s6 = 0500A5E8 -/* 00448 80A7E8A8 267373A4 */ addiu $s3, $s3, %lo(D_80A873A4) ## $s3 = 80A873A4 -/* 0044C 80A7E8AC 00009025 */ or $s2, $zero, $zero ## $s2 = 00000000 -/* 00450 80A7E8B0 27B400D8 */ addiu $s4, $sp, 0x00D8 ## $s4 = FFFFFFF0 -/* 00454 80A7E8B4 27B500CC */ addiu $s5, $sp, 0x00CC ## $s5 = FFFFFFE4 -/* 00458 80A7E8B8 24170009 */ addiu $s7, $zero, 0x0009 ## $s7 = 00000009 -/* 0045C 80A7E8BC 249E0024 */ addiu $s8, $a0, 0x0024 ## $s8 = 00000024 -.L80A7E8C0: -/* 00460 80A7E8C0 26314E20 */ addiu $s1, $s1, 0x4E20 ## $s1 = 00005E20 -/* 00464 80A7E8C4 00118C00 */ sll $s1, $s1, 16 -/* 00468 80A7E8C8 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 0046C 80A7E8CC 00118C03 */ sra $s1, $s1, 16 -/* 00470 80A7E8D0 46180502 */ mul.s $f20, $f0, $f24 -/* 00474 80A7E8D4 00112400 */ sll $a0, $s1, 16 -/* 00478 80A7E8D8 0C01DE1C */ jal Math_Sins - ## sins? -/* 0047C 80A7E8DC 00042403 */ sra $a0, $a0, 16 -/* 00480 80A7E8E0 46140102 */ mul.s $f4, $f0, $f20 -/* 00484 80A7E8E4 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 -/* 00488 80A7E8E8 46062200 */ add.s $f8, $f4, $f6 -/* 0048C 80A7E8EC 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00490 80A7E8F0 E7A800CC */ swc1 $f8, 0x00CC($sp) -/* 00494 80A7E8F4 461E0282 */ mul.s $f10, $f0, $f30 -/* 00498 80A7E8F8 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 0049C 80A7E8FC 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 004A0 80A7E900 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 -/* 004A4 80A7E904 00112400 */ sll $a0, $s1, 16 -/* 004A8 80A7E908 00042403 */ sra $a0, $a0, 16 -/* 004AC 80A7E90C 46105480 */ add.s $f18, $f10, $f16 -/* 004B0 80A7E910 46049180 */ add.s $f6, $f18, $f4 -/* 004B4 80A7E914 0C01DE0D */ jal Math_Coss - ## coss? -/* 004B8 80A7E918 E7A600D0 */ swc1 $f6, 0x00D0($sp) -/* 004BC 80A7E91C 46140202 */ mul.s $f8, $f0, $f20 -/* 004C0 80A7E920 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 004C4 80A7E924 02802025 */ or $a0, $s4, $zero ## $a0 = FFFFFFF0 -/* 004C8 80A7E928 8FA500A4 */ lw $a1, 0x00A4($sp) -/* 004CC 80A7E92C 460A4400 */ add.s $f16, $f8, $f10 -/* 004D0 80A7E930 0C01DF90 */ jal Math_Vec3f_Copy - ## Vec3f_Copy -/* 004D4 80A7E934 E7B000D4 */ swc1 $f16, 0x00D4($sp) -/* 004D8 80A7E938 96020088 */ lhu $v0, 0x0088($s0) ## 00000088 -/* 004DC 80A7E93C C7B200D8 */ lwc1 $f18, 0x00D8($sp) -/* 004E0 80A7E940 3C0180A8 */ lui $at, %hi(D_80A87468) ## $at = 80A80000 -/* 004E4 80A7E944 304F0001 */ andi $t7, $v0, 0x0001 ## $t7 = 00000000 -/* 004E8 80A7E948 11E0000B */ beq $t7, $zero, .L80A7E978 -/* 004EC 80A7E94C 30580008 */ andi $t8, $v0, 0x0008 ## $t8 = 00000000 -/* 004F0 80A7E950 461A9102 */ mul.s $f4, $f18, $f26 -/* 004F4 80A7E954 C7A600DC */ lwc1 $f6, 0x00DC($sp) -/* 004F8 80A7E958 C4287468 */ lwc1 $f8, %lo(D_80A87468)($at) -/* 004FC 80A7E95C C7B000E0 */ lwc1 $f16, 0x00E0($sp) -/* 00500 80A7E960 46083282 */ mul.s $f10, $f6, $f8 -/* 00504 80A7E964 E7A400D8 */ swc1 $f4, 0x00D8($sp) -/* 00508 80A7E968 461A8482 */ mul.s $f18, $f16, $f26 -/* 0050C 80A7E96C E7AA00DC */ swc1 $f10, 0x00DC($sp) -/* 00510 80A7E970 1000000D */ beq $zero, $zero, .L80A7E9A8 -/* 00514 80A7E974 E7B200E0 */ swc1 $f18, 0x00E0($sp) -.L80A7E978: -/* 00518 80A7E978 1300000B */ beq $t8, $zero, .L80A7E9A8 -/* 0051C 80A7E97C C7A400D8 */ lwc1 $f4, 0x00D8($sp) -/* 00520 80A7E980 3C0180A8 */ lui $at, %hi(D_80A8746C) ## $at = 80A80000 -/* 00524 80A7E984 461C2182 */ mul.s $f6, $f4, $f28 -/* 00528 80A7E988 C42A746C */ lwc1 $f10, %lo(D_80A8746C)($at) -/* 0052C 80A7E98C C7A800DC */ lwc1 $f8, 0x00DC($sp) -/* 00530 80A7E990 C7B200E0 */ lwc1 $f18, 0x00E0($sp) -/* 00534 80A7E994 460A4402 */ mul.s $f16, $f8, $f10 -/* 00538 80A7E998 E7A600D8 */ swc1 $f6, 0x00D8($sp) -/* 0053C 80A7E99C 461C9102 */ mul.s $f4, $f18, $f28 -/* 00540 80A7E9A0 E7B000DC */ swc1 $f16, 0x00DC($sp) -/* 00544 80A7E9A4 E7A400E0 */ swc1 $f4, 0x00E0($sp) -.L80A7E9A8: -/* 00548 80A7E9A8 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 0054C 80A7E9AC 00000000 */ nop -/* 00550 80A7E9B0 46180502 */ mul.s $f20, $f0, $f24 -/* 00554 80A7E9B4 00112400 */ sll $a0, $s1, 16 -/* 00558 80A7E9B8 0C01DE1C */ jal Math_Sins - ## sins? -/* 0055C 80A7E9BC 00042403 */ sra $a0, $a0, 16 -/* 00560 80A7E9C0 4600A202 */ mul.s $f8, $f20, $f0 -/* 00564 80A7E9C4 C7A600D8 */ lwc1 $f6, 0x00D8($sp) -/* 00568 80A7E9C8 46083280 */ add.s $f10, $f6, $f8 -/* 0056C 80A7E9CC 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00570 80A7E9D0 E7AA00D8 */ swc1 $f10, 0x00D8($sp) -/* 00574 80A7E9D4 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00578 80A7E9D8 46000586 */ mov.s $f22, $f0 -/* 0057C 80A7E9DC 44928000 */ mtc1 $s2, $f16 ## $f16 = 0.00 -/* 00580 80A7E9E0 3C0180A8 */ lui $at, %hi(D_80A87470) ## $at = 80A80000 -/* 00584 80A7E9E4 C4267470 */ lwc1 $f6, %lo(D_80A87470)($at) -/* 00588 80A7E9E8 468084A0 */ cvt.s.w $f18, $f16 -/* 0058C 80A7E9EC 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 00590 80A7E9F0 44815000 */ mtc1 $at, $f10 ## $f10 = 4.00 -/* 00594 80A7E9F4 00112400 */ sll $a0, $s1, 16 -/* 00598 80A7E9F8 00042403 */ sra $a0, $a0, 16 -/* 0059C 80A7E9FC 4612B102 */ mul.s $f4, $f22, $f18 -/* 005A0 80A7EA00 00000000 */ nop -/* 005A4 80A7EA04 46062202 */ mul.s $f8, $f4, $f6 -/* 005A8 80A7EA08 C7A400DC */ lwc1 $f4, 0x00DC($sp) -/* 005AC 80A7EA0C 460A0402 */ mul.s $f16, $f0, $f10 -/* 005B0 80A7EA10 46088480 */ add.s $f18, $f16, $f8 -/* 005B4 80A7EA14 46122180 */ add.s $f6, $f4, $f18 -/* 005B8 80A7EA18 0C01DE0D */ jal Math_Coss - ## coss? -/* 005BC 80A7EA1C E7A600DC */ swc1 $f6, 0x00DC($sp) -/* 005C0 80A7EA20 4600A402 */ mul.s $f16, $f20, $f0 -/* 005C4 80A7EA24 C7AA00E0 */ lwc1 $f10, 0x00E0($sp) -/* 005C8 80A7EA28 8FA400EC */ lw $a0, 0x00EC($sp) -/* 005CC 80A7EA2C 02A02825 */ or $a1, $s5, $zero ## $a1 = FFFFFFE4 -/* 005D0 80A7EA30 02803025 */ or $a2, $s4, $zero ## $a2 = FFFFFFF0 -/* 005D4 80A7EA34 03C03825 */ or $a3, $s8, $zero ## $a3 = 00000024 -/* 005D8 80A7EA38 2419001E */ addiu $t9, $zero, 0x001E ## $t9 = 0000001E -/* 005DC 80A7EA3C 46105200 */ add.s $f8, $f10, $f16 -/* 005E0 80A7EA40 24080005 */ addiu $t0, $zero, 0x0005 ## $t0 = 00000005 -/* 005E4 80A7EA44 240A0005 */ addiu $t2, $zero, 0x0005 ## $t2 = 00000005 -/* 005E8 80A7EA48 16400004 */ bne $s2, $zero, .L80A7EA5C -/* 005EC 80A7EA4C E7A800E0 */ swc1 $f8, 0x00E0($sp) -/* 005F0 80A7EA50 24020029 */ addiu $v0, $zero, 0x0029 ## $v0 = 00000029 -/* 005F4 80A7EA54 10000008 */ beq $zero, $zero, .L80A7EA78 -/* 005F8 80A7EA58 2403FE3E */ addiu $v1, $zero, 0xFE3E ## $v1 = FFFFFE3E -.L80A7EA5C: -/* 005FC 80A7EA5C 2A410004 */ slti $at, $s2, 0x0004 -/* 00600 80A7EA60 10200004 */ beq $at, $zero, .L80A7EA74 -/* 00604 80A7EA64 24020045 */ addiu $v0, $zero, 0x0045 ## $v0 = 00000045 -/* 00608 80A7EA68 24020025 */ addiu $v0, $zero, 0x0025 ## $v0 = 00000025 -/* 0060C 80A7EA6C 10000002 */ beq $zero, $zero, .L80A7EA78 -/* 00610 80A7EA70 2403FE84 */ addiu $v1, $zero, 0xFE84 ## $v1 = FFFFFE84 -.L80A7EA74: -/* 00614 80A7EA74 2403FEC0 */ addiu $v1, $zero, 0xFEC0 ## $v1 = FFFFFEC0 -.L80A7EA78: -/* 00618 80A7EA78 86690000 */ lh $t1, 0x0000($s3) ## 80A873A4 -/* 0061C 80A7EA7C 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 -/* 00620 80A7EA80 240C0046 */ addiu $t4, $zero, 0x0046 ## $t4 = 00000046 -/* 00624 80A7EA84 240D0002 */ addiu $t5, $zero, 0x0002 ## $t5 = 00000002 -/* 00628 80A7EA88 AFAD0038 */ sw $t5, 0x0038($sp) -/* 0062C 80A7EA8C AFAC0030 */ sw $t4, 0x0030($sp) -/* 00630 80A7EA90 AFAB002C */ sw $t3, 0x002C($sp) -/* 00634 80A7EA94 AFA30010 */ sw $v1, 0x0010($sp) -/* 00638 80A7EA98 AFA20014 */ sw $v0, 0x0014($sp) -/* 0063C 80A7EA9C AFB90018 */ sw $t9, 0x0018($sp) -/* 00640 80A7EAA0 AFA8001C */ sw $t0, 0x001C($sp) -/* 00644 80A7EAA4 AFA00020 */ sw $zero, 0x0020($sp) -/* 00648 80A7EAA8 AFAA0028 */ sw $t2, 0x0028($sp) -/* 0064C 80A7EAAC AFA00034 */ sw $zero, 0x0034($sp) -/* 00650 80A7EAB0 AFB6003C */ sw $s6, 0x003C($sp) -/* 00654 80A7EAB4 0C00A7A3 */ jal EffectSsKakera_Spawn - -/* 00658 80A7EAB8 AFA90024 */ sw $t1, 0x0024($sp) -/* 0065C 80A7EABC 26520001 */ addiu $s2, $s2, 0x0001 ## $s2 = 00000001 -/* 00660 80A7EAC0 1657FF7F */ bne $s2, $s7, .L80A7E8C0 -/* 00664 80A7EAC4 26730002 */ addiu $s3, $s3, 0x0002 ## $s3 = 80A873A6 -/* 00668 80A7EAC8 8FBF009C */ lw $ra, 0x009C($sp) -/* 0066C 80A7EACC D7B40048 */ ldc1 $f20, 0x0048($sp) -/* 00670 80A7EAD0 D7B60050 */ ldc1 $f22, 0x0050($sp) -/* 00674 80A7EAD4 D7B80058 */ ldc1 $f24, 0x0058($sp) -/* 00678 80A7EAD8 D7BA0060 */ ldc1 $f26, 0x0060($sp) -/* 0067C 80A7EADC D7BC0068 */ ldc1 $f28, 0x0068($sp) -/* 00680 80A7EAE0 D7BE0070 */ ldc1 $f30, 0x0070($sp) -/* 00684 80A7EAE4 8FB00078 */ lw $s0, 0x0078($sp) -/* 00688 80A7EAE8 8FB1007C */ lw $s1, 0x007C($sp) -/* 0068C 80A7EAEC 8FB20080 */ lw $s2, 0x0080($sp) -/* 00690 80A7EAF0 8FB30084 */ lw $s3, 0x0084($sp) -/* 00694 80A7EAF4 8FB40088 */ lw $s4, 0x0088($sp) -/* 00698 80A7EAF8 8FB5008C */ lw $s5, 0x008C($sp) -/* 0069C 80A7EAFC 8FB60090 */ lw $s6, 0x0090($sp) -/* 006A0 80A7EB00 8FB70094 */ lw $s7, 0x0094($sp) -/* 006A4 80A7EB04 8FBE0098 */ lw $s8, 0x0098($sp) -/* 006A8 80A7EB08 03E00008 */ jr $ra -/* 006AC 80A7EB0C 27BD00E8 */ addiu $sp, $sp, 0x00E8 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7EB10.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7EB10.s deleted file mode 100644 index c6fba244ce..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7EB10.s +++ /dev/null @@ -1,66 +0,0 @@ -glabel func_80A7EB10 -/* 006B0 80A7EB10 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 006B4 80A7EB14 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 006B8 80A7EB18 AFBF0024 */ sw $ra, 0x0024($sp) -/* 006BC 80A7EB1C AFA5003C */ sw $a1, 0x003C($sp) -/* 006C0 80A7EB20 24C50024 */ addiu $a1, $a2, 0x0024 ## $a1 = 00000024 -/* 006C4 80A7EB24 AFA60038 */ sw $a2, 0x0038($sp) -/* 006C8 80A7EB28 0C01DF90 */ jal Math_Vec3f_Copy - ## Vec3f_Copy -/* 006CC 80A7EB2C 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFF4 -/* 006D0 80A7EB30 8FA60038 */ lw $a2, 0x0038($sp) -/* 006D4 80A7EB34 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFF4 -/* 006D8 80A7EB38 24070003 */ addiu $a3, $zero, 0x0003 ## $a3 = 00000003 -/* 006DC 80A7EB3C 94C20088 */ lhu $v0, 0x0088($a2) ## 00000088 -/* 006E0 80A7EB40 24180050 */ addiu $t8, $zero, 0x0050 ## $t8 = 00000050 -/* 006E4 80A7EB44 2419003C */ addiu $t9, $zero, 0x003C ## $t9 = 0000003C -/* 006E8 80A7EB48 304E0001 */ andi $t6, $v0, 0x0001 ## $t6 = 00000000 -/* 006EC 80A7EB4C 11C00011 */ beq $t6, $zero, .L80A7EB94 -/* 006F0 80A7EB50 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 006F4 80A7EB54 C4C0005C */ lwc1 $f0, 0x005C($a2) ## 0000005C -/* 006F8 80A7EB58 C7A4002C */ lwc1 $f4, 0x002C($sp) -/* 006FC 80A7EB5C C7AA0030 */ lwc1 $f10, 0x0030($sp) -/* 00700 80A7EB60 46000180 */ add.s $f6, $f0, $f0 -/* 00704 80A7EB64 46062200 */ add.s $f8, $f4, $f6 -/* 00708 80A7EB68 C7A40034 */ lwc1 $f4, 0x0034($sp) -/* 0070C 80A7EB6C E7A8002C */ swc1 $f8, 0x002C($sp) -/* 00710 80A7EB70 C4C20060 */ lwc1 $f2, 0x0060($a2) ## 00000060 -/* 00714 80A7EB74 46021400 */ add.s $f16, $f2, $f2 -/* 00718 80A7EB78 46105481 */ sub.s $f18, $f10, $f16 -/* 0071C 80A7EB7C E7B20030 */ swc1 $f18, 0x0030($sp) -/* 00720 80A7EB80 C4CC0064 */ lwc1 $f12, 0x0064($a2) ## 00000064 -/* 00724 80A7EB84 460C6180 */ add.s $f6, $f12, $f12 -/* 00728 80A7EB88 46062200 */ add.s $f8, $f4, $f6 -/* 0072C 80A7EB8C 10000013 */ beq $zero, $zero, .L80A7EBDC -/* 00730 80A7EB90 E7A80034 */ swc1 $f8, 0x0034($sp) -.L80A7EB94: -/* 00734 80A7EB94 304F0008 */ andi $t7, $v0, 0x0008 ## $t7 = 00000000 -/* 00738 80A7EB98 51E00011 */ beql $t7, $zero, .L80A7EBE0 -/* 0073C 80A7EB9C 8FA4003C */ lw $a0, 0x003C($sp) -/* 00740 80A7EBA0 C4C0005C */ lwc1 $f0, 0x005C($a2) ## 0000005C -/* 00744 80A7EBA4 C7AA002C */ lwc1 $f10, 0x002C($sp) -/* 00748 80A7EBA8 C7A40030 */ lwc1 $f4, 0x0030($sp) -/* 0074C 80A7EBAC 46000400 */ add.s $f16, $f0, $f0 -/* 00750 80A7EBB0 46105481 */ sub.s $f18, $f10, $f16 -/* 00754 80A7EBB4 C7AA0034 */ lwc1 $f10, 0x0034($sp) -/* 00758 80A7EBB8 E7B2002C */ swc1 $f18, 0x002C($sp) -/* 0075C 80A7EBBC C4C20060 */ lwc1 $f2, 0x0060($a2) ## 00000060 -/* 00760 80A7EBC0 46021180 */ add.s $f6, $f2, $f2 -/* 00764 80A7EBC4 46062200 */ add.s $f8, $f4, $f6 -/* 00768 80A7EBC8 E7A80030 */ swc1 $f8, 0x0030($sp) -/* 0076C 80A7EBCC C4CC0064 */ lwc1 $f12, 0x0064($a2) ## 00000064 -/* 00770 80A7EBD0 460C6400 */ add.s $f16, $f12, $f12 -/* 00774 80A7EBD4 46105481 */ sub.s $f18, $f10, $f16 -/* 00778 80A7EBD8 E7B20034 */ swc1 $f18, 0x0034($sp) -.L80A7EBDC: -/* 0077C 80A7EBDC 8FA4003C */ lw $a0, 0x003C($sp) -.L80A7EBE0: -/* 00780 80A7EBE0 3C064270 */ lui $a2, 0x4270 ## $a2 = 42700000 -/* 00784 80A7EBE4 AFB80010 */ sw $t8, 0x0010($sp) -/* 00788 80A7EBE8 AFB90014 */ sw $t9, 0x0014($sp) -/* 0078C 80A7EBEC 0C00CD20 */ jal func_80033480 -/* 00790 80A7EBF0 AFA80018 */ sw $t0, 0x0018($sp) -/* 00794 80A7EBF4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00798 80A7EBF8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 0079C 80A7EBFC 03E00008 */ jr $ra -/* 007A0 80A7EC00 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7EC04.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7EC04.s deleted file mode 100644 index 4532294885..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7EC04.s +++ /dev/null @@ -1,66 +0,0 @@ -glabel func_80A7EC04 -/* 007A4 80A7EC04 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 007A8 80A7EC08 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 007AC 80A7EC0C AFBF0024 */ sw $ra, 0x0024($sp) -/* 007B0 80A7EC10 AFA5003C */ sw $a1, 0x003C($sp) -/* 007B4 80A7EC14 24C50024 */ addiu $a1, $a2, 0x0024 ## $a1 = 00000024 -/* 007B8 80A7EC18 AFA60038 */ sw $a2, 0x0038($sp) -/* 007BC 80A7EC1C 0C01DF90 */ jal Math_Vec3f_Copy - ## Vec3f_Copy -/* 007C0 80A7EC20 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFF4 -/* 007C4 80A7EC24 8FA60038 */ lw $a2, 0x0038($sp) -/* 007C8 80A7EC28 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFF4 -/* 007CC 80A7EC2C 2407000A */ addiu $a3, $zero, 0x000A ## $a3 = 0000000A -/* 007D0 80A7EC30 94C20088 */ lhu $v0, 0x0088($a2) ## 00000088 -/* 007D4 80A7EC34 241800B4 */ addiu $t8, $zero, 0x00B4 ## $t8 = 000000B4 -/* 007D8 80A7EC38 2419005A */ addiu $t9, $zero, 0x005A ## $t9 = 0000005A -/* 007DC 80A7EC3C 304E0001 */ andi $t6, $v0, 0x0001 ## $t6 = 00000000 -/* 007E0 80A7EC40 11C00011 */ beq $t6, $zero, .L80A7EC88 -/* 007E4 80A7EC44 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 007E8 80A7EC48 C4C0005C */ lwc1 $f0, 0x005C($a2) ## 0000005C -/* 007EC 80A7EC4C C7A4002C */ lwc1 $f4, 0x002C($sp) -/* 007F0 80A7EC50 C7AA0030 */ lwc1 $f10, 0x0030($sp) -/* 007F4 80A7EC54 46000180 */ add.s $f6, $f0, $f0 -/* 007F8 80A7EC58 46062200 */ add.s $f8, $f4, $f6 -/* 007FC 80A7EC5C C7A40034 */ lwc1 $f4, 0x0034($sp) -/* 00800 80A7EC60 E7A8002C */ swc1 $f8, 0x002C($sp) -/* 00804 80A7EC64 C4C20060 */ lwc1 $f2, 0x0060($a2) ## 00000060 -/* 00808 80A7EC68 46021400 */ add.s $f16, $f2, $f2 -/* 0080C 80A7EC6C 46105481 */ sub.s $f18, $f10, $f16 -/* 00810 80A7EC70 E7B20030 */ swc1 $f18, 0x0030($sp) -/* 00814 80A7EC74 C4CC0064 */ lwc1 $f12, 0x0064($a2) ## 00000064 -/* 00818 80A7EC78 460C6180 */ add.s $f6, $f12, $f12 -/* 0081C 80A7EC7C 46062200 */ add.s $f8, $f4, $f6 -/* 00820 80A7EC80 10000013 */ beq $zero, $zero, .L80A7ECD0 -/* 00824 80A7EC84 E7A80034 */ swc1 $f8, 0x0034($sp) -.L80A7EC88: -/* 00828 80A7EC88 304F0008 */ andi $t7, $v0, 0x0008 ## $t7 = 00000000 -/* 0082C 80A7EC8C 51E00011 */ beql $t7, $zero, .L80A7ECD4 -/* 00830 80A7EC90 8FA4003C */ lw $a0, 0x003C($sp) -/* 00834 80A7EC94 C4C0005C */ lwc1 $f0, 0x005C($a2) ## 0000005C -/* 00838 80A7EC98 C7AA002C */ lwc1 $f10, 0x002C($sp) -/* 0083C 80A7EC9C C7A40030 */ lwc1 $f4, 0x0030($sp) -/* 00840 80A7ECA0 46000400 */ add.s $f16, $f0, $f0 -/* 00844 80A7ECA4 46105481 */ sub.s $f18, $f10, $f16 -/* 00848 80A7ECA8 C7AA0034 */ lwc1 $f10, 0x0034($sp) -/* 0084C 80A7ECAC E7B2002C */ swc1 $f18, 0x002C($sp) -/* 00850 80A7ECB0 C4C20060 */ lwc1 $f2, 0x0060($a2) ## 00000060 -/* 00854 80A7ECB4 46021180 */ add.s $f6, $f2, $f2 -/* 00858 80A7ECB8 46062200 */ add.s $f8, $f4, $f6 -/* 0085C 80A7ECBC E7A80030 */ swc1 $f8, 0x0030($sp) -/* 00860 80A7ECC0 C4CC0064 */ lwc1 $f12, 0x0064($a2) ## 00000064 -/* 00864 80A7ECC4 460C6400 */ add.s $f16, $f12, $f12 -/* 00868 80A7ECC8 46105481 */ sub.s $f18, $f10, $f16 -/* 0086C 80A7ECCC E7B20034 */ swc1 $f18, 0x0034($sp) -.L80A7ECD0: -/* 00870 80A7ECD0 8FA4003C */ lw $a0, 0x003C($sp) -.L80A7ECD4: -/* 00874 80A7ECD4 3C06430C */ lui $a2, 0x430C ## $a2 = 430C0000 -/* 00878 80A7ECD8 AFB80010 */ sw $t8, 0x0010($sp) -/* 0087C 80A7ECDC AFB90014 */ sw $t9, 0x0014($sp) -/* 00880 80A7ECE0 0C00CD20 */ jal func_80033480 -/* 00884 80A7ECE4 AFA80018 */ sw $t0, 0x0018($sp) -/* 00888 80A7ECE8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0088C 80A7ECEC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00890 80A7ECF0 03E00008 */ jr $ra -/* 00894 80A7ECF4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7ECF8.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7ECF8.s deleted file mode 100644 index 9744605b2e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7ECF8.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_80A7ECF8 -/* 00898 80A7ECF8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0089C 80A7ECFC AFBF0014 */ sw $ra, 0x0014($sp) -/* 008A0 80A7ED00 AFA40018 */ sw $a0, 0x0018($sp) -/* 008A4 80A7ED04 AFA5001C */ sw $a1, 0x001C($sp) -/* 008A8 80A7ED08 8483001C */ lh $v1, 0x001C($a0) ## 0000001C -/* 008AC 80A7ED0C 8FA4001C */ lw $a0, 0x001C($sp) -/* 008B0 80A7ED10 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 008B4 80A7ED14 306F0001 */ andi $t7, $v1, 0x0001 ## $t7 = 00000000 -/* 008B8 80A7ED18 15E0000D */ bne $t7, $zero, .L80A7ED50 -/* 008BC 80A7ED1C 00031203 */ sra $v0, $v1, 8 -/* 008C0 80A7ED20 3042000F */ andi $v0, $v0, 0x000F ## $v0 = 00000000 -/* 008C4 80A7ED24 00021400 */ sll $v0, $v0, 16 -/* 008C8 80A7ED28 00021403 */ sra $v0, $v0, 16 -/* 008CC 80A7ED2C 2841000D */ slti $at, $v0, 0x000D -/* 008D0 80A7ED30 14200002 */ bne $at, $zero, .L80A7ED3C -/* 008D4 80A7ED34 8FA60018 */ lw $a2, 0x0018($sp) -/* 008D8 80A7ED38 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A7ED3C: -/* 008DC 80A7ED3C 00403825 */ or $a3, $v0, $zero ## $a3 = 00000000 -/* 008E0 80A7ED40 00073D00 */ sll $a3, $a3, 20 -/* 008E4 80A7ED44 00073C03 */ sra $a3, $a3, 16 -/* 008E8 80A7ED48 0C007E50 */ jal Item_DropCollectibleRandom - -/* 008EC 80A7ED4C 24C60024 */ addiu $a2, $a2, 0x0024 ## $a2 = 00000024 -.L80A7ED50: -/* 008F0 80A7ED50 8FBF0014 */ lw $ra, 0x0014($sp) -/* 008F4 80A7ED54 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 008F8 80A7ED58 03E00008 */ jr $ra -/* 008FC 80A7ED5C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7ED60.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7ED60.s deleted file mode 100644 index d69d255519..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7ED60.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80A7ED60 -/* 00900 80A7ED60 C4840060 */ lwc1 $f4, 0x0060($a0) ## 00000060 -/* 00904 80A7ED64 C486006C */ lwc1 $f6, 0x006C($a0) ## 0000006C -/* 00908 80A7ED68 C4800070 */ lwc1 $f0, 0x0070($a0) ## 00000070 -/* 0090C 80A7ED6C 46062200 */ add.s $f8, $f4, $f6 -/* 00910 80A7ED70 E4880060 */ swc1 $f8, 0x0060($a0) ## 00000060 -/* 00914 80A7ED74 C48A0060 */ lwc1 $f10, 0x0060($a0) ## 00000060 -/* 00918 80A7ED78 4600503C */ c.lt.s $f10, $f0 -/* 0091C 80A7ED7C 00000000 */ nop -/* 00920 80A7ED80 45000002 */ bc1f .L80A7ED8C -/* 00924 80A7ED84 00000000 */ nop -/* 00928 80A7ED88 E4800060 */ swc1 $f0, 0x0060($a0) ## 00000060 -.L80A7ED8C: -/* 0092C 80A7ED8C 03E00008 */ jr $ra -/* 00930 80A7ED90 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7ED94.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7ED94.s deleted file mode 100644 index 115f85c196..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7ED94.s +++ /dev/null @@ -1,44 +0,0 @@ -.late_rodata -glabel D_80A87474 - .float 0.2 - -glabel D_80A87478 - .float 0.1 - -.text -glabel func_80A7ED94 -/* 00934 80A7ED94 44856000 */ mtc1 $a1, $f12 ## $f12 = 0.00 -/* 00938 80A7ED98 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0093C 80A7ED9C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00940 80A7EDA0 AFA40018 */ sw $a0, 0x0018($sp) -/* 00944 80A7EDA4 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00948 80A7EDA8 E7AC001C */ swc1 $f12, 0x001C($sp) -/* 0094C 80A7EDAC 3C0180A8 */ lui $at, %hi(D_80A87474) ## $at = 80A80000 -/* 00950 80A7EDB0 C4247474 */ lwc1 $f4, %lo(D_80A87474)($at) -/* 00954 80A7EDB4 3C0180A8 */ lui $at, %hi(D_80A87478) ## $at = 80A80000 -/* 00958 80A7EDB8 C4287478 */ lwc1 $f8, %lo(D_80A87478)($at) -/* 0095C 80A7EDBC 46040182 */ mul.s $f6, $f0, $f4 -/* 00960 80A7EDC0 C7AC001C */ lwc1 $f12, 0x001C($sp) -/* 00964 80A7EDC4 8FA40018 */ lw $a0, 0x0018($sp) -/* 00968 80A7EDC8 C4820000 */ lwc1 $f2, 0x0000($a0) ## 00000000 -/* 0096C 80A7EDCC C48E0004 */ lwc1 $f14, 0x0004($a0) ## 00000004 -/* 00970 80A7EDD0 46083281 */ sub.s $f10, $f6, $f8 -/* 00974 80A7EDD4 C4900008 */ lwc1 $f16, 0x0008($a0) ## 00000008 -/* 00978 80A7EDD8 460C5482 */ mul.s $f18, $f10, $f12 -/* 0097C 80A7EDDC 46126300 */ add.s $f12, $f12, $f18 -/* 00980 80A7EDE0 460C1102 */ mul.s $f4, $f2, $f12 -/* 00984 80A7EDE4 00000000 */ nop -/* 00988 80A7EDE8 460C7202 */ mul.s $f8, $f14, $f12 -/* 0098C 80A7EDEC 00000000 */ nop -/* 00990 80A7EDF0 460C8482 */ mul.s $f18, $f16, $f12 -/* 00994 80A7EDF4 46041181 */ sub.s $f6, $f2, $f4 -/* 00998 80A7EDF8 46087281 */ sub.s $f10, $f14, $f8 -/* 0099C 80A7EDFC E4860000 */ swc1 $f6, 0x0000($a0) ## 00000000 -/* 009A0 80A7EE00 46128101 */ sub.s $f4, $f16, $f18 -/* 009A4 80A7EE04 E48A0004 */ swc1 $f10, 0x0004($a0) ## 00000004 -/* 009A8 80A7EE08 E4840008 */ swc1 $f4, 0x0008($a0) ## 00000008 -/* 009AC 80A7EE0C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 009B0 80A7EE10 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 009B4 80A7EE14 03E00008 */ jr $ra -/* 009B8 80A7EE18 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7EE1C.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7EE1C.s deleted file mode 100644 index efe738100f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7EE1C.s +++ /dev/null @@ -1,57 +0,0 @@ -.late_rodata -glabel D_80A8747C - .word 0x477FFF00 - -.text -glabel func_80A7EE1C -/* 009BC 80A7EE1C 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 009C0 80A7EE20 AFB40048 */ sw $s4, 0x0048($sp) -/* 009C4 80A7EE24 AFB30044 */ sw $s3, 0x0044($sp) -/* 009C8 80A7EE28 AFB20040 */ sw $s2, 0x0040($sp) -/* 009CC 80A7EE2C AFB1003C */ sw $s1, 0x003C($sp) -/* 009D0 80A7EE30 AFB00038 */ sw $s0, 0x0038($sp) -/* 009D4 80A7EE34 F7B40030 */ sdc1 $f20, 0x0030($sp) -/* 009D8 80A7EE38 3C0180A8 */ lui $at, %hi(D_80A8747C) ## $at = 80A80000 -/* 009DC 80A7EE3C 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 009E0 80A7EE40 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 009E4 80A7EE44 AFBF004C */ sw $ra, 0x004C($sp) -/* 009E8 80A7EE48 C434747C */ lwc1 $f20, %lo(D_80A8747C)($at) -/* 009EC 80A7EE4C 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 -/* 009F0 80A7EE50 24B31C24 */ addiu $s3, $a1, 0x1C24 ## $s3 = 00001C24 -/* 009F4 80A7EE54 24140003 */ addiu $s4, $zero, 0x0003 ## $s4 = 00000003 -.L80A7EE58: -/* 009F8 80A7EE58 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 009FC 80A7EE5C 00000000 */ nop -/* 00A00 80A7EE60 46140202 */ mul.s $f8, $f0, $f20 -/* 00A04 80A7EE64 C6240028 */ lwc1 $f4, 0x0028($s1) ## 00000028 -/* 00A08 80A7EE68 8E270024 */ lw $a3, 0x0024($s1) ## 00000024 -/* 00A0C 80A7EE6C 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 00A10 80A7EE70 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00A14 80A7EE74 C626002C */ lwc1 $f6, 0x002C($s1) ## 0000002C -/* 00A18 80A7EE78 AFB80024 */ sw $t8, 0x0024($sp) -/* 00A1C 80A7EE7C 4600428D */ trunc.w.s $f10, $f8 -/* 00A20 80A7EE80 AFA00020 */ sw $zero, 0x0020($sp) -/* 00A24 80A7EE84 AFA00018 */ sw $zero, 0x0018($sp) -/* 00A28 80A7EE88 02602025 */ or $a0, $s3, $zero ## $a0 = 00001C24 -/* 00A2C 80A7EE8C 440F5000 */ mfc1 $t7, $f10 -/* 00A30 80A7EE90 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 00A34 80A7EE94 24060020 */ addiu $a2, $zero, 0x0020 ## $a2 = 00000020 -/* 00A38 80A7EE98 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 00A3C 80A7EE9C 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 00A40 80A7EEA0 AFAF001C */ sw $t7, 0x001C($sp) -/* 00A44 80A7EEA4 10400003 */ beq $v0, $zero, .L80A7EEB4 -/* 00A48 80A7EEA8 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 00A4C 80A7EEAC 1614FFEA */ bne $s0, $s4, .L80A7EE58 -/* 00A50 80A7EEB0 00000000 */ nop -.L80A7EEB4: -/* 00A54 80A7EEB4 8FBF004C */ lw $ra, 0x004C($sp) -/* 00A58 80A7EEB8 D7B40030 */ ldc1 $f20, 0x0030($sp) -/* 00A5C 80A7EEBC 8FB00038 */ lw $s0, 0x0038($sp) -/* 00A60 80A7EEC0 8FB1003C */ lw $s1, 0x003C($sp) -/* 00A64 80A7EEC4 8FB20040 */ lw $s2, 0x0040($sp) -/* 00A68 80A7EEC8 8FB30044 */ lw $s3, 0x0044($sp) -/* 00A6C 80A7EECC 8FB40048 */ lw $s4, 0x0048($sp) -/* 00A70 80A7EED0 03E00008 */ jr $ra -/* 00A74 80A7EED4 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F098.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F098.s deleted file mode 100644 index 302f9be6d7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F098.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_80A7F098 -/* 00C38 80A7F098 3C0E80A8 */ lui $t6, %hi(func_80A7F0A8) ## $t6 = 80A80000 -/* 00C3C 80A7F09C 25CEF0A8 */ addiu $t6, $t6, %lo(func_80A7F0A8) ## $t6 = 80A7F0A8 -/* 00C40 80A7F0A0 03E00008 */ jr $ra -/* 00C44 80A7F0A4 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F0A8.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F0A8.s deleted file mode 100644 index 4a340b8a59..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F0A8.s +++ /dev/null @@ -1,159 +0,0 @@ -glabel func_80A7F0A8 -/* 00C48 80A7F0A8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00C4C 80A7F0AC AFBF0024 */ sw $ra, 0x0024($sp) -/* 00C50 80A7F0B0 AFB10020 */ sw $s1, 0x0020($sp) -/* 00C54 80A7F0B4 AFB0001C */ sw $s0, 0x001C($sp) -/* 00C58 80A7F0B8 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 00C5C 80A7F0BC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00C60 80A7F0C0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00C64 80A7F0C4 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 00C68 80A7F0C8 0C00BD04 */ jal Actor_HasParent -/* 00C6C 80A7F0CC A7AF0032 */ sh $t7, 0x0032($sp) -/* 00C70 80A7F0D0 50400017 */ beql $v0, $zero, .L80A7F130 -/* 00C74 80A7F0D4 920B0161 */ lbu $t3, 0x0161($s0) ## 00000161 -/* 00C78 80A7F0D8 0C29FCBE */ jal func_80A7F2F8 -/* 00C7C 80A7F0DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C80 80A7F0E0 87B80032 */ lh $t8, 0x0032($sp) -/* 00C84 80A7F0E4 3C0780A8 */ lui $a3, %hi(D_80A873E0) ## $a3 = 80A80000 -/* 00C88 80A7F0E8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00C8C 80A7F0EC 0018C840 */ sll $t9, $t8, 1 -/* 00C90 80A7F0F0 00F93821 */ addu $a3, $a3, $t9 -/* 00C94 80A7F0F4 94E773E0 */ lhu $a3, %lo(D_80A873E0)($a3) -/* 00C98 80A7F0F8 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 00C9C 80A7F0FC 0C01AEB6 */ jal Audio_PlaySoundAtPosition - -/* 00CA0 80A7F100 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 00CA4 80A7F104 8608001C */ lh $t0, 0x001C($s0) ## 0000001C -/* 00CA8 80A7F108 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00CAC 80A7F10C 00084903 */ sra $t1, $t0, 4 -/* 00CB0 80A7F110 312A0001 */ andi $t2, $t1, 0x0001 ## $t2 = 00000000 -/* 00CB4 80A7F114 51400074 */ beql $t2, $zero, .L80A7F2E8 -/* 00CB8 80A7F118 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00CBC 80A7F11C 0C29FB87 */ jal func_80A7EE1C -/* 00CC0 80A7F120 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00CC4 80A7F124 10000070 */ beq $zero, $zero, .L80A7F2E8 -/* 00CC8 80A7F128 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00CCC 80A7F12C 920B0161 */ lbu $t3, 0x0161($s0) ## 00000161 -.L80A7F130: -/* 00CD0 80A7F130 87AD0032 */ lh $t5, 0x0032($sp) -/* 00CD4 80A7F134 316C0002 */ andi $t4, $t3, 0x0002 ## $t4 = 00000000 -/* 00CD8 80A7F138 5180002F */ beql $t4, $zero, .L80A7F1F8 -/* 00CDC 80A7F13C 3C014416 */ lui $at, 0x4416 ## $at = 44160000 -/* 00CE0 80A7F140 55A0002D */ bnel $t5, $zero, .L80A7F1F8 -/* 00CE4 80A7F144 3C014416 */ lui $at, 0x4416 ## $at = 44160000 -/* 00CE8 80A7F148 8E0E018C */ lw $t6, 0x018C($s0) ## 0000018C -/* 00CEC 80A7F14C 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 00CF0 80A7F150 34210048 */ ori $at, $at, 0x0048 ## $at = 40000048 -/* 00CF4 80A7F154 8DCF0000 */ lw $t7, 0x0000($t6) ## 00000000 -/* 00CF8 80A7F158 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00CFC 80A7F15C 01E1C024 */ and $t8, $t7, $at -/* 00D00 80A7F160 53000025 */ beql $t8, $zero, .L80A7F1F8 -/* 00D04 80A7F164 3C014416 */ lui $at, 0x4416 ## $at = 44160000 -/* 00D08 80A7F168 0C29FB3E */ jal func_80A7ECF8 -/* 00D0C 80A7F16C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00D10 80A7F170 87A20032 */ lh $v0, 0x0032($sp) -/* 00D14 80A7F174 3C0680A8 */ lui $a2, %hi(D_80A84AD4) ## $a2 = 80A80000 -/* 00D18 80A7F178 3C0780A8 */ lui $a3, %hi(D_80A7FA30) ## $a3 = 80A80000 -/* 00D1C 80A7F17C 0002C840 */ sll $t9, $v0, 1 -/* 00D20 80A7F180 00F93821 */ addu $a3, $a3, $t9 -/* 00D24 80A7F184 00C23021 */ addu $a2, $a2, $v0 -/* 00D28 80A7F188 90C64AD4 */ lbu $a2, %lo(D_80A84AD4)($a2) -/* 00D2C 80A7F18C 94E7FA30 */ lhu $a3, %lo(D_80A7FA30)($a3) -/* 00D30 80A7F190 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00D34 80A7F194 0C01AEB6 */ jal Audio_PlaySoundAtPosition - -/* 00D38 80A7F198 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 00D3C 80A7F19C 87A20032 */ lh $v0, 0x0032($sp) -/* 00D40 80A7F1A0 3C1980A8 */ lui $t9, %hi(D_80A87328) ## $t9 = 80A80000 -/* 00D44 80A7F1A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D48 80A7F1A8 00021080 */ sll $v0, $v0, 2 -/* 00D4C 80A7F1AC 0322C821 */ addu $t9, $t9, $v0 -/* 00D50 80A7F1B0 8F397328 */ lw $t9, %lo(D_80A87328)($t9) -/* 00D54 80A7F1B4 AFA2002C */ sw $v0, 0x002C($sp) -/* 00D58 80A7F1B8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00D5C 80A7F1BC 0320F809 */ jalr $ra, $t9 -/* 00D60 80A7F1C0 00000000 */ nop -/* 00D64 80A7F1C4 8FA2002C */ lw $v0, 0x002C($sp) -/* 00D68 80A7F1C8 3C1980A8 */ lui $t9, %hi(D_80A87330) ## $t9 = 80A80000 -/* 00D6C 80A7F1CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D70 80A7F1D0 0322C821 */ addu $t9, $t9, $v0 -/* 00D74 80A7F1D4 8F397330 */ lw $t9, %lo(D_80A87330)($t9) -/* 00D78 80A7F1D8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00D7C 80A7F1DC 0320F809 */ jalr $ra, $t9 -/* 00D80 80A7F1E0 00000000 */ nop -/* 00D84 80A7F1E4 0C00B55C */ jal Actor_Kill - -/* 00D88 80A7F1E8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D8C 80A7F1EC 1000003E */ beq $zero, $zero, .L80A7F2E8 -/* 00D90 80A7F1F0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00D94 80A7F1F4 3C014416 */ lui $at, 0x4416 ## $at = 44160000 -.L80A7F1F8: -/* 00D98 80A7F1F8 44813000 */ mtc1 $at, $f6 ## $f6 = 600.00 -/* 00D9C 80A7F1FC C6040090 */ lwc1 $f4, 0x0090($s0) ## 00000090 -/* 00DA0 80A7F200 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00DA4 80A7F204 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 -/* 00DA8 80A7F208 4606203C */ c.lt.s $f4, $f6 -/* 00DAC 80A7F20C 00000000 */ nop -/* 00DB0 80A7F210 45020035 */ bc1fl .L80A7F2E8 -/* 00DB4 80A7F214 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00DB8 80A7F218 0C0189B7 */ jal Collider_CylinderUpdate - -/* 00DBC 80A7F21C AFA5002C */ sw $a1, 0x002C($sp) -/* 00DC0 80A7F220 92080161 */ lbu $t0, 0x0161($s0) ## 00000161 -/* 00DC4 80A7F224 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00DC8 80A7F228 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 00DCC 80A7F22C 3109FFFD */ andi $t1, $t0, 0xFFFD ## $t1 = 00000000 -/* 00DD0 80A7F230 A2090161 */ sb $t1, 0x0161($s0) ## 00000161 -/* 00DD4 80A7F234 02212821 */ addu $a1, $s1, $at -/* 00DD8 80A7F238 AFA50028 */ sw $a1, 0x0028($sp) -/* 00DDC 80A7F23C 8FA6002C */ lw $a2, 0x002C($sp) -/* 00DE0 80A7F240 0C01767D */ jal CollisionCheck_SetAC - ## CollisionCheck_setAC -/* 00DE4 80A7F244 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00DE8 80A7F248 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 -/* 00DEC 80A7F24C 44815000 */ mtc1 $at, $f10 ## $f10 = 400.00 -/* 00DF0 80A7F250 C6080090 */ lwc1 $f8, 0x0090($s0) ## 00000090 -/* 00DF4 80A7F254 8FA50028 */ lw $a1, 0x0028($sp) -/* 00DF8 80A7F258 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00DFC 80A7F25C 460A403C */ c.lt.s $f8, $f10 -/* 00E00 80A7F260 00000000 */ nop -/* 00E04 80A7F264 45020020 */ bc1fl .L80A7F2E8 -/* 00E08 80A7F268 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00E0C 80A7F26C 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOT -/* 00E10 80A7F270 8FA6002C */ lw $a2, 0x002C($sp) -/* 00E14 80A7F274 3C0142B4 */ lui $at, 0x42B4 ## $at = 42B40000 -/* 00E18 80A7F278 44819000 */ mtc1 $at, $f18 ## $f18 = 90.00 -/* 00E1C 80A7F27C C6100090 */ lwc1 $f16, 0x0090($s0) ## 00000090 -/* 00E20 80A7F280 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00E24 80A7F284 87AA0032 */ lh $t2, 0x0032($sp) -/* 00E28 80A7F288 4612803C */ c.lt.s $f16, $f18 -/* 00E2C 80A7F28C 00000000 */ nop -/* 00E30 80A7F290 45020015 */ bc1fl .L80A7F2E8 -/* 00E34 80A7F294 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00E38 80A7F298 1541000B */ bne $t2, $at, .L80A7F2C8 -/* 00E3C 80A7F29C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E40 80A7F2A0 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00E44 80A7F2A4 44812000 */ mtc1 $at, $f4 ## $f4 = 20.00 -/* 00E48 80A7F2A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E4C 80A7F2AC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00E50 80A7F2B0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00E54 80A7F2B4 3C0742A0 */ lui $a3, 0x42A0 ## $a3 = 42A00000 -/* 00E58 80A7F2B8 0C00BD0D */ jal func_8002F434 -/* 00E5C 80A7F2BC E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00E60 80A7F2C0 10000009 */ beq $zero, $zero, .L80A7F2E8 -/* 00E64 80A7F2C4 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A7F2C8: -/* 00E68 80A7F2C8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00E6C 80A7F2CC 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 -/* 00E70 80A7F2D0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00E74 80A7F2D4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00E78 80A7F2D8 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 -/* 00E7C 80A7F2DC 0C00BD0D */ jal func_8002F434 -/* 00E80 80A7F2E0 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00E84 80A7F2E4 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A7F2E8: -/* 00E88 80A7F2E8 8FB0001C */ lw $s0, 0x001C($sp) -/* 00E8C 80A7F2EC 8FB10020 */ lw $s1, 0x0020($sp) -/* 00E90 80A7F2F0 03E00008 */ jr $ra -/* 00E94 80A7F2F4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F2F8.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F2F8.s deleted file mode 100644 index a5237ed4b1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F2F8.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80A7F2F8 -/* 00E98 80A7F2F8 8C980004 */ lw $t8, 0x0004($a0) ## 00000004 -/* 00E9C 80A7F2FC 3C0E80A8 */ lui $t6, %hi(func_80A7F31C) ## $t6 = 80A80000 -/* 00EA0 80A7F300 25CEF31C */ addiu $t6, $t6, %lo(func_80A7F31C) ## $t6 = 80A7F31C -/* 00EA4 80A7F304 240FFFFF */ addiu $t7, $zero, 0xFFFF ## $t7 = FFFFFFFF -/* 00EA8 80A7F308 37190010 */ ori $t9, $t8, 0x0010 ## $t9 = 00000010 -/* 00EAC 80A7F30C AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 00EB0 80A7F310 A08F0003 */ sb $t7, 0x0003($a0) ## 00000003 -/* 00EB4 80A7F314 03E00008 */ jr $ra -/* 00EB8 80A7F318 AC990004 */ sw $t9, 0x0004($a0) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F31C.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F31C.s deleted file mode 100644 index c12214bdb8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F31C.s +++ /dev/null @@ -1,55 +0,0 @@ -glabel func_80A7F31C -/* 00EBC 80A7F31C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00EC0 80A7F320 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00EC4 80A7F324 AFB00020 */ sw $s0, 0x0020($sp) -/* 00EC8 80A7F328 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00ECC 80A7F32C 0C00BD68 */ jal Actor_HasNoParent -/* 00ED0 80A7F330 AFA5002C */ sw $a1, 0x002C($sp) -/* 00ED4 80A7F334 10400027 */ beq $v0, $zero, .L80A7F3D4 -/* 00ED8 80A7F338 8FAE002C */ lw $t6, 0x002C($sp) -/* 00EDC 80A7F33C 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 00EE0 80A7F340 3C0F0001 */ lui $t7, 0x0001 ## $t7 = 00010000 -/* 00EE4 80A7F344 01EE7821 */ addu $t7, $t7, $t6 -/* 00EE8 80A7F348 81EF1CBC */ lb $t7, 0x1CBC($t7) ## 00011CBC -/* 00EEC 80A7F34C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00EF0 80A7F350 30580001 */ andi $t8, $v0, 0x0001 ## $t8 = 00000000 -/* 00EF4 80A7F354 17010008 */ bne $t8, $at, .L80A7F378 -/* 00EF8 80A7F358 A20F0003 */ sb $t7, 0x0003($s0) ## 00000003 -/* 00EFC 80A7F35C 0002CA83 */ sra $t9, $v0, 10 -/* 00F00 80A7F360 00024983 */ sra $t1, $v0, 6 -/* 00F04 80A7F364 312A0003 */ andi $t2, $t1, 0x0003 ## $t2 = 00000000 -/* 00F08 80A7F368 3328003C */ andi $t0, $t9, 0x003C ## $t0 = 00000000 -/* 00F0C 80A7F36C 010A2825 */ or $a1, $t0, $t2 ## $a1 = 00000000 -/* 00F10 80A7F370 0C00B2DD */ jal Flags_SetSwitch - -/* 00F14 80A7F374 8FA4002C */ lw $a0, 0x002C($sp) -.L80A7F378: -/* 00F18 80A7F378 0C29FCFA */ jal func_80A7F3E8 -/* 00F1C 80A7F37C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F20 80A7F380 0C29FB58 */ jal func_80A7ED60 -/* 00F24 80A7F384 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F28 80A7F388 860B001C */ lh $t3, 0x001C($s0) ## 0000001C -/* 00F2C 80A7F38C 3C0580A8 */ lui $a1, %hi(D_80A7FA28) ## $a1 = 80A80000 -/* 00F30 80A7F390 2604005C */ addiu $a0, $s0, 0x005C ## $a0 = 0000005C -/* 00F34 80A7F394 316C0001 */ andi $t4, $t3, 0x0001 ## $t4 = 00000000 -/* 00F38 80A7F398 000C6880 */ sll $t5, $t4, 2 -/* 00F3C 80A7F39C 00AD2821 */ addu $a1, $a1, $t5 -/* 00F40 80A7F3A0 0C29FB65 */ jal func_80A7ED94 -/* 00F44 80A7F3A4 8CA5FA28 */ lw $a1, %lo(D_80A7FA28)($a1) -/* 00F48 80A7F3A8 0C00B5FB */ jal func_8002D7EC -/* 00F4C 80A7F3AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F50 80A7F3B0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00F54 80A7F3B4 240E00C5 */ addiu $t6, $zero, 0x00C5 ## $t6 = 000000C5 -/* 00F58 80A7F3B8 AFAE0014 */ sw $t6, 0x0014($sp) -/* 00F5C 80A7F3BC 8FA4002C */ lw $a0, 0x002C($sp) -/* 00F60 80A7F3C0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00F64 80A7F3C4 3C0640F0 */ lui $a2, 0x40F0 ## $a2 = 40F00000 -/* 00F68 80A7F3C8 3C07420C */ lui $a3, 0x420C ## $a3 = 420C0000 -/* 00F6C 80A7F3CC 0C00B92D */ jal func_8002E4B4 -/* 00F70 80A7F3D0 E7A40010 */ swc1 $f4, 0x0010($sp) -.L80A7F3D4: -/* 00F74 80A7F3D4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00F78 80A7F3D8 8FB00020 */ lw $s0, 0x0020($sp) -/* 00F7C 80A7F3DC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00F80 80A7F3E0 03E00008 */ jr $ra -/* 00F84 80A7F3E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F3E8.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F3E8.s deleted file mode 100644 index ab476da1a8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F3E8.s +++ /dev/null @@ -1,84 +0,0 @@ -glabel func_80A7F3E8 -/* 00F88 80A7F3E8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00F8C 80A7F3EC AFB00018 */ sw $s0, 0x0018($sp) -/* 00F90 80A7F3F0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00F94 80A7F3F4 AFBF001C */ sw $ra, 0x001C($sp) -/* 00F98 80A7F3F8 0C01DE1C */ jal Math_Sins - ## sins? -/* 00F9C 80A7F3FC 84840032 */ lh $a0, 0x0032($a0) ## 00000032 -/* 00FA0 80A7F400 C6040068 */ lwc1 $f4, 0x0068($s0) ## 00000068 -/* 00FA4 80A7F404 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -/* 00FA8 80A7F408 46040182 */ mul.s $f6, $f0, $f4 -/* 00FAC 80A7F40C 0C01DE0D */ jal Math_Coss - ## coss? -/* 00FB0 80A7F410 E606005C */ swc1 $f6, 0x005C($s0) ## 0000005C -/* 00FB4 80A7F414 C6080068 */ lwc1 $f8, 0x0068($s0) ## 00000068 -/* 00FB8 80A7F418 860E001C */ lh $t6, 0x001C($s0) ## 0000001C -/* 00FBC 80A7F41C 46080282 */ mul.s $f10, $f0, $f8 -/* 00FC0 80A7F420 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 00FC4 80A7F424 15E00019 */ bne $t7, $zero, .L80A7F48C -/* 00FC8 80A7F428 E60A0064 */ swc1 $f10, 0x0064($s0) ## 00000064 -/* 00FCC 80A7F42C 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00FD0 80A7F430 00000000 */ nop -/* 00FD4 80A7F434 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00FD8 80A7F438 44818000 */ mtc1 $at, $f16 ## $f16 = 0.50 -/* 00FDC 80A7F43C 3C01467A */ lui $at, 0x467A ## $at = 467A0000 -/* 00FE0 80A7F440 44812000 */ mtc1 $at, $f4 ## $f4 = 16000.00 -/* 00FE4 80A7F444 46100481 */ sub.s $f18, $f0, $f16 -/* 00FE8 80A7F448 3C0180A8 */ lui $at, %hi(D_80A7F9F0) ## $at = 80A80000 -/* 00FEC 80A7F44C 46049182 */ mul.s $f6, $f18, $f4 -/* 00FF0 80A7F450 4600320D */ trunc.w.s $f8, $f6 -/* 00FF4 80A7F454 44194000 */ mfc1 $t9, $f8 -/* 00FF8 80A7F458 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00FFC 80A7F45C A439F9F0 */ sh $t9, %lo(D_80A7F9F0)($at) -/* 01000 80A7F460 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 01004 80A7F464 44815000 */ mtc1 $at, $f10 ## $f10 = 0.50 -/* 01008 80A7F468 3C014516 */ lui $at, 0x4516 ## $at = 45160000 -/* 0100C 80A7F46C 44819000 */ mtc1 $at, $f18 ## $f18 = 2400.00 -/* 01010 80A7F470 460A0401 */ sub.s $f16, $f0, $f10 -/* 01014 80A7F474 3C0180A8 */ lui $at, %hi(D_80A7F9F4) ## $at = 80A80000 -/* 01018 80A7F478 46128102 */ mul.s $f4, $f16, $f18 -/* 0101C 80A7F47C 4600218D */ trunc.w.s $f6, $f4 -/* 01020 80A7F480 44093000 */ mfc1 $t1, $f6 -/* 01024 80A7F484 10000019 */ beq $zero, $zero, .L80A7F4EC -/* 01028 80A7F488 A429F9F4 */ sh $t1, %lo(D_80A7F9F4)($at) -.L80A7F48C: -/* 0102C 80A7F48C 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 01030 80A7F490 00000000 */ nop -/* 01034 80A7F494 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 01038 80A7F498 44814000 */ mtc1 $at, $f8 ## $f8 = 0.50 -/* 0103C 80A7F49C 3C0145FA */ lui $at, 0x45FA ## $at = 45FA0000 -/* 01040 80A7F4A0 44818000 */ mtc1 $at, $f16 ## $f16 = 8000.00 -/* 01044 80A7F4A4 46080281 */ sub.s $f10, $f0, $f8 -/* 01048 80A7F4A8 3C0180A8 */ lui $at, %hi(D_80A7F9F0) ## $at = 80A80000 -/* 0104C 80A7F4AC 46105482 */ mul.s $f18, $f10, $f16 -/* 01050 80A7F4B0 4600910D */ trunc.w.s $f4, $f18 -/* 01054 80A7F4B4 440B2000 */ mfc1 $t3, $f4 -/* 01058 80A7F4B8 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 0105C 80A7F4BC A42BF9F0 */ sh $t3, %lo(D_80A7F9F0)($at) -/* 01060 80A7F4C0 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 01064 80A7F4C4 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 -/* 01068 80A7F4C8 3C0144C8 */ lui $at, 0x44C8 ## $at = 44C80000 -/* 0106C 80A7F4CC 44815000 */ mtc1 $at, $f10 ## $f10 = 1600.00 -/* 01070 80A7F4D0 46060201 */ sub.s $f8, $f0, $f6 -/* 01074 80A7F4D4 3C0180A8 */ lui $at, %hi(D_80A7F9F4) ## $at = 80A80000 -/* 01078 80A7F4D8 460A4402 */ mul.s $f16, $f8, $f10 -/* 0107C 80A7F4DC 4600848D */ trunc.w.s $f18, $f16 -/* 01080 80A7F4E0 440D9000 */ mfc1 $t5, $f18 -/* 01084 80A7F4E4 00000000 */ nop -/* 01088 80A7F4E8 A42DF9F4 */ sh $t5, %lo(D_80A7F9F4)($at) -.L80A7F4EC: -/* 0108C 80A7F4EC 3C0F80A8 */ lui $t7, %hi(func_80A7F514) ## $t7 = 80A80000 -/* 01090 80A7F4F0 240E00F0 */ addiu $t6, $zero, 0x00F0 ## $t6 = 000000F0 -/* 01094 80A7F4F4 25EFF514 */ addiu $t7, $t7, %lo(func_80A7F514) ## $t7 = 80A7F514 -/* 01098 80A7F4F8 A20E00AE */ sb $t6, 0x00AE($s0) ## 000000AE -/* 0109C 80A7F4FC AE0F014C */ sw $t7, 0x014C($s0) ## 0000014C -/* 010A0 80A7F500 8FBF001C */ lw $ra, 0x001C($sp) -/* 010A4 80A7F504 8FB00018 */ lw $s0, 0x0018($sp) -/* 010A8 80A7F508 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 010AC 80A7F50C 03E00008 */ jr $ra -/* 010B0 80A7F510 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F514.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F514.s deleted file mode 100644 index 9207591352..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F514.s +++ /dev/null @@ -1,232 +0,0 @@ -glabel func_80A7F514 -/* 010B4 80A7F514 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 010B8 80A7F518 AFBF0024 */ sw $ra, 0x0024($sp) -/* 010BC 80A7F51C AFB10020 */ sw $s1, 0x0020($sp) -/* 010C0 80A7F520 AFB0001C */ sw $s0, 0x001C($sp) -/* 010C4 80A7F524 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 010C8 80A7F528 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 010CC 80A7F52C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 010D0 80A7F530 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 010D4 80A7F534 A7AF004A */ sh $t7, 0x004A($sp) -/* 010D8 80A7F538 94820088 */ lhu $v0, 0x0088($a0) ## 00000088 -/* 010DC 80A7F53C 30580009 */ andi $t8, $v0, 0x0009 ## $t8 = 00000000 -/* 010E0 80A7F540 13000049 */ beq $t8, $zero, .L80A7F668 -/* 010E4 80A7F544 30480040 */ andi $t0, $v0, 0x0040 ## $t0 = 00000000 -/* 010E8 80A7F548 0C29FB3E */ jal func_80A7ECF8 -/* 010EC 80A7F54C 00000000 */ nop -/* 010F0 80A7F550 87A2004A */ lh $v0, 0x004A($sp) -/* 010F4 80A7F554 3C1980A8 */ lui $t9, %hi(D_80A87328) ## $t9 = 80A80000 -/* 010F8 80A7F558 27397328 */ addiu $t9, $t9, %lo(D_80A87328) ## $t9 = 80A87328 -/* 010FC 80A7F55C 00021080 */ sll $v0, $v0, 2 -/* 01100 80A7F560 00591821 */ addu $v1, $v0, $t9 -/* 01104 80A7F564 8C790000 */ lw $t9, 0x0000($v1) ## 00000000 -/* 01108 80A7F568 AFA3002C */ sw $v1, 0x002C($sp) -/* 0110C 80A7F56C AFA20030 */ sw $v0, 0x0030($sp) -/* 01110 80A7F570 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01114 80A7F574 0320F809 */ jalr $ra, $t9 -/* 01118 80A7F578 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0111C 80A7F57C 96080088 */ lhu $t0, 0x0088($s0) ## 00000088 -/* 01120 80A7F580 87A2004A */ lh $v0, 0x004A($sp) -/* 01124 80A7F584 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01128 80A7F588 31090020 */ andi $t1, $t0, 0x0020 ## $t1 = 00000000 -/* 0112C 80A7F58C 15200011 */ bne $t1, $zero, .L80A7F5D4 -/* 01130 80A7F590 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 01134 80A7F594 3C0680A8 */ lui $a2, %hi(D_80A84AD4) ## $a2 = 80A80000 -/* 01138 80A7F598 00025040 */ sll $t2, $v0, 1 -/* 0113C 80A7F59C 3C0780A8 */ lui $a3, %hi(D_80A7FA30) ## $a3 = 80A80000 -/* 01140 80A7F5A0 00EA3821 */ addu $a3, $a3, $t2 -/* 01144 80A7F5A4 00C23021 */ addu $a2, $a2, $v0 -/* 01148 80A7F5A8 90C64AD4 */ lbu $a2, %lo(D_80A84AD4)($a2) -/* 0114C 80A7F5AC 0C01AEB6 */ jal Audio_PlaySoundAtPosition - -/* 01150 80A7F5B0 94E7FA30 */ lhu $a3, %lo(D_80A7FA30)($a3) -/* 01154 80A7F5B4 8FAB0030 */ lw $t3, 0x0030($sp) -/* 01158 80A7F5B8 3C1980A8 */ lui $t9, %hi(D_80A87330) ## $t9 = 80A80000 -/* 0115C 80A7F5BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01160 80A7F5C0 032BC821 */ addu $t9, $t9, $t3 -/* 01164 80A7F5C4 8F397330 */ lw $t9, %lo(D_80A87330)($t9) -/* 01168 80A7F5C8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0116C 80A7F5CC 0320F809 */ jalr $ra, $t9 -/* 01170 80A7F5D0 00000000 */ nop -.L80A7F5D4: -/* 01174 80A7F5D4 8FAC002C */ lw $t4, 0x002C($sp) -/* 01178 80A7F5D8 3C0D80A8 */ lui $t5, %hi(D_80A8732C) ## $t5 = 80A80000 -/* 0117C 80A7F5DC 25AD732C */ addiu $t5, $t5, %lo(D_80A8732C) ## $t5 = 80A8732C -/* 01180 80A7F5E0 158D001D */ bne $t4, $t5, .L80A7F658 -/* 01184 80A7F5E4 00000000 */ nop -/* 01188 80A7F5E8 862E07A0 */ lh $t6, 0x07A0($s1) ## 000007A0 -/* 0118C 80A7F5EC 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 01190 80A7F5F0 000E7880 */ sll $t7, $t6, 2 -/* 01194 80A7F5F4 022FC021 */ addu $t8, $s1, $t7 -/* 01198 80A7F5F8 0C024BE2 */ jal Quake_Add -/* 0119C 80A7F5FC 8F040790 */ lw $a0, 0x0790($t8) ## 00000790 -/* 011A0 80A7F600 00022400 */ sll $a0, $v0, 16 -/* 011A4 80A7F604 AFA20040 */ sw $v0, 0x0040($sp) -/* 011A8 80A7F608 00042403 */ sra $a0, $a0, 16 -/* 011AC 80A7F60C 0C024B6B */ jal Quake_SetSpeed -/* 011B0 80A7F610 2405C350 */ addiu $a1, $zero, 0xC350 ## $a1 = FFFFC350 -/* 011B4 80A7F614 87B10042 */ lh $s1, 0x0042($sp) -/* 011B8 80A7F618 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 011BC 80A7F61C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 011C0 80A7F620 00112400 */ sll $a0, $s1, 16 -/* 011C4 80A7F624 00042403 */ sra $a0, $a0, 16 -/* 011C8 80A7F628 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 011CC 80A7F62C 0C024B9C */ jal Quake_SetQuakeValues -/* 011D0 80A7F630 AFA00010 */ sw $zero, 0x0010($sp) -/* 011D4 80A7F634 00112400 */ sll $a0, $s1, 16 -/* 011D8 80A7F638 00042403 */ sra $a0, $a0, 16 -/* 011DC 80A7F63C 0C024B7C */ jal Quake_SetCountdown -/* 011E0 80A7F640 24050007 */ addiu $a1, $zero, 0x0007 ## $a1 = 00000007 -/* 011E4 80A7F644 C60C008C */ lwc1 $f12, 0x008C($s0) ## 0000008C -/* 011E8 80A7F648 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF -/* 011EC 80A7F64C 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 011F0 80A7F650 0C02A800 */ jal func_800AA000 -/* 011F4 80A7F654 24070096 */ addiu $a3, $zero, 0x0096 ## $a3 = 00000096 -.L80A7F658: -/* 011F8 80A7F658 0C00B55C */ jal Actor_Kill - -/* 011FC 80A7F65C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01200 80A7F660 10000082 */ beq $zero, $zero, .L80A7F86C -/* 01204 80A7F664 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A7F668: -/* 01208 80A7F668 51000053 */ beql $t0, $zero, .L80A7F7B8 -/* 0120C 80A7F66C 260400BC */ addiu $a0, $s0, 0x00BC ## $a0 = 000000BC -/* 01210 80A7F670 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 01214 80A7F674 2409015E */ addiu $t1, $zero, 0x015E ## $t1 = 0000015E -/* 01218 80A7F678 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0121C 80A7F67C E7A40034 */ swc1 $f4, 0x0034($sp) -/* 01220 80A7F680 C6080084 */ lwc1 $f8, 0x0084($s0) ## 00000084 -/* 01224 80A7F684 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 01228 80A7F688 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFE4 -/* 0122C 80A7F68C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01230 80A7F690 46083280 */ add.s $f10, $f6, $f8 -/* 01234 80A7F694 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01238 80A7F698 E7AA0038 */ swc1 $f10, 0x0038($sp) -/* 0123C 80A7F69C C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C -/* 01240 80A7F6A0 AFA90014 */ sw $t1, 0x0014($sp) -/* 01244 80A7F6A4 AFA00010 */ sw $zero, 0x0010($sp) -/* 01248 80A7F6A8 0C00A527 */ jal EffectSsGSplash_Spawn -/* 0124C 80A7F6AC E7B0003C */ swc1 $f16, 0x003C($sp) -/* 01250 80A7F6B0 87AA004A */ lh $t2, 0x004A($sp) -/* 01254 80A7F6B4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01258 80A7F6B8 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFE4 -/* 0125C 80A7F6BC 15400017 */ bne $t2, $zero, .L80A7F71C -/* 01260 80A7F6C0 2406012C */ addiu $a2, $zero, 0x012C ## $a2 = 0000012C -/* 01264 80A7F6C4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01268 80A7F6C8 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFE4 -/* 0126C 80A7F6CC 24060096 */ addiu $a2, $zero, 0x0096 ## $a2 = 00000096 -/* 01270 80A7F6D0 2407028A */ addiu $a3, $zero, 0x028A ## $a3 = 0000028A -/* 01274 80A7F6D4 0C00A511 */ jal EffectSsGRipple_Spawn -/* 01278 80A7F6D8 AFA00010 */ sw $zero, 0x0010($sp) -/* 0127C 80A7F6DC 240B0004 */ addiu $t3, $zero, 0x0004 ## $t3 = 00000004 -/* 01280 80A7F6E0 AFAB0010 */ sw $t3, 0x0010($sp) -/* 01284 80A7F6E4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01288 80A7F6E8 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFE4 -/* 0128C 80A7F6EC 24060190 */ addiu $a2, $zero, 0x0190 ## $a2 = 00000190 -/* 01290 80A7F6F0 0C00A511 */ jal EffectSsGRipple_Spawn -/* 01294 80A7F6F4 24070320 */ addiu $a3, $zero, 0x0320 ## $a3 = 00000320 -/* 01298 80A7F6F8 24190008 */ addiu $t9, $zero, 0x0008 ## $t9 = 00000008 -/* 0129C 80A7F6FC AFB90010 */ sw $t9, 0x0010($sp) -/* 012A0 80A7F700 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 012A4 80A7F704 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFE4 -/* 012A8 80A7F708 240601F4 */ addiu $a2, $zero, 0x01F4 ## $a2 = 000001F4 -/* 012AC 80A7F70C 0C00A511 */ jal EffectSsGRipple_Spawn -/* 012B0 80A7F710 2407044C */ addiu $a3, $zero, 0x044C ## $a3 = 0000044C -/* 012B4 80A7F714 10000013 */ beq $zero, $zero, .L80A7F764 -/* 012B8 80A7F718 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 -.L80A7F71C: -/* 012BC 80A7F71C 240702BC */ addiu $a3, $zero, 0x02BC ## $a3 = 000002BC -/* 012C0 80A7F720 0C00A511 */ jal EffectSsGRipple_Spawn -/* 012C4 80A7F724 AFA00010 */ sw $zero, 0x0010($sp) -/* 012C8 80A7F728 240C0004 */ addiu $t4, $zero, 0x0004 ## $t4 = 00000004 -/* 012CC 80A7F72C AFAC0010 */ sw $t4, 0x0010($sp) -/* 012D0 80A7F730 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 012D4 80A7F734 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFE4 -/* 012D8 80A7F738 240601F4 */ addiu $a2, $zero, 0x01F4 ## $a2 = 000001F4 -/* 012DC 80A7F73C 0C00A511 */ jal EffectSsGRipple_Spawn -/* 012E0 80A7F740 24070384 */ addiu $a3, $zero, 0x0384 ## $a3 = 00000384 -/* 012E4 80A7F744 240D0008 */ addiu $t5, $zero, 0x0008 ## $t5 = 00000008 -/* 012E8 80A7F748 AFAD0010 */ sw $t5, 0x0010($sp) -/* 012EC 80A7F74C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 012F0 80A7F750 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFE4 -/* 012F4 80A7F754 240601F4 */ addiu $a2, $zero, 0x01F4 ## $a2 = 000001F4 -/* 012F8 80A7F758 0C00A511 */ jal EffectSsGRipple_Spawn -/* 012FC 80A7F75C 24070514 */ addiu $a3, $zero, 0x0514 ## $a3 = 00000514 -/* 01300 80A7F760 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 -.L80A7F764: -/* 01304 80A7F764 44819000 */ mtc1 $at, $f18 ## $f18 = -6.00 -/* 01308 80A7F768 3C0280A8 */ lui $v0, %hi(D_80A7F9F0) ## $v0 = 80A80000 -/* 0130C 80A7F76C 3C0380A8 */ lui $v1, %hi(D_80A7F9F4) ## $v1 = 80A80000 -/* 01310 80A7F770 E6120070 */ swc1 $f18, 0x0070($s0) ## 00000070 -/* 01314 80A7F774 2463F9F4 */ addiu $v1, $v1, %lo(D_80A7F9F4) ## $v1 = 80A7F9F4 -/* 01318 80A7F778 2442F9F0 */ addiu $v0, $v0, %lo(D_80A7F9F0) ## $v0 = 80A7F9F0 -/* 0131C 80A7F77C 844E0000 */ lh $t6, 0x0000($v0) ## 80A7F9F0 -/* 01320 80A7F780 84780000 */ lh $t8, 0x0000($v1) ## 80A7F9F4 -/* 01324 80A7F784 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01328 80A7F788 000E7883 */ sra $t7, $t6, 2 -/* 0132C 80A7F78C 00184083 */ sra $t0, $t8, 2 -/* 01330 80A7F790 A44F0000 */ sh $t7, 0x0000($v0) ## 80A7F9F0 -/* 01334 80A7F794 A4680000 */ sh $t0, 0x0000($v1) ## 80A7F9F4 -/* 01338 80A7F798 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 0133C 80A7F79C 24060028 */ addiu $a2, $zero, 0x0028 ## $a2 = 00000028 -/* 01340 80A7F7A0 0C01AEB6 */ jal Audio_PlaySoundAtPosition - -/* 01344 80A7F7A4 240728C5 */ addiu $a3, $zero, 0x28C5 ## $a3 = 000028C5 -/* 01348 80A7F7A8 96090088 */ lhu $t1, 0x0088($s0) ## 00000088 -/* 0134C 80A7F7AC 312AFFBF */ andi $t2, $t1, 0xFFBF ## $t2 = 00000000 -/* 01350 80A7F7B0 A60A0088 */ sh $t2, 0x0088($s0) ## 00000088 -/* 01354 80A7F7B4 260400BC */ addiu $a0, $s0, 0x00BC ## $a0 = 000000BC -.L80A7F7B8: -/* 01358 80A7F7B8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 0135C 80A7F7BC 0C01DE80 */ jal Math_ApproxF - -/* 01360 80A7F7C0 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 -/* 01364 80A7F7C4 0C29FB58 */ jal func_80A7ED60 -/* 01368 80A7F7C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0136C 80A7F7CC 87AB004A */ lh $t3, 0x004A($sp) -/* 01370 80A7F7D0 3C0580A8 */ lui $a1, %hi(D_80A7FA28) ## $a1 = 80A80000 -/* 01374 80A7F7D4 2604005C */ addiu $a0, $s0, 0x005C ## $a0 = 0000005C -/* 01378 80A7F7D8 000BC880 */ sll $t9, $t3, 2 -/* 0137C 80A7F7DC 00B92821 */ addu $a1, $a1, $t9 -/* 01380 80A7F7E0 0C29FB65 */ jal func_80A7ED94 -/* 01384 80A7F7E4 8CA5FA28 */ lw $a1, %lo(D_80A7FA28)($a1) -/* 01388 80A7F7E8 0C00B5FB */ jal func_8002D7EC -/* 0138C 80A7F7EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01390 80A7F7F0 3C0D80A8 */ lui $t5, %hi(D_80A7F9F0) ## $t5 = 80A80000 -/* 01394 80A7F7F4 85ADF9F0 */ lh $t5, %lo(D_80A7F9F0)($t5) -/* 01398 80A7F7F8 860C00B4 */ lh $t4, 0x00B4($s0) ## 000000B4 -/* 0139C 80A7F7FC 3C1880A8 */ lui $t8, %hi(D_80A7F9F4) ## $t8 = 80A80000 -/* 013A0 80A7F800 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6 -/* 013A4 80A7F804 018D7021 */ addu $t6, $t4, $t5 -/* 013A8 80A7F808 A60E00B4 */ sh $t6, 0x00B4($s0) ## 000000B4 -/* 013AC 80A7F80C 8718F9F4 */ lh $t8, %lo(D_80A7F9F4)($t8) -/* 013B0 80A7F810 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 013B4 80A7F814 240900C5 */ addiu $t1, $zero, 0x00C5 ## $t1 = 000000C5 -/* 013B8 80A7F818 01F84021 */ addu $t0, $t7, $t8 -/* 013BC 80A7F81C A60800B6 */ sh $t0, 0x00B6($s0) ## 000000B6 -/* 013C0 80A7F820 AFA90014 */ sw $t1, 0x0014($sp) -/* 013C4 80A7F824 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 013C8 80A7F828 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 013CC 80A7F82C 3C0640F0 */ lui $a2, 0x40F0 ## $a2 = 40F00000 -/* 013D0 80A7F830 3C07420C */ lui $a3, 0x420C ## $a3 = 420C0000 -/* 013D4 80A7F834 0C00B92D */ jal func_8002E4B4 -/* 013D8 80A7F838 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 013DC 80A7F83C 26060150 */ addiu $a2, $s0, 0x0150 ## $a2 = 00000150 -/* 013E0 80A7F840 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000150 -/* 013E4 80A7F844 AFA60030 */ sw $a2, 0x0030($sp) -/* 013E8 80A7F848 0C0189B7 */ jal Collider_CylinderUpdate - -/* 013EC 80A7F84C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 013F0 80A7F850 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 013F4 80A7F854 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 013F8 80A7F858 8FA60030 */ lw $a2, 0x0030($sp) -/* 013FC 80A7F85C 02212821 */ addu $a1, $s1, $at -/* 01400 80A7F860 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOT -/* 01404 80A7F864 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01408 80A7F868 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A7F86C: -/* 0140C 80A7F86C 8FB0001C */ lw $s0, 0x001C($sp) -/* 01410 80A7F870 8FB10020 */ lw $s1, 0x0020($sp) -/* 01414 80A7F874 03E00008 */ jr $ra -/* 01418 80A7F878 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F8A0.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F8A0.s deleted file mode 100644 index d0ebbce452..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F8A0.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_80A7F8A0 -/* 01440 80A7F8A0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01444 80A7F8A4 AFA40018 */ sw $a0, 0x0018($sp) -/* 01448 80A7F8A8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0144C 80A7F8AC AFBF0014 */ sw $ra, 0x0014($sp) -/* 01450 80A7F8B0 3C050501 */ lui $a1, 0x0501 ## $a1 = 05010000 -/* 01454 80A7F8B4 0C00D498 */ jal Gfx_DrawDListOpa - -/* 01458 80A7F8B8 24A5A880 */ addiu $a1, $a1, 0xA880 ## $a1 = 0500A880 -/* 0145C 80A7F8BC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01460 80A7F8C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01464 80A7F8C4 03E00008 */ jr $ra -/* 01468 80A7F8C8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F8CC.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F8CC.s deleted file mode 100644 index bf77f25473..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F8CC.s +++ /dev/null @@ -1,72 +0,0 @@ -.rdata -glabel D_80A87428 - .asciz "../z_en_ishi.c" - .balign 4 - -glabel D_80A87438 - .asciz "../z_en_ishi.c" - .balign 4 - -glabel D_80A87448 - .asciz "../z_en_ishi.c" - .balign 4 - -.text -glabel func_80A7F8CC -/* 0146C 80A7F8CC 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 01470 80A7F8D0 AFBF001C */ sw $ra, 0x001C($sp) -/* 01474 80A7F8D4 AFB00018 */ sw $s0, 0x0018($sp) -/* 01478 80A7F8D8 AFA40048 */ sw $a0, 0x0048($sp) -/* 0147C 80A7F8DC AFA5004C */ sw $a1, 0x004C($sp) -/* 01480 80A7F8E0 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 01484 80A7F8E4 3C0680A8 */ lui $a2, %hi(D_80A87428) ## $a2 = 80A80000 -/* 01488 80A7F8E8 24C67428 */ addiu $a2, $a2, %lo(D_80A87428) ## $a2 = 80A87428 -/* 0148C 80A7F8EC 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFEC -/* 01490 80A7F8F0 2407041A */ addiu $a3, $zero, 0x041A ## $a3 = 0000041A -/* 01494 80A7F8F4 0C031AB1 */ jal Graph_OpenDisps -/* 01498 80A7F8F8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 0149C 80A7F8FC 8FAF004C */ lw $t7, 0x004C($sp) -/* 014A0 80A7F900 0C024F46 */ jal func_80093D18 -/* 014A4 80A7F904 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 014A8 80A7F908 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 014AC 80A7F90C 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 -/* 014B0 80A7F910 37390003 */ ori $t9, $t9, 0x0003 ## $t9 = DA380003 -/* 014B4 80A7F914 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 014B8 80A7F918 AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 -/* 014BC 80A7F91C AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 014C0 80A7F920 8FA8004C */ lw $t0, 0x004C($sp) -/* 014C4 80A7F924 3C0580A8 */ lui $a1, %hi(D_80A87438) ## $a1 = 80A80000 -/* 014C8 80A7F928 24A57438 */ addiu $a1, $a1, %lo(D_80A87438) ## $a1 = 80A87438 -/* 014CC 80A7F92C 8D040000 */ lw $a0, 0x0000($t0) ## 00000000 -/* 014D0 80A7F930 2406041F */ addiu $a2, $zero, 0x041F ## $a2 = 0000041F -/* 014D4 80A7F934 0C0346A2 */ jal Matrix_NewMtx -/* 014D8 80A7F938 AFA20030 */ sw $v0, 0x0030($sp) -/* 014DC 80A7F93C 8FA30030 */ lw $v1, 0x0030($sp) -/* 014E0 80A7F940 3C0AFA00 */ lui $t2, 0xFA00 ## $t2 = FA000000 -/* 014E4 80A7F944 240BFFFF */ addiu $t3, $zero, 0xFFFF ## $t3 = FFFFFFFF -/* 014E8 80A7F948 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 014EC 80A7F94C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 014F0 80A7F950 3C0E0501 */ lui $t6, 0x0501 ## $t6 = 05010000 -/* 014F4 80A7F954 25CEA3B8 */ addiu $t6, $t6, 0xA3B8 ## $t6 = 0500A3B8 -/* 014F8 80A7F958 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 014FC 80A7F95C AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 -/* 01500 80A7F960 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 01504 80A7F964 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 01508 80A7F968 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 0150C 80A7F96C 3C0DDE00 */ lui $t5, 0xDE00 ## $t5 = DE000000 -/* 01510 80A7F970 3C0680A8 */ lui $a2, %hi(D_80A87448) ## $a2 = 80A80000 -/* 01514 80A7F974 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 01518 80A7F978 AE0C02C0 */ sw $t4, 0x02C0($s0) ## 000002C0 -/* 0151C 80A7F97C AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 01520 80A7F980 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 01524 80A7F984 8FAF004C */ lw $t7, 0x004C($sp) -/* 01528 80A7F988 24C67448 */ addiu $a2, $a2, %lo(D_80A87448) ## $a2 = 80A87448 -/* 0152C 80A7F98C 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFEC -/* 01530 80A7F990 24070426 */ addiu $a3, $zero, 0x0426 ## $a3 = 00000426 -/* 01534 80A7F994 0C031AD5 */ jal Graph_CloseDisps -/* 01538 80A7F998 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 -/* 0153C 80A7F99C 8FBF001C */ lw $ra, 0x001C($sp) -/* 01540 80A7F9A0 8FB00018 */ lw $s0, 0x0018($sp) -/* 01544 80A7F9A4 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 01548 80A7F9A8 03E00008 */ jr $ra -/* 0154C 80A7F9AC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Destroy.s deleted file mode 100644 index d9121ad8de..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Destroy.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel EnKakasi_Destroy -/* 00000 80A8F170 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00004 80A8F174 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00008 80A8F178 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0000C 80A8F17C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00010 80A8F180 0C0170EB */ jal Collider_DestroyCylinder - -/* 00014 80A8F184 24C501BC */ addiu $a1, $a2, 0x01BC ## $a1 = 000001BC -/* 00018 80A8F188 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0001C 80A8F18C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00020 80A8F190 03E00008 */ jr $ra -/* 00024 80A8F194 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Draw.s deleted file mode 100644 index b9606bf0b8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Draw.s +++ /dev/null @@ -1,50 +0,0 @@ -.rdata -glabel D_80A8FEB8 - .asciz "\n\n" - .balign 4 - -glabel D_80A8FEBC - .asciz "\x1b[33m☆☆☆☆☆ フラグ！ ☆☆☆☆☆ %d\n\x1b[m" - .balign 4 - -.text -glabel EnKakasi_Draw -/* 00BE0 80A8FD50 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00BE4 80A8FD54 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* 00BE8 80A8FD58 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* 00BEC 80A8FD5C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00BF0 80A8FD60 AFA40028 */ sw $a0, 0x0028($sp) -/* 00BF4 80A8FD64 AFA5002C */ sw $a1, 0x002C($sp) -/* 00BF8 80A8FD68 85CF12DA */ lh $t7, 0x12DA($t6) ## 801612DA -/* 00BFC 80A8FD6C 3C0480A9 */ lui $a0, %hi(D_80A8FEB8) ## $a0 = 80A90000 -/* 00C00 80A8FD70 51E00009 */ beql $t7, $zero, .L80A8FD98 -/* 00C04 80A8FD74 8FB8002C */ lw $t8, 0x002C($sp) -/* 00C08 80A8FD78 0C00084C */ jal osSyncPrintf - -/* 00C0C 80A8FD7C 2484FEB8 */ addiu $a0, $a0, %lo(D_80A8FEB8) ## $a0 = 80A8FEB8 -/* 00C10 80A8FD80 3C0480A9 */ lui $a0, %hi(D_80A8FEBC) ## $a0 = 80A90000 -/* 00C14 80A8FD84 3C058016 */ lui $a1, %hi(gSaveContext+0xf40) -/* 00C18 80A8FD88 90A5F5A0 */ lbu $a1, %lo(gSaveContext+0xf40)($a1) -/* 00C1C 80A8FD8C 0C00084C */ jal osSyncPrintf - -/* 00C20 80A8FD90 2484FEBC */ addiu $a0, $a0, %lo(D_80A8FEBC) ## $a0 = 80A8FEBC -/* 00C24 80A8FD94 8FB8002C */ lw $t8, 0x002C($sp) -.L80A8FD98: -/* 00C28 80A8FD98 0C024F46 */ jal func_80093D18 -/* 00C2C 80A8FD9C 8F040000 */ lw $a0, 0x0000($t8) ## 00000000 -/* 00C30 80A8FDA0 8FA20028 */ lw $v0, 0x0028($sp) -/* 00C34 80A8FDA4 8FA4002C */ lw $a0, 0x002C($sp) -/* 00C38 80A8FDA8 8C450154 */ lw $a1, 0x0154($v0) ## 00000154 -/* 00C3C 80A8FDAC 8C460170 */ lw $a2, 0x0170($v0) ## 00000170 -/* 00C40 80A8FDB0 90470152 */ lbu $a3, 0x0152($v0) ## 00000152 -/* 00C44 80A8FDB4 AFA00014 */ sw $zero, 0x0014($sp) -/* 00C48 80A8FDB8 AFA00010 */ sw $zero, 0x0010($sp) -/* 00C4C 80A8FDBC 0C0286B2 */ jal SkelAnime_DrawSV -/* 00C50 80A8FDC0 AFA20018 */ sw $v0, 0x0018($sp) -/* 00C54 80A8FDC4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00C58 80A8FDC8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00C5C 80A8FDCC 03E00008 */ jr $ra -/* 00C60 80A8FDD0 00000000 */ nop -/* 00C64 80A8FDD4 00000000 */ nop -/* 00C68 80A8FDD8 00000000 */ nop -/* 00C6C 80A8FDDC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Init.s deleted file mode 100644 index 4b8541023d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Init.s +++ /dev/null @@ -1,77 +0,0 @@ -.rdata -glabel D_80A8FE30 - .asciz "\n\n" - .balign 4 - -glabel D_80A8FE34 - .asciz "\x1b[33m☆☆☆☆☆ Ｌｅｔ’ｓ ＤＡＮＣＥ！ ☆☆☆☆☆ %f\n\x1b[m" - .balign 4 - -.text -glabel EnKakasi_Init -/* 00028 80A8F198 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0002C 80A8F19C AFB00028 */ sw $s0, 0x0028($sp) -/* 00030 80A8F1A0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00034 80A8F1A4 AFBF002C */ sw $ra, 0x002C($sp) -/* 00038 80A8F1A8 3C0480A9 */ lui $a0, %hi(D_80A8FE30) ## $a0 = 80A90000 -/* 0003C 80A8F1AC AFA5003C */ sw $a1, 0x003C($sp) -/* 00040 80A8F1B0 0C00084C */ jal osSyncPrintf - -/* 00044 80A8F1B4 2484FE30 */ addiu $a0, $a0, %lo(D_80A8FE30) ## $a0 = 80A8FE30 -/* 00048 80A8F1B8 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 0004C 80A8F1BC 3C0480A9 */ lui $a0, %hi(D_80A8FE34) ## $a0 = 80A90000 -/* 00050 80A8F1C0 2484FE34 */ addiu $a0, $a0, %lo(D_80A8FE34) ## $a0 = 80A8FE34 -/* 00054 80A8F1C4 460021A1 */ cvt.d.s $f6, $f4 -/* 00058 80A8F1C8 44073000 */ mfc1 $a3, $f6 -/* 0005C 80A8F1CC 44063800 */ mfc1 $a2, $f7 -/* 00060 80A8F1D0 0C00084C */ jal osSyncPrintf - -/* 00064 80A8F1D4 00000000 */ nop -/* 00068 80A8F1D8 260501BC */ addiu $a1, $s0, 0x01BC ## $a1 = 000001BC -/* 0006C 80A8F1DC AFA50030 */ sw $a1, 0x0030($sp) -/* 00070 80A8F1E0 0C0170D9 */ jal Collider_InitCylinder - -/* 00074 80A8F1E4 8FA4003C */ lw $a0, 0x003C($sp) -/* 00078 80A8F1E8 3C0780A9 */ lui $a3, %hi(D_80A8FDE0) ## $a3 = 80A90000 -/* 0007C 80A8F1EC 8FA50030 */ lw $a1, 0x0030($sp) -/* 00080 80A8F1F0 24E7FDE0 */ addiu $a3, $a3, %lo(D_80A8FDE0) ## $a3 = 80A8FDE0 -/* 00084 80A8F1F4 8FA4003C */ lw $a0, 0x003C($sp) -/* 00088 80A8F1F8 0C01712B */ jal Collider_SetCylinder - -/* 0008C 80A8F1FC 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00090 80A8F200 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 -/* 00094 80A8F204 A20E001F */ sb $t6, 0x001F($s0) ## 0000001F -/* 00098 80A8F208 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 0009C 80A8F20C 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 000A0 80A8F210 24E70214 */ addiu $a3, $a3, 0x0214 ## $a3 = 06000214 -/* 000A4 80A8F214 24C665B0 */ addiu $a2, $a2, 0x65B0 ## $a2 = 060065B0 -/* 000A8 80A8F218 AFA00018 */ sw $zero, 0x0018($sp) -/* 000AC 80A8F21C AFA00014 */ sw $zero, 0x0014($sp) -/* 000B0 80A8F220 AFA00010 */ sw $zero, 0x0010($sp) -/* 000B4 80A8F224 8FA4003C */ lw $a0, 0x003C($sp) -/* 000B8 80A8F228 0C0291BE */ jal SkelAnime_InitSV -/* 000BC 80A8F22C 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 -/* 000C0 80A8F230 8A180030 */ lwl $t8, 0x0030($s0) ## 00000030 -/* 000C4 80A8F234 9A180033 */ lwr $t8, 0x0033($s0) ## 00000033 -/* 000C8 80A8F238 8E190004 */ lw $t9, 0x0004($s0) ## 00000004 -/* 000CC 80A8F23C 240900FF */ addiu $t1, $zero, 0x00FF ## $t1 = 000000FF -/* 000D0 80A8F240 AA1801AE */ swl $t8, 0x01AE($s0) ## 000001AE -/* 000D4 80A8F244 BA1801B1 */ swr $t8, 0x01B1($s0) ## 000001B1 -/* 000D8 80A8F248 96180034 */ lhu $t8, 0x0034($s0) ## 00000034 -/* 000DC 80A8F24C 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 -/* 000E0 80A8F250 37280400 */ ori $t0, $t9, 0x0400 ## $t0 = 00000400 -/* 000E4 80A8F254 AE080004 */ sw $t0, 0x0004($s0) ## 00000004 -/* 000E8 80A8F258 A20900AE */ sb $t1, 0x00AE($s0) ## 000000AE -/* 000EC 80A8F25C 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A -/* 000F0 80A8F260 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000F4 80A8F264 0C00B58B */ jal Actor_SetScale - -/* 000F8 80A8F268 A61801B2 */ sh $t8, 0x01B2($s0) ## 000001B2 -/* 000FC 80A8F26C 3C0A80A9 */ lui $t2, %hi(func_80A8F660) ## $t2 = 80A90000 -/* 00100 80A8F270 254AF660 */ addiu $t2, $t2, %lo(func_80A8F660) ## $t2 = 80A8F660 -/* 00104 80A8F274 AE0A014C */ sw $t2, 0x014C($s0) ## 0000014C -/* 00108 80A8F278 8FBF002C */ lw $ra, 0x002C($sp) -/* 0010C 80A8F27C 8FB00028 */ lw $s0, 0x0028($sp) -/* 00110 80A8F280 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00114 80A8F284 03E00008 */ jr $ra -/* 00118 80A8F288 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Update.s deleted file mode 100644 index 193a75281b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Update.s +++ /dev/null @@ -1,72 +0,0 @@ -glabel EnKakasi_Update -/* 00ADC 80A8FC4C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00AE0 80A8FC50 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00AE4 80A8FC54 AFB00020 */ sw $s0, 0x0020($sp) -/* 00AE8 80A8FC58 AFA5003C */ sw $a1, 0x003C($sp) -/* 00AEC 80A8FC5C 889900B4 */ lwl $t9, 0x00B4($a0) ## 000000B4 -/* 00AF0 80A8FC60 989900B7 */ lwr $t9, 0x00B7($a0) ## 000000B7 -/* 00AF4 80A8FC64 848E0198 */ lh $t6, 0x0198($a0) ## 00000198 -/* 00AF8 80A8FC68 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00AFC 80A8FC6C A8990030 */ swl $t9, 0x0030($a0) ## 00000030 -/* 00B00 80A8FC70 B8990033 */ swr $t9, 0x0033($a0) ## 00000033 -/* 00B04 80A8FC74 949900B8 */ lhu $t9, 0x00B8($a0) ## 000000B8 -/* 00B08 80A8FC78 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 00B0C 80A8FC7C A48F0198 */ sh $t7, 0x0198($a0) ## 00000198 -/* 00B10 80A8FC80 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 -/* 00B14 80A8FC84 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -/* 00B18 80A8FC88 00801025 */ or $v0, $a0, $zero ## $v0 = 00000000 -/* 00B1C 80A8FC8C A4990034 */ sh $t9, 0x0034($a0) ## 00000034 -.L80A8FC90: -/* 00B20 80A8FC90 8444019C */ lh $a0, 0x019C($v0) ## 0000019C -/* 00B24 80A8FC94 24630002 */ addiu $v1, $v1, 0x0002 ## $v1 = 00000002 -/* 00B28 80A8FC98 10800002 */ beq $a0, $zero, .L80A8FCA4 -/* 00B2C 80A8FC9C 2488FFFF */ addiu $t0, $a0, 0xFFFF ## $t0 = FFFFFFFF -/* 00B30 80A8FCA0 A448019C */ sh $t0, 0x019C($v0) ## 0000019C -.L80A8FCA4: -/* 00B34 80A8FCA4 1465FFFA */ bne $v1, $a1, .L80A8FC90 -/* 00B38 80A8FCA8 24420002 */ addiu $v0, $v0, 0x0002 ## $v0 = 00000002 -/* 00B3C 80A8FCAC 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 00B40 80A8FCB0 44810000 */ mtc1 $at, $f0 ## $f0 = 60.00 -/* 00B44 80A8FCB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B48 80A8FCB8 44050000 */ mfc1 $a1, $f0 -/* 00B4C 80A8FCBC 0C00B56E */ jal Actor_SetHeight - -/* 00B50 80A8FCC0 E60001B4 */ swc1 $f0, 0x01B4($s0) ## 000001B4 -/* 00B54 80A8FCC4 8E19014C */ lw $t9, 0x014C($s0) ## 0000014C -/* 00B58 80A8FCC8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B5C 80A8FCCC 8FA5003C */ lw $a1, 0x003C($sp) -/* 00B60 80A8FCD0 0320F809 */ jalr $ra, $t9 -/* 00B64 80A8FCD4 00000000 */ nop -/* 00B68 80A8FCD8 0C00B638 */ jal Actor_MoveForward - -/* 00B6C 80A8FCDC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B70 80A8FCE0 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 00B74 80A8FCE4 44810000 */ mtc1 $at, $f0 ## $f0 = 50.00 -/* 00B78 80A8FCE8 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 00B7C 80A8FCEC 44812000 */ mtc1 $at, $f4 ## $f4 = 100.00 -/* 00B80 80A8FCF0 2409001C */ addiu $t1, $zero, 0x001C ## $t1 = 0000001C -/* 00B84 80A8FCF4 44060000 */ mfc1 $a2, $f0 -/* 00B88 80A8FCF8 44070000 */ mfc1 $a3, $f0 -/* 00B8C 80A8FCFC AFA90014 */ sw $t1, 0x0014($sp) -/* 00B90 80A8FD00 8FA4003C */ lw $a0, 0x003C($sp) -/* 00B94 80A8FD04 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00B98 80A8FD08 0C00B92D */ jal func_8002E4B4 -/* 00B9C 80A8FD0C E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00BA0 80A8FD10 260601BC */ addiu $a2, $s0, 0x01BC ## $a2 = 000001BC -/* 00BA4 80A8FD14 00C02825 */ or $a1, $a2, $zero ## $a1 = 000001BC -/* 00BA8 80A8FD18 AFA60028 */ sw $a2, 0x0028($sp) -/* 00BAC 80A8FD1C 0C0189B7 */ jal Collider_CylinderUpdate - -/* 00BB0 80A8FD20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00BB4 80A8FD24 8FA4003C */ lw $a0, 0x003C($sp) -/* 00BB8 80A8FD28 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00BBC 80A8FD2C 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 00BC0 80A8FD30 8FA60028 */ lw $a2, 0x0028($sp) -/* 00BC4 80A8FD34 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOT -/* 00BC8 80A8FD38 00812821 */ addu $a1, $a0, $at -/* 00BCC 80A8FD3C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00BD0 80A8FD40 8FB00020 */ lw $s0, 0x0020($sp) -/* 00BD4 80A8FD44 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00BD8 80A8FD48 03E00008 */ jr $ra -/* 00BDC 80A8FD4C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F28C.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F28C.s deleted file mode 100644 index bf632a6635..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F28C.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_80A8F28C -/* 0011C 80A8F28C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00120 80A8F290 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00124 80A8F294 AFB00020 */ sw $s0, 0x0020($sp) -/* 00128 80A8F298 A48001AC */ sh $zero, 0x01AC($a0) ## 000001AC -/* 0012C 80A8F29C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00130 80A8F2A0 848E01AC */ lh $t6, 0x01AC($a0) ## 000001AC -/* 00134 80A8F2A4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00138 80A8F2A8 A48001A4 */ sh $zero, 0x01A4($a0) ## 000001A4 -/* 0013C 80A8F2AC 24840168 */ addiu $a0, $a0, 0x0168 ## $a0 = 00000168 -/* 00140 80A8F2B0 3C053F00 */ lui $a1, 0x3F00 ## $a1 = 3F000000 -/* 00144 80A8F2B4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00148 80A8F2B8 E4840004 */ swc1 $f4, 0x0004($a0) ## 0000016C -/* 0014C 80A8F2BC 0C01E123 */ jal Math_SmoothDownscaleMaxF - -/* 00150 80A8F2C0 A48E0040 */ sh $t6, 0x0040($a0) ## 000001A8 -/* 00154 80A8F2C4 860501AE */ lh $a1, 0x01AE($s0) ## 000001AE -/* 00158 80A8F2C8 AFA00010 */ sw $zero, 0x0010($sp) -/* 0015C 80A8F2CC 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 00160 80A8F2D0 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 00164 80A8F2D4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00168 80A8F2D8 24072710 */ addiu $a3, $zero, 0x2710 ## $a3 = 00002710 -/* 0016C 80A8F2DC 860501B0 */ lh $a1, 0x01B0($s0) ## 000001B0 -/* 00170 80A8F2E0 AFA00010 */ sw $zero, 0x0010($sp) -/* 00174 80A8F2E4 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 00178 80A8F2E8 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 0017C 80A8F2EC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00180 80A8F2F0 24072710 */ addiu $a3, $zero, 0x2710 ## $a3 = 00002710 -/* 00184 80A8F2F4 860501B2 */ lh $a1, 0x01B2($s0) ## 000001B2 -/* 00188 80A8F2F8 AFA00010 */ sw $zero, 0x0010($sp) -/* 0018C 80A8F2FC 260400B8 */ addiu $a0, $s0, 0x00B8 ## $a0 = 000000B8 -/* 00190 80A8F300 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 00194 80A8F304 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00198 80A8F308 24072710 */ addiu $a3, $zero, 0x2710 ## $a3 = 00002710 -/* 0019C 80A8F30C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 001A0 80A8F310 8FB00020 */ lw $s0, 0x0020($sp) -/* 001A4 80A8F314 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 001A8 80A8F318 03E00008 */ jr $ra -/* 001AC 80A8F31C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F320.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F320.s deleted file mode 100644 index e285b72775..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F320.s +++ /dev/null @@ -1,253 +0,0 @@ -.late_rodata -glabel D_80A8FEE8 - .word 0x412FD70A -glabel D_80A8FEEC - .word 0x409FAE14 -glabel D_80A8FEF0 - .word 0x403F5C29 -glabel jtbl_80A8FEF4 -.word L80A8F3D8 -.word L80A8F408 -.word L80A8F424 -.word L80A8F444 -.word L80A8F464 -.word 0x00000000, 0x00000000 - -.text -glabel func_80A8F320 -/* 001B0 80A8F320 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 001B4 80A8F324 AFA60030 */ sw $a2, 0x0030($sp) -/* 001B8 80A8F328 00063400 */ sll $a2, $a2, 16 -/* 001BC 80A8F32C 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 001C0 80A8F330 00063403 */ sra $a2, $a2, 16 -/* 001C4 80A8F334 AFBF0024 */ sw $ra, 0x0024($sp) -/* 001C8 80A8F338 AFB00020 */ sw $s0, 0x0020($sp) -/* 001CC 80A8F33C 00451021 */ addu $v0, $v0, $a1 -/* 001D0 80A8F340 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 001D4 80A8F344 10C0001C */ beq $a2, $zero, .L80A8F3B8 -/* 001D8 80A8F348 904204E8 */ lbu $v0, 0x04E8($v0) ## 000104E8 -/* 001DC 80A8F34C 848E01A2 */ lh $t6, 0x01A2($a0) ## 000001A2 -/* 001E0 80A8F350 3C0180A9 */ lui $at, %hi(D_80A8FEE8) ## $at = 80A90000 -/* 001E4 80A8F354 15C0000F */ bne $t6, $zero, .L80A8F394 -/* 001E8 80A8F358 00000000 */ nop -/* 001EC 80A8F35C 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 001F0 80A8F360 C42CFEE8 */ lwc1 $f12, %lo(D_80A8FEE8)($at) -/* 001F4 80A8F364 4600010D */ trunc.w.s $f4, $f0 -/* 001F8 80A8F368 3C0180A9 */ lui $at, %hi(D_80A8FEEC) ## $at = 80A90000 -/* 001FC 80A8F36C 44082000 */ mfc1 $t0, $f4 -/* 00200 80A8F370 00000000 */ nop -/* 00204 80A8F374 2509001E */ addiu $t1, $t0, 0x001E ## $t1 = 0000001E -/* 00208 80A8F378 A60901A2 */ sh $t1, 0x01A2($s0) ## 000001A2 -/* 0020C 80A8F37C 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 00210 80A8F380 C42CFEEC */ lwc1 $f12, %lo(D_80A8FEEC)($at) -/* 00214 80A8F384 4600018D */ trunc.w.s $f6, $f0 -/* 00218 80A8F388 440B3000 */ mfc1 $t3, $f6 -/* 0021C 80A8F38C 00000000 */ nop -/* 00220 80A8F390 A60B01A6 */ sh $t3, 0x01A6($s0) ## 000001A6 -.L80A8F394: -/* 00224 80A8F394 3C0180A9 */ lui $at, %hi(D_80A8FEF0) ## $at = 80A90000 -/* 00228 80A8F398 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 0022C 80A8F39C C42CFEF0 */ lwc1 $f12, %lo(D_80A8FEF0)($at) -/* 00230 80A8F3A0 4600020D */ trunc.w.s $f8, $f0 -/* 00234 80A8F3A4 860201A6 */ lh $v0, 0x01A6($s0) ## 000001A6 -/* 00238 80A8F3A8 440F4000 */ mfc1 $t7, $f8 -/* 0023C 80A8F3AC 00000000 */ nop -/* 00240 80A8F3B0 25F80005 */ addiu $t8, $t7, 0x0005 ## $t8 = 00000005 -/* 00244 80A8F3B4 A618019A */ sh $t8, 0x019A($s0) ## 0000019A -.L80A8F3B8: -/* 00248 80A8F3B8 2C410005 */ sltiu $at, $v0, 0x0005 -/* 0024C 80A8F3BC 1020002F */ beq $at, $zero, .L80A8F47C -/* 00250 80A8F3C0 0002C880 */ sll $t9, $v0, 2 -/* 00254 80A8F3C4 3C0180A9 */ lui $at, %hi(jtbl_80A8FEF4) ## $at = 80A90000 -/* 00258 80A8F3C8 00390821 */ addu $at, $at, $t9 -/* 0025C 80A8F3CC 8C39FEF4 */ lw $t9, %lo(jtbl_80A8FEF4)($at) -/* 00260 80A8F3D0 03200008 */ jr $t9 -/* 00264 80A8F3D4 00000000 */ nop -glabel L80A8F3D8 -/* 00268 80A8F3D8 8608019A */ lh $t0, 0x019A($s0) ## 0000019A -/* 0026C 80A8F3DC 860A01A4 */ lh $t2, 0x01A4($s0) ## 000001A4 -/* 00270 80A8F3E0 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 00274 80A8F3E4 25090001 */ addiu $t1, $t0, 0x0001 ## $t1 = 00000001 -/* 00278 80A8F3E8 15400024 */ bne $t2, $zero, .L80A8F47C -/* 0027C 80A8F3EC A609019A */ sh $t1, 0x019A($s0) ## 0000019A -/* 00280 80A8F3F0 A60B01A4 */ sh $t3, 0x01A4($s0) ## 000001A4 -/* 00284 80A8F3F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00288 80A8F3F8 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0028C 80A8F3FC 2405286B */ addiu $a1, $zero, 0x286B ## $a1 = 0000286B -/* 00290 80A8F400 1000001F */ beq $zero, $zero, .L80A8F480 -/* 00294 80A8F404 8602019A */ lh $v0, 0x019A($s0) ## 0000019A -glabel L80A8F408 -/* 00298 80A8F408 860C019A */ lh $t4, 0x019A($s0) ## 0000019A -/* 0029C 80A8F40C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 002A0 80A8F410 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 -/* 002A4 80A8F414 258D0001 */ addiu $t5, $t4, 0x0001 ## $t5 = 00000001 -/* 002A8 80A8F418 A60D019A */ sh $t5, 0x019A($s0) ## 0000019A -/* 002AC 80A8F41C 10000017 */ beq $zero, $zero, .L80A8F47C -/* 002B0 80A8F420 E60A01B8 */ swc1 $f10, 0x01B8($s0) ## 000001B8 -glabel L80A8F424 -/* 002B4 80A8F424 860E019A */ lh $t6, 0x019A($s0) ## 0000019A -/* 002B8 80A8F428 861801AC */ lh $t8, 0x01AC($s0) ## 000001AC -/* 002BC 80A8F42C 24191388 */ addiu $t9, $zero, 0x1388 ## $t9 = 00001388 -/* 002C0 80A8F430 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 002C4 80A8F434 17000011 */ bne $t8, $zero, .L80A8F47C -/* 002C8 80A8F438 A60F019A */ sh $t7, 0x019A($s0) ## 0000019A -/* 002CC 80A8F43C 1000000F */ beq $zero, $zero, .L80A8F47C -/* 002D0 80A8F440 A61901AC */ sh $t9, 0x01AC($s0) ## 000001AC -glabel L80A8F444 -/* 002D4 80A8F444 8608019A */ lh $t0, 0x019A($s0) ## 0000019A -/* 002D8 80A8F448 860A01A8 */ lh $t2, 0x01A8($s0) ## 000001A8 -/* 002DC 80A8F44C 240B1388 */ addiu $t3, $zero, 0x1388 ## $t3 = 00001388 -/* 002E0 80A8F450 25090001 */ addiu $t1, $t0, 0x0001 ## $t1 = 00000001 -/* 002E4 80A8F454 15400009 */ bne $t2, $zero, .L80A8F47C -/* 002E8 80A8F458 A609019A */ sh $t1, 0x019A($s0) ## 0000019A -/* 002EC 80A8F45C 10000007 */ beq $zero, $zero, .L80A8F47C -/* 002F0 80A8F460 A60B01A8 */ sh $t3, 0x01A8($s0) ## 000001A8 -glabel L80A8F464 -/* 002F4 80A8F464 860C019A */ lh $t4, 0x019A($s0) ## 0000019A -/* 002F8 80A8F468 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 002FC 80A8F46C 44818000 */ mtc1 $at, $f16 ## $f16 = 2.00 -/* 00300 80A8F470 258D0001 */ addiu $t5, $t4, 0x0001 ## $t5 = 00000001 -/* 00304 80A8F474 A60D019A */ sh $t5, 0x019A($s0) ## 0000019A -/* 00308 80A8F478 E61001B8 */ swc1 $f16, 0x01B8($s0) ## 000001B8 -.L80A8F47C: -/* 0030C 80A8F47C 8602019A */ lh $v0, 0x019A($s0) ## 0000019A -.L80A8F480: -/* 00310 80A8F480 240E0008 */ addiu $t6, $zero, 0x0008 ## $t6 = 00000008 -/* 00314 80A8F484 28410009 */ slti $at, $v0, 0x0009 -/* 00318 80A8F488 14200003 */ bne $at, $zero, .L80A8F498 -/* 0031C 80A8F48C 00000000 */ nop -/* 00320 80A8F490 A60E019A */ sh $t6, 0x019A($s0) ## 0000019A -/* 00324 80A8F494 8602019A */ lh $v0, 0x019A($s0) ## 0000019A -.L80A8F498: -/* 00328 80A8F498 1040006C */ beq $v0, $zero, .L80A8F64C -/* 0032C 80A8F49C 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 00330 80A8F4A0 44819000 */ mtc1 $at, $f18 ## $f18 = -1.00 -/* 00334 80A8F4A4 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 00338 80A8F4A8 1441000B */ bne $v0, $at, .L80A8F4D8 -/* 0033C 80A8F4AC E612006C */ swc1 $f18, 0x006C($s0) ## 0000006C -/* 00340 80A8F4B0 960F0088 */ lhu $t7, 0x0088($s0) ## 00000088 -/* 00344 80A8F4B4 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 00348 80A8F4B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0034C 80A8F4BC 31F80001 */ andi $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 00350 80A8F4C0 53000006 */ beql $t8, $zero, .L80A8F4DC -/* 00354 80A8F4C4 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 00358 80A8F4C8 44812000 */ mtc1 $at, $f4 ## $f4 = 3.00 -/* 0035C 80A8F4CC 24051847 */ addiu $a1, $zero, 0x1847 ## $a1 = 00001847 -/* 00360 80A8F4D0 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00364 80A8F4D4 E6040060 */ swc1 $f4, 0x0060($s0) ## 00000060 -.L80A8F4D8: -/* 00368 80A8F4D8 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -.L80A8F4DC: -/* 0036C 80A8F4DC 3C073E4C */ lui $a3, 0x3E4C ## $a3 = 3E4C0000 -/* 00370 80A8F4E0 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3E4CCCCD -/* 00374 80A8F4E4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 00378 80A8F4E8 2604016C */ addiu $a0, $s0, 0x016C ## $a0 = 0000016C -/* 0037C 80A8F4EC 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 00380 80A8F4F0 8E0501B8 */ lw $a1, 0x01B8($s0) ## 000001B8 -/* 00384 80A8F4F4 860501A8 */ lh $a1, 0x01A8($s0) ## 000001A8 -/* 00388 80A8F4F8 AFA00010 */ sw $zero, 0x0010($sp) -/* 0038C 80A8F4FC 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 00390 80A8F500 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 00394 80A8F504 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00398 80A8F508 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 -/* 0039C 80A8F50C 860501AC */ lh $a1, 0x01AC($s0) ## 000001AC -/* 003A0 80A8F510 AFA00010 */ sw $zero, 0x0010($sp) -/* 003A4 80A8F514 260400B8 */ addiu $a0, $s0, 0x00B8 ## $a0 = 000000B8 -/* 003A8 80A8F518 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 003AC 80A8F51C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 003B0 80A8F520 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 -/* 003B4 80A8F524 860201A8 */ lh $v0, 0x01A8($s0) ## 000001A8 -/* 003B8 80A8F528 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 003BC 80A8F52C 50400017 */ beql $v0, $zero, .L80A8F58C -/* 003C0 80A8F530 860201AC */ lh $v0, 0x01AC($s0) ## 000001AC -/* 003C4 80A8F534 861900B4 */ lh $t9, 0x00B4($s0) ## 000000B4 -/* 003C8 80A8F538 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 003CC 80A8F53C 44814000 */ mtc1 $at, $f8 ## $f8 = 50.00 -/* 003D0 80A8F540 03224023 */ subu $t0, $t9, $v0 -/* 003D4 80A8F544 44883000 */ mtc1 $t0, $f6 ## $f6 = 0.00 -/* 003D8 80A8F548 00000000 */ nop -/* 003DC 80A8F54C 46803020 */ cvt.s.w $f0, $f6 -/* 003E0 80A8F550 46000005 */ abs.s $f0, $f0 -/* 003E4 80A8F554 4608003C */ c.lt.s $f0, $f8 -/* 003E8 80A8F558 00000000 */ nop -/* 003EC 80A8F55C 4502000B */ bc1fl .L80A8F58C -/* 003F0 80A8F560 860201AC */ lh $v0, 0x01AC($s0) ## 000001AC -/* 003F4 80A8F564 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 -/* 003F8 80A8F568 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 003FC 80A8F56C 44819000 */ mtc1 $at, $f18 ## $f18 = -1.00 -/* 00400 80A8F570 46805420 */ cvt.s.w $f16, $f10 -/* 00404 80A8F574 46128102 */ mul.s $f4, $f16, $f18 -/* 00408 80A8F578 4600218D */ trunc.w.s $f6, $f4 -/* 0040C 80A8F57C 440A3000 */ mfc1 $t2, $f6 -/* 00410 80A8F580 00000000 */ nop -/* 00414 80A8F584 A60A01A8 */ sh $t2, 0x01A8($s0) ## 000001A8 -/* 00418 80A8F588 860201AC */ lh $v0, 0x01AC($s0) ## 000001AC -.L80A8F58C: -/* 0041C 80A8F58C 50400017 */ beql $v0, $zero, .L80A8F5EC -/* 00420 80A8F590 860F01A4 */ lh $t7, 0x01A4($s0) ## 000001A4 -/* 00424 80A8F594 860B00B8 */ lh $t3, 0x00B8($s0) ## 000000B8 -/* 00428 80A8F598 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 0042C 80A8F59C 44815000 */ mtc1 $at, $f10 ## $f10 = 50.00 -/* 00430 80A8F5A0 01626023 */ subu $t4, $t3, $v0 -/* 00434 80A8F5A4 448C4000 */ mtc1 $t4, $f8 ## $f8 = 0.00 -/* 00438 80A8F5A8 00000000 */ nop -/* 0043C 80A8F5AC 46804020 */ cvt.s.w $f0, $f8 -/* 00440 80A8F5B0 46000005 */ abs.s $f0, $f0 -/* 00444 80A8F5B4 460A003C */ c.lt.s $f0, $f10 -/* 00448 80A8F5B8 00000000 */ nop -/* 0044C 80A8F5BC 4502000B */ bc1fl .L80A8F5EC -/* 00450 80A8F5C0 860F01A4 */ lh $t7, 0x01A4($s0) ## 000001A4 -/* 00454 80A8F5C4 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 -/* 00458 80A8F5C8 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 0045C 80A8F5CC 44812000 */ mtc1 $at, $f4 ## $f4 = -1.00 -/* 00460 80A8F5D0 468084A0 */ cvt.s.w $f18, $f16 -/* 00464 80A8F5D4 46049182 */ mul.s $f6, $f18, $f4 -/* 00468 80A8F5D8 4600320D */ trunc.w.s $f8, $f6 -/* 0046C 80A8F5DC 440E4000 */ mfc1 $t6, $f8 -/* 00470 80A8F5E0 00000000 */ nop -/* 00474 80A8F5E4 A60E01AC */ sh $t6, 0x01AC($s0) ## 000001AC -/* 00478 80A8F5E8 860F01A4 */ lh $t7, 0x01A4($s0) ## 000001A4 -.L80A8F5EC: -/* 0047C 80A8F5EC 51E00009 */ beql $t7, $zero, .L80A8F614 -/* 00480 80A8F5F0 C60A0168 */ lwc1 $f10, 0x0168($s0) ## 00000168 -/* 00484 80A8F5F4 861800B6 */ lh $t8, 0x00B6($s0) ## 000000B6 -/* 00488 80A8F5F8 27191000 */ addiu $t9, $t8, 0x1000 ## $t9 = 00001000 -/* 0048C 80A8F5FC A61900B6 */ sh $t9, 0x00B6($s0) ## 000000B6 -/* 00490 80A8F600 860800B6 */ lh $t0, 0x00B6($s0) ## 000000B6 -/* 00494 80A8F604 55000003 */ bnel $t0, $zero, .L80A8F614 -/* 00498 80A8F608 C60A0168 */ lwc1 $f10, 0x0168($s0) ## 00000168 -/* 0049C 80A8F60C A60001A4 */ sh $zero, 0x01A4($s0) ## 000001A4 -/* 004A0 80A8F610 C60A0168 */ lwc1 $f10, 0x0168($s0) ## 00000168 -.L80A8F614: -/* 004A4 80A8F614 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 004A8 80A8F618 4600540D */ trunc.w.s $f16, $f10 -/* 004AC 80A8F61C 44028000 */ mfc1 $v0, $f16 -/* 004B0 80A8F620 00000000 */ nop -/* 004B4 80A8F624 00021400 */ sll $v0, $v0, 16 -/* 004B8 80A8F628 00021403 */ sra $v0, $v0, 16 -/* 004BC 80A8F62C 10410003 */ beq $v0, $at, .L80A8F63C -/* 004C0 80A8F630 24010011 */ addiu $at, $zero, 0x0011 ## $at = 00000011 -/* 004C4 80A8F634 14410003 */ bne $v0, $at, .L80A8F644 -/* 004C8 80A8F638 00000000 */ nop -.L80A8F63C: -/* 004CC 80A8F63C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 004D0 80A8F640 2405286A */ addiu $a1, $zero, 0x286A ## $a1 = 0000286A -.L80A8F644: -/* 004D4 80A8F644 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 004D8 80A8F648 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 -.L80A8F64C: -/* 004DC 80A8F64C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 004E0 80A8F650 8FB00020 */ lw $s0, 0x0020($sp) -/* 004E4 80A8F654 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 004E8 80A8F658 03E00008 */ jr $ra -/* 004EC 80A8F65C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F660.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F660.s deleted file mode 100644 index 6c6121aed5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F660.s +++ /dev/null @@ -1,69 +0,0 @@ -glabel func_80A8F660 -/* 004F0 80A8F660 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 004F4 80A8F664 AFB00028 */ sw $s0, 0x0028($sp) -/* 004F8 80A8F668 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 004FC 80A8F66C AFBF002C */ sw $ra, 0x002C($sp) -/* 00500 80A8F670 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00504 80A8F674 AFA50034 */ sw $a1, 0x0034($sp) -/* 00508 80A8F678 0C028800 */ jal SkelAnime_GetFrameCount - -/* 0050C 80A8F67C 24840214 */ addiu $a0, $a0, 0x0214 ## $a0 = 06000214 -/* 00510 80A8F680 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00514 80A8F684 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00518 80A8F688 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 0051C 80A8F68C 468021A0 */ cvt.s.w $f6, $f4 -/* 00520 80A8F690 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00524 80A8F694 24A50214 */ addiu $a1, $a1, 0x0214 ## $a1 = 06000214 -/* 00528 80A8F698 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 -/* 0052C 80A8F69C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00530 80A8F6A0 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00534 80A8F6A4 4600320D */ trunc.w.s $f8, $f6 -/* 00538 80A8F6A8 AFA00014 */ sw $zero, 0x0014($sp) -/* 0053C 80A8F6AC E7B20018 */ swc1 $f18, 0x0018($sp) -/* 00540 80A8F6B0 440F4000 */ mfc1 $t7, $f8 -/* 00544 80A8F6B4 00000000 */ nop -/* 00548 80A8F6B8 000FC400 */ sll $t8, $t7, 16 -/* 0054C 80A8F6BC 0018CC03 */ sra $t9, $t8, 16 -/* 00550 80A8F6C0 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 -/* 00554 80A8F6C4 00000000 */ nop -/* 00558 80A8F6C8 46805420 */ cvt.s.w $f16, $f10 -/* 0055C 80A8F6CC 0C029468 */ jal SkelAnime_ChangeAnim - -/* 00560 80A8F6D0 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 00564 80A8F6D4 3C028016 */ lui $v0, %hi(gSaveContext) -/* 00568 80A8F6D8 24084076 */ addiu $t0, $zero, 0x4076 ## $t0 = 00004076 -/* 0056C 80A8F6DC 24090006 */ addiu $t1, $zero, 0x0006 ## $t1 = 00000006 -/* 00570 80A8F6E0 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00574 80A8F6E4 A608010E */ sh $t0, 0x010E($s0) ## 0000010E -/* 00578 80A8F6E8 A6090196 */ sh $t1, 0x0196($s0) ## 00000196 -/* 0057C 80A8F6EC 8C4A0004 */ lw $t2, 0x0004($v0) ## 8015E664 -/* 00580 80A8F6F0 3C0880A9 */ lui $t0, %hi(func_80A8F75C) ## $t0 = 80A90000 -/* 00584 80A8F6F4 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 00588 80A8F6F8 1140000A */ beq $t2, $zero, .L80A8F724 -/* 0058C 80A8F6FC 2508F75C */ addiu $t0, $t0, %lo(func_80A8F75C) ## $t0 = 80A8F75C -/* 00590 80A8F700 A2000194 */ sb $zero, 0x0194($s0) ## 00000194 -/* 00594 80A8F704 904B0F40 */ lbu $t3, 0x0F40($v0) ## 8015F5A0 -/* 00598 80A8F708 240C407A */ addiu $t4, $zero, 0x407A ## $t4 = 0000407A -/* 0059C 80A8F70C 240D0005 */ addiu $t5, $zero, 0x0005 ## $t5 = 00000005 -/* 005A0 80A8F710 5160000D */ beql $t3, $zero, .L80A8F748 -/* 005A4 80A8F714 AE08014C */ sw $t0, 0x014C($s0) ## 0000014C -/* 005A8 80A8F718 A60C010E */ sh $t4, 0x010E($s0) ## 0000010E -/* 005AC 80A8F71C 10000009 */ beq $zero, $zero, .L80A8F744 -/* 005B0 80A8F720 A60D0196 */ sh $t5, 0x0196($s0) ## 00000196 -.L80A8F724: -/* 005B4 80A8F724 A20E0194 */ sb $t6, 0x0194($s0) ## 00000194 -/* 005B8 80A8F728 904F0F40 */ lbu $t7, 0x0F40($v0) ## 8015F5A0 -/* 005BC 80A8F72C 24184079 */ addiu $t8, $zero, 0x4079 ## $t8 = 00004079 -/* 005C0 80A8F730 24190005 */ addiu $t9, $zero, 0x0005 ## $t9 = 00000005 -/* 005C4 80A8F734 51E00004 */ beql $t7, $zero, .L80A8F748 -/* 005C8 80A8F738 AE08014C */ sw $t0, 0x014C($s0) ## 0000014C -/* 005CC 80A8F73C A618010E */ sh $t8, 0x010E($s0) ## 0000010E -/* 005D0 80A8F740 A6190196 */ sh $t9, 0x0196($s0) ## 00000196 -.L80A8F744: -/* 005D4 80A8F744 AE08014C */ sw $t0, 0x014C($s0) ## 0000014C -.L80A8F748: -/* 005D8 80A8F748 8FBF002C */ lw $ra, 0x002C($sp) -/* 005DC 80A8F74C 8FB00028 */ lw $s0, 0x0028($sp) -/* 005E0 80A8F750 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 005E4 80A8F754 03E00008 */ jr $ra -/* 005E8 80A8F758 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F75C.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F75C.s deleted file mode 100644 index bec03c8abb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F75C.s +++ /dev/null @@ -1,103 +0,0 @@ -glabel func_80A8F75C -/* 005EC 80A8F75C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 005F0 80A8F760 AFBF0024 */ sw $ra, 0x0024($sp) -/* 005F4 80A8F764 AFB00020 */ sw $s0, 0x0020($sp) -/* 005F8 80A8F768 AFA50034 */ sw $a1, 0x0034($sp) -/* 005FC 80A8F76C 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 00600 80A8F770 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00604 80A8F774 0C2A3CA3 */ jal func_80A8F28C -/* 00608 80A8F778 AFAF002C */ sw $t7, 0x002C($sp) -/* 0060C 80A8F77C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00610 80A8F780 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 -/* 00614 80A8F784 2418FFFF */ addiu $t8, $zero, 0xFFFF ## $t8 = FFFFFFFF -/* 00618 80A8F788 A6180208 */ sh $t8, 0x0208($s0) ## 00000208 -/* 0061C 80A8F78C 8FA50034 */ lw $a1, 0x0034($sp) -/* 00620 80A8F790 0C00BC65 */ jal func_8002F194 -/* 00624 80A8F794 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00628 80A8F798 1040000C */ beq $v0, $zero, .L80A8F7CC -/* 0062C 80A8F79C 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 -/* 00630 80A8F7A0 86190196 */ lh $t9, 0x0196($s0) ## 00000196 -/* 00634 80A8F7A4 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00638 80A8F7A8 3C0980A9 */ lui $t1, %hi(func_80A8F660) ## $t1 = 80A90000 -/* 0063C 80A8F7AC 17210005 */ bne $t9, $at, .L80A8F7C4 -/* 00640 80A8F7B0 2529F660 */ addiu $t1, $t1, %lo(func_80A8F660) ## $t1 = 80A8F660 -/* 00644 80A8F7B4 3C0880A9 */ lui $t0, %hi(func_80A8F9C8) ## $t0 = 80A90000 -/* 00648 80A8F7B8 2508F9C8 */ addiu $t0, $t0, %lo(func_80A8F9C8) ## $t0 = 80A8F9C8 -/* 0064C 80A8F7BC 1000003F */ beq $zero, $zero, .L80A8F8BC -/* 00650 80A8F7C0 AE08014C */ sw $t0, 0x014C($s0) ## 0000014C -.L80A8F7C4: -/* 00654 80A8F7C4 1000003D */ beq $zero, $zero, .L80A8F8BC -/* 00658 80A8F7C8 AE09014C */ sw $t1, 0x014C($s0) ## 0000014C -.L80A8F7CC: -/* 0065C 80A8F7CC C6000090 */ lwc1 $f0, 0x0090($s0) ## 00000090 -/* 00660 80A8F7D0 44812000 */ mtc1 $at, $f4 ## $f4 = 0.00 -/* 00664 80A8F7D4 860A008A */ lh $t2, 0x008A($s0) ## 0000008A -/* 00668 80A8F7D8 860B00B6 */ lh $t3, 0x00B6($s0) ## 000000B6 -/* 0066C 80A8F7DC 4600203C */ c.lt.s $f4, $f0 -/* 00670 80A8F7E0 014B1023 */ subu $v0, $t2, $t3 -/* 00674 80A8F7E4 00021400 */ sll $v0, $v0, 16 -/* 00678 80A8F7E8 45010034 */ bc1t .L80A8F8BC -/* 0067C 80A8F7EC 00021403 */ sra $v0, $v0, 16 -/* 00680 80A8F7F0 04400004 */ bltz $v0, .L80A8F804 -/* 00684 80A8F7F4 00021823 */ subu $v1, $zero, $v0 -/* 00688 80A8F7F8 00021C00 */ sll $v1, $v0, 16 -/* 0068C 80A8F7FC 10000003 */ beq $zero, $zero, .L80A8F80C -/* 00690 80A8F800 00031C03 */ sra $v1, $v1, 16 -.L80A8F804: -/* 00694 80A8F804 00031C00 */ sll $v1, $v1, 16 -/* 00698 80A8F808 00031C03 */ sra $v1, $v1, 16 -.L80A8F80C: -/* 0069C 80A8F80C 28614300 */ slti $at, $v1, 0x4300 -/* 006A0 80A8F810 5020002B */ beql $at, $zero, .L80A8F8C0 -/* 006A4 80A8F814 8FBF0024 */ lw $ra, 0x0024($sp) -/* 006A8 80A8F818 920C0194 */ lbu $t4, 0x0194($s0) ## 00000194 -/* 006AC 80A8F81C 8FA3002C */ lw $v1, 0x002C($sp) -/* 006B0 80A8F820 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 006B4 80A8F824 15800023 */ bne $t4, $zero, .L80A8F8B4 -/* 006B8 80A8F828 3C0642C8 */ lui $a2, 0x42C8 ## $a2 = 42C80000 -/* 006BC 80A8F82C 8C620680 */ lw $v0, 0x0680($v1) ## 00000680 -/* 006C0 80A8F830 240508D4 */ addiu $a1, $zero, 0x08D4 ## $a1 = 000008D4 -/* 006C4 80A8F834 02003825 */ or $a3, $s0, $zero ## $a3 = 00000000 -/* 006C8 80A8F838 000269C0 */ sll $t5, $v0, 7 -/* 006CC 80A8F83C 05A10015 */ bgez $t5, .L80A8F894 -/* 006D0 80A8F840 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 006D4 80A8F844 8FA40034 */ lw $a0, 0x0034($sp) -/* 006D8 80A8F848 2406FF9D */ addiu $a2, $zero, 0xFF9D ## $a2 = FFFFFF9D -/* 006DC 80A8F84C 0C02003E */ jal func_800800F8 -/* 006E0 80A8F850 AFA00010 */ sw $zero, 0x0010($sp) -/* 006E4 80A8F854 A6020208 */ sh $v0, 0x0208($s0) ## 00000208 -/* 006E8 80A8F858 8FA40034 */ lw $a0, 0x0034($sp) -/* 006EC 80A8F85C 0C042F56 */ jal func_8010BD58 -/* 006F0 80A8F860 2405002A */ addiu $a1, $zero, 0x002A ## $a1 = 0000002A -/* 006F4 80A8F864 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 006F8 80A8F868 A600019A */ sh $zero, 0x019A($s0) ## 0000019A -/* 006FC 80A8F86C 3C010080 */ lui $at, 0x0080 ## $at = 00800000 -/* 00700 80A8F870 E60601B8 */ swc1 $f6, 0x01B8($s0) ## 000001B8 -/* 00704 80A8F874 8FAE002C */ lw $t6, 0x002C($sp) -/* 00708 80A8F878 3C1980A9 */ lui $t9, %hi(func_80A8F8D0) ## $t9 = 80A90000 -/* 0070C 80A8F87C 2739F8D0 */ addiu $t9, $t9, %lo(func_80A8F8D0) ## $t9 = 80A8F8D0 -/* 00710 80A8F880 8DCF0680 */ lw $t7, 0x0680($t6) ## 00000680 -/* 00714 80A8F884 01E1C025 */ or $t8, $t7, $at ## $t8 = 00800000 -/* 00718 80A8F888 ADD80680 */ sw $t8, 0x0680($t6) ## 00000680 -/* 0071C 80A8F88C 1000000B */ beq $zero, $zero, .L80A8F8BC -/* 00720 80A8F890 AE19014C */ sw $t9, 0x014C($s0) ## 0000014C -.L80A8F894: -/* 00724 80A8F894 44814000 */ mtc1 $at, $f8 ## $f8 = 0.00 -/* 00728 80A8F898 3C010080 */ lui $at, 0x0080 ## $at = 00800000 -/* 0072C 80A8F89C 00414025 */ or $t0, $v0, $at ## $t0 = 00800000 -/* 00730 80A8F8A0 4608003C */ c.lt.s $f0, $f8 -/* 00734 80A8F8A4 00000000 */ nop -/* 00738 80A8F8A8 45000002 */ bc1f .L80A8F8B4 -/* 0073C 80A8F8AC 00000000 */ nop -/* 00740 80A8F8B0 AC680680 */ sw $t0, 0x0680($v1) ## 00000680 -.L80A8F8B4: -/* 00744 80A8F8B4 0C00BCB3 */ jal func_8002F2CC -/* 00748 80A8F8B8 8FA50034 */ lw $a1, 0x0034($sp) -.L80A8F8BC: -/* 0074C 80A8F8BC 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A8F8C0: -/* 00750 80A8F8C0 8FB00020 */ lw $s0, 0x0020($sp) -/* 00754 80A8F8C4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00758 80A8F8C8 03E00008 */ jr $ra -/* 0075C 80A8F8CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F8D0.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F8D0.s deleted file mode 100644 index ca1f3b6b66..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F8D0.s +++ /dev/null @@ -1,74 +0,0 @@ -.rdata -glabel D_80A8FE70 - .asciz "\x1b[34m☆☆☆☆☆ 終り？ ☆☆☆☆☆ \n\x1b[m" - .balign 4 - -.text -glabel func_80A8F8D0 -/* 00760 80A8F8D0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00764 80A8F8D4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00768 80A8F8D8 AFBF001C */ sw $ra, 0x001C($sp) -/* 0076C 80A8F8DC AFB00018 */ sw $s0, 0x0018($sp) -/* 00770 80A8F8E0 00A11821 */ addu $v1, $a1, $at -/* 00774 80A8F8E4 946604C6 */ lhu $a2, 0x04C6($v1) ## 000004C6 -/* 00778 80A8F8E8 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 0077C 80A8F8EC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00780 80A8F8F0 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 00784 80A8F8F4 14C10023 */ bne $a2, $at, .L80A8F984 -/* 00788 80A8F8F8 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 0078C 80A8F8FC 906E03DC */ lbu $t6, 0x03DC($v1) ## 000003DC -/* 00790 80A8F900 3C0480A9 */ lui $a0, %hi(D_80A8FE70) ## $a0 = 80A90000 -/* 00794 80A8F904 2484FE70 */ addiu $a0, $a0, %lo(D_80A8FE70) ## $a0 = 80A8FE70 -/* 00798 80A8F908 55C0001F */ bnel $t6, $zero, .L80A8F988 -/* 0079C 80A8F90C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 007A0 80A8F910 0C00084C */ jal osSyncPrintf - -/* 007A4 80A8F914 AFA5002C */ sw $a1, 0x002C($sp) -/* 007A8 80A8F918 860F019A */ lh $t7, 0x019A($s0) ## 0000019A -/* 007AC 80A8F91C 8FA7002C */ lw $a3, 0x002C($sp) -/* 007B0 80A8F920 11E00010 */ beq $t7, $zero, .L80A8F964 -/* 007B4 80A8F924 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 007B8 80A8F928 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 007BC 80A8F92C 0C041B33 */ jal func_80106CCC -/* 007C0 80A8F930 AFA7002C */ sw $a3, 0x002C($sp) -/* 007C4 80A8F934 8FA4002C */ lw $a0, 0x002C($sp) -/* 007C8 80A8F938 24184077 */ addiu $t8, $zero, 0x4077 ## $t8 = 00004077 -/* 007CC 80A8F93C 24190005 */ addiu $t9, $zero, 0x0005 ## $t9 = 00000005 -/* 007D0 80A8F940 A618010E */ sh $t8, 0x010E($s0) ## 0000010E -/* 007D4 80A8F944 A6190196 */ sh $t9, 0x0196($s0) ## 00000196 -/* 007D8 80A8F948 3305FFFF */ andi $a1, $t8, 0xFFFF ## $a1 = 00004077 -/* 007DC 80A8F94C 0C042DA0 */ jal func_8010B680 -/* 007E0 80A8F950 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 007E4 80A8F954 3C0880A9 */ lui $t0, %hi(func_80A8F9C8) ## $t0 = 80A90000 -/* 007E8 80A8F958 2508F9C8 */ addiu $t0, $t0, %lo(func_80A8F9C8) ## $t0 = 80A8F9C8 -/* 007EC 80A8F95C 10000015 */ beq $zero, $zero, .L80A8F9B4 -/* 007F0 80A8F960 AE08014C */ sw $t0, 0x014C($s0) ## 0000014C -.L80A8F964: -/* 007F4 80A8F964 0C0200FC */ jal func_800803F0 -/* 007F8 80A8F968 86050208 */ lh $a1, 0x0208($s0) ## 00000208 -/* 007FC 80A8F96C 3C0A80A9 */ lui $t2, %hi(func_80A8F660) ## $t2 = 80A90000 -/* 00800 80A8F970 2409FFFF */ addiu $t1, $zero, 0xFFFF ## $t1 = FFFFFFFF -/* 00804 80A8F974 254AF660 */ addiu $t2, $t2, %lo(func_80A8F660) ## $t2 = 80A8F660 -/* 00808 80A8F978 A6090208 */ sh $t1, 0x0208($s0) ## 00000208 -/* 0080C 80A8F97C 1000000D */ beq $zero, $zero, .L80A8F9B4 -/* 00810 80A8F980 AE0A014C */ sw $t2, 0x014C($s0) ## 0000014C -.L80A8F984: -/* 00814 80A8F984 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -.L80A8F988: -/* 00818 80A8F988 14C1000A */ bne $a2, $at, .L80A8F9B4 -/* 0081C 80A8F98C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00820 80A8F990 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 00824 80A8F994 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00828 80A8F998 0C2A3CC8 */ jal func_80A8F320 -/* 0082C 80A8F99C AFA20024 */ sw $v0, 0x0024($sp) -/* 00830 80A8F9A0 8FA20024 */ lw $v0, 0x0024($sp) -/* 00834 80A8F9A4 3C010080 */ lui $at, 0x0080 ## $at = 00800000 -/* 00838 80A8F9A8 8C4B0680 */ lw $t3, 0x0680($v0) ## 00000680 -/* 0083C 80A8F9AC 01616025 */ or $t4, $t3, $at ## $t4 = 00800000 -/* 00840 80A8F9B0 AC4C0680 */ sw $t4, 0x0680($v0) ## 00000680 -.L80A8F9B4: -/* 00844 80A8F9B4 8FBF001C */ lw $ra, 0x001C($sp) -/* 00848 80A8F9B8 8FB00018 */ lw $s0, 0x0018($sp) -/* 0084C 80A8F9BC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00850 80A8F9C0 03E00008 */ jr $ra -/* 00854 80A8F9C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F9C8.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F9C8.s deleted file mode 100644 index 32c204ecc1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F9C8.s +++ /dev/null @@ -1,59 +0,0 @@ -glabel func_80A8F9C8 -/* 00858 80A8F9C8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0085C 80A8F9CC AFBF0024 */ sw $ra, 0x0024($sp) -/* 00860 80A8F9D0 AFB10020 */ sw $s1, 0x0020($sp) -/* 00864 80A8F9D4 AFB0001C */ sw $s0, 0x001C($sp) -/* 00868 80A8F9D8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 0086C 80A8F9DC 0C2A3CA3 */ jal func_80A8F28C -/* 00870 80A8F9E0 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 00874 80A8F9E4 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00878 80A8F9E8 26240150 */ addiu $a0, $s1, 0x0150 ## $a0 = 00000150 -/* 0087C 80A8F9EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00880 80A8F9F0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00884 80A8F9F4 0C00B7D5 */ jal func_8002DF54 -/* 00888 80A8F9F8 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 0088C 80A8F9FC 0C042F6F */ jal func_8010BDBC -/* 00890 80A8FA00 260420D8 */ addiu $a0, $s0, 0x20D8 ## $a0 = 000020D8 -/* 00894 80A8FA04 862E0196 */ lh $t6, 0x0196($s1) ## 00000196 -/* 00898 80A8FA08 55C20022 */ bnel $t6, $v0, .L80A8FA94 -/* 0089C 80A8FA0C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 008A0 80A8FA10 0C041AF2 */ jal func_80106BC8 -/* 008A4 80A8FA14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 008A8 80A8FA18 5040001E */ beql $v0, $zero, .L80A8FA94 -/* 008AC 80A8FA1C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 008B0 80A8FA20 86220208 */ lh $v0, 0x0208($s1) ## 00000208 -/* 008B4 80A8FA24 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 008B8 80A8FA28 10410004 */ beq $v0, $at, .L80A8FA3C -/* 008BC 80A8FA2C 00027880 */ sll $t7, $v0, 2 -/* 008C0 80A8FA30 020FC021 */ addu $t8, $s0, $t7 -/* 008C4 80A8FA34 0C016C69 */ jal func_8005B1A4 -/* 008C8 80A8FA38 8F040790 */ lw $a0, 0x0790($t8) ## 00000790 -.L80A8FA3C: -/* 008CC 80A8FA3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 008D0 80A8FA40 240508DE */ addiu $a1, $zero, 0x08DE ## $a1 = 000008DE -/* 008D4 80A8FA44 2406FF9D */ addiu $a2, $zero, 0xFF9D ## $a2 = FFFFFF9D -/* 008D8 80A8FA48 02203825 */ or $a3, $s1, $zero ## $a3 = 00000000 -/* 008DC 80A8FA4C 0C02003E */ jal func_800800F8 -/* 008E0 80A8FA50 AFA00010 */ sw $zero, 0x0010($sp) -/* 008E4 80A8FA54 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 008E8 80A8FA58 A6220208 */ sh $v0, 0x0208($s1) ## 00000208 -/* 008EC 80A8FA5C 00300821 */ addu $at, $at, $s0 -/* 008F0 80A8FA60 24190037 */ addiu $t9, $zero, 0x0037 ## $t9 = 00000037 -/* 008F4 80A8FA64 A03903DC */ sb $t9, 0x03DC($at) ## 000103DC -/* 008F8 80A8FA68 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 008FC 80A8FA6C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00900 80A8FA70 0C00B7D5 */ jal func_8002DF54 -/* 00904 80A8FA74 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 00908 80A8FA78 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0090C 80A8FA7C 0C042F56 */ jal func_8010BD58 -/* 00910 80A8FA80 2405002B */ addiu $a1, $zero, 0x002B ## $a1 = 0000002B -/* 00914 80A8FA84 3C0880A9 */ lui $t0, %hi(func_80A8FAA4) ## $t0 = 80A90000 -/* 00918 80A8FA88 2508FAA4 */ addiu $t0, $t0, %lo(func_80A8FAA4) ## $t0 = 80A8FAA4 -/* 0091C 80A8FA8C AE28014C */ sw $t0, 0x014C($s1) ## 0000014C -/* 00920 80A8FA90 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A8FA94: -/* 00924 80A8FA94 8FB0001C */ lw $s0, 0x001C($sp) -/* 00928 80A8FA98 8FB10020 */ lw $s1, 0x0020($sp) -/* 0092C 80A8FA9C 03E00008 */ jr $ra -/* 00930 80A8FAA0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8FAA4.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8FAA4.s deleted file mode 100644 index c16641cdb0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8FAA4.s +++ /dev/null @@ -1,81 +0,0 @@ -.rdata -glabel D_80A8FE98 - .asciz "game_play->message.msg_mode=%d\n" - .balign 4 - -.text -glabel func_80A8FAA4 -/* 00934 80A8FAA4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00938 80A8FAA8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0093C 80A8FAAC AFBF0024 */ sw $ra, 0x0024($sp) -/* 00940 80A8FAB0 AFB10020 */ sw $s1, 0x0020($sp) -/* 00944 80A8FAB4 AFB0001C */ sw $s0, 0x001C($sp) -/* 00948 80A8FAB8 00A11021 */ addu $v0, $a1, $at -/* 0094C 80A8FABC 944E04C6 */ lhu $t6, 0x04C6($v0) ## 000004C6 -/* 00950 80A8FAC0 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 00954 80A8FAC4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00958 80A8FAC8 11C10005 */ beq $t6, $at, .L80A8FAE0 -/* 0095C 80A8FACC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00960 80A8FAD0 0C2A3CC8 */ jal func_80A8F320 -/* 00964 80A8FAD4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00968 80A8FAD8 10000033 */ beq $zero, $zero, .L80A8FBA8 -/* 0096C 80A8FADC 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A8FAE0: -/* 00970 80A8FAE0 3C0480A9 */ lui $a0, %hi(D_80A8FE98) ## $a0 = 80A90000 -/* 00974 80A8FAE4 904503DC */ lbu $a1, 0x03DC($v0) ## 000003DC -/* 00978 80A8FAE8 AFA2002C */ sw $v0, 0x002C($sp) -/* 0097C 80A8FAEC 0C00084C */ jal osSyncPrintf - -/* 00980 80A8FAF0 2484FE98 */ addiu $a0, $a0, %lo(D_80A8FE98) ## $a0 = 80A8FE98 -/* 00984 80A8FAF4 8FA2002C */ lw $v0, 0x002C($sp) -/* 00988 80A8FAF8 904F03DC */ lbu $t7, 0x03DC($v0) ## 000003DC -/* 0098C 80A8FAFC 55E0002A */ bnel $t7, $zero, .L80A8FBA8 -/* 00990 80A8FB00 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00994 80A8FB04 92180194 */ lbu $t8, 0x0194($s0) ## 00000194 -/* 00998 80A8FB08 24094078 */ addiu $t1, $zero, 0x4078 ## $t1 = 00004078 -/* 0099C 80A8FB0C 240A0005 */ addiu $t2, $zero, 0x0005 ## $t2 = 00000005 -/* 009A0 80A8FB10 1300000B */ beq $t8, $zero, .L80A8FB40 -/* 009A4 80A8FB14 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 009A8 80A8FB18 24194077 */ addiu $t9, $zero, 0x4077 ## $t9 = 00004077 -/* 009AC 80A8FB1C 24080005 */ addiu $t0, $zero, 0x0005 ## $t0 = 00000005 -/* 009B0 80A8FB20 A619010E */ sh $t9, 0x010E($s0) ## 0000010E -/* 009B4 80A8FB24 A6080196 */ sh $t0, 0x0196($s0) ## 00000196 -/* 009B8 80A8FB28 3325FFFF */ andi $a1, $t9, 0xFFFF ## $a1 = 00004077 -/* 009BC 80A8FB2C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 009C0 80A8FB30 0C042DA0 */ jal func_8010B680 -/* 009C4 80A8FB34 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 009C8 80A8FB38 10000006 */ beq $zero, $zero, .L80A8FB54 -/* 009CC 80A8FB3C 00000000 */ nop -.L80A8FB40: -/* 009D0 80A8FB40 A609010E */ sh $t1, 0x010E($s0) ## 0000010E -/* 009D4 80A8FB44 A60A0196 */ sh $t2, 0x0196($s0) ## 00000196 -/* 009D8 80A8FB48 3125FFFF */ andi $a1, $t1, 0xFFFF ## $a1 = 00000000 -/* 009DC 80A8FB4C 0C042DA0 */ jal func_8010B680 -/* 009E0 80A8FB50 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -.L80A8FB54: -/* 009E4 80A8FB54 3C0B80A9 */ lui $t3, %hi(func_80A8FBB8) ## $t3 = 80A90000 -/* 009E8 80A8FB58 256BFBB8 */ addiu $t3, $t3, %lo(func_80A8FBB8) ## $t3 = 80A8FBB8 -/* 009EC 80A8FB5C AE0B014C */ sw $t3, 0x014C($s0) ## 0000014C -/* 009F0 80A8FB60 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 009F4 80A8FB64 0C0200FC */ jal func_800803F0 -/* 009F8 80A8FB68 86050208 */ lh $a1, 0x0208($s0) ## 00000208 -/* 009FC 80A8FB6C 240CFFFF */ addiu $t4, $zero, 0xFFFF ## $t4 = FFFFFFFF -/* 00A00 80A8FB70 A60C0208 */ sh $t4, 0x0208($s0) ## 00000208 -/* 00A04 80A8FB74 AFA00010 */ sw $zero, 0x0010($sp) -/* 00A08 80A8FB78 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00A0C 80A8FB7C 240508D4 */ addiu $a1, $zero, 0x08D4 ## $a1 = 000008D4 -/* 00A10 80A8FB80 2406FF9D */ addiu $a2, $zero, 0xFF9D ## $a2 = FFFFFF9D -/* 00A14 80A8FB84 0C02003E */ jal func_800800F8 -/* 00A18 80A8FB88 02003825 */ or $a3, $s0, $zero ## $a3 = 00000000 -/* 00A1C 80A8FB8C A6020208 */ sh $v0, 0x0208($s0) ## 00000208 -/* 00A20 80A8FB90 860D0208 */ lh $t5, 0x0208($s0) ## 00000208 -/* 00A24 80A8FB94 000D7080 */ sll $t6, $t5, 2 -/* 00A28 80A8FB98 022E7821 */ addu $t7, $s1, $t6 -/* 00A2C 80A8FB9C 0C016C69 */ jal func_8005B1A4 -/* 00A30 80A8FBA0 8DE40790 */ lw $a0, 0x0790($t7) ## 00000790 -/* 00A34 80A8FBA4 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A8FBA8: -/* 00A38 80A8FBA8 8FB0001C */ lw $s0, 0x001C($sp) -/* 00A3C 80A8FBAC 8FB10020 */ lw $s1, 0x0020($sp) -/* 00A40 80A8FBB0 03E00008 */ jr $ra -/* 00A44 80A8FBB4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8FBB8.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8FBB8.s deleted file mode 100644 index 2645fd6ff3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8FBB8.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_80A8FBB8 -/* 00A48 80A8FBB8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00A4C 80A8FBBC AFBF001C */ sw $ra, 0x001C($sp) -/* 00A50 80A8FBC0 AFB10018 */ sw $s1, 0x0018($sp) -/* 00A54 80A8FBC4 AFB00014 */ sw $s0, 0x0014($sp) -/* 00A58 80A8FBC8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00A5C 80A8FBCC 0C2A3CA3 */ jal func_80A8F28C -/* 00A60 80A8FBD0 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 00A64 80A8FBD4 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00A68 80A8FBD8 26240150 */ addiu $a0, $s1, 0x0150 ## $a0 = 00000150 -/* 00A6C 80A8FBDC 0C042F6F */ jal func_8010BDBC -/* 00A70 80A8FBE0 260420D8 */ addiu $a0, $s0, 0x20D8 ## $a0 = 000020D8 -/* 00A74 80A8FBE4 862E0196 */ lh $t6, 0x0196($s1) ## 00000196 -/* 00A78 80A8FBE8 55C20014 */ bnel $t6, $v0, .L80A8FC3C -/* 00A7C 80A8FBEC 8FBF001C */ lw $ra, 0x001C($sp) -/* 00A80 80A8FBF0 0C041AF2 */ jal func_80106BC8 -/* 00A84 80A8FBF4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A88 80A8FBF8 50400010 */ beql $v0, $zero, .L80A8FC3C -/* 00A8C 80A8FBFC 8FBF001C */ lw $ra, 0x001C($sp) -/* 00A90 80A8FC00 862F0208 */ lh $t7, 0x0208($s1) ## 00000208 -/* 00A94 80A8FC04 000FC080 */ sll $t8, $t7, 2 -/* 00A98 80A8FC08 0218C821 */ addu $t9, $s0, $t8 -/* 00A9C 80A8FC0C 0C016C69 */ jal func_8005B1A4 -/* 00AA0 80A8FC10 8F240790 */ lw $a0, 0x0790($t9) ## 00000790 -/* 00AA4 80A8FC14 0C041B33 */ jal func_80106CCC -/* 00AA8 80A8FC18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00AAC 80A8FC1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00AB0 80A8FC20 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00AB4 80A8FC24 0C00B7D5 */ jal func_8002DF54 -/* 00AB8 80A8FC28 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 00ABC 80A8FC2C 3C0880A9 */ lui $t0, %hi(func_80A8F660) ## $t0 = 80A90000 -/* 00AC0 80A8FC30 2508F660 */ addiu $t0, $t0, %lo(func_80A8F660) ## $t0 = 80A8F660 -/* 00AC4 80A8FC34 AE28014C */ sw $t0, 0x014C($s1) ## 0000014C -/* 00AC8 80A8FC38 8FBF001C */ lw $ra, 0x001C($sp) -.L80A8FC3C: -/* 00ACC 80A8FC3C 8FB00014 */ lw $s0, 0x0014($sp) -/* 00AD0 80A8FC40 8FB10018 */ lw $s1, 0x0018($sp) -/* 00AD4 80A8FC44 03E00008 */ jr $ra -/* 00AD8 80A8FC48 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/EnKakasi2_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/EnKakasi2_Destroy.s deleted file mode 100644 index b866a2e85d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/EnKakasi2_Destroy.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel EnKakasi2_Destroy -/* 0022C 80A9023C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00230 80A90240 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00234 80A90244 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00238 80A90248 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0023C 80A9024C 0C0170EB */ jal Collider_DestroyCylinder - -/* 00240 80A90250 24C501AC */ addiu $a1, $a2, 0x01AC ## $a1 = 000001AC -/* 00244 80A90254 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00248 80A90258 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0024C 80A9025C 03E00008 */ jr $ra -/* 00250 80A90260 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/EnKakasi2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/EnKakasi2_Init.s deleted file mode 100644 index 75ffc5b32c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/EnKakasi2_Init.s +++ /dev/null @@ -1,194 +0,0 @@ -.rdata -glabel D_80A909F0 - .asciz "\n\n" - .balign 4 - -glabel D_80A909F4 - .asciz "\x1b[32m☆☆☆☆☆ 梅田参号見参！ ☆☆☆☆☆ \n\x1b[m" - .balign 4 - -glabel D_80A90A24 - .asciz "\x1b[33m☆☆☆☆☆ 元？(引数０) ☆☆☆☆ %f\n\x1b[m" - .balign 4 - -glabel D_80A90A54 - .asciz "\x1b[33m☆☆☆☆☆ 元？(Ｚアングル) ☆☆ %f\n\x1b[m" - .balign 4 - -glabel D_80A90A84 - .asciz "\x1b[33m☆☆☆☆☆ 補正座標Ｘ ☆☆☆☆☆ %f\n\x1b[m" - .balign 4 - -glabel D_80A90AB4 - .asciz "\x1b[33m☆☆☆☆☆ 補正座標Ｙ ☆☆☆☆☆ %f\n\x1b[m" - .balign 4 - -glabel D_80A90AE4 - .asciz "\x1b[33m☆☆☆☆☆ 補正座標Ｚ ☆☆☆☆☆ %f\n\x1b[m" - .balign 4 - -glabel D_80A90B14 - .asciz "\x1b[33m☆☆☆☆☆ SAVE ☆☆☆☆☆ %d\n\x1b[m" - .balign 4 - -glabel D_80A90B44 - .asciz "\n\n" - .balign 4 - -.text -glabel EnKakasi2_Init -/* 00000 80A90010 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 00004 80A90014 AFB00028 */ sw $s0, 0x0028($sp) -/* 00008 80A90018 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0000C 80A9001C AFBF002C */ sw $ra, 0x002C($sp) -/* 00010 80A90020 3C0480A9 */ lui $a0, %hi(D_80A909F0) ## $a0 = 80A90000 -/* 00014 80A90024 AFA5004C */ sw $a1, 0x004C($sp) -/* 00018 80A90028 0C00084C */ jal osSyncPrintf - -/* 0001C 80A9002C 248409F0 */ addiu $a0, $a0, %lo(D_80A909F0) ## $a0 = 80A909F0 -/* 00020 80A90030 3C0480A9 */ lui $a0, %hi(D_80A909F4) ## $a0 = 80A90000 -/* 00024 80A90034 0C00084C */ jal osSyncPrintf - -/* 00028 80A90038 248409F4 */ addiu $a0, $a0, %lo(D_80A909F4) ## $a0 = 80A909F4 -/* 0002C 80A9003C 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 00030 80A90040 86190034 */ lh $t9, 0x0034($s0) ## 00000034 -/* 00034 80A90044 2401003F */ addiu $at, $zero, 0x003F ## $at = 0000003F -/* 00038 80A90048 304E003F */ andi $t6, $v0, 0x003F ## $t6 = 00000000 -/* 0003C 80A9004C A60E0196 */ sh $t6, 0x0196($s0) ## 00000196 -/* 00040 80A90050 00027983 */ sra $t7, $v0, 6 -/* 00044 80A90054 86080196 */ lh $t0, 0x0196($s0) ## 00000196 -/* 00048 80A90058 31F800FF */ andi $t8, $t7, 0x00FF ## $t8 = 00000000 -/* 0004C 80A9005C 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 00050 80A90060 44993000 */ mtc1 $t9, $f6 ## $f6 = 0.00 -/* 00054 80A90064 2409FFFF */ addiu $t1, $zero, 0xFFFF ## $t1 = FFFFFFFF -/* 00058 80A90068 468020A0 */ cvt.s.w $f2, $f4 -/* 0005C 80A9006C 15010002 */ bne $t0, $at, .L80A90078 -/* 00060 80A90070 46803320 */ cvt.s.w $f12, $f6 -/* 00064 80A90074 A6090196 */ sh $t1, 0x0196($s0) ## 00000196 -.L80A90078: -/* 00068 80A90078 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 0006C 80A9007C 44810000 */ mtc1 $at, $f0 ## $f0 = 40.00 -/* 00070 80A90080 46001121 */ cvt.d.s $f4, $f2 -/* 00074 80A90084 240A0004 */ addiu $t2, $zero, 0x0004 ## $t2 = 00000004 -/* 00078 80A90088 46001202 */ mul.s $f8, $f2, $f0 -/* 0007C 80A9008C A20A001F */ sb $t2, 0x001F($s0) ## 0000001F -/* 00080 80A90090 44072000 */ mfc1 $a3, $f4 -/* 00084 80A90094 46006402 */ mul.s $f16, $f12, $f0 -/* 00088 80A90098 44062800 */ mfc1 $a2, $f5 -/* 0008C 80A9009C 3C0480A9 */ lui $a0, %hi(D_80A90A24) ## $a0 = 80A90000 -/* 00090 80A900A0 24840A24 */ addiu $a0, $a0, %lo(D_80A90A24) ## $a0 = 80A90A24 -/* 00094 80A900A4 46004280 */ add.s $f10, $f8, $f0 -/* 00098 80A900A8 46008480 */ add.s $f18, $f16, $f0 -/* 0009C 80A900AC E60A019C */ swc1 $f10, 0x019C($s0) ## 0000019C -/* 000A0 80A900B0 E61201A0 */ swc1 $f18, 0x01A0($s0) ## 000001A0 -/* 000A4 80A900B4 0C00084C */ jal osSyncPrintf - -/* 000A8 80A900B8 E7AC0038 */ swc1 $f12, 0x0038($sp) -/* 000AC 80A900BC C7AC0038 */ lwc1 $f12, 0x0038($sp) -/* 000B0 80A900C0 3C0480A9 */ lui $a0, %hi(D_80A90A54) ## $a0 = 80A90000 -/* 000B4 80A900C4 24840A54 */ addiu $a0, $a0, %lo(D_80A90A54) ## $a0 = 80A90A54 -/* 000B8 80A900C8 460061A1 */ cvt.d.s $f6, $f12 -/* 000BC 80A900CC 44073000 */ mfc1 $a3, $f6 -/* 000C0 80A900D0 44063800 */ mfc1 $a2, $f7 -/* 000C4 80A900D4 0C00084C */ jal osSyncPrintf - -/* 000C8 80A900D8 00000000 */ nop -/* 000CC 80A900DC C608019C */ lwc1 $f8, 0x019C($s0) ## 0000019C -/* 000D0 80A900E0 3C0480A9 */ lui $a0, %hi(D_80A90A84) ## $a0 = 80A90000 -/* 000D4 80A900E4 24840A84 */ addiu $a0, $a0, %lo(D_80A90A84) ## $a0 = 80A90A84 -/* 000D8 80A900E8 460042A1 */ cvt.d.s $f10, $f8 -/* 000DC 80A900EC 44075000 */ mfc1 $a3, $f10 -/* 000E0 80A900F0 44065800 */ mfc1 $a2, $f11 -/* 000E4 80A900F4 0C00084C */ jal osSyncPrintf - -/* 000E8 80A900F8 00000000 */ nop -/* 000EC 80A900FC C61001A0 */ lwc1 $f16, 0x01A0($s0) ## 000001A0 -/* 000F0 80A90100 3C0480A9 */ lui $a0, %hi(D_80A90AB4) ## $a0 = 80A90000 -/* 000F4 80A90104 24840AB4 */ addiu $a0, $a0, %lo(D_80A90AB4) ## $a0 = 80A90AB4 -/* 000F8 80A90108 460084A1 */ cvt.d.s $f18, $f16 -/* 000FC 80A9010C 44079000 */ mfc1 $a3, $f18 -/* 00100 80A90110 44069800 */ mfc1 $a2, $f19 -/* 00104 80A90114 0C00084C */ jal osSyncPrintf - -/* 00108 80A90118 00000000 */ nop -/* 0010C 80A9011C C60401A4 */ lwc1 $f4, 0x01A4($s0) ## 000001A4 -/* 00110 80A90120 3C0480A9 */ lui $a0, %hi(D_80A90AE4) ## $a0 = 80A90000 -/* 00114 80A90124 24840AE4 */ addiu $a0, $a0, %lo(D_80A90AE4) ## $a0 = 80A90AE4 -/* 00118 80A90128 460021A1 */ cvt.d.s $f6, $f4 -/* 0011C 80A9012C 44073000 */ mfc1 $a3, $f6 -/* 00120 80A90130 44063800 */ mfc1 $a2, $f7 -/* 00124 80A90134 0C00084C */ jal osSyncPrintf - -/* 00128 80A90138 00000000 */ nop -/* 0012C 80A9013C 3C0480A9 */ lui $a0, %hi(D_80A90B14) ## $a0 = 80A90000 -/* 00130 80A90140 24840B14 */ addiu $a0, $a0, %lo(D_80A90B14) ## $a0 = 80A90B14 -/* 00134 80A90144 0C00084C */ jal osSyncPrintf - -/* 00138 80A90148 86050196 */ lh $a1, 0x0196($s0) ## 00000196 -/* 0013C 80A9014C 3C0480A9 */ lui $a0, %hi(D_80A90B44) ## $a0 = 80A90000 -/* 00140 80A90150 0C00084C */ jal osSyncPrintf - -/* 00144 80A90154 24840B44 */ addiu $a0, $a0, %lo(D_80A90B44) ## $a0 = 80A90B44 -/* 00148 80A90158 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 0014C 80A9015C 44814000 */ mtc1 $at, $f8 ## $f8 = 60.00 -/* 00150 80A90160 240B00FF */ addiu $t3, $zero, 0x00FF ## $t3 = 000000FF -/* 00154 80A90164 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 -/* 00158 80A90168 A20B00AE */ sb $t3, 0x00AE($s0) ## 000000AE -/* 0015C 80A9016C 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A -/* 00160 80A90170 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00164 80A90174 0C00B58B */ jal Actor_SetScale - -/* 00168 80A90178 E60801A8 */ swc1 $f8, 0x01A8($s0) ## 000001A8 -/* 0016C 80A9017C 8E0C0004 */ lw $t4, 0x0004($s0) ## 00000004 -/* 00170 80A90180 86050196 */ lh $a1, 0x0196($s0) ## 00000196 -/* 00174 80A90184 860E00B6 */ lh $t6, 0x00B6($s0) ## 000000B6 -/* 00178 80A90188 358D0400 */ ori $t5, $t4, 0x0400 ## $t5 = 00000400 -/* 0017C 80A9018C AE0D0004 */ sw $t5, 0x0004($s0) ## 00000004 -/* 00180 80A90190 04A0001F */ bltz $a1, .L80A90210 -/* 00184 80A90194 A60E0198 */ sh $t6, 0x0198($s0) ## 00000198 -/* 00188 80A90198 0C00B2D0 */ jal Flags_GetSwitch - -/* 0018C 80A9019C 8FA4004C */ lw $a0, 0x004C($sp) -/* 00190 80A901A0 1040001B */ beq $v0, $zero, .L80A90210 -/* 00194 80A901A4 3C0F80A9 */ lui $t7, %hi(func_80A90948) ## $t7 = 80A90000 -/* 00198 80A901A8 25EF0948 */ addiu $t7, $t7, %lo(func_80A90948) ## $t7 = 80A90948 -/* 0019C 80A901AC AE0F0134 */ sw $t7, 0x0134($s0) ## 00000134 -/* 001A0 80A901B0 260501AC */ addiu $a1, $s0, 0x01AC ## $a1 = 000001AC -/* 001A4 80A901B4 AFA50034 */ sw $a1, 0x0034($sp) -/* 001A8 80A901B8 0C0170D9 */ jal Collider_InitCylinder - -/* 001AC 80A901BC 8FA4004C */ lw $a0, 0x004C($sp) -/* 001B0 80A901C0 3C0780A9 */ lui $a3, %hi(D_80A909A0) ## $a3 = 80A90000 -/* 001B4 80A901C4 8FA50034 */ lw $a1, 0x0034($sp) -/* 001B8 80A901C8 24E709A0 */ addiu $a3, $a3, %lo(D_80A909A0) ## $a3 = 80A909A0 -/* 001BC 80A901CC 8FA4004C */ lw $a0, 0x004C($sp) -/* 001C0 80A901D0 0C01712B */ jal Collider_SetCylinder - -/* 001C4 80A901D4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 001C8 80A901D8 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 001CC 80A901DC 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 001D0 80A901E0 24E70214 */ addiu $a3, $a3, 0x0214 ## $a3 = 06000214 -/* 001D4 80A901E4 24C665B0 */ addiu $a2, $a2, 0x65B0 ## $a2 = 060065B0 -/* 001D8 80A901E8 8FA4004C */ lw $a0, 0x004C($sp) -/* 001DC 80A901EC 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 -/* 001E0 80A901F0 AFA00010 */ sw $zero, 0x0010($sp) -/* 001E4 80A901F4 AFA00014 */ sw $zero, 0x0014($sp) -/* 001E8 80A901F8 0C0291BE */ jal SkelAnime_InitSV -/* 001EC 80A901FC AFA00018 */ sw $zero, 0x0018($sp) -/* 001F0 80A90200 3C1880A9 */ lui $t8, %hi(func_80A9062C) ## $t8 = 80A90000 -/* 001F4 80A90204 2718062C */ addiu $t8, $t8, %lo(func_80A9062C) ## $t8 = 80A9062C -/* 001F8 80A90208 10000007 */ beq $zero, $zero, .L80A90228 -/* 001FC 80A9020C AE18014C */ sw $t8, 0x014C($s0) ## 0000014C -.L80A90210: -/* 00200 80A90210 3C01C5FA */ lui $at, 0xC5FA ## $at = C5FA0000 -/* 00204 80A90214 44815000 */ mtc1 $at, $f10 ## $f10 = -8000.00 -/* 00208 80A90218 3C1980A9 */ lui $t9, %hi(func_80A90264) ## $t9 = 80A90000 -/* 0020C 80A9021C 27390264 */ addiu $t9, $t9, %lo(func_80A90264) ## $t9 = 80A90264 -/* 00210 80A90220 AE19014C */ sw $t9, 0x014C($s0) ## 0000014C -/* 00214 80A90224 E60A00BC */ swc1 $f10, 0x00BC($s0) ## 000000BC -.L80A90228: -/* 00218 80A90228 8FBF002C */ lw $ra, 0x002C($sp) -/* 0021C 80A9022C 8FB00028 */ lw $s0, 0x0028($sp) -/* 00220 80A90230 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 00224 80A90234 03E00008 */ jr $ra -/* 00228 80A90238 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/EnKakasi2_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/EnKakasi2_Update.s deleted file mode 100644 index c112c6cffd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/EnKakasi2_Update.s +++ /dev/null @@ -1,164 +0,0 @@ -.rdata -glabel D_80A90BA0 - .asciz "\x1b[33m☆☆☆☆☆ this->actor.player_distance ☆☆☆☆☆ %f\n\x1b[m" - .balign 4 - -glabel D_80A90BE0 - .asciz "\x1b[33m☆☆☆☆☆ this->hosei.x ☆☆☆☆☆ %f\n\x1b[m" - .balign 4 - -.late_rodata -glabel D_80A90C10 - .word 0x0A0A0000, 0x00000000, 0x00000000, 0x00000000 - -.text -glabel EnKakasi2_Update -/* 00720 80A90730 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 -/* 00724 80A90734 AFBF004C */ sw $ra, 0x004C($sp) -/* 00728 80A90738 AFB10048 */ sw $s1, 0x0048($sp) -/* 0072C 80A9073C AFB00044 */ sw $s0, 0x0044($sp) -/* 00730 80A90740 888F00B4 */ lwl $t7, 0x00B4($a0) ## 000000B4 -/* 00734 80A90744 988F00B7 */ lwr $t7, 0x00B7($a0) ## 000000B7 -/* 00738 80A90748 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0073C 80A9074C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00740 80A90750 A88F0030 */ swl $t7, 0x0030($a0) ## 00000030 -/* 00744 80A90754 B88F0033 */ swr $t7, 0x0033($a0) ## 00000033 -/* 00748 80A90758 948F00B8 */ lhu $t7, 0x00B8($a0) ## 000000B8 -/* 0074C 80A9075C A48F0034 */ sh $t7, 0x0034($a0) ## 00000034 -/* 00750 80A90760 0C00B56E */ jal Actor_SetHeight - -/* 00754 80A90764 8E0501A8 */ lw $a1, 0x01A8($s0) ## 000001A8 -/* 00758 80A90768 8E19014C */ lw $t9, 0x014C($s0) ## 0000014C -/* 0075C 80A9076C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00760 80A90770 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00764 80A90774 0320F809 */ jalr $ra, $t9 -/* 00768 80A90778 00000000 */ nop -/* 0076C 80A9077C 0C00B638 */ jal Actor_MoveForward - -/* 00770 80A90780 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00774 80A90784 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00778 80A90788 C60600BC */ lwc1 $f6, 0x00BC($s0) ## 000000BC -/* 0077C 80A9078C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00780 80A90790 260501AC */ addiu $a1, $s0, 0x01AC ## $a1 = 000001AC -/* 00784 80A90794 46062032 */ c.eq.s $f4, $f6 -/* 00788 80A90798 00000000 */ nop -/* 0078C 80A9079C 4500000E */ bc1f .L80A907D8 -/* 00790 80A907A0 00000000 */ nop -/* 00794 80A907A4 0C0189B7 */ jal Collider_CylinderUpdate - -/* 00798 80A907A8 AFA50050 */ sw $a1, 0x0050($sp) -/* 0079C 80A907AC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 007A0 80A907B0 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 007A4 80A907B4 02212821 */ addu $a1, $s1, $at -/* 007A8 80A907B8 AFA50054 */ sw $a1, 0x0054($sp) -/* 007AC 80A907BC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 007B0 80A907C0 0C01767D */ jal CollisionCheck_SetAC - ## CollisionCheck_setAC -/* 007B4 80A907C4 8FA60050 */ lw $a2, 0x0050($sp) -/* 007B8 80A907C8 8FA50054 */ lw $a1, 0x0054($sp) -/* 007BC 80A907CC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 007C0 80A907D0 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOT -/* 007C4 80A907D4 8FA60050 */ lw $a2, 0x0050($sp) -.L80A907D8: -/* 007C8 80A907D8 3C028016 */ lui $v0, %hi(gGameInfo) -/* 007CC 80A907DC 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* 007D0 80A907E0 845812D4 */ lh $t8, 0x12D4($v0) ## 801612D4 -/* 007D4 80A907E4 53000054 */ beql $t8, $zero, .L80A90938 -/* 007D8 80A907E8 8FBF004C */ lw $ra, 0x004C($sp) -/* 007DC 80A907EC 844812DE */ lh $t0, 0x12DE($v0) ## 801612DE -/* 007E0 80A907F0 51000015 */ beql $t0, $zero, .L80A90848 -/* 007E4 80A907F4 8E090134 */ lw $t1, 0x0134($s0) ## 00000134 -/* 007E8 80A907F8 C6080090 */ lwc1 $f8, 0x0090($s0) ## 00000090 -/* 007EC 80A907FC 3C0480A9 */ lui $a0, %hi(D_80A90BA0) ## $a0 = 80A90000 -/* 007F0 80A90800 24840BA0 */ addiu $a0, $a0, %lo(D_80A90BA0) ## $a0 = 80A90BA0 -/* 007F4 80A90804 460042A1 */ cvt.d.s $f10, $f8 -/* 007F8 80A90808 44075000 */ mfc1 $a3, $f10 -/* 007FC 80A9080C 44065800 */ mfc1 $a2, $f11 -/* 00800 80A90810 0C00084C */ jal osSyncPrintf - -/* 00804 80A90814 00000000 */ nop -/* 00808 80A90818 C610019C */ lwc1 $f16, 0x019C($s0) ## 0000019C -/* 0080C 80A9081C 3C0480A9 */ lui $a0, %hi(D_80A90BE0) ## $a0 = 80A90000 -/* 00810 80A90820 24840BE0 */ addiu $a0, $a0, %lo(D_80A90BE0) ## $a0 = 80A90BE0 -/* 00814 80A90824 460084A1 */ cvt.d.s $f18, $f16 -/* 00818 80A90828 44079000 */ mfc1 $a3, $f18 -/* 0081C 80A9082C 44069800 */ mfc1 $a2, $f19 -/* 00820 80A90830 0C00084C */ jal osSyncPrintf - -/* 00824 80A90834 00000000 */ nop -/* 00828 80A90838 3C0480A9 */ lui $a0, %hi(D_80A90C10) ## $a0 = 80A90000 -/* 0082C 80A9083C 0C00084C */ jal osSyncPrintf - -/* 00830 80A90840 24840C10 */ addiu $a0, $a0, %lo(D_80A90C10) ## $a0 = 80A90C10 -/* 00834 80A90844 8E090134 */ lw $t1, 0x0134($s0) ## 00000134 -.L80A90848: -/* 00838 80A90848 5520003B */ bnel $t1, $zero, .L80A90938 -/* 0083C 80A9084C 8FBF004C */ lw $ra, 0x004C($sp) -/* 00840 80A90850 86020194 */ lh $v0, 0x0194($s0) ## 00000194 -/* 00844 80A90854 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00848 80A90858 240B00FF */ addiu $t3, $zero, 0x00FF ## $t3 = 000000FF -/* 0084C 80A9085C 1040001F */ beq $v0, $zero, .L80A908DC -/* 00850 80A90860 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF -/* 00854 80A90864 304A0001 */ andi $t2, $v0, 0x0001 ## $t2 = 00000000 -/* 00858 80A90868 15400032 */ bne $t2, $zero, .L80A90934 -/* 0085C 80A9086C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00860 80A90870 860B0032 */ lh $t3, 0x0032($s0) ## 00000032 -/* 00864 80A90874 C60C0024 */ lwc1 $f12, 0x0024($s0) ## 00000024 -/* 00868 80A90878 C60E0028 */ lwc1 $f14, 0x0028($s0) ## 00000028 -/* 0086C 80A9087C 8E06002C */ lw $a2, 0x002C($s0) ## 0000002C -/* 00870 80A90880 86070030 */ lh $a3, 0x0030($s0) ## 00000030 -/* 00874 80A90884 AFAB0010 */ sw $t3, 0x0010($sp) -/* 00878 80A90888 860C0034 */ lh $t4, 0x0034($s0) ## 00000034 -/* 0087C 80A9088C 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 00880 80A90890 240D0046 */ addiu $t5, $zero, 0x0046 ## $t5 = 00000046 -/* 00884 80A90894 240E0046 */ addiu $t6, $zero, 0x0046 ## $t6 = 00000046 -/* 00888 80A90898 240F0046 */ addiu $t7, $zero, 0x0046 ## $t7 = 00000046 -/* 0088C 80A9089C 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 00890 80A908A0 24180004 */ addiu $t8, $zero, 0x0004 ## $t8 = 00000004 -/* 00894 80A908A4 AFB80034 */ sw $t8, 0x0034($sp) -/* 00898 80A908A8 AFB90030 */ sw $t9, 0x0030($sp) -/* 0089C 80A908AC AFAF002C */ sw $t7, 0x002C($sp) -/* 008A0 80A908B0 AFAE0028 */ sw $t6, 0x0028($sp) -/* 008A4 80A908B4 AFAD0024 */ sw $t5, 0x0024($sp) -/* 008A8 80A908B8 AFAC0014 */ sw $t4, 0x0014($sp) -/* 008AC 80A908BC E7A00018 */ swc1 $f0, 0x0018($sp) -/* 008B0 80A908C0 E7A0001C */ swc1 $f0, 0x001C($sp) -/* 008B4 80A908C4 E7A00020 */ swc1 $f0, 0x0020($sp) -/* 008B8 80A908C8 8E280000 */ lw $t0, 0x0000($s1) ## 00000000 -/* 008BC 80A908CC 0C018FA7 */ jal DebugDisplay_AddObject - -/* 008C0 80A908D0 AFA80038 */ sw $t0, 0x0038($sp) -/* 008C4 80A908D4 10000018 */ beq $zero, $zero, .L80A90938 -/* 008C8 80A908D8 8FBF004C */ lw $ra, 0x004C($sp) -.L80A908DC: -/* 008CC 80A908DC 86090032 */ lh $t1, 0x0032($s0) ## 00000032 -/* 008D0 80A908E0 C60C0024 */ lwc1 $f12, 0x0024($s0) ## 00000024 -/* 008D4 80A908E4 C60E0028 */ lwc1 $f14, 0x0028($s0) ## 00000028 -/* 008D8 80A908E8 8E06002C */ lw $a2, 0x002C($s0) ## 0000002C -/* 008DC 80A908EC 86070030 */ lh $a3, 0x0030($s0) ## 00000030 -/* 008E0 80A908F0 AFA90010 */ sw $t1, 0x0010($sp) -/* 008E4 80A908F4 860A0034 */ lh $t2, 0x0034($s0) ## 00000034 -/* 008E8 80A908F8 44810000 */ mtc1 $at, $f0 ## $f0 = 0.00 -/* 008EC 80A908FC 240D00FF */ addiu $t5, $zero, 0x00FF ## $t5 = 000000FF -/* 008F0 80A90900 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 -/* 008F4 80A90904 AFAE0034 */ sw $t6, 0x0034($sp) -/* 008F8 80A90908 AFAD0030 */ sw $t5, 0x0030($sp) -/* 008FC 80A9090C AFAC002C */ sw $t4, 0x002C($sp) -/* 00900 80A90910 AFAB0028 */ sw $t3, 0x0028($sp) -/* 00904 80A90914 AFA00024 */ sw $zero, 0x0024($sp) -/* 00908 80A90918 AFAA0014 */ sw $t2, 0x0014($sp) -/* 0090C 80A9091C E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00910 80A90920 E7A0001C */ swc1 $f0, 0x001C($sp) -/* 00914 80A90924 E7A00020 */ swc1 $f0, 0x0020($sp) -/* 00918 80A90928 8E2F0000 */ lw $t7, 0x0000($s1) ## 00000000 -/* 0091C 80A9092C 0C018FA7 */ jal DebugDisplay_AddObject - -/* 00920 80A90930 AFAF0038 */ sw $t7, 0x0038($sp) -.L80A90934: -/* 00924 80A90934 8FBF004C */ lw $ra, 0x004C($sp) -.L80A90938: -/* 00928 80A90938 8FB00044 */ lw $s0, 0x0044($sp) -/* 0092C 80A9093C 8FB10048 */ lw $s1, 0x0048($sp) -/* 00930 80A90940 03E00008 */ jr $ra -/* 00934 80A90944 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A90264.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A90264.s deleted file mode 100644 index c926c9823d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A90264.s +++ /dev/null @@ -1,181 +0,0 @@ -.rdata -glabel D_80A90B48 - .asciz "\x1b[32m☆☆☆☆☆ SAVE 終了 ☆☆☆☆☆ %d\n\x1b[m" - .balign 4 - -glabel D_80A90B74 - .asciz "\x1b[32m☆☆☆☆☆ SAVE 終了 ☆☆☆☆☆ %d\n\x1b[m" - .balign 4 - -.text -glabel func_80A90264 -/* 00254 80A90264 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00258 80A90268 AFBF002C */ sw $ra, 0x002C($sp) -/* 0025C 80A9026C AFB10028 */ sw $s1, 0x0028($sp) -/* 00260 80A90270 AFB00024 */ sw $s0, 0x0024($sp) -/* 00264 80A90274 848E0194 */ lh $t6, 0x0194($a0) ## 00000194 -/* 00268 80A90278 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 0026C 80A9027C 3C188016 */ lui $t8, %hi(gGameInfo) -/* 00270 80A90280 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 00274 80A90284 A48F0194 */ sh $t7, 0x0194($a0) ## 00000194 -/* 00278 80A90288 8F18FA90 */ lw $t8, %lo(gGameInfo)($t8) -/* 0027C 80A9028C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00280 80A90290 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00284 80A90294 871912D6 */ lh $t9, 0x12D6($t8) ## 801612D6 -/* 00288 80A90298 5320003F */ beql $t9, $zero, .L80A90398 -/* 0028C 80A9029C C6120090 */ lwc1 $f18, 0x0090($s0) ## 00000090 -/* 00290 80A902A0 C4840090 */ lwc1 $f4, 0x0090($a0) ## 00000090 -/* 00294 80A902A4 C486019C */ lwc1 $f6, 0x019C($a0) ## 0000019C -/* 00298 80A902A8 4606203C */ c.lt.s $f4, $f6 -/* 0029C 80A902AC 00000000 */ nop -/* 002A0 80A902B0 45020039 */ bc1fl .L80A90398 -/* 002A4 80A902B4 C6120090 */ lwc1 $f18, 0x0090($s0) ## 00000090 -/* 002A8 80A902B8 C4480028 */ lwc1 $f8, 0x0028($v0) ## 00000028 -/* 002AC 80A902BC C48A0028 */ lwc1 $f10, 0x0028($a0) ## 00000028 -/* 002B0 80A902C0 C49001A0 */ lwc1 $f16, 0x01A0($a0) ## 000001A0 -/* 002B4 80A902C4 3C0880A9 */ lui $t0, %hi(func_80A90948) ## $t0 = 80A90000 -/* 002B8 80A902C8 460A4001 */ sub.s $f0, $f8, $f10 -/* 002BC 80A902CC 25080948 */ addiu $t0, $t0, %lo(func_80A90948) ## $t0 = 80A90948 -/* 002C0 80A902D0 46000005 */ abs.s $f0, $f0 -/* 002C4 80A902D4 4610003C */ c.lt.s $f0, $f16 -/* 002C8 80A902D8 00000000 */ nop -/* 002CC 80A902DC 4502002E */ bc1fl .L80A90398 -/* 002D0 80A902E0 C6120090 */ lwc1 $f18, 0x0090($s0) ## 00000090 -/* 002D4 80A902E4 AC880134 */ sw $t0, 0x0134($a0) ## 00000134 -/* 002D8 80A902E8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 002DC 80A902EC 260501AC */ addiu $a1, $s0, 0x01AC ## $a1 = 000001AC -/* 002E0 80A902F0 0C0170D9 */ jal Collider_InitCylinder - -/* 002E4 80A902F4 AFA50030 */ sw $a1, 0x0030($sp) -/* 002E8 80A902F8 3C0780A9 */ lui $a3, %hi(D_80A909A0) ## $a3 = 80A90000 -/* 002EC 80A902FC 8FA50030 */ lw $a1, 0x0030($sp) -/* 002F0 80A90300 24E709A0 */ addiu $a3, $a3, %lo(D_80A909A0) ## $a3 = 80A909A0 -/* 002F4 80A90304 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 002F8 80A90308 0C01712B */ jal Collider_SetCylinder - -/* 002FC 80A9030C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00300 80A90310 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 00304 80A90314 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 00308 80A90318 24E70214 */ addiu $a3, $a3, 0x0214 ## $a3 = 06000214 -/* 0030C 80A9031C 24C665B0 */ addiu $a2, $a2, 0x65B0 ## $a2 = 060065B0 -/* 00310 80A90320 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00314 80A90324 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 -/* 00318 80A90328 AFA00010 */ sw $zero, 0x0010($sp) -/* 0031C 80A9032C AFA00014 */ sw $zero, 0x0014($sp) -/* 00320 80A90330 0C0291BE */ jal SkelAnime_InitSV -/* 00324 80A90334 AFA00018 */ sw $zero, 0x0018($sp) -/* 00328 80A90338 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0032C 80A9033C 0C020120 */ jal func_80080480 -/* 00330 80A90340 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00334 80A90344 8E090004 */ lw $t1, 0x0004($s0) ## 00000004 -/* 00338 80A90348 3C010800 */ lui $at, 0x0800 ## $at = 08000000 -/* 0033C 80A9034C 34210001 */ ori $at, $at, 0x0001 ## $at = 08000001 -/* 00340 80A90350 01215025 */ or $t2, $t1, $at ## $t2 = 08000001 -/* 00344 80A90354 AE0A0004 */ sw $t2, 0x0004($s0) ## 00000004 -/* 00348 80A90358 0C01E221 */ jal func_80078884 -/* 0034C 80A9035C 24044802 */ addiu $a0, $zero, 0x4802 ## $a0 = 00004802 -/* 00350 80A90360 86050196 */ lh $a1, 0x0196($s0) ## 00000196 -/* 00354 80A90364 04A00004 */ bltz $a1, .L80A90378 -/* 00358 80A90368 00000000 */ nop -/* 0035C 80A9036C 0C00B2DD */ jal Flags_SetSwitch - -/* 00360 80A90370 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00364 80A90374 86050196 */ lh $a1, 0x0196($s0) ## 00000196 -.L80A90378: -/* 00368 80A90378 3C0480A9 */ lui $a0, %hi(D_80A90B48) ## $a0 = 80A90000 -/* 0036C 80A9037C 0C00084C */ jal osSyncPrintf - -/* 00370 80A90380 24840B48 */ addiu $a0, $a0, %lo(D_80A90B48) ## $a0 = 80A90B48 -/* 00374 80A90384 3C0B80A9 */ lui $t3, %hi(func_80A904D8) ## $t3 = 80A90000 -/* 00378 80A90388 256B04D8 */ addiu $t3, $t3, %lo(func_80A904D8) ## $t3 = 80A904D8 -/* 0037C 80A9038C 1000004D */ beq $zero, $zero, .L80A904C4 -/* 00380 80A90390 AE0B014C */ sw $t3, 0x014C($s0) ## 0000014C -/* 00384 80A90394 C6120090 */ lwc1 $f18, 0x0090($s0) ## 00000090 -.L80A90398: -/* 00388 80A90398 C604019C */ lwc1 $f4, 0x019C($s0) ## 0000019C -/* 0038C 80A9039C 4604903C */ c.lt.s $f18, $f4 -/* 00390 80A903A0 00000000 */ nop -/* 00394 80A903A4 45020048 */ bc1fl .L80A904C8 -/* 00398 80A903A8 8FBF002C */ lw $ra, 0x002C($sp) -/* 0039C 80A903AC C4460028 */ lwc1 $f6, 0x0028($v0) ## 00000028 -/* 003A0 80A903B0 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 003A4 80A903B4 C60A01A0 */ lwc1 $f10, 0x01A0($s0) ## 000001A0 -/* 003A8 80A903B8 3C0C8016 */ lui $t4, %hi(gSaveContext+0xee6) -/* 003AC 80A903BC 46083001 */ sub.s $f0, $f6, $f8 -/* 003B0 80A903C0 46000005 */ abs.s $f0, $f0 -/* 003B4 80A903C4 460A003C */ c.lt.s $f0, $f10 -/* 003B8 80A903C8 00000000 */ nop -/* 003BC 80A903CC 4502003E */ bc1fl .L80A904C8 -/* 003C0 80A903D0 8FBF002C */ lw $ra, 0x002C($sp) -/* 003C4 80A903D4 958CF546 */ lhu $t4, %lo(gSaveContext+0xee6)($t4) -/* 003C8 80A903D8 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 -/* 003CC 80A903DC 01D17021 */ addu $t6, $t6, $s1 -/* 003D0 80A903E0 318D1000 */ andi $t5, $t4, 0x1000 ## $t5 = 00000000 -/* 003D4 80A903E4 51A00038 */ beql $t5, $zero, .L80A904C8 -/* 003D8 80A903E8 8FBF002C */ lw $ra, 0x002C($sp) -/* 003DC 80A903EC A6000194 */ sh $zero, 0x0194($s0) ## 00000194 -/* 003E0 80A903F0 95CE04C6 */ lhu $t6, 0x04C6($t6) ## 000104C6 -/* 003E4 80A903F4 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 003E8 80A903F8 55C10033 */ bnel $t6, $at, .L80A904C8 -/* 003EC 80A903FC 8FBF002C */ lw $ra, 0x002C($sp) -/* 003F0 80A90400 86050196 */ lh $a1, 0x0196($s0) ## 00000196 -/* 003F4 80A90404 04A00004 */ bltz $a1, .L80A90418 -/* 003F8 80A90408 00000000 */ nop -/* 003FC 80A9040C 0C00B2DD */ jal Flags_SetSwitch - -/* 00400 80A90410 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00404 80A90414 86050196 */ lh $a1, 0x0196($s0) ## 00000196 -.L80A90418: -/* 00408 80A90418 3C0480A9 */ lui $a0, %hi(D_80A90B74) ## $a0 = 80A90000 -/* 0040C 80A9041C 0C00084C */ jal osSyncPrintf - -/* 00410 80A90420 24840B74 */ addiu $a0, $a0, %lo(D_80A90B74) ## $a0 = 80A90B74 -/* 00414 80A90424 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00418 80A90428 00310821 */ addu $at, $at, $s1 -/* 0041C 80A9042C 240F0004 */ addiu $t7, $zero, 0x0004 ## $t7 = 00000004 -/* 00420 80A90430 3C1880A9 */ lui $t8, %hi(func_80A90948) ## $t8 = 80A90000 -/* 00424 80A90434 A42F04C6 */ sh $t7, 0x04C6($at) ## 000104C6 -/* 00428 80A90438 27180948 */ addiu $t8, $t8, %lo(func_80A90948) ## $t8 = 80A90948 -/* 0042C 80A9043C AE180134 */ sw $t8, 0x0134($s0) ## 00000134 -/* 00430 80A90440 260501AC */ addiu $a1, $s0, 0x01AC ## $a1 = 000001AC -/* 00434 80A90444 AFA50030 */ sw $a1, 0x0030($sp) -/* 00438 80A90448 0C0170D9 */ jal Collider_InitCylinder - -/* 0043C 80A9044C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00440 80A90450 3C0780A9 */ lui $a3, %hi(D_80A909A0) ## $a3 = 80A90000 -/* 00444 80A90454 8FA50030 */ lw $a1, 0x0030($sp) -/* 00448 80A90458 24E709A0 */ addiu $a3, $a3, %lo(D_80A909A0) ## $a3 = 80A909A0 -/* 0044C 80A9045C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00450 80A90460 0C01712B */ jal Collider_SetCylinder - -/* 00454 80A90464 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00458 80A90468 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 0045C 80A9046C 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 00460 80A90470 24E70214 */ addiu $a3, $a3, 0x0214 ## $a3 = 06000214 -/* 00464 80A90474 24C665B0 */ addiu $a2, $a2, 0x65B0 ## $a2 = 060065B0 -/* 00468 80A90478 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0046C 80A9047C 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 -/* 00470 80A90480 AFA00010 */ sw $zero, 0x0010($sp) -/* 00474 80A90484 AFA00014 */ sw $zero, 0x0014($sp) -/* 00478 80A90488 0C0291BE */ jal SkelAnime_InitSV -/* 0047C 80A9048C AFA00018 */ sw $zero, 0x0018($sp) -/* 00480 80A90490 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00484 80A90494 0C020120 */ jal func_80080480 -/* 00488 80A90498 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0048C 80A9049C 0C01E221 */ jal func_80078884 -/* 00490 80A904A0 24044802 */ addiu $a0, $zero, 0x4802 ## $a0 = 00004802 -/* 00494 80A904A4 8E190004 */ lw $t9, 0x0004($s0) ## 00000004 -/* 00498 80A904A8 3C010800 */ lui $at, 0x0800 ## $at = 08000000 -/* 0049C 80A904AC 34210001 */ ori $at, $at, 0x0001 ## $at = 08000001 -/* 004A0 80A904B0 3C0980A9 */ lui $t1, %hi(func_80A904D8) ## $t1 = 80A90000 -/* 004A4 80A904B4 252904D8 */ addiu $t1, $t1, %lo(func_80A904D8) ## $t1 = 80A904D8 -/* 004A8 80A904B8 03214025 */ or $t0, $t9, $at ## $t0 = 08000001 -/* 004AC 80A904BC AE080004 */ sw $t0, 0x0004($s0) ## 00000004 -/* 004B0 80A904C0 AE09014C */ sw $t1, 0x014C($s0) ## 0000014C -.L80A904C4: -/* 004B4 80A904C4 8FBF002C */ lw $ra, 0x002C($sp) -.L80A904C8: -/* 004B8 80A904C8 8FB00024 */ lw $s0, 0x0024($sp) -/* 004BC 80A904CC 8FB10028 */ lw $s1, 0x0028($sp) -/* 004C0 80A904D0 03E00008 */ jr $ra -/* 004C4 80A904D4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A904D8.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A904D8.s deleted file mode 100644 index 5422c0d309..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A904D8.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_80A904D8 -/* 004C8 80A904D8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 004CC 80A904DC AFA40028 */ sw $a0, 0x0028($sp) -/* 004D0 80A904E0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 004D4 80A904E4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 004D8 80A904E8 AFA5002C */ sw $a1, 0x002C($sp) -/* 004DC 80A904EC 0C028800 */ jal SkelAnime_GetFrameCount - -/* 004E0 80A904F0 24840214 */ addiu $a0, $a0, 0x0214 ## $a0 = 06000214 -/* 004E4 80A904F4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 004E8 80A904F8 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 004EC 80A904FC 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 004F0 80A90500 468021A0 */ cvt.s.w $f6, $f4 -/* 004F4 80A90504 8FA40028 */ lw $a0, 0x0028($sp) -/* 004F8 80A90508 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 004FC 80A9050C 24A50214 */ addiu $a1, $a1, 0x0214 ## $a1 = 06000214 -/* 00500 80A90510 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00504 80A90514 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00508 80A90518 4600320D */ trunc.w.s $f8, $f6 -/* 0050C 80A9051C AFA00014 */ sw $zero, 0x0014($sp) -/* 00510 80A90520 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 00514 80A90524 24840150 */ addiu $a0, $a0, 0x0150 ## $a0 = 00000150 -/* 00518 80A90528 440F4000 */ mfc1 $t7, $f8 -/* 0051C 80A9052C 00000000 */ nop -/* 00520 80A90530 000FC400 */ sll $t8, $t7, 16 -/* 00524 80A90534 0018CC03 */ sra $t9, $t8, 16 -/* 00528 80A90538 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 -/* 0052C 80A9053C 00000000 */ nop -/* 00530 80A90540 46805420 */ cvt.s.w $f16, $f10 -/* 00534 80A90544 0C029468 */ jal SkelAnime_ChangeAnim - -/* 00538 80A90548 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 0053C 80A9054C 8FA40028 */ lw $a0, 0x0028($sp) -/* 00540 80A90550 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00544 80A90554 240528BF */ addiu $a1, $zero, 0x28BF ## $a1 = 000028BF -/* 00548 80A90558 8FA90028 */ lw $t1, 0x0028($sp) -/* 0054C 80A9055C 3C0880A9 */ lui $t0, %hi(func_80A90578) ## $t0 = 80A90000 -/* 00550 80A90560 25080578 */ addiu $t0, $t0, %lo(func_80A90578) ## $t0 = 80A90578 -/* 00554 80A90564 AD28014C */ sw $t0, 0x014C($t1) ## 0000014C -/* 00558 80A90568 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0055C 80A9056C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00560 80A90570 03E00008 */ jr $ra -/* 00564 80A90574 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A90578.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A90578.s deleted file mode 100644 index 5569cff04d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A90578.s +++ /dev/null @@ -1,52 +0,0 @@ -glabel func_80A90578 -/* 00568 80A90578 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0056C 80A9057C AFB00018 */ sw $s0, 0x0018($sp) -/* 00570 80A90580 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00574 80A90584 AFBF001C */ sw $ra, 0x001C($sp) -/* 00578 80A90588 AFA50024 */ sw $a1, 0x0024($sp) -/* 0057C 80A9058C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00580 80A90590 24840150 */ addiu $a0, $a0, 0x0150 ## $a0 = 00000150 -/* 00584 80A90594 C6040168 */ lwc1 $f4, 0x0168($s0) ## 00000168 -/* 00588 80A90598 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 0058C 80A9059C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00590 80A905A0 4600218D */ trunc.w.s $f6, $f4 -/* 00594 80A905A4 44023000 */ mfc1 $v0, $f6 -/* 00598 80A905A8 00000000 */ nop -/* 0059C 80A905AC 00021400 */ sll $v0, $v0, 16 -/* 005A0 80A905B0 00021403 */ sra $v0, $v0, 16 -/* 005A4 80A905B4 10410003 */ beq $v0, $at, .L80A905C4 -/* 005A8 80A905B8 24010011 */ addiu $at, $zero, 0x0011 ## $at = 00000011 -/* 005AC 80A905BC 54410004 */ bnel $v0, $at, .L80A905D0 -/* 005B0 80A905C0 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6 -.L80A905C4: -/* 005B4 80A905C4 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 005B8 80A905C8 2405286A */ addiu $a1, $zero, 0x286A ## $a1 = 0000286A -/* 005BC 80A905CC 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6 -.L80A905D0: -/* 005C0 80A905D0 260400BC */ addiu $a0, $s0, 0x00BC ## $a0 = 000000BC -/* 005C4 80A905D4 3C053F00 */ lui $a1, 0x3F00 ## $a1 = 3F000000 -/* 005C8 80A905D8 25F80800 */ addiu $t8, $t7, 0x0800 ## $t8 = 00000800 -/* 005CC 80A905DC A61800B6 */ sh $t8, 0x00B6($s0) ## 000000B6 -/* 005D0 80A905E0 0C01E123 */ jal Math_SmoothDownscaleMaxF - -/* 005D4 80A905E4 3C0643FA */ lui $a2, 0x43FA ## $a2 = 43FA0000 -/* 005D8 80A905E8 3C01C2C8 */ lui $at, 0xC2C8 ## $at = C2C80000 -/* 005DC 80A905EC 44814000 */ mtc1 $at, $f8 ## $f8 = -100.00 -/* 005E0 80A905F0 C60A00BC */ lwc1 $f10, 0x00BC($s0) ## 000000BC -/* 005E4 80A905F4 3C1980A9 */ lui $t9, %hi(func_80A9062C) ## $t9 = 80A90000 -/* 005E8 80A905F8 460A403C */ c.lt.s $f8, $f10 -/* 005EC 80A905FC 00000000 */ nop -/* 005F0 80A90600 45020006 */ bc1fl .L80A9061C -/* 005F4 80A90604 8FBF001C */ lw $ra, 0x001C($sp) -/* 005F8 80A90608 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 005FC 80A9060C 2739062C */ addiu $t9, $t9, %lo(func_80A9062C) ## $t9 = 80A9062C -/* 00600 80A90610 AE19014C */ sw $t9, 0x014C($s0) ## 0000014C -/* 00604 80A90614 E61000BC */ swc1 $f16, 0x00BC($s0) ## 000000BC -/* 00608 80A90618 8FBF001C */ lw $ra, 0x001C($sp) -.L80A9061C: -/* 0060C 80A9061C 8FB00018 */ lw $s0, 0x0018($sp) -/* 00610 80A90620 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00614 80A90624 03E00008 */ jr $ra -/* 00618 80A90628 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A9062C.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A9062C.s deleted file mode 100644 index 502dd8a091..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A9062C.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_80A9062C -/* 0061C 80A9062C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00620 80A90630 AFA40028 */ sw $a0, 0x0028($sp) -/* 00624 80A90634 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00628 80A90638 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 0062C 80A9063C AFA5002C */ sw $a1, 0x002C($sp) -/* 00630 80A90640 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00634 80A90644 24840214 */ addiu $a0, $a0, 0x0214 ## $a0 = 06000214 -/* 00638 80A90648 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 0063C 80A9064C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00640 80A90650 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00644 80A90654 468021A0 */ cvt.s.w $f6, $f4 -/* 00648 80A90658 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 0064C 80A9065C 8FA40028 */ lw $a0, 0x0028($sp) -/* 00650 80A90660 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00654 80A90664 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 00658 80A90668 44060000 */ mfc1 $a2, $f0 -/* 0065C 80A9066C 4600320D */ trunc.w.s $f8, $f6 -/* 00660 80A90670 44070000 */ mfc1 $a3, $f0 -/* 00664 80A90674 AFA80014 */ sw $t0, 0x0014($sp) -/* 00668 80A90678 24A50214 */ addiu $a1, $a1, 0x0214 ## $a1 = 06000214 -/* 0066C 80A9067C 440F4000 */ mfc1 $t7, $f8 -/* 00670 80A90680 24840150 */ addiu $a0, $a0, 0x0150 ## $a0 = 00000150 -/* 00674 80A90684 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 00678 80A90688 000FC400 */ sll $t8, $t7, 16 -/* 0067C 80A9068C 0018CC03 */ sra $t9, $t8, 16 -/* 00680 80A90690 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 -/* 00684 80A90694 00000000 */ nop -/* 00688 80A90698 46805420 */ cvt.s.w $f16, $f10 -/* 0068C 80A9069C 0C029468 */ jal SkelAnime_ChangeAnim - -/* 00690 80A906A0 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 00694 80A906A4 8FAA0028 */ lw $t2, 0x0028($sp) -/* 00698 80A906A8 3C0980A9 */ lui $t1, %hi(func_80A906C4) ## $t1 = 80A90000 -/* 0069C 80A906AC 252906C4 */ addiu $t1, $t1, %lo(func_80A906C4) ## $t1 = 80A906C4 -/* 006A0 80A906B0 AD49014C */ sw $t1, 0x014C($t2) ## 0000014C -/* 006A4 80A906B4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 006A8 80A906B8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 006AC 80A906BC 03E00008 */ jr $ra -/* 006B0 80A906C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A906C4.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A906C4.s deleted file mode 100644 index 6075e3a8e9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A906C4.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_80A906C4 -/* 006B4 80A906C4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 006B8 80A906C8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 006BC 80A906CC AFB00020 */ sw $s0, 0x0020($sp) -/* 006C0 80A906D0 AFA5002C */ sw $a1, 0x002C($sp) -/* 006C4 80A906D4 C4860168 */ lwc1 $f6, 0x0168($a0) ## 00000168 -/* 006C8 80A906D8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 006CC 80A906DC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 006D0 80A906E0 24840168 */ addiu $a0, $a0, 0x0168 ## $a0 = 00000168 -/* 006D4 80A906E4 46062032 */ c.eq.s $f4, $f6 -/* 006D8 80A906E8 3C053F00 */ lui $a1, 0x3F00 ## $a1 = 3F000000 -/* 006DC 80A906EC 45030004 */ bc1tl .L80A90700 -/* 006E0 80A906F0 86050198 */ lh $a1, 0x0198($s0) ## 00000198 -/* 006E4 80A906F4 0C01E123 */ jal Math_SmoothDownscaleMaxF - -/* 006E8 80A906F8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 006EC 80A906FC 86050198 */ lh $a1, 0x0198($s0) ## 00000198 -.L80A90700: -/* 006F0 80A90700 AFA00010 */ sw $zero, 0x0010($sp) -/* 006F4 80A90704 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 006F8 80A90708 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 006FC 80A9070C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00700 80A90710 24070BB8 */ addiu $a3, $zero, 0x0BB8 ## $a3 = 00000BB8 -/* 00704 80A90714 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00708 80A90718 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 -/* 0070C 80A9071C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00710 80A90720 8FB00020 */ lw $s0, 0x0020($sp) -/* 00714 80A90724 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00718 80A90728 03E00008 */ jr $ra -/* 0071C 80A9072C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A90948.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A90948.s deleted file mode 100644 index 3740302548..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A90948.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80A90948 -/* 00938 80A90948 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0093C 80A9094C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00940 80A90950 AFA40028 */ sw $a0, 0x0028($sp) -/* 00944 80A90954 AFA5002C */ sw $a1, 0x002C($sp) -/* 00948 80A90958 0C024F46 */ jal func_80093D18 -/* 0094C 80A9095C 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 -/* 00950 80A90960 8FA20028 */ lw $v0, 0x0028($sp) -/* 00954 80A90964 8FA4002C */ lw $a0, 0x002C($sp) -/* 00958 80A90968 8C450154 */ lw $a1, 0x0154($v0) ## 00000154 -/* 0095C 80A9096C 8C460170 */ lw $a2, 0x0170($v0) ## 00000170 -/* 00960 80A90970 90470152 */ lbu $a3, 0x0152($v0) ## 00000152 -/* 00964 80A90974 AFA00014 */ sw $zero, 0x0014($sp) -/* 00968 80A90978 AFA00010 */ sw $zero, 0x0010($sp) -/* 0096C 80A9097C 0C0286B2 */ jal SkelAnime_DrawSV -/* 00970 80A90980 AFA20018 */ sw $v0, 0x0018($sp) -/* 00974 80A90984 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00978 80A90988 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0097C 80A9098C 03E00008 */ jr $ra -/* 00980 80A90990 00000000 */ nop -/* 00984 80A90994 00000000 */ nop -/* 00988 80A90998 00000000 */ nop -/* 0098C 80A9099C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Destroy.s deleted file mode 100644 index 909f2eafcc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Destroy.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel EnKakasi3_Destroy -/* 00000 80A90D20 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00004 80A90D24 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00008 80A90D28 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0000C 80A90D2C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00010 80A90D30 0C0170EB */ jal Collider_DestroyCylinder - -/* 00014 80A90D34 24C501BC */ addiu $a1, $a2, 0x01BC ## $a1 = 000001BC -/* 00018 80A90D38 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0001C 80A90D3C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00020 80A90D40 03E00008 */ jr $ra -/* 00024 80A90D44 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Draw.s deleted file mode 100644 index 392d68cf52..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Draw.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel EnKakasi3_Draw -/* 00F98 80A91CB8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00F9C 80A91CBC AFBF0024 */ sw $ra, 0x0024($sp) -/* 00FA0 80A91CC0 AFA40028 */ sw $a0, 0x0028($sp) -/* 00FA4 80A91CC4 AFA5002C */ sw $a1, 0x002C($sp) -/* 00FA8 80A91CC8 0C024F46 */ jal func_80093D18 -/* 00FAC 80A91CCC 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 -/* 00FB0 80A91CD0 8FA20028 */ lw $v0, 0x0028($sp) -/* 00FB4 80A91CD4 8FA4002C */ lw $a0, 0x002C($sp) -/* 00FB8 80A91CD8 8C450154 */ lw $a1, 0x0154($v0) ## 00000154 -/* 00FBC 80A91CDC 8C460170 */ lw $a2, 0x0170($v0) ## 00000170 -/* 00FC0 80A91CE0 90470152 */ lbu $a3, 0x0152($v0) ## 00000152 -/* 00FC4 80A91CE4 AFA00014 */ sw $zero, 0x0014($sp) -/* 00FC8 80A91CE8 AFA00010 */ sw $zero, 0x0010($sp) -/* 00FCC 80A91CEC 0C0286B2 */ jal SkelAnime_DrawSV -/* 00FD0 80A91CF0 AFA20018 */ sw $v0, 0x0018($sp) -/* 00FD4 80A91CF4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00FD8 80A91CF8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00FDC 80A91CFC 03E00008 */ jr $ra -/* 00FE0 80A91D00 00000000 */ nop -/* 00FE4 80A91D04 00000000 */ nop -/* 00FE8 80A91D08 00000000 */ nop -/* 00FEC 80A91D0C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Init.s deleted file mode 100644 index a1b0770c96..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Init.s +++ /dev/null @@ -1,72 +0,0 @@ -.rdata -glabel D_80A91D60 - .asciz "\n\n" - .balign 4 - -glabel D_80A91D64 - .asciz "\x1b[33m☆☆☆☆☆ おーボヌール ☆☆☆☆☆ \n\x1b[m" - .balign 4 - -.text -glabel EnKakasi3_Init -/* 00028 80A90D48 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0002C 80A90D4C AFB00028 */ sw $s0, 0x0028($sp) -/* 00030 80A90D50 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00034 80A90D54 AFBF002C */ sw $ra, 0x002C($sp) -/* 00038 80A90D58 3C0480A9 */ lui $a0, %hi(D_80A91D60) ## $a0 = 80A90000 -/* 0003C 80A90D5C AFA5003C */ sw $a1, 0x003C($sp) -/* 00040 80A90D60 0C00084C */ jal osSyncPrintf - -/* 00044 80A90D64 24841D60 */ addiu $a0, $a0, %lo(D_80A91D60) ## $a0 = 80A91D60 -/* 00048 80A90D68 3C0480A9 */ lui $a0, %hi(D_80A91D64) ## $a0 = 80A90000 -/* 0004C 80A90D6C 0C00084C */ jal osSyncPrintf - -/* 00050 80A90D70 24841D64 */ addiu $a0, $a0, %lo(D_80A91D64) ## $a0 = 80A91D64 -/* 00054 80A90D74 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 -/* 00058 80A90D78 A20E001F */ sb $t6, 0x001F($s0) ## 0000001F -/* 0005C 80A90D7C 260501BC */ addiu $a1, $s0, 0x01BC ## $a1 = 000001BC -/* 00060 80A90D80 AFA50030 */ sw $a1, 0x0030($sp) -/* 00064 80A90D84 0C0170D9 */ jal Collider_InitCylinder - -/* 00068 80A90D88 8FA4003C */ lw $a0, 0x003C($sp) -/* 0006C 80A90D8C 3C0780A9 */ lui $a3, %hi(D_80A91D10) ## $a3 = 80A90000 -/* 00070 80A90D90 8FA50030 */ lw $a1, 0x0030($sp) -/* 00074 80A90D94 24E71D10 */ addiu $a3, $a3, %lo(D_80A91D10) ## $a3 = 80A91D10 -/* 00078 80A90D98 8FA4003C */ lw $a0, 0x003C($sp) -/* 0007C 80A90D9C 0C01712B */ jal Collider_SetCylinder - -/* 00080 80A90DA0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00084 80A90DA4 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 00088 80A90DA8 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 0008C 80A90DAC 24E70214 */ addiu $a3, $a3, 0x0214 ## $a3 = 06000214 -/* 00090 80A90DB0 24C665B0 */ addiu $a2, $a2, 0x65B0 ## $a2 = 060065B0 -/* 00094 80A90DB4 8FA4003C */ lw $a0, 0x003C($sp) -/* 00098 80A90DB8 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 -/* 0009C 80A90DBC AFA00010 */ sw $zero, 0x0010($sp) -/* 000A0 80A90DC0 AFA00014 */ sw $zero, 0x0014($sp) -/* 000A4 80A90DC4 0C0291BE */ jal SkelAnime_InitSV -/* 000A8 80A90DC8 AFA00018 */ sw $zero, 0x0018($sp) -/* 000AC 80A90DCC 8A080030 */ lwl $t0, 0x0030($s0) ## 00000030 -/* 000B0 80A90DD0 9A080033 */ lwr $t0, 0x0033($s0) ## 00000033 -/* 000B4 80A90DD4 8E0F0004 */ lw $t7, 0x0004($s0) ## 00000004 -/* 000B8 80A90DD8 240900FF */ addiu $t1, $zero, 0x00FF ## $t1 = 000000FF -/* 000BC 80A90DDC AA0801B0 */ swl $t0, 0x01B0($s0) ## 000001B0 -/* 000C0 80A90DE0 BA0801B3 */ swr $t0, 0x01B3($s0) ## 000001B3 -/* 000C4 80A90DE4 96080034 */ lhu $t0, 0x0034($s0) ## 00000034 -/* 000C8 80A90DE8 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 -/* 000CC 80A90DEC 35F80400 */ ori $t8, $t7, 0x0400 ## $t8 = 00000400 -/* 000D0 80A90DF0 AE180004 */ sw $t8, 0x0004($s0) ## 00000004 -/* 000D4 80A90DF4 A20900AE */ sb $t1, 0x00AE($s0) ## 000000AE -/* 000D8 80A90DF8 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A -/* 000DC 80A90DFC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000E0 80A90E00 0C00B58B */ jal Actor_SetScale - -/* 000E4 80A90E04 A60801B4 */ sh $t0, 0x01B4($s0) ## 000001B4 -/* 000E8 80A90E08 3C0A80A9 */ lui $t2, %hi(func_80A911F0) ## $t2 = 80A90000 -/* 000EC 80A90E0C 254A11F0 */ addiu $t2, $t2, %lo(func_80A911F0) ## $t2 = 80A911F0 -/* 000F0 80A90E10 AE0A014C */ sw $t2, 0x014C($s0) ## 0000014C -/* 000F4 80A90E14 8FBF002C */ lw $ra, 0x002C($sp) -/* 000F8 80A90E18 8FB00028 */ lw $s0, 0x0028($sp) -/* 000FC 80A90E1C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00100 80A90E20 03E00008 */ jr $ra -/* 00104 80A90E24 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Update.s deleted file mode 100644 index 2bfbd1824b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Update.s +++ /dev/null @@ -1,95 +0,0 @@ -.rdata -glabel D_80A91E04 - .asciz "\n\n" - .balign 4 - -glabel D_80A91E08 - .asciz "\x1b[33m☆☆☆☆☆ フラグ！ ☆☆☆☆☆ %d\n\x1b[m" - .balign 4 - -.text -glabel EnKakasi3_Update -/* 00E6C 80A91B8C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00E70 80A91B90 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* 00E74 80A91B94 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* 00E78 80A91B98 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00E7C 80A91B9C AFB00020 */ sw $s0, 0x0020($sp) -/* 00E80 80A91BA0 AFA5003C */ sw $a1, 0x003C($sp) -/* 00E84 80A91BA4 85CF12D8 */ lh $t7, 0x12D8($t6) ## 801612D8 -/* 00E88 80A91BA8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00E8C 80A91BAC 3C0480A9 */ lui $a0, %hi(D_80A91E04) ## $a0 = 80A90000 -/* 00E90 80A91BB0 51E00009 */ beql $t7, $zero, .L80A91BD8 -/* 00E94 80A91BB4 8A0900B4 */ lwl $t1, 0x00B4($s0) ## 000000B4 -/* 00E98 80A91BB8 0C00084C */ jal osSyncPrintf - -/* 00E9C 80A91BBC 24841E04 */ addiu $a0, $a0, %lo(D_80A91E04) ## $a0 = 80A91E04 -/* 00EA0 80A91BC0 3C0480A9 */ lui $a0, %hi(D_80A91E08) ## $a0 = 80A90000 -/* 00EA4 80A91BC4 3C058016 */ lui $a1, %hi(gSaveContext+0x12c5) -/* 00EA8 80A91BC8 90A5F925 */ lbu $a1, %lo(gSaveContext+0x12c5)($a1) -/* 00EAC 80A91BCC 0C00084C */ jal osSyncPrintf - -/* 00EB0 80A91BD0 24841E08 */ addiu $a0, $a0, %lo(D_80A91E08) ## $a0 = 80A91E08 -/* 00EB4 80A91BD4 8A0900B4 */ lwl $t1, 0x00B4($s0) ## 000000B4 -.L80A91BD8: -/* 00EB8 80A91BD8 9A0900B7 */ lwr $t1, 0x00B7($s0) ## 000000B7 -/* 00EBC 80A91BDC 86180198 */ lh $t8, 0x0198($s0) ## 00000198 -/* 00EC0 80A91BE0 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -/* 00EC4 80A91BE4 AA090030 */ swl $t1, 0x0030($s0) ## 00000030 -/* 00EC8 80A91BE8 BA090033 */ swr $t1, 0x0033($s0) ## 00000033 -/* 00ECC 80A91BEC 960900B8 */ lhu $t1, 0x00B8($s0) ## 000000B8 -/* 00ED0 80A91BF0 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 00ED4 80A91BF4 A6190198 */ sh $t9, 0x0198($s0) ## 00000198 -/* 00ED8 80A91BF8 02001025 */ or $v0, $s0, $zero ## $v0 = 00000000 -/* 00EDC 80A91BFC 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 -/* 00EE0 80A91C00 A6090034 */ sh $t1, 0x0034($s0) ## 00000034 -.L80A91C04: -/* 00EE4 80A91C04 8444019C */ lh $a0, 0x019C($v0) ## 0000019C -/* 00EE8 80A91C08 24630002 */ addiu $v1, $v1, 0x0002 ## $v1 = 00000002 -/* 00EEC 80A91C0C 10800002 */ beq $a0, $zero, .L80A91C18 -/* 00EF0 80A91C10 248AFFFF */ addiu $t2, $a0, 0xFFFF ## $t2 = FFFFFFFF -/* 00EF4 80A91C14 A44A019C */ sh $t2, 0x019C($v0) ## 0000019C -.L80A91C18: -/* 00EF8 80A91C18 1465FFFA */ bne $v1, $a1, .L80A91C04 -/* 00EFC 80A91C1C 24420002 */ addiu $v0, $v0, 0x0002 ## $v0 = 00000002 -/* 00F00 80A91C20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F04 80A91C24 0C00B56E */ jal Actor_SetHeight - -/* 00F08 80A91C28 3C054270 */ lui $a1, 0x4270 ## $a1 = 42700000 -/* 00F0C 80A91C2C 8E19014C */ lw $t9, 0x014C($s0) ## 0000014C -/* 00F10 80A91C30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F14 80A91C34 8FA5003C */ lw $a1, 0x003C($sp) -/* 00F18 80A91C38 0320F809 */ jalr $ra, $t9 -/* 00F1C 80A91C3C 00000000 */ nop -/* 00F20 80A91C40 0C00B638 */ jal Actor_MoveForward - -/* 00F24 80A91C44 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F28 80A91C48 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 00F2C 80A91C4C 44810000 */ mtc1 $at, $f0 ## $f0 = 50.00 -/* 00F30 80A91C50 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 00F34 80A91C54 44812000 */ mtc1 $at, $f4 ## $f4 = 100.00 -/* 00F38 80A91C58 240B001C */ addiu $t3, $zero, 0x001C ## $t3 = 0000001C -/* 00F3C 80A91C5C 44060000 */ mfc1 $a2, $f0 -/* 00F40 80A91C60 44070000 */ mfc1 $a3, $f0 -/* 00F44 80A91C64 AFAB0014 */ sw $t3, 0x0014($sp) -/* 00F48 80A91C68 8FA4003C */ lw $a0, 0x003C($sp) -/* 00F4C 80A91C6C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00F50 80A91C70 0C00B92D */ jal func_8002E4B4 -/* 00F54 80A91C74 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00F58 80A91C78 260601BC */ addiu $a2, $s0, 0x01BC ## $a2 = 000001BC -/* 00F5C 80A91C7C 00C02825 */ or $a1, $a2, $zero ## $a1 = 000001BC -/* 00F60 80A91C80 AFA60028 */ sw $a2, 0x0028($sp) -/* 00F64 80A91C84 0C0189B7 */ jal Collider_CylinderUpdate - -/* 00F68 80A91C88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F6C 80A91C8C 8FA4003C */ lw $a0, 0x003C($sp) -/* 00F70 80A91C90 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00F74 80A91C94 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 00F78 80A91C98 8FA60028 */ lw $a2, 0x0028($sp) -/* 00F7C 80A91C9C 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOT -/* 00F80 80A91CA0 00812821 */ addu $a1, $a0, $at -/* 00F84 80A91CA4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00F88 80A91CA8 8FB00020 */ lw $s0, 0x0020($sp) -/* 00F8C 80A91CAC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00F90 80A91CB0 03E00008 */ jr $ra -/* 00F94 80A91CB4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A90E28.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A90E28.s deleted file mode 100644 index 000c6a1263..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A90E28.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_80A90E28 -/* 00108 80A90E28 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0010C 80A90E2C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00110 80A90E30 AFB00020 */ sw $s0, 0x0020($sp) -/* 00114 80A90E34 A48001AE */ sh $zero, 0x01AE($a0) ## 000001AE -/* 00118 80A90E38 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 0011C 80A90E3C 848E01AE */ lh $t6, 0x01AE($a0) ## 000001AE -/* 00120 80A90E40 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00124 80A90E44 A48001A4 */ sh $zero, 0x01A4($a0) ## 000001A4 -/* 00128 80A90E48 24840168 */ addiu $a0, $a0, 0x0168 ## $a0 = 00000168 -/* 0012C 80A90E4C 3C053F00 */ lui $a1, 0x3F00 ## $a1 = 3F000000 -/* 00130 80A90E50 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00134 80A90E54 E4840004 */ swc1 $f4, 0x0004($a0) ## 0000016C -/* 00138 80A90E58 0C01E123 */ jal Math_SmoothDownscaleMaxF - -/* 0013C 80A90E5C A48E0042 */ sh $t6, 0x0042($a0) ## 000001AA -/* 00140 80A90E60 860501B0 */ lh $a1, 0x01B0($s0) ## 000001B0 -/* 00144 80A90E64 AFA00010 */ sw $zero, 0x0010($sp) -/* 00148 80A90E68 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 0014C 80A90E6C 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 00150 80A90E70 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00154 80A90E74 24072710 */ addiu $a3, $zero, 0x2710 ## $a3 = 00002710 -/* 00158 80A90E78 860501B2 */ lh $a1, 0x01B2($s0) ## 000001B2 -/* 0015C 80A90E7C AFA00010 */ sw $zero, 0x0010($sp) -/* 00160 80A90E80 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 00164 80A90E84 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 00168 80A90E88 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 0016C 80A90E8C 24072710 */ addiu $a3, $zero, 0x2710 ## $a3 = 00002710 -/* 00170 80A90E90 860501B4 */ lh $a1, 0x01B4($s0) ## 000001B4 -/* 00174 80A90E94 AFA00010 */ sw $zero, 0x0010($sp) -/* 00178 80A90E98 260400B8 */ addiu $a0, $s0, 0x00B8 ## $a0 = 000000B8 -/* 0017C 80A90E9C 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 00180 80A90EA0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00184 80A90EA4 24072710 */ addiu $a3, $zero, 0x2710 ## $a3 = 00002710 -/* 00188 80A90EA8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0018C 80A90EAC 8FB00020 */ lw $s0, 0x0020($sp) -/* 00190 80A90EB0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00194 80A90EB4 03E00008 */ jr $ra -/* 00198 80A90EB8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A90EBC.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A90EBC.s deleted file mode 100644 index ec8bb71fe8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A90EBC.s +++ /dev/null @@ -1,250 +0,0 @@ -.late_rodata -glabel D_80A91E34 - .word 0x412FD70A -glabel D_80A91E38 - .word 0x409FAE14 -glabel D_80A91E3C - .word 0x403F5C29 -glabel jtbl_80A91E40 -.word L80A90F68 -.word L80A90F98 -.word L80A90FB4 -.word L80A90FD4 -.word L80A90FF4 -.word 0x00000000, 0x00000000, 0x00000000 - -.text -glabel func_80A90EBC -/* 0019C 80A90EBC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 001A0 80A90EC0 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 001A4 80A90EC4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 001A8 80A90EC8 AFB00020 */ sw $s0, 0x0020($sp) -/* 001AC 80A90ECC 00451021 */ addu $v0, $v0, $a1 -/* 001B0 80A90ED0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 001B4 80A90ED4 10C0001C */ beq $a2, $zero, .L80A90F48 -/* 001B8 80A90ED8 904204E8 */ lbu $v0, 0x04E8($v0) ## 000104E8 -/* 001BC 80A90EDC 848E01A2 */ lh $t6, 0x01A2($a0) ## 000001A2 -/* 001C0 80A90EE0 3C0180A9 */ lui $at, %hi(D_80A91E34) ## $at = 80A90000 -/* 001C4 80A90EE4 15C0000F */ bne $t6, $zero, .L80A90F24 -/* 001C8 80A90EE8 00000000 */ nop -/* 001CC 80A90EEC 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 001D0 80A90EF0 C42C1E34 */ lwc1 $f12, %lo(D_80A91E34)($at) -/* 001D4 80A90EF4 4600010D */ trunc.w.s $f4, $f0 -/* 001D8 80A90EF8 3C0180A9 */ lui $at, %hi(D_80A91E38) ## $at = 80A90000 -/* 001DC 80A90EFC 44082000 */ mfc1 $t0, $f4 -/* 001E0 80A90F00 00000000 */ nop -/* 001E4 80A90F04 2509001E */ addiu $t1, $t0, 0x001E ## $t1 = 0000001E -/* 001E8 80A90F08 A60901A2 */ sh $t1, 0x01A2($s0) ## 000001A2 -/* 001EC 80A90F0C 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 001F0 80A90F10 C42C1E38 */ lwc1 $f12, %lo(D_80A91E38)($at) -/* 001F4 80A90F14 4600018D */ trunc.w.s $f6, $f0 -/* 001F8 80A90F18 440B3000 */ mfc1 $t3, $f6 -/* 001FC 80A90F1C 00000000 */ nop -/* 00200 80A90F20 A60B01A6 */ sh $t3, 0x01A6($s0) ## 000001A6 -.L80A90F24: -/* 00204 80A90F24 3C0180A9 */ lui $at, %hi(D_80A91E3C) ## $at = 80A90000 -/* 00208 80A90F28 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 0020C 80A90F2C C42C1E3C */ lwc1 $f12, %lo(D_80A91E3C)($at) -/* 00210 80A90F30 4600020D */ trunc.w.s $f8, $f0 -/* 00214 80A90F34 860201A6 */ lh $v0, 0x01A6($s0) ## 000001A6 -/* 00218 80A90F38 440F4000 */ mfc1 $t7, $f8 -/* 0021C 80A90F3C 00000000 */ nop -/* 00220 80A90F40 25F80005 */ addiu $t8, $t7, 0x0005 ## $t8 = 00000005 -/* 00224 80A90F44 A618019A */ sh $t8, 0x019A($s0) ## 0000019A -.L80A90F48: -/* 00228 80A90F48 2C410005 */ sltiu $at, $v0, 0x0005 -/* 0022C 80A90F4C 1020002F */ beq $at, $zero, .L80A9100C -/* 00230 80A90F50 0002C880 */ sll $t9, $v0, 2 -/* 00234 80A90F54 3C0180A9 */ lui $at, %hi(jtbl_80A91E40) ## $at = 80A90000 -/* 00238 80A90F58 00390821 */ addu $at, $at, $t9 -/* 0023C 80A90F5C 8C391E40 */ lw $t9, %lo(jtbl_80A91E40)($at) -/* 00240 80A90F60 03200008 */ jr $t9 -/* 00244 80A90F64 00000000 */ nop -glabel L80A90F68 -/* 00248 80A90F68 8608019A */ lh $t0, 0x019A($s0) ## 0000019A -/* 0024C 80A90F6C 860A01A4 */ lh $t2, 0x01A4($s0) ## 000001A4 -/* 00250 80A90F70 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 00254 80A90F74 25090001 */ addiu $t1, $t0, 0x0001 ## $t1 = 00000001 -/* 00258 80A90F78 15400024 */ bne $t2, $zero, .L80A9100C -/* 0025C 80A90F7C A609019A */ sh $t1, 0x019A($s0) ## 0000019A -/* 00260 80A90F80 A60B01A4 */ sh $t3, 0x01A4($s0) ## 000001A4 -/* 00264 80A90F84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00268 80A90F88 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0026C 80A90F8C 2405286B */ addiu $a1, $zero, 0x286B ## $a1 = 0000286B -/* 00270 80A90F90 1000001F */ beq $zero, $zero, .L80A91010 -/* 00274 80A90F94 8602019A */ lh $v0, 0x019A($s0) ## 0000019A -glabel L80A90F98 -/* 00278 80A90F98 860C019A */ lh $t4, 0x019A($s0) ## 0000019A -/* 0027C 80A90F9C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00280 80A90FA0 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 -/* 00284 80A90FA4 258D0001 */ addiu $t5, $t4, 0x0001 ## $t5 = 00000001 -/* 00288 80A90FA8 A60D019A */ sh $t5, 0x019A($s0) ## 0000019A -/* 0028C 80A90FAC 10000017 */ beq $zero, $zero, .L80A9100C -/* 00290 80A90FB0 E60A01B8 */ swc1 $f10, 0x01B8($s0) ## 000001B8 -glabel L80A90FB4 -/* 00294 80A90FB4 860E019A */ lh $t6, 0x019A($s0) ## 0000019A -/* 00298 80A90FB8 861801AE */ lh $t8, 0x01AE($s0) ## 000001AE -/* 0029C 80A90FBC 24191388 */ addiu $t9, $zero, 0x1388 ## $t9 = 00001388 -/* 002A0 80A90FC0 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 002A4 80A90FC4 17000011 */ bne $t8, $zero, .L80A9100C -/* 002A8 80A90FC8 A60F019A */ sh $t7, 0x019A($s0) ## 0000019A -/* 002AC 80A90FCC 1000000F */ beq $zero, $zero, .L80A9100C -/* 002B0 80A90FD0 A61901AE */ sh $t9, 0x01AE($s0) ## 000001AE -glabel L80A90FD4 -/* 002B4 80A90FD4 8608019A */ lh $t0, 0x019A($s0) ## 0000019A -/* 002B8 80A90FD8 860A01AA */ lh $t2, 0x01AA($s0) ## 000001AA -/* 002BC 80A90FDC 240B1388 */ addiu $t3, $zero, 0x1388 ## $t3 = 00001388 -/* 002C0 80A90FE0 25090001 */ addiu $t1, $t0, 0x0001 ## $t1 = 00000001 -/* 002C4 80A90FE4 15400009 */ bne $t2, $zero, .L80A9100C -/* 002C8 80A90FE8 A609019A */ sh $t1, 0x019A($s0) ## 0000019A -/* 002CC 80A90FEC 10000007 */ beq $zero, $zero, .L80A9100C -/* 002D0 80A90FF0 A60B01AA */ sh $t3, 0x01AA($s0) ## 000001AA -glabel L80A90FF4 -/* 002D4 80A90FF4 860C019A */ lh $t4, 0x019A($s0) ## 0000019A -/* 002D8 80A90FF8 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 002DC 80A90FFC 44818000 */ mtc1 $at, $f16 ## $f16 = 2.00 -/* 002E0 80A91000 258D0001 */ addiu $t5, $t4, 0x0001 ## $t5 = 00000001 -/* 002E4 80A91004 A60D019A */ sh $t5, 0x019A($s0) ## 0000019A -/* 002E8 80A91008 E61001B8 */ swc1 $f16, 0x01B8($s0) ## 000001B8 -.L80A9100C: -/* 002EC 80A9100C 8602019A */ lh $v0, 0x019A($s0) ## 0000019A -.L80A91010: -/* 002F0 80A91010 240E0008 */ addiu $t6, $zero, 0x0008 ## $t6 = 00000008 -/* 002F4 80A91014 28410009 */ slti $at, $v0, 0x0009 -/* 002F8 80A91018 14200003 */ bne $at, $zero, .L80A91028 -/* 002FC 80A9101C 00000000 */ nop -/* 00300 80A91020 A60E019A */ sh $t6, 0x019A($s0) ## 0000019A -/* 00304 80A91024 8602019A */ lh $v0, 0x019A($s0) ## 0000019A -.L80A91028: -/* 00308 80A91028 1040006C */ beq $v0, $zero, .L80A911DC -/* 0030C 80A9102C 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 00310 80A91030 44819000 */ mtc1 $at, $f18 ## $f18 = -1.00 -/* 00314 80A91034 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 00318 80A91038 1441000B */ bne $v0, $at, .L80A91068 -/* 0031C 80A9103C E612006C */ swc1 $f18, 0x006C($s0) ## 0000006C -/* 00320 80A91040 960F0088 */ lhu $t7, 0x0088($s0) ## 00000088 -/* 00324 80A91044 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 00328 80A91048 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0032C 80A9104C 31F80001 */ andi $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 00330 80A91050 53000006 */ beql $t8, $zero, .L80A9106C -/* 00334 80A91054 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 00338 80A91058 44812000 */ mtc1 $at, $f4 ## $f4 = 3.00 -/* 0033C 80A9105C 24051847 */ addiu $a1, $zero, 0x1847 ## $a1 = 00001847 -/* 00340 80A91060 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00344 80A91064 E6040060 */ swc1 $f4, 0x0060($s0) ## 00000060 -.L80A91068: -/* 00348 80A91068 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -.L80A9106C: -/* 0034C 80A9106C 3C073E4C */ lui $a3, 0x3E4C ## $a3 = 3E4C0000 -/* 00350 80A91070 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3E4CCCCD -/* 00354 80A91074 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 00358 80A91078 2604016C */ addiu $a0, $s0, 0x016C ## $a0 = 0000016C -/* 0035C 80A9107C 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 00360 80A91080 8E0501B8 */ lw $a1, 0x01B8($s0) ## 000001B8 -/* 00364 80A91084 860501AA */ lh $a1, 0x01AA($s0) ## 000001AA -/* 00368 80A91088 AFA00010 */ sw $zero, 0x0010($sp) -/* 0036C 80A9108C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 00370 80A91090 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 00374 80A91094 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00378 80A91098 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 -/* 0037C 80A9109C 860501AE */ lh $a1, 0x01AE($s0) ## 000001AE -/* 00380 80A910A0 AFA00010 */ sw $zero, 0x0010($sp) -/* 00384 80A910A4 260400B8 */ addiu $a0, $s0, 0x00B8 ## $a0 = 000000B8 -/* 00388 80A910A8 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 0038C 80A910AC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00390 80A910B0 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 -/* 00394 80A910B4 860201AA */ lh $v0, 0x01AA($s0) ## 000001AA -/* 00398 80A910B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0039C 80A910BC 50400017 */ beql $v0, $zero, .L80A9111C -/* 003A0 80A910C0 860201AE */ lh $v0, 0x01AE($s0) ## 000001AE -/* 003A4 80A910C4 861900B4 */ lh $t9, 0x00B4($s0) ## 000000B4 -/* 003A8 80A910C8 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 003AC 80A910CC 44814000 */ mtc1 $at, $f8 ## $f8 = 50.00 -/* 003B0 80A910D0 03224023 */ subu $t0, $t9, $v0 -/* 003B4 80A910D4 44883000 */ mtc1 $t0, $f6 ## $f6 = 0.00 -/* 003B8 80A910D8 00000000 */ nop -/* 003BC 80A910DC 46803020 */ cvt.s.w $f0, $f6 -/* 003C0 80A910E0 46000005 */ abs.s $f0, $f0 -/* 003C4 80A910E4 4608003C */ c.lt.s $f0, $f8 -/* 003C8 80A910E8 00000000 */ nop -/* 003CC 80A910EC 4502000B */ bc1fl .L80A9111C -/* 003D0 80A910F0 860201AE */ lh $v0, 0x01AE($s0) ## 000001AE -/* 003D4 80A910F4 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 -/* 003D8 80A910F8 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 003DC 80A910FC 44819000 */ mtc1 $at, $f18 ## $f18 = -1.00 -/* 003E0 80A91100 46805420 */ cvt.s.w $f16, $f10 -/* 003E4 80A91104 46128102 */ mul.s $f4, $f16, $f18 -/* 003E8 80A91108 4600218D */ trunc.w.s $f6, $f4 -/* 003EC 80A9110C 440A3000 */ mfc1 $t2, $f6 -/* 003F0 80A91110 00000000 */ nop -/* 003F4 80A91114 A60A01AA */ sh $t2, 0x01AA($s0) ## 000001AA -/* 003F8 80A91118 860201AE */ lh $v0, 0x01AE($s0) ## 000001AE -.L80A9111C: -/* 003FC 80A9111C 50400017 */ beql $v0, $zero, .L80A9117C -/* 00400 80A91120 860F01A4 */ lh $t7, 0x01A4($s0) ## 000001A4 -/* 00404 80A91124 860B00B8 */ lh $t3, 0x00B8($s0) ## 000000B8 -/* 00408 80A91128 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 0040C 80A9112C 44815000 */ mtc1 $at, $f10 ## $f10 = 50.00 -/* 00410 80A91130 01626023 */ subu $t4, $t3, $v0 -/* 00414 80A91134 448C4000 */ mtc1 $t4, $f8 ## $f8 = 0.00 -/* 00418 80A91138 00000000 */ nop -/* 0041C 80A9113C 46804020 */ cvt.s.w $f0, $f8 -/* 00420 80A91140 46000005 */ abs.s $f0, $f0 -/* 00424 80A91144 460A003C */ c.lt.s $f0, $f10 -/* 00428 80A91148 00000000 */ nop -/* 0042C 80A9114C 4502000B */ bc1fl .L80A9117C -/* 00430 80A91150 860F01A4 */ lh $t7, 0x01A4($s0) ## 000001A4 -/* 00434 80A91154 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 -/* 00438 80A91158 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 0043C 80A9115C 44812000 */ mtc1 $at, $f4 ## $f4 = -1.00 -/* 00440 80A91160 468084A0 */ cvt.s.w $f18, $f16 -/* 00444 80A91164 46049182 */ mul.s $f6, $f18, $f4 -/* 00448 80A91168 4600320D */ trunc.w.s $f8, $f6 -/* 0044C 80A9116C 440E4000 */ mfc1 $t6, $f8 -/* 00450 80A91170 00000000 */ nop -/* 00454 80A91174 A60E01AE */ sh $t6, 0x01AE($s0) ## 000001AE -/* 00458 80A91178 860F01A4 */ lh $t7, 0x01A4($s0) ## 000001A4 -.L80A9117C: -/* 0045C 80A9117C 51E00009 */ beql $t7, $zero, .L80A911A4 -/* 00460 80A91180 C60A0168 */ lwc1 $f10, 0x0168($s0) ## 00000168 -/* 00464 80A91184 861800B6 */ lh $t8, 0x00B6($s0) ## 000000B6 -/* 00468 80A91188 27191000 */ addiu $t9, $t8, 0x1000 ## $t9 = 00001000 -/* 0046C 80A9118C A61900B6 */ sh $t9, 0x00B6($s0) ## 000000B6 -/* 00470 80A91190 860800B6 */ lh $t0, 0x00B6($s0) ## 000000B6 -/* 00474 80A91194 55000003 */ bnel $t0, $zero, .L80A911A4 -/* 00478 80A91198 C60A0168 */ lwc1 $f10, 0x0168($s0) ## 00000168 -/* 0047C 80A9119C A60001A4 */ sh $zero, 0x01A4($s0) ## 000001A4 -/* 00480 80A911A0 C60A0168 */ lwc1 $f10, 0x0168($s0) ## 00000168 -.L80A911A4: -/* 00484 80A911A4 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 00488 80A911A8 4600540D */ trunc.w.s $f16, $f10 -/* 0048C 80A911AC 44028000 */ mfc1 $v0, $f16 -/* 00490 80A911B0 00000000 */ nop -/* 00494 80A911B4 00021400 */ sll $v0, $v0, 16 -/* 00498 80A911B8 00021403 */ sra $v0, $v0, 16 -/* 0049C 80A911BC 10410003 */ beq $v0, $at, .L80A911CC -/* 004A0 80A911C0 24010011 */ addiu $at, $zero, 0x0011 ## $at = 00000011 -/* 004A4 80A911C4 14410003 */ bne $v0, $at, .L80A911D4 -/* 004A8 80A911C8 00000000 */ nop -.L80A911CC: -/* 004AC 80A911CC 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 004B0 80A911D0 2405286A */ addiu $a1, $zero, 0x286A ## $a1 = 0000286A -.L80A911D4: -/* 004B4 80A911D4 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 004B8 80A911D8 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 -.L80A911DC: -/* 004BC 80A911DC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 004C0 80A911E0 8FB00020 */ lw $s0, 0x0020($sp) -/* 004C4 80A911E4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 004C8 80A911E8 03E00008 */ jr $ra -/* 004CC 80A911EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A911F0.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A911F0.s deleted file mode 100644 index 9803d79554..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A911F0.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_80A911F0 -/* 004D0 80A911F0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 004D4 80A911F4 AFA40028 */ sw $a0, 0x0028($sp) -/* 004D8 80A911F8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 004DC 80A911FC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 004E0 80A91200 AFA5002C */ sw $a1, 0x002C($sp) -/* 004E4 80A91204 0C028800 */ jal SkelAnime_GetFrameCount - -/* 004E8 80A91208 24840214 */ addiu $a0, $a0, 0x0214 ## $a0 = 06000214 -/* 004EC 80A9120C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 004F0 80A91210 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 004F4 80A91214 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 004F8 80A91218 468021A0 */ cvt.s.w $f6, $f4 -/* 004FC 80A9121C 8FA40028 */ lw $a0, 0x0028($sp) -/* 00500 80A91220 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00504 80A91224 24A50214 */ addiu $a1, $a1, 0x0214 ## $a1 = 06000214 -/* 00508 80A91228 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0050C 80A9122C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00510 80A91230 4600320D */ trunc.w.s $f8, $f6 -/* 00514 80A91234 AFA00014 */ sw $zero, 0x0014($sp) -/* 00518 80A91238 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 0051C 80A9123C 24840150 */ addiu $a0, $a0, 0x0150 ## $a0 = 00000150 -/* 00520 80A91240 440F4000 */ mfc1 $t7, $f8 -/* 00524 80A91244 00000000 */ nop -/* 00528 80A91248 000FC400 */ sll $t8, $t7, 16 -/* 0052C 80A9124C 0018CC03 */ sra $t9, $t8, 16 -/* 00530 80A91250 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 -/* 00534 80A91254 00000000 */ nop -/* 00538 80A91258 46805420 */ cvt.s.w $f16, $f10 -/* 0053C 80A9125C 0C029468 */ jal SkelAnime_ChangeAnim - -/* 00540 80A91260 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 00544 80A91264 8FA90028 */ lw $t1, 0x0028($sp) -/* 00548 80A91268 3C0880A9 */ lui $t0, %hi(func_80A91284) ## $t0 = 80A90000 -/* 0054C 80A9126C 25081284 */ addiu $t0, $t0, %lo(func_80A91284) ## $t0 = 80A91284 -/* 00550 80A91270 AD28014C */ sw $t0, 0x014C($t1) ## 0000014C -/* 00554 80A91274 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00558 80A91278 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0055C 80A9127C 03E00008 */ jr $ra -/* 00560 80A91280 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A91284.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A91284.s deleted file mode 100644 index 3377b3ed0f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A91284.s +++ /dev/null @@ -1,53 +0,0 @@ -glabel func_80A91284 -/* 00564 80A91284 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00568 80A91288 AFA5001C */ sw $a1, 0x001C($sp) -/* 0056C 80A9128C 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 00570 80A91290 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00574 80A91294 AFA40018 */ sw $a0, 0x0018($sp) -/* 00578 80A91298 AFA50018 */ sw $a1, 0x0018($sp) -/* 0057C 80A9129C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00580 80A912A0 24840150 */ addiu $a0, $a0, 0x0150 ## $a0 = 00000150 -/* 00584 80A912A4 8FA50018 */ lw $a1, 0x0018($sp) -/* 00588 80A912A8 3C028016 */ lui $v0, %hi(gSaveContext) -/* 0058C 80A912AC 240E40A1 */ addiu $t6, $zero, 0x40A1 ## $t6 = 000040A1 -/* 00590 80A912B0 240F0006 */ addiu $t7, $zero, 0x0006 ## $t7 = 00000006 -/* 00594 80A912B4 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00598 80A912B8 A4AE010E */ sh $t6, 0x010E($a1) ## 0000010E -/* 0059C 80A912BC A4AF0196 */ sh $t7, 0x0196($a1) ## 00000196 -/* 005A0 80A912C0 A4A0019A */ sh $zero, 0x019A($a1) ## 0000019A -/* 005A4 80A912C4 8C580004 */ lw $t8, 0x0004($v0) ## 8015E664 -/* 005A8 80A912C8 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 005AC 80A912CC 5300000C */ beql $t8, $zero, .L80A91300 -/* 005B0 80A912D0 A0AB0194 */ sb $t3, 0x0194($a1) ## 00000194 -/* 005B4 80A912D4 A0A00194 */ sb $zero, 0x0194($a1) ## 00000194 -/* 005B8 80A912D8 905912C5 */ lbu $t9, 0x12C5($v0) ## 8015F925 -/* 005BC 80A912DC 240840A0 */ addiu $t0, $zero, 0x40A0 ## $t0 = 000040A0 -/* 005C0 80A912E0 24090005 */ addiu $t1, $zero, 0x0005 ## $t1 = 00000005 -/* 005C4 80A912E4 13200011 */ beq $t9, $zero, .L80A9132C -/* 005C8 80A912E8 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 005CC 80A912EC A4A8010E */ sh $t0, 0x010E($a1) ## 0000010E -/* 005D0 80A912F0 A4A90196 */ sh $t1, 0x0196($a1) ## 00000196 -/* 005D4 80A912F4 1000000D */ beq $zero, $zero, .L80A9132C -/* 005D8 80A912F8 A4AA01A8 */ sh $t2, 0x01A8($a1) ## 000001A8 -/* 005DC 80A912FC A0AB0194 */ sb $t3, 0x0194($a1) ## 00000194 -.L80A91300: -/* 005E0 80A91300 904C12C5 */ lbu $t4, 0x12C5($v0) ## 8015F925 -/* 005E4 80A91304 11800009 */ beq $t4, $zero, .L80A9132C -/* 005E8 80A91308 00000000 */ nop -/* 005EC 80A9130C 90AD0195 */ lbu $t5, 0x0195($a1) ## 00000195 -/* 005F0 80A91310 240E40A2 */ addiu $t6, $zero, 0x40A2 ## $t6 = 000040A2 -/* 005F4 80A91314 240F40A3 */ addiu $t7, $zero, 0x40A3 ## $t7 = 000040A3 -/* 005F8 80A91318 51A00004 */ beql $t5, $zero, .L80A9132C -/* 005FC 80A9131C A4AF010E */ sh $t7, 0x010E($a1) ## 0000010E -/* 00600 80A91320 10000002 */ beq $zero, $zero, .L80A9132C -/* 00604 80A91324 A4AE010E */ sh $t6, 0x010E($a1) ## 0000010E -/* 00608 80A91328 A4AF010E */ sh $t7, 0x010E($a1) ## 0000010E -.L80A9132C: -/* 0060C 80A9132C 3C1880A9 */ lui $t8, %hi(func_80A91348) ## $t8 = 80A90000 -/* 00610 80A91330 27181348 */ addiu $t8, $t8, %lo(func_80A91348) ## $t8 = 80A91348 -/* 00614 80A91334 ACB8014C */ sw $t8, 0x014C($a1) ## 0000014C -/* 00618 80A91338 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0061C 80A9133C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00620 80A91340 03E00008 */ jr $ra -/* 00624 80A91344 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A91348.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A91348.s deleted file mode 100644 index 417be907f5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A91348.s +++ /dev/null @@ -1,169 +0,0 @@ -glabel func_80A91348 -/* 00628 80A91348 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0062C 80A9134C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00630 80A91350 AFB00020 */ sw $s0, 0x0020($sp) -/* 00634 80A91354 AFA50034 */ sw $a1, 0x0034($sp) -/* 00638 80A91358 8CA81C44 */ lw $t0, 0x1C44($a1) ## 00001C44 -/* 0063C 80A9135C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00640 80A91360 0C2A438A */ jal func_80A90E28 -/* 00644 80A91364 AFA8002C */ sw $t0, 0x002C($sp) -/* 00648 80A91368 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 0064C 80A9136C 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 -/* 00650 80A91370 240FFFFF */ addiu $t7, $zero, 0xFFFF ## $t7 = FFFFFFFF -/* 00654 80A91374 A60F0208 */ sh $t7, 0x0208($s0) ## 00000208 -/* 00658 80A91378 8FA50034 */ lw $a1, 0x0034($sp) -/* 0065C 80A9137C 0C00BC65 */ jal func_8002F194 -/* 00660 80A91380 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00664 80A91384 10400012 */ beq $v0, $zero, .L80A913D0 -/* 00668 80A91388 8FA8002C */ lw $t0, 0x002C($sp) -/* 0066C 80A9138C 92180194 */ lbu $t8, 0x0194($s0) ## 00000194 -/* 00670 80A91390 3C0B80A9 */ lui $t3, %hi(func_80A91284) ## $t3 = 80A90000 -/* 00674 80A91394 256B1284 */ addiu $t3, $t3, %lo(func_80A91284) ## $t3 = 80A91284 -/* 00678 80A91398 1700000B */ bne $t8, $zero, .L80A913C8 -/* 0067C 80A9139C 00000000 */ nop -/* 00680 80A913A0 861901A8 */ lh $t9, 0x01A8($s0) ## 000001A8 -/* 00684 80A913A4 3C0A80A9 */ lui $t2, %hi(func_80A91760) ## $t2 = 80A90000 -/* 00688 80A913A8 3C0980A9 */ lui $t1, %hi(func_80A91284) ## $t1 = 80A90000 -/* 0068C 80A913AC 17200004 */ bne $t9, $zero, .L80A913C0 -/* 00690 80A913B0 254A1760 */ addiu $t2, $t2, %lo(func_80A91760) ## $t2 = 80A91760 -/* 00694 80A913B4 25291284 */ addiu $t1, $t1, %lo(func_80A91284) ## $t1 = 80A91284 -/* 00698 80A913B8 1000007A */ beq $zero, $zero, .L80A915A4 -/* 0069C 80A913BC AE09014C */ sw $t1, 0x014C($s0) ## 0000014C -.L80A913C0: -/* 006A0 80A913C0 10000078 */ beq $zero, $zero, .L80A915A4 -/* 006A4 80A913C4 AE0A014C */ sw $t2, 0x014C($s0) ## 0000014C -.L80A913C8: -/* 006A8 80A913C8 10000076 */ beq $zero, $zero, .L80A915A4 -/* 006AC 80A913CC AE0B014C */ sw $t3, 0x014C($s0) ## 0000014C -.L80A913D0: -/* 006B0 80A913D0 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 -/* 006B4 80A913D4 44812000 */ mtc1 $at, $f4 ## $f4 = 120.00 -/* 006B8 80A913D8 C6000090 */ lwc1 $f0, 0x0090($s0) ## 00000090 -/* 006BC 80A913DC 860C008A */ lh $t4, 0x008A($s0) ## 0000008A -/* 006C0 80A913E0 860D00B6 */ lh $t5, 0x00B6($s0) ## 000000B6 -/* 006C4 80A913E4 4600203C */ c.lt.s $f4, $f0 -/* 006C8 80A913E8 018D1023 */ subu $v0, $t4, $t5 -/* 006CC 80A913EC 00021400 */ sll $v0, $v0, 16 -/* 006D0 80A913F0 4501006C */ bc1t .L80A915A4 -/* 006D4 80A913F4 00021403 */ sra $v0, $v0, 16 -/* 006D8 80A913F8 04400004 */ bltz $v0, .L80A9140C -/* 006DC 80A913FC 00021823 */ subu $v1, $zero, $v0 -/* 006E0 80A91400 00021C00 */ sll $v1, $v0, 16 -/* 006E4 80A91404 10000003 */ beq $zero, $zero, .L80A91414 -/* 006E8 80A91408 00031C03 */ sra $v1, $v1, 16 -.L80A9140C: -/* 006EC 80A9140C 00031C00 */ sll $v1, $v1, 16 -/* 006F0 80A91410 00031C03 */ sra $v1, $v1, 16 -.L80A91414: -/* 006F4 80A91414 28614300 */ slti $at, $v1, 0x4300 -/* 006F8 80A91418 50200063 */ beql $at, $zero, .L80A915A8 -/* 006FC 80A9141C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00700 80A91420 920E0194 */ lbu $t6, 0x0194($s0) ## 00000194 -/* 00704 80A91424 3C0D8016 */ lui $t5, %hi(gSaveContext+0x12c5) -/* 00708 80A91428 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0070C 80A9142C 15C0002B */ bne $t6, $zero, .L80A914DC -/* 00710 80A91430 3C0642C8 */ lui $a2, 0x42C8 ## $a2 = 42C80000 -/* 00714 80A91434 8D020680 */ lw $v0, 0x0680($t0) ## 00000680 -/* 00718 80A91438 240508D4 */ addiu $a1, $zero, 0x08D4 ## $a1 = 000008D4 -/* 0071C 80A9143C 02003825 */ or $a3, $s0, $zero ## $a3 = 00000000 -/* 00720 80A91440 000279C0 */ sll $t7, $v0, 7 -/* 00724 80A91444 05E1001C */ bgez $t7, .L80A914B8 -/* 00728 80A91448 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 0072C 80A9144C 8FA40034 */ lw $a0, 0x0034($sp) -/* 00730 80A91450 2406FF9D */ addiu $a2, $zero, 0xFF9D ## $a2 = FFFFFF9D -/* 00734 80A91454 AFA00010 */ sw $zero, 0x0010($sp) -/* 00738 80A91458 0C02003E */ jal func_800800F8 -/* 0073C 80A9145C AFA8002C */ sw $t0, 0x002C($sp) -/* 00740 80A91460 8FA40034 */ lw $a0, 0x0034($sp) -/* 00744 80A91464 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00748 80A91468 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 0074C 80A9146C A6020208 */ sh $v0, 0x0208($s0) ## 00000208 -/* 00750 80A91470 24180037 */ addiu $t8, $zero, 0x0037 ## $t8 = 00000037 -/* 00754 80A91474 00240821 */ addu $at, $at, $a0 -/* 00758 80A91478 A03803DC */ sb $t8, 0x03DC($at) ## 000103DC -/* 0075C 80A9147C 24190005 */ addiu $t9, $zero, 0x0005 ## $t9 = 00000005 -/* 00760 80A91480 A6190196 */ sh $t9, 0x0196($s0) ## 00000196 -/* 00764 80A91484 240540A4 */ addiu $a1, $zero, 0x40A4 ## $a1 = 000040A4 -/* 00768 80A91488 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0076C 80A9148C 0C042DA0 */ jal func_8010B680 -/* 00770 80A91490 E60601B8 */ swc1 $f6, 0x01B8($s0) ## 000001B8 -/* 00774 80A91494 8FA8002C */ lw $t0, 0x002C($sp) -/* 00778 80A91498 3C010080 */ lui $at, 0x0080 ## $at = 00800000 -/* 0077C 80A9149C 3C0B80A9 */ lui $t3, %hi(func_80A915B8) ## $t3 = 80A90000 -/* 00780 80A914A0 8D090680 */ lw $t1, 0x0680($t0) ## 00000680 -/* 00784 80A914A4 256B15B8 */ addiu $t3, $t3, %lo(func_80A915B8) ## $t3 = 80A915B8 -/* 00788 80A914A8 01215025 */ or $t2, $t1, $at ## $t2 = 00800000 -/* 0078C 80A914AC AD0A0680 */ sw $t2, 0x0680($t0) ## 00000680 -/* 00790 80A914B0 1000003C */ beq $zero, $zero, .L80A915A4 -/* 00794 80A914B4 AE0B014C */ sw $t3, 0x014C($s0) ## 0000014C -.L80A914B8: -/* 00798 80A914B8 44814000 */ mtc1 $at, $f8 ## $f8 = 0.00 -/* 0079C 80A914BC 3C010080 */ lui $at, 0x0080 ## $at = 00800000 -/* 007A0 80A914C0 00416025 */ or $t4, $v0, $at ## $t4 = 00800000 -/* 007A4 80A914C4 4608003C */ c.lt.s $f0, $f8 -/* 007A8 80A914C8 00000000 */ nop -/* 007AC 80A914CC 45000033 */ bc1f .L80A9159C -/* 007B0 80A914D0 00000000 */ nop -/* 007B4 80A914D4 10000031 */ beq $zero, $zero, .L80A9159C -/* 007B8 80A914D8 AD0C0680 */ sw $t4, 0x0680($t0) ## 00000680 -.L80A914DC: -/* 007BC 80A914DC 91ADF925 */ lbu $t5, %lo(gSaveContext+0x12c5)($t5) -/* 007C0 80A914E0 11A0002E */ beq $t5, $zero, .L80A9159C -/* 007C4 80A914E4 00000000 */ nop -/* 007C8 80A914E8 920E0195 */ lbu $t6, 0x0195($s0) ## 00000195 -/* 007CC 80A914EC 15C0002B */ bne $t6, $zero, .L80A9159C -/* 007D0 80A914F0 00000000 */ nop -/* 007D4 80A914F4 8D020680 */ lw $v0, 0x0680($t0) ## 00000680 -/* 007D8 80A914F8 240508D4 */ addiu $a1, $zero, 0x08D4 ## $a1 = 000008D4 -/* 007DC 80A914FC 02003825 */ or $a3, $s0, $zero ## $a3 = 00000000 -/* 007E0 80A91500 000279C0 */ sll $t7, $v0, 7 -/* 007E4 80A91504 05E1001D */ bgez $t7, .L80A9157C -/* 007E8 80A91508 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 007EC 80A9150C 8FA40034 */ lw $a0, 0x0034($sp) -/* 007F0 80A91510 2406FF9D */ addiu $a2, $zero, 0xFF9D ## $a2 = FFFFFF9D -/* 007F4 80A91514 AFA00010 */ sw $zero, 0x0010($sp) -/* 007F8 80A91518 0C02003E */ jal func_800800F8 -/* 007FC 80A9151C AFA8002C */ sw $t0, 0x002C($sp) -/* 00800 80A91520 A6020208 */ sh $v0, 0x0208($s0) ## 00000208 -/* 00804 80A91524 8FB90034 */ lw $t9, 0x0034($sp) -/* 00808 80A91528 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0080C 80A9152C 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 00810 80A91530 24180037 */ addiu $t8, $zero, 0x0037 ## $t8 = 00000037 -/* 00814 80A91534 00390821 */ addu $at, $at, $t9 -/* 00818 80A91538 A03803DC */ sb $t8, 0x03DC($at) ## 000103DC -/* 0081C 80A9153C 24090005 */ addiu $t1, $zero, 0x0005 ## $t1 = 00000005 -/* 00820 80A91540 A6090196 */ sh $t1, 0x0196($s0) ## 00000196 -/* 00824 80A91544 E60A01B8 */ swc1 $f10, 0x01B8($s0) ## 000001B8 -/* 00828 80A91548 8FA40034 */ lw $a0, 0x0034($sp) -/* 0082C 80A9154C 240540A8 */ addiu $a1, $zero, 0x40A8 ## $a1 = 000040A8 -/* 00830 80A91550 0C042DA0 */ jal func_8010B680 -/* 00834 80A91554 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00838 80A91558 8FA8002C */ lw $t0, 0x002C($sp) -/* 0083C 80A9155C 3C010080 */ lui $at, 0x0080 ## $at = 00800000 -/* 00840 80A91560 3C0C80A9 */ lui $t4, %hi(func_80A9187C) ## $t4 = 80A90000 -/* 00844 80A91564 8D0A0680 */ lw $t2, 0x0680($t0) ## 00000680 -/* 00848 80A91568 258C187C */ addiu $t4, $t4, %lo(func_80A9187C) ## $t4 = 80A9187C -/* 0084C 80A9156C 01415825 */ or $t3, $t2, $at ## $t3 = 00800000 -/* 00850 80A91570 AD0B0680 */ sw $t3, 0x0680($t0) ## 00000680 -/* 00854 80A91574 1000000B */ beq $zero, $zero, .L80A915A4 -/* 00858 80A91578 AE0C014C */ sw $t4, 0x014C($s0) ## 0000014C -.L80A9157C: -/* 0085C 80A9157C 44818000 */ mtc1 $at, $f16 ## $f16 = 0.00 -/* 00860 80A91580 3C010080 */ lui $at, 0x0080 ## $at = 00800000 -/* 00864 80A91584 00416825 */ or $t5, $v0, $at ## $t5 = 00800000 -/* 00868 80A91588 4610003C */ c.lt.s $f0, $f16 -/* 0086C 80A9158C 00000000 */ nop -/* 00870 80A91590 45000002 */ bc1f .L80A9159C -/* 00874 80A91594 00000000 */ nop -/* 00878 80A91598 AD0D0680 */ sw $t5, 0x0680($t0) ## 00000680 -.L80A9159C: -/* 0087C 80A9159C 0C00BCB3 */ jal func_8002F2CC -/* 00880 80A915A0 8FA50034 */ lw $a1, 0x0034($sp) -.L80A915A4: -/* 00884 80A915A4 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A915A8: -/* 00888 80A915A8 8FB00020 */ lw $s0, 0x0020($sp) -/* 0088C 80A915AC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00890 80A915B0 03E00008 */ jr $ra -/* 00894 80A915B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A915B8.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A915B8.s deleted file mode 100644 index 13cae44ec8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A915B8.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_80A915B8 -/* 00898 80A915B8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0089C 80A915BC AFBF0014 */ sw $ra, 0x0014($sp) -/* 008A0 80A915C0 AFA40018 */ sw $a0, 0x0018($sp) -/* 008A4 80A915C4 AFA5001C */ sw $a1, 0x001C($sp) -/* 008A8 80A915C8 0C042F6F */ jal func_8010BDBC -/* 008AC 80A915CC 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 008B0 80A915D0 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 008B4 80A915D4 5441000F */ bnel $v0, $at, .L80A91614 -/* 008B8 80A915D8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 008BC 80A915DC 0C041AF2 */ jal func_80106BC8 -/* 008C0 80A915E0 8FA4001C */ lw $a0, 0x001C($sp) -/* 008C4 80A915E4 5040000B */ beql $v0, $zero, .L80A91614 -/* 008C8 80A915E8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 008CC 80A915EC 0C041B33 */ jal func_80106CCC -/* 008D0 80A915F0 8FA4001C */ lw $a0, 0x001C($sp) -/* 008D4 80A915F4 8FA4001C */ lw $a0, 0x001C($sp) -/* 008D8 80A915F8 0C042F56 */ jal func_8010BD58 -/* 008DC 80A915FC 2405002C */ addiu $a1, $zero, 0x002C ## $a1 = 0000002C -/* 008E0 80A91600 8FAF0018 */ lw $t7, 0x0018($sp) -/* 008E4 80A91604 3C0E80A9 */ lui $t6, %hi(func_80A91620) ## $t6 = 80A90000 -/* 008E8 80A91608 25CE1620 */ addiu $t6, $t6, %lo(func_80A91620) ## $t6 = 80A91620 -/* 008EC 80A9160C ADEE014C */ sw $t6, 0x014C($t7) ## 0000014C -/* 008F0 80A91610 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A91614: -/* 008F4 80A91614 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 008F8 80A91618 03E00008 */ jr $ra -/* 008FC 80A9161C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A91620.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A91620.s deleted file mode 100644 index 92971cb659..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A91620.s +++ /dev/null @@ -1,89 +0,0 @@ -glabel func_80A91620 -/* 00900 80A91620 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00904 80A91624 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00908 80A91628 AFBF001C */ sw $ra, 0x001C($sp) -/* 0090C 80A9162C AFB00018 */ sw $s0, 0x0018($sp) -/* 00910 80A91630 00A11821 */ addu $v1, $a1, $at -/* 00914 80A91634 946204C6 */ lhu $v0, 0x04C6($v1) ## 000004C6 -/* 00918 80A91638 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 0091C 80A9163C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00920 80A91640 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 00924 80A91644 10410006 */ beq $v0, $at, .L80A91660 -/* 00928 80A91648 8CA81C44 */ lw $t0, 0x1C44($a1) ## 00001C44 -/* 0092C 80A9164C 28410005 */ slti $at, $v0, 0x0005 -/* 00930 80A91650 1420001E */ bne $at, $zero, .L80A916CC -/* 00934 80A91654 2841000B */ slti $at, $v0, 0x000B -/* 00938 80A91658 5020001D */ beql $at, $zero, .L80A916D0 -/* 0093C 80A9165C 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -.L80A91660: -/* 00940 80A91660 906E03DC */ lbu $t6, 0x03DC($v1) ## 000003DC -/* 00944 80A91664 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00948 80A91668 55C00019 */ bnel $t6, $zero, .L80A916D0 -/* 0094C 80A9166C 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00950 80A91670 86050208 */ lh $a1, 0x0208($s0) ## 00000208 -/* 00954 80A91674 0C0200FC */ jal func_800803F0 -/* 00958 80A91678 AFA7002C */ sw $a3, 0x002C($sp) -/* 0095C 80A9167C 86020208 */ lh $v0, 0x0208($s0) ## 00000208 -/* 00960 80A91680 8FA7002C */ lw $a3, 0x002C($sp) -/* 00964 80A91684 2409FFFF */ addiu $t1, $zero, 0xFFFF ## $t1 = FFFFFFFF -/* 00968 80A91688 00027880 */ sll $t7, $v0, 2 -/* 0096C 80A9168C 00EFC021 */ addu $t8, $a3, $t7 -/* 00970 80A91690 8F190790 */ lw $t9, 0x0790($t8) ## 00000790 -/* 00974 80A91694 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 00978 80A91698 17200003 */ bne $t9, $zero, .L80A916A8 -/* 0097C 80A9169C 00000000 */ nop -/* 00980 80A916A0 A6090208 */ sh $t1, 0x0208($s0) ## 00000208 -/* 00984 80A916A4 86020208 */ lh $v0, 0x0208($s0) ## 00000208 -.L80A916A8: -/* 00988 80A916A8 10410004 */ beq $v0, $at, .L80A916BC -/* 0098C 80A916AC 00025080 */ sll $t2, $v0, 2 -/* 00990 80A916B0 00EA5821 */ addu $t3, $a3, $t2 -/* 00994 80A916B4 0C016C69 */ jal func_8005B1A4 -/* 00998 80A916B8 8D640790 */ lw $a0, 0x0790($t3) ## 00000790 -.L80A916BC: -/* 0099C 80A916BC 3C0C80A9 */ lui $t4, %hi(func_80A911F0) ## $t4 = 80A90000 -/* 009A0 80A916C0 258C11F0 */ addiu $t4, $t4, %lo(func_80A911F0) ## $t4 = 80A911F0 -/* 009A4 80A916C4 10000021 */ beq $zero, $zero, .L80A9174C -/* 009A8 80A916C8 AE0C014C */ sw $t4, 0x014C($s0) ## 0000014C -.L80A916CC: -/* 009AC 80A916CC 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -.L80A916D0: -/* 009B0 80A916D0 54410013 */ bnel $v0, $at, .L80A91720 -/* 009B4 80A916D4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 009B8 80A916D8 906D03DC */ lbu $t5, 0x03DC($v1) ## 000003DC -/* 009BC 80A916DC 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 009C0 80A916E0 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 009C4 80A916E4 15A0000D */ bne $t5, $zero, .L80A9171C -/* 009C8 80A916E8 240540A5 */ addiu $a1, $zero, 0x40A5 ## $a1 = 000040A5 -/* 009CC 80A916EC A60E0196 */ sh $t6, 0x0196($s0) ## 00000196 -/* 009D0 80A916F0 AFA7002C */ sw $a3, 0x002C($sp) -/* 009D4 80A916F4 0C042DA0 */ jal func_8010B680 -/* 009D8 80A916F8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 009DC 80A916FC 8FA4002C */ lw $a0, 0x002C($sp) -/* 009E0 80A91700 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 009E4 80A91704 0C00B7D5 */ jal func_8002DF54 -/* 009E8 80A91708 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 009EC 80A9170C 3C0F80A9 */ lui $t7, %hi(func_80A91A90) ## $t7 = 80A90000 -/* 009F0 80A91710 25EF1A90 */ addiu $t7, $t7, %lo(func_80A91A90) ## $t7 = 80A91A90 -/* 009F4 80A91714 1000000D */ beq $zero, $zero, .L80A9174C -/* 009F8 80A91718 AE0F014C */ sw $t7, 0x014C($s0) ## 0000014C -.L80A9171C: -/* 009FC 80A9171C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -.L80A91720: -/* 00A00 80A91720 1441000A */ bne $v0, $at, .L80A9174C -/* 00A04 80A91724 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A08 80A91728 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 00A0C 80A9172C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00A10 80A91730 0C2A43AF */ jal func_80A90EBC -/* 00A14 80A91734 AFA80024 */ sw $t0, 0x0024($sp) -/* 00A18 80A91738 8FA80024 */ lw $t0, 0x0024($sp) -/* 00A1C 80A9173C 3C010080 */ lui $at, 0x0080 ## $at = 00800000 -/* 00A20 80A91740 8D180680 */ lw $t8, 0x0680($t0) ## 00000680 -/* 00A24 80A91744 0301C825 */ or $t9, $t8, $at ## $t9 = 00800000 -/* 00A28 80A91748 AD190680 */ sw $t9, 0x0680($t0) ## 00000680 -.L80A9174C: -/* 00A2C 80A9174C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00A30 80A91750 8FB00018 */ lw $s0, 0x0018($sp) -/* 00A34 80A91754 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00A38 80A91758 03E00008 */ jr $ra -/* 00A3C 80A9175C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A91760.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A91760.s deleted file mode 100644 index 6550d433c9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A91760.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_80A91760 -/* 00A40 80A91760 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00A44 80A91764 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00A48 80A91768 AFB10020 */ sw $s1, 0x0020($sp) -/* 00A4C 80A9176C AFB0001C */ sw $s0, 0x001C($sp) -/* 00A50 80A91770 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00A54 80A91774 0C2A438A */ jal func_80A90E28 -/* 00A58 80A91778 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00A5C 80A9177C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00A60 80A91780 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 -/* 00A64 80A91784 0C042F6F */ jal func_8010BDBC -/* 00A68 80A91788 262420D8 */ addiu $a0, $s1, 0x20D8 ## $a0 = 000020D8 -/* 00A6C 80A9178C 860E0196 */ lh $t6, 0x0196($s0) ## 00000196 -/* 00A70 80A91790 55C20016 */ bnel $t6, $v0, .L80A917EC -/* 00A74 80A91794 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00A78 80A91798 0C041AF2 */ jal func_80106BC8 -/* 00A7C 80A9179C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00A80 80A917A0 10400011 */ beq $v0, $zero, .L80A917E8 -/* 00A84 80A917A4 240F0037 */ addiu $t7, $zero, 0x0037 ## $t7 = 00000037 -/* 00A88 80A917A8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00A8C 80A917AC 00310821 */ addu $at, $at, $s1 -/* 00A90 80A917B0 A02F03DC */ sb $t7, 0x03DC($at) ## 000103DC -/* 00A94 80A917B4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00A98 80A917B8 0C042F56 */ jal func_8010BD58 -/* 00A9C 80A917BC 2405002D */ addiu $a1, $zero, 0x002D ## $a1 = 0000002D -/* 00AA0 80A917C0 3C1880A9 */ lui $t8, %hi(func_80A917FC) ## $t8 = 80A90000 -/* 00AA4 80A917C4 271817FC */ addiu $t8, $t8, %lo(func_80A917FC) ## $t8 = 80A917FC -/* 00AA8 80A917C8 AE18014C */ sw $t8, 0x014C($s0) ## 0000014C -/* 00AAC 80A917CC AFA00010 */ sw $zero, 0x0010($sp) -/* 00AB0 80A917D0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00AB4 80A917D4 240508E8 */ addiu $a1, $zero, 0x08E8 ## $a1 = 000008E8 -/* 00AB8 80A917D8 2406FF9D */ addiu $a2, $zero, 0xFF9D ## $a2 = FFFFFF9D -/* 00ABC 80A917DC 0C02003E */ jal func_800800F8 -/* 00AC0 80A917E0 02003825 */ or $a3, $s0, $zero ## $a3 = 00000000 -/* 00AC4 80A917E4 A6020208 */ sh $v0, 0x0208($s0) ## 00000208 -.L80A917E8: -/* 00AC8 80A917E8 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A917EC: -/* 00ACC 80A917EC 8FB0001C */ lw $s0, 0x001C($sp) -/* 00AD0 80A917F0 8FB10020 */ lw $s1, 0x0020($sp) -/* 00AD4 80A917F4 03E00008 */ jr $ra -/* 00AD8 80A917F8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A917FC.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A917FC.s deleted file mode 100644 index 4ab235393f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A917FC.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_80A917FC -/* 00ADC 80A917FC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00AE0 80A91800 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 -/* 00AE4 80A91804 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00AE8 80A91808 AFA40018 */ sw $a0, 0x0018($sp) -/* 00AEC 80A9180C 01C57021 */ addu $t6, $t6, $a1 -/* 00AF0 80A91810 95CE04C6 */ lhu $t6, 0x04C6($t6) ## 000104C6 -/* 00AF4 80A91814 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 00AF8 80A91818 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 00AFC 80A9181C 11C10005 */ beq $t6, $at, .L80A91834 -/* 00B00 80A91820 240F0004 */ addiu $t7, $zero, 0x0004 ## $t7 = 00000004 -/* 00B04 80A91824 0C2A43AF */ jal func_80A90EBC -/* 00B08 80A91828 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00B0C 80A9182C 10000010 */ beq $zero, $zero, .L80A91870 -/* 00B10 80A91830 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A91834: -/* 00B14 80A91834 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00B18 80A91838 00270821 */ addu $at, $at, $a3 -/* 00B1C 80A9183C A42F04C6 */ sh $t7, 0x04C6($at) ## 000104C6 -/* 00B20 80A91840 AFA7001C */ sw $a3, 0x001C($sp) -/* 00B24 80A91844 0C041B33 */ jal func_80106CCC -/* 00B28 80A91848 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00B2C 80A9184C 8FB80018 */ lw $t8, 0x0018($sp) -/* 00B30 80A91850 8FA4001C */ lw $a0, 0x001C($sp) -/* 00B34 80A91854 0C0200FC */ jal func_800803F0 -/* 00B38 80A91858 87050208 */ lh $a1, 0x0208($t8) ## 00000208 -/* 00B3C 80A9185C 8FA80018 */ lw $t0, 0x0018($sp) -/* 00B40 80A91860 3C1980A9 */ lui $t9, %hi(func_80A911F0) ## $t9 = 80A90000 -/* 00B44 80A91864 273911F0 */ addiu $t9, $t9, %lo(func_80A911F0) ## $t9 = 80A911F0 -/* 00B48 80A91868 AD19014C */ sw $t9, 0x014C($t0) ## 0000014C -/* 00B4C 80A9186C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A91870: -/* 00B50 80A91870 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00B54 80A91874 03E00008 */ jr $ra -/* 00B58 80A91878 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A9187C.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A9187C.s deleted file mode 100644 index 142ba617bf..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A9187C.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_80A9187C -/* 00B5C 80A9187C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00B60 80A91880 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00B64 80A91884 AFA40018 */ sw $a0, 0x0018($sp) -/* 00B68 80A91888 AFA5001C */ sw $a1, 0x001C($sp) -/* 00B6C 80A9188C 0C042F6F */ jal func_8010BDBC -/* 00B70 80A91890 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 00B74 80A91894 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00B78 80A91898 5441000F */ bnel $v0, $at, .L80A918D8 -/* 00B7C 80A9189C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00B80 80A918A0 0C041AF2 */ jal func_80106BC8 -/* 00B84 80A918A4 8FA4001C */ lw $a0, 0x001C($sp) -/* 00B88 80A918A8 5040000B */ beql $v0, $zero, .L80A918D8 -/* 00B8C 80A918AC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00B90 80A918B0 0C041B33 */ jal func_80106CCC -/* 00B94 80A918B4 8FA4001C */ lw $a0, 0x001C($sp) -/* 00B98 80A918B8 8FA4001C */ lw $a0, 0x001C($sp) -/* 00B9C 80A918BC 0C042F56 */ jal func_8010BD58 -/* 00BA0 80A918C0 24050028 */ addiu $a1, $zero, 0x0028 ## $a1 = 00000028 -/* 00BA4 80A918C4 8FAF0018 */ lw $t7, 0x0018($sp) -/* 00BA8 80A918C8 3C0E80A9 */ lui $t6, %hi(func_80A918E4) ## $t6 = 80A90000 -/* 00BAC 80A918CC 25CE18E4 */ addiu $t6, $t6, %lo(func_80A918E4) ## $t6 = 80A918E4 -/* 00BB0 80A918D0 ADEE014C */ sw $t6, 0x014C($t7) ## 0000014C -/* 00BB4 80A918D4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80A918D8: -/* 00BB8 80A918D8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00BBC 80A918DC 03E00008 */ jr $ra -/* 00BC0 80A918E0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A918E4.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A918E4.s deleted file mode 100644 index 12faf6d728..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A918E4.s +++ /dev/null @@ -1,133 +0,0 @@ -.rdata -glabel D_80A91D94 - .asciz "\x1b[35m☆☆☆☆☆ まさか！ ☆☆☆☆☆ %d\n\x1b[m" - .balign 4 - -glabel D_80A91DC0 - .asciz "\n\n" - .balign 4 - -glabel D_80A91DC4 - .asciz "\x1b[36m☆☆☆☆☆ これで、他の奴もＯＫ！だ！ ☆☆☆☆☆ %d\n\x1b[m" - .balign 4 - -.text -glabel func_80A918E4 -/* 00BC4 80A918E4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00BC8 80A918E8 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* 00BCC 80A918EC 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* 00BD0 80A918F0 AFBF001C */ sw $ra, 0x001C($sp) -/* 00BD4 80A918F4 AFB10018 */ sw $s1, 0x0018($sp) -/* 00BD8 80A918F8 AFB00014 */ sw $s0, 0x0014($sp) -/* 00BDC 80A918FC 85CF12DA */ lh $t7, 0x12DA($t6) ## 801612DA -/* 00BE0 80A91900 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00BE4 80A91904 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 00BE8 80A91908 11E00009 */ beq $t7, $zero, .L80A91930 -/* 00BEC 80A9190C 8CA71C44 */ lw $a3, 0x1C44($a1) ## 00001C44 -/* 00BF0 80A91910 3C050001 */ lui $a1, 0x0001 ## $a1 = 00010000 -/* 00BF4 80A91914 00B02821 */ addu $a1, $a1, $s0 -/* 00BF8 80A91918 94A504C6 */ lhu $a1, 0x04C6($a1) ## 000104C6 -/* 00BFC 80A9191C 3C0480A9 */ lui $a0, %hi(D_80A91D94) ## $a0 = 80A90000 -/* 00C00 80A91920 24841D94 */ addiu $a0, $a0, %lo(D_80A91D94) ## $a0 = 80A91D94 -/* 00C04 80A91924 0C00084C */ jal osSyncPrintf - -/* 00C08 80A91928 AFA70024 */ sw $a3, 0x0024($sp) -/* 00C0C 80A9192C 8FA70024 */ lw $a3, 0x0024($sp) -.L80A91930: -/* 00C10 80A91930 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00C14 80A91934 02011821 */ addu $v1, $s0, $at -/* 00C18 80A91938 946204C6 */ lhu $v0, 0x04C6($v1) ## 000004C6 -/* 00C1C 80A9193C 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00C20 80A91940 10410005 */ beq $v0, $at, .L80A91958 -/* 00C24 80A91944 28410005 */ slti $at, $v0, 0x0005 -/* 00C28 80A91948 14200019 */ bne $at, $zero, .L80A919B0 -/* 00C2C 80A9194C 2841000B */ slti $at, $v0, 0x000B -/* 00C30 80A91950 50200018 */ beql $at, $zero, .L80A919B4 -/* 00C34 80A91954 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -.L80A91958: -/* 00C38 80A91958 907803DC */ lbu $t8, 0x03DC($v1) ## 000003DC -/* 00C3C 80A9195C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C40 80A91960 240540A6 */ addiu $a1, $zero, 0x40A6 ## $a1 = 000040A6 -/* 00C44 80A91964 57000013 */ bnel $t8, $zero, .L80A919B4 -/* 00C48 80A91968 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00C4C 80A9196C 0C042DA0 */ jal func_8010B680 -/* 00C50 80A91970 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00C54 80A91974 24190005 */ addiu $t9, $zero, 0x0005 ## $t9 = 00000005 -/* 00C58 80A91978 A6390196 */ sh $t9, 0x0196($s1) ## 00000196 -/* 00C5C 80A9197C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C60 80A91980 0C0200FC */ jal func_800803F0 -/* 00C64 80A91984 86250208 */ lh $a1, 0x0208($s1) ## 00000208 -/* 00C68 80A91988 2408FFFF */ addiu $t0, $zero, 0xFFFF ## $t0 = FFFFFFFF -/* 00C6C 80A9198C A6280208 */ sh $t0, 0x0208($s1) ## 00000208 -/* 00C70 80A91990 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C74 80A91994 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00C78 80A91998 0C00B7D5 */ jal func_8002DF54 -/* 00C7C 80A9199C 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 00C80 80A919A0 3C0980A9 */ lui $t1, %hi(func_80A91A90) ## $t1 = 80A90000 -/* 00C84 80A919A4 25291A90 */ addiu $t1, $t1, %lo(func_80A91A90) ## $t1 = 80A91A90 -/* 00C88 80A919A8 10000034 */ beq $zero, $zero, .L80A91A7C -/* 00C8C 80A919AC AE29014C */ sw $t1, 0x014C($s1) ## 0000014C -.L80A919B0: -/* 00C90 80A919B0 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -.L80A919B4: -/* 00C94 80A919B4 54410026 */ bnel $v0, $at, .L80A91A50 -/* 00C98 80A919B8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00C9C 80A919BC 906A03DC */ lbu $t2, 0x03DC($v1) ## 000003DC -/* 00CA0 80A919C0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00CA4 80A919C4 00300821 */ addu $at, $at, $s0 -/* 00CA8 80A919C8 15400020 */ bne $t2, $zero, .L80A91A4C -/* 00CAC 80A919CC 240B0004 */ addiu $t3, $zero, 0x0004 ## $t3 = 00000004 -/* 00CB0 80A919D0 A42B04C6 */ sh $t3, 0x04C6($at) ## 000104C6 -/* 00CB4 80A919D4 3C0C8016 */ lui $t4, %hi(gGameInfo) -/* 00CB8 80A919D8 8D8CFA90 */ lw $t4, %lo(gGameInfo)($t4) -/* 00CBC 80A919DC 3C0480A9 */ lui $a0, %hi(D_80A91DC0) ## $a0 = 80A90000 -/* 00CC0 80A919E0 24841DC0 */ addiu $a0, $a0, %lo(D_80A91DC0) ## $a0 = 80A91DC0 -/* 00CC4 80A919E4 858D12DA */ lh $t5, 0x12DA($t4) ## 801612DA -/* 00CC8 80A919E8 51A00009 */ beql $t5, $zero, .L80A91A10 -/* 00CCC 80A919EC 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 00CD0 80A919F0 0C00084C */ jal osSyncPrintf - -/* 00CD4 80A919F4 AFA30020 */ sw $v1, 0x0020($sp) -/* 00CD8 80A919F8 8FA30020 */ lw $v1, 0x0020($sp) -/* 00CDC 80A919FC 3C0480A9 */ lui $a0, %hi(D_80A91DC4) ## $a0 = 80A90000 -/* 00CE0 80A91A00 24841DC4 */ addiu $a0, $a0, %lo(D_80A91DC4) ## $a0 = 80A91DC4 -/* 00CE4 80A91A04 0C00084C */ jal osSyncPrintf - -/* 00CE8 80A91A08 946504C6 */ lhu $a1, 0x04C6($v1) ## 000004C6 -/* 00CEC 80A91A0C 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -.L80A91A10: -/* 00CF0 80A91A10 A22E0195 */ sb $t6, 0x0195($s1) ## 00000195 -/* 00CF4 80A91A14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00CF8 80A91A18 240540A7 */ addiu $a1, $zero, 0x40A7 ## $a1 = 000040A7 -/* 00CFC 80A91A1C 0C042DA0 */ jal func_8010B680 -/* 00D00 80A91A20 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00D04 80A91A24 240F0005 */ addiu $t7, $zero, 0x0005 ## $t7 = 00000005 -/* 00D08 80A91A28 A62F0196 */ sh $t7, 0x0196($s1) ## 00000196 -/* 00D0C 80A91A2C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D10 80A91A30 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00D14 80A91A34 0C00B7D5 */ jal func_8002DF54 -/* 00D18 80A91A38 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 00D1C 80A91A3C 3C1880A9 */ lui $t8, %hi(func_80A91A90) ## $t8 = 80A90000 -/* 00D20 80A91A40 27181A90 */ addiu $t8, $t8, %lo(func_80A91A90) ## $t8 = 80A91A90 -/* 00D24 80A91A44 1000000D */ beq $zero, $zero, .L80A91A7C -/* 00D28 80A91A48 AE38014C */ sw $t8, 0x014C($s1) ## 0000014C -.L80A91A4C: -/* 00D2C 80A91A4C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -.L80A91A50: -/* 00D30 80A91A50 1441000A */ bne $v0, $at, .L80A91A7C -/* 00D34 80A91A54 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00D38 80A91A58 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00D3C 80A91A5C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00D40 80A91A60 0C2A43AF */ jal func_80A90EBC -/* 00D44 80A91A64 AFA70024 */ sw $a3, 0x0024($sp) -/* 00D48 80A91A68 8FA70024 */ lw $a3, 0x0024($sp) -/* 00D4C 80A91A6C 3C010080 */ lui $at, 0x0080 ## $at = 00800000 -/* 00D50 80A91A70 8CF90680 */ lw $t9, 0x0680($a3) ## 00000680 -/* 00D54 80A91A74 03214025 */ or $t0, $t9, $at ## $t0 = 00800000 -/* 00D58 80A91A78 ACE80680 */ sw $t0, 0x0680($a3) ## 00000680 -.L80A91A7C: -/* 00D5C 80A91A7C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00D60 80A91A80 8FB00014 */ lw $s0, 0x0014($sp) -/* 00D64 80A91A84 8FB10018 */ lw $s1, 0x0018($sp) -/* 00D68 80A91A88 03E00008 */ jr $ra -/* 00D6C 80A91A8C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A91A90.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A91A90.s deleted file mode 100644 index 9d9060f7bb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A91A90.s +++ /dev/null @@ -1,70 +0,0 @@ -glabel func_80A91A90 -/* 00D70 80A91A90 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00D74 80A91A94 AFBF001C */ sw $ra, 0x001C($sp) -/* 00D78 80A91A98 AFB10018 */ sw $s1, 0x0018($sp) -/* 00D7C 80A91A9C AFB00014 */ sw $s0, 0x0014($sp) -/* 00D80 80A91AA0 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00D84 80A91AA4 0C2A438A */ jal func_80A90E28 -/* 00D88 80A91AA8 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 00D8C 80A91AAC 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00D90 80A91AB0 26240150 */ addiu $a0, $s1, 0x0150 ## $a0 = 00000150 -/* 00D94 80A91AB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D98 80A91AB8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00D9C 80A91ABC 0C00B7D5 */ jal func_8002DF54 -/* 00DA0 80A91AC0 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 00DA4 80A91AC4 0C042F6F */ jal func_8010BDBC -/* 00DA8 80A91AC8 260420D8 */ addiu $a0, $s0, 0x20D8 ## $a0 = 000020D8 -/* 00DAC 80A91ACC 862E0196 */ lh $t6, 0x0196($s1) ## 00000196 -/* 00DB0 80A91AD0 55C2002A */ bnel $t6, $v0, .L80A91B7C -/* 00DB4 80A91AD4 8FBF001C */ lw $ra, 0x001C($sp) -/* 00DB8 80A91AD8 0C041AF2 */ jal func_80106BC8 -/* 00DBC 80A91ADC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00DC0 80A91AE0 10400025 */ beq $v0, $zero, .L80A91B78 -/* 00DC4 80A91AE4 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 00DC8 80A91AE8 922F0195 */ lbu $t7, 0x0195($s1) ## 00000195 -/* 00DCC 80A91AEC 3C038016 */ lui $v1, %hi(gSaveContext) -/* 00DD0 80A91AF0 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 00DD4 80A91AF4 11E00006 */ beq $t7, $zero, .L80A91B10 -/* 00DD8 80A91AF8 240BFFFF */ addiu $t3, $zero, 0xFFFF ## $t3 = FFFFFFFF -/* 00DDC 80A91AFC 94620EE6 */ lhu $v0, 0x0EE6($v1) ## 8015F546 -/* 00DE0 80A91B00 30581000 */ andi $t8, $v0, 0x1000 ## $t8 = 00000000 -/* 00DE4 80A91B04 17000002 */ bne $t8, $zero, .L80A91B10 -/* 00DE8 80A91B08 34591000 */ ori $t9, $v0, 0x1000 ## $t9 = 00001000 -/* 00DEC 80A91B0C A4790EE6 */ sh $t9, 0x0EE6($v1) ## 8015F546 -.L80A91B10: -/* 00DF0 80A91B10 86220208 */ lh $v0, 0x0208($s1) ## 00000208 -/* 00DF4 80A91B14 00024080 */ sll $t0, $v0, 2 -/* 00DF8 80A91B18 02084821 */ addu $t1, $s0, $t0 -/* 00DFC 80A91B1C 8D2A0790 */ lw $t2, 0x0790($t1) ## 00000790 -/* 00E00 80A91B20 15400003 */ bne $t2, $zero, .L80A91B30 -/* 00E04 80A91B24 00000000 */ nop -/* 00E08 80A91B28 A62B0208 */ sh $t3, 0x0208($s1) ## 00000208 -/* 00E0C 80A91B2C 86220208 */ lh $v0, 0x0208($s1) ## 00000208 -.L80A91B30: -/* 00E10 80A91B30 10410004 */ beq $v0, $at, .L80A91B44 -/* 00E14 80A91B34 00026080 */ sll $t4, $v0, 2 -/* 00E18 80A91B38 020C6821 */ addu $t5, $s0, $t4 -/* 00E1C 80A91B3C 0C016C69 */ jal func_8005B1A4 -/* 00E20 80A91B40 8DA40790 */ lw $a0, 0x0790($t5) ## 00000790 -.L80A91B44: -/* 00E24 80A91B44 0C041B33 */ jal func_80106CCC -/* 00E28 80A91B48 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E2C 80A91B4C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00E30 80A91B50 00300821 */ addu $at, $at, $s0 -/* 00E34 80A91B54 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 -/* 00E38 80A91B58 A42E04C6 */ sh $t6, 0x04C6($at) ## 000104C6 -/* 00E3C 80A91B5C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E40 80A91B60 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00E44 80A91B64 0C00B7D5 */ jal func_8002DF54 -/* 00E48 80A91B68 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 00E4C 80A91B6C 3C0F80A9 */ lui $t7, %hi(func_80A911F0) ## $t7 = 80A90000 -/* 00E50 80A91B70 25EF11F0 */ addiu $t7, $t7, %lo(func_80A911F0) ## $t7 = 80A911F0 -/* 00E54 80A91B74 AE2F014C */ sw $t7, 0x014C($s1) ## 0000014C -.L80A91B78: -/* 00E58 80A91B78 8FBF001C */ lw $ra, 0x001C($sp) -.L80A91B7C: -/* 00E5C 80A91B7C 8FB00014 */ lw $s0, 0x0014($sp) -/* 00E60 80A91B80 8FB10018 */ lw $s1, 0x0018($sp) -/* 00E64 80A91B84 03E00008 */ jr $ra -/* 00E68 80A91B88 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Destroy.s deleted file mode 100644 index 4c475f8405..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Destroy.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel EnReeba_Destroy -/* 001FC 80AE4ECC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00200 80AE4ED0 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00204 80AE4ED4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00208 80AE4ED8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0020C 80AE4EDC 24C50290 */ addiu $a1, $a2, 0x0290 ## $a1 = 00000290 -/* 00210 80AE4EE0 0C0170EB */ jal Collider_DestroyCylinder - -/* 00214 80AE4EE4 AFA60018 */ sw $a2, 0x0018($sp) -/* 00218 80AE4EE8 8FA60018 */ lw $a2, 0x0018($sp) -/* 0021C 80AE4EEC 8CC30118 */ lw $v1, 0x0118($a2) ## 00000118 -/* 00220 80AE4EF0 50600010 */ beql $v1, $zero, .L80AE4F34 -/* 00224 80AE4EF4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00228 80AE4EF8 8C6E0130 */ lw $t6, 0x0130($v1) ## 00000130 -/* 0022C 80AE4EFC 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -/* 00230 80AE4F00 51C0000C */ beql $t6, $zero, .L80AE4F34 -/* 00234 80AE4F04 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00238 80AE4F08 84630152 */ lh $v1, 0x0152($v1) ## 00000152 -/* 0023C 80AE4F0C 24190258 */ addiu $t9, $zero, 0x0258 ## $t9 = 00000258 -/* 00240 80AE4F10 18600002 */ blez $v1, .L80AE4F1C -/* 00244 80AE4F14 246FFFFF */ addiu $t7, $v1, 0xFFFF ## $t7 = FFFFFFFF -/* 00248 80AE4F18 A44F0152 */ sh $t7, 0x0152($v0) ## 00000152 -.L80AE4F1C: -/* 0024C 80AE4F1C 84D8027A */ lh $t8, 0x027A($a2) ## 0000027A -/* 00250 80AE4F20 53000004 */ beql $t8, $zero, .L80AE4F34 -/* 00254 80AE4F24 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00258 80AE4F28 AC40016C */ sw $zero, 0x016C($v0) ## 0000016C -/* 0025C 80AE4F2C A4590164 */ sh $t9, 0x0164($v0) ## 00000164 -/* 00260 80AE4F30 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AE4F34: -/* 00264 80AE4F34 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00268 80AE4F38 03E00008 */ jr $ra -/* 0026C 80AE4F3C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Draw.s deleted file mode 100644 index d817c10245..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Draw.s +++ /dev/null @@ -1,121 +0,0 @@ -.rdata -glabel D_80AE665C - .asciz "../z_en_reeba.c" - .balign 4 - -glabel D_80AE666C - .asciz "../z_en_reeba.c" - .balign 4 - -.text -glabel EnReeba_Draw -/* 016F4 80AE63C4 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 -/* 016F8 80AE63C8 AFB10048 */ sw $s1, 0x0048($sp) -/* 016FC 80AE63CC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 01700 80AE63D0 AFBF004C */ sw $ra, 0x004C($sp) -/* 01704 80AE63D4 AFB00044 */ sw $s0, 0x0044($sp) -/* 01708 80AE63D8 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 0170C 80AE63DC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01710 80AE63E0 3C0680AE */ lui $a2, %hi(D_80AE665C) ## $a2 = 80AE0000 -/* 01714 80AE63E4 24C6665C */ addiu $a2, $a2, %lo(D_80AE665C) ## $a2 = 80AE665C -/* 01718 80AE63E8 27A4006C */ addiu $a0, $sp, 0x006C ## $a0 = FFFFFFE4 -/* 0171C 80AE63EC 24070426 */ addiu $a3, $zero, 0x0426 ## $a3 = 00000426 -/* 01720 80AE63F0 0C031AB1 */ jal Graph_OpenDisps -/* 01724 80AE63F4 AFA5007C */ sw $a1, 0x007C($sp) -/* 01728 80AE63F8 0C024F46 */ jal func_80093D18 -/* 0172C 80AE63FC 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 01730 80AE6400 860E027A */ lh $t6, 0x027A($s0) ## 0000027A -/* 01734 80AE6404 8FA8007C */ lw $t0, 0x007C($sp) -/* 01738 80AE6408 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0173C 80AE640C 11C0000B */ beq $t6, $zero, .L80AE643C -/* 01740 80AE6410 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01744 80AE6414 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 -/* 01748 80AE6418 3C18FA00 */ lui $t8, 0xFA00 ## $t8 = FA000000 -/* 0174C 80AE641C 3C199B37 */ lui $t9, 0x9B37 ## $t9 = 9B370000 -/* 01750 80AE6420 246F0008 */ addiu $t7, $v1, 0x0008 ## $t7 = 00000008 -/* 01754 80AE6424 AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 -/* 01758 80AE6428 3739FFFF */ ori $t9, $t9, 0xFFFF ## $t9 = 9B37FFFF -/* 0175C 80AE642C 37180001 */ ori $t8, $t8, 0x0001 ## $t8 = FA000001 -/* 01760 80AE6430 AC780000 */ sw $t8, 0x0000($v1) ## 00000000 -/* 01764 80AE6434 10000009 */ beq $zero, $zero, .L80AE645C -/* 01768 80AE6438 AC790004 */ sw $t9, 0x0004($v1) ## 00000004 -.L80AE643C: -/* 0176C 80AE643C 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 -/* 01770 80AE6440 3C0AFA00 */ lui $t2, 0xFA00 ## $t2 = FA000000 -/* 01774 80AE6444 354A0001 */ ori $t2, $t2, 0x0001 ## $t2 = FA000001 -/* 01778 80AE6448 24690008 */ addiu $t1, $v1, 0x0008 ## $t1 = 00000008 -/* 0177C 80AE644C AD0902C0 */ sw $t1, 0x02C0($t0) ## 000002C0 -/* 01780 80AE6450 240BFFFF */ addiu $t3, $zero, 0xFFFF ## $t3 = FFFFFFFF -/* 01784 80AE6454 AC6B0004 */ sw $t3, 0x0004($v1) ## 00000004 -/* 01788 80AE6458 AC6A0000 */ sw $t2, 0x0000($v1) ## 00000000 -.L80AE645C: -/* 0178C 80AE645C 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 01790 80AE6460 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C -/* 01794 80AE6464 AFB00014 */ sw $s0, 0x0014($sp) -/* 01798 80AE6468 0C028572 */ jal SkelAnime_Draw - -/* 0179C 80AE646C AFA00010 */ sw $zero, 0x0010($sp) -/* 017A0 80AE6470 3C0680AE */ lui $a2, %hi(D_80AE666C) ## $a2 = 80AE0000 -/* 017A4 80AE6474 24C6666C */ addiu $a2, $a2, %lo(D_80AE666C) ## $a2 = 80AE666C -/* 017A8 80AE6478 27A4006C */ addiu $a0, $sp, 0x006C ## $a0 = FFFFFFE4 -/* 017AC 80AE647C 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 017B0 80AE6480 0C031AD5 */ jal Graph_CloseDisps -/* 017B4 80AE6484 24070440 */ addiu $a3, $zero, 0x0440 ## $a3 = 00000440 -/* 017B8 80AE6488 3C0C8016 */ lui $t4, %hi(gGameInfo) -/* 017BC 80AE648C 8D8CFA90 */ lw $t4, %lo(gGameInfo)($t4) -/* 017C0 80AE6490 858D12D4 */ lh $t5, 0x12D4($t4) ## 801612D4 -/* 017C4 80AE6494 51A0002E */ beql $t5, $zero, .L80AE6550 -/* 017C8 80AE6498 8FBF004C */ lw $ra, 0x004C($sp) -/* 017CC 80AE649C 0C01DE1C */ jal Math_Sins - ## sins? -/* 017D0 80AE64A0 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -/* 017D4 80AE64A4 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 017D8 80AE64A8 44812000 */ mtc1 $at, $f4 ## $f4 = 30.00 -/* 017DC 80AE64AC C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 -/* 017E0 80AE64B0 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 017E4 80AE64B4 46040182 */ mul.s $f6, $f0, $f4 -/* 017E8 80AE64B8 44812000 */ mtc1 $at, $f4 ## $f4 = 20.00 -/* 017EC 80AE64BC 46083280 */ add.s $f10, $f6, $f8 -/* 017F0 80AE64C0 E7AA0058 */ swc1 $f10, 0x0058($sp) -/* 017F4 80AE64C4 C6120028 */ lwc1 $f18, 0x0028($s0) ## 00000028 -/* 017F8 80AE64C8 46049180 */ add.s $f6, $f18, $f4 -/* 017FC 80AE64CC E7A6005C */ swc1 $f6, 0x005C($sp) -/* 01800 80AE64D0 0C01DE0D */ jal Math_Coss - ## coss? -/* 01804 80AE64D4 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -/* 01808 80AE64D8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0180C 80AE64DC 44818000 */ mtc1 $at, $f16 ## $f16 = 1.00 -/* 01810 80AE64E0 860E0032 */ lh $t6, 0x0032($s0) ## 00000032 -/* 01814 80AE64E4 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 01818 80AE64E8 44814000 */ mtc1 $at, $f8 ## $f8 = 30.00 -/* 0181C 80AE64EC C612002C */ lwc1 $f18, 0x002C($s0) ## 0000002C -/* 01820 80AE64F0 86070030 */ lh $a3, 0x0030($s0) ## 00000030 -/* 01824 80AE64F4 AFAE0010 */ sw $t6, 0x0010($sp) -/* 01828 80AE64F8 46080282 */ mul.s $f10, $f0, $f8 -/* 0182C 80AE64FC 860F0034 */ lh $t7, 0x0034($s0) ## 00000034 -/* 01830 80AE6500 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 01834 80AE6504 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 01838 80AE6508 24090004 */ addiu $t1, $zero, 0x0004 ## $t1 = 00000004 -/* 0183C 80AE650C AFA90034 */ sw $t1, 0x0034($sp) -/* 01840 80AE6510 AFB90030 */ sw $t9, 0x0030($sp) -/* 01844 80AE6514 46125080 */ add.s $f2, $f10, $f18 -/* 01848 80AE6518 AFB80024 */ sw $t8, 0x0024($sp) -/* 0184C 80AE651C AFA0002C */ sw $zero, 0x002C($sp) -/* 01850 80AE6520 AFA00028 */ sw $zero, 0x0028($sp) -/* 01854 80AE6524 E7B00020 */ swc1 $f16, 0x0020($sp) -/* 01858 80AE6528 E7B0001C */ swc1 $f16, 0x001C($sp) -/* 0185C 80AE652C E7B00018 */ swc1 $f16, 0x0018($sp) -/* 01860 80AE6530 AFAF0014 */ sw $t7, 0x0014($sp) -/* 01864 80AE6534 8E2A0000 */ lw $t2, 0x0000($s1) ## 00000000 -/* 01868 80AE6538 44061000 */ mfc1 $a2, $f2 -/* 0186C 80AE653C C7AC0058 */ lwc1 $f12, 0x0058($sp) -/* 01870 80AE6540 C7AE005C */ lwc1 $f14, 0x005C($sp) -/* 01874 80AE6544 0C018FA7 */ jal DebugDisplay_AddObject - -/* 01878 80AE6548 AFAA0038 */ sw $t2, 0x0038($sp) -/* 0187C 80AE654C 8FBF004C */ lw $ra, 0x004C($sp) -.L80AE6550: -/* 01880 80AE6550 8FB00044 */ lw $s0, 0x0044($sp) -/* 01884 80AE6554 8FB10048 */ lw $s1, 0x0048($sp) -/* 01888 80AE6558 03E00008 */ jr $ra -/* 0188C 80AE655C 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Init.s deleted file mode 100644 index a45f9cc476..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Init.s +++ /dev/null @@ -1,151 +0,0 @@ -.rdata -glabel D_80AE65F0 - .asciz "\x1b[33m☆☆☆☆☆ リーバぼす登場 ☆☆☆☆☆ %f\n\x1b[m" - .balign 4 - -.late_rodata -glabel D_80AE667C - .float 0.04 - -glabel D_80AE6680 - .word 0xC6D6D800 - -.text -glabel EnReeba_Init -/* 00000 80AE4CD0 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 00004 80AE4CD4 AFB00024 */ sw $s0, 0x0024($sp) -/* 00008 80AE4CD8 AFBF002C */ sw $ra, 0x002C($sp) -/* 0000C 80AE4CDC AFB10028 */ sw $s1, 0x0028($sp) -/* 00010 80AE4CE0 8C990024 */ lw $t9, 0x0024($a0) ## 00000024 -/* 00014 80AE4CE4 3C01C060 */ lui $at, 0xC060 ## $at = C0600000 -/* 00018 80AE4CE8 44812000 */ mtc1 $at, $f4 ## $f4 = -3.50 -/* 0001C 80AE4CEC AC990038 */ sw $t9, 0x0038($a0) ## 00000038 -/* 00020 80AE4CF0 8C99002C */ lw $t9, 0x002C($a0) ## 0000002C -/* 00024 80AE4CF4 8C980028 */ lw $t8, 0x0028($a0) ## 00000028 -/* 00028 80AE4CF8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0002C 80AE4CFC 240E0047 */ addiu $t6, $zero, 0x0047 ## $t6 = 00000047 -/* 00030 80AE4D00 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 -/* 00034 80AE4D04 A08E0117 */ sb $t6, 0x0117($a0) ## 00000117 -/* 00038 80AE4D08 A08F001F */ sb $t7, 0x001F($a0) ## 0000001F -/* 0003C 80AE4D0C E484006C */ swc1 $f4, 0x006C($a0) ## 0000006C -/* 00040 80AE4D10 AC990040 */ sw $t9, 0x0040($a0) ## 00000040 -/* 00044 80AE4D14 AC98003C */ sw $t8, 0x003C($a0) ## 0000003C -/* 00048 80AE4D18 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 0004C 80AE4D1C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00050 80AE4D20 26080190 */ addiu $t0, $s0, 0x0190 ## $t0 = 00000190 -/* 00054 80AE4D24 260901FC */ addiu $t1, $s0, 0x01FC ## $t1 = 000001FC -/* 00058 80AE4D28 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 0005C 80AE4D2C 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 00060 80AE4D30 240A0012 */ addiu $t2, $zero, 0x0012 ## $t2 = 00000012 -/* 00064 80AE4D34 AFAA0018 */ sw $t2, 0x0018($sp) -/* 00068 80AE4D38 24E701E4 */ addiu $a3, $a3, 0x01E4 ## $a3 = 060001E4 -/* 0006C 80AE4D3C 24C61EE8 */ addiu $a2, $a2, 0x1EE8 ## $a2 = 06001EE8 -/* 00070 80AE4D40 AFA90014 */ sw $t1, 0x0014($sp) -/* 00074 80AE4D44 AFA80010 */ sw $t0, 0x0010($sp) -/* 00078 80AE4D48 0C02915F */ jal SkelAnime_Init - -/* 0007C 80AE4D4C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00080 80AE4D50 240B00FE */ addiu $t3, $zero, 0x00FE ## $t3 = 000000FE -/* 00084 80AE4D54 240C0004 */ addiu $t4, $zero, 0x0004 ## $t4 = 00000004 -/* 00088 80AE4D58 A20B00AE */ sb $t3, 0x00AE($s0) ## 000000AE -/* 0008C 80AE4D5C A20C00AF */ sb $t4, 0x00AF($s0) ## 000000AF -/* 00090 80AE4D60 26050290 */ addiu $a1, $s0, 0x0290 ## $a1 = 00000290 -/* 00094 80AE4D64 AFA50034 */ sw $a1, 0x0034($sp) -/* 00098 80AE4D68 0C0170D9 */ jal Collider_InitCylinder - -/* 0009C 80AE4D6C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000A0 80AE4D70 3C0780AE */ lui $a3, %hi(D_80AE65A0) ## $a3 = 80AE0000 -/* 000A4 80AE4D74 8FA50034 */ lw $a1, 0x0034($sp) -/* 000A8 80AE4D78 24E765A0 */ addiu $a3, $a3, %lo(D_80AE65A0) ## $a3 = 80AE65A0 -/* 000AC 80AE4D7C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000B0 80AE4D80 0C01712B */ jal Collider_SetCylinder - -/* 000B4 80AE4D84 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 000B8 80AE4D88 860D001C */ lh $t5, 0x001C($s0) ## 0000001C -/* 000BC 80AE4D8C 3C0180AE */ lui $at, %hi(D_80AE667C) ## $at = 80AE0000 -/* 000C0 80AE4D90 A60D027A */ sh $t5, 0x027A($s0) ## 0000027A -/* 000C4 80AE4D94 860E027A */ lh $t6, 0x027A($s0) ## 0000027A -/* 000C8 80AE4D98 C426667C */ lwc1 $f6, %lo(D_80AE667C)($at) -/* 000CC 80AE4D9C 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 000D0 80AE4DA0 11C0001C */ beq $t6, $zero, .L80AE4E14 -/* 000D4 80AE4DA4 E606028C */ swc1 $f6, 0x028C($s0) ## 0000028C -/* 000D8 80AE4DA8 C608028C */ lwc1 $f8, 0x028C($s0) ## 0000028C -/* 000DC 80AE4DAC 44815000 */ mtc1 $at, $f10 ## $f10 = 1.50 -/* 000E0 80AE4DB0 240F0023 */ addiu $t7, $zero, 0x0023 ## $t7 = 00000023 -/* 000E4 80AE4DB4 2418002D */ addiu $t8, $zero, 0x002D ## $t8 = 0000002D -/* 000E8 80AE4DB8 460A4402 */ mul.s $f16, $f8, $f10 -/* 000EC 80AE4DBC 3C0480AE */ lui $a0, %hi(D_80AE65F0) ## $a0 = 80AE0000 -/* 000F0 80AE4DC0 A60F02D0 */ sh $t7, 0x02D0($s0) ## 000002D0 -/* 000F4 80AE4DC4 A61802D2 */ sh $t8, 0x02D2($s0) ## 000002D2 -/* 000F8 80AE4DC8 248465F0 */ addiu $a0, $a0, %lo(D_80AE65F0) ## $a0 = 80AE65F0 -/* 000FC 80AE4DCC E610028C */ swc1 $f16, 0x028C($s0) ## 0000028C -/* 00100 80AE4DD0 C612028C */ lwc1 $f18, 0x028C($s0) ## 0000028C -/* 00104 80AE4DD4 46009121 */ cvt.d.s $f4, $f18 -/* 00108 80AE4DD8 44072000 */ mfc1 $a3, $f4 -/* 0010C 80AE4DDC 44062800 */ mfc1 $a2, $f5 -/* 00110 80AE4DE0 0C00084C */ jal osSyncPrintf - -/* 00114 80AE4DE4 00000000 */ nop -/* 00118 80AE4DE8 24190014 */ addiu $t9, $zero, 0x0014 ## $t9 = 00000014 -/* 0011C 80AE4DEC 24080004 */ addiu $t0, $zero, 0x0004 ## $t0 = 00000004 -/* 00120 80AE4DF0 24090010 */ addiu $t1, $zero, 0x0010 ## $t1 = 00000010 -/* 00124 80AE4DF4 A21900AF */ sb $t9, 0x00AF($s0) ## 000000AF -/* 00128 80AE4DF8 A20802AC */ sb $t0, 0x02AC($s0) ## 000002AC -/* 0012C 80AE4DFC A20902AD */ sb $t1, 0x02AD($s0) ## 000002AD -/* 00130 80AE4E00 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00134 80AE4E04 26251C24 */ addiu $a1, $s1, 0x1C24 ## $a1 = 00001C24 -/* 00138 80AE4E08 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 0013C 80AE4E0C 0C00CDD2 */ jal Actor_ChangeType - -/* 00140 80AE4E10 24070005 */ addiu $a3, $zero, 0x0005 ## $a3 = 00000005 -.L80AE4E14: -/* 00144 80AE4E14 3C0180AE */ lui $at, %hi(D_80AE6680) ## $at = 80AE0000 -/* 00148 80AE4E18 C4286680 */ lwc1 $f8, %lo(D_80AE6680)($at) -/* 0014C 80AE4E1C C606028C */ lwc1 $f6, 0x028C($s0) ## 0000028C -/* 00150 80AE4E20 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) -/* 00154 80AE4E24 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) -/* 00158 80AE4E28 46083002 */ mul.s $f0, $f6, $f8 -/* 0015C 80AE4E2C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 00160 80AE4E30 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00164 80AE4E34 44050000 */ mfc1 $a1, $f0 -/* 00168 80AE4E38 E6000284 */ swc1 $f0, 0x0284($s0) ## 00000284 -/* 0016C 80AE4E3C 0C00AC78 */ jal ActorShape_Init - -/* 00170 80AE4E40 E60000BC */ swc1 $f0, 0x00BC($s0) ## 000000BC -/* 00174 80AE4E44 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 00178 80AE4E48 44810000 */ mtc1 $at, $f0 ## $f0 = 60.00 -/* 0017C 80AE4E4C 3C0A80AE */ lui $t2, %hi(D_80AE6560) ## $t2 = 80AE0000 -/* 00180 80AE4E50 254A6560 */ addiu $t2, $t2, %lo(D_80AE6560) ## $t2 = 80AE6560 -/* 00184 80AE4E54 AE0A0098 */ sw $t2, 0x0098($s0) ## 00000098 -/* 00188 80AE4E58 240B001D */ addiu $t3, $zero, 0x001D ## $t3 = 0000001D -/* 0018C 80AE4E5C 44070000 */ mfc1 $a3, $f0 -/* 00190 80AE4E60 AFAB0014 */ sw $t3, 0x0014($sp) -/* 00194 80AE4E64 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00198 80AE4E68 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0019C 80AE4E6C 3C06420C */ lui $a2, 0x420C ## $a2 = 420C0000 -/* 001A0 80AE4E70 0C00B92D */ jal func_8002E4B4 -/* 001A4 80AE4E74 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 001A8 80AE4E78 262407C0 */ addiu $a0, $s1, 0x07C0 ## $a0 = 000007C0 -/* 001AC 80AE4E7C 8E050078 */ lw $a1, 0x0078($s0) ## 00000078 -/* 001B0 80AE4E80 0C010753 */ jal func_80041D4C -/* 001B4 80AE4E84 9206007D */ lbu $a2, 0x007D($s0) ## 0000007D -/* 001B8 80AE4E88 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 001BC 80AE4E8C 10410008 */ beq $v0, $at, .L80AE4EB0 -/* 001C0 80AE4E90 3C0C80AE */ lui $t4, %hi(func_80AE4F40) ## $t4 = 80AE0000 -/* 001C4 80AE4E94 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 001C8 80AE4E98 10410005 */ beq $v0, $at, .L80AE4EB0 -/* 001CC 80AE4E9C 00000000 */ nop -/* 001D0 80AE4EA0 0C00B55C */ jal Actor_Kill - -/* 001D4 80AE4EA4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 001D8 80AE4EA8 10000004 */ beq $zero, $zero, .L80AE4EBC -/* 001DC 80AE4EAC 8FBF002C */ lw $ra, 0x002C($sp) -.L80AE4EB0: -/* 001E0 80AE4EB0 258C4F40 */ addiu $t4, $t4, %lo(func_80AE4F40) ## $t4 = 00004F40 -/* 001E4 80AE4EB4 AE0C026C */ sw $t4, 0x026C($s0) ## 0000026C -/* 001E8 80AE4EB8 8FBF002C */ lw $ra, 0x002C($sp) -.L80AE4EBC: -/* 001EC 80AE4EBC 8FB00024 */ lw $s0, 0x0024($sp) -/* 001F0 80AE4EC0 8FB10028 */ lw $s1, 0x0028($sp) -/* 001F4 80AE4EC4 03E00008 */ jr $ra -/* 001F8 80AE4EC8 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Update.s deleted file mode 100644 index cd9a9f4c61..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Update.s +++ /dev/null @@ -1,193 +0,0 @@ -glabel EnReeba_Update -/* 01448 80AE6118 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 0144C 80AE611C AFBF0024 */ sw $ra, 0x0024($sp) -/* 01450 80AE6120 AFB00020 */ sw $s0, 0x0020($sp) -/* 01454 80AE6124 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 -/* 01458 80AE6128 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0145C 80AE612C AFA50044 */ sw $a1, 0x0044($sp) -/* 01460 80AE6130 0C2B97B7 */ jal func_80AE5EDC -/* 01464 80AE6134 AFAE0034 */ sw $t6, 0x0034($sp) -/* 01468 80AE6138 8E19026C */ lw $t9, 0x026C($s0) ## 0000026C -/* 0146C 80AE613C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01470 80AE6140 8FA50044 */ lw $a1, 0x0044($sp) -/* 01474 80AE6144 0320F809 */ jalr $ra, $t9 -/* 01478 80AE6148 00000000 */ nop -/* 0147C 80AE614C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01480 80AE6150 0C00B58B */ jal Actor_SetScale - -/* 01484 80AE6154 8E05028C */ lw $a1, 0x028C($s0) ## 0000028C -/* 01488 80AE6158 86020270 */ lh $v0, 0x0270($s0) ## 00000270 -/* 0148C 80AE615C 10400002 */ beq $v0, $zero, .L80AE6168 -/* 01490 80AE6160 244FFFFF */ addiu $t7, $v0, 0xFFFF ## $t7 = FFFFFFFF -/* 01494 80AE6164 A60F0270 */ sh $t7, 0x0270($s0) ## 00000270 -.L80AE6168: -/* 01498 80AE6168 86020272 */ lh $v0, 0x0272($s0) ## 00000272 -/* 0149C 80AE616C 10400002 */ beq $v0, $zero, .L80AE6178 -/* 014A0 80AE6170 2458FFFF */ addiu $t8, $v0, 0xFFFF ## $t8 = FFFFFFFF -/* 014A4 80AE6174 A6180272 */ sh $t8, 0x0272($s0) ## 00000272 -.L80AE6178: -/* 014A8 80AE6178 86020278 */ lh $v0, 0x0278($s0) ## 00000278 -/* 014AC 80AE617C 10400002 */ beq $v0, $zero, .L80AE6188 -/* 014B0 80AE6180 2448FFFF */ addiu $t0, $v0, 0xFFFF ## $t0 = FFFFFFFF -/* 014B4 80AE6184 A6080278 */ sh $t0, 0x0278($s0) ## 00000278 -.L80AE6188: -/* 014B8 80AE6188 86020274 */ lh $v0, 0x0274($s0) ## 00000274 -/* 014BC 80AE618C 10400002 */ beq $v0, $zero, .L80AE6198 -/* 014C0 80AE6190 2449FFFF */ addiu $t1, $v0, 0xFFFF ## $t1 = FFFFFFFF -/* 014C4 80AE6194 A6090274 */ sh $t1, 0x0274($s0) ## 00000274 -.L80AE6198: -/* 014C8 80AE6198 86020276 */ lh $v0, 0x0276($s0) ## 00000276 -/* 014CC 80AE619C 10400002 */ beq $v0, $zero, .L80AE61A8 -/* 014D0 80AE61A0 244AFFFF */ addiu $t2, $v0, 0xFFFF ## $t2 = FFFFFFFF -/* 014D4 80AE61A4 A60A0276 */ sh $t2, 0x0276($s0) ## 00000276 -.L80AE61A8: -/* 014D8 80AE61A8 0C00B638 */ jal Actor_MoveForward - -/* 014DC 80AE61AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 014E0 80AE61B0 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 014E4 80AE61B4 44810000 */ mtc1 $at, $f0 ## $f0 = 60.00 -/* 014E8 80AE61B8 240B001D */ addiu $t3, $zero, 0x001D ## $t3 = 0000001D -/* 014EC 80AE61BC AFAB0014 */ sw $t3, 0x0014($sp) -/* 014F0 80AE61C0 44070000 */ mfc1 $a3, $f0 -/* 014F4 80AE61C4 8FA40044 */ lw $a0, 0x0044($sp) -/* 014F8 80AE61C8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 014FC 80AE61CC 3C06420C */ lui $a2, 0x420C ## $a2 = 420C0000 -/* 01500 80AE61D0 0C00B92D */ jal func_8002E4B4 -/* 01504 80AE61D4 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 01508 80AE61D8 920302A0 */ lbu $v1, 0x02A0($s0) ## 000002A0 -/* 0150C 80AE61DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01510 80AE61E0 26050290 */ addiu $a1, $s0, 0x0290 ## $a1 = 00000290 -/* 01514 80AE61E4 306C0004 */ andi $t4, $v1, 0x0004 ## $t4 = 00000000 -/* 01518 80AE61E8 1180001C */ beq $t4, $zero, .L80AE625C -/* 0151C 80AE61EC 306DFFFB */ andi $t5, $v1, 0xFFFB ## $t5 = 00000000 -/* 01520 80AE61F0 8E02026C */ lw $v0, 0x026C($s0) ## 0000026C -/* 01524 80AE61F4 3C0E80AE */ lui $t6, %hi(func_80AE5270) ## $t6 = 80AE0000 -/* 01528 80AE61F8 25CE5270 */ addiu $t6, $t6, %lo(func_80AE5270) ## $t6 = 80AE5270 -/* 0152C 80AE61FC 11C20005 */ beq $t6, $v0, .L80AE6214 -/* 01530 80AE6200 A20D02A0 */ sb $t5, 0x02A0($s0) ## 000002A0 -/* 01534 80AE6204 3C1980AE */ lui $t9, %hi(func_80AE53AC) ## $t9 = 80AE0000 -/* 01538 80AE6208 273953AC */ addiu $t9, $t9, %lo(func_80AE53AC) ## $t9 = 80AE53AC -/* 0153C 80AE620C 57220014 */ bnel $t9, $v0, .L80AE6260 -/* 01540 80AE6210 920302A0 */ lbu $v1, 0x02A0($s0) ## 000002A0 -.L80AE6214: -/* 01544 80AE6214 860F0032 */ lh $t7, 0x0032($s0) ## 00000032 -/* 01548 80AE6218 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 0154C 80AE621C 44812000 */ mtc1 $at, $f4 ## $f4 = 8.00 -/* 01550 80AE6220 448F3000 */ mtc1 $t7, $f6 ## $f6 = 0.00 -/* 01554 80AE6224 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 01558 80AE6228 44815000 */ mtc1 $at, $f10 ## $f10 = -1.00 -/* 0155C 80AE622C 46803220 */ cvt.s.w $f8, $f6 -/* 01560 80AE6230 3C0A80AE */ lui $t2, %hi(func_80AE561C) ## $t2 = 80AE0000 -/* 01564 80AE6234 2409000E */ addiu $t1, $zero, 0x000E ## $t1 = 0000000E -/* 01568 80AE6238 254A561C */ addiu $t2, $t2, %lo(func_80AE561C) ## $t2 = 80AE561C -/* 0156C 80AE623C A6090272 */ sh $t1, 0x0272($s0) ## 00000272 -/* 01570 80AE6240 AE0A026C */ sw $t2, 0x026C($s0) ## 0000026C -/* 01574 80AE6244 460A4402 */ mul.s $f16, $f8, $f10 -/* 01578 80AE6248 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 0157C 80AE624C 4600848D */ trunc.w.s $f18, $f16 -/* 01580 80AE6250 44089000 */ mfc1 $t0, $f18 -/* 01584 80AE6254 10000056 */ beq $zero, $zero, .L80AE63B0 -/* 01588 80AE6258 A6080032 */ sh $t0, 0x0032($s0) ## 00000032 -.L80AE625C: -/* 0158C 80AE625C 920302A0 */ lbu $v1, 0x02A0($s0) ## 000002A0 -.L80AE6260: -/* 01590 80AE6260 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 01594 80AE6264 306B0002 */ andi $t3, $v1, 0x0002 ## $t3 = 00000000 -/* 01598 80AE6268 11600010 */ beq $t3, $zero, .L80AE62AC -/* 0159C 80AE626C 306CFFFD */ andi $t4, $v1, 0xFFFD ## $t4 = 00000000 -/* 015A0 80AE6270 A20C02A0 */ sb $t4, 0x02A0($s0) ## 000002A0 -/* 015A4 80AE6274 8FAD0034 */ lw $t5, 0x0034($sp) -/* 015A8 80AE6278 8E0E0294 */ lw $t6, 0x0294($s0) ## 00000294 -/* 015AC 80AE627C 55AE000C */ bnel $t5, $t6, .L80AE62B0 -/* 015B0 80AE6280 8E0A0024 */ lw $t2, 0x0024($s0) ## 00000024 -/* 015B4 80AE6284 8619027A */ lh $t9, 0x027A($s0) ## 0000027A -/* 015B8 80AE6288 57200009 */ bnel $t9, $zero, .L80AE62B0 -/* 015BC 80AE628C 8E0A0024 */ lw $t2, 0x0024($s0) ## 00000024 -/* 015C0 80AE6290 8E18026C */ lw $t8, 0x026C($s0) ## 0000026C -/* 015C4 80AE6294 3C0F80AE */ lui $t7, %hi(func_80AE56E0) ## $t7 = 80AE0000 -/* 015C8 80AE6298 25EF56E0 */ addiu $t7, $t7, %lo(func_80AE56E0) ## $t7 = 80AE56E0 -/* 015CC 80AE629C 11F80003 */ beq $t7, $t8, .L80AE62AC -/* 015D0 80AE62A0 3C0880AE */ lui $t0, %hi(func_80AE5688) ## $t0 = 80AE0000 -/* 015D4 80AE62A4 25085688 */ addiu $t0, $t0, %lo(func_80AE5688) ## $t0 = 80AE5688 -/* 015D8 80AE62A8 AE08026C */ sw $t0, 0x026C($s0) ## 0000026C -.L80AE62AC: -/* 015DC 80AE62AC 8E0A0024 */ lw $t2, 0x0024($s0) ## 00000024 -.L80AE62B0: -/* 015E0 80AE62B0 860B027A */ lh $t3, 0x027A($s0) ## 0000027A -/* 015E4 80AE62B4 8E090028 */ lw $t1, 0x0028($s0) ## 00000028 -/* 015E8 80AE62B8 AE0A0038 */ sw $t2, 0x0038($s0) ## 00000038 -/* 015EC 80AE62BC 8E0A002C */ lw $t2, 0x002C($s0) ## 0000002C -/* 015F0 80AE62C0 AE09003C */ sw $t1, 0x003C($s0) ## 0000003C -/* 015F4 80AE62C4 15600007 */ bne $t3, $zero, .L80AE62E4 -/* 015F8 80AE62C8 AE0A0040 */ sw $t2, 0x0040($s0) ## 00000040 -/* 015FC 80AE62CC 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -/* 01600 80AE62D0 44813000 */ mtc1 $at, $f6 ## $f6 = 15.00 -/* 01604 80AE62D4 C604003C */ lwc1 $f4, 0x003C($s0) ## 0000003C -/* 01608 80AE62D8 46062200 */ add.s $f8, $f4, $f6 -/* 0160C 80AE62DC 10000006 */ beq $zero, $zero, .L80AE62F8 -/* 01610 80AE62E0 E608003C */ swc1 $f8, 0x003C($s0) ## 0000003C -.L80AE62E4: -/* 01614 80AE62E4 C60A003C */ lwc1 $f10, 0x003C($s0) ## 0000003C -/* 01618 80AE62E8 44818000 */ mtc1 $at, $f16 ## $f16 = 15.00 -/* 0161C 80AE62EC 00000000 */ nop -/* 01620 80AE62F0 46105480 */ add.s $f18, $f10, $f16 -/* 01624 80AE62F4 E612003C */ swc1 $f18, 0x003C($s0) ## 0000003C -.L80AE62F8: -/* 01628 80AE62F8 0C0189B7 */ jal Collider_CylinderUpdate - -/* 0162C 80AE62FC AFA50028 */ sw $a1, 0x0028($sp) -/* 01630 80AE6300 3C01C42F */ lui $at, 0xC42F ## $at = C42F0000 -/* 01634 80AE6304 44813000 */ mtc1 $at, $f6 ## $f6 = -700.00 -/* 01638 80AE6308 C60400BC */ lwc1 $f4, 0x00BC($s0) ## 000000BC -/* 0163C 80AE630C 4604303E */ c.le.s $f6, $f4 -/* 01640 80AE6310 00000000 */ nop -/* 01644 80AE6314 45020027 */ bc1fl .L80AE63B4 -/* 01648 80AE6318 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0164C 80AE631C 920C00AF */ lbu $t4, 0x00AF($s0) ## 000000AF -/* 01650 80AE6320 59800024 */ blezl $t4, .L80AE63B4 -/* 01654 80AE6324 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01658 80AE6328 8E0E026C */ lw $t6, 0x026C($s0) ## 0000026C -/* 0165C 80AE632C 3C0D80AE */ lui $t5, %hi(func_80AE56E0) ## $t5 = 80AE0000 -/* 01660 80AE6330 25AD56E0 */ addiu $t5, $t5, %lo(func_80AE56E0) ## $t5 = 80AE56E0 -/* 01664 80AE6334 11AE001E */ beq $t5, $t6, .L80AE63B0 -/* 01668 80AE6338 8FA40044 */ lw $a0, 0x0044($sp) -/* 0166C 80AE633C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01670 80AE6340 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 01674 80AE6344 00812821 */ addu $a1, $a0, $at -/* 01678 80AE6348 AFA5002C */ sw $a1, 0x002C($sp) -/* 0167C 80AE634C 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOT -/* 01680 80AE6350 8FA60028 */ lw $a2, 0x0028($sp) -/* 01684 80AE6354 C60800BC */ lwc1 $f8, 0x00BC($s0) ## 000000BC -/* 01688 80AE6358 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 0168C 80AE635C 3C1980AE */ lui $t9, %hi(func_80AE5270) ## $t9 = 80AE0000 -/* 01690 80AE6360 8FA40044 */ lw $a0, 0x0044($sp) -/* 01694 80AE6364 460A403C */ c.lt.s $f8, $f10 -/* 01698 80AE6368 27395270 */ addiu $t9, $t9, %lo(func_80AE5270) ## $t9 = 80AE5270 -/* 0169C 80AE636C 8FA5002C */ lw $a1, 0x002C($sp) -/* 016A0 80AE6370 8FA60028 */ lw $a2, 0x0028($sp) -/* 016A4 80AE6374 4503000F */ bc1tl .L80AE63B4 -/* 016A8 80AE6378 8FBF0024 */ lw $ra, 0x0024($sp) -/* 016AC 80AE637C 0C01767D */ jal CollisionCheck_SetAC - ## CollisionCheck_setAC -/* 016B0 80AE6380 AFB90030 */ sw $t9, 0x0030($sp) -/* 016B4 80AE6384 8E02026C */ lw $v0, 0x026C($s0) ## 0000026C -/* 016B8 80AE6388 8FAF0030 */ lw $t7, 0x0030($sp) -/* 016BC 80AE638C 3C1880AE */ lui $t8, %hi(func_80AE53AC) ## $t8 = 80AE0000 -/* 016C0 80AE6390 271853AC */ addiu $t8, $t8, %lo(func_80AE53AC) ## $t8 = 80AE53AC -/* 016C4 80AE6394 11E20003 */ beq $t7, $v0, .L80AE63A4 -/* 016C8 80AE6398 8FA40044 */ lw $a0, 0x0044($sp) -/* 016CC 80AE639C 57020005 */ bnel $t8, $v0, .L80AE63B4 -/* 016D0 80AE63A0 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AE63A4: -/* 016D4 80AE63A4 8FA5002C */ lw $a1, 0x002C($sp) -/* 016D8 80AE63A8 0C0175E7 */ jal CollisionCheck_SetAT - ## CollisionCheck_setAT -/* 016DC 80AE63AC 8FA60028 */ lw $a2, 0x0028($sp) -.L80AE63B0: -/* 016E0 80AE63B0 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AE63B4: -/* 016E4 80AE63B4 8FB00020 */ lw $s0, 0x0020($sp) -/* 016E8 80AE63B8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 016EC 80AE63BC 03E00008 */ jr $ra -/* 016F0 80AE63C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE4F40.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE4F40.s deleted file mode 100644 index 3790a512c6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE4F40.s +++ /dev/null @@ -1,78 +0,0 @@ -glabel func_80AE4F40 -/* 00270 80AE4F40 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00274 80AE4F44 AFB00028 */ sw $s0, 0x0028($sp) -/* 00278 80AE4F48 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0027C 80AE4F4C AFBF002C */ sw $ra, 0x002C($sp) -/* 00280 80AE4F50 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00284 80AE4F54 AFA5003C */ sw $a1, 0x003C($sp) -/* 00288 80AE4F58 0C028800 */ jal SkelAnime_GetFrameCount - -/* 0028C 80AE4F5C 248401E4 */ addiu $a0, $a0, 0x01E4 ## $a0 = 060001E4 -/* 00290 80AE4F60 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00294 80AE4F64 8FAE003C */ lw $t6, 0x003C($sp) -/* 00298 80AE4F68 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 0029C 80AE4F6C 468021A0 */ cvt.s.w $f6, $f4 -/* 002A0 80AE4F70 8DCF1C44 */ lw $t7, 0x1C44($t6) ## 00001C44 -/* 002A4 80AE4F74 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 -/* 002A8 80AE4F78 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 002AC 80AE4F7C 24A501E4 */ addiu $a1, $a1, 0x01E4 ## $a1 = 060001E4 -/* 002B0 80AE4F80 AFA00014 */ sw $zero, 0x0014($sp) -/* 002B4 80AE4F84 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 002B8 80AE4F88 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 002BC 80AE4F8C 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 -/* 002C0 80AE4F90 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 002C4 80AE4F94 AFAF0030 */ sw $t7, 0x0030($sp) -/* 002C8 80AE4F98 0C029468 */ jal SkelAnime_ChangeAnim - -/* 002CC 80AE4F9C E7A80018 */ swc1 $f8, 0x0018($sp) -/* 002D0 80AE4FA0 8FB80030 */ lw $t8, 0x0030($sp) -/* 002D4 80AE4FA4 24030014 */ addiu $v1, $zero, 0x0014 ## $v1 = 00000014 -/* 002D8 80AE4FA8 240D0002 */ addiu $t5, $zero, 0x0002 ## $t5 = 00000002 -/* 002DC 80AE4FAC C7000838 */ lwc1 $f0, 0x0838($t8) ## 00000838 -/* 002E0 80AE4FB0 240539EE */ addiu $a1, $zero, 0x39EE ## $a1 = 000039EE -/* 002E4 80AE4FB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 002E8 80AE4FB8 46000005 */ abs.s $f0, $f0 -/* 002EC 80AE4FBC 4600028D */ trunc.w.s $f10, $f0 -/* 002F0 80AE4FC0 440A5000 */ mfc1 $t2, $f10 -/* 002F4 80AE4FC4 00000000 */ nop -/* 002F8 80AE4FC8 000A5840 */ sll $t3, $t2, 1 -/* 002FC 80AE4FCC 006B6023 */ subu $t4, $v1, $t3 -/* 00300 80AE4FD0 A60C0278 */ sh $t4, 0x0278($s0) ## 00000278 -/* 00304 80AE4FD4 86020278 */ lh $v0, 0x0278($s0) ## 00000278 -/* 00308 80AE4FD8 04430004 */ bgezl $v0, .L80AE4FEC -/* 0030C 80AE4FDC 28410015 */ slti $at, $v0, 0x0015 -/* 00310 80AE4FE0 A60D0278 */ sh $t5, 0x0278($s0) ## 00000278 -/* 00314 80AE4FE4 86020278 */ lh $v0, 0x0278($s0) ## 00000278 -/* 00318 80AE4FE8 28410015 */ slti $at, $v0, 0x0015 -.L80AE4FEC: -/* 0031C 80AE4FEC 54200003 */ bnel $at, $zero, .L80AE4FFC -/* 00320 80AE4FF0 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 -/* 00324 80AE4FF4 A6030278 */ sh $v1, 0x0278($s0) ## 00000278 -/* 00328 80AE4FF8 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 -.L80AE4FFC: -/* 0032C 80AE4FFC 8618027A */ lh $t8, 0x027A($s0) ## 0000027A -/* 00330 80AE5000 3C01F7FF */ lui $at, 0xF7FF ## $at = F7FF0000 -/* 00334 80AE5004 C6100080 */ lwc1 $f16, 0x0080($s0) ## 00000080 -/* 00338 80AE5008 3421FFFF */ ori $at, $at, 0xFFFF ## $at = F7FFFFFF -/* 0033C 80AE500C 01C17824 */ and $t7, $t6, $at -/* 00340 80AE5010 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 -/* 00344 80AE5014 13000005 */ beq $t8, $zero, .L80AE502C -/* 00348 80AE5018 E6100028 */ swc1 $f16, 0x0028($s0) ## 00000028 -/* 0034C 80AE501C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00350 80AE5020 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00354 80AE5024 10000003 */ beq $zero, $zero, .L80AE5034 -/* 00358 80AE5028 00000000 */ nop -.L80AE502C: -/* 0035C 80AE502C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00360 80AE5030 24053986 */ addiu $a1, $zero, 0x3986 ## $a1 = 00003986 -.L80AE5034: -/* 00364 80AE5034 3C1980AE */ lui $t9, %hi(func_80AE5054) ## $t9 = 80AE0000 -/* 00368 80AE5038 27395054 */ addiu $t9, $t9, %lo(func_80AE5054) ## $t9 = 80AE5054 -/* 0036C 80AE503C AE19026C */ sw $t9, 0x026C($s0) ## 0000026C -/* 00370 80AE5040 8FBF002C */ lw $ra, 0x002C($sp) -/* 00374 80AE5044 8FB00028 */ lw $s0, 0x0028($sp) -/* 00378 80AE5048 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 0037C 80AE504C 03E00008 */ jr $ra -/* 00380 80AE5050 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5054.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5054.s deleted file mode 100644 index 5561aa0ebd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5054.s +++ /dev/null @@ -1,162 +0,0 @@ -.late_rodata -glabel jtbl_80AE6684 -.word L80AE5170 -.word L80AE517C -.word L80AE51A8 -.word L80AE51A8 -.word L80AE51E8 -glabel D_80AE6698 - .float 0.15 - -.text -glabel func_80AE5054 -/* 00384 80AE5054 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00388 80AE5058 AFBF0034 */ sw $ra, 0x0034($sp) -/* 0038C 80AE505C AFB00030 */ sw $s0, 0x0030($sp) -/* 00390 80AE5060 AFA50044 */ sw $a1, 0x0044($sp) -/* 00394 80AE5064 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 00398 80AE5068 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0039C 80AE506C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 003A0 80AE5070 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 003A4 80AE5074 AFAF003C */ sw $t7, 0x003C($sp) -/* 003A8 80AE5078 8FA40044 */ lw $a0, 0x0044($sp) -/* 003AC 80AE507C 3C180001 */ lui $t8, 0x0001 ## $t8 = 00010000 -/* 003B0 80AE5080 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 003B4 80AE5084 0304C021 */ addu $t8, $t8, $a0 -/* 003B8 80AE5088 8F181DE4 */ lw $t8, 0x1DE4($t8) ## 00011DE4 -/* 003BC 80AE508C 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024 -/* 003C0 80AE5090 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 003C4 80AE5094 33190003 */ andi $t9, $t8, 0x0003 ## $t9 = 00000000 -/* 003C8 80AE5098 1720000C */ bne $t9, $zero, .L80AE50CC -/* 003CC 80AE509C 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 003D0 80AE50A0 8E0700C4 */ lw $a3, 0x00C4($s0) ## 000000C4 -/* 003D4 80AE50A4 44812000 */ mtc1 $at, $f4 ## $f4 = 8.00 -/* 003D8 80AE50A8 240901F4 */ addiu $t1, $zero, 0x01F4 ## $t1 = 000001F4 -/* 003DC 80AE50AC 240A000A */ addiu $t2, $zero, 0x000A ## $t2 = 0000000A -/* 003E0 80AE50B0 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 003E4 80AE50B4 AFAB0020 */ sw $t3, 0x0020($sp) -/* 003E8 80AE50B8 AFAA001C */ sw $t2, 0x001C($sp) -/* 003EC 80AE50BC AFA90018 */ sw $t1, 0x0018($sp) -/* 003F0 80AE50C0 AFA80010 */ sw $t0, 0x0010($sp) -/* 003F4 80AE50C4 0C00CC98 */ jal func_80033260 -/* 003F8 80AE50C8 E7A40014 */ swc1 $f4, 0x0014($sp) -.L80AE50CC: -/* 003FC 80AE50CC 860C0278 */ lh $t4, 0x0278($s0) ## 00000278 -/* 00400 80AE50D0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00404 80AE50D4 55800062 */ bnel $t4, $zero, .L80AE5260 -/* 00408 80AE50D8 8FBF0034 */ lw $ra, 0x0034($sp) -/* 0040C 80AE50DC 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 00410 80AE50E0 260400C4 */ addiu $a0, $s0, 0x00C4 ## $a0 = 000000C4 -/* 00414 80AE50E4 3C054140 */ lui $a1, 0x4140 ## $a1 = 41400000 -/* 00418 80AE50E8 44060000 */ mfc1 $a2, $f0 -/* 0041C 80AE50EC 44070000 */ mfc1 $a3, $f0 -/* 00420 80AE50F0 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 00424 80AE50F4 00000000 */ nop -/* 00428 80AE50F8 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 0042C 80AE50FC C60600BC */ lwc1 $f6, 0x00BC($s0) ## 000000BC -/* 00430 80AE5100 8FA3003C */ lw $v1, 0x003C($sp) -/* 00434 80AE5104 4602303C */ c.lt.s $f6, $f2 -/* 00438 80AE5108 00000000 */ nop -/* 0043C 80AE510C 4502000D */ bc1fl .L80AE5144 -/* 00440 80AE5110 960D0280 */ lhu $t5, 0x0280($s0) ## 00000280 -/* 00444 80AE5114 260400BC */ addiu $a0, $s0, 0x00BC ## $a0 = 000000BC -/* 00448 80AE5118 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 0044C 80AE511C 0C01E123 */ jal Math_SmoothDownscaleMaxF - -/* 00450 80AE5120 8E060288 */ lw $a2, 0x0288($s0) ## 00000288 -/* 00454 80AE5124 26040288 */ addiu $a0, $s0, 0x0288 ## $a0 = 00000288 -/* 00458 80AE5128 3C054396 */ lui $a1, 0x4396 ## $a1 = 43960000 -/* 0045C 80AE512C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00460 80AE5130 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 00464 80AE5134 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 -/* 00468 80AE5138 10000049 */ beq $zero, $zero, .L80AE5260 -/* 0046C 80AE513C 8FBF0034 */ lw $ra, 0x0034($sp) -/* 00470 80AE5140 960D0280 */ lhu $t5, 0x0280($s0) ## 00000280 -.L80AE5144: -/* 00474 80AE5144 E6020288 */ swc1 $f2, 0x0288($s0) ## 00000288 -/* 00478 80AE5148 E60200BC */ swc1 $f2, 0x00BC($s0) ## 000000BC -/* 0047C 80AE514C 2DA10005 */ sltiu $at, $t5, 0x0005 -/* 00480 80AE5150 10200030 */ beq $at, $zero, .L80AE5214 -/* 00484 80AE5154 C4600838 */ lwc1 $f0, 0x0838($v1) ## 00000838 -/* 00488 80AE5158 000D6880 */ sll $t5, $t5, 2 -/* 0048C 80AE515C 3C0180AE */ lui $at, %hi(jtbl_80AE6684) ## $at = 80AE0000 -/* 00490 80AE5160 002D0821 */ addu $at, $at, $t5 -/* 00494 80AE5164 8C2D6684 */ lw $t5, %lo(jtbl_80AE6684)($at) -/* 00498 80AE5168 01A00008 */ jr $t5 -/* 0049C 80AE516C 00000000 */ nop -glabel L80AE5170 -/* 004A0 80AE5170 860E008A */ lh $t6, 0x008A($s0) ## 0000008A -/* 004A4 80AE5174 10000027 */ beq $zero, $zero, .L80AE5214 -/* 004A8 80AE5178 A60E0032 */ sh $t6, 0x0032($s0) ## 00000032 -glabel L80AE517C -/* 004AC 80AE517C 860F008A */ lh $t7, 0x008A($s0) ## 0000008A -/* 004B0 80AE5180 3C014448 */ lui $at, 0x4448 ## $at = 44480000 -/* 004B4 80AE5184 44818000 */ mtc1 $at, $f16 ## $f16 = 800.00 -/* 004B8 80AE5188 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 -/* 004BC 80AE518C 46008482 */ mul.s $f18, $f16, $f0 -/* 004C0 80AE5190 468042A0 */ cvt.s.w $f10, $f8 -/* 004C4 80AE5194 46125100 */ add.s $f4, $f10, $f18 -/* 004C8 80AE5198 4600218D */ trunc.w.s $f6, $f4 -/* 004CC 80AE519C 44193000 */ mfc1 $t9, $f6 -/* 004D0 80AE51A0 1000001C */ beq $zero, $zero, .L80AE5214 -/* 004D4 80AE51A4 A6190032 */ sh $t9, 0x0032($s0) ## 00000032 -glabel L80AE51A8 -/* 004D8 80AE51A8 8602008A */ lh $v0, 0x008A($s0) ## 0000008A -/* 004DC 80AE51AC 846800B6 */ lh $t0, 0x00B6($v1) ## 000000B6 -/* 004E0 80AE51B0 3C0180AE */ lui $at, %hi(D_80AE6698) ## $at = 80AE0000 -/* 004E4 80AE51B4 C42A6698 */ lwc1 $f10, %lo(D_80AE6698)($at) -/* 004E8 80AE51B8 01024823 */ subu $t1, $t0, $v0 -/* 004EC 80AE51BC 44894000 */ mtc1 $t1, $f8 ## $f8 = 0.00 -/* 004F0 80AE51C0 460A0482 */ mul.s $f18, $f0, $f10 -/* 004F4 80AE51C4 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 -/* 004F8 80AE51C8 46804420 */ cvt.s.w $f16, $f8 -/* 004FC 80AE51CC 46803220 */ cvt.s.w $f8, $f6 -/* 00500 80AE51D0 46128102 */ mul.s $f4, $f16, $f18 -/* 00504 80AE51D4 46044280 */ add.s $f10, $f8, $f4 -/* 00508 80AE51D8 4600540D */ trunc.w.s $f16, $f10 -/* 0050C 80AE51DC 440B8000 */ mfc1 $t3, $f16 -/* 00510 80AE51E0 1000000C */ beq $zero, $zero, .L80AE5214 -/* 00514 80AE51E4 A60B0032 */ sh $t3, 0x0032($s0) ## 00000032 -glabel L80AE51E8 -/* 00518 80AE51E8 860C008A */ lh $t4, 0x008A($s0) ## 0000008A -/* 0051C 80AE51EC 3C014448 */ lui $at, 0x4448 ## $at = 44480000 -/* 00520 80AE51F0 44814000 */ mtc1 $at, $f8 ## $f8 = 800.00 -/* 00524 80AE51F4 448C9000 */ mtc1 $t4, $f18 ## $f18 = 0.00 -/* 00528 80AE51F8 46004102 */ mul.s $f4, $f8, $f0 -/* 0052C 80AE51FC 468091A0 */ cvt.s.w $f6, $f18 -/* 00530 80AE5200 46043281 */ sub.s $f10, $f6, $f4 -/* 00534 80AE5204 4600540D */ trunc.w.s $f16, $f10 -/* 00538 80AE5208 440E8000 */ mfc1 $t6, $f16 -/* 0053C 80AE520C 00000000 */ nop -/* 00540 80AE5210 A60E0032 */ sh $t6, 0x0032($s0) ## 00000032 -.L80AE5214: -/* 00544 80AE5214 860F027A */ lh $t7, 0x027A($s0) ## 0000027A -/* 00548 80AE5218 3C1880AE */ lui $t8, %hi(func_80AE538C) ## $t8 = 80AE0000 -/* 0054C 80AE521C 24190082 */ addiu $t9, $zero, 0x0082 ## $t9 = 00000082 -/* 00550 80AE5220 11E00004 */ beq $t7, $zero, .L80AE5234 -/* 00554 80AE5224 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 00558 80AE5228 2718538C */ addiu $t8, $t8, %lo(func_80AE538C) ## $t8 = 80AE538C -/* 0055C 80AE522C 1000000B */ beq $zero, $zero, .L80AE525C -/* 00560 80AE5230 AE18026C */ sw $t8, 0x026C($s0) ## 0000026C -.L80AE5234: -/* 00564 80AE5234 44816000 */ mtc1 $at, $f12 ## $f12 = 4.00 -/* 00568 80AE5238 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 0056C 80AE523C A6190272 */ sh $t9, 0x0272($s0) ## 00000272 -/* 00570 80AE5240 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 00574 80AE5244 44819000 */ mtc1 $at, $f18 ## $f18 = 6.00 -/* 00578 80AE5248 3C0880AE */ lui $t0, %hi(func_80AE5270) ## $t0 = 80AE0000 -/* 0057C 80AE524C 25085270 */ addiu $t0, $t0, %lo(func_80AE5270) ## $t0 = 80AE5270 -/* 00580 80AE5250 46120200 */ add.s $f8, $f0, $f18 -/* 00584 80AE5254 AE08026C */ sw $t0, 0x026C($s0) ## 0000026C -/* 00588 80AE5258 E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 -.L80AE525C: -/* 0058C 80AE525C 8FBF0034 */ lw $ra, 0x0034($sp) -.L80AE5260: -/* 00590 80AE5260 8FB00030 */ lw $s0, 0x0030($sp) -/* 00594 80AE5264 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00598 80AE5268 03E00008 */ jr $ra -/* 0059C 80AE526C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5270.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5270.s deleted file mode 100644 index 43eaae444f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5270.s +++ /dev/null @@ -1,81 +0,0 @@ -glabel func_80AE5270 -/* 005A0 80AE5270 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 005A4 80AE5274 AFB00018 */ sw $s0, 0x0018($sp) -/* 005A8 80AE5278 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 005AC 80AE527C AFBF001C */ sw $ra, 0x001C($sp) -/* 005B0 80AE5280 AFA50024 */ sw $a1, 0x0024($sp) -/* 005B4 80AE5284 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 005B8 80AE5288 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 005BC 80AE528C 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -/* 005C0 80AE5290 44810000 */ mtc1 $at, $f0 ## $f0 = 12.00 -/* 005C4 80AE5294 C60400C4 */ lwc1 $f4, 0x00C4($s0) ## 000000C4 -/* 005C8 80AE5298 260400C4 */ addiu $a0, $s0, 0x00C4 ## $a0 = 000000C4 -/* 005CC 80AE529C 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 -/* 005D0 80AE52A0 4600203C */ c.lt.s $f4, $f0 -/* 005D4 80AE52A4 00000000 */ nop -/* 005D8 80AE52A8 45020005 */ bc1fl .L80AE52C0 -/* 005DC 80AE52AC 8FA40024 */ lw $a0, 0x0024($sp) -/* 005E0 80AE52B0 44050000 */ mfc1 $a1, $f0 -/* 005E4 80AE52B4 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 005E8 80AE52B8 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 005EC 80AE52BC 8FA40024 */ lw $a0, 0x0024($sp) -.L80AE52C0: -/* 005F0 80AE52C0 8E050078 */ lw $a1, 0x0078($s0) ## 00000078 -/* 005F4 80AE52C4 9206007D */ lbu $a2, 0x007D($s0) ## 0000007D -/* 005F8 80AE52C8 0C010753 */ jal func_80041D4C -/* 005FC 80AE52CC 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 -/* 00600 80AE52D0 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00604 80AE52D4 10410008 */ beq $v0, $at, .L80AE52F8 -/* 00608 80AE52D8 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 0060C 80AE52DC 10410006 */ beq $v0, $at, .L80AE52F8 -/* 00610 80AE52E0 3C0E80AE */ lui $t6, %hi(func_80AE5688) ## $t6 = 80AE0000 -/* 00614 80AE52E4 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 00618 80AE52E8 25CE5688 */ addiu $t6, $t6, %lo(func_80AE5688) ## $t6 = 80AE5688 -/* 0061C 80AE52EC AE0E026C */ sw $t6, 0x026C($s0) ## 0000026C -/* 00620 80AE52F0 10000021 */ beq $zero, $zero, .L80AE5378 -/* 00624 80AE52F4 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 -.L80AE52F8: -/* 00628 80AE52F8 860F0272 */ lh $t7, 0x0272($s0) ## 00000272 -/* 0062C 80AE52FC 3C0880AE */ lui $t0, %hi(func_80AE5688) ## $t0 = 80AE0000 -/* 00630 80AE5300 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 00634 80AE5304 11E00012 */ beq $t7, $zero, .L80AE5350 -/* 00638 80AE5308 25085688 */ addiu $t0, $t0, %lo(func_80AE5688) ## $t0 = 80AE5688 -/* 0063C 80AE530C C6000090 */ lwc1 $f0, 0x0090($s0) ## 00000090 -/* 00640 80AE5310 44814000 */ mtc1 $at, $f8 ## $f8 = 30.00 -/* 00644 80AE5314 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 -/* 00648 80AE5318 4608003C */ c.lt.s $f0, $f8 -/* 0064C 80AE531C 00000000 */ nop -/* 00650 80AE5320 4501000B */ bc1t .L80AE5350 -/* 00654 80AE5324 00000000 */ nop -/* 00658 80AE5328 44815000 */ mtc1 $at, $f10 ## $f10 = 400.00 -/* 0065C 80AE532C 00000000 */ nop -/* 00660 80AE5330 4600503C */ c.lt.s $f10, $f0 -/* 00664 80AE5334 00000000 */ nop -/* 00668 80AE5338 45010005 */ bc1t .L80AE5350 -/* 0066C 80AE533C 00000000 */ nop -/* 00670 80AE5340 96180088 */ lhu $t8, 0x0088($s0) ## 00000088 -/* 00674 80AE5344 33190008 */ andi $t9, $t8, 0x0008 ## $t9 = 00000000 -/* 00678 80AE5348 53200004 */ beql $t9, $zero, .L80AE535C -/* 0067C 80AE534C 86090274 */ lh $t1, 0x0274($s0) ## 00000274 -.L80AE5350: -/* 00680 80AE5350 10000009 */ beq $zero, $zero, .L80AE5378 -/* 00684 80AE5354 AE08026C */ sw $t0, 0x026C($s0) ## 0000026C -/* 00688 80AE5358 86090274 */ lh $t1, 0x0274($s0) ## 00000274 -.L80AE535C: -/* 0068C 80AE535C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00690 80AE5360 55200006 */ bnel $t1, $zero, .L80AE537C -/* 00694 80AE5364 8FBF001C */ lw $ra, 0x001C($sp) -/* 00698 80AE5368 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0069C 80AE536C 2405398A */ addiu $a1, $zero, 0x398A ## $a1 = 0000398A -/* 006A0 80AE5370 240A000A */ addiu $t2, $zero, 0x000A ## $t2 = 0000000A -/* 006A4 80AE5374 A60A0274 */ sh $t2, 0x0274($s0) ## 00000274 -.L80AE5378: -/* 006A8 80AE5378 8FBF001C */ lw $ra, 0x001C($sp) -.L80AE537C: -/* 006AC 80AE537C 8FB00018 */ lw $s0, 0x0018($sp) -/* 006B0 80AE5380 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 006B4 80AE5384 03E00008 */ jr $ra -/* 006B8 80AE5388 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE538C.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE538C.s deleted file mode 100644 index 9e4558b151..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE538C.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80AE538C -/* 006BC 80AE538C AFA50004 */ sw $a1, 0x0004($sp) -/* 006C0 80AE5390 8C8E0004 */ lw $t6, 0x0004($a0) ## 00000004 -/* 006C4 80AE5394 3C1880AE */ lui $t8, %hi(func_80AE53AC) ## $t8 = 80AE0000 -/* 006C8 80AE5398 271853AC */ addiu $t8, $t8, %lo(func_80AE53AC) ## $t8 = 80AE53AC -/* 006CC 80AE539C 35CF0005 */ ori $t7, $t6, 0x0005 ## $t7 = 00000005 -/* 006D0 80AE53A0 AC8F0004 */ sw $t7, 0x0004($a0) ## 00000004 -/* 006D4 80AE53A4 03E00008 */ jr $ra -/* 006D8 80AE53A8 AC98026C */ sw $t8, 0x026C($a0) ## 0000026C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE53AC.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE53AC.s deleted file mode 100644 index 13073e5838..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE53AC.s +++ /dev/null @@ -1,178 +0,0 @@ -.late_rodata -glabel D_80AE669C - .word 0x3FE66666 - -.text -glabel func_80AE53AC -/* 006DC 80AE53AC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 006E0 80AE53B0 AFB00018 */ sw $s0, 0x0018($sp) -/* 006E4 80AE53B4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 006E8 80AE53B8 AFBF001C */ sw $ra, 0x001C($sp) -/* 006EC 80AE53BC AFA50024 */ sw $a1, 0x0024($sp) -/* 006F0 80AE53C0 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 006F4 80AE53C4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 006F8 80AE53C8 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -/* 006FC 80AE53CC 44810000 */ mtc1 $at, $f0 ## $f0 = 12.00 -/* 00700 80AE53D0 C60400C4 */ lwc1 $f4, 0x00C4($s0) ## 000000C4 -/* 00704 80AE53D4 260400C4 */ addiu $a0, $s0, 0x00C4 ## $a0 = 000000C4 -/* 00708 80AE53D8 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 -/* 0070C 80AE53DC 4600203C */ c.lt.s $f4, $f0 -/* 00710 80AE53E0 00000000 */ nop -/* 00714 80AE53E4 45020005 */ bc1fl .L80AE53FC -/* 00718 80AE53E8 8FA40024 */ lw $a0, 0x0024($sp) -/* 0071C 80AE53EC 44050000 */ mfc1 $a1, $f0 -/* 00720 80AE53F0 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 00724 80AE53F4 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 00728 80AE53F8 8FA40024 */ lw $a0, 0x0024($sp) -.L80AE53FC: -/* 0072C 80AE53FC 8E050078 */ lw $a1, 0x0078($s0) ## 00000078 -/* 00730 80AE5400 9206007D */ lbu $a2, 0x007D($s0) ## 0000007D -/* 00734 80AE5404 0C010753 */ jal func_80041D4C -/* 00738 80AE5408 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 -/* 0073C 80AE540C 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00740 80AE5410 10410002 */ beq $v0, $at, .L80AE541C -/* 00744 80AE5414 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 00748 80AE5418 1441000B */ bne $v0, $at, .L80AE5448 -.L80AE541C: -/* 0074C 80AE541C 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 -/* 00750 80AE5420 44813000 */ mtc1 $at, $f6 ## $f6 = 400.00 -/* 00754 80AE5424 C6000090 */ lwc1 $f0, 0x0090($s0) ## 00000090 -/* 00758 80AE5428 4600303C */ c.lt.s $f6, $f0 -/* 0075C 80AE542C 00000000 */ nop -/* 00760 80AE5430 45010005 */ bc1t .L80AE5448 -/* 00764 80AE5434 00000000 */ nop -/* 00768 80AE5438 960E0088 */ lhu $t6, 0x0088($s0) ## 00000088 -/* 0076C 80AE543C 3C01428C */ lui $at, 0x428C ## $at = 428C0000 -/* 00770 80AE5440 31CF0008 */ andi $t7, $t6, 0x0008 ## $t7 = 00000000 -/* 00774 80AE5444 11E00004 */ beq $t7, $zero, .L80AE5458 -.L80AE5448: -/* 00778 80AE5448 3C1880AE */ lui $t8, %hi(func_80AE5688) ## $t8 = 80AE0000 -/* 0077C 80AE544C 27185688 */ addiu $t8, $t8, %lo(func_80AE5688) ## $t8 = 80AE5688 -/* 00780 80AE5450 1000006D */ beq $zero, $zero, .L80AE5608 -/* 00784 80AE5454 AE18026C */ sw $t8, 0x026C($s0) ## 0000026C -.L80AE5458: -/* 00788 80AE5458 44814000 */ mtc1 $at, $f8 ## $f8 = 70.00 -/* 0078C 80AE545C 00000000 */ nop -/* 00790 80AE5460 4608003C */ c.lt.s $f0, $f8 -/* 00794 80AE5464 00000000 */ nop -/* 00798 80AE5468 45000006 */ bc1f .L80AE5484 -/* 0079C 80AE546C 00000000 */ nop -/* 007A0 80AE5470 86190270 */ lh $t9, 0x0270($s0) ## 00000270 -/* 007A4 80AE5474 2408001E */ addiu $t0, $zero, 0x001E ## $t0 = 0000001E -/* 007A8 80AE5478 17200002 */ bne $t9, $zero, .L80AE5484 -/* 007AC 80AE547C 00000000 */ nop -/* 007B0 80AE5480 A6080270 */ sh $t0, 0x0270($s0) ## 00000270 -.L80AE5484: -/* 007B4 80AE5484 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 007B8 80AE5488 00000000 */ nop -/* 007BC 80AE548C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 007C0 80AE5490 44818000 */ mtc1 $at, $f16 ## $f16 = 20.00 -/* 007C4 80AE5494 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 007C8 80AE5498 44812000 */ mtc1 $at, $f4 ## $f4 = 50.00 -/* 007CC 80AE549C C60A0090 */ lwc1 $f10, 0x0090($s0) ## 00000090 -/* 007D0 80AE54A0 3C014316 */ lui $at, 0x4316 ## $at = 43160000 -/* 007D4 80AE54A4 46040182 */ mul.s $f6, $f0, $f4 -/* 007D8 80AE54A8 44814000 */ mtc1 $at, $f8 ## $f8 = 150.00 -/* 007DC 80AE54AC 46105481 */ sub.s $f18, $f10, $f16 -/* 007E0 80AE54B0 3C0180AE */ lui $at, %hi(D_80AE669C) ## $at = 80AE0000 -/* 007E4 80AE54B4 C424669C */ lwc1 $f4, %lo(D_80AE669C)($at) -/* 007E8 80AE54B8 C6100068 */ lwc1 $f16, 0x0068($s0) ## 00000068 -/* 007EC 80AE54BC 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 007F0 80AE54C0 46083280 */ add.s $f10, $f6, $f8 -/* 007F4 80AE54C4 2405398A */ addiu $a1, $zero, 0x398A ## $a1 = 0000398A -/* 007F8 80AE54C8 460A9083 */ div.s $f2, $f18, $f10 -/* 007FC 80AE54CC 44819000 */ mtc1 $at, $f18 ## $f18 = 3.00 -/* 00800 80AE54D0 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 00804 80AE54D4 46041182 */ mul.s $f6, $f2, $f4 -/* 00808 80AE54D8 46068200 */ add.s $f8, $f16, $f6 -/* 0080C 80AE54DC E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 -/* 00810 80AE54E0 C60C0068 */ lwc1 $f12, 0x0068($s0) ## 00000068 -/* 00814 80AE54E4 460C903E */ c.le.s $f18, $f12 -/* 00818 80AE54E8 00000000 */ nop -/* 0081C 80AE54EC 45020006 */ bc1fl .L80AE5508 -/* 00820 80AE54F0 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 00824 80AE54F4 44815000 */ mtc1 $at, $f10 ## $f10 = -3.00 -/* 00828 80AE54F8 00000000 */ nop -/* 0082C 80AE54FC E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 -/* 00830 80AE5500 C60C0068 */ lwc1 $f12, 0x0068($s0) ## 00000068 -/* 00834 80AE5504 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -.L80AE5508: -/* 00838 80AE5508 44810000 */ mtc1 $at, $f0 ## $f0 = -3.00 -/* 0083C 80AE550C 00000000 */ nop -/* 00840 80AE5510 4600603C */ c.lt.s $f12, $f0 -/* 00844 80AE5514 00000000 */ nop -/* 00848 80AE5518 45020003 */ bc1fl .L80AE5528 -/* 0084C 80AE551C 86090270 */ lh $t1, 0x0270($s0) ## 00000270 -/* 00850 80AE5520 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 00854 80AE5524 86090270 */ lh $t1, 0x0270($s0) ## 00000270 -.L80AE5528: -/* 00858 80AE5528 55200004 */ bnel $t1, $zero, .L80AE553C -/* 0085C 80AE552C 8602008A */ lh $v0, 0x008A($s0) ## 0000008A -/* 00860 80AE5530 10000005 */ beq $zero, $zero, .L80AE5548 -/* 00864 80AE5534 8602008A */ lh $v0, 0x008A($s0) ## 0000008A -/* 00868 80AE5538 8602008A */ lh $v0, 0x008A($s0) ## 0000008A -.L80AE553C: -/* 0086C 80AE553C 00021023 */ subu $v0, $zero, $v0 -/* 00870 80AE5540 00021400 */ sll $v0, $v0, 16 -/* 00874 80AE5544 00021403 */ sra $v0, $v0, 16 -.L80AE5548: -/* 00878 80AE5548 86030032 */ lh $v1, 0x0032($s0) ## 00000032 -/* 0087C 80AE554C 00431023 */ subu $v0, $v0, $v1 -/* 00880 80AE5550 00021400 */ sll $v0, $v0, 16 -/* 00884 80AE5554 00021403 */ sra $v0, $v0, 16 -/* 00888 80AE5558 58400010 */ blezl $v0, .L80AE559C -/* 0088C 80AE555C 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 -/* 00890 80AE5560 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00894 80AE5564 3C0141F8 */ lui $at, 0x41F8 ## $at = 41F80000 -/* 00898 80AE5568 44813000 */ mtc1 $at, $f6 ## $f6 = 31.00 -/* 0089C 80AE556C 46802420 */ cvt.s.w $f16, $f4 -/* 008A0 80AE5570 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 008A4 80AE5574 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 -/* 008A8 80AE5578 46068203 */ div.s $f8, $f16, $f6 -/* 008AC 80AE557C 46124280 */ add.s $f10, $f8, $f18 -/* 008B0 80AE5580 4600510D */ trunc.w.s $f4, $f10 -/* 008B4 80AE5584 44042000 */ mfc1 $a0, $f4 -/* 008B8 80AE5588 00000000 */ nop -/* 008BC 80AE558C 00042400 */ sll $a0, $a0, 16 -/* 008C0 80AE5590 1000000E */ beq $zero, $zero, .L80AE55CC -/* 008C4 80AE5594 00042403 */ sra $a0, $a0, 16 -/* 008C8 80AE5598 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 -.L80AE559C: -/* 008CC 80AE559C 3C0141F8 */ lui $at, 0x41F8 ## $at = 41F80000 -/* 008D0 80AE55A0 44814000 */ mtc1 $at, $f8 ## $f8 = 31.00 -/* 008D4 80AE55A4 468081A0 */ cvt.s.w $f6, $f16 -/* 008D8 80AE55A8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 008DC 80AE55AC 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 -/* 008E0 80AE55B0 46083483 */ div.s $f18, $f6, $f8 -/* 008E4 80AE55B4 460A9101 */ sub.s $f4, $f18, $f10 -/* 008E8 80AE55B8 4600240D */ trunc.w.s $f16, $f4 -/* 008EC 80AE55BC 44048000 */ mfc1 $a0, $f16 -/* 008F0 80AE55C0 00000000 */ nop -/* 008F4 80AE55C4 00042400 */ sll $a0, $a0, 16 -/* 008F8 80AE55C8 00042403 */ sra $a0, $a0, 16 -.L80AE55CC: -/* 008FC 80AE55CC 44843000 */ mtc1 $a0, $f6 ## $f6 = 0.00 -/* 00900 80AE55D0 44834000 */ mtc1 $v1, $f8 ## $f8 = 0.00 -/* 00904 80AE55D4 860E0274 */ lh $t6, 0x0274($s0) ## 00000274 -/* 00908 80AE55D8 46803020 */ cvt.s.w $f0, $f6 -/* 0090C 80AE55DC 468044A0 */ cvt.s.w $f18, $f8 -/* 00910 80AE55E0 46000280 */ add.s $f10, $f0, $f0 -/* 00914 80AE55E4 460A9100 */ add.s $f4, $f18, $f10 -/* 00918 80AE55E8 4600240D */ trunc.w.s $f16, $f4 -/* 0091C 80AE55EC 440D8000 */ mfc1 $t5, $f16 -/* 00920 80AE55F0 15C00005 */ bne $t6, $zero, .L80AE5608 -/* 00924 80AE55F4 A60D0032 */ sh $t5, 0x0032($s0) ## 00000032 -/* 00928 80AE55F8 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0092C 80AE55FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00930 80AE5600 240F0014 */ addiu $t7, $zero, 0x0014 ## $t7 = 00000014 -/* 00934 80AE5604 A60F0274 */ sh $t7, 0x0274($s0) ## 00000274 -.L80AE5608: -/* 00938 80AE5608 8FBF001C */ lw $ra, 0x001C($sp) -/* 0093C 80AE560C 8FB00018 */ lw $s0, 0x0018($sp) -/* 00940 80AE5610 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00944 80AE5614 03E00008 */ jr $ra -/* 00948 80AE5618 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE561C.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE561C.s deleted file mode 100644 index fa2daf1853..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE561C.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_80AE561C -/* 0094C 80AE561C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00950 80AE5620 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00954 80AE5624 AFA5001C */ sw $a1, 0x001C($sp) -/* 00958 80AE5628 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 0095C 80AE562C 3C063E99 */ lui $a2, 0x3E99 ## $a2 = 3E990000 -/* 00960 80AE5630 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A -/* 00964 80AE5634 AFA70018 */ sw $a3, 0x0018($sp) -/* 00968 80AE5638 24840068 */ addiu $a0, $a0, 0x0068 ## $a0 = 00000068 -/* 0096C 80AE563C 0C01E123 */ jal Math_SmoothDownscaleMaxF - -/* 00970 80AE5640 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 00974 80AE5644 8FA70018 */ lw $a3, 0x0018($sp) -/* 00978 80AE5648 84EE0272 */ lh $t6, 0x0272($a3) ## 00000272 -/* 0097C 80AE564C 55C0000B */ bnel $t6, $zero, .L80AE567C -/* 00980 80AE5650 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00984 80AE5654 84EF027A */ lh $t7, 0x027A($a3) ## 0000027A -/* 00988 80AE5658 3C1980AE */ lui $t9, %hi(func_80AE5688) ## $t9 = 80AE0000 -/* 0098C 80AE565C 3C1880AE */ lui $t8, %hi(func_80AE538C) ## $t8 = 80AE0000 -/* 00990 80AE5660 11E00004 */ beq $t7, $zero, .L80AE5674 -/* 00994 80AE5664 27395688 */ addiu $t9, $t9, %lo(func_80AE5688) ## $t9 = 80AE5688 -/* 00998 80AE5668 2718538C */ addiu $t8, $t8, %lo(func_80AE538C) ## $t8 = 80AE538C -/* 0099C 80AE566C 10000002 */ beq $zero, $zero, .L80AE5678 -/* 009A0 80AE5670 ACF8026C */ sw $t8, 0x026C($a3) ## 0000026C -.L80AE5674: -/* 009A4 80AE5674 ACF9026C */ sw $t9, 0x026C($a3) ## 0000026C -.L80AE5678: -/* 009A8 80AE5678 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AE567C: -/* 009AC 80AE567C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 009B0 80AE5680 03E00008 */ jr $ra -/* 009B4 80AE5684 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5688.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5688.s deleted file mode 100644 index c452e579e8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5688.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80AE5688 -/* 009B8 80AE5688 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 009BC 80AE568C AFBF0014 */ sw $ra, 0x0014($sp) -/* 009C0 80AE5690 AFA5001C */ sw $a1, 0x001C($sp) -/* 009C4 80AE5694 A480027E */ sh $zero, 0x027E($a0) ## 0000027E -/* 009C8 80AE5698 AFA40018 */ sw $a0, 0x0018($sp) -/* 009CC 80AE569C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 009D0 80AE56A0 24053987 */ addiu $a1, $zero, 0x3987 ## $a1 = 00003987 -/* 009D4 80AE56A4 8FA40018 */ lw $a0, 0x0018($sp) -/* 009D8 80AE56A8 3C010800 */ lui $at, 0x0800 ## $at = 08000000 -/* 009DC 80AE56AC 3C0880AE */ lui $t0, %hi(func_80AE56E0) ## $t0 = 80AE0000 -/* 009E0 80AE56B0 8C8E0004 */ lw $t6, 0x0004($a0) ## 00000004 -/* 009E4 80AE56B4 250856E0 */ addiu $t0, $t0, %lo(func_80AE56E0) ## $t0 = 80AE56E0 -/* 009E8 80AE56B8 AC88026C */ sw $t0, 0x026C($a0) ## 0000026C -/* 009EC 80AE56BC 01C17825 */ or $t7, $t6, $at ## $t7 = 08000000 -/* 009F0 80AE56C0 2401FFFA */ addiu $at, $zero, 0xFFFA ## $at = FFFFFFFA -/* 009F4 80AE56C4 01E1C824 */ and $t9, $t7, $at -/* 009F8 80AE56C8 AC8F0004 */ sw $t7, 0x0004($a0) ## 00000004 -/* 009FC 80AE56CC AC990004 */ sw $t9, 0x0004($a0) ## 00000004 -/* 00A00 80AE56D0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00A04 80AE56D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00A08 80AE56D8 03E00008 */ jr $ra -/* 00A0C 80AE56DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE56E0.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE56E0.s deleted file mode 100644 index a75b7c994a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE56E0.s +++ /dev/null @@ -1,78 +0,0 @@ -glabel func_80AE56E0 -/* 00A10 80AE56E0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00A14 80AE56E4 AFB00030 */ sw $s0, 0x0030($sp) -/* 00A18 80AE56E8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00A1C 80AE56EC AFBF0034 */ sw $ra, 0x0034($sp) -/* 00A20 80AE56F0 AFA5003C */ sw $a1, 0x003C($sp) -/* 00A24 80AE56F4 3C063E99 */ lui $a2, 0x3E99 ## $a2 = 3E990000 -/* 00A28 80AE56F8 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A -/* 00A2C 80AE56FC 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 00A30 80AE5700 0C01E123 */ jal Math_SmoothDownscaleMaxF - -/* 00A34 80AE5704 248400C4 */ addiu $a0, $a0, 0x00C4 ## $a0 = 000000C4 -/* 00A38 80AE5708 3C053DCC */ lui $a1, 0x3DCC ## $a1 = 3DCC0000 -/* 00A3C 80AE570C 3C063E99 */ lui $a2, 0x3E99 ## $a2 = 3E990000 -/* 00A40 80AE5710 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A -/* 00A44 80AE5714 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3DCCCCCD -/* 00A48 80AE5718 0C01E123 */ jal Math_SmoothDownscaleMaxF - -/* 00A4C 80AE571C 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 00A50 80AE5720 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00A54 80AE5724 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00A58 80AE5728 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00A5C 80AE572C 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 -/* 00A60 80AE5730 C6000284 */ lwc1 $f0, 0x0284($s0) ## 00000284 -/* 00A64 80AE5734 C60400BC */ lwc1 $f4, 0x00BC($s0) ## 000000BC -/* 00A68 80AE5738 8FA4003C */ lw $a0, 0x003C($sp) -/* 00A6C 80AE573C 46060200 */ add.s $f8, $f0, $f6 -/* 00A70 80AE5740 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 -/* 00A74 80AE5744 01C47021 */ addu $t6, $t6, $a0 -/* 00A78 80AE5748 4604403E */ c.le.s $f8, $f4 -/* 00A7C 80AE574C 00000000 */ nop -/* 00A80 80AE5750 45000020 */ bc1f .L80AE57D4 -/* 00A84 80AE5754 00000000 */ nop -/* 00A88 80AE5758 8DCE1DE4 */ lw $t6, 0x1DE4($t6) ## 00011DE4 -/* 00A8C 80AE575C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00A90 80AE5760 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024 -/* 00A94 80AE5764 31CF0003 */ andi $t7, $t6, 0x0003 ## $t7 = 00000000 -/* 00A98 80AE5768 15E0000E */ bne $t7, $zero, .L80AE57A4 -/* 00A9C 80AE576C 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 00AA0 80AE5770 8E0700C4 */ lw $a3, 0x00C4($s0) ## 000000C4 -/* 00AA4 80AE5774 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 00AA8 80AE5778 44815000 */ mtc1 $at, $f10 ## $f10 = 8.00 -/* 00AAC 80AE577C 241901F4 */ addiu $t9, $zero, 0x01F4 ## $t9 = 000001F4 -/* 00AB0 80AE5780 2408000A */ addiu $t0, $zero, 0x000A ## $t0 = 0000000A -/* 00AB4 80AE5784 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 00AB8 80AE5788 AFA90020 */ sw $t1, 0x0020($sp) -/* 00ABC 80AE578C AFA8001C */ sw $t0, 0x001C($sp) -/* 00AC0 80AE5790 AFB90018 */ sw $t9, 0x0018($sp) -/* 00AC4 80AE5794 AFB80010 */ sw $t8, 0x0010($sp) -/* 00AC8 80AE5798 0C00CC98 */ jal func_80033260 -/* 00ACC 80AE579C E7AA0014 */ swc1 $f10, 0x0014($sp) -/* 00AD0 80AE57A0 C6000284 */ lwc1 $f0, 0x0284($s0) ## 00000284 -.L80AE57A4: -/* 00AD4 80AE57A4 44050000 */ mfc1 $a1, $f0 -/* 00AD8 80AE57A8 260400BC */ addiu $a0, $s0, 0x00BC ## $a0 = 000000BC -/* 00ADC 80AE57AC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00AE0 80AE57B0 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 00AE4 80AE57B4 8E070288 */ lw $a3, 0x0288($s0) ## 00000288 -/* 00AE8 80AE57B8 26040288 */ addiu $a0, $s0, 0x0288 ## $a0 = 00000288 -/* 00AEC 80AE57BC 3C054396 */ lui $a1, 0x4396 ## $a1 = 43960000 -/* 00AF0 80AE57C0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00AF4 80AE57C4 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 00AF8 80AE57C8 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 -/* 00AFC 80AE57CC 10000004 */ beq $zero, $zero, .L80AE57E0 -/* 00B00 80AE57D0 8FBF0034 */ lw $ra, 0x0034($sp) -.L80AE57D4: -/* 00B04 80AE57D4 0C00B55C */ jal Actor_Kill - -/* 00B08 80AE57D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B0C 80AE57DC 8FBF0034 */ lw $ra, 0x0034($sp) -.L80AE57E0: -/* 00B10 80AE57E0 8FB00030 */ lw $s0, 0x0030($sp) -/* 00B14 80AE57E4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00B18 80AE57E8 03E00008 */ jr $ra -/* 00B1C 80AE57EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE57F0.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE57F0.s deleted file mode 100644 index 338b6d9d67..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE57F0.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80AE57F0 -/* 00B20 80AE57F0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00B24 80AE57F4 AFBF001C */ sw $ra, 0x001C($sp) -/* 00B28 80AE57F8 AFA50024 */ sw $a1, 0x0024($sp) -/* 00B2C 80AE57FC 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 -/* 00B30 80AE5800 44812000 */ mtc1 $at, $f4 ## $f4 = -8.00 -/* 00B34 80AE5804 848F008A */ lh $t7, 0x008A($a0) ## 0000008A -/* 00B38 80AE5808 240E000E */ addiu $t6, $zero, 0x000E ## $t6 = 0000000E -/* 00B3C 80AE580C A48E0276 */ sh $t6, 0x0276($a0) ## 00000276 -/* 00B40 80AE5810 24180008 */ addiu $t8, $zero, 0x0008 ## $t8 = 00000008 -/* 00B44 80AE5814 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 00B48 80AE5818 A48F0032 */ sh $t7, 0x0032($a0) ## 00000032 -/* 00B4C 80AE581C AFA40020 */ sw $a0, 0x0020($sp) -/* 00B50 80AE5820 AFB80010 */ sw $t8, 0x0010($sp) -/* 00B54 80AE5824 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 -/* 00B58 80AE5828 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 00B5C 80AE582C 0C00D09B */ jal func_8003426C -/* 00B60 80AE5830 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00B64 80AE5834 8FA40020 */ lw $a0, 0x0020($sp) -/* 00B68 80AE5838 3C1980AE */ lui $t9, %hi(func_80AE5854) ## $t9 = 80AE0000 -/* 00B6C 80AE583C 27395854 */ addiu $t9, $t9, %lo(func_80AE5854) ## $t9 = 80AE5854 -/* 00B70 80AE5840 AC99026C */ sw $t9, 0x026C($a0) ## 0000026C -/* 00B74 80AE5844 8FBF001C */ lw $ra, 0x001C($sp) -/* 00B78 80AE5848 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00B7C 80AE584C 03E00008 */ jr $ra -/* 00B80 80AE5850 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5854.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5854.s deleted file mode 100644 index d24b70fa88..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5854.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_80AE5854 -/* 00B84 80AE5854 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00B88 80AE5858 AFA5001C */ sw $a1, 0x001C($sp) -/* 00B8C 80AE585C 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 00B90 80AE5860 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00B94 80AE5864 AFA40018 */ sw $a0, 0x0018($sp) -/* 00B98 80AE5868 AFA50018 */ sw $a1, 0x0018($sp) -/* 00B9C 80AE586C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00BA0 80AE5870 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00BA4 80AE5874 8FA50018 */ lw $a1, 0x0018($sp) -/* 00BA8 80AE5878 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00BAC 80AE587C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00BB0 80AE5880 C4A00068 */ lwc1 $f0, 0x0068($a1) ## 00000068 -/* 00BB4 80AE5884 4604003C */ c.lt.s $f0, $f4 -/* 00BB8 80AE5888 00000000 */ nop -/* 00BBC 80AE588C 45020006 */ bc1fl .L80AE58A8 -/* 00BC0 80AE5890 84AE0276 */ lh $t6, 0x0276($a1) ## 00000276 -/* 00BC4 80AE5894 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 00BC8 80AE5898 00000000 */ nop -/* 00BCC 80AE589C 46060200 */ add.s $f8, $f0, $f6 -/* 00BD0 80AE58A0 E4A80068 */ swc1 $f8, 0x0068($a1) ## 00000068 -/* 00BD4 80AE58A4 84AE0276 */ lh $t6, 0x0276($a1) ## 00000276 -.L80AE58A8: -/* 00BD8 80AE58A8 55C0000D */ bnel $t6, $zero, .L80AE58E0 -/* 00BDC 80AE58AC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00BE0 80AE58B0 84AF027A */ lh $t7, 0x027A($a1) ## 0000027A -/* 00BE4 80AE58B4 3C0880AE */ lui $t0, %hi(func_80AE5688) ## $t0 = 80AE0000 -/* 00BE8 80AE58B8 2418001E */ addiu $t8, $zero, 0x001E ## $t8 = 0000001E -/* 00BEC 80AE58BC 11E00006 */ beq $t7, $zero, .L80AE58D8 -/* 00BF0 80AE58C0 25085688 */ addiu $t0, $t0, %lo(func_80AE5688) ## $t0 = 80AE5688 -/* 00BF4 80AE58C4 3C1980AE */ lui $t9, %hi(func_80AE538C) ## $t9 = 80AE0000 -/* 00BF8 80AE58C8 2739538C */ addiu $t9, $t9, %lo(func_80AE538C) ## $t9 = 80AE538C -/* 00BFC 80AE58CC A4B80270 */ sh $t8, 0x0270($a1) ## 00000270 -/* 00C00 80AE58D0 10000002 */ beq $zero, $zero, .L80AE58DC -/* 00C04 80AE58D4 ACB9026C */ sw $t9, 0x026C($a1) ## 0000026C -.L80AE58D8: -/* 00C08 80AE58D8 ACA8026C */ sw $t0, 0x026C($a1) ## 0000026C -.L80AE58DC: -/* 00C0C 80AE58DC 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AE58E0: -/* 00C10 80AE58E0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00C14 80AE58E4 03E00008 */ jr $ra -/* 00C18 80AE58E8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE58EC.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE58EC.s deleted file mode 100644 index 6d60dd2f6f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE58EC.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80AE58EC -/* 00C1C 80AE58EC AFA50004 */ sw $a1, 0x0004($sp) -/* 00C20 80AE58F0 8C980004 */ lw $t8, 0x0004($a0) ## 00000004 -/* 00C24 80AE58F4 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 -/* 00C28 80AE58F8 44812000 */ mtc1 $at, $f4 ## $f4 = -8.00 -/* 00C2C 80AE58FC 3C010800 */ lui $at, 0x0800 ## $at = 08000000 -/* 00C30 80AE5900 0301C825 */ or $t9, $t8, $at ## $t9 = 08000000 -/* 00C34 80AE5904 848F008A */ lh $t7, 0x008A($a0) ## 0000008A -/* 00C38 80AE5908 2401FFFA */ addiu $at, $zero, 0xFFFA ## $at = FFFFFFFA -/* 00C3C 80AE590C 3C0A80AE */ lui $t2, %hi(func_80AE5938) ## $t2 = 80AE0000 -/* 00C40 80AE5910 240E000E */ addiu $t6, $zero, 0x000E ## $t6 = 0000000E -/* 00C44 80AE5914 AC990004 */ sw $t9, 0x0004($a0) ## 00000004 -/* 00C48 80AE5918 03214824 */ and $t1, $t9, $at -/* 00C4C 80AE591C 254A5938 */ addiu $t2, $t2, %lo(func_80AE5938) ## $t2 = 80AE5938 -/* 00C50 80AE5920 A48E0278 */ sh $t6, 0x0278($a0) ## 00000278 -/* 00C54 80AE5924 AC890004 */ sw $t1, 0x0004($a0) ## 00000004 -/* 00C58 80AE5928 AC8A026C */ sw $t2, 0x026C($a0) ## 0000026C -/* 00C5C 80AE592C E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 00C60 80AE5930 03E00008 */ jr $ra -/* 00C64 80AE5934 A48F0032 */ sh $t7, 0x0032($a0) ## 00000032 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5938.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5938.s deleted file mode 100644 index b26891597d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5938.s +++ /dev/null @@ -1,100 +0,0 @@ -glabel func_80AE5938 -/* 00C68 80AE5938 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 00C6C 80AE593C AFBF003C */ sw $ra, 0x003C($sp) -/* 00C70 80AE5940 AFB00038 */ sw $s0, 0x0038($sp) -/* 00C74 80AE5944 AFA5005C */ sw $a1, 0x005C($sp) -/* 00C78 80AE5948 848E0278 */ lh $t6, 0x0278($a0) ## 00000278 -/* 00C7C 80AE594C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00C80 80AE5950 51C0000E */ beql $t6, $zero, .L80AE598C -/* 00C84 80AE5954 8602027E */ lh $v0, 0x027E($s0) ## 0000027E -/* 00C88 80AE5958 C4800068 */ lwc1 $f0, 0x0068($a0) ## 00000068 -/* 00C8C 80AE595C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00C90 80AE5960 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00C94 80AE5964 4604003C */ c.lt.s $f0, $f4 -/* 00C98 80AE5968 00000000 */ nop -/* 00C9C 80AE596C 45020047 */ bc1fl .L80AE5A8C -/* 00CA0 80AE5970 8FBF003C */ lw $ra, 0x003C($sp) -/* 00CA4 80AE5974 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 00CA8 80AE5978 00000000 */ nop -/* 00CAC 80AE597C 46060200 */ add.s $f8, $f0, $f6 -/* 00CB0 80AE5980 10000041 */ beq $zero, $zero, .L80AE5A88 -/* 00CB4 80AE5984 E4880068 */ swc1 $f8, 0x0068($a0) ## 00000068 -/* 00CB8 80AE5988 8602027E */ lh $v0, 0x027E($s0) ## 0000027E -.L80AE598C: -/* 00CBC 80AE598C 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 00CC0 80AE5990 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00CC4 80AE5994 10410005 */ beq $v0, $at, .L80AE59AC -/* 00CC8 80AE5998 E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 -/* 00CCC 80AE599C 920F00AF */ lbu $t7, 0x00AF($s0) ## 000000AF -/* 00CD0 80AE59A0 3C1880AE */ lui $t8, %hi(func_80AE5A9C) ## $t8 = 80AE0000 -/* 00CD4 80AE59A4 27185A9C */ addiu $t8, $t8, %lo(func_80AE5A9C) ## $t8 = 80AE5A9C -/* 00CD8 80AE59A8 11E00034 */ beq $t7, $zero, .L80AE5A7C -.L80AE59AC: -/* 00CDC 80AE59AC 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00CE0 80AE59B0 1441002C */ bne $v0, $at, .L80AE5A64 -/* 00CE4 80AE59B4 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00CE8 80AE59B8 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 00CEC 80AE59BC 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 00CF0 80AE59C0 00000000 */ nop -/* 00CF4 80AE59C4 C6100024 */ lwc1 $f16, 0x0024($s0) ## 00000024 -/* 00CF8 80AE59C8 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00CFC 80AE59CC 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 00D00 80AE59D0 46100480 */ add.s $f18, $f0, $f16 -/* 00D04 80AE59D4 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 00D08 80AE59D8 E7B2004C */ swc1 $f18, 0x004C($sp) -/* 00D0C 80AE59DC C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 00D10 80AE59E0 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00D14 80AE59E4 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 00D18 80AE59E8 46040180 */ add.s $f6, $f0, $f4 -/* 00D1C 80AE59EC 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 00D20 80AE59F0 E7A60050 */ swc1 $f6, 0x0050($sp) -/* 00D24 80AE59F4 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 00D28 80AE59F8 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 00D2C 80AE59FC 44811000 */ mtc1 $at, $f2 ## $f2 = 3.00 -/* 00D30 80AE5A00 46080280 */ add.s $f10, $f0, $f8 -/* 00D34 80AE5A04 8FA4005C */ lw $a0, 0x005C($sp) -/* 00D38 80AE5A08 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00D3C 80AE5A0C 27A6004C */ addiu $a2, $sp, 0x004C ## $a2 = FFFFFFF4 -/* 00D40 80AE5A10 E7AA0054 */ swc1 $f10, 0x0054($sp) -/* 00D44 80AE5A14 8618027A */ lh $t8, 0x027A($s0) ## 0000027A -/* 00D48 80AE5A18 24070096 */ addiu $a3, $zero, 0x0096 ## $a3 = 00000096 -/* 00D4C 80AE5A1C 24190096 */ addiu $t9, $zero, 0x0096 ## $t9 = 00000096 -/* 00D50 80AE5A20 13000004 */ beq $t8, $zero, .L80AE5A34 -/* 00D54 80AE5A24 24080096 */ addiu $t0, $zero, 0x0096 ## $t0 = 00000096 -/* 00D58 80AE5A28 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 00D5C 80AE5A2C 44811000 */ mtc1 $at, $f2 ## $f2 = 6.00 -/* 00D60 80AE5A30 00000000 */ nop -.L80AE5A34: -/* 00D64 80AE5A34 240900FA */ addiu $t1, $zero, 0x00FA ## $t1 = 000000FA -/* 00D68 80AE5A38 240A00EB */ addiu $t2, $zero, 0x00EB ## $t2 = 000000EB -/* 00D6C 80AE5A3C 240B00F5 */ addiu $t3, $zero, 0x00F5 ## $t3 = 000000F5 -/* 00D70 80AE5A40 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF -/* 00D74 80AE5A44 AFAC0024 */ sw $t4, 0x0024($sp) -/* 00D78 80AE5A48 AFAB0020 */ sw $t3, 0x0020($sp) -/* 00D7C 80AE5A4C AFAA001C */ sw $t2, 0x001C($sp) -/* 00D80 80AE5A50 AFA90018 */ sw $t1, 0x0018($sp) -/* 00D84 80AE5A54 AFB90010 */ sw $t9, 0x0010($sp) -/* 00D88 80AE5A58 AFA80014 */ sw $t0, 0x0014($sp) -/* 00D8C 80AE5A5C 0C00A850 */ jal EffectSsEnIce_SpawnFlyingVec3f -/* 00D90 80AE5A60 E7A20028 */ swc1 $f2, 0x0028($sp) -.L80AE5A64: -/* 00D94 80AE5A64 3C0E80AE */ lui $t6, %hi(func_80AE5E48) ## $t6 = 80AE0000 -/* 00D98 80AE5A68 240D0042 */ addiu $t5, $zero, 0x0042 ## $t5 = 00000042 -/* 00D9C 80AE5A6C 25CE5E48 */ addiu $t6, $t6, %lo(func_80AE5E48) ## $t6 = 80AE5E48 -/* 00DA0 80AE5A70 A60D0278 */ sh $t5, 0x0278($s0) ## 00000278 -/* 00DA4 80AE5A74 10000004 */ beq $zero, $zero, .L80AE5A88 -/* 00DA8 80AE5A78 AE0E026C */ sw $t6, 0x026C($s0) ## 0000026C -.L80AE5A7C: -/* 00DAC 80AE5A7C 240F001E */ addiu $t7, $zero, 0x001E ## $t7 = 0000001E -/* 00DB0 80AE5A80 A60F0278 */ sh $t7, 0x0278($s0) ## 00000278 -/* 00DB4 80AE5A84 AE18026C */ sw $t8, 0x026C($s0) ## 0000026C -.L80AE5A88: -/* 00DB8 80AE5A88 8FBF003C */ lw $ra, 0x003C($sp) -.L80AE5A8C: -/* 00DBC 80AE5A8C 8FB00038 */ lw $s0, 0x0038($sp) -/* 00DC0 80AE5A90 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 00DC4 80AE5A94 03E00008 */ jr $ra -/* 00DC8 80AE5A98 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5A9C.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5A9C.s deleted file mode 100644 index 7a4ff49b63..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5A9C.s +++ /dev/null @@ -1,83 +0,0 @@ -glabel func_80AE5A9C -/* 00DCC 80AE5A9C 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 00DD0 80AE5AA0 AFBF003C */ sw $ra, 0x003C($sp) -/* 00DD4 80AE5AA4 AFB00038 */ sw $s0, 0x0038($sp) -/* 00DD8 80AE5AA8 AFA5005C */ sw $a1, 0x005C($sp) -/* 00DDC 80AE5AAC 84820278 */ lh $v0, 0x0278($a0) ## 00000278 -/* 00DE0 80AE5AB0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00DE4 80AE5AB4 24053989 */ addiu $a1, $zero, 0x3989 ## $a1 = 00003989 -/* 00DE8 80AE5AB8 10400035 */ beq $v0, $zero, .L80AE5B90 -/* 00DEC 80AE5ABC 00000000 */ nop -/* 00DF0 80AE5AC0 848E027E */ lh $t6, 0x027E($a0) ## 0000027E -/* 00DF4 80AE5AC4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00DF8 80AE5AC8 304F000F */ andi $t7, $v0, 0x000F ## $t7 = 00000000 -/* 00DFC 80AE5ACC 55C10039 */ bnel $t6, $at, .L80AE5BB4 -/* 00E00 80AE5AD0 8FBF003C */ lw $ra, 0x003C($sp) -/* 00E04 80AE5AD4 15E00036 */ bne $t7, $zero, .L80AE5BB0 -/* 00E08 80AE5AD8 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00E0C 80AE5ADC 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 00E10 80AE5AE0 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 00E14 80AE5AE4 00000000 */ nop -/* 00E18 80AE5AE8 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 00E1C 80AE5AEC 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00E20 80AE5AF0 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 00E24 80AE5AF4 46040180 */ add.s $f6, $f0, $f4 -/* 00E28 80AE5AF8 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 00E2C 80AE5AFC E7A6004C */ swc1 $f6, 0x004C($sp) -/* 00E30 80AE5B00 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 00E34 80AE5B04 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00E38 80AE5B08 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 00E3C 80AE5B0C 46080280 */ add.s $f10, $f0, $f8 -/* 00E40 80AE5B10 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 00E44 80AE5B14 E7AA0050 */ swc1 $f10, 0x0050($sp) -/* 00E48 80AE5B18 C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C -/* 00E4C 80AE5B1C 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 00E50 80AE5B20 44811000 */ mtc1 $at, $f2 ## $f2 = 3.00 -/* 00E54 80AE5B24 46100480 */ add.s $f18, $f0, $f16 -/* 00E58 80AE5B28 8FA4005C */ lw $a0, 0x005C($sp) -/* 00E5C 80AE5B2C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00E60 80AE5B30 27A6004C */ addiu $a2, $sp, 0x004C ## $a2 = FFFFFFF4 -/* 00E64 80AE5B34 E7B20054 */ swc1 $f18, 0x0054($sp) -/* 00E68 80AE5B38 8618027A */ lh $t8, 0x027A($s0) ## 0000027A -/* 00E6C 80AE5B3C 24070096 */ addiu $a3, $zero, 0x0096 ## $a3 = 00000096 -/* 00E70 80AE5B40 24190096 */ addiu $t9, $zero, 0x0096 ## $t9 = 00000096 -/* 00E74 80AE5B44 13000004 */ beq $t8, $zero, .L80AE5B58 -/* 00E78 80AE5B48 24080096 */ addiu $t0, $zero, 0x0096 ## $t0 = 00000096 -/* 00E7C 80AE5B4C 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 00E80 80AE5B50 44811000 */ mtc1 $at, $f2 ## $f2 = 6.00 -/* 00E84 80AE5B54 00000000 */ nop -.L80AE5B58: -/* 00E88 80AE5B58 240900FA */ addiu $t1, $zero, 0x00FA ## $t1 = 000000FA -/* 00E8C 80AE5B5C 240A00EB */ addiu $t2, $zero, 0x00EB ## $t2 = 000000EB -/* 00E90 80AE5B60 240B00F5 */ addiu $t3, $zero, 0x00F5 ## $t3 = 000000F5 -/* 00E94 80AE5B64 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF -/* 00E98 80AE5B68 AFAC0024 */ sw $t4, 0x0024($sp) -/* 00E9C 80AE5B6C AFAB0020 */ sw $t3, 0x0020($sp) -/* 00EA0 80AE5B70 AFAA001C */ sw $t2, 0x001C($sp) -/* 00EA4 80AE5B74 AFA90018 */ sw $t1, 0x0018($sp) -/* 00EA8 80AE5B78 AFB90010 */ sw $t9, 0x0010($sp) -/* 00EAC 80AE5B7C AFA80014 */ sw $t0, 0x0014($sp) -/* 00EB0 80AE5B80 0C00A850 */ jal EffectSsEnIce_SpawnFlyingVec3f -/* 00EB4 80AE5B84 E7A20028 */ swc1 $f2, 0x0028($sp) -/* 00EB8 80AE5B88 1000000A */ beq $zero, $zero, .L80AE5BB4 -/* 00EBC 80AE5B8C 8FBF003C */ lw $ra, 0x003C($sp) -.L80AE5B90: -/* 00EC0 80AE5B90 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00EC4 80AE5B94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00EC8 80AE5B98 8FA4005C */ lw $a0, 0x005C($sp) -/* 00ECC 80AE5B9C 0C00CB1F */ jal func_80032C7C -/* 00ED0 80AE5BA0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00ED4 80AE5BA4 3C0D80AE */ lui $t5, %hi(func_80AE5C38) ## $t5 = 80AE0000 -/* 00ED8 80AE5BA8 25AD5C38 */ addiu $t5, $t5, %lo(func_80AE5C38) ## $t5 = 80AE5C38 -/* 00EDC 80AE5BAC AE0D026C */ sw $t5, 0x026C($s0) ## 0000026C -.L80AE5BB0: -/* 00EE0 80AE5BB0 8FBF003C */ lw $ra, 0x003C($sp) -.L80AE5BB4: -/* 00EE4 80AE5BB4 8FB00038 */ lw $s0, 0x0038($sp) -/* 00EE8 80AE5BB8 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 00EEC 80AE5BBC 03E00008 */ jr $ra -/* 00EF0 80AE5BC0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5BC4.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5BC4.s deleted file mode 100644 index b22d5a0132..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5BC4.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_80AE5BC4 -/* 00EF4 80AE5BC4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00EF8 80AE5BC8 AFBF001C */ sw $ra, 0x001C($sp) -/* 00EFC 80AE5BCC AFA50024 */ sw $a1, 0x0024($sp) -/* 00F00 80AE5BD0 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 -/* 00F04 80AE5BD4 44812000 */ mtc1 $at, $f4 ## $f4 = -8.00 -/* 00F08 80AE5BD8 848E008A */ lh $t6, 0x008A($a0) ## 0000008A -/* 00F0C 80AE5BDC 240F0008 */ addiu $t7, $zero, 0x0008 ## $t7 = 00000008 -/* 00F10 80AE5BE0 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 00F14 80AE5BE4 A48E0032 */ sh $t6, 0x0032($a0) ## 00000032 -/* 00F18 80AE5BE8 AFA40020 */ sw $a0, 0x0020($sp) -/* 00F1C 80AE5BEC AFAF0010 */ sw $t7, 0x0010($sp) -/* 00F20 80AE5BF0 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 -/* 00F24 80AE5BF4 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 00F28 80AE5BF8 0C00D09B */ jal func_8003426C -/* 00F2C 80AE5BFC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00F30 80AE5C00 8FA40020 */ lw $a0, 0x0020($sp) -/* 00F34 80AE5C04 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 00F38 80AE5C08 3C0980AE */ lui $t1, %hi(func_80AE5C38) ## $t1 = 80AE0000 -/* 00F3C 80AE5C0C 8C990004 */ lw $t9, 0x0004($a0) ## 00000004 -/* 00F40 80AE5C10 2418000E */ addiu $t8, $zero, 0x000E ## $t8 = 0000000E -/* 00F44 80AE5C14 25295C38 */ addiu $t1, $t1, %lo(func_80AE5C38) ## $t1 = 80AE5C38 -/* 00F48 80AE5C18 03214024 */ and $t0, $t9, $at -/* 00F4C 80AE5C1C A4980278 */ sh $t8, 0x0278($a0) ## 00000278 -/* 00F50 80AE5C20 AC880004 */ sw $t0, 0x0004($a0) ## 00000004 -/* 00F54 80AE5C24 AC89026C */ sw $t1, 0x026C($a0) ## 0000026C -/* 00F58 80AE5C28 8FBF001C */ lw $ra, 0x001C($sp) -/* 00F5C 80AE5C2C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00F60 80AE5C30 03E00008 */ jr $ra -/* 00F64 80AE5C34 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5C38.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5C38.s deleted file mode 100644 index 2dc9154ebc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5C38.s +++ /dev/null @@ -1,165 +0,0 @@ -.rdata -glabel D_80AE6624 - .asciz "\n\n" - .balign 4 - -glabel D_80AE6628 - .asciz "\x1b[32m☆☆☆☆☆ 何匹ＤＥＡＤ？ ☆☆☆☆☆%d\n\x1b[m" - .balign 4 - -glabel D_80AE6658 - .asciz "\n\n" - .balign 4 - -.late_rodata -glabel D_80AE66A0 - .float 0.01 - -.text -glabel func_80AE5C38 -/* 00F68 80AE5C38 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 -/* 00F6C 80AE5C3C 3C0F80AE */ lui $t7, %hi(D_80AE65CC) ## $t7 = 80AE0000 -/* 00F70 80AE5C40 AFBF004C */ sw $ra, 0x004C($sp) -/* 00F74 80AE5C44 AFB00048 */ sw $s0, 0x0048($sp) -/* 00F78 80AE5C48 AFA50084 */ sw $a1, 0x0084($sp) -/* 00F7C 80AE5C4C 25EF65CC */ addiu $t7, $t7, %lo(D_80AE65CC) ## $t7 = 80AE65CC -/* 00F80 80AE5C50 8DF90000 */ lw $t9, 0x0000($t7) ## 80AE65CC -/* 00F84 80AE5C54 27AE0068 */ addiu $t6, $sp, 0x0068 ## $t6 = FFFFFFE8 -/* 00F88 80AE5C58 8DF80004 */ lw $t8, 0x0004($t7) ## 80AE65D0 -/* 00F8C 80AE5C5C ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFE8 -/* 00F90 80AE5C60 8DF90008 */ lw $t9, 0x0008($t7) ## 80AE65D4 -/* 00F94 80AE5C64 3C0980AE */ lui $t1, %hi(D_80AE65D8) ## $t1 = 80AE0000 -/* 00F98 80AE5C68 252965D8 */ addiu $t1, $t1, %lo(D_80AE65D8) ## $t1 = 80AE65D8 -/* 00F9C 80AE5C6C ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFEC -/* 00FA0 80AE5C70 ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFF0 -/* 00FA4 80AE5C74 8D2B0000 */ lw $t3, 0x0000($t1) ## 80AE65D8 -/* 00FA8 80AE5C78 27A8005C */ addiu $t0, $sp, 0x005C ## $t0 = FFFFFFDC -/* 00FAC 80AE5C7C 8D2A0004 */ lw $t2, 0x0004($t1) ## 80AE65DC -/* 00FB0 80AE5C80 AD0B0000 */ sw $t3, 0x0000($t0) ## FFFFFFDC -/* 00FB4 80AE5C84 8D2B0008 */ lw $t3, 0x0008($t1) ## 80AE65E0 -/* 00FB8 80AE5C88 AD0A0004 */ sw $t2, 0x0004($t0) ## FFFFFFE0 -/* 00FBC 80AE5C8C 3C053DCC */ lui $a1, 0x3DCC ## $a1 = 3DCC0000 -/* 00FC0 80AE5C90 AD0B0008 */ sw $t3, 0x0008($t0) ## FFFFFFE4 -/* 00FC4 80AE5C94 848C0278 */ lh $t4, 0x0278($a0) ## 00000278 -/* 00FC8 80AE5C98 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00FCC 80AE5C9C 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3DCCCCCD -/* 00FD0 80AE5CA0 1180000D */ beq $t4, $zero, .L80AE5CD8 -/* 00FD4 80AE5CA4 3C063C23 */ lui $a2, 0x3C23 ## $a2 = 3C230000 -/* 00FD8 80AE5CA8 C4800068 */ lwc1 $f0, 0x0068($a0) ## 00000068 -/* 00FDC 80AE5CAC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00FE0 80AE5CB0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00FE4 80AE5CB4 4604003C */ c.lt.s $f0, $f4 -/* 00FE8 80AE5CB8 00000000 */ nop -/* 00FEC 80AE5CBC 4502005E */ bc1fl .L80AE5E38 -/* 00FF0 80AE5CC0 8FBF004C */ lw $ra, 0x004C($sp) -/* 00FF4 80AE5CC4 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 00FF8 80AE5CC8 00000000 */ nop -/* 00FFC 80AE5CCC 46060200 */ add.s $f8, $f0, $f6 -/* 01000 80AE5CD0 10000058 */ beq $zero, $zero, .L80AE5E34 -/* 01004 80AE5CD4 E4880068 */ swc1 $f8, 0x0068($a0) ## 00000068 -.L80AE5CD8: -/* 01008 80AE5CD8 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 0100C 80AE5CDC 2604028C */ addiu $a0, $s0, 0x028C ## $a0 = 0000028C -/* 01010 80AE5CE0 34C6D70A */ ori $a2, $a2, 0xD70A ## $a2 = 3C23D70A -/* 01014 80AE5CE4 0C01E123 */ jal Math_SmoothDownscaleMaxF - -/* 01018 80AE5CE8 E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 -/* 0101C 80AE5CEC 3C0180AE */ lui $at, %hi(D_80AE66A0) ## $at = 80AE0000 -/* 01020 80AE5CF0 C43266A0 */ lwc1 $f18, %lo(D_80AE66A0)($at) -/* 01024 80AE5CF4 C610028C */ lwc1 $f16, 0x028C($s0) ## 0000028C -/* 01028 80AE5CF8 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 0102C 80AE5CFC 27A50074 */ addiu $a1, $sp, 0x0074 ## $a1 = FFFFFFF4 -/* 01030 80AE5D00 4612803C */ c.lt.s $f16, $f18 -/* 01034 80AE5D04 27A6005C */ addiu $a2, $sp, 0x005C ## $a2 = FFFFFFDC -/* 01038 80AE5D08 27A70068 */ addiu $a3, $sp, 0x0068 ## $a3 = FFFFFFE8 -/* 0103C 80AE5D0C 240D0078 */ addiu $t5, $zero, 0x0078 ## $t5 = 00000078 -/* 01040 80AE5D10 45000048 */ bc1f .L80AE5E34 -/* 01044 80AE5D14 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 01048 80AE5D18 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 0104C 80AE5D1C 44815000 */ mtc1 $at, $f10 ## $f10 = 4.00 -/* 01050 80AE5D20 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF -/* 01054 80AE5D24 E7A40074 */ swc1 $f4, 0x0074($sp) -/* 01058 80AE5D28 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 0105C 80AE5D2C 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 01060 80AE5D30 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 01064 80AE5D34 E7A60078 */ swc1 $f6, 0x0078($sp) -/* 01068 80AE5D38 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 0106C 80AE5D3C 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF -/* 01070 80AE5D40 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 01074 80AE5D44 240A0009 */ addiu $t2, $zero, 0x0009 ## $t2 = 00000009 -/* 01078 80AE5D48 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 0107C 80AE5D4C AFAB003C */ sw $t3, 0x003C($sp) -/* 01080 80AE5D50 AFAA0038 */ sw $t2, 0x0038($sp) -/* 01084 80AE5D54 AFA90034 */ sw $t1, 0x0034($sp) -/* 01088 80AE5D58 AFA80028 */ sw $t0, 0x0028($sp) -/* 0108C 80AE5D5C AFA00030 */ sw $zero, 0x0030($sp) -/* 01090 80AE5D60 AFA0002C */ sw $zero, 0x002C($sp) -/* 01094 80AE5D64 AFB90024 */ sw $t9, 0x0024($sp) -/* 01098 80AE5D68 AFB80020 */ sw $t8, 0x0020($sp) -/* 0109C 80AE5D6C AFAF001C */ sw $t7, 0x001C($sp) -/* 010A0 80AE5D70 AFAE0018 */ sw $t6, 0x0018($sp) -/* 010A4 80AE5D74 AFA00014 */ sw $zero, 0x0014($sp) -/* 010A8 80AE5D78 AFAD0010 */ sw $t5, 0x0010($sp) -/* 010AC 80AE5D7C 8FA40084 */ lw $a0, 0x0084($sp) -/* 010B0 80AE5D80 E7AA0060 */ swc1 $f10, 0x0060($sp) -/* 010B4 80AE5D84 0C00A9AE */ jal EffectSsDeadDb_Spawn -/* 010B8 80AE5D88 E7A8007C */ swc1 $f8, 0x007C($sp) -/* 010BC 80AE5D8C 860C027A */ lh $t4, 0x027A($s0) ## 0000027A -/* 010C0 80AE5D90 27A60074 */ addiu $a2, $sp, 0x0074 ## $a2 = FFFFFFF4 -/* 010C4 80AE5D94 8FA40084 */ lw $a0, 0x0084($sp) -/* 010C8 80AE5D98 15800007 */ bne $t4, $zero, .L80AE5DB8 -/* 010CC 80AE5D9C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 010D0 80AE5DA0 8FA40084 */ lw $a0, 0x0084($sp) -/* 010D4 80AE5DA4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 010D8 80AE5DA8 0C007E50 */ jal Item_DropCollectibleRandom - -/* 010DC 80AE5DAC 240700E0 */ addiu $a3, $zero, 0x00E0 ## $a3 = 000000E0 -/* 010E0 80AE5DB0 10000004 */ beq $zero, $zero, .L80AE5DC4 -/* 010E4 80AE5DB4 8E030118 */ lw $v1, 0x0118($s0) ## 00000118 -.L80AE5DB8: -/* 010E8 80AE5DB8 0C007E50 */ jal Item_DropCollectibleRandom - -/* 010EC 80AE5DBC 240700C0 */ addiu $a3, $zero, 0x00C0 ## $a3 = 000000C0 -/* 010F0 80AE5DC0 8E030118 */ lw $v1, 0x0118($s0) ## 00000118 -.L80AE5DC4: -/* 010F4 80AE5DC4 5060001C */ beql $v1, $zero, .L80AE5E38 -/* 010F8 80AE5DC8 8FBF004C */ lw $ra, 0x004C($sp) -/* 010FC 80AE5DCC 8C6D0130 */ lw $t5, 0x0130($v1) ## 00000130 -/* 01100 80AE5DD0 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -/* 01104 80AE5DD4 11A00015 */ beq $t5, $zero, .L80AE5E2C -/* 01108 80AE5DD8 00000000 */ nop -/* 0110C 80AE5DDC 860E027A */ lh $t6, 0x027A($s0) ## 0000027A -/* 01110 80AE5DE0 3C0480AE */ lui $a0, %hi(D_80AE6624) ## $a0 = 80AE0000 -/* 01114 80AE5DE4 24846624 */ addiu $a0, $a0, %lo(D_80AE6624) ## $a0 = 80AE6624 -/* 01118 80AE5DE8 15C00010 */ bne $t6, $zero, .L80AE5E2C -/* 0111C 80AE5DEC 00000000 */ nop -/* 01120 80AE5DF0 8463015E */ lh $v1, 0x015E($v1) ## 0000015E -/* 01124 80AE5DF4 2861000A */ slti $at, $v1, 0x000A -/* 01128 80AE5DF8 10200002 */ beq $at, $zero, .L80AE5E04 -/* 0112C 80AE5DFC 246F0001 */ addiu $t7, $v1, 0x0001 ## $t7 = 00000001 -/* 01130 80AE5E00 A44F015E */ sh $t7, 0x015E($v0) ## 0000015E -.L80AE5E04: -/* 01134 80AE5E04 0C00084C */ jal osSyncPrintf - -/* 01138 80AE5E08 AFA20058 */ sw $v0, 0x0058($sp) -/* 0113C 80AE5E0C 8FA20058 */ lw $v0, 0x0058($sp) -/* 01140 80AE5E10 3C0480AE */ lui $a0, %hi(D_80AE6628) ## $a0 = 80AE0000 -/* 01144 80AE5E14 24846628 */ addiu $a0, $a0, %lo(D_80AE6628) ## $a0 = 80AE6628 -/* 01148 80AE5E18 0C00084C */ jal osSyncPrintf - -/* 0114C 80AE5E1C 8445015E */ lh $a1, 0x015E($v0) ## 0000015E -/* 01150 80AE5E20 3C0480AE */ lui $a0, %hi(D_80AE6658) ## $a0 = 80AE0000 -/* 01154 80AE5E24 0C00084C */ jal osSyncPrintf - -/* 01158 80AE5E28 24846658 */ addiu $a0, $a0, %lo(D_80AE6658) ## $a0 = 80AE6658 -.L80AE5E2C: -/* 0115C 80AE5E2C 0C00B55C */ jal Actor_Kill - -/* 01160 80AE5E30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80AE5E34: -/* 01164 80AE5E34 8FBF004C */ lw $ra, 0x004C($sp) -.L80AE5E38: -/* 01168 80AE5E38 8FB00048 */ lw $s0, 0x0048($sp) -/* 0116C 80AE5E3C 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 -/* 01170 80AE5E40 03E00008 */ jr $ra -/* 01174 80AE5E44 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5E48.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5E48.s deleted file mode 100644 index fd47422be5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5E48.s +++ /dev/null @@ -1,50 +0,0 @@ -.late_rodata -glabel D_80AE66A4 - .float 3000.0 - -glabel D_80AE66A8 - .float 3000.0 - -.text -glabel func_80AE5E48 -/* 01178 80AE5E48 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0117C 80AE5E4C AFBF0014 */ sw $ra, 0x0014($sp) -/* 01180 80AE5E50 AFA5001C */ sw $a1, 0x001C($sp) -/* 01184 80AE5E54 848E0278 */ lh $t6, 0x0278($a0) ## 00000278 -/* 01188 80AE5E58 29C10025 */ slti $at, $t6, 0x0025 -/* 0118C 80AE5E5C 1020001B */ beq $at, $zero, .L80AE5ECC -/* 01190 80AE5E60 3C0180AE */ lui $at, %hi(D_80AE66A4) ## $at = 80AE0000 -/* 01194 80AE5E64 C42C66A4 */ lwc1 $f12, %lo(D_80AE66A4)($at) -/* 01198 80AE5E68 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 0119C 80AE5E6C AFA40018 */ sw $a0, 0x0018($sp) -/* 011A0 80AE5E70 4600010D */ trunc.w.s $f4, $f0 -/* 011A4 80AE5E74 8FA40018 */ lw $a0, 0x0018($sp) -/* 011A8 80AE5E78 3C0180AE */ lui $at, %hi(D_80AE66A8) ## $at = 80AE0000 -/* 011AC 80AE5E7C 44182000 */ mfc1 $t8, $f4 -/* 011B0 80AE5E80 00000000 */ nop -/* 011B4 80AE5E84 A49800B4 */ sh $t8, 0x00B4($a0) ## 000000B4 -/* 011B8 80AE5E88 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 011BC 80AE5E8C C42C66A8 */ lwc1 $f12, %lo(D_80AE66A8)($at) -/* 011C0 80AE5E90 4600018D */ trunc.w.s $f6, $f0 -/* 011C4 80AE5E94 8FA40018 */ lw $a0, 0x0018($sp) -/* 011C8 80AE5E98 84890278 */ lh $t1, 0x0278($a0) ## 00000278 -/* 011CC 80AE5E9C 44083000 */ mfc1 $t0, $f6 -/* 011D0 80AE5EA0 1520000A */ bne $t1, $zero, .L80AE5ECC -/* 011D4 80AE5EA4 A48800B8 */ sh $t0, 0x00B8($a0) ## 000000B8 -/* 011D8 80AE5EA8 848A027A */ lh $t2, 0x027A($a0) ## 0000027A -/* 011DC 80AE5EAC 3C0C80AE */ lui $t4, %hi(func_80AE5688) ## $t4 = 80AE0000 -/* 011E0 80AE5EB0 3C0B80AE */ lui $t3, %hi(func_80AE538C) ## $t3 = 80AE0000 -/* 011E4 80AE5EB4 11400004 */ beq $t2, $zero, .L80AE5EC8 -/* 011E8 80AE5EB8 258C5688 */ addiu $t4, $t4, %lo(func_80AE5688) ## $t4 = 80AE5688 -/* 011EC 80AE5EBC 256B538C */ addiu $t3, $t3, %lo(func_80AE538C) ## $t3 = 80AE538C -/* 011F0 80AE5EC0 10000002 */ beq $zero, $zero, .L80AE5ECC -/* 011F4 80AE5EC4 AC8B026C */ sw $t3, 0x026C($a0) ## 0000026C -.L80AE5EC8: -/* 011F8 80AE5EC8 AC8C026C */ sw $t4, 0x026C($a0) ## 0000026C -.L80AE5ECC: -/* 011FC 80AE5ECC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01200 80AE5ED0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01204 80AE5ED4 03E00008 */ jr $ra -/* 01208 80AE5ED8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5EDC.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5EDC.s deleted file mode 100644 index 62e8992f8d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5EDC.s +++ /dev/null @@ -1,182 +0,0 @@ -.late_rodata -glabel jtbl_80AE66AC -.word L80AE60CC -.word L80AE6104 -.word L80AE608C -.word L80AE6104 -.word L80AE6104 -.word L80AE6104 -.word L80AE6104 -.word L80AE6104 -.word L80AE6104 -.word L80AE6104 -.word L80AE5F5C -.word L80AE5F5C -.word L80AE5FB4 -.word L80AE600C -.word 0x00000000, 0x00000000, 0x00000000 - -.text -glabel func_80AE5EDC -/* 0120C 80AE5EDC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01210 80AE5EE0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01214 80AE5EE4 AFB00020 */ sw $s0, 0x0020($sp) -/* 01218 80AE5EE8 AFA5002C */ sw $a1, 0x002C($sp) -/* 0121C 80AE5EEC 908202A1 */ lbu $v0, 0x02A1($a0) ## 000002A1 -/* 01220 80AE5EF0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01224 80AE5EF4 304E0002 */ andi $t6, $v0, 0x0002 ## $t6 = 00000000 -/* 01228 80AE5EF8 11C00082 */ beq $t6, $zero, .L80AE6104 -/* 0122C 80AE5EFC 304FFFFD */ andi $t7, $v0, 0xFFFD ## $t7 = 00000000 -/* 01230 80AE5F00 8C83026C */ lw $v1, 0x026C($a0) ## 0000026C -/* 01234 80AE5F04 3C1880AE */ lui $t8, %hi(func_80AE5C38) ## $t8 = 80AE0000 -/* 01238 80AE5F08 27185C38 */ addiu $t8, $t8, %lo(func_80AE5C38) ## $t8 = 80AE5C38 -/* 0123C 80AE5F0C 1303007D */ beq $t8, $v1, .L80AE6104 -/* 01240 80AE5F10 A08F02A1 */ sb $t7, 0x02A1($a0) ## 000002A1 -/* 01244 80AE5F14 3C1980AE */ lui $t9, %hi(func_80AE5854) ## $t9 = 80AE0000 -/* 01248 80AE5F18 27395854 */ addiu $t9, $t9, %lo(func_80AE5854) ## $t9 = 80AE5854 -/* 0124C 80AE5F1C 5323007A */ beql $t9, $v1, .L80AE6108 -/* 01250 80AE5F20 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01254 80AE5F24 908900B1 */ lbu $t1, 0x00B1($a0) ## 000000B1 -/* 01258 80AE5F28 A48000B8 */ sh $zero, 0x00B8($a0) ## 000000B8 -/* 0125C 80AE5F2C 848800B8 */ lh $t0, 0x00B8($a0) ## 000000B8 -/* 01260 80AE5F30 252AFFFF */ addiu $t2, $t1, 0xFFFF ## $t2 = FFFFFFFF -/* 01264 80AE5F34 2D41000E */ sltiu $at, $t2, 0x000E -/* 01268 80AE5F38 A480027E */ sh $zero, 0x027E($a0) ## 0000027E -/* 0126C 80AE5F3C 10200071 */ beq $at, $zero, .L80AE6104 -/* 01270 80AE5F40 A48800B4 */ sh $t0, 0x00B4($a0) ## 000000B4 -/* 01274 80AE5F44 000A5080 */ sll $t2, $t2, 2 -/* 01278 80AE5F48 3C0180AE */ lui $at, %hi(jtbl_80AE66AC) ## $at = 80AE0000 -/* 0127C 80AE5F4C 002A0821 */ addu $at, $at, $t2 -/* 01280 80AE5F50 8C2A66AC */ lw $t2, %lo(jtbl_80AE66AC)($at) -/* 01284 80AE5F54 01400008 */ jr $t2 -/* 01288 80AE5F58 00000000 */ nop -glabel L80AE5F5C -/* 0128C 80AE5F5C 920B00AF */ lbu $t3, 0x00AF($s0) ## 000000AF -/* 01290 80AE5F60 29610002 */ slti $at, $t3, 0x0002 -/* 01294 80AE5F64 14200013 */ bne $at, $zero, .L80AE5FB4 -/* 01298 80AE5F68 00000000 */ nop -/* 0129C 80AE5F6C 860C027E */ lh $t4, 0x027E($s0) ## 0000027E -/* 012A0 80AE5F70 24020004 */ addiu $v0, $zero, 0x0004 ## $v0 = 00000004 -/* 012A4 80AE5F74 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 012A8 80AE5F78 104C000E */ beq $v0, $t4, .L80AE5FB4 -/* 012AC 80AE5F7C 2405389E */ addiu $a1, $zero, 0x389E ## $a1 = 0000389E -/* 012B0 80AE5F80 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 012B4 80AE5F84 A602027E */ sh $v0, 0x027E($s0) ## 0000027E -/* 012B8 80AE5F88 240D0050 */ addiu $t5, $zero, 0x0050 ## $t5 = 00000050 -/* 012BC 80AE5F8C AFAD0010 */ sw $t5, 0x0010($sp) -/* 012C0 80AE5F90 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 012C4 80AE5F94 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 012C8 80AE5F98 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 012CC 80AE5F9C 0C00D09B */ jal func_8003426C -/* 012D0 80AE5FA0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 012D4 80AE5FA4 3C0E80AE */ lui $t6, %hi(func_80AE58EC) ## $t6 = 80AE0000 -/* 012D8 80AE5FA8 25CE58EC */ addiu $t6, $t6, %lo(func_80AE58EC) ## $t6 = 80AE58EC -/* 012DC 80AE5FAC 10000055 */ beq $zero, $zero, .L80AE6104 -/* 012E0 80AE5FB0 AE0E026C */ sw $t6, 0x026C($s0) ## 0000026C -glabel L80AE5FB4 -.L80AE5FB4: -/* 012E4 80AE5FB4 920F00AF */ lbu $t7, 0x00AF($s0) ## 000000AF -/* 012E8 80AE5FB8 24020004 */ addiu $v0, $zero, 0x0004 ## $v0 = 00000004 -/* 012EC 80AE5FBC 29E10003 */ slti $at, $t7, 0x0003 -/* 012F0 80AE5FC0 54200013 */ bnel $at, $zero, .L80AE6010 -/* 012F4 80AE5FC4 24090006 */ addiu $t1, $zero, 0x0006 ## $t1 = 00000006 -/* 012F8 80AE5FC8 8618027E */ lh $t8, 0x027E($s0) ## 0000027E -/* 012FC 80AE5FCC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01300 80AE5FD0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01304 80AE5FD4 1058000D */ beq $v0, $t8, .L80AE600C -/* 01308 80AE5FD8 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 0130C 80AE5FDC A602027E */ sh $v0, 0x027E($s0) ## 0000027E -/* 01310 80AE5FE0 24190050 */ addiu $t9, $zero, 0x0050 ## $t9 = 00000050 -/* 01314 80AE5FE4 AFB90010 */ sw $t9, 0x0010($sp) -/* 01318 80AE5FE8 0C00D09B */ jal func_8003426C -/* 0131C 80AE5FEC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01320 80AE5FF0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01324 80AE5FF4 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01328 80AE5FF8 2405389E */ addiu $a1, $zero, 0x389E ## $a1 = 0000389E -/* 0132C 80AE5FFC 3C0880AE */ lui $t0, %hi(func_80AE58EC) ## $t0 = 80AE0000 -/* 01330 80AE6000 250858EC */ addiu $t0, $t0, %lo(func_80AE58EC) ## $t0 = 80AE58EC -/* 01334 80AE6004 1000003F */ beq $zero, $zero, .L80AE6104 -/* 01338 80AE6008 AE08026C */ sw $t0, 0x026C($s0) ## 0000026C -glabel L80AE600C -.L80AE600C: -/* 0133C 80AE600C 24090006 */ addiu $t1, $zero, 0x0006 ## $t1 = 00000006 -.L80AE6010: -/* 01340 80AE6010 A609027C */ sh $t1, 0x027C($s0) ## 0000027C -/* 01344 80AE6014 0C00D58A */ jal Actor_ApplyDamage - -/* 01348 80AE6018 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0134C 80AE601C 920A00AF */ lbu $t2, 0x00AF($s0) ## 000000AF -/* 01350 80AE6020 24053989 */ addiu $a1, $zero, 0x3989 ## $a1 = 00003989 -/* 01354 80AE6024 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01358 80AE6028 5540000B */ bnel $t2, $zero, .L80AE6058 -/* 0135C 80AE602C 8E0D026C */ lw $t5, 0x026C($s0) ## 0000026C -/* 01360 80AE6030 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01364 80AE6034 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01368 80AE6038 8FA4002C */ lw $a0, 0x002C($sp) -/* 0136C 80AE603C 0C00CB1F */ jal func_80032C7C -/* 01370 80AE6040 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01374 80AE6044 3C0B80AE */ lui $t3, %hi(func_80AE5BC4) ## $t3 = 80AE0000 -/* 01378 80AE6048 256B5BC4 */ addiu $t3, $t3, %lo(func_80AE5BC4) ## $t3 = 80AE5BC4 -/* 0137C 80AE604C 1000002D */ beq $zero, $zero, .L80AE6104 -/* 01380 80AE6050 AE0B026C */ sw $t3, 0x026C($s0) ## 0000026C -/* 01384 80AE6054 8E0D026C */ lw $t5, 0x026C($s0) ## 0000026C -.L80AE6058: -/* 01388 80AE6058 3C0C80AE */ lui $t4, %hi(func_80AE5E48) ## $t4 = 80AE0000 -/* 0138C 80AE605C 258C5E48 */ addiu $t4, $t4, %lo(func_80AE5E48) ## $t4 = 80AE5E48 -/* 01390 80AE6060 158D0004 */ bne $t4, $t5, .L80AE6074 -/* 01394 80AE6064 00000000 */ nop -/* 01398 80AE6068 A60000B8 */ sh $zero, 0x00B8($s0) ## 000000B8 -/* 0139C 80AE606C 860E00B8 */ lh $t6, 0x00B8($s0) ## 000000B8 -/* 013A0 80AE6070 A60E00B4 */ sh $t6, 0x00B4($s0) ## 000000B4 -.L80AE6074: -/* 013A4 80AE6074 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 013A8 80AE6078 24053988 */ addiu $a1, $zero, 0x3988 ## $a1 = 00003988 -/* 013AC 80AE607C 3C0F80AE */ lui $t7, %hi(func_80AE57F0) ## $t7 = 80AE0000 -/* 013B0 80AE6080 25EF57F0 */ addiu $t7, $t7, %lo(func_80AE57F0) ## $t7 = 80AE57F0 -/* 013B4 80AE6084 1000001F */ beq $zero, $zero, .L80AE6104 -/* 013B8 80AE6088 AE0F026C */ sw $t7, 0x026C($s0) ## 0000026C -glabel L80AE608C -/* 013BC 80AE608C 0C00D58A */ jal Actor_ApplyDamage - -/* 013C0 80AE6090 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 013C4 80AE6094 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 -/* 013C8 80AE6098 A602027C */ sh $v0, 0x027C($s0) ## 0000027C -/* 013CC 80AE609C A602027E */ sh $v0, 0x027E($s0) ## 0000027E -/* 013D0 80AE60A0 24180050 */ addiu $t8, $zero, 0x0050 ## $t8 = 00000050 -/* 013D4 80AE60A4 AFB80010 */ sw $t8, 0x0010($sp) -/* 013D8 80AE60A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 013DC 80AE60AC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 013E0 80AE60B0 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 013E4 80AE60B4 0C00D09B */ jal func_8003426C -/* 013E8 80AE60B8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 013EC 80AE60BC 3C1980AE */ lui $t9, %hi(func_80AE58EC) ## $t9 = 80AE0000 -/* 013F0 80AE60C0 273958EC */ addiu $t9, $t9, %lo(func_80AE58EC) ## $t9 = 80AE58EC -/* 013F4 80AE60C4 1000000F */ beq $zero, $zero, .L80AE6104 -/* 013F8 80AE60C8 AE19026C */ sw $t9, 0x026C($s0) ## 0000026C -glabel L80AE60CC -/* 013FC 80AE60CC 8608027E */ lh $t0, 0x027E($s0) ## 0000027E -/* 01400 80AE60D0 24020004 */ addiu $v0, $zero, 0x0004 ## $v0 = 00000004 -/* 01404 80AE60D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01408 80AE60D8 1048000A */ beq $v0, $t0, .L80AE6104 -/* 0140C 80AE60DC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01410 80AE60E0 A602027E */ sh $v0, 0x027E($s0) ## 0000027E -/* 01414 80AE60E4 24090050 */ addiu $t1, $zero, 0x0050 ## $t1 = 00000050 -/* 01418 80AE60E8 AFA90010 */ sw $t1, 0x0010($sp) -/* 0141C 80AE60EC 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 01420 80AE60F0 0C00D09B */ jal func_8003426C -/* 01424 80AE60F4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01428 80AE60F8 3C0A80AE */ lui $t2, %hi(func_80AE58EC) ## $t2 = 80AE0000 -/* 0142C 80AE60FC 254A58EC */ addiu $t2, $t2, %lo(func_80AE58EC) ## $t2 = 80AE58EC -/* 01430 80AE6100 AE0A026C */ sw $t2, 0x026C($s0) ## 0000026C -glabel L80AE6104 -.L80AE6104: -/* 01434 80AE6104 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AE6108: -/* 01438 80AE6108 8FB00020 */ lw $s0, 0x0020($sp) -/* 0143C 80AE610C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01440 80AE6110 03E00008 */ jr $ra -/* 01444 80AE6114 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Destroy.s deleted file mode 100644 index 386088e150..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Destroy.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel EnRl_Destroy -/* 00000 80AE72B0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00004 80AE72B4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00008 80AE72B8 0C0295BC */ jal SkelAnime_Free -/* 0000C 80AE72BC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00010 80AE72C0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00014 80AE72C4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00018 80AE72C8 03E00008 */ jr $ra -/* 0001C 80AE72CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Draw.s deleted file mode 100644 index fbff0a024a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Draw.s +++ /dev/null @@ -1,35 +0,0 @@ -.rdata -glabel D_80AE829C - .asciz "\x1b[31m描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n\x1b[m" - .balign 4 - -.text -glabel EnRl_Draw -/* 00E90 80AE8140 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00E94 80AE8144 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00E98 80AE8148 8C820198 */ lw $v0, 0x0198($a0) ## 00000198 -/* 00E9C 80AE814C 04400008 */ bltz $v0, .L80AE8170 -/* 00EA0 80AE8150 28410003 */ slti $at, $v0, 0x0003 -/* 00EA4 80AE8154 10200006 */ beq $at, $zero, .L80AE8170 -/* 00EA8 80AE8158 00027080 */ sll $t6, $v0, 2 -/* 00EAC 80AE815C 3C0380AF */ lui $v1, %hi(D_80AE81D0) ## $v1 = 80AF0000 -/* 00EB0 80AE8160 006E1821 */ addu $v1, $v1, $t6 -/* 00EB4 80AE8164 8C6381D0 */ lw $v1, %lo(D_80AE81D0)($v1) -/* 00EB8 80AE8168 14600006 */ bne $v1, $zero, .L80AE8184 -/* 00EBC 80AE816C 00000000 */ nop -.L80AE8170: -/* 00EC0 80AE8170 3C0480AF */ lui $a0, %hi(D_80AE829C) ## $a0 = 80AF0000 -/* 00EC4 80AE8174 0C00084C */ jal osSyncPrintf - -/* 00EC8 80AE8178 2484829C */ addiu $a0, $a0, %lo(D_80AE829C) ## $a0 = 80AE829C -/* 00ECC 80AE817C 10000004 */ beq $zero, $zero, .L80AE8190 -/* 00ED0 80AE8180 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AE8184: -/* 00ED4 80AE8184 0060F809 */ jalr $ra, $v1 -/* 00ED8 80AE8188 00000000 */ nop -/* 00EDC 80AE818C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AE8190: -/* 00EE0 80AE8190 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00EE4 80AE8194 03E00008 */ jr $ra -/* 00EE8 80AE8198 00000000 */ nop -/* 00EEC 80AE819C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Init.s deleted file mode 100644 index fc31ae5dc3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Init.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel EnRl_Init -/* 00CB8 80AE7F68 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00CBC 80AE7F6C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00CC0 80AE7F70 AFA40018 */ sw $a0, 0x0018($sp) -/* 00CC4 80AE7F74 AFA5001C */ sw $a1, 0x001C($sp) -/* 00CC8 80AE7F78 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) -/* 00CCC 80AE7F7C 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) -/* 00CD0 80AE7F80 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 00CD4 80AE7F84 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 -/* 00CD8 80AE7F88 0C00AC78 */ jal ActorShape_Init - -/* 00CDC 80AE7F8C 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 -/* 00CE0 80AE7F90 8FA40018 */ lw $a0, 0x0018($sp) -/* 00CE4 80AE7F94 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00CE8 80AE7F98 8FA5001C */ lw $a1, 0x001C($sp) -/* 00CEC 80AE7F9C 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 00CF0 80AE7FA0 15C10005 */ bne $t6, $at, .L80AE7FB8 -/* 00CF4 80AE7FA4 00000000 */ nop -/* 00CF8 80AE7FA8 0C2B9E1E */ jal func_80AE7878 -/* 00CFC 80AE7FAC 00000000 */ nop -/* 00D00 80AE7FB0 10000004 */ beq $zero, $zero, .L80AE7FC4 -/* 00D04 80AE7FB4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AE7FB8: -/* 00D08 80AE7FB8 0C2B9D51 */ jal func_80AE7544 -/* 00D0C 80AE7FBC 00000000 */ nop -/* 00D10 80AE7FC0 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AE7FC4: -/* 00D14 80AE7FC4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00D18 80AE7FC8 03E00008 */ jr $ra -/* 00D1C 80AE7FCC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Update.s deleted file mode 100644 index 0445f028a4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Update.s +++ /dev/null @@ -1,34 +0,0 @@ -.rdata -glabel D_80AE8240 - .asciz "\x1b[31mメインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n\x1b[m" - .balign 4 - -.text -glabel EnRl_Update -/* 00C5C 80AE7F0C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00C60 80AE7F10 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00C64 80AE7F14 8C820194 */ lw $v0, 0x0194($a0) ## 00000194 -/* 00C68 80AE7F18 04400008 */ bltz $v0, .L80AE7F3C -/* 00C6C 80AE7F1C 28410008 */ slti $at, $v0, 0x0008 -/* 00C70 80AE7F20 10200006 */ beq $at, $zero, .L80AE7F3C -/* 00C74 80AE7F24 00027080 */ sll $t6, $v0, 2 -/* 00C78 80AE7F28 3C0380AF */ lui $v1, %hi(D_80AE81B0) ## $v1 = 80AF0000 -/* 00C7C 80AE7F2C 006E1821 */ addu $v1, $v1, $t6 -/* 00C80 80AE7F30 8C6381B0 */ lw $v1, %lo(D_80AE81B0)($v1) -/* 00C84 80AE7F34 14600006 */ bne $v1, $zero, .L80AE7F50 -/* 00C88 80AE7F38 00000000 */ nop -.L80AE7F3C: -/* 00C8C 80AE7F3C 3C0480AF */ lui $a0, %hi(D_80AE8240) ## $a0 = 80AF0000 -/* 00C90 80AE7F40 0C00084C */ jal osSyncPrintf - -/* 00C94 80AE7F44 24848240 */ addiu $a0, $a0, %lo(D_80AE8240) ## $a0 = 80AE8240 -/* 00C98 80AE7F48 10000004 */ beq $zero, $zero, .L80AE7F5C -/* 00C9C 80AE7F4C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AE7F50: -/* 00CA0 80AE7F50 0060F809 */ jalr $ra, $v1 -/* 00CA4 80AE7F54 00000000 */ nop -/* 00CA8 80AE7F58 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AE7F5C: -/* 00CAC 80AE7F5C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00CB0 80AE7F60 03E00008 */ jr $ra -/* 00CB4 80AE7F64 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE72D0.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE72D0.s deleted file mode 100644 index af6ff27336..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE72D0.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_80AE72D0 -/* 00020 80AE72D0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00024 80AE72D4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00028 80AE72D8 848E0192 */ lh $t6, 0x0192($a0) ## 00000192 -/* 0002C 80AE72DC 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00030 80AE72E0 24C30192 */ addiu $v1, $a2, 0x0192 ## $v1 = 00000192 -/* 00034 80AE72E4 15C00003 */ bne $t6, $zero, .L80AE72F4 -/* 00038 80AE72E8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0003C 80AE72EC 10000005 */ beq $zero, $zero, .L80AE7304 -/* 00040 80AE72F0 24830192 */ addiu $v1, $a0, 0x0192 ## $v1 = 00000192 -.L80AE72F4: -/* 00044 80AE72F4 846F0000 */ lh $t7, 0x0000($v1) ## 00000192 -/* 00048 80AE72F8 25F8FFFF */ addiu $t8, $t7, 0xFFFF ## $t8 = FFFFFFFF -/* 0004C 80AE72FC A4780000 */ sh $t8, 0x0000($v1) ## 00000192 -/* 00050 80AE7300 84620000 */ lh $v0, 0x0000($v1) ## 00000192 -.L80AE7304: -/* 00054 80AE7304 14400008 */ bne $v0, $zero, .L80AE7328 -/* 00058 80AE7308 2404003C */ addiu $a0, $zero, 0x003C ## $a0 = 0000003C -/* 0005C 80AE730C 2405003C */ addiu $a1, $zero, 0x003C ## $a1 = 0000003C -/* 00060 80AE7310 AFA3001C */ sw $v1, 0x001C($sp) -/* 00064 80AE7314 0C01DF64 */ jal Math_Rand_S16Offset - -/* 00068 80AE7318 AFA60038 */ sw $a2, 0x0038($sp) -/* 0006C 80AE731C 8FA3001C */ lw $v1, 0x001C($sp) -/* 00070 80AE7320 8FA60038 */ lw $a2, 0x0038($sp) -/* 00074 80AE7324 A4620000 */ sh $v0, 0x0000($v1) ## 00000000 -.L80AE7328: -/* 00078 80AE7328 84790000 */ lh $t9, 0x0000($v1) ## 00000000 -/* 0007C 80AE732C 24C20190 */ addiu $v0, $a2, 0x0190 ## $v0 = 00000190 -/* 00080 80AE7330 A4590000 */ sh $t9, 0x0000($v0) ## 00000190 -/* 00084 80AE7334 84480000 */ lh $t0, 0x0000($v0) ## 00000190 -/* 00088 80AE7338 29010003 */ slti $at, $t0, 0x0003 -/* 0008C 80AE733C 54200003 */ bnel $at, $zero, .L80AE734C -/* 00090 80AE7340 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00094 80AE7344 A4400000 */ sh $zero, 0x0000($v0) ## 00000190 -/* 00098 80AE7348 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AE734C: -/* 0009C 80AE734C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 000A0 80AE7350 03E00008 */ jr $ra -/* 000A4 80AE7354 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7358.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7358.s deleted file mode 100644 index a2f2be4d99..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7358.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_80AE7358 -/* 000A8 80AE7358 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 000AC 80AE735C AFB00028 */ sw $s0, 0x0028($sp) -/* 000B0 80AE7360 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 000B4 80AE7364 AFBF002C */ sw $ra, 0x002C($sp) -/* 000B8 80AE7368 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 000BC 80AE736C 0C028800 */ jal SkelAnime_GetFrameCount - -/* 000C0 80AE7370 24840A3C */ addiu $a0, $a0, 0x0A3C ## $a0 = 06000A3C -/* 000C4 80AE7374 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 000C8 80AE7378 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 000CC 80AE737C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 000D0 80AE7380 468021A0 */ cvt.s.w $f6, $f4 -/* 000D4 80AE7384 44070000 */ mfc1 $a3, $f0 -/* 000D8 80AE7388 24A50A3C */ addiu $a1, $a1, 0x0A3C ## $a1 = 06000A3C -/* 000DC 80AE738C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 000E0 80AE7390 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 000E4 80AE7394 AFA00014 */ sw $zero, 0x0014($sp) -/* 000E8 80AE7398 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 000EC 80AE739C 0C029468 */ jal SkelAnime_ChangeAnim - -/* 000F0 80AE73A0 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 000F4 80AE73A4 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 000F8 80AE73A8 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 -/* 000FC 80AE73AC AE0E0194 */ sw $t6, 0x0194($s0) ## 00000194 -/* 00100 80AE73B0 AE000198 */ sw $zero, 0x0198($s0) ## 00000198 -/* 00104 80AE73B4 AE0001A0 */ sw $zero, 0x01A0($s0) ## 000001A0 -/* 00108 80AE73B8 AE0001A4 */ sw $zero, 0x01A4($s0) ## 000001A4 -/* 0010C 80AE73BC A20000C8 */ sb $zero, 0x00C8($s0) ## 000000C8 -/* 00110 80AE73C0 E608019C */ swc1 $f8, 0x019C($s0) ## 0000019C -/* 00114 80AE73C4 8FBF002C */ lw $ra, 0x002C($sp) -/* 00118 80AE73C8 8FB00028 */ lw $s0, 0x0028($sp) -/* 0011C 80AE73CC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00120 80AE73D0 03E00008 */ jr $ra -/* 00124 80AE73D4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE73D8.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE73D8.s deleted file mode 100644 index 6ae6cdcaf3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE73D8.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80AE73D8 -/* 00128 80AE73D8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0012C 80AE73DC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00130 80AE73E0 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 00134 80AE73E4 3C0F80AF */ lui $t7, %hi(D_80AE81AC) ## $t7 = 80AF0000 -/* 00138 80AE73E8 3C1980AF */ lui $t9, %hi(D_80AE81AC) ## $t9 = 80AF0000 -/* 0013C 80AE73EC 15C0000D */ bne $t6, $zero, .L80AE7424 -/* 00140 80AE73F0 00000000 */ nop -/* 00144 80AE73F4 8DEF81AC */ lw $t7, %lo(D_80AE81AC)($t7) -/* 00148 80AE73F8 51E00011 */ beql $t7, $zero, .L80AE7440 -/* 0014C 80AE73FC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00150 80AE7400 8498001C */ lh $t8, 0x001C($a0) ## 0000001C -/* 00154 80AE7404 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00158 80AE7408 17010003 */ bne $t8, $at, .L80AE7418 -/* 0015C 80AE740C 00000000 */ nop -/* 00160 80AE7410 0C2B9CD6 */ jal func_80AE7358 -/* 00164 80AE7414 00000000 */ nop -.L80AE7418: -/* 00168 80AE7418 3C0180AF */ lui $at, %hi(D_80AE81AC) ## $at = 80AF0000 -/* 0016C 80AE741C 10000007 */ beq $zero, $zero, .L80AE743C -/* 00170 80AE7420 AC2081AC */ sw $zero, %lo(D_80AE81AC)($at) -.L80AE7424: -/* 00174 80AE7424 8F3981AC */ lw $t9, %lo(D_80AE81AC)($t9) -/* 00178 80AE7428 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 0017C 80AE742C 3C0180AF */ lui $at, %hi(D_80AE81AC) ## $at = 80AF0000 -/* 00180 80AE7430 57200003 */ bnel $t9, $zero, .L80AE7440 -/* 00184 80AE7434 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00188 80AE7438 AC2881AC */ sw $t0, %lo(D_80AE81AC)($at) -.L80AE743C: -/* 0018C 80AE743C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AE7440: -/* 00190 80AE7440 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00194 80AE7444 03E00008 */ jr $ra -/* 00198 80AE7448 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE744C.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE744C.s deleted file mode 100644 index bcb392177a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE744C.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80AE744C -/* 0019C 80AE744C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 001A0 80AE7450 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 001A4 80AE7454 44810000 */ mtc1 $at, $f0 ## $f0 = 30.00 -/* 001A8 80AE7458 AFA50024 */ sw $a1, 0x0024($sp) -/* 001AC 80AE745C 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 001B0 80AE7460 AFBF001C */ sw $ra, 0x001C($sp) -/* 001B4 80AE7464 AFA40020 */ sw $a0, 0x0020($sp) -/* 001B8 80AE7468 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 001BC 80AE746C 44070000 */ mfc1 $a3, $f0 -/* 001C0 80AE7470 AFAE0014 */ sw $t6, 0x0014($sp) -/* 001C4 80AE7474 8FA40024 */ lw $a0, 0x0024($sp) -/* 001C8 80AE7478 3C064296 */ lui $a2, 0x4296 ## $a2 = 42960000 -/* 001CC 80AE747C 0C00B92D */ jal func_8002E4B4 -/* 001D0 80AE7480 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 001D4 80AE7484 8FBF001C */ lw $ra, 0x001C($sp) -/* 001D8 80AE7488 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 001DC 80AE748C 03E00008 */ jr $ra -/* 001E0 80AE7490 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7494.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7494.s deleted file mode 100644 index 7285a87aa7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7494.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80AE7494 -/* 001E4 80AE7494 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 001E8 80AE7498 AFBF0014 */ sw $ra, 0x0014($sp) -/* 001EC 80AE749C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 001F0 80AE74A0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 001F4 80AE74A4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 001F8 80AE74A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 001FC 80AE74AC 03E00008 */ jr $ra -/* 00200 80AE74B0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE74B4.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE74B4.s deleted file mode 100644 index 65d0148eca..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE74B4.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80AE74B4 -/* 00204 80AE74B4 AFA40000 */ sw $a0, 0x0000($sp) -/* 00208 80AE74B8 AFA60008 */ sw $a2, 0x0008($sp) -/* 0020C 80AE74BC 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 00210 80AE74C0 00077880 */ sll $t7, $a3, 2 -/* 00214 80AE74C4 30C6FFFF */ andi $a2, $a2, 0xFFFF ## $a2 = 00000000 -/* 00218 80AE74C8 11C00009 */ beq $t6, $zero, .L80AE74F0 -/* 0021C 80AE74CC 00AFC021 */ addu $t8, $a1, $t7 -/* 00220 80AE74D0 8F021D8C */ lw $v0, 0x1D8C($t8) ## 00001D8C -/* 00224 80AE74D4 50400007 */ beql $v0, $zero, .L80AE74F4 -/* 00228 80AE74D8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0022C 80AE74DC 94590000 */ lhu $t9, 0x0000($v0) ## 00000000 -/* 00230 80AE74E0 54D90004 */ bnel $a2, $t9, .L80AE74F4 -/* 00234 80AE74E4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00238 80AE74E8 03E00008 */ jr $ra -/* 0023C 80AE74EC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80AE74F0: -/* 00240 80AE74F0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80AE74F4: -/* 00244 80AE74F4 03E00008 */ jr $ra -/* 00248 80AE74F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE74FC.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE74FC.s deleted file mode 100644 index ade3595376..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE74FC.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80AE74FC -/* 0024C 80AE74FC AFA40000 */ sw $a0, 0x0000($sp) -/* 00250 80AE7500 AFA60008 */ sw $a2, 0x0008($sp) -/* 00254 80AE7504 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 00258 80AE7508 00077880 */ sll $t7, $a3, 2 -/* 0025C 80AE750C 30C6FFFF */ andi $a2, $a2, 0xFFFF ## $a2 = 00000000 -/* 00260 80AE7510 11C00009 */ beq $t6, $zero, .L80AE7538 -/* 00264 80AE7514 00AFC021 */ addu $t8, $a1, $t7 -/* 00268 80AE7518 8F021D8C */ lw $v0, 0x1D8C($t8) ## 00001D8C -/* 0026C 80AE751C 50400007 */ beql $v0, $zero, .L80AE753C -/* 00270 80AE7520 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00274 80AE7524 94590000 */ lhu $t9, 0x0000($v0) ## 00000000 -/* 00278 80AE7528 50D90004 */ beql $a2, $t9, .L80AE753C -/* 0027C 80AE752C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00280 80AE7530 03E00008 */ jr $ra -/* 00284 80AE7534 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80AE7538: -/* 00288 80AE7538 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80AE753C: -/* 0028C 80AE753C 03E00008 */ jr $ra -/* 00290 80AE7540 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7544.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7544.s deleted file mode 100644 index c16d0db17e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7544.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80AE7544 -/* 00294 80AE7544 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00298 80AE7548 AFA40028 */ sw $a0, 0x0028($sp) -/* 0029C 80AE754C AFA5002C */ sw $a1, 0x002C($sp) -/* 002A0 80AE7550 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 002A4 80AE7554 8FA50028 */ lw $a1, 0x0028($sp) -/* 002A8 80AE7558 AFBF0024 */ sw $ra, 0x0024($sp) -/* 002AC 80AE755C 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 002B0 80AE7560 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 002B4 80AE7564 24E70A3C */ addiu $a3, $a3, 0x0A3C ## $a3 = 06000A3C -/* 002B8 80AE7568 24C67B38 */ addiu $a2, $a2, 0x7B38 ## $a2 = 06007B38 -/* 002BC 80AE756C AFA00010 */ sw $zero, 0x0010($sp) -/* 002C0 80AE7570 AFA00014 */ sw $zero, 0x0014($sp) -/* 002C4 80AE7574 AFA00018 */ sw $zero, 0x0018($sp) -/* 002C8 80AE7578 0C0291BE */ jal SkelAnime_InitSV -/* 002CC 80AE757C 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 002D0 80AE7580 8FBF0024 */ lw $ra, 0x0024($sp) -/* 002D4 80AE7584 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 002D8 80AE7588 03E00008 */ jr $ra -/* 002DC 80AE758C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7590.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7590.s deleted file mode 100644 index 4d27b1b2ad..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7590.s +++ /dev/null @@ -1,58 +0,0 @@ -glabel func_80AE7590 -/* 002E0 80AE7590 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 002E4 80AE7594 3C0E8016 */ lui $t6, %hi(gSaveContext+0x1360) -/* 002E8 80AE7598 8DCEF9C0 */ lw $t6, %lo(gSaveContext+0x1360)($t6) -/* 002EC 80AE759C AFBF0034 */ sw $ra, 0x0034($sp) -/* 002F0 80AE75A0 AFB00030 */ sw $s0, 0x0030($sp) -/* 002F4 80AE75A4 AFA40038 */ sw $a0, 0x0038($sp) -/* 002F8 80AE75A8 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 002FC 80AE75AC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00300 80AE75B0 15C10028 */ bne $t6, $at, .L80AE7654 -/* 00304 80AE75B4 84A200A4 */ lh $v0, 0x00A4($a1) ## 000000A4 -/* 00308 80AE75B8 24010044 */ addiu $at, $zero, 0x0044 ## $at = 00000044 -/* 0030C 80AE75BC 54410026 */ bnel $v0, $at, .L80AE7658 -/* 00310 80AE75C0 8FBF0034 */ lw $ra, 0x0034($sp) -/* 00314 80AE75C4 90AF1D6C */ lbu $t7, 0x1D6C($a1) ## 00001D6C -/* 00318 80AE75C8 51E00023 */ beql $t7, $zero, .L80AE7658 -/* 0031C 80AE75CC 8FBF0034 */ lw $ra, 0x0034($sp) -/* 00320 80AE75D0 8CA21DA4 */ lw $v0, 0x1DA4($a1) ## 00001DA4 -/* 00324 80AE75D4 50400020 */ beql $v0, $zero, .L80AE7658 -/* 00328 80AE75D8 8FBF0034 */ lw $ra, 0x0034($sp) -/* 0032C 80AE75DC 94580000 */ lhu $t8, 0x0000($v0) ## 00000000 -/* 00330 80AE75E0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00334 80AE75E4 5701001C */ bnel $t8, $at, .L80AE7658 -/* 00338 80AE75E8 8FBF0034 */ lw $ra, 0x0034($sp) -/* 0033C 80AE75EC 8C8801A8 */ lw $t0, 0x01A8($a0) ## 000001A8 -/* 00340 80AE75F0 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 00344 80AE75F4 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 00001C24 -/* 00348 80AE75F8 15000016 */ bne $t0, $zero, .L80AE7654 -/* 0034C 80AE75FC 2406008B */ addiu $a2, $zero, 0x008B ## $a2 = 0000008B -/* 00350 80AE7600 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 00354 80AE7604 44813000 */ mtc1 $at, $f6 ## $f6 = 80.00 -/* 00358 80AE7608 2409000E */ addiu $t1, $zero, 0x000E ## $t1 = 0000000E -/* 0035C 80AE760C C4400024 */ lwc1 $f0, 0x0024($v0) ## 00000024 -/* 00360 80AE7610 C4440028 */ lwc1 $f4, 0x0028($v0) ## 00000028 -/* 00364 80AE7614 C44C002C */ lwc1 $f12, 0x002C($v0) ## 0000002C -/* 00368 80AE7618 44070000 */ mfc1 $a3, $f0 -/* 0036C 80AE761C 46062080 */ add.s $f2, $f4, $f6 -/* 00370 80AE7620 AFA90024 */ sw $t1, 0x0024($sp) -/* 00374 80AE7624 AFA00020 */ sw $zero, 0x0020($sp) -/* 00378 80AE7628 AFA0001C */ sw $zero, 0x001C($sp) -/* 0037C 80AE762C E7A20010 */ swc1 $f2, 0x0010($sp) -/* 00380 80AE7630 AFA00018 */ sw $zero, 0x0018($sp) -/* 00384 80AE7634 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 00388 80AE7638 E7AC0014 */ swc1 $f12, 0x0014($sp) -/* 0038C 80AE763C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00390 80AE7640 0C021344 */ jal Item_Give -/* 00394 80AE7644 2405006B */ addiu $a1, $zero, 0x006B ## $a1 = 0000006B -/* 00398 80AE7648 8FAB0038 */ lw $t3, 0x0038($sp) -/* 0039C 80AE764C 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 003A0 80AE7650 AD6A01A8 */ sw $t2, 0x01A8($t3) ## 000001A8 -.L80AE7654: -/* 003A4 80AE7654 8FBF0034 */ lw $ra, 0x0034($sp) -.L80AE7658: -/* 003A8 80AE7658 8FB00030 */ lw $s0, 0x0030($sp) -/* 003AC 80AE765C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 003B0 80AE7660 03E00008 */ jr $ra -/* 003B4 80AE7664 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7668.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7668.s deleted file mode 100644 index 01b96223c6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7668.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_80AE7668 -/* 003B8 80AE7668 84830032 */ lh $v1, 0x0032($a0) ## 00000032 -/* 003BC 80AE766C 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 003C0 80AE7670 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 003C4 80AE7674 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 003C8 80AE7678 00611821 */ addu $v1, $v1, $at -/* 003CC 80AE767C 00031C00 */ sll $v1, $v1, 16 -/* 003D0 80AE7680 AC860198 */ sw $a2, 0x0198($a0) ## 00000198 -/* 003D4 80AE7684 AC860194 */ sw $a2, 0x0194($a0) ## 00000194 -/* 003D8 80AE7688 00031C03 */ sra $v1, $v1, 16 -/* 003DC 80AE768C A44300B6 */ sh $v1, 0x00B6($v0) ## 000000B6 -/* 003E0 80AE7690 03E00008 */ jr $ra -/* 003E4 80AE7694 A4430032 */ sh $v1, 0x0032($v0) ## 00000032 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7698.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7698.s deleted file mode 100644 index 9c3604d99f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7698.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_80AE7698 -/* 003E8 80AE7698 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 003EC 80AE769C AFBF0024 */ sw $ra, 0x0024($sp) -/* 003F0 80AE76A0 AFA40028 */ sw $a0, 0x0028($sp) -/* 003F4 80AE76A4 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 003F8 80AE76A8 51C0001D */ beql $t6, $zero, .L80AE7720 -/* 003FC 80AE76AC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00400 80AE76B0 8CA21D8C */ lw $v0, 0x1D8C($a1) ## 00001D8C -/* 00404 80AE76B4 5040001A */ beql $v0, $zero, .L80AE7720 -/* 00408 80AE76B8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0040C 80AE76BC 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 00410 80AE76C0 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00414 80AE76C4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00418 80AE76C8 55E10015 */ bnel $t7, $at, .L80AE7720 -/* 0041C 80AE76CC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00420 80AE76D0 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00424 80AE76D4 2484040C */ addiu $a0, $a0, 0x040C ## $a0 = 0600040C -/* 00428 80AE76D8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 0042C 80AE76DC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00430 80AE76E0 8FA40028 */ lw $a0, 0x0028($sp) -/* 00434 80AE76E4 468021A0 */ cvt.s.w $f6, $f4 -/* 00438 80AE76E8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0043C 80AE76EC 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 00440 80AE76F0 44070000 */ mfc1 $a3, $f0 -/* 00444 80AE76F4 AFB80014 */ sw $t8, 0x0014($sp) -/* 00448 80AE76F8 24A5040C */ addiu $a1, $a1, 0x040C ## $a1 = 0600040C -/* 0044C 80AE76FC E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00450 80AE7700 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00454 80AE7704 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00458 80AE7708 0C029468 */ jal SkelAnime_ChangeAnim - -/* 0045C 80AE770C E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00460 80AE7710 8FA80028 */ lw $t0, 0x0028($sp) -/* 00464 80AE7714 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 00468 80AE7718 AD190194 */ sw $t9, 0x0194($t0) ## 00000194 -/* 0046C 80AE771C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AE7720: -/* 00470 80AE7720 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00474 80AE7724 03E00008 */ jr $ra -/* 00478 80AE7728 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE772C.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE772C.s deleted file mode 100644 index f24db61fe7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE772C.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_80AE772C -/* 0047C 80AE772C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00480 80AE7730 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00484 80AE7734 10A00014 */ beq $a1, $zero, .L80AE7788 -/* 00488 80AE7738 AFA40028 */ sw $a0, 0x0028($sp) -/* 0048C 80AE773C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00490 80AE7740 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00494 80AE7744 24840830 */ addiu $a0, $a0, 0x0830 ## $a0 = 06000830 -/* 00498 80AE7748 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 0049C 80AE774C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 004A0 80AE7750 8FA40028 */ lw $a0, 0x0028($sp) -/* 004A4 80AE7754 468021A0 */ cvt.s.w $f6, $f4 -/* 004A8 80AE7758 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 004AC 80AE775C 44070000 */ mfc1 $a3, $f0 -/* 004B0 80AE7760 24A50830 */ addiu $a1, $a1, 0x0830 ## $a1 = 06000830 -/* 004B4 80AE7764 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 004B8 80AE7768 AFA00014 */ sw $zero, 0x0014($sp) -/* 004BC 80AE776C E7A60010 */ swc1 $f6, 0x0010($sp) -/* 004C0 80AE7770 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 004C4 80AE7774 0C029468 */ jal SkelAnime_ChangeAnim - -/* 004C8 80AE7778 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 004CC 80AE777C 8FAF0028 */ lw $t7, 0x0028($sp) -/* 004D0 80AE7780 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 -/* 004D4 80AE7784 ADEE0194 */ sw $t6, 0x0194($t7) ## 00000194 -.L80AE7788: -/* 004D8 80AE7788 8FBF0024 */ lw $ra, 0x0024($sp) -/* 004DC 80AE778C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 004E0 80AE7790 03E00008 */ jr $ra -/* 004E4 80AE7794 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7798.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7798.s deleted file mode 100644 index 74186b01f0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7798.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80AE7798 -/* 004E8 80AE7798 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 004EC 80AE779C AFBF0014 */ sw $ra, 0x0014($sp) -/* 004F0 80AE77A0 0C2B9D9A */ jal func_80AE7668 -/* 004F4 80AE77A4 00000000 */ nop -/* 004F8 80AE77A8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 004FC 80AE77AC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00500 80AE77B0 03E00008 */ jr $ra -/* 00504 80AE77B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE77B8.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE77B8.s deleted file mode 100644 index 09025ebffd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE77B8.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80AE77B8 -/* 00508 80AE77B8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0050C 80AE77BC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00510 80AE77C0 AFA40018 */ sw $a0, 0x0018($sp) -/* 00514 80AE77C4 0C2B9D13 */ jal func_80AE744C -/* 00518 80AE77C8 AFA5001C */ sw $a1, 0x001C($sp) -/* 0051C 80AE77CC 0C2B9D25 */ jal func_80AE7494 -/* 00520 80AE77D0 8FA40018 */ lw $a0, 0x0018($sp) -/* 00524 80AE77D4 0C2B9CB4 */ jal func_80AE72D0 -/* 00528 80AE77D8 8FA40018 */ lw $a0, 0x0018($sp) -/* 0052C 80AE77DC 8FA40018 */ lw $a0, 0x0018($sp) -/* 00530 80AE77E0 0C2B9DA6 */ jal func_80AE7698 -/* 00534 80AE77E4 8FA5001C */ lw $a1, 0x001C($sp) -/* 00538 80AE77E8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0053C 80AE77EC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00540 80AE77F0 03E00008 */ jr $ra -/* 00544 80AE77F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE77F8.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE77F8.s deleted file mode 100644 index fac0e64dcd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE77F8.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80AE77F8 -/* 00548 80AE77F8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0054C 80AE77FC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00550 80AE7800 0C2B9D13 */ jal func_80AE744C -/* 00554 80AE7804 AFA40020 */ sw $a0, 0x0020($sp) -/* 00558 80AE7808 0C2B9D25 */ jal func_80AE7494 -/* 0055C 80AE780C 8FA40020 */ lw $a0, 0x0020($sp) -/* 00560 80AE7810 AFA2001C */ sw $v0, 0x001C($sp) -/* 00564 80AE7814 0C2B9CB4 */ jal func_80AE72D0 -/* 00568 80AE7818 8FA40020 */ lw $a0, 0x0020($sp) -/* 0056C 80AE781C 8FA40020 */ lw $a0, 0x0020($sp) -/* 00570 80AE7820 0C2B9DCB */ jal func_80AE772C -/* 00574 80AE7824 8FA5001C */ lw $a1, 0x001C($sp) -/* 00578 80AE7828 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0057C 80AE782C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00580 80AE7830 03E00008 */ jr $ra -/* 00584 80AE7834 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7838.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7838.s deleted file mode 100644 index 1df3ae08ad..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7838.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80AE7838 -/* 00588 80AE7838 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0058C 80AE783C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00590 80AE7840 AFA40018 */ sw $a0, 0x0018($sp) -/* 00594 80AE7844 0C2B9D13 */ jal func_80AE744C -/* 00598 80AE7848 AFA5001C */ sw $a1, 0x001C($sp) -/* 0059C 80AE784C 0C2B9D25 */ jal func_80AE7494 -/* 005A0 80AE7850 8FA40018 */ lw $a0, 0x0018($sp) -/* 005A4 80AE7854 0C2B9CB4 */ jal func_80AE72D0 -/* 005A8 80AE7858 8FA40018 */ lw $a0, 0x0018($sp) -/* 005AC 80AE785C 8FA40018 */ lw $a0, 0x0018($sp) -/* 005B0 80AE7860 0C2B9D64 */ jal func_80AE7590 -/* 005B4 80AE7864 8FA5001C */ lw $a1, 0x001C($sp) -/* 005B8 80AE7868 8FBF0014 */ lw $ra, 0x0014($sp) -/* 005BC 80AE786C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 005C0 80AE7870 03E00008 */ jr $ra -/* 005C4 80AE7874 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7878.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7878.s deleted file mode 100644 index 3eee0803f0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7878.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80AE7878 -/* 005C8 80AE7878 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 005CC 80AE787C AFA40028 */ sw $a0, 0x0028($sp) -/* 005D0 80AE7880 AFA5002C */ sw $a1, 0x002C($sp) -/* 005D4 80AE7884 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 005D8 80AE7888 8FA50028 */ lw $a1, 0x0028($sp) -/* 005DC 80AE788C AFBF0024 */ sw $ra, 0x0024($sp) -/* 005E0 80AE7890 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 005E4 80AE7894 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 005E8 80AE7898 24E70A3C */ addiu $a3, $a3, 0x0A3C ## $a3 = 06000A3C -/* 005EC 80AE789C 24C67B38 */ addiu $a2, $a2, 0x7B38 ## $a2 = 06007B38 -/* 005F0 80AE78A0 AFA00010 */ sw $zero, 0x0010($sp) -/* 005F4 80AE78A4 AFA00014 */ sw $zero, 0x0014($sp) -/* 005F8 80AE78A8 AFA00018 */ sw $zero, 0x0018($sp) -/* 005FC 80AE78AC 0C0291BE */ jal SkelAnime_InitSV -/* 00600 80AE78B0 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 00604 80AE78B4 8FA20028 */ lw $v0, 0x0028($sp) -/* 00608 80AE78B8 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 -/* 0060C 80AE78BC AC4E0194 */ sw $t6, 0x0194($v0) ## 00000194 -/* 00610 80AE78C0 A04000C8 */ sb $zero, 0x00C8($v0) ## 000000C8 -/* 00614 80AE78C4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00618 80AE78C8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0061C 80AE78CC 03E00008 */ jr $ra -/* 00620 80AE78D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE78D4.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE78D4.s deleted file mode 100644 index bc9f97766e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE78D4.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80AE78D4 -/* 00624 80AE78D4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00628 80AE78D8 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 0062C 80AE78DC 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 00630 80AE78E0 AFBF0034 */ sw $ra, 0x0034($sp) -/* 00634 80AE78E4 AFA40038 */ sw $a0, 0x0038($sp) -/* 00638 80AE78E8 C4A40024 */ lwc1 $f4, 0x0024($a1) ## 00000024 -/* 0063C 80AE78EC 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* 00640 80AE78F0 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* 00644 80AE78F4 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00648 80AE78F8 3C0141B0 */ lui $at, 0x41B0 ## $at = 41B00000 -/* 0064C 80AE78FC 85CF1478 */ lh $t7, 0x1478($t6) ## 80161478 -/* 00650 80AE7900 44815000 */ mtc1 $at, $f10 ## $f10 = 22.00 -/* 00654 80AE7904 C4B20028 */ lwc1 $f18, 0x0028($a1) ## 00000028 -/* 00658 80AE7908 448F3000 */ mtc1 $t7, $f6 ## $f6 = 0.00 -/* 0065C 80AE790C 24180005 */ addiu $t8, $zero, 0x0005 ## $t8 = 00000005 -/* 00660 80AE7910 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 00664 80AE7914 46803220 */ cvt.s.w $f8, $f6 -/* 00668 80AE7918 240700F5 */ addiu $a3, $zero, 0x00F5 ## $a3 = 000000F5 -/* 0066C 80AE791C 460A4400 */ add.s $f16, $f8, $f10 -/* 00670 80AE7920 46128100 */ add.s $f4, $f16, $f18 -/* 00674 80AE7924 E7A40014 */ swc1 $f4, 0x0014($sp) -/* 00678 80AE7928 C4A6002C */ lwc1 $f6, 0x002C($a1) ## 0000002C -/* 0067C 80AE792C AFB80028 */ sw $t8, 0x0028($sp) -/* 00680 80AE7930 AFA00024 */ sw $zero, 0x0024($sp) -/* 00684 80AE7934 AFA00020 */ sw $zero, 0x0020($sp) -/* 00688 80AE7938 AFA0001C */ sw $zero, 0x001C($sp) -/* 0068C 80AE793C 0C00C916 */ jal Actor_SpawnAsChild - -/* 00690 80AE7940 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 00694 80AE7944 8FBF0034 */ lw $ra, 0x0034($sp) -/* 00698 80AE7948 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 0069C 80AE794C 03E00008 */ jr $ra -/* 006A0 80AE7950 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7954.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7954.s deleted file mode 100644 index c944ca8380..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7954.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80AE7954 -/* 006A4 80AE7954 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 006A8 80AE7958 AFBF0014 */ sw $ra, 0x0014($sp) -/* 006AC 80AE795C AFA40018 */ sw $a0, 0x0018($sp) -/* 006B0 80AE7960 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 006B4 80AE7964 0C2B9D2D */ jal func_80AE74B4 -/* 006B8 80AE7968 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 006BC 80AE796C 10400009 */ beq $v0, $zero, .L80AE7994 -/* 006C0 80AE7970 8FA40018 */ lw $a0, 0x0018($sp) -/* 006C4 80AE7974 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 006C8 80AE7978 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 006CC 80AE797C 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 006D0 80AE7980 AC8E0194 */ sw $t6, 0x0194($a0) ## 00000194 -/* 006D4 80AE7984 AC8F0198 */ sw $t7, 0x0198($a0) ## 00000198 -/* 006D8 80AE7988 AC8001A0 */ sw $zero, 0x01A0($a0) ## 000001A0 -/* 006DC 80AE798C A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 -/* 006E0 80AE7990 E484019C */ swc1 $f4, 0x019C($a0) ## 0000019C -.L80AE7994: -/* 006E4 80AE7994 8FBF0014 */ lw $ra, 0x0014($sp) -/* 006E8 80AE7998 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 006EC 80AE799C 03E00008 */ jr $ra -/* 006F0 80AE79A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE79A4.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE79A4.s deleted file mode 100644 index 6868f893c3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE79A4.s +++ /dev/null @@ -1,89 +0,0 @@ -glabel func_80AE79A4 -/* 006F4 80AE79A4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 006F8 80AE79A8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 006FC 80AE79AC AFA40018 */ sw $a0, 0x0018($sp) -/* 00700 80AE79B0 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 00704 80AE79B4 0C2B9D2D */ jal func_80AE74B4 -/* 00708 80AE79B8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0070C 80AE79BC 10400025 */ beq $v0, $zero, .L80AE7A54 -/* 00710 80AE79C0 8FA40018 */ lw $a0, 0x0018($sp) -/* 00714 80AE79C4 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00718 80AE79C8 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 -/* 0071C 80AE79CC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00720 80AE79D0 2482019C */ addiu $v0, $a0, 0x019C ## $v0 = 0000019C -/* 00724 80AE79D4 C4440000 */ lwc1 $f4, 0x0000($v0) ## 0000019C -/* 00728 80AE79D8 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 0072C 80AE79DC 3C058016 */ lui $a1, %hi(gGameInfo) -/* 00730 80AE79E0 24A5FA90 */ addiu $a1, %lo(gGameInfo) -/* 00734 80AE79E4 46062200 */ add.s $f8, $f4, $f6 -/* 00738 80AE79E8 24180007 */ addiu $t8, $zero, 0x0007 ## $t8 = 00000007 -/* 0073C 80AE79EC 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 00740 80AE79F0 E4480000 */ swc1 $f8, 0x0000($v0) ## 0000019C -/* 00744 80AE79F4 8CAE0000 */ lw $t6, 0x0000($a1) ## 8015FA90 -/* 00748 80AE79F8 C4400000 */ lwc1 $f0, 0x0000($v0) ## 0000019C -/* 0074C 80AE79FC 85CF145E */ lh $t7, 0x145E($t6) ## 0000145E -/* 00750 80AE7A00 448F5000 */ mtc1 $t7, $f10 ## $f10 = 0.00 -/* 00754 80AE7A04 00000000 */ nop -/* 00758 80AE7A08 46805420 */ cvt.s.w $f16, $f10 -/* 0075C 80AE7A0C 46028480 */ add.s $f18, $f16, $f2 -/* 00760 80AE7A10 4600903E */ c.le.s $f18, $f0 -/* 00764 80AE7A14 00000000 */ nop -/* 00768 80AE7A18 45000020 */ bc1f .L80AE7A9C -/* 0076C 80AE7A1C 00000000 */ nop -/* 00770 80AE7A20 AC980194 */ sw $t8, 0x0194($a0) ## 00000194 -/* 00774 80AE7A24 AC990198 */ sw $t9, 0x0198($a0) ## 00000198 -/* 00778 80AE7A28 8CA80000 */ lw $t0, 0x0000($a1) ## 8015FA90 -/* 0077C 80AE7A2C 240300FF */ addiu $v1, $zero, 0x00FF ## $v1 = 000000FF -/* 00780 80AE7A30 8509145E */ lh $t1, 0x145E($t0) ## 0000145E -/* 00784 80AE7A34 44892000 */ mtc1 $t1, $f4 ## $f4 = 0.00 -/* 00788 80AE7A38 00000000 */ nop -/* 0078C 80AE7A3C 468021A0 */ cvt.s.w $f6, $f4 -/* 00790 80AE7A40 46023200 */ add.s $f8, $f6, $f2 -/* 00794 80AE7A44 E4480000 */ swc1 $f8, 0x0000($v0) ## 0000019C -/* 00798 80AE7A48 AC8301A0 */ sw $v1, 0x01A0($a0) ## 000001A0 -/* 0079C 80AE7A4C 10000026 */ beq $zero, $zero, .L80AE7AE8 -/* 007A0 80AE7A50 A08300C8 */ sb $v1, 0x00C8($a0) ## 000000C8 -.L80AE7A54: -/* 007A4 80AE7A54 2482019C */ addiu $v0, $a0, 0x019C ## $v0 = 0000019C -/* 007A8 80AE7A58 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 007AC 80AE7A5C 44818000 */ mtc1 $at, $f16 ## $f16 = 1.00 -/* 007B0 80AE7A60 C44A0000 */ lwc1 $f10, 0x0000($v0) ## 0000019C -/* 007B4 80AE7A64 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 007B8 80AE7A68 46105481 */ sub.s $f18, $f10, $f16 -/* 007BC 80AE7A6C E4520000 */ swc1 $f18, 0x0000($v0) ## 0000019C -/* 007C0 80AE7A70 C4400000 */ lwc1 $f0, 0x0000($v0) ## 0000019C -/* 007C4 80AE7A74 4602003E */ c.le.s $f0, $f2 -/* 007C8 80AE7A78 00000000 */ nop -/* 007CC 80AE7A7C 45000007 */ bc1f .L80AE7A9C -/* 007D0 80AE7A80 240A0004 */ addiu $t2, $zero, 0x0004 ## $t2 = 00000004 -/* 007D4 80AE7A84 AC8A0194 */ sw $t2, 0x0194($a0) ## 00000194 -/* 007D8 80AE7A88 AC800198 */ sw $zero, 0x0198($a0) ## 00000198 -/* 007DC 80AE7A8C E4420000 */ swc1 $f2, 0x0000($v0) ## 0000019C -/* 007E0 80AE7A90 AC8001A0 */ sw $zero, 0x01A0($a0) ## 000001A0 -/* 007E4 80AE7A94 10000014 */ beq $zero, $zero, .L80AE7AE8 -/* 007E8 80AE7A98 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 -.L80AE7A9C: -/* 007EC 80AE7A9C 3C058016 */ lui $a1, %hi(gGameInfo) -/* 007F0 80AE7AA0 24A5FA90 */ addiu $a1, %lo(gGameInfo) -/* 007F4 80AE7AA4 8CAB0000 */ lw $t3, 0x0000($a1) ## 8015FA90 -/* 007F8 80AE7AA8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 007FC 80AE7AAC 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 -/* 00800 80AE7AB0 856C145E */ lh $t4, 0x145E($t3) ## 0000145E -/* 00804 80AE7AB4 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 00808 80AE7AB8 44818000 */ mtc1 $at, $f16 ## $f16 = 255.00 -/* 0080C 80AE7ABC 448C2000 */ mtc1 $t4, $f4 ## $f4 = 0.00 -/* 00810 80AE7AC0 00000000 */ nop -/* 00814 80AE7AC4 468021A0 */ cvt.s.w $f6, $f4 -/* 00818 80AE7AC8 46023200 */ add.s $f8, $f6, $f2 -/* 0081C 80AE7ACC 46080283 */ div.s $f10, $f0, $f8 -/* 00820 80AE7AD0 46105482 */ mul.s $f18, $f10, $f16 -/* 00824 80AE7AD4 4600910D */ trunc.w.s $f4, $f18 -/* 00828 80AE7AD8 44022000 */ mfc1 $v0, $f4 -/* 0082C 80AE7ADC 00000000 */ nop -/* 00830 80AE7AE0 AC8201A0 */ sw $v0, 0x01A0($a0) ## 000001A0 -/* 00834 80AE7AE4 A08200C8 */ sb $v0, 0x00C8($a0) ## 000000C8 -.L80AE7AE8: -/* 00838 80AE7AE8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0083C 80AE7AEC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00840 80AE7AF0 03E00008 */ jr $ra -/* 00844 80AE7AF4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7AF8.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7AF8.s deleted file mode 100644 index 1ed83f7729..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7AF8.s +++ /dev/null @@ -1,70 +0,0 @@ -glabel func_80AE7AF8 -/* 00848 80AE7AF8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0084C 80AE7AFC AFBF002C */ sw $ra, 0x002C($sp) -/* 00850 80AE7B00 AFB00028 */ sw $s0, 0x0028($sp) -/* 00854 80AE7B04 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00858 80AE7B08 AFA50034 */ sw $a1, 0x0034($sp) -/* 0085C 80AE7B0C 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 00860 80AE7B10 0C2B9D2D */ jal func_80AE74B4 -/* 00864 80AE7B14 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00868 80AE7B18 10400015 */ beq $v0, $zero, .L80AE7B70 -/* 0086C 80AE7B1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00870 80AE7B20 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00874 80AE7B24 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00878 80AE7B28 2484040C */ addiu $a0, $a0, 0x040C ## $a0 = 0600040C -/* 0087C 80AE7B2C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00880 80AE7B30 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 -/* 00884 80AE7B34 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 00888 80AE7B38 468021A0 */ cvt.s.w $f6, $f4 -/* 0088C 80AE7B3C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00890 80AE7B40 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00894 80AE7B44 AFAE0014 */ sw $t6, 0x0014($sp) -/* 00898 80AE7B48 24A5040C */ addiu $a1, $a1, 0x040C ## $a1 = 0600040C -/* 0089C 80AE7B4C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 008A0 80AE7B50 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 008A4 80AE7B54 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 008A8 80AE7B58 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 008AC 80AE7B5C 0C029468 */ jal SkelAnime_ChangeAnim - -/* 008B0 80AE7B60 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 008B4 80AE7B64 240F0006 */ addiu $t7, $zero, 0x0006 ## $t7 = 00000006 -/* 008B8 80AE7B68 1000001E */ beq $zero, $zero, .L80AE7BE4 -/* 008BC 80AE7B6C AE0F0194 */ sw $t7, 0x0194($s0) ## 00000194 -.L80AE7B70: -/* 008C0 80AE7B70 8FA50034 */ lw $a1, 0x0034($sp) -/* 008C4 80AE7B74 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 008C8 80AE7B78 0C2B9D3F */ jal func_80AE74FC -/* 008CC 80AE7B7C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 008D0 80AE7B80 10400018 */ beq $v0, $zero, .L80AE7BE4 -/* 008D4 80AE7B84 24180005 */ addiu $t8, $zero, 0x0005 ## $t8 = 00000005 -/* 008D8 80AE7B88 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 008DC 80AE7B8C AE180194 */ sw $t8, 0x0194($s0) ## 00000194 -/* 008E0 80AE7B90 AE190198 */ sw $t9, 0x0198($s0) ## 00000198 -/* 008E4 80AE7B94 3C088016 */ lui $t0, %hi(gGameInfo) -/* 008E8 80AE7B98 8D08FA90 */ lw $t0, %lo(gGameInfo)($t0) -/* 008EC 80AE7B9C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 008F0 80AE7BA0 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 -/* 008F4 80AE7BA4 8509145E */ lh $t1, 0x145E($t0) ## 8016145E -/* 008F8 80AE7BA8 8E0B01A4 */ lw $t3, 0x01A4($s0) ## 000001A4 -/* 008FC 80AE7BAC 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF -/* 00900 80AE7BB0 44895000 */ mtc1 $t1, $f10 ## $f10 = 0.00 -/* 00904 80AE7BB4 AE0A01A0 */ sw $t2, 0x01A0($s0) ## 000001A0 -/* 00908 80AE7BB8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0090C 80AE7BBC 46805420 */ cvt.s.w $f16, $f10 -/* 00910 80AE7BC0 46128100 */ add.s $f4, $f16, $f18 -/* 00914 80AE7BC4 15600005 */ bne $t3, $zero, .L80AE7BDC -/* 00918 80AE7BC8 E604019C */ swc1 $f4, 0x019C($s0) ## 0000019C -/* 0091C 80AE7BCC 0C2B9E35 */ jal func_80AE78D4 -/* 00920 80AE7BD0 8FA50034 */ lw $a1, 0x0034($sp) -/* 00924 80AE7BD4 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 00928 80AE7BD8 AE0C01A4 */ sw $t4, 0x01A4($s0) ## 000001A4 -.L80AE7BDC: -/* 0092C 80AE7BDC 240D00FF */ addiu $t5, $zero, 0x00FF ## $t5 = 000000FF -/* 00930 80AE7BE0 A20D00C8 */ sb $t5, 0x00C8($s0) ## 000000C8 -.L80AE7BE4: -/* 00934 80AE7BE4 8FBF002C */ lw $ra, 0x002C($sp) -/* 00938 80AE7BE8 8FB00028 */ lw $s0, 0x0028($sp) -/* 0093C 80AE7BEC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00940 80AE7BF0 03E00008 */ jr $ra -/* 00944 80AE7BF4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7BF8.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7BF8.s deleted file mode 100644 index c6123a3da2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7BF8.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_80AE7BF8 -/* 00948 80AE7BF8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0094C 80AE7BFC AFBF0024 */ sw $ra, 0x0024($sp) -/* 00950 80AE7C00 10A00014 */ beq $a1, $zero, .L80AE7C54 -/* 00954 80AE7C04 AFA40028 */ sw $a0, 0x0028($sp) -/* 00958 80AE7C08 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 0095C 80AE7C0C 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00960 80AE7C10 24840830 */ addiu $a0, $a0, 0x0830 ## $a0 = 06000830 -/* 00964 80AE7C14 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00968 80AE7C18 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 0096C 80AE7C1C 8FA40028 */ lw $a0, 0x0028($sp) -/* 00970 80AE7C20 468021A0 */ cvt.s.w $f6, $f4 -/* 00974 80AE7C24 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00978 80AE7C28 44070000 */ mfc1 $a3, $f0 -/* 0097C 80AE7C2C 24A50830 */ addiu $a1, $a1, 0x0830 ## $a1 = 06000830 -/* 00980 80AE7C30 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00984 80AE7C34 AFA00014 */ sw $zero, 0x0014($sp) -/* 00988 80AE7C38 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 0098C 80AE7C3C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00990 80AE7C40 0C029468 */ jal SkelAnime_ChangeAnim - -/* 00994 80AE7C44 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00998 80AE7C48 8FAF0028 */ lw $t7, 0x0028($sp) -/* 0099C 80AE7C4C 240E0007 */ addiu $t6, $zero, 0x0007 ## $t6 = 00000007 -/* 009A0 80AE7C50 ADEE0194 */ sw $t6, 0x0194($t7) ## 00000194 -.L80AE7C54: -/* 009A4 80AE7C54 8FBF0024 */ lw $ra, 0x0024($sp) -/* 009A8 80AE7C58 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 009AC 80AE7C5C 03E00008 */ jr $ra -/* 009B0 80AE7C60 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7C64.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7C64.s deleted file mode 100644 index 550b67a062..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7C64.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_80AE7C64 -/* 009B4 80AE7C64 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 009B8 80AE7C68 AFBF0014 */ sw $ra, 0x0014($sp) -/* 009BC 80AE7C6C AFA40018 */ sw $a0, 0x0018($sp) -/* 009C0 80AE7C70 0C2B9E55 */ jal func_80AE7954 -/* 009C4 80AE7C74 AFA5001C */ sw $a1, 0x001C($sp) -/* 009C8 80AE7C78 8FA40018 */ lw $a0, 0x0018($sp) -/* 009CC 80AE7C7C 0C2B9CF6 */ jal func_80AE73D8 -/* 009D0 80AE7C80 8FA5001C */ lw $a1, 0x001C($sp) -/* 009D4 80AE7C84 8FBF0014 */ lw $ra, 0x0014($sp) -/* 009D8 80AE7C88 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 009DC 80AE7C8C 03E00008 */ jr $ra -/* 009E0 80AE7C90 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7C94.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7C94.s deleted file mode 100644 index 68005f9f82..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7C94.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80AE7C94 -/* 009E4 80AE7C94 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 009E8 80AE7C98 AFBF001C */ sw $ra, 0x001C($sp) -/* 009EC 80AE7C9C AFB00018 */ sw $s0, 0x0018($sp) -/* 009F0 80AE7CA0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 009F4 80AE7CA4 0C2B9D13 */ jal func_80AE744C -/* 009F8 80AE7CA8 AFA50024 */ sw $a1, 0x0024($sp) -/* 009FC 80AE7CAC 0C2B9D25 */ jal func_80AE7494 -/* 00A00 80AE7CB0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A04 80AE7CB4 0C2B9CB4 */ jal func_80AE72D0 -/* 00A08 80AE7CB8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A0C 80AE7CBC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A10 80AE7CC0 0C2B9E69 */ jal func_80AE79A4 -/* 00A14 80AE7CC4 8FA50024 */ lw $a1, 0x0024($sp) -/* 00A18 80AE7CC8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A1C 80AE7CCC 0C2B9CF6 */ jal func_80AE73D8 -/* 00A20 80AE7CD0 8FA50024 */ lw $a1, 0x0024($sp) -/* 00A24 80AE7CD4 8FBF001C */ lw $ra, 0x001C($sp) -/* 00A28 80AE7CD8 8FB00018 */ lw $s0, 0x0018($sp) -/* 00A2C 80AE7CDC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00A30 80AE7CE0 03E00008 */ jr $ra -/* 00A34 80AE7CE4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7CE8.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7CE8.s deleted file mode 100644 index b88353f560..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7CE8.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80AE7CE8 -/* 00A38 80AE7CE8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00A3C 80AE7CEC AFBF001C */ sw $ra, 0x001C($sp) -/* 00A40 80AE7CF0 AFB00018 */ sw $s0, 0x0018($sp) -/* 00A44 80AE7CF4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00A48 80AE7CF8 0C2B9D13 */ jal func_80AE744C -/* 00A4C 80AE7CFC AFA5002C */ sw $a1, 0x002C($sp) -/* 00A50 80AE7D00 0C2B9D25 */ jal func_80AE7494 -/* 00A54 80AE7D04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A58 80AE7D08 AFA20024 */ sw $v0, 0x0024($sp) -/* 00A5C 80AE7D0C 0C2B9CB4 */ jal func_80AE72D0 -/* 00A60 80AE7D10 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A64 80AE7D14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A68 80AE7D18 0C2B9EFE */ jal func_80AE7BF8 -/* 00A6C 80AE7D1C 8FA50024 */ lw $a1, 0x0024($sp) -/* 00A70 80AE7D20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A74 80AE7D24 0C2B9CF6 */ jal func_80AE73D8 -/* 00A78 80AE7D28 8FA5002C */ lw $a1, 0x002C($sp) -/* 00A7C 80AE7D2C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00A80 80AE7D30 8FB00018 */ lw $s0, 0x0018($sp) -/* 00A84 80AE7D34 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00A88 80AE7D38 03E00008 */ jr $ra -/* 00A8C 80AE7D3C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7D40.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7D40.s deleted file mode 100644 index 21c22401ed..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7D40.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80AE7D40 -/* 00A90 80AE7D40 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00A94 80AE7D44 AFBF001C */ sw $ra, 0x001C($sp) -/* 00A98 80AE7D48 AFB00018 */ sw $s0, 0x0018($sp) -/* 00A9C 80AE7D4C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00AA0 80AE7D50 0C2B9D13 */ jal func_80AE744C -/* 00AA4 80AE7D54 AFA50024 */ sw $a1, 0x0024($sp) -/* 00AA8 80AE7D58 0C2B9D25 */ jal func_80AE7494 -/* 00AAC 80AE7D5C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00AB0 80AE7D60 0C2B9CB4 */ jal func_80AE72D0 -/* 00AB4 80AE7D64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00AB8 80AE7D68 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00ABC 80AE7D6C 0C2B9EBE */ jal func_80AE7AF8 -/* 00AC0 80AE7D70 8FA50024 */ lw $a1, 0x0024($sp) -/* 00AC4 80AE7D74 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00AC8 80AE7D78 0C2B9CF6 */ jal func_80AE73D8 -/* 00ACC 80AE7D7C 8FA50024 */ lw $a1, 0x0024($sp) -/* 00AD0 80AE7D80 8FBF001C */ lw $ra, 0x001C($sp) -/* 00AD4 80AE7D84 8FB00018 */ lw $s0, 0x0018($sp) -/* 00AD8 80AE7D88 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00ADC 80AE7D8C 03E00008 */ jr $ra -/* 00AE0 80AE7D90 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7D94.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7D94.s deleted file mode 100644 index be9012ef01..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7D94.s +++ /dev/null @@ -1,105 +0,0 @@ -.rdata -glabel D_80AE8200 - .asciz "../z_en_rl_inKenjyanomaDemo02.c" - .balign 4 - -glabel D_80AE8220 - .asciz "../z_en_rl_inKenjyanomaDemo02.c" - .balign 4 - -.text -glabel func_80AE7D94 -/* 00AE4 80AE7D94 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 00AE8 80AE7D98 AFBF002C */ sw $ra, 0x002C($sp) -/* 00AEC 80AE7D9C AFB00028 */ sw $s0, 0x0028($sp) -/* 00AF0 80AE7DA0 AFA40078 */ sw $a0, 0x0078($sp) -/* 00AF4 80AE7DA4 AFA5007C */ sw $a1, 0x007C($sp) -/* 00AF8 80AE7DA8 84820190 */ lh $v0, 0x0190($a0) ## 00000190 -/* 00AFC 80AE7DAC 3C1880AF */ lui $t8, %hi(D_80AE81A0) ## $t8 = 80AF0000 -/* 00B00 80AE7DB0 3C0680AF */ lui $a2, %hi(D_80AE8200) ## $a2 = 80AF0000 -/* 00B04 80AE7DB4 00027880 */ sll $t7, $v0, 2 -/* 00B08 80AE7DB8 030FC021 */ addu $t8, $t8, $t7 -/* 00B0C 80AE7DBC 8F1881A0 */ lw $t8, %lo(D_80AE81A0)($t8) -/* 00B10 80AE7DC0 24C68200 */ addiu $a2, $a2, %lo(D_80AE8200) ## $a2 = 80AE8200 -/* 00B14 80AE7DC4 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD8 -/* 00B18 80AE7DC8 AFB80068 */ sw $t8, 0x0068($sp) -/* 00B1C 80AE7DCC 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 00B20 80AE7DD0 24070130 */ addiu $a3, $zero, 0x0130 ## $a3 = 00000130 -/* 00B24 80AE7DD4 0C031AB1 */ jal Graph_OpenDisps -/* 00B28 80AE7DD8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00B2C 80AE7DDC 8FA9007C */ lw $t1, 0x007C($sp) -/* 00B30 80AE7DE0 0C024F61 */ jal func_80093D84 -/* 00B34 80AE7DE4 8D240000 */ lw $a0, 0x0000($t1) ## 00000000 -/* 00B38 80AE7DE8 8FA70068 */ lw $a3, 0x0068($sp) -/* 00B3C 80AE7DEC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00B40 80AE7DF0 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 00B44 80AE7DF4 00076100 */ sll $t4, $a3, 4 -/* 00B48 80AE7DF8 000C6F02 */ srl $t5, $t4, 28 -/* 00B4C 80AE7DFC 3C0F8016 */ lui $t7, %hi(gSegments) -/* 00B50 80AE7E00 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 00B54 80AE7E04 AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 -/* 00B58 80AE7E08 25EF6FA8 */ addiu $t7, %lo(gSegments) -/* 00B5C 80AE7E0C 000D7080 */ sll $t6, $t5, 2 -/* 00B60 80AE7E10 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020 -/* 00B64 80AE7E14 01CF2021 */ addu $a0, $t6, $t7 -/* 00B68 80AE7E18 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 00B6C 80AE7E1C 8C980000 */ lw $t8, 0x0000($a0) ## 00000000 -/* 00B70 80AE7E20 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00B74 80AE7E24 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00B78 80AE7E28 00E12824 */ and $a1, $a3, $at -/* 00B7C 80AE7E2C 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 00B80 80AE7E30 0305C821 */ addu $t9, $t8, $a1 -/* 00B84 80AE7E34 03264821 */ addu $t1, $t9, $a2 -/* 00B88 80AE7E38 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 00B8C 80AE7E3C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00B90 80AE7E40 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 00B94 80AE7E44 356B0024 */ ori $t3, $t3, 0x0024 ## $t3 = DB060024 -/* 00B98 80AE7E48 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 00B9C 80AE7E4C AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 -/* 00BA0 80AE7E50 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 00BA4 80AE7E54 8C8C0000 */ lw $t4, 0x0000($a0) ## 00000000 -/* 00BA8 80AE7E58 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 -/* 00BAC 80AE7E5C 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 00BB0 80AE7E60 01856821 */ addu $t5, $t4, $a1 -/* 00BB4 80AE7E64 01A67021 */ addu $t6, $t5, $a2 -/* 00BB8 80AE7E68 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 00BBC 80AE7E6C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00BC0 80AE7E70 8FA80078 */ lw $t0, 0x0078($sp) -/* 00BC4 80AE7E74 3C0C8011 */ lui $t4, %hi(D_80116280) -/* 00BC8 80AE7E78 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 00BCC 80AE7E7C AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 -/* 00BD0 80AE7E80 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 00BD4 80AE7E84 8D1901A0 */ lw $t9, 0x01A0($t0) ## 000001A0 -/* 00BD8 80AE7E88 258C6280 */ addiu $t4, %lo(D_80116280) -/* 00BDC 80AE7E8C 356B0030 */ ori $t3, $t3, 0x0030 ## $t3 = DB060030 -/* 00BE0 80AE7E90 332900FF */ andi $t1, $t9, 0x00FF ## $t1 = 00000000 -/* 00BE4 80AE7E94 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 00BE8 80AE7E98 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00BEC 80AE7E9C 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 00BF0 80AE7EA0 AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 -/* 00BF4 80AE7EA4 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 00BF8 80AE7EA8 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 00BFC 80AE7EAC 2502014C */ addiu $v0, $t0, 0x014C ## $v0 = 0000014C -/* 00C00 80AE7EB0 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 -/* 00C04 80AE7EB4 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C -/* 00C08 80AE7EB8 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 00C0C 80AE7EBC AFA00018 */ sw $zero, 0x0018($sp) -/* 00C10 80AE7EC0 AFA00014 */ sw $zero, 0x0014($sp) -/* 00C14 80AE7EC4 AFA00010 */ sw $zero, 0x0010($sp) -/* 00C18 80AE7EC8 8E0D02D0 */ lw $t5, 0x02D0($s0) ## 000002D0 -/* 00C1C 80AE7ECC 8FA4007C */ lw $a0, 0x007C($sp) -/* 00C20 80AE7ED0 0C0289CF */ jal SkelAnime_DrawSV2 -/* 00C24 80AE7ED4 AFAD001C */ sw $t5, 0x001C($sp) -/* 00C28 80AE7ED8 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 -/* 00C2C 80AE7EDC 8FAE007C */ lw $t6, 0x007C($sp) -/* 00C30 80AE7EE0 3C0680AF */ lui $a2, %hi(D_80AE8220) ## $a2 = 80AF0000 -/* 00C34 80AE7EE4 24C68220 */ addiu $a2, $a2, %lo(D_80AE8220) ## $a2 = 80AE8220 -/* 00C38 80AE7EE8 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD8 -/* 00C3C 80AE7EEC 2407014B */ addiu $a3, $zero, 0x014B ## $a3 = 0000014B -/* 00C40 80AE7EF0 0C031AD5 */ jal Graph_CloseDisps -/* 00C44 80AE7EF4 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 00C48 80AE7EF8 8FBF002C */ lw $ra, 0x002C($sp) -/* 00C4C 80AE7EFC 8FB00028 */ lw $s0, 0x0028($sp) -/* 00C50 80AE7F00 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 -/* 00C54 80AE7F04 03E00008 */ jr $ra -/* 00C58 80AE7F08 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7FD0.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7FD0.s deleted file mode 100644 index fd2d0aca5c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7FD0.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_80AE7FD0 -/* 00D20 80AE7FD0 AFA40000 */ sw $a0, 0x0000($sp) -/* 00D24 80AE7FD4 03E00008 */ jr $ra -/* 00D28 80AE7FD8 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7FDC.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7FDC.s deleted file mode 100644 index c2884262f3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7FDC.s +++ /dev/null @@ -1,100 +0,0 @@ -.rdata -glabel D_80AE827C - .asciz "../z_en_rl.c" - .balign 4 - -glabel D_80AE828C - .asciz "../z_en_rl.c" - .balign 4 - -.text -glabel func_80AE7FDC -/* 00D2C 80AE7FDC 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 00D30 80AE7FE0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00D34 80AE7FE4 AFA40070 */ sw $a0, 0x0070($sp) -/* 00D38 80AE7FE8 AFA50074 */ sw $a1, 0x0074($sp) -/* 00D3C 80AE7FEC 84820190 */ lh $v0, 0x0190($a0) ## 00000190 -/* 00D40 80AE7FF0 3C1880AF */ lui $t8, %hi(D_80AE81A0) ## $t8 = 80AF0000 -/* 00D44 80AE7FF4 3C0680AF */ lui $a2, %hi(D_80AE827C) ## $a2 = 80AF0000 -/* 00D48 80AE7FF8 00027880 */ sll $t7, $v0, 2 -/* 00D4C 80AE7FFC 030FC021 */ addu $t8, $t8, $t7 -/* 00D50 80AE8000 8F1881A0 */ lw $t8, %lo(D_80AE81A0)($t8) -/* 00D54 80AE8004 24C6827C */ addiu $a2, $a2, %lo(D_80AE827C) ## $a2 = 80AE827C -/* 00D58 80AE8008 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFD8 -/* 00D5C 80AE800C AFB80060 */ sw $t8, 0x0060($sp) -/* 00D60 80AE8010 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 00D64 80AE8014 240701A0 */ addiu $a3, $zero, 0x01A0 ## $a3 = 000001A0 -/* 00D68 80AE8018 0C031AB1 */ jal Graph_OpenDisps -/* 00D6C 80AE801C AFA50058 */ sw $a1, 0x0058($sp) -/* 00D70 80AE8020 8FA90074 */ lw $t1, 0x0074($sp) -/* 00D74 80AE8024 0C024F46 */ jal func_80093D18 -/* 00D78 80AE8028 8D240000 */ lw $a0, 0x0000($t1) ## 00000000 -/* 00D7C 80AE802C 8FA80058 */ lw $t0, 0x0058($sp) -/* 00D80 80AE8030 8FA70060 */ lw $a3, 0x0060($sp) -/* 00D84 80AE8034 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 00D88 80AE8038 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 00D8C 80AE803C 00076100 */ sll $t4, $a3, 4 -/* 00D90 80AE8040 000C6F02 */ srl $t5, $t4, 28 -/* 00D94 80AE8044 3C0F8016 */ lui $t7, %hi(gSegments) -/* 00D98 80AE8048 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 00D9C 80AE804C 25EF6FA8 */ addiu $t7, %lo(gSegments) -/* 00DA0 80AE8050 000D7080 */ sll $t6, $t5, 2 -/* 00DA4 80AE8054 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020 -/* 00DA8 80AE8058 AD0A02C0 */ sw $t2, 0x02C0($t0) ## 000002C0 -/* 00DAC 80AE805C 01CF2021 */ addu $a0, $t6, $t7 -/* 00DB0 80AE8060 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 00DB4 80AE8064 8C980000 */ lw $t8, 0x0000($a0) ## 00000000 -/* 00DB8 80AE8068 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00DBC 80AE806C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00DC0 80AE8070 00E12824 */ and $a1, $a3, $at -/* 00DC4 80AE8074 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 00DC8 80AE8078 0305C821 */ addu $t9, $t8, $a1 -/* 00DCC 80AE807C 03264821 */ addu $t1, $t9, $a2 -/* 00DD0 80AE8080 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 00DD4 80AE8084 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 00DD8 80AE8088 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 00DDC 80AE808C 356B0024 */ ori $t3, $t3, 0x0024 ## $t3 = DB060024 -/* 00DE0 80AE8090 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 00DE4 80AE8094 AD0A02C0 */ sw $t2, 0x02C0($t0) ## 000002C0 -/* 00DE8 80AE8098 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 00DEC 80AE809C 8C8C0000 */ lw $t4, 0x0000($a0) ## 00000000 -/* 00DF0 80AE80A0 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 00DF4 80AE80A4 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 -/* 00DF8 80AE80A8 01856821 */ addu $t5, $t4, $a1 -/* 00DFC 80AE80AC 01A67021 */ addu $t6, $t5, $a2 -/* 00E00 80AE80B0 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 00E04 80AE80B4 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 00E08 80AE80B8 3C0B8011 */ lui $t3, %hi(D_80116280+0x10) -/* 00E0C 80AE80BC 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 -/* 00E10 80AE80C0 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 00E14 80AE80C4 AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 -/* 00E18 80AE80C8 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 00E1C 80AE80CC AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 00E20 80AE80D0 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 00E24 80AE80D4 354A0030 */ ori $t2, $t2, 0x0030 ## $t2 = DB060030 -/* 00E28 80AE80D8 256B6290 */ addiu $t3, %lo(D_80116280+0x10) -/* 00E2C 80AE80DC 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 00E30 80AE80E0 AD0902C0 */ sw $t1, 0x02C0($t0) ## 000002C0 -/* 00E34 80AE80E4 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 00E38 80AE80E8 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 00E3C 80AE80EC 8FA30070 */ lw $v1, 0x0070($sp) -/* 00E40 80AE80F0 8FA40074 */ lw $a0, 0x0074($sp) -/* 00E44 80AE80F4 2462014C */ addiu $v0, $v1, 0x014C ## $v0 = 0000014C -/* 00E48 80AE80F8 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 -/* 00E4C 80AE80FC 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C -/* 00E50 80AE8100 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 00E54 80AE8104 AFA00014 */ sw $zero, 0x0014($sp) -/* 00E58 80AE8108 AFA00010 */ sw $zero, 0x0010($sp) -/* 00E5C 80AE810C 0C0286B2 */ jal SkelAnime_DrawSV -/* 00E60 80AE8110 AFA30018 */ sw $v1, 0x0018($sp) -/* 00E64 80AE8114 8FAC0074 */ lw $t4, 0x0074($sp) -/* 00E68 80AE8118 3C0680AF */ lui $a2, %hi(D_80AE828C) ## $a2 = 80AF0000 -/* 00E6C 80AE811C 24C6828C */ addiu $a2, $a2, %lo(D_80AE828C) ## $a2 = 80AE828C -/* 00E70 80AE8120 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFD8 -/* 00E74 80AE8124 240701B5 */ addiu $a3, $zero, 0x01B5 ## $a3 = 000001B5 -/* 00E78 80AE8128 0C031AD5 */ jal Graph_CloseDisps -/* 00E7C 80AE812C 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 00E80 80AE8130 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00E84 80AE8134 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 -/* 00E88 80AE8138 03E00008 */ jr $ra -/* 00E8C 80AE813C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/ObjKibako_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/ObjKibako_Destroy.s deleted file mode 100644 index 963ec1b22a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/ObjKibako_Destroy.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel ObjKibako_Destroy -/* 00170 80B94E10 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00174 80B94E14 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00178 80B94E18 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0017C 80B94E1C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00180 80B94E20 0C0170EB */ jal Collider_DestroyCylinder - -/* 00184 80B94E24 24E50150 */ addiu $a1, $a3, 0x0150 ## $a1 = 00000150 -/* 00188 80B94E28 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0018C 80B94E2C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00190 80B94E30 03E00008 */ jr $ra -/* 00194 80B94E34 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/ObjKibako_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/ObjKibako_Draw.s deleted file mode 100644 index 6cd962b039..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/ObjKibako_Draw.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel ObjKibako_Draw -/* 00B58 80B957F8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00B5C 80B957FC AFA40018 */ sw $a0, 0x0018($sp) -/* 00B60 80B95800 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00B64 80B95804 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00B68 80B95808 3C050500 */ lui $a1, 0x0500 ## $a1 = 05000000 -/* 00B6C 80B9580C 0C00D498 */ jal Gfx_DrawDListOpa - -/* 00B70 80B95810 24A55290 */ addiu $a1, $a1, 0x5290 ## $a1 = 05005290 -/* 00B74 80B95814 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00B78 80B95818 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00B7C 80B9581C 03E00008 */ jr $ra -/* 00B80 80B95820 00000000 */ nop -/* 00B84 80B95824 00000000 */ nop -/* 00B88 80B95828 00000000 */ nop -/* 00B8C 80B9582C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/ObjKibako_Init.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/ObjKibako_Init.s deleted file mode 100644 index 950a068f12..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/ObjKibako_Init.s +++ /dev/null @@ -1,46 +0,0 @@ -.rdata -glabel D_80B958A0 - .asciz "(dungeon keep 木箱)(arg_data 0x%04x)\n" - .balign 4 - -.late_rodata -glabel D_80B958C8 - .float -1.2 - -.text -glabel ObjKibako_Init -/* 000EC 80B94D8C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 000F0 80B94D90 AFA50024 */ sw $a1, 0x0024($sp) -/* 000F4 80B94D94 AFBF001C */ sw $ra, 0x001C($sp) -/* 000F8 80B94D98 AFB00018 */ sw $s0, 0x0018($sp) -/* 000FC 80B94D9C 3C0580B9 */ lui $a1, %hi(D_80B95884) ## $a1 = 80B90000 -/* 00100 80B94DA0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00104 80B94DA4 0C01E037 */ jal Actor_ProcessInitChain - -/* 00108 80B94DA8 24A55884 */ addiu $a1, $a1, %lo(D_80B95884) ## $a1 = 80B95884 -/* 0010C 80B94DAC 3C0180B9 */ lui $at, %hi(D_80B958C8) ## $at = 80B90000 -/* 00110 80B94DB0 C42458C8 */ lwc1 $f4, %lo(D_80B958C8)($at) -/* 00114 80B94DB4 3C01C150 */ lui $at, 0xC150 ## $at = C1500000 -/* 00118 80B94DB8 44813000 */ mtc1 $at, $f6 ## $f6 = -13.00 -/* 0011C 80B94DBC E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C -/* 00120 80B94DC0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00124 80B94DC4 E6060070 */ swc1 $f6, 0x0070($s0) ## 00000070 -/* 00128 80B94DC8 0C2E534D */ jal func_80B94D34 -/* 0012C 80B94DCC 8FA50024 */ lw $a1, 0x0024($sp) -/* 00130 80B94DD0 3C0680B9 */ lui $a2, %hi(D_80B9587C) ## $a2 = 80B90000 -/* 00134 80B94DD4 24C6587C */ addiu $a2, $a2, %lo(D_80B9587C) ## $a2 = 80B9587C -/* 00138 80B94DD8 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 0013C 80B94DDC 0C0187B5 */ jal func_80061ED4 -/* 00140 80B94DE0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00144 80B94DE4 0C2E54CD */ jal func_80B95334 -/* 00148 80B94DE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0014C 80B94DEC 3C0480B9 */ lui $a0, %hi(D_80B958A0) ## $a0 = 80B90000 -/* 00150 80B94DF0 248458A0 */ addiu $a0, $a0, %lo(D_80B958A0) ## $a0 = 80B958A0 -/* 00154 80B94DF4 0C00084C */ jal osSyncPrintf - -/* 00158 80B94DF8 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 0015C 80B94DFC 8FBF001C */ lw $ra, 0x001C($sp) -/* 00160 80B94E00 8FB00018 */ lw $s0, 0x0018($sp) -/* 00164 80B94E04 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00168 80B94E08 03E00008 */ jr $ra -/* 0016C 80B94E0C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/ObjKibako_Update.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/ObjKibako_Update.s deleted file mode 100644 index b38d1d8613..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/ObjKibako_Update.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel ObjKibako_Update -/* 00B34 80B957D4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00B38 80B957D8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00B3C 80B957DC 8C99014C */ lw $t9, 0x014C($a0) ## 0000014C -/* 00B40 80B957E0 0320F809 */ jalr $ra, $t9 -/* 00B44 80B957E4 00000000 */ nop -/* 00B48 80B957E8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00B4C 80B957EC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00B50 80B957F0 03E00008 */ jr $ra -/* 00B54 80B957F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B94CA0.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B94CA0.s deleted file mode 100644 index 817ed1358a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B94CA0.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_80B94CA0 -/* 00000 80B94CA0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00004 80B94CA4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00008 80B94CA8 AFA5001C */ sw $a1, 0x001C($sp) -/* 0000C 80B94CAC 8483001C */ lh $v1, 0x001C($a0) ## 0000001C -/* 00010 80B94CB0 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00014 80B94CB4 3062001F */ andi $v0, $v1, 0x001F ## $v0 = 00000000 -/* 00018 80B94CB8 00021400 */ sll $v0, $v0, 16 -/* 0001C 80B94CBC 00021403 */ sra $v0, $v0, 16 -/* 00020 80B94CC0 0440000B */ bltz $v0, .L80B94CF0 -/* 00024 80B94CC4 2841001A */ slti $at, $v0, 0x001A -/* 00028 80B94CC8 10200009 */ beq $at, $zero, .L80B94CF0 -/* 0002C 80B94CCC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00030 80B94CD0 00037203 */ sra $t6, $v1, 8 -/* 00034 80B94CD4 31CF003F */ andi $t7, $t6, 0x003F ## $t7 = 00000000 -/* 00038 80B94CD8 000FC200 */ sll $t8, $t7, 8 -/* 0003C 80B94CDC 00583025 */ or $a2, $v0, $t8 ## $a2 = 00000000 -/* 00040 80B94CE0 00063400 */ sll $a2, $a2, 16 -/* 00044 80B94CE4 00063403 */ sra $a2, $a2, 16 -/* 00048 80B94CE8 0C007D52 */ jal Item_DropCollectible - -/* 0004C 80B94CEC 24E50024 */ addiu $a1, $a3, 0x0024 ## $a1 = 00000024 -.L80B94CF0: -/* 00050 80B94CF0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00054 80B94CF4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00058 80B94CF8 03E00008 */ jr $ra -/* 0005C 80B94CFC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B94D00.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B94D00.s deleted file mode 100644 index c09eafdc61..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B94D00.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80B94D00 -/* 00060 80B94D00 C4840060 */ lwc1 $f4, 0x0060($a0) ## 00000060 -/* 00064 80B94D04 C486006C */ lwc1 $f6, 0x006C($a0) ## 0000006C -/* 00068 80B94D08 C4800070 */ lwc1 $f0, 0x0070($a0) ## 00000070 -/* 0006C 80B94D0C 46062200 */ add.s $f8, $f4, $f6 -/* 00070 80B94D10 E4880060 */ swc1 $f8, 0x0060($a0) ## 00000060 -/* 00074 80B94D14 C48A0060 */ lwc1 $f10, 0x0060($a0) ## 00000060 -/* 00078 80B94D18 4600503C */ c.lt.s $f10, $f0 -/* 0007C 80B94D1C 00000000 */ nop -/* 00080 80B94D20 45000002 */ bc1f .L80B94D2C -/* 00084 80B94D24 00000000 */ nop -/* 00088 80B94D28 E4800060 */ swc1 $f0, 0x0060($a0) ## 00000060 -.L80B94D2C: -/* 0008C 80B94D2C 03E00008 */ jr $ra -/* 00090 80B94D30 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B94D34.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B94D34.s deleted file mode 100644 index 0ba0160d54..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B94D34.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80B94D34 -/* 00094 80B94D34 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00098 80B94D38 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 0009C 80B94D3C AFA50024 */ sw $a1, 0x0024($sp) -/* 000A0 80B94D40 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 000A4 80B94D44 AFBF0014 */ sw $ra, 0x0014($sp) -/* 000A8 80B94D48 24C50150 */ addiu $a1, $a2, 0x0150 ## $a1 = 00000150 -/* 000AC 80B94D4C AFA50018 */ sw $a1, 0x0018($sp) -/* 000B0 80B94D50 0C0170D9 */ jal Collider_InitCylinder - -/* 000B4 80B94D54 AFA60020 */ sw $a2, 0x0020($sp) -/* 000B8 80B94D58 3C0780B9 */ lui $a3, %hi(D_80B95850) ## $a3 = 80B90000 -/* 000BC 80B94D5C 8FA60020 */ lw $a2, 0x0020($sp) -/* 000C0 80B94D60 24E75850 */ addiu $a3, $a3, %lo(D_80B95850) ## $a3 = 80B95850 -/* 000C4 80B94D64 8FA40024 */ lw $a0, 0x0024($sp) -/* 000C8 80B94D68 0C01712B */ jal Collider_SetCylinder - -/* 000CC 80B94D6C 8FA50018 */ lw $a1, 0x0018($sp) -/* 000D0 80B94D70 8FA40020 */ lw $a0, 0x0020($sp) -/* 000D4 80B94D74 0C0189B7 */ jal Collider_CylinderUpdate - -/* 000D8 80B94D78 8FA50018 */ lw $a1, 0x0018($sp) -/* 000DC 80B94D7C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 000E0 80B94D80 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 000E4 80B94D84 03E00008 */ jr $ra -/* 000E8 80B94D88 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B94E38.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B94E38.s deleted file mode 100644 index 4f02f1d7ee..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B94E38.s +++ /dev/null @@ -1,182 +0,0 @@ -.late_rodata -glabel D_80B958CC - .float 0.2 - -glabel D_80B958D0 - .float 0.1 - -glabel D_80B958D4 - .float 0.7 - -.text -glabel func_80B94E38 -/* 00198 80B94E38 27BDFF20 */ addiu $sp, $sp, 0xFF20 ## $sp = FFFFFF20 -/* 0019C 80B94E3C F7BE0070 */ sdc1 $f30, 0x0070($sp) -/* 001A0 80B94E40 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 001A4 80B94E44 4481F000 */ mtc1 $at, $f30 ## $f30 = 5.00 -/* 001A8 80B94E48 F7BC0068 */ sdc1 $f28, 0x0068($sp) -/* 001AC 80B94E4C 3C0180B9 */ lui $at, %hi(D_80B958CC) ## $at = 80B90000 -/* 001B0 80B94E50 C43C58CC */ lwc1 $f28, %lo(D_80B958CC)($at) -/* 001B4 80B94E54 F7BA0060 */ sdc1 $f26, 0x0060($sp) -/* 001B8 80B94E58 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 001BC 80B94E5C 4481D000 */ mtc1 $at, $f26 ## $f26 = 2.00 -/* 001C0 80B94E60 AFB60090 */ sw $s6, 0x0090($sp) -/* 001C4 80B94E64 F7B80058 */ sdc1 $f24, 0x0058($sp) -/* 001C8 80B94E68 3C014180 */ lui $at, 0x4180 ## $at = 41800000 -/* 001CC 80B94E6C AFBE0098 */ sw $s8, 0x0098($sp) -/* 001D0 80B94E70 AFB70094 */ sw $s7, 0x0094($sp) -/* 001D4 80B94E74 AFB5008C */ sw $s5, 0x008C($sp) -/* 001D8 80B94E78 AFB40088 */ sw $s4, 0x0088($sp) -/* 001DC 80B94E7C AFB30084 */ sw $s3, 0x0084($sp) -/* 001E0 80B94E80 AFB20080 */ sw $s2, 0x0080($sp) -/* 001E4 80B94E84 AFB1007C */ sw $s1, 0x007C($sp) -/* 001E8 80B94E88 3C160500 */ lui $s6, 0x0500 ## $s6 = 05000000 -/* 001EC 80B94E8C 4481C000 */ mtc1 $at, $f24 ## $f24 = 16.00 -/* 001F0 80B94E90 00A0F025 */ or $s8, $a1, $zero ## $s8 = 00000000 -/* 001F4 80B94E94 AFBF009C */ sw $ra, 0x009C($sp) -/* 001F8 80B94E98 AFB00078 */ sw $s0, 0x0078($sp) -/* 001FC 80B94E9C F7B60050 */ sdc1 $f22, 0x0050($sp) -/* 00200 80B94EA0 F7B40048 */ sdc1 $f20, 0x0048($sp) -/* 00204 80B94EA4 26D65380 */ addiu $s6, $s6, 0x5380 ## $s6 = 05005380 -/* 00208 80B94EA8 24910024 */ addiu $s1, $a0, 0x0024 ## $s1 = 00000024 -/* 0020C 80B94EAC 00009025 */ or $s2, $zero, $zero ## $s2 = 00000000 -/* 00210 80B94EB0 00009825 */ or $s3, $zero, $zero ## $s3 = 00000000 -/* 00214 80B94EB4 27B400C8 */ addiu $s4, $sp, 0x00C8 ## $s4 = FFFFFFE8 -/* 00218 80B94EB8 27B500BC */ addiu $s5, $sp, 0x00BC ## $s5 = FFFFFFDC -/* 0021C 80B94EBC 2417000C */ addiu $s7, $zero, 0x000C ## $s7 = 0000000C -.L80B94EC0: -/* 00220 80B94EC0 00122400 */ sll $a0, $s2, 16 -/* 00224 80B94EC4 0C01DE1C */ jal Math_Sins - ## sins? -/* 00228 80B94EC8 00042403 */ sra $a0, $a0, 16 -/* 0022C 80B94ECC 00122400 */ sll $a0, $s2, 16 -/* 00230 80B94ED0 46000506 */ mov.s $f20, $f0 -/* 00234 80B94ED4 0C01DE0D */ jal Math_Coss - ## coss? -/* 00238 80B94ED8 00042403 */ sra $a0, $a0, 16 -/* 0023C 80B94EDC 4618A102 */ mul.s $f4, $f20, $f24 -/* 00240 80B94EE0 46000586 */ mov.s $f22, $f0 -/* 00244 80B94EE4 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00248 80B94EE8 E7A400C8 */ swc1 $f4, 0x00C8($sp) -/* 0024C 80B94EEC 461E0182 */ mul.s $f6, $f0, $f30 -/* 00250 80B94EF0 C7B000C8 */ lwc1 $f16, 0x00C8($sp) -/* 00254 80B94EF4 4618B282 */ mul.s $f10, $f22, $f24 -/* 00258 80B94EF8 00000000 */ nop -/* 0025C 80B94EFC 461C8482 */ mul.s $f18, $f16, $f28 -/* 00260 80B94F00 461A3200 */ add.s $f8, $f6, $f26 -/* 00264 80B94F04 E7AA00D0 */ swc1 $f10, 0x00D0($sp) -/* 00268 80B94F08 E7A800CC */ swc1 $f8, 0x00CC($sp) -/* 0026C 80B94F0C 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00270 80B94F10 E7B200BC */ swc1 $f18, 0x00BC($sp) -/* 00274 80B94F14 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 00278 80B94F18 44812000 */ mtc1 $at, $f4 ## $f4 = 6.00 -/* 0027C 80B94F1C C7AA00D0 */ lwc1 $f10, 0x00D0($sp) -/* 00280 80B94F20 C7B200C8 */ lwc1 $f18, 0x00C8($sp) -/* 00284 80B94F24 46040182 */ mul.s $f6, $f0, $f4 -/* 00288 80B94F28 461A3200 */ add.s $f8, $f6, $f26 -/* 0028C 80B94F2C 461C5402 */ mul.s $f16, $f10, $f28 -/* 00290 80B94F30 E7A800C0 */ swc1 $f8, 0x00C0($sp) -/* 00294 80B94F34 C7A800CC */ lwc1 $f8, 0x00CC($sp) -/* 00298 80B94F38 E7B000C4 */ swc1 $f16, 0x00C4($sp) -/* 0029C 80B94F3C C6240000 */ lwc1 $f4, 0x0000($s1) ## 00000024 -/* 002A0 80B94F40 46049180 */ add.s $f6, $f18, $f4 -/* 002A4 80B94F44 E7A600C8 */ swc1 $f6, 0x00C8($sp) -/* 002A8 80B94F48 C6300004 */ lwc1 $f16, 0x0004($s1) ## 00000028 -/* 002AC 80B94F4C 46104480 */ add.s $f18, $f8, $f16 -/* 002B0 80B94F50 E7B200CC */ swc1 $f18, 0x00CC($sp) -/* 002B4 80B94F54 C6240008 */ lwc1 $f4, 0x0008($s1) ## 0000002C -/* 002B8 80B94F58 46045180 */ add.s $f6, $f10, $f4 -/* 002BC 80B94F5C 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 002C0 80B94F60 E7A600D0 */ swc1 $f6, 0x00D0($sp) -/* 002C4 80B94F64 3C0180B9 */ lui $at, %hi(D_80B958D0) ## $at = 80B90000 -/* 002C8 80B94F68 C42858D0 */ lwc1 $f8, %lo(D_80B958D0)($at) -/* 002CC 80B94F6C 3C0180B9 */ lui $at, %hi(D_80B958D4) ## $at = 80B90000 -/* 002D0 80B94F70 4608003C */ c.lt.s $f0, $f8 -/* 002D4 80B94F74 00000000 */ nop -/* 002D8 80B94F78 45000003 */ bc1f .L80B94F88 -/* 002DC 80B94F7C 00000000 */ nop -/* 002E0 80B94F80 10000009 */ beq $zero, $zero, .L80B94FA8 -/* 002E4 80B94F84 24100060 */ addiu $s0, $zero, 0x0060 ## $s0 = 00000060 -.L80B94F88: -/* 002E8 80B94F88 C43058D4 */ lwc1 $f16, %lo(D_80B958D4)($at) -/* 002EC 80B94F8C 24100020 */ addiu $s0, $zero, 0x0020 ## $s0 = 00000020 -/* 002F0 80B94F90 4610003C */ c.lt.s $f0, $f16 -/* 002F4 80B94F94 00000000 */ nop -/* 002F8 80B94F98 45000003 */ bc1f .L80B94FA8 -/* 002FC 80B94F9C 00000000 */ nop -/* 00300 80B94FA0 10000001 */ beq $zero, $zero, .L80B94FA8 -/* 00304 80B94FA4 24100040 */ addiu $s0, $zero, 0x0040 ## $s0 = 00000040 -.L80B94FA8: -/* 00308 80B94FA8 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 0030C 80B94FAC 00000000 */ nop -/* 00310 80B94FB0 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 00314 80B94FB4 44819000 */ mtc1 $at, $f18 ## $f18 = 30.00 -/* 00318 80B94FB8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 0031C 80B94FBC 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 -/* 00320 80B94FC0 46120282 */ mul.s $f10, $f0, $f18 -/* 00324 80B94FC4 240EFF38 */ addiu $t6, $zero, 0xFF38 ## $t6 = FFFFFF38 -/* 00328 80B94FC8 240F000A */ addiu $t7, $zero, 0x000A ## $t7 = 0000000A -/* 0032C 80B94FCC 2418000A */ addiu $t8, $zero, 0x000A ## $t8 = 0000000A -/* 00330 80B94FD0 24090020 */ addiu $t1, $zero, 0x0020 ## $t1 = 00000020 -/* 00334 80B94FD4 240A003C */ addiu $t2, $zero, 0x003C ## $t2 = 0000003C -/* 00338 80B94FD8 240BFFFF */ addiu $t3, $zero, 0xFFFF ## $t3 = FFFFFFFF -/* 0033C 80B94FDC 46045180 */ add.s $f6, $f10, $f4 -/* 00340 80B94FE0 240C0003 */ addiu $t4, $zero, 0x0003 ## $t4 = 00000003 -/* 00344 80B94FE4 AFAC0038 */ sw $t4, 0x0038($sp) -/* 00348 80B94FE8 AFAB0034 */ sw $t3, 0x0034($sp) -/* 0034C 80B94FEC 4600320D */ trunc.w.s $f8, $f6 -/* 00350 80B94FF0 AFAA0030 */ sw $t2, 0x0030($sp) -/* 00354 80B94FF4 AFA9002C */ sw $t1, 0x002C($sp) -/* 00358 80B94FF8 AFB8001C */ sw $t8, 0x001C($sp) -/* 0035C 80B94FFC 44084000 */ mfc1 $t0, $f8 -/* 00360 80B95000 AFAF0018 */ sw $t7, 0x0018($sp) -/* 00364 80B95004 AFAE0010 */ sw $t6, 0x0010($sp) -/* 00368 80B95008 03C02025 */ or $a0, $s8, $zero ## $a0 = 00000000 -/* 0036C 80B9500C 02802825 */ or $a1, $s4, $zero ## $a1 = FFFFFFE8 -/* 00370 80B95010 02A03025 */ or $a2, $s5, $zero ## $a2 = FFFFFFDC -/* 00374 80B95014 02203825 */ or $a3, $s1, $zero ## $a3 = 00000024 -/* 00378 80B95018 AFB00014 */ sw $s0, 0x0014($sp) -/* 0037C 80B9501C AFA00020 */ sw $zero, 0x0020($sp) -/* 00380 80B95020 AFA00028 */ sw $zero, 0x0028($sp) -/* 00384 80B95024 AFB6003C */ sw $s6, 0x003C($sp) -/* 00388 80B95028 0C00A7A3 */ jal EffectSsKakera_Spawn - -/* 0038C 80B9502C AFA80024 */ sw $t0, 0x0024($sp) -/* 00390 80B95030 26524E20 */ addiu $s2, $s2, 0x4E20 ## $s2 = 00004E20 -/* 00394 80B95034 00129400 */ sll $s2, $s2, 16 -/* 00398 80B95038 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000001 -/* 0039C 80B9503C 1677FFA0 */ bne $s3, $s7, .L80B94EC0 -/* 003A0 80B95040 00129403 */ sra $s2, $s2, 16 -/* 003A4 80B95044 240D0032 */ addiu $t5, $zero, 0x0032 ## $t5 = 00000032 -/* 003A8 80B95048 240E008C */ addiu $t6, $zero, 0x008C ## $t6 = 0000008C -/* 003AC 80B9504C 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 003B0 80B95050 AFAF0018 */ sw $t7, 0x0018($sp) -/* 003B4 80B95054 AFAE0014 */ sw $t6, 0x0014($sp) -/* 003B8 80B95058 AFAD0010 */ sw $t5, 0x0010($sp) -/* 003BC 80B9505C 03C02025 */ or $a0, $s8, $zero ## $a0 = 00000000 -/* 003C0 80B95060 02202825 */ or $a1, $s1, $zero ## $a1 = 00000024 -/* 003C4 80B95064 3C064220 */ lui $a2, 0x4220 ## $a2 = 42200000 -/* 003C8 80B95068 0C00CD20 */ jal func_80033480 -/* 003CC 80B9506C 24070003 */ addiu $a3, $zero, 0x0003 ## $a3 = 00000003 -/* 003D0 80B95070 8FBF009C */ lw $ra, 0x009C($sp) -/* 003D4 80B95074 D7B40048 */ ldc1 $f20, 0x0048($sp) -/* 003D8 80B95078 D7B60050 */ ldc1 $f22, 0x0050($sp) -/* 003DC 80B9507C D7B80058 */ ldc1 $f24, 0x0058($sp) -/* 003E0 80B95080 D7BA0060 */ ldc1 $f26, 0x0060($sp) -/* 003E4 80B95084 D7BC0068 */ ldc1 $f28, 0x0068($sp) -/* 003E8 80B95088 D7BE0070 */ ldc1 $f30, 0x0070($sp) -/* 003EC 80B9508C 8FB00078 */ lw $s0, 0x0078($sp) -/* 003F0 80B95090 8FB1007C */ lw $s1, 0x007C($sp) -/* 003F4 80B95094 8FB20080 */ lw $s2, 0x0080($sp) -/* 003F8 80B95098 8FB30084 */ lw $s3, 0x0084($sp) -/* 003FC 80B9509C 8FB40088 */ lw $s4, 0x0088($sp) -/* 00400 80B950A0 8FB5008C */ lw $s5, 0x008C($sp) -/* 00404 80B950A4 8FB60090 */ lw $s6, 0x0090($sp) -/* 00408 80B950A8 8FB70094 */ lw $s7, 0x0094($sp) -/* 0040C 80B950AC 8FBE0098 */ lw $s8, 0x0098($sp) -/* 00410 80B950B0 03E00008 */ jr $ra -/* 00414 80B950B4 27BD00E0 */ addiu $sp, $sp, 0x00E0 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B950B8.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B950B8.s deleted file mode 100644 index cc84bd2ccc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B950B8.s +++ /dev/null @@ -1,176 +0,0 @@ -.late_rodata -glabel D_80B958D8 - .word 0x3E3851EC -glabel D_80B958DC - .float 0.2 - -.text -glabel func_80B950B8 -/* 00418 80B950B8 27BDFF20 */ addiu $sp, $sp, 0xFF20 ## $sp = FFFFFF20 -/* 0041C 80B950BC AFB1007C */ sw $s1, 0x007C($sp) -/* 00420 80B950C0 AFBF009C */ sw $ra, 0x009C($sp) -/* 00424 80B950C4 AFBE0098 */ sw $s8, 0x0098($sp) -/* 00428 80B950C8 AFB70094 */ sw $s7, 0x0094($sp) -/* 0042C 80B950CC AFB60090 */ sw $s6, 0x0090($sp) -/* 00430 80B950D0 AFB5008C */ sw $s5, 0x008C($sp) -/* 00434 80B950D4 AFB40088 */ sw $s4, 0x0088($sp) -/* 00438 80B950D8 AFB30084 */ sw $s3, 0x0084($sp) -/* 0043C 80B950DC AFB20080 */ sw $s2, 0x0080($sp) -/* 00440 80B950E0 AFB00078 */ sw $s0, 0x0078($sp) -/* 00444 80B950E4 F7BE0070 */ sdc1 $f30, 0x0070($sp) -/* 00448 80B950E8 F7BC0068 */ sdc1 $f28, 0x0068($sp) -/* 0044C 80B950EC F7BA0060 */ sdc1 $f26, 0x0060($sp) -/* 00450 80B950F0 F7B80058 */ sdc1 $f24, 0x0058($sp) -/* 00454 80B950F4 F7B60050 */ sdc1 $f22, 0x0050($sp) -/* 00458 80B950F8 F7B40048 */ sdc1 $f20, 0x0048($sp) -/* 0045C 80B950FC 24910024 */ addiu $s1, $a0, 0x0024 ## $s1 = 00000024 -/* 00460 80B95100 8E2F0000 */ lw $t7, 0x0000($s1) ## 00000024 -/* 00464 80B95104 27B500C8 */ addiu $s5, $sp, 0x00C8 ## $s5 = FFFFFFE8 -/* 00468 80B95108 00A0A025 */ or $s4, $a1, $zero ## $s4 = 00000000 -/* 0046C 80B9510C AEAF0000 */ sw $t7, 0x0000($s5) ## FFFFFFE8 -/* 00470 80B95110 8E2E0004 */ lw $t6, 0x0004($s1) ## 00000028 -/* 00474 80B95114 241801F4 */ addiu $t8, $zero, 0x01F4 ## $t8 = 000001F4 -/* 00478 80B95118 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0047C 80B9511C AEAE0004 */ sw $t6, 0x0004($s5) ## FFFFFFEC -/* 00480 80B95120 8E2F0008 */ lw $t7, 0x0008($s1) ## 0000002C -/* 00484 80B95124 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00488 80B95128 AEAF0008 */ sw $t7, 0x0008($s5) ## FFFFFFF0 -/* 0048C 80B9512C C7A400CC */ lwc1 $f4, 0x00CC($sp) -/* 00490 80B95130 C4860084 */ lwc1 $f6, 0x0084($a0) ## 00000084 -/* 00494 80B95134 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00498 80B95138 02A02825 */ or $a1, $s5, $zero ## $a1 = FFFFFFE8 -/* 0049C 80B9513C 46062200 */ add.s $f8, $f4, $f6 -/* 004A0 80B95140 AFB80014 */ sw $t8, 0x0014($sp) -/* 004A4 80B95144 AFA00010 */ sw $zero, 0x0010($sp) -/* 004A8 80B95148 0C00A527 */ jal EffectSsGSplash_Spawn -/* 004AC 80B9514C E7A800CC */ swc1 $f8, 0x00CC($sp) -/* 004B0 80B95150 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 004B4 80B95154 4481F000 */ mtc1 $at, $f30 ## $f30 = 5.00 -/* 004B8 80B95158 3C0180B9 */ lui $at, %hi(D_80B958D8) ## $at = 80B90000 -/* 004BC 80B9515C C43C58D8 */ lwc1 $f28, %lo(D_80B958D8)($at) -/* 004C0 80B95160 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 004C4 80B95164 4481D000 */ mtc1 $at, $f26 ## $f26 = 2.00 -/* 004C8 80B95168 3C014180 */ lui $at, 0x4180 ## $at = 41800000 -/* 004CC 80B9516C 3C170500 */ lui $s7, 0x0500 ## $s7 = 05000000 -/* 004D0 80B95170 4481C000 */ mtc1 $at, $f24 ## $f24 = 16.00 -/* 004D4 80B95174 26F75380 */ addiu $s7, $s7, 0x5380 ## $s7 = 05005380 -/* 004D8 80B95178 00009825 */ or $s3, $zero, $zero ## $s3 = 00000000 -/* 004DC 80B9517C 00009025 */ or $s2, $zero, $zero ## $s2 = 00000000 -/* 004E0 80B95180 241E000C */ addiu $s8, $zero, 0x000C ## $s8 = 0000000C -/* 004E4 80B95184 27B600BC */ addiu $s6, $sp, 0x00BC ## $s6 = FFFFFFDC -.L80B95188: -/* 004E8 80B95188 00122400 */ sll $a0, $s2, 16 -/* 004EC 80B9518C 0C01DE1C */ jal Math_Sins - ## sins? -/* 004F0 80B95190 00042403 */ sra $a0, $a0, 16 -/* 004F4 80B95194 00122400 */ sll $a0, $s2, 16 -/* 004F8 80B95198 46000506 */ mov.s $f20, $f0 -/* 004FC 80B9519C 0C01DE0D */ jal Math_Coss - ## coss? -/* 00500 80B951A0 00042403 */ sra $a0, $a0, 16 -/* 00504 80B951A4 4618A282 */ mul.s $f10, $f20, $f24 -/* 00508 80B951A8 46000586 */ mov.s $f22, $f0 -/* 0050C 80B951AC 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00510 80B951B0 E7AA00C8 */ swc1 $f10, 0x00C8($sp) -/* 00514 80B951B4 461E0402 */ mul.s $f16, $f0, $f30 -/* 00518 80B951B8 C7A600C8 */ lwc1 $f6, 0x00C8($sp) -/* 0051C 80B951BC 4618B102 */ mul.s $f4, $f22, $f24 -/* 00520 80B951C0 00000000 */ nop -/* 00524 80B951C4 461C3202 */ mul.s $f8, $f6, $f28 -/* 00528 80B951C8 461A8480 */ add.s $f18, $f16, $f26 -/* 0052C 80B951CC E7A400D0 */ swc1 $f4, 0x00D0($sp) -/* 00530 80B951D0 E7B200CC */ swc1 $f18, 0x00CC($sp) -/* 00534 80B951D4 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00538 80B951D8 E7A800BC */ swc1 $f8, 0x00BC($sp) -/* 0053C 80B951DC 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 00540 80B951E0 44815000 */ mtc1 $at, $f10 ## $f10 = 4.00 -/* 00544 80B951E4 C7A400D0 */ lwc1 $f4, 0x00D0($sp) -/* 00548 80B951E8 C7A800C8 */ lwc1 $f8, 0x00C8($sp) -/* 0054C 80B951EC 460A0402 */ mul.s $f16, $f0, $f10 -/* 00550 80B951F0 461A8480 */ add.s $f18, $f16, $f26 -/* 00554 80B951F4 461C2182 */ mul.s $f6, $f4, $f28 -/* 00558 80B951F8 E7B200C0 */ swc1 $f18, 0x00C0($sp) -/* 0055C 80B951FC C7B200CC */ lwc1 $f18, 0x00CC($sp) -/* 00560 80B95200 E7A600C4 */ swc1 $f6, 0x00C4($sp) -/* 00564 80B95204 C62A0000 */ lwc1 $f10, 0x0000($s1) ## 00000024 -/* 00568 80B95208 460A4400 */ add.s $f16, $f8, $f10 -/* 0056C 80B9520C E7B000C8 */ swc1 $f16, 0x00C8($sp) -/* 00570 80B95210 C6260004 */ lwc1 $f6, 0x0004($s1) ## 00000028 -/* 00574 80B95214 46069200 */ add.s $f8, $f18, $f6 -/* 00578 80B95218 E7A800CC */ swc1 $f8, 0x00CC($sp) -/* 0057C 80B9521C C62A0008 */ lwc1 $f10, 0x0008($s1) ## 0000002C -/* 00580 80B95220 460A2400 */ add.s $f16, $f4, $f10 -/* 00584 80B95224 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00588 80B95228 E7B000D0 */ swc1 $f16, 0x00D0($sp) -/* 0058C 80B9522C 3C0180B9 */ lui $at, %hi(D_80B958DC) ## $at = 80B90000 -/* 00590 80B95230 C43258DC */ lwc1 $f18, %lo(D_80B958DC)($at) -/* 00594 80B95234 24100020 */ addiu $s0, $zero, 0x0020 ## $s0 = 00000020 -/* 00598 80B95238 4612003C */ c.lt.s $f0, $f18 -/* 0059C 80B9523C 00000000 */ nop -/* 005A0 80B95240 45000003 */ bc1f .L80B95250 -/* 005A4 80B95244 00000000 */ nop -/* 005A8 80B95248 10000001 */ beq $zero, $zero, .L80B95250 -/* 005AC 80B9524C 24100040 */ addiu $s0, $zero, 0x0040 ## $s0 = 00000040 -.L80B95250: -/* 005B0 80B95250 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 005B4 80B95254 00000000 */ nop -/* 005B8 80B95258 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 005BC 80B9525C 44813000 */ mtc1 $at, $f6 ## $f6 = 30.00 -/* 005C0 80B95260 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 005C4 80B95264 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 -/* 005C8 80B95268 46060202 */ mul.s $f8, $f0, $f6 -/* 005CC 80B9526C 2419FF4C */ addiu $t9, $zero, 0xFF4C ## $t9 = FFFFFF4C -/* 005D0 80B95270 2408001E */ addiu $t0, $zero, 0x001E ## $t0 = 0000001E -/* 005D4 80B95274 2409001E */ addiu $t1, $zero, 0x001E ## $t1 = 0000001E -/* 005D8 80B95278 240C0020 */ addiu $t4, $zero, 0x0020 ## $t4 = 00000020 -/* 005DC 80B9527C 240D0046 */ addiu $t5, $zero, 0x0046 ## $t5 = 00000046 -/* 005E0 80B95280 240EFFFF */ addiu $t6, $zero, 0xFFFF ## $t6 = FFFFFFFF -/* 005E4 80B95284 46044280 */ add.s $f10, $f8, $f4 -/* 005E8 80B95288 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 -/* 005EC 80B9528C AFAF0038 */ sw $t7, 0x0038($sp) -/* 005F0 80B95290 AFAE0034 */ sw $t6, 0x0034($sp) -/* 005F4 80B95294 4600540D */ trunc.w.s $f16, $f10 -/* 005F8 80B95298 AFAD0030 */ sw $t5, 0x0030($sp) -/* 005FC 80B9529C AFAC002C */ sw $t4, 0x002C($sp) -/* 00600 80B952A0 AFA9001C */ sw $t1, 0x001C($sp) -/* 00604 80B952A4 440B8000 */ mfc1 $t3, $f16 -/* 00608 80B952A8 AFA80018 */ sw $t0, 0x0018($sp) -/* 0060C 80B952AC AFB90010 */ sw $t9, 0x0010($sp) -/* 00610 80B952B0 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 00614 80B952B4 02A02825 */ or $a1, $s5, $zero ## $a1 = FFFFFFE8 -/* 00618 80B952B8 02C03025 */ or $a2, $s6, $zero ## $a2 = FFFFFFDC -/* 0061C 80B952BC 02203825 */ or $a3, $s1, $zero ## $a3 = 00000024 -/* 00620 80B952C0 AFB00014 */ sw $s0, 0x0014($sp) -/* 00624 80B952C4 AFA00020 */ sw $zero, 0x0020($sp) -/* 00628 80B952C8 AFA00028 */ sw $zero, 0x0028($sp) -/* 0062C 80B952CC AFB7003C */ sw $s7, 0x003C($sp) -/* 00630 80B952D0 0C00A7A3 */ jal EffectSsKakera_Spawn - -/* 00634 80B952D4 AFAB0024 */ sw $t3, 0x0024($sp) -/* 00638 80B952D8 26524E20 */ addiu $s2, $s2, 0x4E20 ## $s2 = 00004E20 -/* 0063C 80B952DC 00129400 */ sll $s2, $s2, 16 -/* 00640 80B952E0 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000001 -/* 00644 80B952E4 167EFFA8 */ bne $s3, $s8, .L80B95188 -/* 00648 80B952E8 00129403 */ sra $s2, $s2, 16 -/* 0064C 80B952EC 8FBF009C */ lw $ra, 0x009C($sp) -/* 00650 80B952F0 D7B40048 */ ldc1 $f20, 0x0048($sp) -/* 00654 80B952F4 D7B60050 */ ldc1 $f22, 0x0050($sp) -/* 00658 80B952F8 D7B80058 */ ldc1 $f24, 0x0058($sp) -/* 0065C 80B952FC D7BA0060 */ ldc1 $f26, 0x0060($sp) -/* 00660 80B95300 D7BC0068 */ ldc1 $f28, 0x0068($sp) -/* 00664 80B95304 D7BE0070 */ ldc1 $f30, 0x0070($sp) -/* 00668 80B95308 8FB00078 */ lw $s0, 0x0078($sp) -/* 0066C 80B9530C 8FB1007C */ lw $s1, 0x007C($sp) -/* 00670 80B95310 8FB20080 */ lw $s2, 0x0080($sp) -/* 00674 80B95314 8FB30084 */ lw $s3, 0x0084($sp) -/* 00678 80B95318 8FB40088 */ lw $s4, 0x0088($sp) -/* 0067C 80B9531C 8FB5008C */ lw $s5, 0x008C($sp) -/* 00680 80B95320 8FB60090 */ lw $s6, 0x0090($sp) -/* 00684 80B95324 8FB70094 */ lw $s7, 0x0094($sp) -/* 00688 80B95328 8FBE0098 */ lw $s8, 0x0098($sp) -/* 0068C 80B9532C 03E00008 */ jr $ra -/* 00690 80B95330 27BD00E0 */ addiu $sp, $sp, 0x00E0 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B95334.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B95334.s deleted file mode 100644 index 0fcf27b3b7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B95334.s +++ /dev/null @@ -1,7 +0,0 @@ -glabel func_80B95334 -/* 00694 80B95334 3C0E80B9 */ lui $t6, %hi(func_80B9534C) ## $t6 = 80B90000 -/* 00698 80B95338 25CE534C */ addiu $t6, $t6, %lo(func_80B9534C) ## $t6 = 80B9534C -/* 0069C 80B9533C 240F00FE */ addiu $t7, $zero, 0x00FE ## $t7 = 000000FE -/* 006A0 80B95340 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 006A4 80B95344 03E00008 */ jr $ra -/* 006A8 80B95348 A08F00AE */ sb $t7, 0x00AE($a0) ## 000000AE diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B9534C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B9534C.s deleted file mode 100644 index a208555c74..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B9534C.s +++ /dev/null @@ -1,141 +0,0 @@ -glabel func_80B9534C -/* 006AC 80B9534C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 006B0 80B95350 AFBF0024 */ sw $ra, 0x0024($sp) -/* 006B4 80B95354 AFB10020 */ sw $s1, 0x0020($sp) -/* 006B8 80B95358 AFB0001C */ sw $s0, 0x001C($sp) -/* 006BC 80B9535C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 006C0 80B95360 0C00BD04 */ jal Actor_HasParent -/* 006C4 80B95364 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 006C8 80B95368 50400006 */ beql $v0, $zero, .L80B95384 -/* 006CC 80B9536C 960E0088 */ lhu $t6, 0x0088($s0) ## 00000088 -/* 006D0 80B95370 0C2E5550 */ jal func_80B95540 -/* 006D4 80B95374 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 006D8 80B95378 1000006D */ beq $zero, $zero, .L80B95530 -/* 006DC 80B9537C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 006E0 80B95380 960E0088 */ lhu $t6, 0x0088($s0) ## 00000088 -.L80B95384: -/* 006E4 80B95384 3C014198 */ lui $at, 0x4198 ## $at = 41980000 -/* 006E8 80B95388 31CF0020 */ andi $t7, $t6, 0x0020 ## $t7 = 00000000 -/* 006EC 80B9538C 51E00017 */ beql $t7, $zero, .L80B953EC -/* 006F0 80B95390 92180161 */ lbu $t8, 0x0161($s0) ## 00000161 -/* 006F4 80B95394 44812000 */ mtc1 $at, $f4 ## $f4 = 19.00 -/* 006F8 80B95398 C6060084 */ lwc1 $f6, 0x0084($s0) ## 00000084 -/* 006FC 80B9539C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00700 80B953A0 4606203C */ c.lt.s $f4, $f6 -/* 00704 80B953A4 00000000 */ nop -/* 00708 80B953A8 45020010 */ bc1fl .L80B953EC -/* 0070C 80B953AC 92180161 */ lbu $t8, 0x0161($s0) ## 00000161 -/* 00710 80B953B0 0C2E542E */ jal func_80B950B8 -/* 00714 80B953B4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00718 80B953B8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0071C 80B953BC 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 00720 80B953C0 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 00724 80B953C4 0C01AEB6 */ jal Audio_PlaySoundAtPosition - -/* 00728 80B953C8 240728AA */ addiu $a3, $zero, 0x28AA ## $a3 = 000028AA -/* 0072C 80B953CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00730 80B953D0 0C2E5328 */ jal func_80B94CA0 -/* 00734 80B953D4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00738 80B953D8 0C00B55C */ jal Actor_Kill - -/* 0073C 80B953DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00740 80B953E0 10000053 */ beq $zero, $zero, .L80B95530 -/* 00744 80B953E4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00748 80B953E8 92180161 */ lbu $t8, 0x0161($s0) ## 00000161 -.L80B953EC: -/* 0074C 80B953EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00750 80B953F0 33190002 */ andi $t9, $t8, 0x0002 ## $t9 = 00000000 -/* 00754 80B953F4 1320000F */ beq $t9, $zero, .L80B95434 -/* 00758 80B953F8 00000000 */ nop -/* 0075C 80B953FC 0C2E538E */ jal func_80B94E38 -/* 00760 80B95400 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00764 80B95404 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00768 80B95408 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 0076C 80B9540C 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 00770 80B95410 0C01AEB6 */ jal Audio_PlaySoundAtPosition - -/* 00774 80B95414 240728AA */ addiu $a3, $zero, 0x28AA ## $a3 = 000028AA -/* 00778 80B95418 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0077C 80B9541C 0C2E5328 */ jal func_80B94CA0 -/* 00780 80B95420 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00784 80B95424 0C00B55C */ jal Actor_Kill - -/* 00788 80B95428 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0078C 80B9542C 10000040 */ beq $zero, $zero, .L80B95530 -/* 00790 80B95430 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B95434: -/* 00794 80B95434 0C00B638 */ jal Actor_MoveForward - -/* 00798 80B95438 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0079C 80B9543C 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 007A0 80B95440 24080005 */ addiu $t0, $zero, 0x0005 ## $t0 = 00000005 -/* 007A4 80B95444 AFA80014 */ sw $t0, 0x0014($sp) -/* 007A8 80B95448 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 007AC 80B9544C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 007B0 80B95450 3C064198 */ lui $a2, 0x4198 ## $a2 = 41980000 -/* 007B4 80B95454 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 -/* 007B8 80B95458 0C00B92D */ jal func_8002E4B4 -/* 007BC 80B9545C E7A80010 */ swc1 $f8, 0x0010($sp) -/* 007C0 80B95460 92020162 */ lbu $v0, 0x0162($s0) ## 00000162 -/* 007C4 80B95464 3C0141E0 */ lui $at, 0x41E0 ## $at = 41E00000 -/* 007C8 80B95468 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 007CC 80B9546C 30490008 */ andi $t1, $v0, 0x0008 ## $t1 = 00000000 -/* 007D0 80B95470 15200009 */ bne $t1, $zero, .L80B95498 -/* 007D4 80B95474 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 -/* 007D8 80B95478 44815000 */ mtc1 $at, $f10 ## $f10 = 28.00 -/* 007DC 80B9547C C6100090 */ lwc1 $f16, 0x0090($s0) ## 00000090 -/* 007E0 80B95480 344A0008 */ ori $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 007E4 80B95484 4610503C */ c.lt.s $f10, $f16 -/* 007E8 80B95488 00000000 */ nop -/* 007EC 80B9548C 45020003 */ bc1fl .L80B9549C -/* 007F0 80B95490 3C014416 */ lui $at, 0x4416 ## $at = 44160000 -/* 007F4 80B95494 A20A0162 */ sb $t2, 0x0162($s0) ## 00000162 -.L80B95498: -/* 007F8 80B95498 3C014416 */ lui $at, 0x4416 ## $at = 44160000 -.L80B9549C: -/* 007FC 80B9549C 44819000 */ mtc1 $at, $f18 ## $f18 = 600.00 -/* 00800 80B954A0 C6000090 */ lwc1 $f0, 0x0090($s0) ## 00000090 -/* 00804 80B954A4 4612003C */ c.lt.s $f0, $f18 -/* 00808 80B954A8 00000000 */ nop -/* 0080C 80B954AC 45020017 */ bc1fl .L80B9550C -/* 00810 80B954B0 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 00814 80B954B4 0C0189B7 */ jal Collider_CylinderUpdate - -/* 00818 80B954B8 AFA5002C */ sw $a1, 0x002C($sp) -/* 0081C 80B954BC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00820 80B954C0 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 00824 80B954C4 02212821 */ addu $a1, $s1, $at -/* 00828 80B954C8 AFA50028 */ sw $a1, 0x0028($sp) -/* 0082C 80B954CC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00830 80B954D0 0C01767D */ jal CollisionCheck_SetAC - ## CollisionCheck_setAC -/* 00834 80B954D4 8FA6002C */ lw $a2, 0x002C($sp) -/* 00838 80B954D8 3C014334 */ lui $at, 0x4334 ## $at = 43340000 -/* 0083C 80B954DC 44812000 */ mtc1 $at, $f4 ## $f4 = 180.00 -/* 00840 80B954E0 C6000090 */ lwc1 $f0, 0x0090($s0) ## 00000090 -/* 00844 80B954E4 8FA50028 */ lw $a1, 0x0028($sp) -/* 00848 80B954E8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0084C 80B954EC 4604003C */ c.lt.s $f0, $f4 -/* 00850 80B954F0 00000000 */ nop -/* 00854 80B954F4 45020005 */ bc1fl .L80B9550C -/* 00858 80B954F8 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 0085C 80B954FC 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOT -/* 00860 80B95500 8FA6002C */ lw $a2, 0x002C($sp) -/* 00864 80B95504 C6000090 */ lwc1 $f0, 0x0090($s0) ## 00000090 -/* 00868 80B95508 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -.L80B9550C: -/* 0086C 80B9550C 44813000 */ mtc1 $at, $f6 ## $f6 = 100.00 -/* 00870 80B95510 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00874 80B95514 4606003C */ c.lt.s $f0, $f6 -/* 00878 80B95518 00000000 */ nop -/* 0087C 80B9551C 45020004 */ bc1fl .L80B95530 -/* 00880 80B95520 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00884 80B95524 0C00BD60 */ jal func_8002F580 -/* 00888 80B95528 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0088C 80B9552C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B95530: -/* 00890 80B95530 8FB0001C */ lw $s0, 0x001C($sp) -/* 00894 80B95534 8FB10020 */ lw $s1, 0x0020($sp) -/* 00898 80B95538 03E00008 */ jr $ra -/* 0089C 80B9553C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B95540.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B95540.s deleted file mode 100644 index 599c7cba62..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B95540.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_80B95540 -/* 008A0 80B95540 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 008A4 80B95544 AFBF0014 */ sw $ra, 0x0014($sp) -/* 008A8 80B95548 3C0E80B9 */ lui $t6, %hi(func_80B95574) ## $t6 = 80B90000 -/* 008AC 80B9554C 25CE5574 */ addiu $t6, $t6, %lo(func_80B95574) ## $t6 = 80B95574 -/* 008B0 80B95550 240FFFFF */ addiu $t7, $zero, 0xFFFF ## $t7 = FFFFFFFF -/* 008B4 80B95554 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 008B8 80B95558 A08F0003 */ sb $t7, 0x0003($a0) ## 00000003 -/* 008BC 80B9555C 0C00BDF7 */ jal func_8002F7DC -/* 008C0 80B95560 24050878 */ addiu $a1, $zero, 0x0878 ## $a1 = 00000878 -/* 008C4 80B95564 8FBF0014 */ lw $ra, 0x0014($sp) -/* 008C8 80B95568 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 008CC 80B9556C 03E00008 */ jr $ra -/* 008D0 80B95570 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B95574.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B95574.s deleted file mode 100644 index 7af9358413..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B95574.s +++ /dev/null @@ -1,59 +0,0 @@ -.late_rodata -glabel D_80B958E0 - .float 0.1 - -.text -glabel func_80B95574 -/* 008D4 80B95574 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 008D8 80B95578 AFBF0024 */ sw $ra, 0x0024($sp) -/* 008DC 80B9557C AFB00020 */ sw $s0, 0x0020($sp) -/* 008E0 80B95580 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 008E4 80B95584 0C00BD68 */ jal Actor_HasNoParent -/* 008E8 80B95588 AFA5002C */ sw $a1, 0x002C($sp) -/* 008EC 80B9558C 10400025 */ beq $v0, $zero, .L80B95624 -/* 008F0 80B95590 8FAE002C */ lw $t6, 0x002C($sp) -/* 008F4 80B95594 3C0F0001 */ lui $t7, 0x0001 ## $t7 = 00010000 -/* 008F8 80B95598 01EE7821 */ addu $t7, $t7, $t6 -/* 008FC 80B9559C 81EF1CBC */ lb $t7, 0x1CBC($t7) ## 00011CBC -/* 00900 80B955A0 C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -/* 00904 80B955A4 3C0180B9 */ lui $at, %hi(D_80B958E0) ## $at = 80B90000 -/* 00908 80B955A8 A20F0003 */ sb $t7, 0x0003($s0) ## 00000003 -/* 0090C 80B955AC C42458E0 */ lwc1 $f4, %lo(D_80B958E0)($at) -/* 00910 80B955B0 46000005 */ abs.s $f0, $f0 -/* 00914 80B955B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00918 80B955B8 4604003C */ c.lt.s $f0, $f4 -/* 0091C 80B955BC 00000000 */ nop -/* 00920 80B955C0 45000009 */ bc1f .L80B955E8 -/* 00924 80B955C4 00000000 */ nop -/* 00928 80B955C8 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0092C 80B955CC 240528AB */ addiu $a1, $zero, 0x28AB ## $a1 = 000028AB -/* 00930 80B955D0 0C2E54CD */ jal func_80B95334 -/* 00934 80B955D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00938 80B955D8 92180162 */ lbu $t8, 0x0162($s0) ## 00000162 -/* 0093C 80B955DC 3319FFF7 */ andi $t9, $t8, 0xFFF7 ## $t9 = 00000000 -/* 00940 80B955E0 10000007 */ beq $zero, $zero, .L80B95600 -/* 00944 80B955E4 A2190162 */ sb $t9, 0x0162($s0) ## 00000162 -.L80B955E8: -/* 00948 80B955E8 0C2E558E */ jal func_80B95638 -/* 0094C 80B955EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00950 80B955F0 0C2E5340 */ jal func_80B94D00 -/* 00954 80B955F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00958 80B955F8 0C00B5FB */ jal func_8002D7EC -/* 0095C 80B955FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80B95600: -/* 00960 80B95600 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 00964 80B95604 24080005 */ addiu $t0, $zero, 0x0005 ## $t0 = 00000005 -/* 00968 80B95608 AFA80014 */ sw $t0, 0x0014($sp) -/* 0096C 80B9560C 8FA4002C */ lw $a0, 0x002C($sp) -/* 00970 80B95610 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00974 80B95614 3C064198 */ lui $a2, 0x4198 ## $a2 = 41980000 -/* 00978 80B95618 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 -/* 0097C 80B9561C 0C00B92D */ jal func_8002E4B4 -/* 00980 80B95620 E7A60010 */ swc1 $f6, 0x0010($sp) -.L80B95624: -/* 00984 80B95624 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00988 80B95628 8FB00020 */ lw $s0, 0x0020($sp) -/* 0098C 80B9562C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00990 80B95630 03E00008 */ jr $ra -/* 00994 80B95634 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B95638.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B95638.s deleted file mode 100644 index 9418b0b8d3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B95638.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_80B95638 -/* 00998 80B95638 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0099C 80B9563C AFBF0014 */ sw $ra, 0x0014($sp) -/* 009A0 80B95640 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 009A4 80B95644 84840032 */ lh $a0, 0x0032($a0) ## 00000032 -/* 009A8 80B95648 0C01DE1C */ jal Math_Sins - ## sins? -/* 009AC 80B9564C AFA50018 */ sw $a1, 0x0018($sp) -/* 009B0 80B95650 8FA50018 */ lw $a1, 0x0018($sp) -/* 009B4 80B95654 C4A40068 */ lwc1 $f4, 0x0068($a1) ## 00000068 -/* 009B8 80B95658 84A40032 */ lh $a0, 0x0032($a1) ## 00000032 -/* 009BC 80B9565C 46040182 */ mul.s $f6, $f0, $f4 -/* 009C0 80B95660 0C01DE0D */ jal Math_Coss - ## coss? -/* 009C4 80B95664 E4A6005C */ swc1 $f6, 0x005C($a1) ## 0000005C -/* 009C8 80B95668 8FA50018 */ lw $a1, 0x0018($sp) -/* 009CC 80B9566C 3C0F80B9 */ lui $t7, %hi(func_80B9569C) ## $t7 = 80B90000 -/* 009D0 80B95670 240E00F0 */ addiu $t6, $zero, 0x00F0 ## $t6 = 000000F0 -/* 009D4 80B95674 C4A80068 */ lwc1 $f8, 0x0068($a1) ## 00000068 -/* 009D8 80B95678 25EF569C */ addiu $t7, $t7, %lo(func_80B9569C) ## $t7 = 80B9569C -/* 009DC 80B9567C A0AE00AE */ sb $t6, 0x00AE($a1) ## 000000AE -/* 009E0 80B95680 46080282 */ mul.s $f10, $f0, $f8 -/* 009E4 80B95684 ACAF014C */ sw $t7, 0x014C($a1) ## 0000014C -/* 009E8 80B95688 E4AA0064 */ swc1 $f10, 0x0064($a1) ## 00000064 -/* 009EC 80B9568C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 009F0 80B95690 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 009F4 80B95694 03E00008 */ jr $ra -/* 009F8 80B95698 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B9569C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B9569C.s deleted file mode 100644 index e0e26e392c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B9569C.s +++ /dev/null @@ -1,90 +0,0 @@ -glabel func_80B9569C -/* 009FC 80B9569C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00A00 80B956A0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00A04 80B956A4 AFB10020 */ sw $s1, 0x0020($sp) -/* 00A08 80B956A8 AFB0001C */ sw $s0, 0x001C($sp) -/* 00A0C 80B956AC 94820088 */ lhu $v0, 0x0088($a0) ## 00000088 -/* 00A10 80B956B0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00A14 80B956B4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00A18 80B956B8 304E000B */ andi $t6, $v0, 0x000B ## $t6 = 00000000 -/* 00A1C 80B956BC 15C00006 */ bne $t6, $zero, .L80B956D8 -/* 00A20 80B956C0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00A24 80B956C4 908F0160 */ lbu $t7, 0x0160($a0) ## 00000160 -/* 00A28 80B956C8 30590040 */ andi $t9, $v0, 0x0040 ## $t9 = 00000000 -/* 00A2C 80B956CC 31F80002 */ andi $t8, $t7, 0x0002 ## $t8 = 00000000 -/* 00A30 80B956D0 1300000F */ beq $t8, $zero, .L80B95710 -/* 00A34 80B956D4 00000000 */ nop -.L80B956D8: -/* 00A38 80B956D8 0C2E538E */ jal func_80B94E38 -/* 00A3C 80B956DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A40 80B956E0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00A44 80B956E4 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 00A48 80B956E8 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 00A4C 80B956EC 0C01AEB6 */ jal Audio_PlaySoundAtPosition - -/* 00A50 80B956F0 240728AA */ addiu $a3, $zero, 0x28AA ## $a3 = 000028AA -/* 00A54 80B956F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A58 80B956F8 0C2E5328 */ jal func_80B94CA0 -/* 00A5C 80B956FC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00A60 80B95700 0C00B55C */ jal Actor_Kill - -/* 00A64 80B95704 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A68 80B95708 1000002E */ beq $zero, $zero, .L80B957C4 -/* 00A6C 80B9570C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B95710: -/* 00A70 80B95710 1320000F */ beq $t9, $zero, .L80B95750 -/* 00A74 80B95714 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A78 80B95718 0C2E542E */ jal func_80B950B8 -/* 00A7C 80B9571C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00A80 80B95720 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00A84 80B95724 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 00A88 80B95728 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 00A8C 80B9572C 0C01AEB6 */ jal Audio_PlaySoundAtPosition - -/* 00A90 80B95730 240728AA */ addiu $a3, $zero, 0x28AA ## $a3 = 000028AA -/* 00A94 80B95734 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A98 80B95738 0C2E5328 */ jal func_80B94CA0 -/* 00A9C 80B9573C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00AA0 80B95740 0C00B55C */ jal Actor_Kill - -/* 00AA4 80B95744 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00AA8 80B95748 1000001E */ beq $zero, $zero, .L80B957C4 -/* 00AAC 80B9574C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B95750: -/* 00AB0 80B95750 0C2E5340 */ jal func_80B94D00 -/* 00AB4 80B95754 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00AB8 80B95758 0C00B5FB */ jal func_8002D7EC -/* 00ABC 80B9575C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00AC0 80B95760 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00AC4 80B95764 24080005 */ addiu $t0, $zero, 0x0005 ## $t0 = 00000005 -/* 00AC8 80B95768 AFA80014 */ sw $t0, 0x0014($sp) -/* 00ACC 80B9576C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00AD0 80B95770 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00AD4 80B95774 3C064198 */ lui $a2, 0x4198 ## $a2 = 41980000 -/* 00AD8 80B95778 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 -/* 00ADC 80B9577C 0C00B92D */ jal func_8002E4B4 -/* 00AE0 80B95780 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00AE4 80B95784 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 -/* 00AE8 80B95788 AFA5002C */ sw $a1, 0x002C($sp) -/* 00AEC 80B9578C 0C0189B7 */ jal Collider_CylinderUpdate - -/* 00AF0 80B95790 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00AF4 80B95794 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00AF8 80B95798 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 00AFC 80B9579C 02218021 */ addu $s0, $s1, $at -/* 00B00 80B957A0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00B04 80B957A4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00B08 80B957A8 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOT -/* 00B0C 80B957AC 8FA6002C */ lw $a2, 0x002C($sp) -/* 00B10 80B957B0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00B14 80B957B4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00B18 80B957B8 0C0175E7 */ jal CollisionCheck_SetAT - ## CollisionCheck_setAT -/* 00B1C 80B957BC 8FA6002C */ lw $a2, 0x002C($sp) -/* 00B20 80B957C0 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B957C4: -/* 00B24 80B957C4 8FB0001C */ lw $s0, 0x001C($sp) -/* 00B28 80B957C8 8FB10020 */ lw $s1, 0x0020($sp) -/* 00B2C 80B957CC 03E00008 */ jr $ra -/* 00B30 80B957D0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Destroy.s deleted file mode 100644 index 04140081ac..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Destroy.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel ObjSyokudai_Destroy -/* 001C0 80B9F470 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 001C4 80B9F474 AFA40018 */ sw $a0, 0x0018($sp) -/* 001C8 80B9F478 AFA5001C */ sw $a1, 0x001C($sp) -/* 001CC 80B9F47C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 001D0 80B9F480 8FA50018 */ lw $a1, 0x0018($sp) -/* 001D4 80B9F484 AFBF0014 */ sw $ra, 0x0014($sp) -/* 001D8 80B9F488 0C0170EB */ jal Collider_DestroyCylinder - -/* 001DC 80B9F48C 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 001E0 80B9F490 8FA50018 */ lw $a1, 0x0018($sp) -/* 001E4 80B9F494 8FA4001C */ lw $a0, 0x001C($sp) -/* 001E8 80B9F498 0C0170EB */ jal Collider_DestroyCylinder - -/* 001EC 80B9F49C 24A50198 */ addiu $a1, $a1, 0x0198 ## $a1 = 00000198 -/* 001F0 80B9F4A0 8FA4001C */ lw $a0, 0x001C($sp) -/* 001F4 80B9F4A4 8FAE0018 */ lw $t6, 0x0018($sp) -/* 001F8 80B9F4A8 248507A8 */ addiu $a1, $a0, 0x07A8 ## $a1 = 000007A8 -/* 001FC 80B9F4AC 0C01E9F1 */ jal LightContext_RemoveLight - -/* 00200 80B9F4B0 8DC601E8 */ lw $a2, 0x01E8($t6) ## 000001E8 -/* 00204 80B9F4B4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00208 80B9F4B8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0020C 80B9F4BC 03E00008 */ jr $ra -/* 00210 80B9F4C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Draw.s deleted file mode 100644 index f93da78e83..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Draw.s +++ /dev/null @@ -1,224 +0,0 @@ -.rdata -glabel D_80B9FE90 - .asciz "../z_obj_syokudai.c" - .balign 4 - -glabel D_80B9FEA4 - .asciz "../z_obj_syokudai.c" - .balign 4 - -glabel D_80B9FEB8 - .asciz "../z_obj_syokudai.c" - .balign 4 - -glabel D_80B9FECC - .asciz "../z_obj_syokudai.c" - .balign 4 - -.late_rodata -glabel D_80B9FEE0 - .float 0.0027 - -glabel D_80B9FEE4 - .float 9.58738019108e-05 - -.text -glabel ObjSyokudai_Draw -/* 00834 80B9FAE4 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 -/* 00838 80B9FAE8 AFBF0044 */ sw $ra, 0x0044($sp) -/* 0083C 80B9FAEC AFB20040 */ sw $s2, 0x0040($sp) -/* 00840 80B9FAF0 AFB1003C */ sw $s1, 0x003C($sp) -/* 00844 80B9FAF4 AFB00038 */ sw $s0, 0x0038($sp) -/* 00848 80B9FAF8 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 0084C 80B9FAFC 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 00850 80B9FB00 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 00854 80B9FB04 000E7983 */ sra $t7, $t6, 6 -/* 00858 80B9FB08 31F8000F */ andi $t8, $t7, 0x000F ## $t8 = 00000000 -/* 0085C 80B9FB0C 0018C880 */ sll $t9, $t8, 2 -/* 00860 80B9FB10 0338C823 */ subu $t9, $t9, $t8 -/* 00864 80B9FB14 0019C8C0 */ sll $t9, $t9, 3 -/* 00868 80B9FB18 0338C821 */ addu $t9, $t9, $t8 -/* 0086C 80B9FB1C 0019C840 */ sll $t9, $t9, 1 -/* 00870 80B9FB20 27280064 */ addiu $t0, $t9, 0x0064 ## $t0 = 00000064 -/* 00874 80B9FB24 AFA80084 */ sw $t0, 0x0084($sp) -/* 00878 80B9FB28 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 0087C 80B9FB2C 3C0680BA */ lui $a2, %hi(D_80B9FE90) ## $a2 = 80BA0000 -/* 00880 80B9FB30 24C6FE90 */ addiu $a2, $a2, %lo(D_80B9FE90) ## $a2 = 80B9FE90 -/* 00884 80B9FB34 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFE0 -/* 00888 80B9FB38 240702C3 */ addiu $a3, $zero, 0x02C3 ## $a3 = 000002C3 -/* 0088C 80B9FB3C 0C031AB1 */ jal Graph_OpenDisps -/* 00890 80B9FB40 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00894 80B9FB44 0C024F46 */ jal func_80093D18 -/* 00898 80B9FB48 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 0089C 80B9FB4C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 008A0 80B9FB50 3C0ADA38 */ lui $t2, 0xDA38 ## $t2 = DA380000 -/* 008A4 80B9FB54 354A0003 */ ori $t2, $t2, 0x0003 ## $t2 = DA380003 -/* 008A8 80B9FB58 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 008AC 80B9FB5C AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 -/* 008B0 80B9FB60 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 008B4 80B9FB64 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 008B8 80B9FB68 3C0580BA */ lui $a1, %hi(D_80B9FEA4) ## $a1 = 80BA0000 -/* 008BC 80B9FB6C 24A5FEA4 */ addiu $a1, $a1, %lo(D_80B9FEA4) ## $a1 = 80B9FEA4 -/* 008C0 80B9FB70 240602CA */ addiu $a2, $zero, 0x02CA ## $a2 = 000002CA -/* 008C4 80B9FB74 0C0346A2 */ jal Matrix_NewMtx -/* 008C8 80B9FB78 AFA2006C */ sw $v0, 0x006C($sp) -/* 008CC 80B9FB7C 8FA3006C */ lw $v1, 0x006C($sp) -/* 008D0 80B9FB80 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 -/* 008D4 80B9FB84 3C1880BA */ lui $t8, %hi(D_80B9FE7C) ## $t8 = 80BA0000 -/* 008D8 80B9FB88 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 008DC 80B9FB8C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 008E0 80B9FB90 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 008E4 80B9FB94 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 008E8 80B9FB98 AE0B02C0 */ sw $t3, 0x02C0($s0) ## 000002C0 -/* 008EC 80B9FB9C AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 008F0 80B9FBA0 962D001C */ lhu $t5, 0x001C($s1) ## 0000001C -/* 008F4 80B9FBA4 000D7303 */ sra $t6, $t5, 12 -/* 008F8 80B9FBA8 000E7880 */ sll $t7, $t6, 2 -/* 008FC 80B9FBAC 030FC021 */ addu $t8, $t8, $t7 -/* 00900 80B9FBB0 8F18FE7C */ lw $t8, %lo(D_80B9FE7C)($t8) -/* 00904 80B9FBB4 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 00908 80B9FBB8 862201E4 */ lh $v0, 0x01E4($s1) ## 000001E4 -/* 0090C 80B9FBBC 8FA30084 */ lw $v1, 0x0084($sp) -/* 00910 80B9FBC0 1040007F */ beq $v0, $zero, .L80B9FDC0 -/* 00914 80B9FBC4 00000000 */ nop -/* 00918 80B9FBC8 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 0091C 80B9FBCC 0062082A */ slt $at, $v1, $v0 -/* 00920 80B9FBD0 10200008 */ beq $at, $zero, .L80B9FBF4 -/* 00924 80B9FBD4 0062C823 */ subu $t9, $v1, $v0 -/* 00928 80B9FBD8 2728000A */ addiu $t0, $t9, 0x000A ## $t0 = 0000000A -/* 0092C 80B9FBDC 44882000 */ mtc1 $t0, $f4 ## $f4 = 0.00 -/* 00930 80B9FBE0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00934 80B9FBE4 44814000 */ mtc1 $at, $f8 ## $f8 = 10.00 -/* 00938 80B9FBE8 468021A0 */ cvt.s.w $f6, $f4 -/* 0093C 80B9FBEC 1000000A */ beq $zero, $zero, .L80B9FC18 -/* 00940 80B9FBF0 46083003 */ div.s $f0, $f6, $f8 -.L80B9FBF4: -/* 00944 80B9FBF4 18400008 */ blez $v0, .L80B9FC18 -/* 00948 80B9FBF8 28410014 */ slti $at, $v0, 0x0014 -/* 0094C 80B9FBFC 10200006 */ beq $at, $zero, .L80B9FC18 -/* 00950 80B9FC00 00000000 */ nop -/* 00954 80B9FC04 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 -/* 00958 80B9FC08 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 0095C 80B9FC0C 44819000 */ mtc1 $at, $f18 ## $f18 = 20.00 -/* 00960 80B9FC10 46805420 */ cvt.s.w $f16, $f10 -/* 00964 80B9FC14 46128003 */ div.s $f0, $f16, $f18 -.L80B9FC18: -/* 00968 80B9FC18 3C0180BA */ lui $at, %hi(D_80B9FEE0) ## $at = 80BA0000 -/* 0096C 80B9FC1C C424FEE0 */ lwc1 $f4, %lo(D_80B9FEE0)($at) -/* 00970 80B9FC20 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 00974 80B9FC24 46040002 */ mul.s $f0, $f0, $f4 -/* 00978 80B9FC28 0C024F61 */ jal func_80093D84 -/* 0097C 80B9FC2C E7A00064 */ swc1 $f0, 0x0064($sp) -/* 00980 80B9FC30 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00984 80B9FC34 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 -/* 00988 80B9FC38 354A0020 */ ori $t2, $t2, 0x0020 ## $t2 = DB060020 -/* 0098C 80B9FC3C 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 00990 80B9FC40 AE0902D0 */ sw $t1, 0x02D0($s0) ## 000002D0 -/* 00994 80B9FC44 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 00998 80B9FC48 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 0099C 80B9FC4C 240B0020 */ addiu $t3, $zero, 0x0020 ## $t3 = 00000020 -/* 009A0 80B9FC50 240C0040 */ addiu $t4, $zero, 0x0040 ## $t4 = 00000040 -/* 009A4 80B9FC54 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 009A8 80B9FC58 AFAD0018 */ sw $t5, 0x0018($sp) -/* 009AC 80B9FC5C AFAC0014 */ sw $t4, 0x0014($sp) -/* 009B0 80B9FC60 AFAB0010 */ sw $t3, 0x0010($sp) -/* 009B4 80B9FC64 AFA0001C */ sw $zero, 0x001C($sp) -/* 009B8 80B9FC68 922E01E6 */ lbu $t6, 0x01E6($s1) ## 000001E6 -/* 009BC 80B9FC6C 24190020 */ addiu $t9, $zero, 0x0020 ## $t9 = 00000020 -/* 009C0 80B9FC70 24080080 */ addiu $t0, $zero, 0x0080 ## $t0 = 00000080 -/* 009C4 80B9FC74 000E0823 */ subu $at, $zero, $t6 -/* 009C8 80B9FC78 00017880 */ sll $t7, $at, 2 -/* 009CC 80B9FC7C 01E17821 */ addu $t7, $t7, $at -/* 009D0 80B9FC80 000F7880 */ sll $t7, $t7, 2 -/* 009D4 80B9FC84 31F801FF */ andi $t8, $t7, 0x01FF ## $t8 = 00000000 -/* 009D8 80B9FC88 AFB80020 */ sw $t8, 0x0020($sp) -/* 009DC 80B9FC8C AFA80028 */ sw $t0, 0x0028($sp) -/* 009E0 80B9FC90 AFB90024 */ sw $t9, 0x0024($sp) -/* 009E4 80B9FC94 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 009E8 80B9FC98 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 009EC 80B9FC9C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 009F0 80B9FCA0 0C0253D0 */ jal Gfx_TwoTexScroll -/* 009F4 80B9FCA4 AFA20060 */ sw $v0, 0x0060($sp) -/* 009F8 80B9FCA8 8FA30060 */ lw $v1, 0x0060($sp) -/* 009FC 80B9FCAC 3C0AFA00 */ lui $t2, 0xFA00 ## $t2 = FA000000 -/* 00A00 80B9FCB0 3C0BFFFF */ lui $t3, 0xFFFF ## $t3 = FFFF0000 -/* 00A04 80B9FCB4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00A08 80B9FCB8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00A0C 80B9FCBC 356B00FF */ ori $t3, $t3, 0x00FF ## $t3 = FFFF00FF -/* 00A10 80B9FCC0 354A8080 */ ori $t2, $t2, 0x8080 ## $t2 = FA008080 -/* 00A14 80B9FCC4 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 00A18 80B9FCC8 AE0902D0 */ sw $t1, 0x02D0($s0) ## 000002D0 -/* 00A1C 80B9FCCC AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 00A20 80B9FCD0 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 00A24 80B9FCD4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00A28 80B9FCD8 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 00A2C 80B9FCDC 3C014250 */ lui $at, 0x4250 ## $at = 42500000 -/* 00A30 80B9FCE0 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 00A34 80B9FCE4 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 -/* 00A38 80B9FCE8 3C0DFB00 */ lui $t5, 0xFB00 ## $t5 = FB000000 -/* 00A3C 80B9FCEC 3C0EFF00 */ lui $t6, 0xFF00 ## $t6 = FF000000 -/* 00A40 80B9FCF0 44817000 */ mtc1 $at, $f14 ## $f14 = 52.00 -/* 00A44 80B9FCF4 44066000 */ mfc1 $a2, $f12 -/* 00A48 80B9FCF8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00A4C 80B9FCFC AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 00A50 80B9FD00 0C034261 */ jal Matrix_Translate -/* 00A54 80B9FD04 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 00A58 80B9FD08 864F07A0 */ lh $t7, 0x07A0($s2) ## 000007A0 -/* 00A5C 80B9FD0C 000FC080 */ sll $t8, $t7, 2 -/* 00A60 80B9FD10 0258C821 */ addu $t9, $s2, $t8 -/* 00A64 80B9FD14 0C016A7D */ jal func_8005A9F4 -/* 00A68 80B9FD18 8F240790 */ lw $a0, 0x0790($t9) ## 00000790 -/* 00A6C 80B9FD1C 862800B6 */ lh $t0, 0x00B6($s1) ## 000000B6 -/* 00A70 80B9FD20 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 00A74 80B9FD24 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00A78 80B9FD28 00484823 */ subu $t1, $v0, $t0 -/* 00A7C 80B9FD2C 01215021 */ addu $t2, $t1, $at -/* 00A80 80B9FD30 000A5C00 */ sll $t3, $t2, 16 -/* 00A84 80B9FD34 000B6403 */ sra $t4, $t3, 16 -/* 00A88 80B9FD38 448C3000 */ mtc1 $t4, $f6 ## $f6 = 0.00 -/* 00A8C 80B9FD3C 3C0180BA */ lui $at, %hi(D_80B9FEE4) ## $at = 80BA0000 -/* 00A90 80B9FD40 C42AFEE4 */ lwc1 $f10, %lo(D_80B9FEE4)($at) -/* 00A94 80B9FD44 46803220 */ cvt.s.w $f8, $f6 -/* 00A98 80B9FD48 460A4302 */ mul.s $f12, $f8, $f10 -/* 00A9C 80B9FD4C 0C034348 */ jal Matrix_RotateY -/* 00AA0 80B9FD50 00000000 */ nop -/* 00AA4 80B9FD54 C7AC0064 */ lwc1 $f12, 0x0064($sp) -/* 00AA8 80B9FD58 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00AAC 80B9FD5C 44066000 */ mfc1 $a2, $f12 -/* 00AB0 80B9FD60 0C0342A3 */ jal Matrix_Scale -/* 00AB4 80B9FD64 46006386 */ mov.s $f14, $f12 -/* 00AB8 80B9FD68 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00ABC 80B9FD6C 3C0EDA38 */ lui $t6, 0xDA38 ## $t6 = DA380000 -/* 00AC0 80B9FD70 35CE0003 */ ori $t6, $t6, 0x0003 ## $t6 = DA380003 -/* 00AC4 80B9FD74 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 00AC8 80B9FD78 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 00ACC 80B9FD7C AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 00AD0 80B9FD80 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 00AD4 80B9FD84 3C0580BA */ lui $a1, %hi(D_80B9FEB8) ## $a1 = 80BA0000 -/* 00AD8 80B9FD88 24A5FEB8 */ addiu $a1, $a1, %lo(D_80B9FEB8) ## $a1 = 80B9FEB8 -/* 00ADC 80B9FD8C 240602E9 */ addiu $a2, $zero, 0x02E9 ## $a2 = 000002E9 -/* 00AE0 80B9FD90 0C0346A2 */ jal Matrix_NewMtx -/* 00AE4 80B9FD94 AFA20054 */ sw $v0, 0x0054($sp) -/* 00AE8 80B9FD98 8FA30054 */ lw $v1, 0x0054($sp) -/* 00AEC 80B9FD9C 3C190405 */ lui $t9, 0x0405 ## $t9 = 04050000 -/* 00AF0 80B9FDA0 2739D4E0 */ addiu $t9, $t9, 0xD4E0 ## $t9 = 0404D4E0 -/* 00AF4 80B9FDA4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00AF8 80B9FDA8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00AFC 80B9FDAC 3C18DE00 */ lui $t8, 0xDE00 ## $t8 = DE000000 -/* 00B00 80B9FDB0 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 00B04 80B9FDB4 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 -/* 00B08 80B9FDB8 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 00B0C 80B9FDBC AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -.L80B9FDC0: -/* 00B10 80B9FDC0 3C0680BA */ lui $a2, %hi(D_80B9FECC) ## $a2 = 80BA0000 -/* 00B14 80B9FDC4 24C6FECC */ addiu $a2, $a2, %lo(D_80B9FECC) ## $a2 = 80B9FECC -/* 00B18 80B9FDC8 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFE0 -/* 00B1C 80B9FDCC 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 00B20 80B9FDD0 0C031AD5 */ jal Graph_CloseDisps -/* 00B24 80B9FDD4 240702ED */ addiu $a3, $zero, 0x02ED ## $a3 = 000002ED -/* 00B28 80B9FDD8 8FBF0044 */ lw $ra, 0x0044($sp) -/* 00B2C 80B9FDDC 8FB00038 */ lw $s0, 0x0038($sp) -/* 00B30 80B9FDE0 8FB1003C */ lw $s1, 0x003C($sp) -/* 00B34 80B9FDE4 8FB20040 */ lw $s2, 0x0040($sp) -/* 00B38 80B9FDE8 03E00008 */ jr $ra -/* 00B3C 80B9FDEC 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Init.s b/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Init.s deleted file mode 100644 index efb2472366..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Init.s +++ /dev/null @@ -1,126 +0,0 @@ -glabel ObjSyokudai_Init -/* 00000 80B9F2B0 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00004 80B9F2B4 AFBF002C */ sw $ra, 0x002C($sp) -/* 00008 80B9F2B8 AFB10028 */ sw $s1, 0x0028($sp) -/* 0000C 80B9F2BC AFB00024 */ sw $s0, 0x0024($sp) -/* 00010 80B9F2C0 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 00014 80B9F2C4 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00018 80B9F2C8 3C0580BA */ lui $a1, %hi(D_80B9FE68) ## $a1 = 80BA0000 -/* 0001C 80B9F2CC 31CFF000 */ andi $t7, $t6, 0xF000 ## $t7 = 00000000 -/* 00020 80B9F2D0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00024 80B9F2D4 AFAF0034 */ sw $t7, 0x0034($sp) -/* 00028 80B9F2D8 0C01E037 */ jal Actor_ProcessInitChain - -/* 0002C 80B9F2DC 24A5FE68 */ addiu $a1, $a1, %lo(D_80B9FE68) ## $a1 = 80B9FE68 -/* 00030 80B9F2E0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00034 80B9F2E4 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 00038 80B9F2E8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0003C 80B9F2EC 44050000 */ mfc1 $a1, $f0 -/* 00040 80B9F2F0 44070000 */ mfc1 $a3, $f0 -/* 00044 80B9F2F4 0C00AC78 */ jal ActorShape_Init - -/* 00048 80B9F2F8 00000000 */ nop -/* 0004C 80B9F2FC 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00050 80B9F300 AFA50030 */ sw $a1, 0x0030($sp) -/* 00054 80B9F304 0C0170D9 */ jal Collider_InitCylinder - -/* 00058 80B9F308 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0005C 80B9F30C 3C0780BA */ lui $a3, %hi(D_80B9FE10) ## $a3 = 80BA0000 -/* 00060 80B9F310 8FA50030 */ lw $a1, 0x0030($sp) -/* 00064 80B9F314 24E7FE10 */ addiu $a3, $a3, %lo(D_80B9FE10) ## $a3 = 80B9FE10 -/* 00068 80B9F318 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0006C 80B9F31C 0C01712B */ jal Collider_SetCylinder - -/* 00070 80B9F320 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00074 80B9F324 8618001C */ lh $t8, 0x001C($s0) ## 0000001C -/* 00078 80B9F328 3C0880BA */ lui $t0, %hi(D_80B9FE78) ## $t0 = 80BA0000 -/* 0007C 80B9F32C 26050198 */ addiu $a1, $s0, 0x0198 ## $a1 = 00000198 -/* 00080 80B9F330 0018CB03 */ sra $t9, $t8, 12 -/* 00084 80B9F334 01194021 */ addu $t0, $t0, $t9 -/* 00088 80B9F338 9108FE78 */ lbu $t0, %lo(D_80B9FE78)($t0) -/* 0008C 80B9F33C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00090 80B9F340 A2080160 */ sb $t0, 0x0160($s0) ## 00000160 -/* 00094 80B9F344 0C0170D9 */ jal Collider_InitCylinder - -/* 00098 80B9F348 AFA50030 */ sw $a1, 0x0030($sp) -/* 0009C 80B9F34C 3C0780BA */ lui $a3, %hi(D_80B9FE3C) ## $a3 = 80BA0000 -/* 000A0 80B9F350 8FA50030 */ lw $a1, 0x0030($sp) -/* 000A4 80B9F354 24E7FE3C */ addiu $a3, $a3, %lo(D_80B9FE3C) ## $a3 = 80B9FE3C -/* 000A8 80B9F358 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000AC 80B9F35C 0C01712B */ jal Collider_SetCylinder - -/* 000B0 80B9F360 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 000B4 80B9F364 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 000B8 80B9F368 3C01428C */ lui $at, 0x428C ## $at = 428C0000 -/* 000BC 80B9F36C 44815000 */ mtc1 $at, $f10 ## $f10 = 70.00 -/* 000C0 80B9F370 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 000C4 80B9F374 4600218D */ trunc.w.s $f6, $f4 -/* 000C8 80B9F378 C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C -/* 000CC 80B9F37C 240900FF */ addiu $t1, $zero, 0x00FF ## $t1 = 000000FF -/* 000D0 80B9F380 460A4400 */ add.s $f16, $f8, $f10 -/* 000D4 80B9F384 44053000 */ mfc1 $a1, $f6 -/* 000D8 80B9F388 A20900AE */ sb $t1, 0x00AE($s0) ## 000000AE -/* 000DC 80B9F38C 4600218D */ trunc.w.s $f6, $f4 -/* 000E0 80B9F390 260401EC */ addiu $a0, $s0, 0x01EC ## $a0 = 000001EC -/* 000E4 80B9F394 240D00FF */ addiu $t5, $zero, 0x00FF ## $t5 = 000000FF -/* 000E8 80B9F398 4600848D */ trunc.w.s $f18, $f16 -/* 000EC 80B9F39C 44073000 */ mfc1 $a3, $f6 -/* 000F0 80B9F3A0 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 000F4 80B9F3A4 240F00B4 */ addiu $t7, $zero, 0x00B4 ## $t7 = 000000B4 -/* 000F8 80B9F3A8 44069000 */ mfc1 $a2, $f18 -/* 000FC 80B9F3AC 2418FFFF */ addiu $t8, $zero, 0xFFFF ## $t8 = FFFFFFFF -/* 00100 80B9F3B0 00052C00 */ sll $a1, $a1, 16 -/* 00104 80B9F3B4 00073C00 */ sll $a3, $a3, 16 -/* 00108 80B9F3B8 00063400 */ sll $a2, $a2, 16 -/* 0010C 80B9F3BC 00063403 */ sra $a2, $a2, 16 -/* 00110 80B9F3C0 00073C03 */ sra $a3, $a3, 16 -/* 00114 80B9F3C4 00052C03 */ sra $a1, $a1, 16 -/* 00118 80B9F3C8 AFB8001C */ sw $t8, 0x001C($sp) -/* 0011C 80B9F3CC AFAF0018 */ sw $t7, 0x0018($sp) -/* 00120 80B9F3D0 AFAE0014 */ sw $t6, 0x0014($sp) -/* 00124 80B9F3D4 AFAD0010 */ sw $t5, 0x0010($sp) -/* 00128 80B9F3D8 0C01E77C */ jal Lights_PointGlowSetInfo - -/* 0012C 80B9F3DC AFA40030 */ sw $a0, 0x0030($sp) -/* 00130 80B9F3E0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00134 80B9F3E4 262507A8 */ addiu $a1, $s1, 0x07A8 ## $a1 = 000007A8 -/* 00138 80B9F3E8 0C01E9D9 */ jal LightContext_InsertLight - -/* 0013C 80B9F3EC 8FA60030 */ lw $a2, 0x0030($sp) -/* 00140 80B9F3F0 8603001C */ lh $v1, 0x001C($s0) ## 0000001C -/* 00144 80B9F3F4 AE0201E8 */ sw $v0, 0x01E8($s0) ## 000001E8 -/* 00148 80B9F3F8 8FA80034 */ lw $t0, 0x0034($sp) -/* 0014C 80B9F3FC 30790400 */ andi $t9, $v1, 0x0400 ## $t9 = 00000000 -/* 00150 80B9F400 17200006 */ bne $t9, $zero, .L80B9F41C -/* 00154 80B9F404 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00158 80B9F408 11010006 */ beq $t0, $at, .L80B9F424 -/* 0015C 80B9F40C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00160 80B9F410 0C00B2D0 */ jal Flags_GetSwitch - -/* 00164 80B9F414 3065003F */ andi $a1, $v1, 0x003F ## $a1 = 00000000 -/* 00168 80B9F418 10400002 */ beq $v0, $zero, .L80B9F424 -.L80B9F41C: -/* 0016C 80B9F41C 2409FFFF */ addiu $t1, $zero, 0xFFFF ## $t1 = FFFFFFFF -/* 00170 80B9F420 A60901E4 */ sh $t1, 0x01E4($s0) ## 000001E4 -.L80B9F424: -/* 00174 80B9F424 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00178 80B9F428 00000000 */ nop -/* 0017C 80B9F42C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00180 80B9F430 44814000 */ mtc1 $at, $f8 ## $f8 = 20.00 -/* 00184 80B9F434 3C0180BA */ lui $at, %hi(D_80B9FF90) ## $at = 80BA0000 -/* 00188 80B9F438 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0018C 80B9F43C 46080282 */ mul.s $f10, $f0, $f8 -/* 00190 80B9F440 3C054270 */ lui $a1, 0x4270 ## $a1 = 42700000 -/* 00194 80B9F444 4600540D */ trunc.w.s $f16, $f10 -/* 00198 80B9F448 440B8000 */ mfc1 $t3, $f16 -/* 0019C 80B9F44C 00000000 */ nop -/* 001A0 80B9F450 A20B01E6 */ sb $t3, 0x01E6($s0) ## 000001E6 -/* 001A4 80B9F454 0C00B56E */ jal Actor_SetHeight - -/* 001A8 80B9F458 AC20FF90 */ sw $zero, %lo(D_80B9FF90)($at) -/* 001AC 80B9F45C 8FBF002C */ lw $ra, 0x002C($sp) -/* 001B0 80B9F460 8FB00024 */ lw $s0, 0x0024($sp) -/* 001B4 80B9F464 8FB10028 */ lw $s1, 0x0028($sp) -/* 001B8 80B9F468 03E00008 */ jr $ra -/* 001BC 80B9F46C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Update.s b/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Update.s deleted file mode 100644 index c4ffa2a9e3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Update.s +++ /dev/null @@ -1,438 +0,0 @@ -glabel ObjSyokudai_Update -/* 00214 80B9F4C4 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 -/* 00218 80B9F4C8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0021C 80B9F4CC AFB00020 */ sw $s0, 0x0020($sp) -/* 00220 80B9F4D0 AFA50084 */ sw $a1, 0x0084($sp) -/* 00224 80B9F4D4 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 00228 80B9F4D8 2418FFFF */ addiu $t8, $zero, 0xFFFF ## $t8 = FFFFFFFF -/* 0022C 80B9F4DC 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 00230 80B9F4E0 00024983 */ sra $t1, $v0, 6 -/* 00234 80B9F4E4 3129000F */ andi $t1, $t1, 0x000F ## $t1 = 00000000 -/* 00238 80B9F4E8 304E003F */ andi $t6, $v0, 0x003F ## $t6 = 00000000 -/* 0023C 80B9F4EC 304FF000 */ andi $t7, $v0, 0xF000 ## $t7 = 00000000 -/* 00240 80B9F4F0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00244 80B9F4F4 AFAE0070 */ sw $t6, 0x0070($sp) -/* 00248 80B9F4F8 AFAF006C */ sw $t7, 0x006C($sp) -/* 0024C 80B9F4FC AFB8005C */ sw $t8, 0x005C($sp) -/* 00250 80B9F500 A3A0005B */ sb $zero, 0x005B($sp) -/* 00254 80B9F504 15210002 */ bne $t1, $at, .L80B9F510 -/* 00258 80B9F508 AFA90068 */ sw $t1, 0x0068($sp) -/* 0025C 80B9F50C 24090018 */ addiu $t1, $zero, 0x0018 ## $t1 = 00000018 -.L80B9F510: -/* 00260 80B9F510 8FA40084 */ lw $a0, 0x0084($sp) -/* 00264 80B9F514 8E060024 */ lw $a2, 0x0024($s0) ## 00000024 -/* 00268 80B9F518 8E07002C */ lw $a3, 0x002C($s0) ## 0000002C -/* 0026C 80B9F51C 27AA0060 */ addiu $t2, $sp, 0x0060 ## $t2 = FFFFFFE0 -/* 00270 80B9F520 27AB0064 */ addiu $t3, $sp, 0x0064 ## $t3 = FFFFFFE4 -/* 00274 80B9F524 AFAB0014 */ sw $t3, 0x0014($sp) -/* 00278 80B9F528 AFAA0010 */ sw $t2, 0x0010($sp) -/* 0027C 80B9F52C AFA90074 */ sw $t1, 0x0074($sp) -/* 00280 80B9F530 0C010891 */ jal func_80042244 -/* 00284 80B9F534 248507C0 */ addiu $a1, $a0, 0x07C0 ## $a1 = 000007C0 -/* 00288 80B9F538 10400018 */ beq $v0, $zero, .L80B9F59C -/* 0028C 80B9F53C 8FA90074 */ lw $t1, 0x0074($sp) -/* 00290 80B9F540 C7A60060 */ lwc1 $f6, 0x0060($sp) -/* 00294 80B9F544 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 00298 80B9F548 3C014250 */ lui $at, 0x4250 ## $at = 42500000 -/* 0029C 80B9F54C 44812000 */ mtc1 $at, $f4 ## $f4 = 52.00 -/* 002A0 80B9F550 46083281 */ sub.s $f10, $f6, $f8 -/* 002A4 80B9F554 460A203C */ c.lt.s $f4, $f10 -/* 002A8 80B9F558 00000000 */ nop -/* 002AC 80B9F55C 45020010 */ bc1fl .L80B9F5A0 -/* 002B0 80B9F560 860F001C */ lh $t7, 0x001C($s0) ## 0000001C -/* 002B4 80B9F564 A60001E4 */ sh $zero, 0x01E4($s0) ## 000001E4 -/* 002B8 80B9F568 8FAC006C */ lw $t4, 0x006C($sp) -/* 002BC 80B9F56C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 002C0 80B9F570 8FA50070 */ lw $a1, 0x0070($sp) -/* 002C4 80B9F574 158100E6 */ bne $t4, $at, .L80B9F910 -/* 002C8 80B9F578 8FA40084 */ lw $a0, 0x0084($sp) -/* 002CC 80B9F57C 0C00B2ED */ jal Flags_UnsetSwitch - -/* 002D0 80B9F580 AFA90074 */ sw $t1, 0x0074($sp) -/* 002D4 80B9F584 8FA90074 */ lw $t1, 0x0074($sp) -/* 002D8 80B9F588 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 002DC 80B9F58C 512000E1 */ beql $t1, $zero, .L80B9F914 -/* 002E0 80B9F590 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 002E4 80B9F594 100000DE */ beq $zero, $zero, .L80B9F910 -/* 002E8 80B9F598 A60D01E4 */ sh $t5, 0x01E4($s0) ## 000001E4 -.L80B9F59C: -/* 002EC 80B9F59C 860F001C */ lh $t7, 0x001C($s0) ## 0000001C -.L80B9F5A0: -/* 002F0 80B9F5A0 8FAE0084 */ lw $t6, 0x0084($sp) -/* 002F4 80B9F5A4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 002F8 80B9F5A8 31F80400 */ andi $t8, $t7, 0x0400 ## $t8 = 00000000 -/* 002FC 80B9F5AC 13000003 */ beq $t8, $zero, .L80B9F5BC -/* 00300 80B9F5B0 8DC81C44 */ lw $t0, 0x1C44($t6) ## 00001C44 -/* 00304 80B9F5B4 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF -/* 00308 80B9F5B8 A61901E4 */ sh $t9, 0x01E4($s0) ## 000001E4 -.L80B9F5BC: -/* 0030C 80B9F5BC 11200025 */ beq $t1, $zero, .L80B9F654 -/* 00310 80B9F5C0 8FA40084 */ lw $a0, 0x0084($sp) -/* 00314 80B9F5C4 8FA50070 */ lw $a1, 0x0070($sp) -/* 00318 80B9F5C8 AFA7004C */ sw $a3, 0x004C($sp) -/* 0031C 80B9F5CC AFA80054 */ sw $t0, 0x0054($sp) -/* 00320 80B9F5D0 0C00B2D0 */ jal Flags_GetSwitch - -/* 00324 80B9F5D4 AFA90074 */ sw $t1, 0x0074($sp) -/* 00328 80B9F5D8 8FA7004C */ lw $a3, 0x004C($sp) -/* 0032C 80B9F5DC 8FA80054 */ lw $t0, 0x0054($sp) -/* 00330 80B9F5E0 10400017 */ beq $v0, $zero, .L80B9F640 -/* 00334 80B9F5E4 8FA90074 */ lw $t1, 0x0074($sp) -/* 00338 80B9F5E8 860301E4 */ lh $v1, 0x01E4($s0) ## 000001E4 -/* 0033C 80B9F5EC 240AFFFF */ addiu $t2, $zero, 0xFFFF ## $t2 = FFFFFFFF -/* 00340 80B9F5F0 1460000F */ bne $v1, $zero, .L80B9F630 -/* 00344 80B9F5F4 00000000 */ nop -/* 00348 80B9F5F8 A60A01E4 */ sh $t2, 0x01E4($s0) ## 000001E4 -/* 0034C 80B9F5FC 8FAB006C */ lw $t3, 0x006C($sp) -/* 00350 80B9F600 8FA40084 */ lw $a0, 0x0084($sp) -/* 00354 80B9F604 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00358 80B9F608 55600013 */ bnel $t3, $zero, .L80B9F658 -/* 0035C 80B9F60C 920F01A9 */ lbu $t7, 0x01A9($s0) ## 000001A9 -/* 00360 80B9F610 AFA7004C */ sw $a3, 0x004C($sp) -/* 00364 80B9F614 AFA80054 */ sw $t0, 0x0054($sp) -/* 00368 80B9F618 0C020120 */ jal func_80080480 -/* 0036C 80B9F61C AFA90074 */ sw $t1, 0x0074($sp) -/* 00370 80B9F620 8FA7004C */ lw $a3, 0x004C($sp) -/* 00374 80B9F624 8FA80054 */ lw $t0, 0x0054($sp) -/* 00378 80B9F628 1000000A */ beq $zero, $zero, .L80B9F654 -/* 0037C 80B9F62C 8FA90074 */ lw $t1, 0x0074($sp) -.L80B9F630: -/* 00380 80B9F630 18600008 */ blez $v1, .L80B9F654 -/* 00384 80B9F634 240CFFFF */ addiu $t4, $zero, 0xFFFF ## $t4 = FFFFFFFF -/* 00388 80B9F638 10000006 */ beq $zero, $zero, .L80B9F654 -/* 0038C 80B9F63C A60C01E4 */ sh $t4, 0x01E4($s0) ## 000001E4 -.L80B9F640: -/* 00390 80B9F640 860D01E4 */ lh $t5, 0x01E4($s0) ## 000001E4 -/* 00394 80B9F644 240E0014 */ addiu $t6, $zero, 0x0014 ## $t6 = 00000014 -/* 00398 80B9F648 05A30003 */ bgezl $t5, .L80B9F658 -/* 0039C 80B9F64C 920F01A9 */ lbu $t7, 0x01A9($s0) ## 000001A9 -/* 003A0 80B9F650 A60E01E4 */ sh $t6, 0x01E4($s0) ## 000001E4 -.L80B9F654: -/* 003A4 80B9F654 920F01A9 */ lbu $t7, 0x01A9($s0) ## 000001A9 -.L80B9F658: -/* 003A8 80B9F658 31F80002 */ andi $t8, $t7, 0x0002 ## $t8 = 00000000 -/* 003AC 80B9F65C 5300000C */ beql $t8, $zero, .L80B9F690 -/* 003B0 80B9F660 810B0151 */ lb $t3, 0x0151($t0) ## 00000151 -/* 003B4 80B9F664 8E1901D4 */ lw $t9, 0x01D4($s0) ## 000001D4 -/* 003B8 80B9F668 3C010002 */ lui $at, 0x0002 ## $at = 00020000 -/* 003BC 80B9F66C 34210820 */ ori $at, $at, 0x0820 ## $at = 00020820 -/* 003C0 80B9F670 8F220000 */ lw $v0, 0x0000($t9) ## 00000000 -/* 003C4 80B9F674 00415024 */ and $t2, $v0, $at -/* 003C8 80B9F678 11400002 */ beq $t2, $zero, .L80B9F684 -/* 003CC 80B9F67C 00000000 */ nop -/* 003D0 80B9F680 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -.L80B9F684: -/* 003D4 80B9F684 10000021 */ beq $zero, $zero, .L80B9F70C -/* 003D8 80B9F688 AFA20048 */ sw $v0, 0x0048($sp) -/* 003DC 80B9F68C 810B0151 */ lb $t3, 0x0151($t0) ## 00000151 -.L80B9F690: -/* 003E0 80B9F690 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 003E4 80B9F694 250408B8 */ addiu $a0, $t0, 0x08B8 ## $a0 = 000008B8 -/* 003E8 80B9F698 1561001C */ bne $t3, $at, .L80B9F70C -/* 003EC 80B9F69C 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 003F0 80B9F6A0 27A6003C */ addiu $a2, $sp, 0x003C ## $a2 = FFFFFFBC -/* 003F4 80B9F6A4 AFA7004C */ sw $a3, 0x004C($sp) -/* 003F8 80B9F6A8 AFA80054 */ sw $t0, 0x0054($sp) -/* 003FC 80B9F6AC 0C01DFB4 */ jal Math_Vec3f_Diff - ## Vec3f_Sub -/* 00400 80B9F6B0 AFA90074 */ sw $t1, 0x0074($sp) -/* 00404 80B9F6B4 3C014286 */ lui $at, 0x4286 ## $at = 42860000 -/* 00408 80B9F6B8 C7A00040 */ lwc1 $f0, 0x0040($sp) -/* 0040C 80B9F6BC 44818000 */ mtc1 $at, $f16 ## $f16 = 67.00 -/* 00410 80B9F6C0 C7A2003C */ lwc1 $f2, 0x003C($sp) -/* 00414 80B9F6C4 C7AC0044 */ lwc1 $f12, 0x0044($sp) -/* 00418 80B9F6C8 46100001 */ sub.s $f0, $f0, $f16 -/* 0041C 80B9F6CC 46021482 */ mul.s $f18, $f2, $f2 -/* 00420 80B9F6D0 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 -/* 00424 80B9F6D4 44818000 */ mtc1 $at, $f16 ## $f16 = 400.00 -/* 00428 80B9F6D8 46000182 */ mul.s $f6, $f0, $f0 -/* 0042C 80B9F6DC 8FA7004C */ lw $a3, 0x004C($sp) -/* 00430 80B9F6E0 8FA80054 */ lw $t0, 0x0054($sp) -/* 00434 80B9F6E4 460C6102 */ mul.s $f4, $f12, $f12 -/* 00438 80B9F6E8 8FA90074 */ lw $t1, 0x0074($sp) -/* 0043C 80B9F6EC E7A00040 */ swc1 $f0, 0x0040($sp) -/* 00440 80B9F6F0 46069200 */ add.s $f8, $f18, $f6 -/* 00444 80B9F6F4 46044280 */ add.s $f10, $f8, $f4 -/* 00448 80B9F6F8 4610503C */ c.lt.s $f10, $f16 -/* 0044C 80B9F6FC 00000000 */ nop -/* 00450 80B9F700 45000002 */ bc1f .L80B9F70C -/* 00454 80B9F704 00000000 */ nop -/* 00458 80B9F708 2407FFFF */ addiu $a3, $zero, 0xFFFF ## $a3 = FFFFFFFF -.L80B9F70C: -/* 0045C 80B9F70C 10E00080 */ beq $a3, $zero, .L80B9F910 -/* 00460 80B9F710 8FA20048 */ lw $v0, 0x0048($sp) -/* 00464 80B9F714 860301E4 */ lh $v1, 0x01E4($s0) ## 000001E4 -/* 00468 80B9F718 8FAC006C */ lw $t4, 0x006C($sp) -/* 0046C 80B9F71C 10600037 */ beq $v1, $zero, .L80B9F7FC -/* 00470 80B9F720 00000000 */ nop -/* 00474 80B9F724 04E10017 */ bgez $a3, .L80B9F784 -/* 00478 80B9F728 304F0020 */ andi $t7, $v0, 0x0020 ## $t7 = 00000000 -/* 0047C 80B9F72C 85020860 */ lh $v0, 0x0860($t0) ## 00000860 -/* 00480 80B9F730 3C078013 */ lui $a3, %hi(D_801333E0) -/* 00484 80B9F734 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 00488 80B9F738 1440000D */ bne $v0, $zero, .L80B9F770 -/* 0048C 80B9F73C 284100C8 */ slti $at, $v0, 0x00C8 -/* 00490 80B9F740 240C00D2 */ addiu $t4, $zero, 0x00D2 ## $t4 = 000000D2 -/* 00494 80B9F744 3C0D8013 */ lui $t5, %hi(D_801333E8) -/* 00498 80B9F748 A50C0860 */ sh $t4, 0x0860($t0) ## 00000860 -/* 0049C 80B9F74C 25AD33E8 */ addiu $t5, %lo(D_801333E8) -/* 004A0 80B9F750 AFAD0014 */ sw $t5, 0x0014($sp) -/* 004A4 80B9F754 AFA70010 */ sw $a3, 0x0010($sp) -/* 004A8 80B9F758 24042822 */ addiu $a0, $zero, 0x2822 ## $a0 = 00002822 -/* 004AC 80B9F75C 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 -/* 004B0 80B9F760 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 004B4 80B9F764 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 004B8 80B9F768 10000014 */ beq $zero, $zero, .L80B9F7BC -/* 004BC 80B9F76C 860301E4 */ lh $v1, 0x01E4($s0) ## 000001E4 -.L80B9F770: -/* 004C0 80B9F770 10200012 */ beq $at, $zero, .L80B9F7BC -/* 004C4 80B9F774 240E00C8 */ addiu $t6, $zero, 0x00C8 ## $t6 = 000000C8 -/* 004C8 80B9F778 A50E0860 */ sh $t6, 0x0860($t0) ## 00000860 -/* 004CC 80B9F77C 1000000F */ beq $zero, $zero, .L80B9F7BC -/* 004D0 80B9F780 860301E4 */ lh $v1, 0x01E4($s0) ## 000001E4 -.L80B9F784: -/* 004D4 80B9F784 11E0000D */ beq $t7, $zero, .L80B9F7BC -/* 004D8 80B9F788 00000000 */ nop -/* 004DC 80B9F78C 8E0201A0 */ lw $v0, 0x01A0($s0) ## 000001A0 -/* 004E0 80B9F790 8C580130 */ lw $t8, 0x0130($v0) ## 00000130 -/* 004E4 80B9F794 13000009 */ beq $t8, $zero, .L80B9F7BC -/* 004E8 80B9F798 00000000 */ nop -/* 004EC 80B9F79C 84590000 */ lh $t9, 0x0000($v0) ## 00000000 -/* 004F0 80B9F7A0 24010016 */ addiu $at, $zero, 0x0016 ## $at = 00000016 -/* 004F4 80B9F7A4 240A0800 */ addiu $t2, $zero, 0x0800 ## $t2 = 00000800 -/* 004F8 80B9F7A8 17210004 */ bne $t9, $at, .L80B9F7BC -/* 004FC 80B9F7AC 00000000 */ nop -/* 00500 80B9F7B0 A440001C */ sh $zero, 0x001C($v0) ## 0000001C -/* 00504 80B9F7B4 AC4A01A8 */ sw $t2, 0x01A8($v0) ## 000001A8 -/* 00508 80B9F7B8 860301E4 */ lh $v1, 0x01E4($s0) ## 000001E4 -.L80B9F7BC: -/* 0050C 80B9F7BC 04600054 */ bltz $v1, .L80B9F910 -/* 00510 80B9F7C0 8FA20068 */ lw $v0, 0x0068($sp) -/* 00514 80B9F7C4 00400821 */ addu $at, $v0, $zero -/* 00518 80B9F7C8 00021080 */ sll $v0, $v0, 2 -/* 0051C 80B9F7CC 00411023 */ subu $v0, $v0, $at -/* 00520 80B9F7D0 000210C0 */ sll $v0, $v0, 3 -/* 00524 80B9F7D4 00411021 */ addu $v0, $v0, $at -/* 00528 80B9F7D8 00021040 */ sll $v0, $v0, 1 -/* 0052C 80B9F7DC 24420064 */ addiu $v0, $v0, 0x0064 ## $v0 = 00000064 -/* 00530 80B9F7E0 0062082A */ slt $at, $v1, $v0 -/* 00534 80B9F7E4 1020004A */ beq $at, $zero, .L80B9F910 -/* 00538 80B9F7E8 8FAB006C */ lw $t3, 0x006C($sp) -/* 0053C 80B9F7EC 51600049 */ beql $t3, $zero, .L80B9F914 -/* 00540 80B9F7F0 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00544 80B9F7F4 10000046 */ beq $zero, $zero, .L80B9F910 -/* 00548 80B9F7F8 A60201E4 */ sh $v0, 0x01E4($s0) ## 000001E4 -.L80B9F7FC: -/* 0054C 80B9F7FC 51800045 */ beql $t4, $zero, .L80B9F914 -/* 00550 80B9F800 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00554 80B9F804 18E00005 */ blez $a3, .L80B9F81C -/* 00558 80B9F808 3C010002 */ lui $at, 0x0002 ## $at = 00020000 -/* 0055C 80B9F80C 34210800 */ ori $at, $at, 0x0800 ## $at = 00020800 -/* 00560 80B9F810 00416824 */ and $t5, $v0, $at -/* 00564 80B9F814 15A00006 */ bne $t5, $zero, .L80B9F830 -/* 00568 80B9F818 00000000 */ nop -.L80B9F81C: -/* 0056C 80B9F81C 04E3003D */ bgezl $a3, .L80B9F914 -/* 00570 80B9F820 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00574 80B9F824 850E0860 */ lh $t6, 0x0860($t0) ## 00000860 -/* 00578 80B9F828 51C0003A */ beql $t6, $zero, .L80B9F914 -/* 0057C 80B9F82C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -.L80B9F830: -/* 00580 80B9F830 04E10007 */ bgez $a3, .L80B9F850 -/* 00584 80B9F834 3C0B80BA */ lui $t3, %hi(D_80B9FF90) ## $t3 = 80BA0000 -/* 00588 80B9F838 850F0860 */ lh $t7, 0x0860($t0) ## 00000860 -/* 0058C 80B9F83C 241800C8 */ addiu $t8, $zero, 0x00C8 ## $t8 = 000000C8 -/* 00590 80B9F840 29E100C8 */ slti $at, $t7, 0x00C8 -/* 00594 80B9F844 10200002 */ beq $at, $zero, .L80B9F850 -/* 00598 80B9F848 00000000 */ nop -/* 0059C 80B9F84C A5180860 */ sh $t8, 0x0860($t0) ## 00000860 -.L80B9F850: -/* 005A0 80B9F850 1520000E */ bne $t1, $zero, .L80B9F88C -/* 005A4 80B9F854 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF -/* 005A8 80B9F858 A61901E4 */ sh $t9, 0x01E4($s0) ## 000001E4 -/* 005AC 80B9F85C 8FAA006C */ lw $t2, 0x006C($sp) -/* 005B0 80B9F860 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 005B4 80B9F864 8FA40084 */ lw $a0, 0x0084($sp) -/* 005B8 80B9F868 1141001F */ beq $t2, $at, .L80B9F8E8 -/* 005BC 80B9F86C 00000000 */ nop -/* 005C0 80B9F870 0C00B2DD */ jal Flags_SetSwitch - -/* 005C4 80B9F874 8FA50070 */ lw $a1, 0x0070($sp) -/* 005C8 80B9F878 8FA40084 */ lw $a0, 0x0084($sp) -/* 005CC 80B9F87C 0C020120 */ jal func_80080480 -/* 005D0 80B9F880 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 005D4 80B9F884 10000018 */ beq $zero, $zero, .L80B9F8E8 -/* 005D8 80B9F888 00000000 */ nop -.L80B9F88C: -/* 005DC 80B9F88C 8D6BFF90 */ lw $t3, %lo(D_80B9FF90)($t3) -/* 005E0 80B9F890 3C0180BA */ lui $at, %hi(D_80B9FF90) ## $at = 80BA0000 -/* 005E4 80B9F894 8FAE0068 */ lw $t6, 0x0068($sp) -/* 005E8 80B9F898 256C0001 */ addiu $t4, $t3, 0x0001 ## $t4 = 00000001 -/* 005EC 80B9F89C AC2CFF90 */ sw $t4, %lo(D_80B9FF90)($at) -/* 005F0 80B9F8A0 0189082A */ slt $at, $t4, $t1 -/* 005F4 80B9F8A4 1420000A */ bne $at, $zero, .L80B9F8D0 -/* 005F8 80B9F8A8 000E7880 */ sll $t7, $t6, 2 -/* 005FC 80B9F8AC 8FA40084 */ lw $a0, 0x0084($sp) -/* 00600 80B9F8B0 0C00B2DD */ jal Flags_SetSwitch - -/* 00604 80B9F8B4 8FA50070 */ lw $a1, 0x0070($sp) -/* 00608 80B9F8B8 8FA40084 */ lw $a0, 0x0084($sp) -/* 0060C 80B9F8BC 0C020120 */ jal func_80080480 -/* 00610 80B9F8C0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00614 80B9F8C4 240DFFFF */ addiu $t5, $zero, 0xFFFF ## $t5 = FFFFFFFF -/* 00618 80B9F8C8 10000007 */ beq $zero, $zero, .L80B9F8E8 -/* 0061C 80B9F8CC A60D01E4 */ sh $t5, 0x01E4($s0) ## 000001E4 -.L80B9F8D0: -/* 00620 80B9F8D0 01EE7823 */ subu $t7, $t7, $t6 -/* 00624 80B9F8D4 000F78C0 */ sll $t7, $t7, 3 -/* 00628 80B9F8D8 01EE7821 */ addu $t7, $t7, $t6 -/* 0062C 80B9F8DC 000F7840 */ sll $t7, $t7, 1 -/* 00630 80B9F8E0 25F8006E */ addiu $t8, $t7, 0x006E ## $t8 = 0000006E -/* 00634 80B9F8E4 A61801E4 */ sh $t8, 0x01E4($s0) ## 000001E4 -.L80B9F8E8: -/* 00638 80B9F8E8 3C078013 */ lui $a3, %hi(D_801333E0) -/* 0063C 80B9F8EC 3C198013 */ lui $t9, %hi(D_801333E8) -/* 00640 80B9F8F0 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 00644 80B9F8F4 273933E8 */ addiu $t9, %lo(D_801333E8) -/* 00648 80B9F8F8 AFB90014 */ sw $t9, 0x0014($sp) -/* 0064C 80B9F8FC AFA70010 */ sw $a3, 0x0010($sp) -/* 00650 80B9F900 24042822 */ addiu $a0, $zero, 0x2822 ## $a0 = 00002822 -/* 00654 80B9F904 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 -/* 00658 80B9F908 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 0065C 80B9F90C 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -.L80B9F910: -/* 00660 80B9F910 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -.L80B9F914: -/* 00664 80B9F914 AFA5002C */ sw $a1, 0x002C($sp) -/* 00668 80B9F918 0C0189B7 */ jal Collider_CylinderUpdate - -/* 0066C 80B9F91C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00670 80B9F920 8FA40084 */ lw $a0, 0x0084($sp) -/* 00674 80B9F924 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00678 80B9F928 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 0067C 80B9F92C 00812821 */ addu $a1, $a0, $at -/* 00680 80B9F930 AFA50030 */ sw $a1, 0x0030($sp) -/* 00684 80B9F934 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOT -/* 00688 80B9F938 8FA6002C */ lw $a2, 0x002C($sp) -/* 0068C 80B9F93C 8FA40084 */ lw $a0, 0x0084($sp) -/* 00690 80B9F940 8FA50030 */ lw $a1, 0x0030($sp) -/* 00694 80B9F944 0C01767D */ jal CollisionCheck_SetAC - ## CollisionCheck_setAC -/* 00698 80B9F948 8FA6002C */ lw $a2, 0x002C($sp) -/* 0069C 80B9F94C 26060198 */ addiu $a2, $s0, 0x0198 ## $a2 = 00000198 -/* 006A0 80B9F950 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000198 -/* 006A4 80B9F954 AFA6002C */ sw $a2, 0x002C($sp) -/* 006A8 80B9F958 0C0189B7 */ jal Collider_CylinderUpdate - -/* 006AC 80B9F95C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 006B0 80B9F960 8FA40084 */ lw $a0, 0x0084($sp) -/* 006B4 80B9F964 8FA6002C */ lw $a2, 0x002C($sp) -/* 006B8 80B9F968 0C01767D */ jal CollisionCheck_SetAC - ## CollisionCheck_setAC -/* 006BC 80B9F96C 8FA50030 */ lw $a1, 0x0030($sp) -/* 006C0 80B9F970 860301E4 */ lh $v1, 0x01E4($s0) ## 000001E4 -/* 006C4 80B9F974 1860000D */ blez $v1, .L80B9F9AC -/* 006C8 80B9F978 246AFFFF */ addiu $t2, $v1, 0xFFFF ## $t2 = FFFFFFFF -/* 006CC 80B9F97C A60A01E4 */ sh $t2, 0x01E4($s0) ## 000001E4 -/* 006D0 80B9F980 860301E4 */ lh $v1, 0x01E4($s0) ## 000001E4 -/* 006D4 80B9F984 8FAB006C */ lw $t3, 0x006C($sp) -/* 006D8 80B9F988 14600008 */ bne $v1, $zero, .L80B9F9AC -/* 006DC 80B9F98C 00000000 */ nop -/* 006E0 80B9F990 11600006 */ beq $t3, $zero, .L80B9F9AC -/* 006E4 80B9F994 3C0280BA */ lui $v0, %hi(D_80B9FF90) ## $v0 = 80BA0000 -/* 006E8 80B9F998 2442FF90 */ addiu $v0, $v0, %lo(D_80B9FF90) ## $v0 = 80B9FF90 -/* 006EC 80B9F99C 8C4C0000 */ lw $t4, 0x0000($v0) ## 80B9FF90 -/* 006F0 80B9F9A0 258DFFFF */ addiu $t5, $t4, 0xFFFF ## $t5 = FFFFFFFF -/* 006F4 80B9F9A4 AC4D0000 */ sw $t5, 0x0000($v0) ## 80B9FF90 -/* 006F8 80B9F9A8 860301E4 */ lh $v1, 0x01E4($s0) ## 000001E4 -.L80B9F9AC: -/* 006FC 80B9F9AC 5060003F */ beql $v1, $zero, .L80B9FAAC -/* 00700 80B9F9B0 93A6005B */ lbu $a2, 0x005B($sp) -/* 00704 80B9F9B4 04600002 */ bltz $v1, .L80B9F9C0 -/* 00708 80B9F9B8 28610014 */ slti $at, $v1, 0x0014 -/* 0070C 80B9F9BC 14200003 */ bne $at, $zero, .L80B9F9CC -.L80B9F9C0: -/* 00710 80B9F9C0 240E00C8 */ addiu $t6, $zero, 0x00C8 ## $t6 = 000000C8 -/* 00714 80B9F9C4 1000000D */ beq $zero, $zero, .L80B9F9FC -/* 00718 80B9F9C8 AFAE005C */ sw $t6, 0x005C($sp) -.L80B9F9CC: -/* 0071C 80B9F9CC 44839000 */ mtc1 $v1, $f18 ## $f18 = 0.00 -/* 00720 80B9F9D0 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 00724 80B9F9D4 44814000 */ mtc1 $at, $f8 ## $f8 = 200.00 -/* 00728 80B9F9D8 468091A0 */ cvt.s.w $f6, $f18 -/* 0072C 80B9F9DC 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00730 80B9F9E0 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 -/* 00734 80B9F9E4 46083102 */ mul.s $f4, $f6, $f8 -/* 00738 80B9F9E8 460A2403 */ div.s $f16, $f4, $f10 -/* 0073C 80B9F9EC 4600848D */ trunc.w.s $f18, $f16 -/* 00740 80B9F9F0 44189000 */ mfc1 $t8, $f18 -/* 00744 80B9F9F4 00000000 */ nop -/* 00748 80B9F9F8 AFB8005C */ sw $t8, 0x005C($sp) -.L80B9F9FC: -/* 0074C 80B9F9FC 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00750 80B9FA00 00000000 */ nop -/* 00754 80B9FA04 3C0142FE */ lui $at, 0x42FE ## $at = 42FE0000 -/* 00758 80B9FA08 44813000 */ mtc1 $at, $f6 ## $f6 = 127.00 -/* 0075C 80B9FA0C 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 00760 80B9FA10 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 00764 80B9FA14 46060202 */ mul.s $f8, $f0, $f6 -/* 00768 80B9FA18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0076C 80B9FA1C 24052031 */ addiu $a1, $zero, 0x2031 ## $a1 = 00002031 -/* 00770 80B9FA20 4459F800 */ cfc1 $t9, $31 -/* 00774 80B9FA24 44CAF800 */ ctc1 $t2, $31 -/* 00778 80B9FA28 00000000 */ nop -/* 0077C 80B9FA2C 46004124 */ cvt.w.s $f4, $f8 -/* 00780 80B9FA30 444AF800 */ cfc1 $t2, $31 -/* 00784 80B9FA34 00000000 */ nop -/* 00788 80B9FA38 314A0078 */ andi $t2, $t2, 0x0078 ## $t2 = 00000000 -/* 0078C 80B9FA3C 51400013 */ beql $t2, $zero, .L80B9FA8C -/* 00790 80B9FA40 440A2000 */ mfc1 $t2, $f4 -/* 00794 80B9FA44 44812000 */ mtc1 $at, $f4 ## $f4 = 2147483648.00 -/* 00798 80B9FA48 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 0079C 80B9FA4C 46044101 */ sub.s $f4, $f8, $f4 -/* 007A0 80B9FA50 44CAF800 */ ctc1 $t2, $31 -/* 007A4 80B9FA54 00000000 */ nop -/* 007A8 80B9FA58 46002124 */ cvt.w.s $f4, $f4 -/* 007AC 80B9FA5C 444AF800 */ cfc1 $t2, $31 -/* 007B0 80B9FA60 00000000 */ nop -/* 007B4 80B9FA64 314A0078 */ andi $t2, $t2, 0x0078 ## $t2 = 00000000 -/* 007B8 80B9FA68 15400005 */ bne $t2, $zero, .L80B9FA80 -/* 007BC 80B9FA6C 00000000 */ nop -/* 007C0 80B9FA70 440A2000 */ mfc1 $t2, $f4 -/* 007C4 80B9FA74 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 007C8 80B9FA78 10000007 */ beq $zero, $zero, .L80B9FA98 -/* 007CC 80B9FA7C 01415025 */ or $t2, $t2, $at ## $t2 = 80000000 -.L80B9FA80: -/* 007D0 80B9FA80 10000005 */ beq $zero, $zero, .L80B9FA98 -/* 007D4 80B9FA84 240AFFFF */ addiu $t2, $zero, 0xFFFF ## $t2 = FFFFFFFF -/* 007D8 80B9FA88 440A2000 */ mfc1 $t2, $f4 -.L80B9FA8C: -/* 007DC 80B9FA8C 00000000 */ nop -/* 007E0 80B9FA90 0540FFFB */ bltz $t2, .L80B9FA80 -/* 007E4 80B9FA94 00000000 */ nop -.L80B9FA98: -/* 007E8 80B9FA98 44D9F800 */ ctc1 $t9, $31 -/* 007EC 80B9FA9C 254C0080 */ addiu $t4, $t2, 0x0080 ## $t4 = 0000007F -/* 007F0 80B9FAA0 0C00BE5D */ jal func_8002F974 -/* 007F4 80B9FAA4 A3AC005B */ sb $t4, 0x005B($sp) -/* 007F8 80B9FAA8 93A6005B */ lbu $a2, 0x005B($sp) -.L80B9FAAC: -/* 007FC 80B9FAAC 8FAE005C */ lw $t6, 0x005C($sp) -/* 00800 80B9FAB0 260401EC */ addiu $a0, $s0, 0x01EC ## $a0 = 000001EC -/* 00804 80B9FAB4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00808 80B9FAB8 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 0080C 80B9FABC 0C01E796 */ jal Lights_PointSetColorAndRadius - -/* 00810 80B9FAC0 AFAE0010 */ sw $t6, 0x0010($sp) -/* 00814 80B9FAC4 920F01E6 */ lbu $t7, 0x01E6($s0) ## 000001E6 -/* 00818 80B9FAC8 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 0081C 80B9FACC A21801E6 */ sb $t8, 0x01E6($s0) ## 000001E6 -/* 00820 80B9FAD0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00824 80B9FAD4 8FB00020 */ lw $s0, 0x0020($sp) -/* 00828 80B9FAD8 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 -/* 0082C 80B9FADC 03E00008 */ jr $ra -/* 00830 80B9FAE0 00000000 */ nop diff --git a/data/overlays/actors/z_bg_hidan_curtain.data.s b/data/overlays/actors/z_bg_hidan_curtain.data.s deleted file mode 100644 index dfbc64dd14..0000000000 --- a/data/overlays/actors/z_bg_hidan_curtain.data.s +++ /dev/null @@ -1,27 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel D_80885B70 - .word 0x0A110009, 0x20010000, 0x00000000, 0x20000000, 0x01040000, 0xFFCFFFFF, 0x00000000, 0x19000100, 0x00510090, 0x00000000, 0x00000000 -glabel D_80885B9C - .word 0x01000050, 0x0064FF00 -glabel D_80885BA4 - .word 0x00510090, 0x3DB851EC, 0x43100000 -glabel D_80885BB0 - .word 0x40A00000, 0x002E0058, 0x3D6147AE, 0x42B00000, 0x40400000 -glabel Bg_Hidan_Curtain_InitVars - .word 0x00490600, 0x00000010, 0x00010000, 0x000001A4 -.word BgHidanCurtain_Init -.word BgHidanCurtain_Destroy -.word BgHidanCurtain_Update -.word BgHidanCurtain_Draw -.word 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_bg_hidan_curtain.reloc.s b/data/overlays/actors/z_bg_hidan_curtain.reloc.s deleted file mode 100644 index 1d334e0b9d..0000000000 --- a/data/overlays/actors/z_bg_hidan_curtain.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_80885D20 - .incbin "baserom/ovl_Bg_Hidan_Curtain", 0xB80, 0x00000100 diff --git a/data/overlays/actors/z_bg_mori_kaitenkabe.data.s b/data/overlays/actors/z_bg_mori_kaitenkabe.data.s deleted file mode 100644 index 8b4ebfb1d1..0000000000 --- a/data/overlays/actors/z_bg_mori_kaitenkabe.data.s +++ /dev/null @@ -1,20 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel Bg_Mori_Kaitenkabe_InitVars - .word 0x00880100, 0x00000000, 0x00720000, 0x00000188 -.word BgMoriKaitenkabe_Init -.word BgMoriKaitenkabe_Destroy -.word BgMoriKaitenkabe_Update -.word 0x00000000 -glabel D_808A53D0 - .word 0xB0F403E8, 0xB0F803E8, 0xB0FC03E8, 0x485003E8 - diff --git a/data/overlays/actors/z_bg_mori_kaitenkabe.reloc.s b/data/overlays/actors/z_bg_mori_kaitenkabe.reloc.s deleted file mode 100644 index dd3f94e069..0000000000 --- a/data/overlays/actors/z_bg_mori_kaitenkabe.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_808A54C0 - .incbin "baserom/ovl_Bg_Mori_Kaitenkabe", 0x700, 0x000000B0 diff --git a/data/overlays/actors/z_bg_mori_rakkatenjo.data.s b/data/overlays/actors/z_bg_mori_rakkatenjo.data.s deleted file mode 100644 index c866292ab7..0000000000 --- a/data/overlays/actors/z_bg_mori_rakkatenjo.data.s +++ /dev/null @@ -1,24 +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_808A5E60 - .word 0x00000000 -glabel Bg_Mori_Rakkatenjo_InitVars - .word 0x00890100, 0x00000030, 0x00720000, 0x00000178 -.word BgMoriRakkatenjo_Init -.word BgMoriRakkatenjo_Destroy -.word BgMoriRakkatenjo_Update -.word 0x00000000 -glabel D_808A5E84 - .word 0xB06CFFFF, 0xB070FFF5, 0x485003E8 -glabel D_808A5E90 - .word 0x40800000, 0x3FC00000, 0x3ECCCCCD, 0x3DCCCCCD - diff --git a/data/overlays/actors/z_bg_mori_rakkatenjo.reloc.s b/data/overlays/actors/z_bg_mori_rakkatenjo.reloc.s deleted file mode 100644 index f17e449ced..0000000000 --- a/data/overlays/actors/z_bg_mori_rakkatenjo.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_808A6090 - .incbin "baserom/ovl_Bg_Mori_Rakkatenjo", 0xB20, 0x00000180 diff --git a/data/overlays/actors/z_bg_po_event.bss.s b/data/overlays/actors/z_bg_po_event.bss.s deleted file mode 100644 index b41e9ace57..0000000000 --- a/data/overlays/actors/z_bg_po_event.bss.s +++ /dev/null @@ -1,14 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .bss - -.balign 16 - -glabel D_808A80A0 - .space 0x10 - diff --git a/data/overlays/actors/z_bg_po_event.data.s b/data/overlays/actors/z_bg_po_event.data.s deleted file mode 100644 index 04f8558c4c..0000000000 --- a/data/overlays/actors/z_bg_po_event.data.s +++ /dev/null @@ -1,45 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel Bg_Po_Event_InitVars - .word 0x00930100, 0x00000000, 0x00990000, 0x00000248 -.word BgPoEvent_Init -.word BgPoEvent_Destroy -.word BgPoEvent_Update -.word BgPoEvent_Draw -glabel D_808A7CD0 - .word 0x04000000, 0x00000000, 0x00000000, 0x0001F820, 0x00000000, 0x00010000, 0x41C80000, 0x42040000, 0x00000000, 0xC1C80000, 0x42040000, 0x00000000, 0xC1C80000, 0xC2040000, 0x00000000, 0x04000000, 0x00000000, 0x00000000, 0x0001F820, 0x00000000, 0x00010000, 0x41C80000, 0x42040000, 0x00000000, 0xC1C80000, 0xC2040000, 0x00000000, 0x41C80000, 0xC2040000, 0x00000000 -glabel D_808A7D48 - .word 0x0A000900, 0x20020000, 0x00000002 -.word D_808A7CD0 -glabel D_808A7D58 - .word 0x00000000 -glabel D_808A7D5C - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_808A7D68 - .word 0xFAEAFC9E, 0x058D03D9 -glabel D_808A7D70 - .word 0x04530443 -glabel D_808A7D74 - .word 0xF2C8F34C -glabel D_808A7D78 - .word 0x086507B1, 0x07750000 -glabel D_808A7D80 - .word 0xFA7EFABA, 0xFA060000 -glabel D_808A7D88 - .word 0x485003E8 -glabel D_808A7D8C - .word 0x00000000 -glabel D_808A7D90 - .word 0x00000000 -glabel D_808A7D94 - .word 0x060075A0, 0x060079E0, 0x06006830, 0x06006D60, 0x06007230, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_bg_po_event.reloc.s b/data/overlays/actors/z_bg_po_event.reloc.s deleted file mode 100644 index b8d1f42901..0000000000 --- a/data/overlays/actors/z_bg_po_event.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_808A7E10 - .incbin "baserom/ovl_Bg_Po_Event", 0x1C00, 0x00000290 diff --git a/data/overlays/actors/z_bg_spot03_taki.data.s b/data/overlays/actors/z_bg_spot03_taki.data.s deleted file mode 100644 index 743ff36899..0000000000 --- a/data/overlays/actors/z_bg_spot03_taki.data.s +++ /dev/null @@ -1,20 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel Bg_Spot03_Taki_InitVars - .word 0x011F0100, 0x00000030, 0x01120000, 0x00000178 -.word BgSpot03Taki_Init -.word BgSpot03Taki_Destroy -.word BgSpot03Taki_Update -.word BgSpot03Taki_Draw -glabel D_808AE3B0 - .word 0x48500064, 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_bg_spot03_taki.reloc.s b/data/overlays/actors/z_bg_spot03_taki.reloc.s deleted file mode 100644 index 0dc2bc79d6..0000000000 --- a/data/overlays/actors/z_bg_spot03_taki.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_808AE410 - .incbin "baserom/ovl_Bg_Spot03_Taki", 0x930, 0x00000060 diff --git a/data/overlays/actors/z_en_ice_hono.data.s b/data/overlays/actors/z_en_ice_hono.data.s deleted file mode 100644 index f813a9458a..0000000000 --- a/data/overlays/actors/z_en_ice_hono.data.s +++ /dev/null @@ -1,28 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel En_Ice_Hono_InitVars - .word 0x00F00700, 0x00000000, 0x00010000, 0x000001BC -.word EnIceHono_Init -.word EnIceHono_Destroy -.word EnIceHono_Update -.word EnIceHono_Draw -glabel D_80A74010 - .word 0x0A000039, 0x20010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x00190050, 0x00000000, 0x00000000 -glabel D_80A7403C - .word 0x0A210021, 0x20010000, 0x00000000, 0xFFCFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x01000100, 0x000C003C, 0x00000000, 0x00000000 -glabel D_80A74068 - .word 0x801F0000, 0xB04C003C, 0xB0F403E8, 0xB0F80190, 0x30FC03E8 -glabel D_80A7407C - .word 0xB0F403E8, 0xB0F80190, 0x30FC03E8 -glabel D_80A74088 - .word 0xB0F403E8, 0xB0F80190, 0x30FC03E8, 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_en_ice_hono.reloc.s b/data/overlays/actors/z_en_ice_hono.reloc.s deleted file mode 100644 index a4c4c8cdb4..0000000000 --- a/data/overlays/actors/z_en_ice_hono.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_80A74180 - .incbin "baserom/ovl_En_Ice_Hono", 0x1190, 0x00000190 diff --git a/data/overlays/actors/z_en_ishi.data.s b/data/overlays/actors/z_en_ishi.data.s deleted file mode 100644 index ca0ec20ffc..0000000000 --- a/data/overlays/actors/z_en_ishi.data.s +++ /dev/null @@ -1,57 +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_80A7F9F0 - .word 0x00000000 -glabel D_80A7F9F4 - .word 0x00000000 -glabel En_Ishi_InitVars - .word 0x014E0600, 0x00800000, 0x00020000, 0x0000019C -.word EnIshi_Init -.word EnIshi_Destroy -.word EnIshi_Update -.word EnIshi_Draw -glabel D_80A7FA18 - .word 0x3DCCCCCD -glabel D_80A7FA1C - .word 0x3ECCCCCD -glabel D_80A7FA20 - .word 0x42680000, 0x42A00000 -glabel D_80A7FA28 - .word 0x00000000, 0x3BA3D70A -glabel D_80A7FA30 - .word 0x28522810, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 -glabel D_80A84AD4 - .word 0x14280000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 -glabel D_80A87328 - .word func_80A7E5A8 -glabel D_80A8732C - .word func_80A7E824 -glabel D_80A87330 - .word func_80A7EB10 -.word func_80A7EC04 -glabel D_80A87338 - .word 0x0C000D39, 0x20010000, 0x00000000, 0x00000000, 0x00000000, 0x4FC1FFFE, 0x00000000, 0x00010100, 0x000A0012, 0xFFFE0000, 0x00000000, 0x0C000D39, 0x20010000, 0x00000000, 0x00000000, 0x00000000, 0x4FC1FFF6, 0x00000000, 0x00010100, 0x00370046, 0x00000000, 0x00000000 -glabel D_80A87390 - .word 0x0000000C, 0x003CFF00 -glabel D_80A87398 - .word 0x0010000D, 0x000B0009, 0x00070005 -glabel D_80A873A4 - .word 0x00910087, 0x00780064, 0x00460032, 0x002D0028, 0x00230000 -glabel D_80A873B8 - .word 0xB86CFB50, 0xB870B1E0, 0xB0F404B0, 0xB0F80096, 0x30FC0190, 0xB86CF63C, 0xB870B1E0, 0xB0F407D0, 0xB0F800FA, 0x30FC01F4 -glabel D_80A873E0 - .word 0x086A086C -glabel D_80A873E4 - .word func_80A7F8A0 -.word func_80A7F8CC -.word 0x00000000 - diff --git a/data/overlays/actors/z_en_ishi.reloc.s b/data/overlays/actors/z_en_ishi.reloc.s deleted file mode 100644 index c3dae904ba..0000000000 --- a/data/overlays/actors/z_en_ishi.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_80A87480 - .incbin "baserom/ovl_En_Ishi", 0x9020, 0x00000200 diff --git a/data/overlays/actors/z_en_kakasi.data.s b/data/overlays/actors/z_en_kakasi.data.s deleted file mode 100644 index aef12a0d13..0000000000 --- a/data/overlays/actors/z_en_kakasi.data.s +++ /dev/null @@ -1,21 +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_80A8FDE0 - .word 0x0A000039, 0x20010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00040100, 0x00140046, 0x00000000, 0x00000000 -glabel En_Kakasi_InitVars - .word 0x017B0400, 0x02000009, 0x01540000, 0x0000020C -.word EnKakasi_Init -.word EnKakasi_Destroy -.word EnKakasi_Update -.word EnKakasi_Draw -.word 0x00000000 - diff --git a/data/overlays/actors/z_en_kakasi.reloc.s b/data/overlays/actors/z_en_kakasi.reloc.s deleted file mode 100644 index 8f1179d229..0000000000 --- a/data/overlays/actors/z_en_kakasi.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_80A8FF10 - .incbin "baserom/ovl_En_Kakasi", 0xDA0, 0x00000100 diff --git a/data/overlays/actors/z_en_kakasi2.data.s b/data/overlays/actors/z_en_kakasi2.data.s deleted file mode 100644 index ea940b5c0d..0000000000 --- a/data/overlays/actors/z_en_kakasi2.data.s +++ /dev/null @@ -1,20 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel D_80A909A0 - .word 0x0A000939, 0x20010000, 0x00000000, 0xFFCFFFFF, 0x00000000, 0xFFCFFFFF, 0x00000000, 0x00050100, 0x00140046, 0x00000000, 0x00000000 -glabel En_Kakasi2_InitVars - .word 0x01C90600, 0x0A000031, 0x01540000, 0x000001F8 -.word EnKakasi2_Init -.word EnKakasi2_Destroy -.word EnKakasi2_Update -.word 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_en_kakasi2.reloc.s b/data/overlays/actors/z_en_kakasi2.reloc.s deleted file mode 100644 index ffe0e8db0e..0000000000 --- a/data/overlays/actors/z_en_kakasi2.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_80A90C20 - .incbin "baserom/ovl_En_Kakasi2", 0xC10, 0x00000100 diff --git a/data/overlays/actors/z_en_kakasi3.data.s b/data/overlays/actors/z_en_kakasi3.data.s deleted file mode 100644 index ebd367bcb0..0000000000 --- a/data/overlays/actors/z_en_kakasi3.data.s +++ /dev/null @@ -1,21 +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_80A91D10 - .word 0x0A000939, 0x20010000, 0x00000000, 0xFFCFFFFF, 0x00000000, 0xFFCFFFFF, 0x00000000, 0x00050100, 0x00140046, 0x00000000, 0x00000000 -glabel En_Kakasi3_InitVars - .word 0x01CA0400, 0x02000009, 0x01540000, 0x0000020C -.word EnKakasi3_Init -.word EnKakasi3_Destroy -.word EnKakasi3_Update -.word EnKakasi3_Draw -.word 0x00000000 - diff --git a/data/overlays/actors/z_en_kakasi3.reloc.s b/data/overlays/actors/z_en_kakasi3.reloc.s deleted file mode 100644 index b3e019ccdb..0000000000 --- a/data/overlays/actors/z_en_kakasi3.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_80A91E60 - .incbin "baserom/ovl_En_Kakasi3", 0x1140, 0x00000140 diff --git a/data/overlays/actors/z_en_reeba.data.s b/data/overlays/actors/z_en_reeba.data.s deleted file mode 100644 index 792d506794..0000000000 --- a/data/overlays/actors/z_en_reeba.data.s +++ /dev/null @@ -1,26 +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_80AE6560 - .word 0x00E2E1E2, 0xC1E2E2D2, 0xE1E4E6E2, 0x34E2E2E2, 0xE2003400, 0x0000E2E8, 0xE4E2E8E4, 0x10000000 -glabel En_Reeba_InitVars - .word 0x001C0800, 0x08000015, 0x00170000, 0x000002DC -.word EnReeba_Init -.word EnReeba_Destroy -.word EnReeba_Update -.word EnReeba_Draw -glabel D_80AE65A0 - .word 0x05110939, 0x10010000, 0x00000000, 0xFFCFFFFF, 0x08080000, 0xFFCFFFFF, 0x00000000, 0x01050100, 0x00140028, 0x00000000, 0x00000000 -glabel D_80AE65CC - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80AE65D8 - .word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_en_reeba.reloc.s b/data/overlays/actors/z_en_reeba.reloc.s deleted file mode 100644 index a53486d489..0000000000 --- a/data/overlays/actors/z_en_reeba.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_80AE66F0 - .incbin "baserom/ovl_En_Reeba", 0x1A20, 0x00000240 diff --git a/data/overlays/actors/z_en_rl.data.s b/data/overlays/actors/z_en_rl.data.s deleted file mode 100644 index a8f61cbc66..0000000000 --- a/data/overlays/actors/z_en_rl.data.s +++ /dev/null @@ -1,36 +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_80AE81A0 - .word 0x06003620, 0x06003960, 0x06003B60 -glabel D_80AE81AC - .word 0x00000000 -glabel D_80AE81B0 - .word func_80AE7798 -.word func_80AE77B8 -.word func_80AE77F8 -.word func_80AE7838 -.word func_80AE7C64 -.word func_80AE7C94 -.word func_80AE7CE8 -.word func_80AE7D40 -glabel D_80AE81D0 - .word func_80AE7FD0 -.word func_80AE7FDC -.word func_80AE7D94 -glabel En_Rl_InitVars - .word 0x00A60400, 0x00000010, 0x00A70000, 0x000001AC -.word EnRl_Init -.word EnRl_Destroy -.word EnRl_Update -.word EnRl_Draw -.word 0x00000000 - diff --git a/data/overlays/actors/z_en_rl.reloc.s b/data/overlays/actors/z_en_rl.reloc.s deleted file mode 100644 index 9d32cd0465..0000000000 --- a/data/overlays/actors/z_en_rl.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_80AE82E0 - .incbin "baserom/ovl_En_Rl", 0x1030, 0x00000160 diff --git a/data/overlays/actors/z_obj_kibako.data.s b/data/overlays/actors/z_obj_kibako.data.s deleted file mode 100644 index a37418a32f..0000000000 --- a/data/overlays/actors/z_obj_kibako.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel Obj_Kibako_InitVars - .word 0x01100600, 0x04000010, 0x00030000, 0x0000019C -.word ObjKibako_Init -.word ObjKibako_Destroy -.word ObjKibako_Update -.word ObjKibako_Draw -glabel D_80B95850 - .word 0x0A090939, 0x20010000, 0x00000000, 0x00000002, 0x00010000, 0x4FC00748, 0x00000000, 0x01010100, 0x000C001B, 0x00000000, 0x00000000 -glabel D_80B9587C - .word 0x0000000C, 0x003CFE00 -glabel D_80B95884 - .word 0xC8500064, 0xB0F403E8, 0xB0F8003C, 0x30FC03E8, 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_obj_kibako.reloc.s b/data/overlays/actors/z_obj_kibako.reloc.s deleted file mode 100644 index d036b02e68..0000000000 --- a/data/overlays/actors/z_obj_kibako.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_80B958F0 - .incbin "baserom/ovl_Obj_Kibako", 0xC50, 0x000000E0 diff --git a/data/overlays/actors/z_obj_syokudai.bss.s b/data/overlays/actors/z_obj_syokudai.bss.s deleted file mode 100644 index 0c89d1df66..0000000000 --- a/data/overlays/actors/z_obj_syokudai.bss.s +++ /dev/null @@ -1,14 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .bss - -.balign 16 - -glabel D_80B9FF90 - .space 0x10 - diff --git a/data/overlays/actors/z_obj_syokudai.data.s b/data/overlays/actors/z_obj_syokudai.data.s deleted file mode 100644 index 756162ae81..0000000000 --- a/data/overlays/actors/z_obj_syokudai.data.s +++ /dev/null @@ -1,28 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel Obj_Syokudai_InitVars - .word 0x005E0600, 0x00000410, 0x00A40000, 0x000001FC -.word ObjSyokudai_Init -.word ObjSyokudai_Destroy -.word ObjSyokudai_Update -.word ObjSyokudai_Draw -glabel D_80B9FE10 - .word 0x09000D39, 0x20010000, 0x02000000, 0x00100000, 0x00000000, 0xEE01FFFF, 0x00000000, 0x00050100, 0x000C002D, 0x00000000, 0x00000000 -glabel D_80B9FE3C - .word 0x0A000900, 0x00010000, 0x02000000, 0x00000000, 0x00000000, 0x00020820, 0x00000000, 0x00010000, 0x000F002D, 0x002D0000, 0x00000000 -glabel D_80B9FE68 - .word 0xC85003E8, 0xB0F40FA0, 0xB0F80320, 0x30FC0320 -glabel D_80B9FE78 - .word 0x090B0B00 -glabel D_80B9FE7C - .word 0x060003A0, 0x06000B90, 0x06000870, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_obj_syokudai.reloc.s b/data/overlays/actors/z_obj_syokudai.reloc.s deleted file mode 100644 index 74ba6b7083..0000000000 --- a/data/overlays/actors/z_obj_syokudai.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_80B9FEF0 - .incbin "baserom/ovl_Obj_Syokudai", 0xC40, 0x000000A0 diff --git a/include/functions.h b/include/functions.h index f38b10400a..906f7e8a26 100644 --- a/include/functions.h +++ b/include/functions.h @@ -654,7 +654,7 @@ void DynaPolyInfo_Alloc(UNK_PTR arg0, UNK_PTR arg1); // ? func_80041B80(?); struct_80041C10_ret* func_80041C10(CollisionContext* colCtx, s32, s32); // ? func_80041C98(?); -// ? func_80041D4C(?); +UNK_TYPE func_80041D4C(CollisionContext*, CollisionPoly*, CollisionPoly*); // ? func_80041D94(?); // ? func_80041DB8(?); // ? func_80041EC8(?); @@ -1115,7 +1115,7 @@ Vec3f* OLib_Vec3fDiffRad(Vec3f* dest, Vec3f* a, Vec3f* b); // ? func_80080024(?); s16 func_800800F8(GlobalContext* globalCtx, s16 arg1, s16 arg2, Actor* actor, s16 arg4); void func_800803F0(GlobalContext* globalCtx, s16 camId); -UNK_RET func_80080480(GlobalContext* globalCtx, Actor* actor); +s16 func_80080480(GlobalContext* globalCtx, Actor* actor); UNK_TYPE func_800806BC(GlobalContext* globalCtx, Actor* actor, UNK_TYPE); UNK_TYPE func_80080728(GlobalContext* globalCtx, u8 actorType); void func_80080788(UNK_TYPE, UNK_TYPE); @@ -2257,6 +2257,7 @@ void func_800F4190(Vec3f*, u16); void func_800F436C(UNK_TYPE arg0, s16 arg1, f32 arg2); // ? func_800F4414(?); // ? func_800F4524(?); +void func_800F46E0(Vec3f* pos, f32 arg0); // ? func_800F4784(?); void func_800F47BC(void); void func_800F47FC(void); diff --git a/spec b/spec index b08da714e0..41534531df 100644 --- a/spec +++ b/spec @@ -824,8 +824,7 @@ endseg beginseg name "ovl_Bg_Hidan_Curtain" include "build/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.o" - include "build/data/overlays/actors/z_bg_hidan_curtain.data.o" - include "build/data/overlays/actors/z_bg_hidan_curtain.reloc.o" + include "build/src/overlays/actors/ovl_Bg_Hidan_Curtain/ovl_Bg_Hidan_Curtain_reloc.o" endseg beginseg @@ -1132,23 +1131,19 @@ endseg beginseg name "ovl_Bg_Mori_Kaitenkabe" include "build/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.o" - include "build/data/overlays/actors/z_bg_mori_kaitenkabe.data.o" - include "build/data/overlays/actors/z_bg_mori_kaitenkabe.reloc.o" + include "build/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/ovl_Bg_Mori_Kaitenkabe_reloc.o" endseg beginseg name "ovl_Bg_Mori_Rakkatenjo" include "build/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.o" - include "build/data/overlays/actors/z_bg_mori_rakkatenjo.data.o" - include "build/data/overlays/actors/z_bg_mori_rakkatenjo.reloc.o" + include "build/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/ovl_Bg_Mori_Rakkatenjo_reloc.o" endseg beginseg name "ovl_Bg_Po_Event" include "build/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.o" - include "build/data/overlays/actors/z_bg_po_event.data.o" - include "build/data/overlays/actors/z_bg_po_event.bss.o" - include "build/data/overlays/actors/z_bg_po_event.reloc.o" + include "build/src/overlays/actors/ovl_Bg_Po_Event/ovl_Bg_Po_Event_reloc.o" endseg beginseg @@ -1223,8 +1218,7 @@ endseg beginseg name "ovl_Bg_Spot03_Taki" include "build/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.o" - include "build/data/overlays/actors/z_bg_spot03_taki.data.o" - include "build/data/overlays/actors/z_bg_spot03_taki.reloc.o" + include "build/src/overlays/actors/ovl_Bg_Spot03_Taki/ovl_Bg_Spot03_Taki_reloc.o" endseg beginseg @@ -2580,8 +2574,7 @@ endseg beginseg name "ovl_En_Ice_Hono" include "build/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.o" - include "build/data/overlays/actors/z_en_ice_hono.data.o" - include "build/data/overlays/actors/z_en_ice_hono.reloc.o" + include "build/src/overlays/actors/ovl_En_Ice_Hono/ovl_En_Ice_Hono_reloc.o" endseg beginseg @@ -2611,8 +2604,7 @@ endseg beginseg name "ovl_En_Ishi" include "build/src/overlays/actors/ovl_En_Ishi/z_en_ishi.o" - include "build/data/overlays/actors/z_en_ishi.data.o" - include "build/data/overlays/actors/z_en_ishi.reloc.o" + include "build/src/overlays/actors/ovl_En_Ishi/ovl_En_Ishi_reloc.o" endseg beginseg @@ -2645,22 +2637,19 @@ endseg beginseg name "ovl_En_Kakasi" include "build/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.o" - include "build/data/overlays/actors/z_en_kakasi.data.o" - include "build/data/overlays/actors/z_en_kakasi.reloc.o" + include "build/src/overlays/actors/ovl_En_Kakasi/ovl_En_Kakasi_reloc.o" endseg beginseg name "ovl_En_Kakasi2" include "build/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.o" - include "build/data/overlays/actors/z_en_kakasi2.data.o" - include "build/data/overlays/actors/z_en_kakasi2.reloc.o" + include "build/src/overlays/actors/ovl_En_Kakasi2/ovl_En_Kakasi2_reloc.o" endseg beginseg name "ovl_En_Kakasi3" include "build/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.o" - include "build/data/overlays/actors/z_en_kakasi3.data.o" - include "build/data/overlays/actors/z_en_kakasi3.reloc.o" + include "build/src/overlays/actors/ovl_En_Kakasi3/ovl_En_Kakasi3_reloc.o" endseg beginseg @@ -2948,8 +2937,7 @@ endseg beginseg name "ovl_En_Reeba" include "build/src/overlays/actors/ovl_En_Reeba/z_en_reeba.o" - include "build/data/overlays/actors/z_en_reeba.data.o" - include "build/data/overlays/actors/z_en_reeba.reloc.o" + include "build/src/overlays/actors/ovl_En_Reeba/ovl_En_Reeba_reloc.o" endseg beginseg @@ -2962,8 +2950,7 @@ endseg beginseg name "ovl_En_Rl" include "build/src/overlays/actors/ovl_En_Rl/z_en_rl.o" - include "build/data/overlays/actors/z_en_rl.data.o" - include "build/data/overlays/actors/z_en_rl.reloc.o" + include "build/src/overlays/actors/ovl_En_Rl/ovl_En_Rl_reloc.o" endseg beginseg @@ -3503,8 +3490,7 @@ endseg beginseg name "ovl_Obj_Kibako" include "build/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.o" - include "build/data/overlays/actors/z_obj_kibako.data.o" - include "build/data/overlays/actors/z_obj_kibako.reloc.o" + include "build/src/overlays/actors/ovl_Obj_Kibako/ovl_Obj_Kibako_reloc.o" endseg beginseg @@ -3583,9 +3569,7 @@ endseg beginseg name "ovl_Obj_Syokudai" include "build/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.o" - include "build/data/overlays/actors/z_obj_syokudai.data.o" - include "build/data/overlays/actors/z_obj_syokudai.bss.o" - include "build/data/overlays/actors/z_obj_syokudai.reloc.o" + include "build/src/overlays/actors/ovl_Obj_Syokudai/ovl_Obj_Syokudai_reloc.o" endseg beginseg diff --git a/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c b/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c index 442268dc08..1acdce8353 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c @@ -36,8 +36,7 @@ const ActorInit Bg_Gnd_Darkmeiro_InitVars = { extern Gfx D_060088B0[]; extern Gfx D_0600BEC0[]; - -extern UNK_TYPE D_0600C080; +extern ColHeader D_0600C080; void BgGndDarkmeiro_ToggleBlock(BgGndDarkmeiro* this, GlobalContext* globalCtx) { if (this->actionFlags & 2) { @@ -53,7 +52,7 @@ void BgGndDarkmeiro_ToggleBlock(BgGndDarkmeiro* this, GlobalContext* globalCtx) void BgGndDarkmeiro_Init(Actor* thisx, GlobalContext* globalCtx) { GlobalContext* globalCtx2 = globalCtx; - s32 local_c = 0; + ColHeader* colHeader = NULL; BgGndDarkmeiro* this = THIS; this->updateFunc = BgGndDarkmeiro_Noop; @@ -64,9 +63,9 @@ void BgGndDarkmeiro_Init(Actor* thisx, GlobalContext* globalCtx) { this->dyna.actor.flags |= 0x80; break; case DARKMEIRO_CLEAR_BLOCK: - DynaPolyInfo_Alloc(&D_0600C080, &local_c); + DynaPolyInfo_Alloc(&D_0600C080, &colHeader); this->dyna.dynaPolyId = - DynaPolyInfo_RegisterActor(globalCtx2, &globalCtx2->colCtx.dyna, &this->dyna.actor, local_c); + DynaPolyInfo_RegisterActor(globalCtx2, &globalCtx2->colCtx.dyna, &this->dyna.actor, colHeader); if (((this->dyna.actor.params >> 8) & 0x3F) == 0x3F) { this->updateFunc = BgGndDarkmeiro_UpdateStaticBlock; this->dyna.actor.draw = BgGndDarkmeiro_DrawStaticBlock; diff --git a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c index 5f225262bd..385f555138 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c @@ -1,3 +1,9 @@ +/* + * File: z_bg_hidan_curtain.c + * Overlay: ovl_Bg_Hidan_Curtain + * Description: Flame circle + */ + #include "z_bg_hidan_curtain.h" #define FLAGS 0x00000010 @@ -9,7 +15,33 @@ void BgHidanCurtain_Destroy(Actor* thisx, GlobalContext* globalCtx); void BgHidanCurtain_Update(Actor* thisx, GlobalContext* globalCtx); void BgHidanCurtain_Draw(Actor* thisx, GlobalContext* globalCtx); -/* +void BgHidanCurtain_WaitForSwitchOn(BgHidanCurtain* this, GlobalContext* globalCtx); +void BgHidanCurtain_WaitForCutscene(BgHidanCurtain* this, GlobalContext* globalCtx); +void BgHidanCurtain_WaitForClear(BgHidanCurtain* this, GlobalContext* globalCtx); +void BgHidanCurtain_TurnOn(BgHidanCurtain* this, GlobalContext* globalCtx); +void BgHidanCurtain_TurnOff(BgHidanCurtain* this, GlobalContext* globalCtx); +void BgHidanCurtain_WaitForTimer(BgHidanCurtain* this, GlobalContext* globalCtx); + +extern Gfx D_040184B0[]; + +typedef struct { + /* 0x00 */ s16 radius; + /* 0x02 */ s16 height; + /* 0x04 */ f32 scale; + /* 0x08 */ f32 riseDist; + /* 0x0C */ f32 riseSpeed; +} BgHidanCurtainParams; // size = 0x10 + +static ColliderCylinderInit sCylinderInit = { + { COLTYPE_UNK10, 0x11, 0x00, 0x09, 0x20, COLSHAPE_CYLINDER }, + { 0x00, { 0x20000000, 0x01, 0x04 }, { 0xFFCFFFFF, 0x00, 0x00 }, 0x19, 0x00, 0x01 }, + { 81, 144, 0, { 0, 0, 0 } }, +}; + +static CollisionCheckInfoInit sCcInfoInit = { 1, 0x50, 0x64, 0xFF }; + +static BgHidanCurtainParams sHCParams[] = { { 81, 144, 0.090f, 144.0f, 5.0f }, { 46, 88, 0.055f, 88.0f, 3.0f } }; + const ActorInit Bg_Hidan_Curtain_InitVars = { ACTOR_BG_HIDAN_CURTAIN, ACTORTYPE_PROP, @@ -21,25 +53,201 @@ const ActorInit Bg_Hidan_Curtain_InitVars = { (ActorFunc)BgHidanCurtain_Update, (ActorFunc)BgHidanCurtain_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Init.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Destroy.s") +void BgHidanCurtain_Init(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + BgHidanCurtain* this = THIS; + BgHidanCurtainParams* hcParams; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_80885434.s") + osSyncPrintf("Curtain (arg_data 0x%04x)\n", this->actor.params); + Actor_SetHeight(&this->actor, 20.0f); + this->type = (thisx->params >> 0xC) & 0xF; + if (this->type > 6) { + // Type is not set + osSyncPrintf("Error : object のタイプが設定されていない(%s %d)(arg_data 0x%04x)\n", "../z_bg_hidan_curtain.c", + 352, this->actor.params); + Actor_Kill(&this->actor); + return; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_808854E8.s") + this->size = ((this->type == 2) || (this->type == 4)) ? 1 : 0; + hcParams = &sHCParams[this->size]; + this->treasureFlag = (thisx->params >> 6) & 0x3F; + thisx->params &= 0x3F; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_80885514.s") + if ((this->actor.params < 0) || (this->actor.params > 0x3F)) { + // Save bit is not set + osSyncPrintf("Warning : object のセーブビットが設定されていない(%s %d)(arg_data 0x%04x)\n", + "../z_bg_hidan_curtain.c", 373, this->actor.params); + } + Actor_SetScale(&this->actor, hcParams->scale); + Collider_InitCylinder(globalCtx, &this->collider); + Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); + this->collider.dim.pos.x = this->actor.posRot.pos.x; + this->collider.dim.pos.y = this->actor.posRot.pos.y; + this->collider.dim.pos.z = this->actor.posRot.pos.z; + this->collider.dim.radius = hcParams->radius; + this->collider.dim.height = hcParams->height; + Collider_CylinderUpdate(&this->actor, &this->collider); + func_80061ED4(&thisx->colChkInfo, NULL, &sCcInfoInit); + if (this->type == 0) { + this->actionFunc = BgHidanCurtain_WaitForClear; + } else { + this->actionFunc = BgHidanCurtain_WaitForSwitchOn; + if ((this->type == 4) || (this->type == 5)) { + this->actor.posRot.pos.y = this->actor.initPosRot.pos.y - hcParams->riseDist; + } + } + if (((this->type == 1) && Flags_GetTreasure(globalCtx, this->treasureFlag)) || + (((this->type == 0) || (this->type == 6)) && Flags_GetClear(globalCtx, this->actor.room))) { + Actor_Kill(&this->actor); + } + this->texScroll = Math_Rand_ZeroOne() * 15.0f; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_80885554.s") +void BgHidanCurtain_Destroy(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + BgHidanCurtain* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_80885594.s") + Collider_DestroyCylinder(globalCtx, &this->collider); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_80885604.s") +void BgHidanCurtain_WaitForSwitchOn(BgHidanCurtain* this, GlobalContext* globalCtx) { + if (Flags_GetSwitch(globalCtx, this->actor.params)) { + if (this->type == 1) { + this->actionFunc = BgHidanCurtain_WaitForCutscene; + func_800800F8(globalCtx, 3350, -99, &this->actor, 0); + this->timer = 50; + } else if (this->type == 3) { + this->actionFunc = BgHidanCurtain_WaitForCutscene; + func_800800F8(globalCtx, 3360, 60, &this->actor, 0); + this->timer = 30; + } else { + this->actionFunc = BgHidanCurtain_TurnOff; + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/func_808856F4.s") +void BgHidanCurtain_WaitForCutscene(BgHidanCurtain* this, GlobalContext* globalCtx) { + if (this->timer-- == 0) { + this->actionFunc = BgHidanCurtain_TurnOff; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Update.s") +void BgHidanCurtain_WaitForClear(BgHidanCurtain* this, GlobalContext* globalCtx) { + if (Flags_GetClear(globalCtx, this->actor.room)) { + this->actionFunc = BgHidanCurtain_TurnOff; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Draw.s") +void BgHidanCurtain_WaitForSwitchOff(BgHidanCurtain* this, GlobalContext* globalCtx) { + if (!Flags_GetSwitch(globalCtx, this->actor.params)) { + this->actionFunc = BgHidanCurtain_TurnOn; + } +} + +void BgHidanCurtain_TurnOn(BgHidanCurtain* this, GlobalContext* globalCtx) { + f32 riseSpeed = sHCParams[this->size].riseSpeed; + + if (Math_ApproxF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y, riseSpeed)) { + Flags_UnsetSwitch(globalCtx, this->actor.params); + this->actionFunc = BgHidanCurtain_WaitForSwitchOn; + } +} + +void BgHidanCurtain_TurnOff(BgHidanCurtain* this, GlobalContext* globalCtx) { + BgHidanCurtainParams* hcParams = &sHCParams[this->size]; + + if (Math_ApproxF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y - hcParams->riseDist, + hcParams->riseSpeed)) { + if ((this->type == 0) || (this->type == 6)) { + Actor_Kill(&this->actor); + } else if (this->type == 5) { + this->actionFunc = BgHidanCurtain_WaitForSwitchOff; + } else { + if (this->type == 2) { + this->timer = 400; + } else if (this->type == 4) { + this->timer = 200; + } else if (this->type == 3) { + this->timer = 160; + } else { // this->type == 1 + this->timer = 300; + } + this->actionFunc = BgHidanCurtain_WaitForTimer; + } + } +} + +void BgHidanCurtain_WaitForTimer(BgHidanCurtain* this, GlobalContext* globalCtx) { + DECR(this->timer); + if (this->timer == 0) { + this->actionFunc = BgHidanCurtain_TurnOn; + } + if ((this->type == 1) || (this->type == 3)) { + func_8002F994(&this->actor, this->timer); + } +} + +void BgHidanCurtain_Update(Actor* thisx, GlobalContext* globalCtx2) { + GlobalContext* globalCtx = globalCtx2; + BgHidanCurtain* this = THIS; + BgHidanCurtainParams* hcParams = &sHCParams[this->size]; + f32 riseProgress; + + if ((globalCtx->cameraPtrs[0]->setting == 0x28) || (globalCtx->cameraPtrs[0]->setting == 0x38)) { + this->collider.base.atFlags &= ~2; + } else { + if (this->collider.base.atFlags & 2) { + this->collider.base.atFlags &= ~2; + func_8002F71C(globalCtx, &this->actor, 5.0f, this->actor.yawTowardsLink, 1.0f); + } + if ((this->type == 4) || (this->type == 5)) { + this->actor.posRot.pos.y = + (2.0f * this->actor.initPosRot.pos.y) - hcParams->riseDist - this->actor.posRot.pos.y; + } + + this->actionFunc(this, globalCtx); + + if ((this->type == 4) || (this->type == 5)) { + this->actor.posRot.pos.y = + (2.0f * this->actor.initPosRot.pos.y) - hcParams->riseDist - this->actor.posRot.pos.y; + } + riseProgress = + (hcParams->riseDist - (this->actor.initPosRot.pos.y - this->actor.posRot.pos.y)) / hcParams->riseDist; + this->alpha = 255.0f * riseProgress; + if (this->alpha > 50) { + this->collider.dim.height = hcParams->height * riseProgress; + CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + if (gSaveContext.sceneSetupIndex <= 3) { + func_8002F974(&this->actor, NA_SE_EV_FIRE_PILLAR_S - SFX_FLAG); + } + } else if ((this->type == 1) && Flags_GetTreasure(globalCtx, this->treasureFlag)) { + Actor_Kill(&this->actor); + } + this->texScroll++; + } +} + +void BgHidanCurtain_Draw(Actor* thisx, GlobalContext* globalCtx) { + BgHidanCurtain* this = THIS; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_hidan_curtain.c", 685); + func_80093D84(globalCtx->state.gfxCtx); + + gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0x80, 0x80, 255, 220, 0, this->alpha); + + gDPSetEnvColor(oGfxCtx->polyXlu.p++, 255, 0, 0, 0); + + gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, this->texScroll & 0x7F, 0, 0x20, 0x40, 1, 0, + (this->texScroll * -0xF) & 0xFF, 0x20, 0x40)); + + gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_hidan_curtain.c", 698), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + + gSPDisplayList(oGfxCtx->polyXlu.p++, D_040184B0); + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_hidan_curtain.c", 702); +} diff --git a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.h b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.h index e985223292..610898622a 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.h +++ b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.h @@ -6,9 +6,18 @@ struct BgHidanCurtain; +typedef void (*BgHidanCurtainActionFunc)(struct BgHidanCurtain*, GlobalContext*); + typedef struct BgHidanCurtain { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x58]; + /* 0x014C */ BgHidanCurtainActionFunc actionFunc; + /* 0x0150 */ u8 type; + /* 0x0151 */ u8 treasureFlag; + /* 0x0152 */ u8 size; + /* 0x0153 */ u8 alpha; + /* 0x0154 */ s16 timer; + /* 0x0156 */ s16 texScroll; + /* 0x0158 */ ColliderCylinder collider; } BgHidanCurtain; // size = 0x01A4 extern const ActorInit Bg_Hidan_Curtain_InitVars; diff --git a/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c b/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c index aecad983b9..be091d9faa 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c +++ b/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c @@ -1,3 +1,9 @@ +/* + * File: z_bg_mori_kaitenkabe.c + * Overlay: ovl_Bg_Mori_Kaitenkabe + * Description: Rotating wall in Forest Temple basement + */ + #include "z_bg_mori_kaitenkabe.h" #define FLAGS 0x00000000 @@ -7,8 +13,17 @@ void BgMoriKaitenkabe_Init(Actor* thisx, GlobalContext* globalCtx); void BgMoriKaitenkabe_Destroy(Actor* thisx, GlobalContext* globalCtx); void BgMoriKaitenkabe_Update(Actor* thisx, GlobalContext* globalCtx); +void BgMoriKaitenkabe_Draw(Actor* thisx, GlobalContext* globalCtx); + +void BgMoriKaitenkabe_WaitForMoriTex(BgMoriKaitenkabe* this, GlobalContext* globalCtx); +void BgMoriKaitenkabe_SetupWait(BgMoriKaitenkabe* this); +void BgMoriKaitenkabe_Wait(BgMoriKaitenkabe* this, GlobalContext* globalCtx); +void BgMoriKaitenkabe_SetupRotate(BgMoriKaitenkabe* this); +void BgMoriKaitenkabe_Rotate(BgMoriKaitenkabe* this, GlobalContext* globalCtx); + +extern ColHeader D_060063B8; +extern Gfx D_060056B0[]; -/* const ActorInit Bg_Mori_Kaitenkabe_InitVars = { ACTOR_BG_MORI_KAITENKABE, ACTORTYPE_BG, @@ -20,23 +35,145 @@ const ActorInit Bg_Mori_Kaitenkabe_InitVars = { (ActorFunc)BgMoriKaitenkabe_Update, NULL, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A4DC0.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/BgMoriKaitenkabe_Init.s") +static InitChainEntry sInitChain[] = { + ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneScale, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_CONTINUE), + ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/BgMoriKaitenkabe_Destroy.s") +void BgMoriKaitenkabe_CrossProduct(Vec3f* dest, Vec3f* v1, Vec3f* v2) { + dest->x = (v1->y * v2->z) - (v1->z * v2->y); + dest->y = (v1->z * v2->x) - (v1->x * v2->z); + dest->z = (v1->x * v2->y) - (v1->y * v2->x); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A4F3C.s") +void BgMoriKaitenkabe_Init(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + BgMoriKaitenkabe* this = THIS; + ColHeader* colHeader = NULL; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A4F90.s") + // Forest Temple object 【Rotating Wall (arg_data: 0x% 04x)】 appears + osSyncPrintf("◯◯◯森の神殿オブジェクト【回転壁(arg_data : 0x%04x)】出現 \n", this->dyna.actor.params); + Actor_ProcessInitChain(&this->dyna.actor, sInitChain); + DynaPolyInfo_SetActorMove(&this->dyna, 0); + DynaPolyInfo_Alloc(&D_060063B8, &colHeader); + this->dyna.dynaPolyId = + DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader); + this->moriTexObjIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_MORI_TEX); + if (this->moriTexObjIndex < 0) { + Actor_Kill(&this->dyna.actor); + // 【Rotating wall】 Bank danger! + osSyncPrintf("【回転壁】 バンク危険！(%s %d)\n", "../z_bg_mori_kaitenkabe.c", 176); + } else { + this->actionFunc = BgMoriKaitenkabe_WaitForMoriTex; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A4FA4.s") +void BgMoriKaitenkabe_Destroy(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + BgMoriKaitenkabe* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A5104.s") + DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A5120.s") +void BgMoriKaitenkabe_WaitForMoriTex(BgMoriKaitenkabe* this, GlobalContext* globalCtx) { + if (Object_IsLoaded(&globalCtx->objectCtx, this->moriTexObjIndex)) { + BgMoriKaitenkabe_SetupWait(this); + this->dyna.actor.draw = BgMoriKaitenkabe_Draw; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/BgMoriKaitenkabe_Update.s") +void BgMoriKaitenkabe_SetupWait(BgMoriKaitenkabe* this) { + this->actionFunc = BgMoriKaitenkabe_Wait; + this->timer = 0; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A52AC.s") +void BgMoriKaitenkabe_Wait(BgMoriKaitenkabe* this, GlobalContext* globalCtx) { + Vec3f push; + Vec3f leverArm; + Vec3f torque; + Player* player = PLAYER; + + if (this->dyna.unk_150 > 0.001f) { + this->timer++; + if ((this->timer > 28) && !Player_InCsMode(globalCtx)) { + BgMoriKaitenkabe_SetupRotate(this); + func_8002DF54(globalCtx, &this->dyna.actor, 8); + Math_Vec3f_Copy(&this->lockedPlayerPos, &player->actor.posRot.pos); + push.x = Math_Sins(this->dyna.unk_158); + push.y = 0.0f; + push.z = Math_Coss(this->dyna.unk_158); + leverArm.x = this->dyna.actor.posRot.pos.x - player->actor.posRot.pos.x; + leverArm.y = 0.0f; + leverArm.z = this->dyna.actor.posRot.pos.z - player->actor.posRot.pos.z; + BgMoriKaitenkabe_CrossProduct(&torque, &push, &leverArm); + this->rotDirection = (torque.y > 0.0f) ? 1.0f : -1.0f; + } + } else { + this->timer = 0; + } + if (fabsf(this->dyna.unk_150) > 0.001f) { + this->dyna.unk_150 = 0.0f; + player->stateFlags2 &= ~0x10; + } +} + +void BgMoriKaitenkabe_SetupRotate(BgMoriKaitenkabe* this) { + this->actionFunc = BgMoriKaitenkabe_Rotate; + this->rotSpeed = 0.0f; + this->rotYdeg = 0.0f; +} + +void BgMoriKaitenkabe_Rotate(BgMoriKaitenkabe* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + Actor* thisx = &this->dyna.actor; + s16 rotY; + + Math_ApproxF(&this->rotSpeed, 0.6f, 0.02f); + if (Math_ApproxF(&this->rotYdeg, this->rotDirection * 45.0f, this->rotSpeed)) { + BgMoriKaitenkabe_SetupWait(this); + func_8002DF54(globalCtx, thisx, 7); + if (this->rotDirection > 0.0f) { + thisx->initPosRot.rot.y += 0x2000; + } else { + thisx->initPosRot.rot.y -= 0x2000; + } + thisx->posRot.rot.y = thisx->shape.rot.y = thisx->initPosRot.rot.y; + func_800788CC(NA_SE_EV_STONEDOOR_STOP); + } else { + rotY = this->rotYdeg * (0x10000 / 360.0f); + thisx->posRot.rot.y = thisx->shape.rot.y = thisx->initPosRot.rot.y + rotY; + func_800788CC(NA_SE_EV_WALL_SLIDE - SFX_FLAG); + } + if (fabsf(this->dyna.unk_150) > 0.001f) { + this->dyna.unk_150 = 0.0f; + player->stateFlags2 &= ~0x10; + } + Math_Vec3f_Copy(&player->actor.posRot.pos, &this->lockedPlayerPos); +} + +void BgMoriKaitenkabe_Update(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + BgMoriKaitenkabe* this = THIS; + + this->actionFunc(this, globalCtx); +} + +void BgMoriKaitenkabe_Draw(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + BgMoriKaitenkabe* this = THIS; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_mori_kaitenkabe.c", 347); + func_80093D18(globalCtx->state.gfxCtx); + + gSPSegment(oGfxCtx->polyOpa.p++, 0x08, globalCtx->objectCtx.status[this->moriTexObjIndex].segment); + + gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mori_kaitenkabe.c", 352), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + + gSPDisplayList(oGfxCtx->polyOpa.p++, D_060056B0); + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_mori_kaitenkabe.c", 356); +} diff --git a/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.h b/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.h index ac941f86ec..d18287b064 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.h +++ b/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.h @@ -6,9 +6,17 @@ struct BgMoriKaitenkabe; +typedef void (*BgMoriKaitenkabeActionFunc)(struct BgMoriKaitenkabe*, GlobalContext*); + typedef struct BgMoriKaitenkabe { - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x3C]; + /* 0x0000 */ DynaPolyActor dyna; + /* 0x0164 */ BgMoriKaitenkabeActionFunc actionFunc; + /* 0x0168 */ s32 timer; + /* 0x016C */ f32 rotDirection; + /* 0x0170 */ f32 rotSpeed; + /* 0x0174 */ f32 rotYdeg; + /* 0x0178 */ Vec3f lockedPlayerPos; + /* 0x0184 */ s8 moriTexObjIndex; } BgMoriKaitenkabe; // size = 0x0188 extern const ActorInit Bg_Mori_Kaitenkabe_InitVars; diff --git a/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c b/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c index 6cbfe95327..812fba0ff3 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c +++ b/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c @@ -1,3 +1,9 @@ +/* + * File: z_bg_mori_rakkatenjo.c + * Overlay: ovl_Bg_Mori_Rakkatenjo + * Description: Falling ceiling in Forest Temple + */ + #include "z_bg_mori_rakkatenjo.h" #define FLAGS 0x00000030 @@ -7,8 +13,24 @@ void BgMoriRakkatenjo_Init(Actor* thisx, GlobalContext* globalCtx); void BgMoriRakkatenjo_Destroy(Actor* thisx, GlobalContext* globalCtx); void BgMoriRakkatenjo_Update(Actor* thisx, GlobalContext* globalCtx); +void BgMoriRakkatenjo_Draw(Actor* thisx, GlobalContext* globalCtx); + +void BgMoriRakkatenjo_SetupWaitForMoriTex(BgMoriRakkatenjo* this); +void BgMoriRakkatenjo_WaitForMoriTex(BgMoriRakkatenjo* this, GlobalContext* globalCtx); +void BgMoriRakkatenjo_SetupWait(BgMoriRakkatenjo* this); +void BgMoriRakkatenjo_Wait(BgMoriRakkatenjo* this, GlobalContext* globalCtx); +void BgMoriRakkatenjo_SetupFall(BgMoriRakkatenjo* this); +void BgMoriRakkatenjo_Fall(BgMoriRakkatenjo* this, GlobalContext* globalCtx); +void BgMoriRakkatenjo_SetupRest(BgMoriRakkatenjo* this); +void BgMoriRakkatenjo_Rest(BgMoriRakkatenjo* this, GlobalContext* globalCtx); +void BgMoriRakkatenjo_SetupRise(BgMoriRakkatenjo* this); +void BgMoriRakkatenjo_Rise(BgMoriRakkatenjo* this, GlobalContext* globalCtx); + +extern ColHeader D_060087AC; +extern Gfx D_06007690[]; + +static s16 sCamSetting = 0; -/* const ActorInit Bg_Mori_Rakkatenjo_InitVars = { ACTOR_BG_MORI_RAKKATENJO, ACTORTYPE_BG, @@ -20,35 +42,199 @@ const ActorInit Bg_Mori_Rakkatenjo_InitVars = { (ActorFunc)BgMoriRakkatenjo_Update, NULL, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/BgMoriRakkatenjo_Init.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/BgMoriRakkatenjo_Destroy.s") +static InitChainEntry sInitChain[] = { + ICHAIN_F32(gravity, -1, ICHAIN_CONTINUE), + ICHAIN_F32(minVelocityY, -11, ICHAIN_CONTINUE), + ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5724.s") +void BgMoriRakkatenjo_Init(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + BgMoriRakkatenjo* this = THIS; + ColHeader* colHeader = NULL; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A57D4.s") + DynaPolyInfo_SetActorMove(&this->dyna, DPM_PLAYER); + // Forest Temple obj. Falling Ceiling + osSyncPrintf("森の神殿 obj. 落下天井 (home posY %f)\n", this->dyna.actor.initPosRot.pos.y); + if ((fabsf(1991.0f - this->dyna.actor.initPosRot.pos.x) > 0.001f) || + (fabsf(683.0f - this->dyna.actor.initPosRot.pos.y) > 0.001f) || + (fabsf(-2520.0f - this->dyna.actor.initPosRot.pos.z) > 0.001f)) { + // The set position has been changed. Let's fix the program. + osSyncPrintf("Warning : セット位置が変更されています。プログラムを修正しましょう。\n"); + } + if (this->dyna.actor.initPosRot.rot.y != 0x8000) { + // The set Angle has changed. Let's fix the program. + osSyncPrintf("Warning : セット Angle が変更されています。プログラムを修正しましょう。\n"); + } + this->moriTexObjIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_MORI_TEX); + if (this->moriTexObjIndex < 0) { + // Forest Temple obj Falling Ceiling Bank Danger! + osSyncPrintf("Error : 森の神殿 obj 落下天井 バンク危険！(%s %d)\n", "../z_bg_mori_rakkatenjo.c", 205); + Actor_Kill(&this->dyna.actor); + return; + } + Actor_ProcessInitChain(&this->dyna.actor, sInitChain); + DynaPolyInfo_Alloc(&D_060087AC, &colHeader); + this->dyna.dynaPolyId = + DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader); + BgMoriRakkatenjo_SetupWaitForMoriTex(this); + sCamSetting = 0; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5884.s") +void BgMoriRakkatenjo_Destroy(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + BgMoriRakkatenjo* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5894.s") + DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A58E8.s") +s32 BgMoriRakkatenjo_IsLinkUnder(BgMoriRakkatenjo* this, GlobalContext* globalCtx) { + Vec3f* pos = &PLAYER->actor.posRot.pos; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5920.s") + return (-3300.0f < pos->z) && (pos->z < -1840.0f) && (1791.0f < pos->x) && (pos->x < 2191.0f); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A59F0.s") +s32 BgMoriRakkatenjo_IsLinkClose(BgMoriRakkatenjo* this, GlobalContext* globalCtx) { + Vec3f* pos = &PLAYER->actor.posRot.pos; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5A0C.s") + return (-3360.0f < pos->z) && (pos->z < -1840.0f) && (1791.0f < pos->x) && (pos->x < 2191.0f); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5B80.s") +void BgMoriRakkatenjo_SetupWaitForMoriTex(BgMoriRakkatenjo* this) { + this->actionFunc = BgMoriRakkatenjo_WaitForMoriTex; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5BA4.s") +void BgMoriRakkatenjo_WaitForMoriTex(BgMoriRakkatenjo* this, GlobalContext* globalCtx) { + if (Object_IsLoaded(&globalCtx->objectCtx, this->moriTexObjIndex)) { + BgMoriRakkatenjo_SetupWait(this); + this->dyna.actor.draw = BgMoriRakkatenjo_Draw; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5BD4.s") +void BgMoriRakkatenjo_SetupWait(BgMoriRakkatenjo* this) { + this->timer = (this->fallCount > 0) ? 100 : 21; + this->dyna.actor.posRot.pos.y = 683.0f; + this->actionFunc = BgMoriRakkatenjo_Wait; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5BF0.s") +void BgMoriRakkatenjo_Wait(BgMoriRakkatenjo* this, GlobalContext* globalCtx) { + if (this->fallCount == 0) { + if (BgMoriRakkatenjo_IsLinkClose(this, globalCtx) || (this->timer < 20)) { + if (this->timer <= 0) { + BgMoriRakkatenjo_SetupFall(this); + } + } else { + this->timer = 21; + } + } else { + if (BgMoriRakkatenjo_IsLinkUnder(this, globalCtx) || (this->timer < 20)) { + if (this->timer <= 0) { + BgMoriRakkatenjo_SetupFall(this); + } + } else { + this->timer = 100; + } + } + if (this->timer < 20) { + func_800788CC(NA_SE_EV_BLOCKSINK - SFX_FLAG); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/BgMoriRakkatenjo_Update.s") +void BgMoriRakkatenjo_SetupFall(BgMoriRakkatenjo* this) { + this->actionFunc = BgMoriRakkatenjo_Fall; + this->bounceCount = 0; + this->dyna.actor.velocity.y = 0.0f; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5D60.s") +void BgMoriRakkatenjo_Fall(BgMoriRakkatenjo* this, GlobalContext* globalCtx) { + static f32 bounceVel[] = { 4.0f, 1.5f, 0.4f, 0.1f }; + s32 pad; + Actor* thisx = &this->dyna.actor; + s32 quake; + + Actor_MoveForward(thisx); + if ((thisx->velocity.y < 0.0f) && (thisx->posRot.pos.y <= 403.0f)) { + if (this->bounceCount >= ARRAY_COUNT(bounceVel)) { + BgMoriRakkatenjo_SetupRest(this); + } else { + if (this->bounceCount == 0) { + this->fallCount++; + func_800788CC(NA_SE_EV_STONE_BOUND); + func_800AA000(SQ(thisx->yDistFromLink), 0xFF, 0x14, 0x96); + } + thisx->posRot.pos.y = + 403.0f - (thisx->posRot.pos.y - 403.0f) * bounceVel[this->bounceCount] / fabsf(thisx->velocity.y); + thisx->velocity.y = bounceVel[this->bounceCount]; + this->bounceCount++; + quake = Quake_Add(ACTIVE_CAM, 3); + Quake_SetSpeed(quake, 50000); + Quake_SetQuakeValues(quake, 5, 0, 0, 0); + Quake_SetCountdown(quake, 5); + } + } +} + +void BgMoriRakkatenjo_SetupRest(BgMoriRakkatenjo* this) { + this->actionFunc = BgMoriRakkatenjo_Rest; + this->dyna.actor.posRot.pos.y = 403.0f; + this->timer = 20; +} + +void BgMoriRakkatenjo_Rest(BgMoriRakkatenjo* this, GlobalContext* globalCtx) { + if (this->timer <= 0) { + BgMoriRakkatenjo_SetupRise(this); + } +} + +void BgMoriRakkatenjo_SetupRise(BgMoriRakkatenjo* this) { + this->actionFunc = BgMoriRakkatenjo_Rise; + this->dyna.actor.velocity.y = -0.1f; +} + +void BgMoriRakkatenjo_Rise(BgMoriRakkatenjo* this, GlobalContext* globalCtx) { + Math_SmoothScaleMaxMinF(&this->dyna.actor.velocity.y, 5.0f, 0.06f, 0.1f, 0.0f); + this->dyna.actor.posRot.pos.y += this->dyna.actor.velocity.y; + if (this->dyna.actor.posRot.pos.y >= 683.0f) { + BgMoriRakkatenjo_SetupWait(this); + } +} + +void BgMoriRakkatenjo_Update(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + BgMoriRakkatenjo* this = THIS; + + if (this->timer > 0) { + this->timer--; + } + this->actionFunc(this, globalCtx); + if (BgMoriRakkatenjo_IsLinkUnder(this, globalCtx)) { + if (sCamSetting == 0) { + osSyncPrintf("camera changed (mori rakka tenjyo) ... \n"); + sCamSetting = globalCtx->cameraPtrs[0]->setting; + Camera_SetCameraData(globalCtx->cameraPtrs[0], 1, &this->dyna.actor, NULL, 0, 0, 0); + func_8005A77C(globalCtx->cameraPtrs[0], 0x27); + } + } else if (sCamSetting != 0) { + osSyncPrintf("camera changed (previous) ... \n"); + func_8005A77C(globalCtx->cameraPtrs[0], 4); + sCamSetting = 0; + } +} + +void BgMoriRakkatenjo_Draw(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + BgMoriRakkatenjo* this = THIS; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_mori_rakkatenjo.c", 497); + func_80093D18(globalCtx->state.gfxCtx); + + gSPSegment(oGfxCtx->polyOpa.p++, 0x08, globalCtx->objectCtx.status[this->moriTexObjIndex].segment); + + gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mori_rakkatenjo.c", 502), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + + gSPDisplayList(oGfxCtx->polyOpa.p++, D_06007690); + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_mori_rakkatenjo.c", 506); +} diff --git a/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.h b/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.h index d6c07f2992..edb1d68d4a 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.h +++ b/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.h @@ -6,9 +6,15 @@ struct BgMoriRakkatenjo; +typedef void (*BgMoriRakkatenjoActionFunction)(struct BgMoriRakkatenjo*, GlobalContext*); + typedef struct BgMoriRakkatenjo { - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x2C]; + /* 0x0000 */ DynaPolyActor dyna; + /* 0x0164 */ BgMoriRakkatenjoActionFunction actionFunc; + /* 0x0168 */ s32 timer; + /* 0x016C */ s32 bounceCount; + /* 0x0170 */ s32 fallCount; + /* 0x0174 */ s8 moriTexObjIndex; } BgMoriRakkatenjo; // size = 0x0178 extern const ActorInit Bg_Mori_Rakkatenjo_InitVars; diff --git a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c index fddcb8b5f0..cbf23f1937 100644 --- a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c +++ b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c @@ -1,3 +1,9 @@ +/* + * File: z_bg_po_event.c + * Overlay: ovl_Bg_Po_Event + * Description: Poe sisters' paintings and puzzle blocks + */ + #include "z_bg_po_event.h" #define FLAGS 0x00000000 @@ -9,7 +15,27 @@ void BgPoEvent_Destroy(Actor* thisx, GlobalContext* globalCtx); void BgPoEvent_Update(Actor* thisx, GlobalContext* globalCtx); void BgPoEvent_Draw(Actor* thisx, GlobalContext* globalCtx); -/* +void BgPoEvent_BlockWait(BgPoEvent* this, GlobalContext* globalCtx); +void BgPoEvent_BlockShake(BgPoEvent* this, GlobalContext* globalCtx); +void BgPoEvent_BlockFall(BgPoEvent* this, GlobalContext* globalCtx); +void BgPoEvent_BlockIdle(BgPoEvent* this, GlobalContext* globalCtx); +void BgPoEvent_BlockPush(BgPoEvent* this, GlobalContext* globalCtx); +void BgPoEvent_BlockReset(BgPoEvent* this, GlobalContext* globalCtx); +void BgPoEvent_BlockSolved(BgPoEvent* this, GlobalContext* globalCtx); +void BgPoEvent_AmyWait(BgPoEvent* this, GlobalContext* globalCtx); // Amy is the green Poe +void BgPoEvent_AmyPuzzle(BgPoEvent* this, GlobalContext* globalCtx); +void BgPoEvent_PaintingEmpty(BgPoEvent* this, GlobalContext* globalCtx); +void BgPoEvent_PaintingAppear(BgPoEvent* this, GlobalContext* globalCtx); +void BgPoEvent_PaintingPresent(BgPoEvent* this, GlobalContext* globalCtx); +void BgPoEvent_PaintingBurn(BgPoEvent* this, GlobalContext* globalCtx); + +extern Gfx D_060075A0[]; +extern Gfx D_060079E0[]; +extern Gfx D_06006830[]; +extern Gfx D_06006D60[]; +extern Gfx D_06007230[]; +extern ColHeader D_06007860; + const ActorInit Bg_Po_Event_InitVars = { ACTOR_BG_PO_EVENT, ACTORTYPE_BG, @@ -21,47 +47,573 @@ const ActorInit Bg_Po_Event_InitVars = { (ActorFunc)BgPoEvent_Update, (ActorFunc)BgPoEvent_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A6210.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A658C.s") +static ColliderTrisItemInit sTrisItemsInit[2] = { + { + { 0x04, { 0x00000000, 0x00, 0x00 }, { 0x0001F820, 0x00, 0x00 }, 0x00, 0x01, 0x00 }, + { { { 25.0f, 33.0f, 0.0f }, { -25.0f, 33.0f, 0.0f }, { -25.0f, -33.0f, 0.0f } } }, + }, + { + { 0x04, { 0x00000000, 0x00, 0x00 }, { 0x0001F820, 0x00, 0x00 }, 0x00, 0x01, 0x00 }, + { { { 25.0f, 33.0f, 0.0f }, { -25.0f, -33.0f, 0.0f }, { 25.0f, -33.0f, 0.0f } } }, + }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Init.s") +static ColliderTrisInit sTrisInit = { + { COLTYPE_UNK10, 0x00, 0x09, 0x00, 0x20, COLSHAPE_TRIS }, + 2, + sTrisItemsInit, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Destroy.s") +static u8 sBlocksAtRest = 0; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A68D0.s") +static Vec3f sZeroVec = { 0.0f, 0.0f, 0.0f }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A69DC.s") +static u8 sPuzzleState; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A6A94.s") +void BgPoEvent_InitPaintings(BgPoEvent* this, GlobalContext* globalCtx) { + static s16 paintingPosX[] = { -1302, -866, 1421, 985 }; + static s16 paintingPosY[] = { 1107, 1091 }; + static s16 paintingPosZ[] = { -3384, -3252 }; + ColliderTrisItemInit* item; + Vec3f* vtxVec; + s32 i1; + s32 i2; + Vec3f sp9C[3]; + f32 coss; + f32 sins; + f32 scaleY; + s32 phi_t2; + Actor* newPainting; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A6BC8.s") + sins = Math_Sins(this->dyna.actor.shape.rot.y); + coss = Math_Coss(this->dyna.actor.shape.rot.y); + if (this->type == 4) { + sins *= 2.4f; + scaleY = 1.818f; + coss *= 2.4f; + } else { + scaleY = 1.0f; + } + for (i1 = 0; i1 < sTrisInit.count; i1++) { + item = &sTrisInit.list[i1]; + if (1) {} // This section looks like a macro of some sort. + for (i2 = 0; i2 < 3; i2++) { + vtxVec = &item->dim.vtx[i2]; + sp9C[i2].x = (vtxVec->x * coss) + (this->dyna.actor.initPosRot.pos.x + (sins * vtxVec->z)); + sp9C[i2].y = (vtxVec->y * scaleY) + this->dyna.actor.initPosRot.pos.y; + sp9C[i2].z = this->dyna.actor.initPosRot.pos.z + (coss * vtxVec->z) - (vtxVec->x * sins); + } + func_800627A0(&this->collider, i1, &sp9C[0], &sp9C[1], &sp9C[2]); + } + if ((this->type != 4) && (this->index != 2)) { + phi_t2 = (this->type == 2) ? this->index : this->index + 2; + newPainting = Actor_SpawnAsChild(&globalCtx->actorCtx, &this->dyna.actor, globalCtx, ACTOR_BG_PO_EVENT, + paintingPosX[phi_t2], paintingPosY[this->index], paintingPosZ[this->index], 0, + this->dyna.actor.shape.rot.y + 0x8000, 0, + ((this->index + 1) << 0xC) + (this->type << 8) + this->dyna.actor.params); + if (newPainting == NULL) { + Actor_Kill(&this->dyna.actor); + return; + } + if (this->index == 0) { + if (this->dyna.actor.child->child == NULL) { + Actor_Kill(&this->dyna.actor); + return; + } + this->dyna.actor.parent = this->dyna.actor.child->child; + this->dyna.actor.child->child->child = &this->dyna.actor; + } + } + this->timer = 0; + if (this->type == 4) { + sPuzzleState = 0; + this->actionFunc = BgPoEvent_AmyWait; + } else { + sPuzzleState = (s32)(Math_Rand_ZeroOne() * 3.0f) % 3; + this->actionFunc = BgPoEvent_PaintingEmpty; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A6CCC.s") +void BgPoEvent_InitBlocks(BgPoEvent* this, GlobalContext* globalCtx) { + static s16 blockPosX[] = { 2149, 1969, 1909 }; + static s16 blockPosZ[] = { -1410, -1350, -1530 }; + Actor* newBlock; + ColHeader* colHeader = NULL; + s32 bgId; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A6F7C.s") + this->dyna.actor.flags |= 0x30; + DynaPolyInfo_Alloc(&D_06007860, &colHeader); + this->dyna.dynaPolyId = + DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader); + if ((this->type == 0) && (this->index != 3)) { + newBlock = Actor_SpawnAsChild(&globalCtx->actorCtx, &this->dyna.actor, globalCtx, ACTOR_BG_PO_EVENT, + blockPosX[this->index], this->dyna.actor.posRot.pos.y, blockPosZ[this->index], 0, + this->dyna.actor.shape.rot.y, this->dyna.actor.shape.rot.z - 0x4000, + ((this->index + 1) << 0xC) + (this->type << 8) + this->dyna.actor.params); + if (newBlock == NULL) { + Actor_Kill(&this->dyna.actor); + return; + } + if (this->index == 0) { + if (this->dyna.actor.child->child == NULL) { + Actor_Kill(&this->dyna.actor); + return; + } + if (this->dyna.actor.child->child->child == NULL) { + Actor_Kill(&this->dyna.actor); + Actor_Kill(this->dyna.actor.child); + return; + } + this->dyna.actor.parent = this->dyna.actor.child->child->child; + this->dyna.actor.child->child->child->child = &this->dyna.actor; + } + } + this->dyna.actor.posRot.pos.y = 833.0f; + this->dyna.actor.groundY = func_8003C9A4(&globalCtx->colCtx, &this->dyna.actor.floorPoly, &bgId, &this->dyna.actor, + &this->dyna.actor.posRot.pos); + this->actionFunc = BgPoEvent_BlockWait; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7138.s") +static InitChainEntry sInitChain[] = { + ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7238.s") +void BgPoEvent_Init(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + BgPoEvent* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A72AC.s") + Actor_ProcessInitChain(thisx, sInitChain); + this->type = (thisx->params >> 8) & 0xF; + this->index = (thisx->params >> 0xC) & 0xF; + thisx->params &= 0x3F; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7328.s") + if (this->type >= 2) { + Collider_InitTris(globalCtx, &this->collider); + Collider_SetTris(globalCtx, &this->collider, thisx, &sTrisInit, this->colliderItems); + if (Flags_GetSwitch(globalCtx, thisx->params)) { + Actor_Kill(thisx); + } else { + BgPoEvent_InitPaintings(this, globalCtx); + } + } else { + DynaPolyInfo_SetActorMove(&this->dyna, DPM_UNK); + if (Flags_GetSwitch(globalCtx, thisx->params)) { + Actor_Kill(thisx); + } else { + BgPoEvent_InitBlocks(this, globalCtx); + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7444.s") +void BgPoEvent_Destroy(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + BgPoEvent* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7500.s") + if (this->type >= 2) { + Collider_DestroyTris(globalCtx, &this->collider); + } else { + DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); + if ((this->type == 1) && (gSaveContext.timer1Value > 0)) { + gSaveContext.timer1State = 0xA; + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7530.s") +void BgPoEvent_BlockWait(BgPoEvent* this, GlobalContext* globalCtx) { + this->dyna.actor.posRot.pos.y = 833.0f; + if (sPuzzleState == 0x3F) { + if (this->type == 1) { + func_800800F8(globalCtx, 0xC4E, 0x41, NULL, 0); + } + this->timer = 45; + this->actionFunc = BgPoEvent_BlockShake; + } else if (this->dyna.actor.xzDistFromLink > 50.0f) { + if (this->type != 1) { + sPuzzleState |= (1 << this->index); + } else { + sPuzzleState |= 0x10; + } + } else if (this->type != 1) { + sPuzzleState &= ~(1 << this->index); + } else { + sPuzzleState &= ~0x10; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7568.s") +void BgPoEvent_BlockShake(BgPoEvent* this, GlobalContext* globalCtx) { + DECR(this->timer); + if (this->timer < 15) { + this->dyna.actor.posRot.pos.x = this->dyna.actor.initPosRot.pos.x + 2.0f * ((this->timer % 3) - 1); + if (!(this->timer % 4)) { + Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_BLOCK_SHAKE); + } + } + if (this->timer == 0) { + this->dyna.actor.posRot.pos.x = this->dyna.actor.initPosRot.pos.x; + sPuzzleState = 0; + this->timer = 60; + this->actionFunc = BgPoEvent_BlockFall; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A75B8.s") +void BgPoEvent_CheckBlock(BgPoEvent* this) { + s32 phi_v1; + s32 phi_a1; + s32 phi_t0; + s32 phi_a3; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A780C.s") + if ((this->index == 3) || (this->index == 1)) { + phi_v1 = this->dyna.actor.posRot.pos.z; + phi_a1 = this->dyna.actor.child->posRot.pos.z; + if (this->index == 3) { + phi_a3 = this->dyna.actor.posRot.pos.x; + phi_t0 = this->dyna.actor.child->posRot.pos.x; + } else { // this->index == 1 + phi_a3 = this->dyna.actor.child->posRot.pos.x; + phi_t0 = this->dyna.actor.posRot.pos.x; + } + } else { + phi_v1 = this->dyna.actor.posRot.pos.x; + phi_a1 = this->dyna.actor.child->posRot.pos.x; + if (this->index == 0) { + phi_a3 = this->dyna.actor.posRot.pos.z; + phi_t0 = this->dyna.actor.child->posRot.pos.z; + } else { // this->index == 2 + phi_a3 = this->dyna.actor.child->posRot.pos.z; + phi_t0 = this->dyna.actor.posRot.pos.z; + } + } + if ((phi_v1 == phi_a1) && ((phi_t0 - phi_a3) == 60)) { + sPuzzleState |= (1 << this->index); + } else { + sPuzzleState &= ~(1 << this->index); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Update.s") +void BgPoEvent_BlockFall(BgPoEvent* this, GlobalContext* globalCtx) { + static s32 firstFall = 0; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Draw.s") + this->dyna.actor.velocity.y++; + if (Math_ApproxF(&this->dyna.actor.posRot.pos.y, 433.0f, this->dyna.actor.velocity.y)) { + this->dyna.actor.flags &= ~0x20; + this->dyna.actor.velocity.y = 0.0f; + sBlocksAtRest++; + if (this->type != 1) { + BgPoEvent_CheckBlock(this); + } else { + Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_STONE_BOUND); + func_80033E88(&this->dyna.actor, globalCtx, 5, 5); + func_80088B34(this->timer); + if (firstFall == 0) { + firstFall = 1; + } else { + func_8002DF54(globalCtx, &PLAYER->actor, 7); + } + } + this->direction = 0; + this->actionFunc = BgPoEvent_BlockIdle; + } +} + +void BgPoEvent_BlockIdle(BgPoEvent* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + Actor* amy; + + if (sPuzzleState == 0xF) { + this->actionFunc = BgPoEvent_BlockSolved; + if ((this->type == 0) && (this->index == 0)) { + amy = + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_PO_SISTERS, this->dyna.actor.posRot.pos.x + 30.0f, + this->dyna.actor.posRot.pos.y - 30.0f, this->dyna.actor.posRot.pos.z + 30.0f, 0, + this->dyna.actor.shape.rot.y, 0, this->dyna.actor.params + 0x300); + if (amy != NULL) { + func_800800F8(globalCtx, 0xC62, 0x1E, amy, 0); + } + func_80078884(NA_SE_SY_CORRECT_CHIME); + gSaveContext.timer1State = 0xA; + } + } else { + if ((gSaveContext.timer1Value == 0) && (sBlocksAtRest == 5)) { + player->stateFlags2 &= ~0x10; + sPuzzleState = 0x10; + sBlocksAtRest = 0; + } + if ((sPuzzleState == 0x40) || ((sPuzzleState == 0x10) && !Player_InCsMode(globalCtx))) { + this->dyna.actor.posRot.rot.z = this->dyna.actor.shape.rot.z; + this->actionFunc = BgPoEvent_BlockReset; + if (sPuzzleState == 0x10) { + sPuzzleState = 0x40; + Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_BLOCK_RISING); + func_8002DF54(globalCtx, &player->actor, 8); + } + } else if (this->dyna.unk_150 != 0.0f) { + if (this->direction == 0) { + if (func_800435D8(globalCtx, &this->dyna, 0x1E, 0x32, -0x14) != 0) { + sBlocksAtRest--; + this->direction = (this->dyna.unk_150 >= 0.0f) ? 1.0f : -1.0f; + this->actionFunc = BgPoEvent_BlockPush; + } else { + player->stateFlags2 &= ~0x10; + this->dyna.unk_150 = 0.0f; + } + } else { + player->stateFlags2 &= ~0x10; + this->dyna.unk_150 = 0.0f; + DECR(this->direction); + } + } else { + this->direction = 0; + } + } +} + +void BgPoEvent_BlockPush(BgPoEvent* this, GlobalContext* globalCtx) { + static f32 blockPushDist = 0.0f; + f32 displacement; + s32 blockStop; + Player* player = PLAYER; + + this->dyna.actor.speedXZ += 0.1f; + this->dyna.actor.speedXZ = CLAMP_MAX(this->dyna.actor.speedXZ, 2.0f); + blockStop = Math_ApproxF(&blockPushDist, 20.0f, this->dyna.actor.speedXZ); + displacement = this->direction * blockPushDist; + this->dyna.actor.posRot.pos.x = (Math_Sins(this->dyna.unk_158) * displacement) + this->dyna.actor.initPosRot.pos.x; + this->dyna.actor.posRot.pos.z = (Math_Coss(this->dyna.unk_158) * displacement) + this->dyna.actor.initPosRot.pos.z; + if (blockStop) { + player->stateFlags2 &= ~0x10; + if ((this->dyna.unk_150 > 0.0f) && (func_800435D8(globalCtx, &this->dyna, 0x1E, 0x32, -0x14) == 0)) { + Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_BLOCK_BOUND); + } + this->dyna.unk_150 = 0.0f; + this->dyna.actor.initPosRot.pos.x = this->dyna.actor.posRot.pos.x; + this->dyna.actor.initPosRot.pos.z = this->dyna.actor.posRot.pos.z; + blockPushDist = 0.0f; + this->dyna.actor.speedXZ = 0.0f; + this->direction = 5; + sBlocksAtRest++; + this->actionFunc = BgPoEvent_BlockIdle; + if (this->type == 1) { + return; + } + BgPoEvent_CheckBlock(this); + BgPoEvent_CheckBlock((BgPoEvent*)this->dyna.actor.parent); + } + func_8002F974(&this->dyna.actor, NA_SE_EV_ROCK_SLIDE - SFX_FLAG); +} + +void BgPoEvent_BlockReset(BgPoEvent* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + if (this->dyna.unk_150 != 0.0f) { + player->stateFlags2 &= ~0x10; + this->dyna.unk_150 = 0.0f; + } + if (Math_ApproxF(&this->dyna.actor.posRot.pos.y, 493.0f, 1.0f) && + Math_ApproxUpdateScaledS(&this->dyna.actor.shape.rot.z, this->dyna.actor.posRot.rot.z - 0x4000, 0x400)) { + + this->index = (this->index + 1) % 4; + this->actionFunc = BgPoEvent_BlockFall; + sPuzzleState = 0; + if (this->type == 1) { + this->timer += 10; + this->timer = CLAMP_MAX(this->timer, 120); + } + } +} + +void BgPoEvent_BlockSolved(BgPoEvent* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + if (this->dyna.unk_150 != 0.0f) { + player->stateFlags2 &= ~0x10; + } + if (Math_ApproxF(&this->dyna.actor.posRot.pos.y, 369.0f, 2.0f)) { + sPuzzleState = 0x20; + Actor_Kill(&this->dyna.actor); + } +} + +void BgPoEvent_AmyWait(BgPoEvent* this, GlobalContext* globalCtx) { + if (this->collider.base.acFlags & 2) { + sPuzzleState |= 0x20; + this->timer = 5; + func_8003426C(&this->dyna.actor, 0x4000, 0xFF, 0, 5); + Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EN_PO_LAUGH2); + this->actionFunc = BgPoEvent_AmyPuzzle; + } +} + +void BgPoEvent_AmyPuzzle(BgPoEvent* this, GlobalContext* globalCtx) { + Vec3f pos; + + if (sPuzzleState == 0xF) { + pos.x = this->dyna.actor.posRot.pos.x - 5.0f; + pos.y = Math_Rand_CenteredFloat(120.0f) + this->dyna.actor.posRot.pos.y; + pos.z = Math_Rand_CenteredFloat(120.0f) + this->dyna.actor.posRot.pos.z; + EffectSsDeadDb_Spawn(globalCtx, &pos, &sZeroVec, &sZeroVec, 170, 0, 200, 255, 100, 170, 0, 255, 0, 1, 9, true); + } else if (sPuzzleState == 0x20) { + Actor_Kill(&this->dyna.actor); + } else { + DECR(this->timer); + } +} + +s32 BgPoEvent_NextPainting(BgPoEvent* this) { + if ((this->dyna.actor.parent != NULL) && (this->dyna.actor.child != NULL)) { + if (Math_Rand_ZeroOne() < 0.5f) { + sPuzzleState = ((BgPoEvent*)this->dyna.actor.parent)->index; + } else { + sPuzzleState = ((BgPoEvent*)this->dyna.actor.child)->index; + } + } else if (this->dyna.actor.parent != NULL) { + sPuzzleState = ((BgPoEvent*)this->dyna.actor.parent)->index; + } else if (this->dyna.actor.child != NULL) { + sPuzzleState = ((BgPoEvent*)this->dyna.actor.child)->index; + } else { + return false; + } + return true; +} + +void BgPoEvent_PaintingEmpty(BgPoEvent* this, GlobalContext* globalCtx) { + if (sPuzzleState == this->index) { + this->timer = 255; + this->actionFunc = BgPoEvent_PaintingAppear; + } +} + +void BgPoEvent_PaintingAppear(BgPoEvent* this, GlobalContext* globalCtx) { + this->timer -= 20; + if (this->timer <= 0) { + this->timer = 1000; + this->actionFunc = BgPoEvent_PaintingPresent; + } +} + +void BgPoEvent_PaintingVanish(BgPoEvent* this, GlobalContext* globalCtx) { + this->timer += 20; + if (this->timer >= 255) { + BgPoEvent_NextPainting(this); + this->actionFunc = BgPoEvent_PaintingEmpty; + } +} + +void BgPoEvent_PaintingPresent(BgPoEvent* this, GlobalContext* globalCtx) { + Actor* thisx = &this->dyna.actor; + Player* player = PLAYER; + + DECR(this->timer); + + if (((this->timer == 0) || ((thisx->xzDistFromLink < 150.0f) && (thisx->yDistFromLink < 50.0f)) || + (func_8002DD78(player) && (thisx->xzDistFromLink < 320.0f) && + ((this->index != 2) ? (thisx->yDistFromLink < 100.0f) : (thisx->yDistFromLink < 0.0f)) && + func_8002DFC8(thisx, 0x2000, globalCtx))) && + ((thisx->parent != NULL) || (thisx->child != NULL))) { + /*The third condition in the || is checking if + 1) Link is holding a ranged weapon + 2) Link is too close in the xz plane + 3) Link is too close in the y direction. The painting + under the balcony allows him to be closer. + 4) Link is within 45 degrees of facing the painting. */ + this->timer = 0; + Audio_PlayActorSound2(thisx, NA_SE_EN_PO_LAUGH); + this->actionFunc = BgPoEvent_PaintingVanish; + } else if (this->collider.base.acFlags & 2) { + if (!BgPoEvent_NextPainting(this)) { + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_PO_SISTERS, thisx->posRot.pos.x, + thisx->posRot.pos.y - 40.0f, thisx->posRot.pos.z, 0, thisx->shape.rot.y, 0, + thisx->params + ((this->type - 1) << 8)); + func_800800F8(globalCtx, 0xC58, 0x50, thisx, 0); + func_80078884(NA_SE_SY_CORRECT_CHIME); + + } else { + Audio_PlayActorSound2(thisx, NA_SE_EN_PO_LAUGH2); + func_800800F8(globalCtx, 0xC58, 0x23, thisx, 0); + } + if (thisx->parent != NULL) { + thisx->parent->child = NULL; + thisx->parent = NULL; + } + if (thisx->child != NULL) { + thisx->child->parent = NULL; + thisx->child = NULL; + } + this->timer = 20; + this->actionFunc = BgPoEvent_PaintingBurn; + } +} + +void BgPoEvent_PaintingBurn(BgPoEvent* this, GlobalContext* globalCtx) { + Vec3f sp54; + + this->timer--; + sp54.x = (Math_Sins(this->dyna.actor.shape.rot.y) * 5.0f) + this->dyna.actor.posRot.pos.x; + sp54.y = Math_Rand_CenteredFloat(66.0f) + this->dyna.actor.posRot.pos.y; + sp54.z = Math_Rand_CenteredFloat(50.0f) + this->dyna.actor.posRot.pos.z; + if (this->timer >= 0) { + if (this->type == 2) { + EffectSsDeadDb_Spawn(globalCtx, &sp54, &sZeroVec, &sZeroVec, 100, 0, 255, 255, 150, 170, 255, 0, 0, 1, 9, + true); + } else { + EffectSsDeadDb_Spawn(globalCtx, &sp54, &sZeroVec, &sZeroVec, 100, 0, 200, 255, 255, 170, 50, 100, 255, 1, 9, + true); + } + } + if (this->timer == 0) { + this->dyna.actor.draw = NULL; + } + if (this->timer < -60) { + Actor_Kill(&this->dyna.actor); + } +} + +void BgPoEvent_Update(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + BgPoEvent* this = THIS; + + this->actionFunc(this, globalCtx); + if ((this->actionFunc == BgPoEvent_AmyWait) || (this->actionFunc == BgPoEvent_PaintingPresent)) { + CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + } +} + +void BgPoEvent_Draw(Actor* thisx, GlobalContext* globalCtx) { + static Gfx* displayLists[] = { D_060075A0, D_060079E0, D_06006830, D_06006D60, D_06007230 }; + s32 pad; + BgPoEvent* this = THIS; + u8 alpha; + Vec3f sp58; + Vec3f sp4C; + f32 sp48; + s32 pad2; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_po_event.c", 1481); + func_80093D18(globalCtx->state.gfxCtx); + if ((this->type == 3) || (this->type == 2)) { + if (this->actionFunc == BgPoEvent_PaintingEmpty) { + alpha = 255; + } else if (this->actionFunc == BgPoEvent_PaintingPresent) { + alpha = 0; + } else { + alpha = this->timer; + } + gDPSetEnvColor(oGfxCtx->polyOpa.p++, 255, 255, 255, alpha); + } + gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_po_event.c", 1501), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(oGfxCtx->polyOpa.p++, displayLists[this->type]); + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_po_event.c", 1508); + + if ((this->type == 0) || (this->type == 1)) { + sp48 = (833.0f - this->dyna.actor.posRot.pos.y) * 0.0025f; + if (!(sp48 > 1.0f)) { + sp58.x = this->dyna.actor.posRot.pos.x; + sp58.y = this->dyna.actor.posRot.pos.y - 30.0f; + sp58.z = this->dyna.actor.posRot.pos.z; + sp4C.y = 1.0f; + sp4C.x = sp4C.z = (sp48 * 0.3f) + 0.4f; + func_80033C30(&sp58, &sp4C, (u8)(155.0f + sp48 * 100.0f), globalCtx); + } + } +} diff --git a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.h b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.h index a908b42b48..a22b332cc0 100644 --- a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.h +++ b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.h @@ -6,9 +6,17 @@ struct BgPoEvent; +typedef void (*BgPoEventActionFunc)(struct BgPoEvent*, GlobalContext*); + typedef struct BgPoEvent { - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0xFC]; + /* 0x0000 */ DynaPolyActor dyna; + /* 0x0164 */ BgPoEventActionFunc actionFunc; + /* 0x0168 */ u8 type; + /* 0x0169 */ u8 index; + /* 0x016A */ s8 direction; + /* 0x016C */ s16 timer; + /* 0x0170 */ ColliderTris collider; + /* 0x0190 */ ColliderTrisItem colliderItems[2]; } BgPoEvent; // size = 0x0248 extern const ActorInit Bg_Po_Event_InitVars; diff --git a/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c b/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c index 7c96ab7176..ec01d4ddd4 100644 --- a/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c +++ b/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c @@ -15,7 +15,8 @@ void BgSpot03Taki_Destroy(Actor* thisx, GlobalContext* globalCtx); void BgSpot03Taki_Update(Actor* thisx, GlobalContext* globalCtx); void BgSpot03Taki_Draw(Actor* thisx, GlobalContext* globalCtx); -/* +void func_808ADEF0(BgSpot03Taki* this, GlobalContext* globalCtx); + const ActorInit Bg_Spot03_Taki_InitVars = { ACTOR_BG_SPOT03_TAKI, ACTORTYPE_BG, @@ -27,15 +28,142 @@ const ActorInit Bg_Spot03_Taki_InitVars = { (ActorFunc)BgSpot03Taki_Update, (ActorFunc)BgSpot03Taki_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/func_808ADAE0.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/BgSpot03Taki_Init.s") +static InitChainEntry sInitChain[] = { + ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/BgSpot03Taki_Destroy.s") +extern UNK_TYPE D_06000C98; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/func_808ADEF0.s") +// These are identical vertex data for the waterfall. +extern Vtx* D_06000800[]; // Vertex buffer 0 +extern Vtx* D_06000990[]; // Vertex buffer 1 -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/BgSpot03Taki_Update.s") +extern Gfx* D_06000B20[]; +extern Gfx* D_06000BC0[]; +extern Gfx* D_06001580[]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/BgSpot03Taki_Draw.s") +void BgSpot03Taki_ApplyOpeningAlpha(BgSpot03Taki* this, s32 bufferIndex) { + s32 i; + Vtx* vtx = (bufferIndex == 0) ? SEGMENTED_TO_VIRTUAL(D_06000800) : SEGMENTED_TO_VIRTUAL(D_06000990); + + for (i = 0; i < 5; i++) { + vtx[i + 10].v.cn[3] = this->openingAlpha; + } +} + +void BgSpot03Taki_Init(Actor* thisx, GlobalContext* globalCtx) { + BgSpot03Taki* this = THIS; + s16 pad; + s32 sp24 = 0; + + this->switchFlag = (this->dyna.actor.params & 0x3F); + DynaPolyInfo_SetActorMove(&this->dyna, 0); + DynaPolyInfo_Alloc(&D_06000C98, &sp24); + this->dyna.dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, sp24); + Actor_ProcessInitChain(&this->dyna.actor, sInitChain); + this->bufferIndex = 0; + this->openingAlpha = 255.0f; + BgSpot03Taki_ApplyOpeningAlpha(this, 0); + BgSpot03Taki_ApplyOpeningAlpha(this, 1); + this->actionFunc = func_808ADEF0; +} + +void BgSpot03Taki_Destroy(Actor* thisx, GlobalContext* globalCtx) { + BgSpot03Taki* this = THIS; + + DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); +} + +void func_808ADEF0(BgSpot03Taki* this, GlobalContext* globalCtx) { + if (this->state == WATERFALL_CLOSED) { + if (Flags_GetSwitch(globalCtx, this->switchFlag)) { + this->state = WATERFALL_OPENING_ANIMATED; + this->timer = 40; + func_800800F8(globalCtx, 0x1004, -0x63, NULL, 0); + } + } else if (this->state == WATERFALL_OPENING_IDLE) { + this->timer--; + if (this->timer < 0) { + this->state = WATERFALL_OPENING_ANIMATED; + } + } else if (this->state == WATERFALL_OPENING_ANIMATED) { + if (this->openingAlpha > 0) { + this->openingAlpha -= 5; + if (this->openingAlpha <= 0.0f) { + func_8003EBF8(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); + this->timer = 400; + this->state = WATERFALL_OPENED; + this->openingAlpha = 0; + } + } + } else if (this->state == WATERFALL_OPENED) { + this->timer--; + if (this->timer < 0) { + this->state = WATERFALL_CLOSING; + } + } else if (this->state == WATERFALL_CLOSING) { + if (this->openingAlpha < 255.0f) { + this->openingAlpha += 5.0f; + if (this->openingAlpha >= 255.0f) { + func_8003EC50(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); + this->state = WATERFALL_CLOSED; + this->openingAlpha = 255.0f; + Flags_UnsetSwitch(globalCtx, this->switchFlag); + } + } + } + + BgSpot03Taki_ApplyOpeningAlpha(this, this->bufferIndex); +} + +void BgSpot03Taki_Update(Actor* thisx, GlobalContext* globalCtx) { + BgSpot03Taki* this = THIS; + + this->actionFunc(this, globalCtx); +} + +void BgSpot03Taki_Draw(Actor* thisx, GlobalContext* globalCtx) { + BgSpot03Taki* this = THIS; + s32 pad; + u32 gameplayFrames; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot03_taki.c", 321); + + gameplayFrames = globalCtx->gameplayFrames; + + gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot03_taki.c", 325), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + + func_80093D84(globalCtx->state.gfxCtx); + + gSPSegment( + oGfxCtx->polyXlu.p++, 0x08, + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, gameplayFrames * 5, 64, 64, 1, 0, gameplayFrames * 5, 64, 64)); + + gSPDisplayList(oGfxCtx->polyXlu.p++, D_06000B20); + + if (this->bufferIndex == 0) { + gSPVertex(oGfxCtx->polyXlu.p++, D_06000800, 25, 0); + } else { + gSPVertex(oGfxCtx->polyXlu.p++, D_06000990, 25, 0); + } + + gSPDisplayList(oGfxCtx->polyXlu.p++, D_06000BC0); + + gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, gameplayFrames * 3, 64, 64, 1, + -gameplayFrames, gameplayFrames * 3, 64, 64)); + + gSPDisplayList(oGfxCtx->polyXlu.p++, D_06001580); + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot03_taki.c", 358); + + this->bufferIndex = this->bufferIndex == 0; + + if (this->state > WATERFALL_CLOSED && this->state < WATERFALL_CLOSING) { + func_800F46E0(&this->dyna.actor.projectedPos, 0.5f); + } else { + func_800F46E0(&this->dyna.actor.projectedPos, 1.0f); + } +} diff --git a/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.h b/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.h index e31e3ad9f9..dffae45e15 100644 --- a/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.h +++ b/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.h @@ -4,11 +4,26 @@ #include "ultra64.h" #include "global.h" +typedef enum { + WATERFALL_CLOSED, + WATERFALL_OPENING_IDLE, + WATERFALL_OPENING_ANIMATED, + WATERFALL_OPENED, + WATERFALL_CLOSING, +} BgSpot03TakiState; + struct BgSpot03Taki; +typedef void (*BgSpot03TakiActionFunc)(struct BgSpot03Taki*, GlobalContext*); + typedef struct BgSpot03Taki { - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x2C]; + /* 0x0000 */ DynaPolyActor dyna; + /* 0x0164 */ BgSpot03TakiActionFunc actionFunc; + /* 0x0168 */ s16 timer; + /* 0x016A */ u8 state; + /* 0x016C */ u16 switchFlag; + /* 0x0170 */ f32 openingAlpha; + /* 0x0174 */ u8 bufferIndex; } BgSpot03Taki; // size = 0x0178 extern const ActorInit Bg_Spot03_Taki_InitVars; diff --git a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.h b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.h index dc9e80202f..2fe8830fd4 100644 --- a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.h +++ b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.h @@ -8,7 +8,9 @@ struct EnArrow; typedef struct EnArrow { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0xFC]; + /* 0x014C */ char unk_14C[0x5C]; + /* 0x01A8 */ s32 unk_1A8; // related to arrows being on fire + /* 0x01AC */ char unk_1AC[0x9C]; /* 0x0248 */ u8 timer; // used for dissapearing when flying or hitting a wall /* 0x0249 */ u8 hitWall; /* 0x024A */ char unk_24A[0x16]; diff --git a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.h b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.h index d7f37d33e7..7e2d99d302 100644 --- a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.h +++ b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.h @@ -8,7 +8,14 @@ struct EnEncount1; typedef struct EnEncount1 { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x24]; + /* 0x014C */ char unk_14C[0x6]; + /* 0x0152 */ s16 unk_152; + /* 0x0154 */ char unk_154[0xA]; + /* 0x015E */ s16 numLeeversDead; + /* 0x0160 */ char unk_160[0x4]; + /* 0x0164 */ s16 unk_164; + /* 0x0166 */ char unk_166[0x6]; + /* 0x016C */ UNK_TYPE unk_16C; } EnEncount1; // size = 0x0170 extern const ActorInit En_Encount1_InitVars; diff --git a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c index bbf457b239..425724a40f 100644 --- a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c +++ b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c @@ -9,7 +9,18 @@ void EnIceHono_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnIceHono_Update(Actor* thisx, GlobalContext* globalCtx); void EnIceHono_Draw(Actor* thisx, GlobalContext* globalCtx); -/* +void EnIceHono_CapturableFlame(EnIceHono* this, GlobalContext* globalCtx); +void EnIceHono_DropFlame(EnIceHono* this, GlobalContext* globalCtx); +void EnIceHono_SpreadFlames(EnIceHono* this, GlobalContext* globalCtx); +void EnIceHono_SmallFlameMove(EnIceHono* this, GlobalContext* globalCtx); + +void EnIceHono_SetupActionCapturableFlame(EnIceHono* this); +void EnIceHono_SetupActionDroppedFlame(EnIceHono* this); +void EnIceHono_SetupActionSpreadFlames(EnIceHono* this); +void EnIceHono_SetupActionSmallFlame(EnIceHono* this); + +extern Gfx D_0404D4E0[]; + const ActorInit En_Ice_Hono_InitVars = { ACTOR_EN_ICE_HONO, ACTORTYPE_ITEMACTION, @@ -21,37 +32,334 @@ const ActorInit En_Ice_Hono_InitVars = { (ActorFunc)EnIceHono_Update, (ActorFunc)EnIceHono_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A72FF0.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A7301C.s") +static ColliderCylinderInit sCylinderInitCapturableFlame = { + { COLTYPE_UNK10, 0x00, 0x00, 0x39, 0x20, COLSHAPE_CYLINDER }, + { 0x00, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, 0x00, 0x00, 0x01 }, + { 25, 80, 0, { 0, 0, 0 } }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A730BC.s") +static ColliderCylinderInit sCylinderInitDroppedFlame = { + { COLTYPE_UNK10, 0x21, 0x00, 0x21, 0x20, COLSHAPE_CYLINDER }, + { 0x00, { 0xFFCFFFFF, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, 0x01, 0x00, 0x01 }, + { 12, 60, 0, { 0, 0, 0 } }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A731C0.s") +static InitChainEntry sInitChainCapturableFlame[] = { + ICHAIN_U8(unk_1F, 0, ICHAIN_CONTINUE), + ICHAIN_F32(unk_4C, 60, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneScale, 400, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/EnIceHono_Init.s") +static InitChainEntry sInitChainDroppedFlame[] = { + ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneScale, 400, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/EnIceHono_Destroy.s") +static InitChainEntry sInitChainSmallFlame[] = { + ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneScale, 400, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A733E8.s") +f32 EnIceHono_SquareDist(Vec3f* pos1, Vec3f* pos2) { + f32 dx = pos1->x - pos2->x; + f32 dz = pos1->z - pos2->z; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A734D4.s") + return SQ(dx) + SQ(dz); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A734F8.s") +void EnIceHono_InitCapturableFlame(Actor* thisx, GlobalContext* globalCtx) { + EnIceHono* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A735A0.s") + Actor_ProcessInitChain(&this->actor, sInitChainCapturableFlame); + Actor_SetScale(&this->actor, 0.0074f); + this->actor.flags |= 1; + Actor_SetHeight(&this->actor, 10.0f); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A735C0.s") + Collider_InitCylinder(globalCtx, &this->collider); + Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInitCapturableFlame); + Collider_CylinderUpdate(&this->actor, &this->collider); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A73780.s") + this->actor.colChkInfo.mass = 0xFF; + EnIceHono_SetupActionCapturableFlame(this); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A737A0.s") +void EnIceHono_InitDroppedFlame(Actor* thisx, GlobalContext* globalCtx) { + EnIceHono* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A739FC.s") + Actor_ProcessInitChain(&this->actor, sInitChainDroppedFlame); + this->actor.scale.x = this->actor.scale.z = this->actor.scale.y = 0.00002f; + this->actor.gravity = -0.3f; + this->actor.minVelocityY = -4.0f; + this->actor.shape.unk_08 = 0.0f; + this->actor.shape.rot.x = this->actor.shape.rot.y = this->actor.shape.rot.z = this->actor.posRot.rot.x = + this->actor.posRot.rot.y = this->actor.posRot.rot.z = 0; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/func_80A73AD0.s") + Collider_InitCylinder(globalCtx, &this->collider); + Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInitDroppedFlame); + Collider_CylinderUpdate(&this->actor, &this->collider); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/EnIceHono_Update.s") + this->collider.dim.radius = this->actor.scale.x * 4000.4f; + this->collider.dim.height = this->actor.scale.y * 8000.2f; + this->actor.colChkInfo.mass = 253; + EnIceHono_SetupActionDroppedFlame(this); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/EnIceHono_Draw.s") +void EnIceHono_InitSmallFlame(Actor* thisx, GlobalContext* globalCtx) { + EnIceHono* this = THIS; + + Actor_ProcessInitChain(&this->actor, sInitChainSmallFlame); + this->actor.scale.x = this->actor.scale.z = this->actor.scale.y = 0.0008f; + this->actor.gravity = -0.3f; + this->actor.minVelocityY = -4.0f; + this->actor.shape.unk_08 = 0.0f; + + EnIceHono_SetupActionSmallFlame(this); +} + +void EnIceHono_Init(Actor* thisx, GlobalContext* globalCtx) { + EnIceHono* this = THIS; + s16 params = this->actor.params; + + switch (this->actor.params) { + case -1: + EnIceHono_InitCapturableFlame(&this->actor, globalCtx); + break; + case 0: + EnIceHono_InitDroppedFlame(&this->actor, globalCtx); + break; + case 1: + case 2: + EnIceHono_InitSmallFlame(&this->actor, globalCtx); + break; + } + + if ((this->actor.params == -1) || (this->actor.params == 0)) { + Lights_PointNoGlowSetInfo(&this->lightInfo, this->actor.posRot.pos.x, (s16)this->actor.posRot.pos.y + 10, + this->actor.posRot.pos.z, 155, 210, 255, 0); + this->lightNode = LightContext_InsertLight(globalCtx, &globalCtx->lightCtx, &this->lightInfo); + this->unk_154 = Math_Rand_ZeroOne() * (0x1FFFF / 2.0f); + this->unk_156 = Math_Rand_ZeroOne() * (0x1FFFF / 2.0f); + // Translates to: "(ice flame)" + osSyncPrintf("(ice 炎)(arg_data 0x%04x)\n", this->actor.params); + } +} + +void EnIceHono_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnIceHono* this = THIS; + + if ((this->actor.params == -1) || (this->actor.params == 0)) { + LightContext_RemoveLight(globalCtx, &globalCtx->lightCtx, this->lightNode); + Collider_DestroyCylinder(globalCtx, &this->collider); + } +} + +u32 EnIceHono_LinkCloseAndFacing(EnIceHono* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + if (this->actor.xzDistFromLink < 60.0f) { + Vec3f tempPos; + tempPos.x = Math_Sins(this->actor.yawTowardsLink + 0x8000) * 40.0f + player->actor.posRot.pos.x; + tempPos.y = player->actor.posRot.pos.y; + tempPos.z = Math_Coss(this->actor.yawTowardsLink + 0x8000) * 40.0f + player->actor.posRot.pos.z; + if (EnIceHono_SquareDist(&tempPos, &this->actor.posRot.pos) <= SQ(40.0f)) { + return 1; + } + } + return 0; +} + +void EnIceHono_SetupActionCapturableFlame(EnIceHono* this) { + this->actionFunc = EnIceHono_CapturableFlame; + this->alpha = 255; + this->actor.shape.unk_08 = -1000.0f; +} + +void EnIceHono_CapturableFlame(EnIceHono* this, GlobalContext* globalCtx) { + if (Actor_HasParent(&this->actor, globalCtx)) { + this->actor.parent = NULL; + } else if (EnIceHono_LinkCloseAndFacing(this, globalCtx)) { + func_8002F434(&this->actor, globalCtx, 0x7E, 60.0f, 100.0f); + } + + if (this->actor.xzDistFromLink < 200.0f) { + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + } + func_8002F8F0(&this->actor, NA_SE_EV_FIRE_PILLAR_S - SFX_FLAG); +} + +void EnIceHono_SetupActionDroppedFlame(EnIceHono* this) { + this->actionFunc = EnIceHono_DropFlame; + this->timer = 200; + this->alpha = 255; +} + +void EnIceHono_DropFlame(EnIceHono* this, GlobalContext* globalCtx) { + u32 bgFlag = this->actor.bgCheckFlags & 1; + + Math_ApproxF(&this->actor.scale.x, 0.0017f, 0.00008f); + this->actor.scale.z = this->actor.scale.x; + Math_ApproxF(&this->actor.scale.y, 0.0017f, 0.00008f); + + if (bgFlag != 0) { + s32 i; + for (i = 0; i < 8; i++) { + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ICE_HONO, this->actor.posRot.pos.x, + this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, + ((s32)(Math_Rand_ZeroOne() * 1000.0f) + i * 0x2000) - 0x1F4, 0, 1); + } + EnIceHono_SetupActionSpreadFlames(this); + } + Actor_MoveForward(&this->actor); + func_8002E4B4(globalCtx, &this->actor, 10.0f, this->actor.scale.x * 3500.0f, 0.0f, 5); + + Collider_CylinderUpdate(&this->actor, &this->collider); + this->collider.dim.radius = this->actor.scale.x * 4000.0f; + this->collider.dim.height = this->actor.scale.y * 8000.0f; + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + + if (this->timer <= 0) { + Actor_Kill(&this->actor); + } +} + +void EnIceHono_SetupActionSpreadFlames(EnIceHono* this) { + this->actionFunc = EnIceHono_SpreadFlames; + this->timer = 60; + this->alpha = 255; +} + +void EnIceHono_SpreadFlames(EnIceHono* this, GlobalContext* globalCtx) { + if (this->timer > 20) { + Math_ApproxF(&this->actor.scale.x, 0.011f, 0.00014f); + Math_ApproxF(&this->actor.scale.y, 0.006f, 0.00012f); + } else { + Math_ApproxF(&this->actor.scale.x, 0.0001f, 0.00015f); + Math_ApproxF(&this->actor.scale.y, 0.0001f, 0.00015f); + } + this->actor.scale.z = this->actor.scale.x; + Actor_MoveForward(&this->actor); + func_8002E4B4(globalCtx, &this->actor, 10.0f, this->actor.scale.x * 3500.0f, 0.0f, 4); + if (this->timer < 25) { + this->alpha -= 10; + this->alpha = CLAMP(this->alpha, 0, 255); + } + + if ((this->alpha > 100) && (this->timer < 40)) { + Collider_CylinderUpdate(&this->actor, &this->collider); + this->collider.dim.radius = this->actor.scale.x * 6000.0f; + this->collider.dim.height = this->actor.scale.y * 8000.0f; + CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + } + if (this->timer == 46) { + s32 i; + for (i = 0; i < 10; i++) { + s32 rot = i * 0x1999; + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ICE_HONO, this->actor.posRot.pos.x, + this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, + ((s32)(Math_Rand_ZeroOne() * 1000.0f) + rot) - 0x1F4, 0, 2); + } + } + + if (this->timer <= 0) { + Actor_Kill(&this->actor); + } +} + +void EnIceHono_SetupActionSmallFlame(EnIceHono* this) { + this->actionFunc = EnIceHono_SmallFlameMove; + this->timer = 44; + this->alpha = 255; + if (this->actor.params == 1) { + this->smallFlameTargetYScale = (Math_Rand_ZeroOne() * 0.005f) + 0.004f; + this->actor.speedXZ = (Math_Rand_ZeroOne() * 1.6f) + 0.5f; + } else { + this->smallFlameTargetYScale = (Math_Rand_ZeroOne() * 0.005f) + 0.003f; + this->actor.speedXZ = (Math_Rand_ZeroOne() * 2.0f) + 0.5f; + } +} + +void EnIceHono_SmallFlameMove(EnIceHono* this, GlobalContext* globalCtx) { + if (this->timer > 20) { + Math_ApproxF(&this->actor.scale.x, 0.006f, 0.00016f); + Math_ApproxF(&this->actor.scale.y, this->smallFlameTargetYScale * 0.667f, 0.00014f); + } else { + Math_ApproxF(&this->actor.scale.x, 0.0001f, 0.00015f); + Math_ApproxF(&this->actor.scale.y, 0.0001f, 0.00015f); + } + this->actor.scale.z = this->actor.scale.x; + Math_ApproxF(&this->actor.speedXZ, 0, 0.06f); + Actor_MoveForward(&this->actor); + func_8002E4B4(globalCtx, &this->actor, 10.0f, 10.0f, 0.0f, 5); + + if (this->timer < 25) { + this->alpha -= 10; + this->alpha = CLAMP(this->alpha, 0, 255); + } + if (this->timer <= 0) { + Actor_Kill(&this->actor); + } +} + +void EnIceHono_Update(Actor* thisx, GlobalContext* globalCtx) { + EnIceHono* this = THIS; + s32 pad1; + f32 intensity; + s32 pad2; + f32 sin154; + f32 sin156; + + if (this->timer > 0) { + this->timer--; + } + if (this->actor.params == 0) { + func_8002F8F0(&this->actor, NA_SE_IT_FLAME - SFX_FLAG); + } + if ((this->actor.params == -1) || (this->actor.params == 0)) { + this->unk_154 += 0x1111; + this->unk_156 += 0x4000; + sin156 = Math_Sins(this->unk_156); + sin154 = Math_Sins(this->unk_154); + intensity = (Math_Rand_ZeroOne() * 0.05f) + ((sin154 * 0.125f) + (sin156 * 0.1f)) + 0.425f; + if ((intensity > 0.7f) || (intensity < 0.2f)) { + // Translates to: "impossible value(ratio = %f)" + osSyncPrintf("ありえない値(ratio = %f)\n", (f64)intensity); + } + Lights_PointNoGlowSetInfo(&this->lightInfo, this->actor.posRot.pos.x, (s16)this->actor.posRot.pos.y + 10, + this->actor.posRot.pos.z, (s32)(155.0f * intensity), (s32)(210.0f * intensity), + (s32)(255.0f * intensity), 1400); + } + + if (this->actionFunc != NULL) { + this->actionFunc(this, globalCtx); + } +} + +void EnIceHono_Draw(Actor* thisx, GlobalContext* globalCtx) { + EnIceHono* this = THIS; + u32 pad; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_ice_hono.c", 695); + func_80093D84(globalCtx->state.gfxCtx); + + gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 64, 1, 0, (globalCtx->state.frames * -20) % 512, + 32, 128)); + + gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0x80, 0x80, 170, 255, 255, this->alpha); + + gDPSetEnvColor(oGfxCtx->polyXlu.p++, 0, 150, 255, 0); + + Matrix_RotateY((s16)(func_8005A9F4(ACTIVE_CAM) - this->actor.shape.rot.y + 0x8000) * (M_PI / 0x8000), + MTXMODE_APPLY); + + gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_ice_hono.c", 718), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(oGfxCtx->polyXlu.p++, D_0404D4E0); + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_ice_hono.c", 722); +} diff --git a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.h b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.h index 680394613e..047e954751 100644 --- a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.h +++ b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.h @@ -6,9 +6,19 @@ struct EnIceHono; +typedef void (*EnIceHonoActionFunc)(struct EnIceHono*, GlobalContext*); + typedef struct EnIceHono { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x70]; + /* 0x014C */ EnIceHonoActionFunc actionFunc; + /* 0x0150 */ s16 alpha; + /* 0x0152 */ s16 timer; + /* 0x0154 */ s16 unk_154; + /* 0x0156 */ s16 unk_156; + /* 0x0158 */ f32 smallFlameTargetYScale; + /* 0x015C */ ColliderCylinder collider; + /* 0x01A8 */ LightNode* lightNode; + /* 0x01AC */ LightInfo lightInfo; } EnIceHono; // size = 0x01BC extern const ActorInit En_Ice_Hono_InitVars; diff --git a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c index f3380f84d8..aa9ce8a1ac 100644 --- a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c +++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c @@ -1,4 +1,13 @@ +/* + * File: z_en_ishi.c + * Overlay: ovl_En_Ishi + * Description: Small and large gray rocks + */ + #include "z_en_ishi.h" +#include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" + +#include "vt.h" #define FLAGS 0x00800000 @@ -9,7 +18,27 @@ void EnIshi_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnIshi_Update(Actor* thisx, GlobalContext* globalCtx); void EnIshi_Draw(Actor* thisx, GlobalContext* globalCtx); -/* +void EnIshi_SetupWait(EnIshi* this); +void EnIshi_Wait(EnIshi* this, GlobalContext* globalCtx); +void EnIshi_SetupLiftedUp(EnIshi* this); +void EnIshi_LiftedUp(EnIshi* this, GlobalContext* globalCtx); +void EnIshi_SetupFly(EnIshi* this); +void EnIshi_Fly(EnIshi* this, GlobalContext* globalCtx); +void EnIshi_SpawnFragmentsSmall(EnIshi* this, GlobalContext* globalCtx); +void EnIshi_SpawnFragmentsLarge(EnIshi* this, GlobalContext* globalCtx); +void EnIshi_SpawnDustSmall(EnIshi* this, GlobalContext* globalCtx); +void EnIshi_SpawnDustLarge(EnIshi* this, GlobalContext* globalCtx); + +extern Gfx D_0500A3B8[]; // Large gray rock +extern Gfx D_0500A5E8[]; // Large gray rock fragments +extern Gfx D_0500A880[]; // Small gray rock + +typedef void (*EnIshiEffectSpawnFunc)(struct EnIshi*, GlobalContext*); +typedef void (*EnIshiDrawFunc)(struct EnIshi*, GlobalContext*); + +static s16 sRotSpeedX = 0; +static s16 sRotSpeedY = 0; + const ActorInit En_Ishi_InitVars = { ACTOR_EN_ISHI, ACTORTYPE_PROP, @@ -21,47 +50,427 @@ const ActorInit En_Ishi_InitVars = { (ActorFunc)EnIshi_Update, (ActorFunc)EnIshi_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7E460.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7E4D8.s") +static f32 sRockScales[] = { 0.1f, 0.4f }; +static f32 D_80A7FA20[] = { 58.0f, 80.0f }; +static f32 D_80A7FA28[] = { 0.0f, 0.005f }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7E5A8.s") +// the sizes of these arrays are very large and take up way more space than it needs to. +// coincidentally the sizes are the same as the ID for NA_SE_EV_ROCK_BROKEN, which may explain a mistake that could +// have been made here +static u16 sBreakSounds[0x2852] = { NA_SE_EV_ROCK_BROKEN, NA_SE_EV_WALL_BROKEN }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7E824.s") +static u8 sBreakSoundDurations[0x2852] = { 20, 40 }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7EB10.s") +static EnIshiEffectSpawnFunc sFragmentSpawnFuncs[] = { EnIshi_SpawnFragmentsSmall, EnIshi_SpawnFragmentsLarge }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7EC04.s") +static EnIshiEffectSpawnFunc sDustSpawnFuncs[] = { EnIshi_SpawnDustSmall, EnIshi_SpawnDustLarge }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7ECF8.s") +static ColliderCylinderInit sCylinderInits[] = { + { + { COLTYPE_UNK12, 0x00, 0x0D, 0x39, 0x20, COLSHAPE_CYLINDER }, + { 0x00, { 0x00000000, 0x00, 0x00 }, { 0x4FC1FFFE, 0x00, 0x00 }, 0x00, 0x01, 0x01 }, + { 10, 18, -2, { 0, 0, 0 } }, + }, + { + { COLTYPE_UNK12, 0x00, 0x0D, 0x39, 0x20, COLSHAPE_CYLINDER }, + { 0x00, { 0x00000000, 0x00, 0x00 }, { 0x4FC1FFF6, 0x00, 0x00 }, 0x00, 0x01, 0x01 }, + { 55, 70, 0, { 0, 0, 0 } }, + } +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7ED60.s") +static CollisionCheckInfoInit sColChkInfoInit = { 0, 12, 60, 0xFF }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7ED94.s") +void EnIshi_InitCollider(Actor* thisx, GlobalContext* globalCtx) { + EnIshi* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7EE1C.s") + Collider_InitCylinder(globalCtx, &this->collider); + Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInits[this->actor.params & 1]); + Collider_CylinderUpdate(&this->actor, &this->collider); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ishi/EnIshi_Init.s") +s32 EnIshi_SnapToFloor(EnIshi* this, GlobalContext* globalCtx, f32 arg2) { + CollisionPoly* sp34; + Vec3f sp28; + UNK_TYPE sp24; + f32 temp_f0; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ishi/EnIshi_Destroy.s") + sp28.x = this->actor.posRot.pos.x; + sp28.y = this->actor.posRot.pos.y + 30.0f; + sp28.z = this->actor.posRot.pos.z; + temp_f0 = func_8003C9A4(&globalCtx->colCtx, &sp34, &sp24, &this->actor, &sp28); + if (temp_f0 > -32000.0f) { + this->actor.posRot.pos.y = temp_f0 + arg2; + Math_Vec3f_Copy(&this->actor.initPosRot.pos, &this->actor.posRot.pos); + return true; + } else { + osSyncPrintf(VT_COL(YELLOW, BLACK)); + // Translation: Failure attaching to ground + osSyncPrintf("地面に付着失敗(%s %d)\n", "../z_en_ishi.c", 388); + osSyncPrintf(VT_RST); + return false; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F098.s") +void EnIshi_SpawnFragmentsSmall(EnIshi* this, GlobalContext* globalCtx) { + static s16 scales[] = { 16, 13, 11, 9, 7, 5 }; + s32 pad; + Vec3f velocity; + Vec3f pos; + s16 phi_v0; + s32 i; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F0A8.s") + for (i = 0; i < ARRAY_COUNT(scales); i++) { + pos.x = this->actor.posRot.pos.x + (Math_Rand_ZeroOne() - 0.5f) * 8.0f; + pos.y = this->actor.posRot.pos.y + (Math_Rand_ZeroOne() * 5.0f) + 5.0f; + pos.z = this->actor.posRot.pos.z + (Math_Rand_ZeroOne() - 0.5f) * 8.0f; + Math_Vec3f_Copy(&velocity, &this->actor.velocity); + if (this->actor.bgCheckFlags & 1) { + velocity.x *= 0.8f; + velocity.y *= -0.8f; + velocity.z *= 0.8f; + } else if (this->actor.bgCheckFlags & 8) { + velocity.x *= -0.8f; + velocity.y *= 0.8f; + velocity.z *= -0.8f; + } + velocity.x += (Math_Rand_ZeroOne() - 0.5f) * 11.0f; + velocity.y += Math_Rand_ZeroOne() * 6.0f; + velocity.z += (Math_Rand_ZeroOne() - 0.5f) * 11.0f; + if (Math_Rand_ZeroOne() < 0.5f) { + phi_v0 = 65; + } else { + phi_v0 = 33; + } + EffectSsKakera_Spawn(globalCtx, &pos, &velocity, &pos, -420, phi_v0, 30, 5, 0, scales[i], 3, 10, 40, + KAKERA_COLOR_NONE, OBJECT_GAMEPLAY_FIELD_KEEP, D_0500A880); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F2F8.s") +void EnIshi_SpawnFragmentsLarge(EnIshi* this, GlobalContext* globalCtx) { + static s16 scales[] = { 145, 135, 120, 100, 70, 50, 45, 40, 35 }; + Actor* thisx = &this->actor; + Vec3f velocity; + Vec3f pos; + s16 angle = 0x1000; + s32 i; + f32 rand; + s16 phi_v0; + s16 phi_v1; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F31C.s") + for (i = 0; i < ARRAY_COUNT(scales); i++) { + angle += 0x4E20; + rand = Math_Rand_ZeroOne() * 10.0f; + pos.x = this->actor.posRot.pos.x + (Math_Sins(angle) * rand); + pos.y = this->actor.posRot.pos.y + (Math_Rand_ZeroOne() * 40.0f) + 5.0f; + pos.z = this->actor.posRot.pos.z + (Math_Coss(angle) * rand); + Math_Vec3f_Copy(&velocity, &thisx->velocity); + if (thisx->bgCheckFlags & 1) { + velocity.x *= 0.9f; + velocity.y *= -0.8f; + velocity.z *= 0.9f; + } else if (thisx->bgCheckFlags & 8) { + velocity.x *= -0.9f; + velocity.y *= 0.8f; + velocity.z *= -0.9f; + } + rand = Math_Rand_ZeroOne() * 10.0f; + velocity.x += rand * Math_Sins(angle); + velocity.y += (Math_Rand_ZeroOne() * 4.0f) + ((Math_Rand_ZeroOne() * i) * 0.7f); + velocity.z += rand * Math_Coss(angle); + if (i == 0) { + phi_v0 = 41; + phi_v1 = -450; + } else if (i < 4) { + phi_v0 = 37; + phi_v1 = -380; + } else { + phi_v0 = 69; + phi_v1 = -320; + } + EffectSsKakera_Spawn(globalCtx, &pos, &velocity, &this->actor.posRot.pos, phi_v1, phi_v0, 30, 5, 0, scales[i], + 5, 2, 70, KAKERA_COLOR_WHITE, OBJECT_GAMEPLAY_FIELD_KEEP, D_0500A5E8); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F3E8.s") +void EnIshi_SpawnDustSmall(EnIshi* this, GlobalContext* globalCtx) { + Vec3f pos; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F514.s") + Math_Vec3f_Copy(&pos, &this->actor.posRot.pos); + if (this->actor.bgCheckFlags & 1) { + pos.x += 2.0f * this->actor.velocity.x; + pos.y -= 2.0f * this->actor.velocity.y; + pos.z += 2.0f * this->actor.velocity.z; + } else if (this->actor.bgCheckFlags & 8) { + pos.x -= 2.0f * this->actor.velocity.x; + pos.y += 2.0f * this->actor.velocity.y; + pos.z -= 2.0f * this->actor.velocity.z; + } + func_80033480(globalCtx, &pos, 60.0f, 3, 0x50, 0x3C, 1); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ishi/EnIshi_Update.s") +void EnIshi_SpawnDustLarge(EnIshi* this, GlobalContext* globalCtx) { + Vec3f pos; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F8A0.s") + Math_Vec3f_Copy(&pos, &this->actor.posRot.pos); + if (this->actor.bgCheckFlags & 1) { + pos.x += 2.0f * this->actor.velocity.x; + pos.y -= 2.0f * this->actor.velocity.y; + pos.z += 2.0f * this->actor.velocity.z; + } else if (this->actor.bgCheckFlags & 8) { + pos.x -= 2.0f * this->actor.velocity.x; + pos.y += 2.0f * this->actor.velocity.y; + pos.z -= 2.0f * this->actor.velocity.z; + } + func_80033480(globalCtx, &pos, 140.0f, 0xA, 0xB4, 0x5A, 1); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F8CC.s") +void EnIshi_DropCollectible(EnIshi* this, GlobalContext* globalCtx) { + s16 dropParams; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ishi/EnIshi_Draw.s") + if ((this->actor.params & 1) == ROCK_SMALL) { + dropParams = (this->actor.params >> 8) & 0xF; + + if (dropParams >= 0xD) { + dropParams = 0; + } + + Item_DropCollectibleRandom(globalCtx, NULL, &this->actor.posRot.pos, dropParams << 4); + } +} + +void EnIshi_Fall(EnIshi* this) { + this->actor.velocity.y += this->actor.gravity; + + if (this->actor.velocity.y < this->actor.minVelocityY) { + this->actor.velocity.y = this->actor.minVelocityY; + } +} + +void func_80A7ED94(Vec3f* arg0, f32 arg1) { + arg1 += ((Math_Rand_ZeroOne() * 0.2f) - 0.1f) * arg1; + arg0->x -= arg0->x * arg1; + arg0->y -= arg0->y * arg1; + arg0->z -= arg0->z * arg1; +} + +void EnIshi_SpawnBugs(EnIshi* this, GlobalContext* globalCtx) { + s32 i; + + for (i = 0; i < 3; i++) { + Actor* bug = + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_INSECT, this->actor.posRot.pos.x, + this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, Math_Rand_ZeroOne() * 0xFFFF, 0, 1); + + if (bug == NULL) { + break; + } + } +} + +static InitChainEntry sInitChains[][5] = { + { + ICHAIN_F32_DIV1000(gravity, -1200, ICHAIN_CONTINUE), + ICHAIN_F32_DIV1000(minVelocityY, -20000, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneForward, 1200, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneScale, 150, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneDownward, 400, ICHAIN_STOP), + }, + { + ICHAIN_F32_DIV1000(gravity, -2500, ICHAIN_CONTINUE), + ICHAIN_F32_DIV1000(minVelocityY, -20000, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneScale, 250, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneDownward, 500, ICHAIN_STOP), + }, +}; + +void EnIshi_Init(Actor* thisx, GlobalContext* globalCtx) { + EnIshi* this = THIS; + s16 type = this->actor.params & 1; + + Actor_ProcessInitChain(&this->actor, sInitChains[type]); + if (globalCtx->csCtx.state != 0) { + this->actor.uncullZoneForward += 1000.0f; + } + if (this->actor.shape.rot.y == 0) { + this->actor.shape.rot.y = this->actor.posRot.rot.y = Math_Rand_ZeroFloat(0x10000); + } + Actor_SetScale(&this->actor, sRockScales[type]); + EnIshi_InitCollider(&this->actor, globalCtx); + if ((type == ROCK_LARGE) && + Flags_GetSwitch(globalCtx, ((this->actor.params >> 0xA) & 0x3C) | ((this->actor.params >> 6) & 3))) { + Actor_Kill(&this->actor); + return; + } + func_80061ED4(&this->actor.colChkInfo, NULL, &sColChkInfoInit); + this->actor.shape.unk_08 = D_80A7FA20[type]; + if (!((this->actor.params >> 5) & 1) && !EnIshi_SnapToFloor(this, globalCtx, 0.0f)) { + Actor_Kill(&this->actor); + return; + } + EnIshi_SetupWait(this); +} + +void EnIshi_Destroy(Actor* thisx, GlobalContext* globalCtx) { + Collider_DestroyCylinder(globalCtx, &THIS->collider); +} + +void EnIshi_SetupWait(EnIshi* this) { + this->actionFunc = EnIshi_Wait; +} + +void EnIshi_Wait(EnIshi* this, GlobalContext* globalCtx) { + static u16 liftSounds[] = { NA_SE_PL_PULL_UP_ROCK, NA_SE_PL_PULL_UP_BIGROCK }; + s32 pad; + s16 type = this->actor.params & 1; + + if (Actor_HasParent(&this->actor, globalCtx)) { + EnIshi_SetupLiftedUp(this); + Audio_PlaySoundAtPosition(globalCtx, &this->actor.posRot.pos, 20, liftSounds[type]); + if ((this->actor.params >> 4) & 1) { + EnIshi_SpawnBugs(this, globalCtx); + } + } else if (this->collider.base.acFlags & 2 && (type == ROCK_SMALL) && + this->collider.body.acHitItem->toucher.flags & 0x40000048) { + EnIshi_DropCollectible(this, globalCtx); + Audio_PlaySoundAtPosition(globalCtx, &this->actor.posRot.pos, sBreakSoundDurations[type], sBreakSounds[type]); + sFragmentSpawnFuncs[type](this, globalCtx); + sDustSpawnFuncs[type](this, globalCtx); + Actor_Kill(&this->actor); + } else if (this->actor.xzDistFromLink < 600.0f) { + Collider_CylinderUpdate(&this->actor, &this->collider); + this->collider.base.acFlags &= ~2; + CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + if (this->actor.xzDistFromLink < 400.0f) { + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + if (this->actor.xzDistFromLink < 90.0f) { + if (type == ROCK_LARGE) { + func_8002F434(&this->actor, globalCtx, 0, 80.0f, 20.0f); + } else { + func_8002F434(&this->actor, globalCtx, 0, 50.0f, 10.0f); + } + } + } + } +} + +void EnIshi_SetupLiftedUp(EnIshi* this) { + this->actionFunc = EnIshi_LiftedUp; + this->actor.room = -1; + this->actor.flags |= 0x10; +} + +void EnIshi_LiftedUp(EnIshi* this, GlobalContext* globalCtx) { + if (Actor_HasNoParent(&this->actor, globalCtx)) { + this->actor.room = globalCtx->roomCtx.curRoom.num; + if ((this->actor.params & 1) == ROCK_LARGE) { + Flags_SetSwitch(globalCtx, ((this->actor.params >> 0xA) & 0x3C) | ((this->actor.params >> 6) & 3)); + } + EnIshi_SetupFly(this); + EnIshi_Fall(this); + func_80A7ED94(&this->actor.velocity, D_80A7FA28[this->actor.params & 1]); + func_8002D7EC(&this->actor); + func_8002E4B4(globalCtx, &this->actor, 7.5f, 35.0f, 0.0f, 0xC5); + } +} + +void EnIshi_SetupFly(EnIshi* this) { + this->actor.velocity.x = Math_Sins(this->actor.posRot.rot.y) * this->actor.speedXZ; + this->actor.velocity.z = Math_Coss(this->actor.posRot.rot.y) * this->actor.speedXZ; + if ((this->actor.params & 1) == ROCK_SMALL) { + sRotSpeedX = (Math_Rand_ZeroOne() - 0.5f) * 16000.0f; + sRotSpeedY = (Math_Rand_ZeroOne() - 0.5f) * 2400.0f; + } else { + sRotSpeedX = (Math_Rand_ZeroOne() - 0.5f) * 8000.0f; + sRotSpeedY = (Math_Rand_ZeroOne() - 0.5f) * 1600.0f; + } + this->actor.colChkInfo.mass = 240; + this->actionFunc = EnIshi_Fly; +} + +void EnIshi_Fly(EnIshi* this, GlobalContext* globalCtx) { + s32 pad; + s16 type = this->actor.params & 1; + s32 pad2; + s32 quakeIdx; + Vec3f contactPos; + + if (this->actor.bgCheckFlags & 9) { + EnIshi_DropCollectible(this, globalCtx); + sFragmentSpawnFuncs[type](this, globalCtx); + if (!(this->actor.bgCheckFlags & 0x20)) { + Audio_PlaySoundAtPosition(globalCtx, &this->actor.posRot.pos, sBreakSoundDurations[type], + sBreakSounds[type]); + sDustSpawnFuncs[type](this, globalCtx); + } + if (type == ROCK_LARGE) { + quakeIdx = Quake_Add(ACTIVE_CAM, 3); + Quake_SetSpeed(quakeIdx, -0x3CB0); + Quake_SetQuakeValues(quakeIdx, 3, 0, 0, 0); + Quake_SetCountdown(quakeIdx, 7); + func_800AA000(this->actor.xyzDistFromLinkSq, 0xFF, 0x14, 0x96); + } + Actor_Kill(&this->actor); + return; + } + if (this->actor.bgCheckFlags & 0x40) { + contactPos.x = this->actor.posRot.pos.x; + contactPos.y = this->actor.posRot.pos.y + this->actor.waterY; + contactPos.z = this->actor.posRot.pos.z; + EffectSsGSplash_Spawn(globalCtx, &contactPos, 0, 0, 0, 350); + if (type == ROCK_SMALL) { + EffectSsGRipple_Spawn(globalCtx, &contactPos, 150, 650, 0); + EffectSsGRipple_Spawn(globalCtx, &contactPos, 400, 800, 4); + EffectSsGRipple_Spawn(globalCtx, &contactPos, 500, 1100, 8); + } else { + EffectSsGRipple_Spawn(globalCtx, &contactPos, 300, 700, 0); + EffectSsGRipple_Spawn(globalCtx, &contactPos, 500, 900, 4); + EffectSsGRipple_Spawn(globalCtx, &contactPos, 500, 1300, 8); + } + this->actor.minVelocityY = -6.0f; + sRotSpeedX >>= 2; + sRotSpeedY >>= 2; + Audio_PlaySoundAtPosition(globalCtx, &this->actor.posRot.pos, 40, NA_SE_EV_DIVE_INTO_WATER_L); + this->actor.bgCheckFlags &= ~0x40; + } + Math_ApproxF(&this->actor.shape.unk_08, 0.0f, 2.0f); + EnIshi_Fall(this); + func_80A7ED94(&this->actor.velocity, D_80A7FA28[type]); + func_8002D7EC(&this->actor); + this->actor.shape.rot.x += sRotSpeedX; + this->actor.shape.rot.y += sRotSpeedY; + func_8002E4B4(globalCtx, &this->actor, 7.5f, 35.0f, 0.0f, 0xC5); + Collider_CylinderUpdate(&this->actor, &this->collider); + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); +} + +void EnIshi_Update(Actor* thisx, GlobalContext* globalCtx) { + EnIshi* this = THIS; + + this->actionFunc(this, globalCtx); +} + +void EnIshi_DrawSmall(EnIshi* this, GlobalContext* globalCtx) { + Gfx_DrawDListOpa(globalCtx, D_0500A880); +} + +void EnIshi_DrawLarge(EnIshi* this, GlobalContext* globalCtx) { + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_ishi.c", 1050); + + func_80093D18(globalCtx->state.gfxCtx); + gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_ishi.c", 1055), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gDPSetPrimColor(oGfxCtx->polyOpa.p++, 0, 0, 255, 255, 255, 255); + gSPDisplayList(oGfxCtx->polyOpa.p++, D_0500A3B8); + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_ishi.c", 1062); +} + +static EnIshiDrawFunc sDrawFuncs[] = { EnIshi_DrawSmall, EnIshi_DrawLarge }; + +void EnIshi_Draw(Actor* thisx, GlobalContext* globalCtx) { + EnIshi* this = THIS; + + sDrawFuncs[this->actor.params & 1](this, globalCtx); +} diff --git a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.h b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.h index 028f07ae2b..20579696bd 100644 --- a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.h +++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.h @@ -4,11 +4,19 @@ #include "ultra64.h" #include "global.h" +typedef enum { + /* 0x00 */ ROCK_SMALL, + /* 0x01 */ ROCK_LARGE +} EnIshiType; + struct EnIshi; +typedef void (*EnIshiActionFunc)(struct EnIshi*, GlobalContext*); + typedef struct EnIshi { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x50]; + /* 0x014C */ EnIshiActionFunc actionFunc; + /* 0x0150 */ ColliderCylinder collider; } EnIshi; // size = 0x019C extern const ActorInit En_Ishi_InitVars; diff --git a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c index eccc1f465a..718959413f 100644 --- a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c +++ b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c @@ -1,4 +1,11 @@ +/* + * File: z_en_kakasi.c + * Overlay: ovl_En_Kakasi + * Description: Pierre the Scarecrow + */ + #include "z_en_kakasi.h" +#include "vt.h" #define FLAGS 0x02000009 @@ -9,7 +16,22 @@ void EnKakasi_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnKakasi_Update(Actor* thisx, GlobalContext* globalCtx); void EnKakasi_Draw(Actor* thisx, GlobalContext* globalCtx); -/* +void func_80A8F660(EnKakasi* this, GlobalContext* globalCtx); +void func_80A8F75C(EnKakasi* this, GlobalContext* globalCtx); +void func_80A8F8D0(EnKakasi* this, GlobalContext* globalCtx); +void func_80A8F9C8(EnKakasi* this, GlobalContext* globalCtx); +void func_80A8FBB8(EnKakasi* this, GlobalContext* globalCtx); +void func_80A8FAA4(EnKakasi* this, GlobalContext* globalCtx); + +static ColliderCylinderInit sCylinderInit = { + { COLTYPE_UNK10, 0x00, 0x00, 0x39, 0x20, COLSHAPE_CYLINDER }, + { 0x00, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, 0x00, 0x04, 0x01 }, + { 20, 70, 0, { 0, 0, 0 } }, +}; + +extern SkeletonHeader D_060065B0; +extern AnimationHeader D_06000214; + const ActorInit En_Kakasi_InitVars = { ACTOR_EN_KAKASI, ACTORTYPE_NPC, @@ -21,27 +43,301 @@ const ActorInit En_Kakasi_InitVars = { (ActorFunc)EnKakasi_Update, (ActorFunc)EnKakasi_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Destroy.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Init.s") +void EnKakasi_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnKakasi* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F28C.s") + Collider_DestroyCylinder(globalCtx, &this->collider); + //! @bug Skelanime_Free is not called +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F320.s") +void EnKakasi_Init(Actor* thisx, GlobalContext* globalCtx) { + EnKakasi* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F660.s") + osSyncPrintf("\n\n"); + osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ Ｌｅｔ’ｓ ＤＡＮＣＥ！ ☆☆☆☆☆ %f\n" VT_RST, this->actor.posRot.pos.y); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F75C.s") + Collider_InitCylinder(globalCtx, &this->collider); + Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); + this->actor.unk_1F = 6; + SkelAnime_InitSV(globalCtx, &this->skelanime, &D_060065B0, &D_06000214, NULL, NULL, 0); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F8D0.s") + this->rot = this->actor.posRot.rot; + this->actor.flags |= 0x400; + this->actor.colChkInfo.mass = 0xFF; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F9C8.s") + Actor_SetScale(&this->actor, 0.01f); + this->actionFunc = func_80A8F660; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8FAA4.s") +void func_80A8F28C(EnKakasi* this) { + this->unk_1A4 = 0; + this->skelanime.animPlaybackSpeed = 0.0f; + this->unk_1A8 = this->unk_1AC = 0; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8FBB8.s") + Math_SmoothDownscaleMaxF(&this->skelanime.animCurrentFrame, 0.5f, 1.0f); + Math_SmoothScaleMaxMinS(&this->actor.shape.rot.x, this->rot.x, 5, 0x2710, 0); + Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, this->rot.y, 5, 0x2710, 0); + Math_SmoothScaleMaxMinS(&this->actor.shape.rot.z, this->rot.z, 5, 0x2710, 0); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Update.s") +void func_80A8F320(EnKakasi* this, GlobalContext* globalCtx, s16 arg) { + s16 phi_v0; + s16 currentFrame; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Draw.s") + phi_v0 = globalCtx->msgCtx.unk_E410[0]; + if (arg != 0) { + if (this->unk_19C[3] == 0) { + this->unk_19C[3] = (s16)Math_Rand_ZeroFloat(10.99f) + 30; + this->unk_1A6 = (s16)Math_Rand_ZeroFloat(4.99f); + } + + this->unk_19A = (s16)Math_Rand_ZeroFloat(2.99f) + 5; + phi_v0 = this->unk_1A6; + } + switch (phi_v0) { + case 0: + this->unk_19A++; + if (this->unk_1A4 == 0) { + this->unk_1A4 = 1; + Audio_PlayActorSound2(&this->actor, NA_SE_EV_KAKASHI_ROLL); + } + break; + case 1: + this->unk_19A++; + this->unk_1B8 = 1.0f; + break; + case 2: + this->unk_19A++; + if (this->unk_1AC == 0) { + this->unk_1AC = 0x1388; + } + break; + case 3: + this->unk_19A++; + if (this->unk_1A8 == 0) { + this->unk_1A8 = 0x1388; + } + break; + case 4: + this->unk_19A++; + this->unk_1B8 = 2.0f; + break; + } + + if (this->unk_19A > 8) { + this->unk_19A = 8; + } + + if (this->unk_19A != 0) { + this->actor.gravity = -1.0f; + if (this->unk_19A == 8 && (this->actor.bgCheckFlags & 1)) { + this->actor.velocity.y = 3.0f; + Audio_PlayActorSound2(&this->actor, NA_SE_IT_KAKASHI_JUMP); + } + Math_SmoothScaleMaxF(&this->skelanime.animPlaybackSpeed, this->unk_1B8, 0.1f, 0.2f); + Math_SmoothScaleMaxMinS(&this->actor.shape.rot.x, this->unk_1A8, 5, 0x3E8, 0); + Math_SmoothScaleMaxMinS(&this->actor.shape.rot.z, this->unk_1AC, 5, 0x3E8, 0); + + if (this->unk_1A8 != 0 && fabsf(this->actor.shape.rot.x - this->unk_1A8) < 50.0f) { + this->unk_1A8 *= -1.0f; + } + if (this->unk_1AC != 0 && fabsf(this->actor.shape.rot.z - this->unk_1AC) < 50.0f) { + this->unk_1AC *= -1.0f; + } + + if (this->unk_1A4 != 0) { + this->actor.shape.rot.y += 0x1000; + if (this->actor.shape.rot.y == 0) { + this->unk_1A4 = 0; + } + } + currentFrame = this->skelanime.animCurrentFrame; + if (currentFrame == 11 || currentFrame == 17) { + Audio_PlayActorSound2(&this->actor, NA_SE_EV_KAKASHI_SWING); + } + SkelAnime_FrameUpdateMatrix(&this->skelanime); + } +} + +void func_80A8F660(EnKakasi* this, GlobalContext* globalCtx) { + f32 frameCount = SkelAnime_GetFrameCount(&D_06000214.genericHeader); + + SkelAnime_ChangeAnim(&this->skelanime, &D_06000214, 1.0f, 0.0f, (s16)frameCount, 0, -10.0f); + + this->actor.textId = 0x4076; + this->unk_196 = 6; + if (LINK_IS_CHILD) { + this->unk_194 = false; + if (gSaveContext.unk_F3C[4] != 0) { + this->actor.textId = 0x407A; + this->unk_196 = 5; + } + } else { + this->unk_194 = true; + if (gSaveContext.unk_F3C[4] != 0) { + this->actor.textId = 0x4079; + this->unk_196 = 5; + } + } + this->actionFunc = func_80A8F75C; +} + +void func_80A8F75C(EnKakasi* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + s16 yawTowardsLink; + s16 absyawTowardsLink; + + func_80A8F28C(this); + SkelAnime_FrameUpdateMatrix(&this->skelanime); + this->camId = -1; + if (func_8002F194(&this->actor, globalCtx)) { + if (this->unk_196 == 5) { + this->actionFunc = func_80A8F9C8; + } else { + this->actionFunc = func_80A8F660; + } + return; + } + + yawTowardsLink = this->actor.yawTowardsLink - this->actor.shape.rot.y; + if (!(this->actor.xzDistFromLink > 120.0f)) { + absyawTowardsLink = ABS(yawTowardsLink); + + if (absyawTowardsLink < 0x4300) { + if (!this->unk_194) { + if (player->stateFlags2 & 0x1000000) { + this->camId = func_800800F8(globalCtx, 0x8D4, -0x63, &this->actor, 0); + + func_8010BD58(globalCtx, 0x2A); + this->unk_19A = 0; + this->unk_1B8 = 0.0; + player->stateFlags2 |= 0x800000; + this->actionFunc = func_80A8F8D0; + return; + } + if (this->actor.xzDistFromLink < 80.0f) { + player->stateFlags2 |= 0x800000; + } + } + func_8002F2CC(&this->actor, globalCtx, 100.0f); + } + } +} + +void func_80A8F8D0(EnKakasi* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + if (globalCtx->msgCtx.unk_E3EE == 4 && globalCtx->msgCtx.msgMode == 0) { + // end? + osSyncPrintf(VT_FGCOL(BLUE) "☆☆☆☆☆ 終り？ ☆☆☆☆☆ \n" VT_RST); + + if (this->unk_19A != 0) { + func_80106CCC(globalCtx); + this->actor.textId = 0x4077; + this->unk_196 = 5; + func_8010B680(globalCtx, this->actor.textId, NULL); + this->actionFunc = func_80A8F9C8; + } else { + func_800803F0(globalCtx, this->camId); + this->camId = -1; + this->actionFunc = func_80A8F660; + } + } else if (globalCtx->msgCtx.unk_E3EE == 1) { + func_80A8F320(this, globalCtx, 0); + player->stateFlags2 |= 0x800000; + } +} + +void func_80A8F9C8(EnKakasi* this, GlobalContext* globalCtx) { + func_80A8F28C(this); + SkelAnime_FrameUpdateMatrix(&this->skelanime); + func_8002DF54(globalCtx, NULL, 8); + + if (this->unk_196 == func_8010BDBC(&globalCtx->msgCtx) && (func_80106BC8(globalCtx) != 0)) { + + if (this->camId != -1) { + func_8005B1A4(globalCtx->cameraPtrs[this->camId]); + } + this->camId = func_800800F8(globalCtx, 0x8DE, -0x63, &this->actor, 0); + globalCtx->msgCtx.msgMode = 0x37; + func_8002DF54(globalCtx, NULL, 8); + func_8010BD58(globalCtx, 0x2B); + this->actionFunc = func_80A8FAA4; + } +} + +void func_80A8FAA4(EnKakasi* this, GlobalContext* globalCtx) { + if (globalCtx->msgCtx.unk_E3EE != 0xF) { + func_80A8F320(this, globalCtx, 1); + return; + } + + osSyncPrintf("game_play->message.msg_mode=%d\n", globalCtx->msgCtx.msgMode); + + if (globalCtx->msgCtx.msgMode == 0) { + if (this->unk_194) { + this->actor.textId = 0x4077; + this->unk_196 = 5; + func_8010B680(globalCtx, this->actor.textId, NULL); + } else { + this->actor.textId = 0x4078; + this->unk_196 = 5; + func_8010B680(globalCtx, this->actor.textId, NULL); + } + this->actionFunc = func_80A8FBB8; + func_800803F0(globalCtx, this->camId); + this->camId = -1; + this->camId = func_800800F8(globalCtx, 0x8D4, -0x63, &this->actor, 0); + func_8005B1A4(globalCtx->cameraPtrs[this->camId]); + } +} + +void func_80A8FBB8(EnKakasi* this, GlobalContext* globalCtx) { + func_80A8F28C(this); + SkelAnime_FrameUpdateMatrix(&this->skelanime); + + if (this->unk_196 == func_8010BDBC(&globalCtx->msgCtx)) { + if (func_80106BC8(globalCtx) != 0) { + func_8005B1A4(globalCtx->cameraPtrs[this->camId]); + func_80106CCC(globalCtx); + func_8002DF54(globalCtx, NULL, 7); + this->actionFunc = func_80A8F660; + } + } +} + +void EnKakasi_Update(Actor* thisx, GlobalContext* globalCtx) { + EnKakasi* this = THIS; + s32 pad; + s32 i; + + this->unk_198++; + this->actor.posRot.rot = this->actor.shape.rot; + for (i = 0; i < ARRAY_COUNT(this->unk_19C); i++) { + if (this->unk_19C[i] != 0) { + this->unk_19C[i]--; + } + } + + this->height = 60.0f; + Actor_SetHeight(&this->actor, this->height); + this->actionFunc(this, globalCtx); + Actor_MoveForward(&this->actor); + func_8002E4B4(globalCtx, &this->actor, 50.0f, 50.0f, 100.0f, 28); + Collider_CylinderUpdate(&this->actor, &this->collider); + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); +} + +void EnKakasi_Draw(Actor* thisx, GlobalContext* globalCtx) { + EnKakasi* this = THIS; + + if (BREG(3) != 0) { + osSyncPrintf("\n\n"); + // flag! + osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ フラグ！ ☆☆☆☆☆ %d\n" VT_RST, gSaveContext.unk_F3C[4]); + } + func_80093D18(globalCtx->state.gfxCtx); + SkelAnime_DrawSV(globalCtx, this->skelanime.skeleton, this->skelanime.limbDrawTbl, this->skelanime.dListCount, NULL, + NULL, &this->actor); +} diff --git a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.h b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.h index be2d3ca0c2..03a0884e02 100644 --- a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.h +++ b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.h @@ -6,9 +6,27 @@ struct EnKakasi; +typedef void (*EnKakasiFunc)(struct EnKakasi*, GlobalContext*); + typedef struct EnKakasi { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0xC0]; + /* 0x014C */ EnKakasiFunc actionFunc; + /* 0x0150 */ SkelAnime skelanime; + /* 0x0194 */ u8 unk_194; + /* 0x0196 */ s16 unk_196; + /* 0x0198 */ s16 unk_198; + /* 0x019A */ s16 unk_19A; + /* 0x019C */ s16 unk_19C[4]; + /* 0x01A4 */ s16 unk_1A4; + /* 0x01A6 */ s16 unk_1A6; + /* 0x01A8 */ s16 unk_1A8; + /* 0x01AA */ char unk_1AA[0x2]; + /* 0x01AC */ s16 unk_1AC; + /* 0x01AE */ Vec3s rot; + /* 0x01B4 */ f32 height; + /* 0x01B8 */ f32 unk_1B8; + /* 0x01BC */ ColliderCylinder collider; + /* 0x0208 */ s16 camId; } EnKakasi; // size = 0x020C extern const ActorInit En_Kakasi_InitVars; diff --git a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c index 307d6ff994..b3cb061f53 100644 --- a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c +++ b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c @@ -1,14 +1,36 @@ +/* + * File: z_en_kakasi2.c + * Overlay: ovl_En_Kakasi2 + * Description: Pierre the Scarecrow Spawn + */ + #include "z_en_kakasi2.h" +#include "vt.h" #define FLAGS 0x0A000031 #define THIS ((EnKakasi2*)thisx) +static ColliderCylinderInit sCylinderInit = { + { COLTYPE_UNK10, 0x00, 0x09, 0x39, 0x20, COLSHAPE_CYLINDER }, + { 0x00, { 0xFFCFFFFF, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, 0x00, 0x05, 0x01 }, + { 20, 70, 0, { 0, 0, 0 } }, +}; + void EnKakasi2_Init(Actor* thisx, GlobalContext* globalCtx); void EnKakasi2_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnKakasi2_Update(Actor* thisx, GlobalContext* globalCtx); +void func_80A90948(Actor* thisx, GlobalContext* globalCtx); + +void func_80A9062C(EnKakasi2* this, GlobalContext* globalCtx); +void func_80A90264(EnKakasi2* this, GlobalContext* globalCtx); +void func_80A904D8(EnKakasi2* this, GlobalContext* globalCtx); +void func_80A90578(EnKakasi2* this, GlobalContext* globalCtx); +void func_80A906C4(EnKakasi2* this, GlobalContext* globalCtx); + +extern SkeletonHeader D_060065B0; +extern AnimationHeader D_06000214; -/* const ActorInit En_Kakasi2_InitVars = { ACTOR_EN_KAKASI2, ACTORTYPE_PROP, @@ -20,21 +42,193 @@ const ActorInit En_Kakasi2_InitVars = { (ActorFunc)EnKakasi2_Update, NULL, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kakasi2/EnKakasi2_Init.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kakasi2/EnKakasi2_Destroy.s") +void EnKakasi2_Init(Actor* thisx, GlobalContext* globalCtx) { + EnKakasi2* this = THIS; + s32 pad; + f32 spawnRangeY; + f32 spawnRangeXZ; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A90264.s") + osSyncPrintf("\n\n"); + // Visit Umeda + osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 梅田参号見参！ ☆☆☆☆☆ \n" VT_RST); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A904D8.s") + this->switchFlag = this->actor.params & 0x3F; + spawnRangeY = (this->actor.params >> 6) & 0xFF; + spawnRangeXZ = this->actor.posRot.rot.z; + if (this->switchFlag == 0x3F) { + this->switchFlag = -1; + } + this->actor.unk_1F = 4; + this->maxSpawnDistance.x = (spawnRangeY * 40.0f) + 40.0f; + this->maxSpawnDistance.y = (spawnRangeXZ * 40.0f) + 40.0f; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A90578.s") + // Former? (Argument 0) + osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 元？(引数０) ☆☆☆☆ %f\n" VT_RST, spawnRangeY); + // Former? (Z angle) + osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 元？(Ｚアングル) ☆☆ %f\n" VT_RST, spawnRangeXZ); + // Correction coordinates X + osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 補正座標Ｘ ☆☆☆☆☆ %f\n" VT_RST, this->maxSpawnDistance.x); + // Correction coordinates Y + osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 補正座標Ｙ ☆☆☆☆☆ %f\n" VT_RST, this->maxSpawnDistance.y); + // Correction coordinates Z + osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 補正座標Ｚ ☆☆☆☆☆ %f\n" VT_RST, this->maxSpawnDistance.z); + osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ SAVE ☆☆☆☆☆ %d\n" VT_RST, this->switchFlag); + osSyncPrintf("\n\n"); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A9062C.s") + this->actor.colChkInfo.mass = 0xFF; + this->height = 60.0f; + Actor_SetScale(&this->actor, 0.01f); + this->actor.flags |= 0x400; + this->unk_198 = this->actor.shape.rot.y; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A906C4.s") + if (this->switchFlag >= 0 && Flags_GetSwitch(globalCtx, this->switchFlag)) { + this->actor.draw = func_80A90948; + Collider_InitCylinder(globalCtx, &this->collider); + Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); + SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_060065B0, &D_06000214, NULL, NULL, 0); + this->actionFunc = func_80A9062C; + } else { + this->actionFunc = func_80A90264; + this->actor.shape.unk_08 = -8000.0f; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kakasi2/EnKakasi2_Update.s") +void EnKakasi2_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnKakasi2* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A90948.s") + Collider_DestroyCylinder(globalCtx, &this->collider); + //! @bug Skelanime_Free is not called +} + +void func_80A90264(EnKakasi2* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + this->unk_194++; + + if ((BREG(1) != 0) && (this->actor.xzDistFromLink < this->maxSpawnDistance.x) && + (fabsf(player->actor.posRot.pos.y - this->actor.posRot.pos.y) < this->maxSpawnDistance.y)) { + + this->actor.draw = func_80A90948; + Collider_InitCylinder(globalCtx, &this->collider); + Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); + SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_060065B0, &D_06000214, NULL, NULL, 0); + func_80080480(globalCtx, this); + this->actor.flags |= 0x8000001; + + func_80078884(NA_SE_SY_CORRECT_CHIME); + if (this->switchFlag >= 0) { + Flags_SetSwitch(globalCtx, this->switchFlag); + } + + osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ SAVE 終了 ☆☆☆☆☆ %d\n" VT_RST, this->switchFlag); + this->actionFunc = func_80A904D8; + } else if ((this->actor.xzDistFromLink < this->maxSpawnDistance.x) && + (fabsf(player->actor.posRot.pos.y - this->actor.posRot.pos.y) < this->maxSpawnDistance.y) && + (gSaveContext.eventChkInf[9] & 0x1000)) { + + this->unk_194 = 0; + if (globalCtx->msgCtx.unk_E3EE == 11) { + if (this->switchFlag >= 0) { + Flags_SetSwitch(globalCtx, this->switchFlag); + } + osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ SAVE 終了 ☆☆☆☆☆ %d\n" VT_RST, this->switchFlag); + globalCtx->msgCtx.unk_E3EE = 4; + this->actor.draw = func_80A90948; + Collider_InitCylinder(globalCtx, &this->collider); + Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); + SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_060065B0, &D_06000214, NULL, NULL, 0); + func_80080480(globalCtx, this); + func_80078884(NA_SE_SY_CORRECT_CHIME); + + this->actor.flags |= 0x8000001; + this->actionFunc = func_80A904D8; + } + } +} + +void func_80A904D8(EnKakasi2* this, GlobalContext* globalCtx) { + f32 frameCount = SkelAnime_GetFrameCount(&D_06000214.genericHeader); + + SkelAnime_ChangeAnim(&this->skelAnime, &D_06000214, 1.0f, 0.0f, (s16)frameCount, 0, -10.0f); + Audio_PlayActorSound2(&this->actor, NA_SE_EV_COME_UP_DEKU_JR); + this->actionFunc = func_80A90578; +} + +void func_80A90578(EnKakasi2* this, GlobalContext* globalCtx) { + s16 currentFrame; + + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + + currentFrame = this->skelAnime.animCurrentFrame; + if (currentFrame == 11 || currentFrame == 17) { + Audio_PlayActorSound2(&this->actor, NA_SE_EV_KAKASHI_SWING); + } + + this->actor.shape.rot.y += 0x800; + Math_SmoothDownscaleMaxF(&this->actor.shape.unk_08, 0.5f, 500.0f); + + if (this->actor.shape.unk_08 > -100.0f) { + this->actionFunc = func_80A9062C; + this->actor.shape.unk_08 = 0.0f; + } +} + +void func_80A9062C(EnKakasi2* this, GlobalContext* globalCtx) { + f32 frameCount = SkelAnime_GetFrameCount(&D_06000214.genericHeader); + + SkelAnime_ChangeAnim(&this->skelAnime, &D_06000214, 0.0f, 0.0f, (s16)frameCount, 2, -10.0f); + this->actionFunc = func_80A906C4; +} + +void func_80A906C4(EnKakasi2* this, GlobalContext* globalCtx) { + if (this->skelAnime.animCurrentFrame != 0) { + Math_SmoothDownscaleMaxF(&this->skelAnime.animCurrentFrame, 0.5f, 1.0f); + } + Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, this->unk_198, 5, 0xBB8, 0); + SkelAnime_FrameUpdateMatrix(&this->skelAnime); +} + +void EnKakasi2_Update(Actor* thisx, GlobalContext* globalCtx) { + EnKakasi2* this = THIS; + GlobalContext* globalCtx2 = globalCtx; + + this->actor.posRot.rot = this->actor.shape.rot; + Actor_SetHeight(&this->actor, this->height); + this->actionFunc(this, globalCtx2); + Actor_MoveForward(&this->actor); + + if (this->actor.shape.unk_08 == 0.0f) { + Collider_CylinderUpdate(&this->actor, &this->collider); + CollisionCheck_SetAC(globalCtx2, &globalCtx2->colChkCtx, &this->collider.base); + CollisionCheck_SetOC(globalCtx2, &globalCtx2->colChkCtx, &this->collider.base); + } + if (BREG(0) != 0) { + if (BREG(5) != 0) { + osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ this->actor.player_distance ☆☆☆☆☆ %f\n" VT_RST, this->actor.xzDistFromLink); + osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ this->hosei.x ☆☆☆☆☆ %f\n" VT_RST, this->maxSpawnDistance.x); + osSyncPrintf("\n\n"); + } + if (this->actor.draw == NULL) { + if (this->unk_194 != 0) { + if ((this->unk_194 % 2) == 0) { + DebugDisplay_AddObject(this->actor.posRot.pos.x, this->actor.posRot.pos.y, this->actor.posRot.pos.z, + this->actor.posRot.rot.x, this->actor.posRot.rot.y, this->actor.posRot.rot.z, + 1.0f, 1.0f, 1.0f, 70, 70, 70, 255, 4, globalCtx2->state.gfxCtx); + } + } else { + DebugDisplay_AddObject(this->actor.posRot.pos.x, this->actor.posRot.pos.y, this->actor.posRot.pos.z, + this->actor.posRot.rot.x, this->actor.posRot.rot.y, this->actor.posRot.rot.z, + 1.0f, 1.0f, 1.0f, 0, 255, 255, 255, 4, globalCtx2->state.gfxCtx); + } + } + } +} + +void func_80A90948(Actor* thisx, GlobalContext* globalCtx) { + EnKakasi2* this = THIS; + + func_80093D18(globalCtx->state.gfxCtx); + SkelAnime_DrawSV(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, this->skelAnime.dListCount, NULL, + NULL, &this->actor); +} diff --git a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.h b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.h index e8843604f2..4bbf3a8377 100644 --- a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.h +++ b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.h @@ -6,9 +6,18 @@ struct EnKakasi2; +typedef void (*EnKakasi2ActionFunc)(struct EnKakasi2*, GlobalContext*); + typedef struct EnKakasi2 { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0xAC]; + /* 0x014C */ EnKakasi2ActionFunc actionFunc; + /* 0x0150 */ SkelAnime skelAnime; + /* 0x0194 */ s16 unk_194; + /* 0x0196 */ s16 switchFlag; + /* 0x0198 */ s16 unk_198; + /* 0x019C */ Vec3f maxSpawnDistance; + /* 0x01A8 */ f32 height; + /* 0x01AC */ ColliderCylinder collider; } EnKakasi2; // size = 0x01F8 extern const ActorInit En_Kakasi2_InitVars; diff --git a/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c b/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c index 83ddffbcbe..b0e0acea6b 100644 --- a/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c +++ b/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c @@ -1,4 +1,11 @@ +/* + * File: z_en_kakasi3.c + * Overlay: ovl_En_Kakasi3 + * Description: Bonooru the Scarecrow + */ + #include "z_en_kakasi3.h" +#include "vt.h" #define FLAGS 0x02000009 @@ -9,7 +16,26 @@ void EnKakasi3_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnKakasi3_Update(Actor* thisx, GlobalContext* globalCtx); void EnKakasi3_Draw(Actor* thisx, GlobalContext* globalCtx); -/* +void func_80A911F0(EnKakasi3* this, GlobalContext* globalCtx); +void func_80A91284(EnKakasi3* this, GlobalContext* globalCtx); +void func_80A91348(EnKakasi3* this, GlobalContext* globalCtx); +void func_80A915B8(EnKakasi3* this, GlobalContext* globalCtx); +void func_80A91620(EnKakasi3* this, GlobalContext* globalCtx); +void func_80A91760(EnKakasi3* this, GlobalContext* globalCtx); +void func_80A917FC(EnKakasi3* this, GlobalContext* globalCtx); +void func_80A9187C(EnKakasi3* this, GlobalContext* globalCtx); +void func_80A918E4(EnKakasi3* this, GlobalContext* globalCtx); +void func_80A91A90(EnKakasi3* this, GlobalContext* globalCtx); + +static ColliderCylinderInit sCylinderInit = { + { COLTYPE_UNK10, 0x00, 0x09, 0x39, 0x20, COLSHAPE_CYLINDER }, + { 0x00, { 0xFFCFFFFF, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, 0x00, 0x05, 0x01 }, + { 20, 70, 0, { 0, 0, 0 } }, +}; + +extern SkeletonHeader D_060065B0; +extern AnimationHeader D_06000214; + const ActorInit En_Kakasi3_InitVars = { ACTOR_EN_KAKASI3, ACTORTYPE_NPC, @@ -21,35 +47,387 @@ const ActorInit En_Kakasi3_InitVars = { (ActorFunc)EnKakasi3_Update, (ActorFunc)EnKakasi3_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Destroy.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Init.s") +void EnKakasi3_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnKakasi3* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A90E28.s") + Collider_DestroyCylinder(globalCtx, &this->collider); + //! @bug Skelanime_Free is not called +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A90EBC.s") +void EnKakasi3_Init(Actor* thisx, GlobalContext* globalCtx) { + EnKakasi3* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A911F0.s") + osSyncPrintf("\n\n"); + // Translates to: Obonur -- Related to the name of the scarecrow (Bonooru) + osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ おーボヌール ☆☆☆☆☆ \n" VT_RST); + this->actor.unk_1F = 6; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A91284.s") + Collider_InitCylinder(globalCtx, &this->collider); + Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); + SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_060065B0, &D_06000214, NULL, NULL, 0); + this->actor.flags |= 0x400; + this->rot = this->actor.posRot.rot; + this->actor.colChkInfo.mass = 0xFF; + Actor_SetScale(&this->actor, 0.01f); + this->actionFunc = func_80A911F0; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A91348.s") +void func_80A90E28(EnKakasi3* this) { + this->unk_1A4 = 0; + this->skelAnime.animPlaybackSpeed = 0.0f; + this->unk_1AA = this->unk_1AE = 0x0; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A915B8.s") + Math_SmoothDownscaleMaxF(&this->skelAnime.animCurrentFrame, 0.5f, 1.0f); + Math_SmoothScaleMaxMinS(&this->actor.shape.rot.x, this->rot.x, 5, 0x2710, 0); + Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, this->rot.y, 5, 0x2710, 0); + Math_SmoothScaleMaxMinS(&this->actor.shape.rot.z, this->rot.z, 5, 0x2710, 0); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A91620.s") +void func_80A90EBC(EnKakasi3* this, GlobalContext* globalCtx, s32 arg) { + s16 currentFrame; + s16 phi_v0; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A91760.s") + phi_v0 = globalCtx->msgCtx.unk_E410[0]; + if (arg != 0) { + if (this->unk_19C[3] == 0) { + this->unk_19C[3] = (s16)Math_Rand_ZeroFloat(10.99f) + 30; + this->unk_1A6 = (s16)Math_Rand_ZeroFloat(4.99f); + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A917FC.s") + this->unk_19A = (s16)Math_Rand_ZeroFloat(2.99f) + 5; + phi_v0 = this->unk_1A6; + } + switch (phi_v0) { + case 0: + this->unk_19A++; + if (this->unk_1A4 == 0) { + this->unk_1A4 = 1; + Audio_PlayActorSound2(&this->actor, NA_SE_EV_KAKASHI_ROLL); + } + break; + case 1: + this->unk_19A++; + this->unk_1B8 = 1.0f; + break; + case 2: + this->unk_19A++; + if (this->unk_1AE == 0x0) { + this->unk_1AE = 0x1388; + } + break; + case 3: + this->unk_19A++; + if (this->unk_1AA == 0x0) { + this->unk_1AA = 0x1388; + } + break; + case 4: + this->unk_19A++; + this->unk_1B8 = 2.0f; + break; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A9187C.s") + if (this->unk_19A > 8) { + this->unk_19A = 8; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A918E4.s") + if (this->unk_19A != 0) { + this->actor.gravity = -1.0f; + if (this->unk_19A == 8 && (this->actor.bgCheckFlags & 1)) { + this->actor.velocity.y = 3.0f; + Audio_PlayActorSound2(&this->actor, NA_SE_IT_KAKASHI_JUMP); + } + Math_SmoothScaleMaxF(&this->skelAnime.animPlaybackSpeed, this->unk_1B8, 0.1f, 0.2f); + Math_SmoothScaleMaxMinS(&this->actor.shape.rot.x, this->unk_1AA, 0x5, 0x3E8, 0); + Math_SmoothScaleMaxMinS(&this->actor.shape.rot.z, this->unk_1AE, 0x5, 0x3E8, 0); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A91A90.s") + if (this->unk_1AA != 0x0 && fabsf(this->actor.shape.rot.x - this->unk_1AA) < 50.0f) { + this->unk_1AA *= -1.0f; + } + if (this->unk_1AE != 0x0 && fabsf(this->actor.shape.rot.z - this->unk_1AE) < 50.0f) { + this->unk_1AE *= -1.0f; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Update.s") + if (this->unk_1A4 != 0) { + this->actor.shape.rot.y += 0x1000; + if (this->actor.shape.rot.y == 0) { + this->unk_1A4 = 0; + } + } + currentFrame = this->skelAnime.animCurrentFrame; + if (currentFrame == 11 || currentFrame == 17) { + Audio_PlayActorSound2(&this->actor, NA_SE_EV_KAKASHI_SWING); + } + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Draw.s") +void func_80A911F0(EnKakasi3* this, GlobalContext* globalCtx) { + f32 frameCount = SkelAnime_GetFrameCount(&D_06000214.genericHeader); + + SkelAnime_ChangeAnim(&this->skelAnime, &D_06000214, 1.0f, 0.0f, (s16)frameCount, 0, -10.0f); + this->actionFunc = func_80A91284; +} + +void func_80A91284(EnKakasi3* this, GlobalContext* globalCtx) { + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + + this->actor.textId = 0x40A1; + this->dialogState = 6; + this->unk_19A = 0; + + if (LINK_IS_CHILD) { + this->unk_194 = false; + if (gSaveContext.unk_12C5 != 0) { + this->actor.textId = 0x40A0; + this->dialogState = 5; + this->unk_1A8 = 1; + } + } else { + this->unk_194 = true; + if (gSaveContext.unk_12C5 != 0) { + if (this->unk_195) { + this->actor.textId = 0x40A2; + } else { + this->actor.textId = 0x40A3; + } + } + } + this->actionFunc = func_80A91348; +} + +void func_80A91348(EnKakasi3* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + s16 angleTowardsLink; + s16 absAngleTowardsLink; + + func_80A90E28(this); + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + this->camId = -1; + if (func_8002F194(&this->actor, globalCtx)) { + if (!this->unk_194) { + if (this->unk_1A8 == 0) { + this->actionFunc = func_80A91284; + } else { + this->actionFunc = func_80A91760; + } + } else { + this->actionFunc = func_80A91284; + } + return; + } + + angleTowardsLink = this->actor.yawTowardsLink - this->actor.shape.rot.y; + if (!(this->actor.xzDistFromLink > 120.0f)) { + absAngleTowardsLink = ABS(angleTowardsLink); + + if (absAngleTowardsLink < 0x4300) { + if (!this->unk_194) { + + if (player->stateFlags2 & 0x1000000) { + this->camId = func_800800F8(globalCtx, 0x8D4, -0x63, &this->actor, 0); + globalCtx->msgCtx.msgMode = 0x37; + this->dialogState = 5; + this->unk_1B8 = 0.0f; + func_8010B680(globalCtx, 0x40A4, NULL); + player->stateFlags2 |= 0x800000; + this->actionFunc = func_80A915B8; + return; + } + if (this->actor.xzDistFromLink < 80.0f) { + player->stateFlags2 |= 0x800000; + } + } else if (gSaveContext.unk_12C5 != 0 && !this->unk_195) { + + if (player->stateFlags2 & 0x1000000) { + this->camId = func_800800F8(globalCtx, 0x8D4, -0x63, &this->actor, 0); + globalCtx->msgCtx.msgMode = 0x37; + this->dialogState = 5; + this->unk_1B8 = 0.0f; + func_8010B680(globalCtx, 0x40A8, NULL); + player->stateFlags2 |= 0x800000; + this->actionFunc = func_80A9187C; + return; + } + if (this->actor.xzDistFromLink < 80.0f) { + player->stateFlags2 |= 0x800000; + } + } + func_8002F2CC(&this->actor, globalCtx, 100.0f); + } + } +} + +void func_80A915B8(EnKakasi3* this, GlobalContext* globalCtx) { + + if (func_8010BDBC(&globalCtx->msgCtx) == 5 && func_80106BC8(globalCtx)) { + func_80106CCC(globalCtx); + func_8010BD58(globalCtx, 0x2C); + this->actionFunc = func_80A91620; + } +} + +void func_80A91620(EnKakasi3* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + if ((globalCtx->msgCtx.unk_E3EE == 4 || (globalCtx->msgCtx.unk_E3EE >= 5 && globalCtx->msgCtx.unk_E3EE < 11)) && + (globalCtx->msgCtx.msgMode == 0)) { + + func_800803F0(globalCtx, this->camId); + if (globalCtx->cameraPtrs[this->camId] == NULL) { + this->camId = -1; + } + if (this->camId != -1) { + func_8005B1A4(globalCtx->cameraPtrs[this->camId]); + } + this->actionFunc = func_80A911F0; + return; + } + + if (globalCtx->msgCtx.unk_E3EE == 3 && globalCtx->msgCtx.msgMode == 0) { + this->dialogState = 5; + func_8010B680(globalCtx, 0x40A5, NULL); + func_8002DF54(globalCtx, NULL, 8); + this->actionFunc = func_80A91A90; + return; + } + + if (globalCtx->msgCtx.unk_E3EE == 1) { + func_80A90EBC(this, globalCtx, 0); + player->stateFlags2 |= 0x800000; + } +} + +void func_80A91760(EnKakasi3* this, GlobalContext* globalCtx) { + + func_80A90E28(this); + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + if (this->dialogState == func_8010BDBC(&globalCtx->msgCtx) && func_80106BC8(globalCtx)) { + globalCtx->msgCtx.msgMode = 0x37; + func_8010BD58(globalCtx, 0x2D); + this->actionFunc = func_80A917FC; + this->camId = func_800800F8(globalCtx, 0x8E8, -0x63, &this->actor, 0); + } +} + +void func_80A917FC(EnKakasi3* this, GlobalContext* globalCtx) { + + if (globalCtx->msgCtx.unk_E3EE != 15) { + func_80A90EBC(this, globalCtx, 1); + } else { + globalCtx->msgCtx.unk_E3EE = 4; + func_80106CCC(globalCtx); + func_800803F0(globalCtx, this->camId); + this->actionFunc = func_80A911F0; + } +} + +void func_80A9187C(EnKakasi3* this, GlobalContext* globalCtx) { + + if (func_8010BDBC(&globalCtx->msgCtx) == 5 && func_80106BC8(globalCtx)) { + func_80106CCC(globalCtx); + func_8010BD58(globalCtx, 0x28); + this->actionFunc = func_80A918E4; + } +} + +void func_80A918E4(EnKakasi3* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + if (BREG(3) != 0) { + // No way! + osSyncPrintf(VT_FGCOL(PURPLE) "☆☆☆☆☆ まさか！ ☆☆☆☆☆ %d\n" VT_RST, globalCtx->msgCtx.unk_E3EE); + } + if ((globalCtx->msgCtx.unk_E3EE == 4 || (globalCtx->msgCtx.unk_E3EE >= 5 && globalCtx->msgCtx.unk_E3EE < 11)) && + globalCtx->msgCtx.msgMode == 0) { + + func_8010B680(globalCtx, 0x40A6, NULL); + this->dialogState = 5; + func_800803F0(globalCtx, this->camId); + this->camId = -1; + func_8002DF54(globalCtx, NULL, 8); + this->actionFunc = func_80A91A90; + return; + } + + if (globalCtx->msgCtx.unk_E3EE == 3 && globalCtx->msgCtx.msgMode == 0) { + globalCtx->msgCtx.unk_E3EE = 4; + if (BREG(3) != 0) { + osSyncPrintf("\n\n"); + // With this, other guys are OK! That's it! + osSyncPrintf(VT_FGCOL(CYAN) "☆☆☆☆☆ これで、他の奴もＯＫ！だ！ ☆☆☆☆☆ %d\n" VT_RST, + globalCtx->msgCtx.unk_E3EE); + } + this->unk_195 = true; + func_8010B680(globalCtx, 0x40A7, NULL); + this->dialogState = 5; + func_8002DF54(globalCtx, NULL, 8); + this->actionFunc = func_80A91A90; + return; + } + + if (globalCtx->msgCtx.unk_E3EE == 1) { + func_80A90EBC(this, globalCtx, 0); + player->stateFlags2 |= 0x800000; + } +} + +void func_80A91A90(EnKakasi3* this, GlobalContext* globalCtx) { + func_80A90E28(this); + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + func_8002DF54(globalCtx, NULL, 8); + + if (this->dialogState == func_8010BDBC(&globalCtx->msgCtx) && func_80106BC8(globalCtx)) { + if (this->unk_195) { + if (!(gSaveContext.eventChkInf[9] & 0x1000)) { + gSaveContext.eventChkInf[9] |= 0x1000; + } + } + if (globalCtx->cameraPtrs[this->camId] == NULL) { + this->camId = -1; + } + if (this->camId != -1) { + func_8005B1A4(globalCtx->cameraPtrs[this->camId]); + } + func_80106CCC(globalCtx); + globalCtx->msgCtx.unk_E3EE = 4; + func_8002DF54(globalCtx, NULL, 7); + this->actionFunc = func_80A911F0; + } +} + +void EnKakasi3_Update(Actor* thisx, GlobalContext* globalCtx) { + EnKakasi3* this = THIS; + s32 pad; + s32 i; + + if (BREG(2) != 0) { + osSyncPrintf("\n\n"); + // flag! + osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ フラグ！ ☆☆☆☆☆ %d\n" VT_RST, gSaveContext.unk_12C5); + } + + this->unk_198++; + this->actor.posRot.rot = this->actor.shape.rot; + for (i = 0; i < ARRAY_COUNT(this->unk_19C); i++) { + if (this->unk_19C[i] != 0) { + this->unk_19C[i]--; + } + } + + Actor_SetHeight(&this->actor, 60.0f); + this->actionFunc(this, globalCtx); + Actor_MoveForward(&this->actor); + func_8002E4B4(globalCtx, &this->actor, 50.0f, 50.0f, 100.0f, 28); + Collider_CylinderUpdate(&this->actor, &this->collider); + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); +} + +void EnKakasi3_Draw(Actor* thisx, GlobalContext* globalCtx) { + EnKakasi3* this = THIS; + + func_80093D18(globalCtx->state.gfxCtx); + SkelAnime_DrawSV(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, this->skelAnime.dListCount, NULL, + NULL, &this->actor); +} diff --git a/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.h b/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.h index bae8c09ba8..8cae78ed74 100644 --- a/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.h +++ b/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.h @@ -6,9 +6,28 @@ struct EnKakasi3; +typedef void (*EnKakasi3ActionFunc)(struct EnKakasi3*, GlobalContext*); + typedef struct EnKakasi3 { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0xC0]; + /* 0x014C */ EnKakasi3ActionFunc actionFunc; + /* 0x0150 */ SkelAnime skelAnime; + /* 0x0194 */ u8 unk_194; + /* 0x0195 */ u8 unk_195; + /* 0x0196 */ s16 dialogState; + /* 0x0198 */ s16 unk_198; + /* 0x019A */ s16 unk_19A; + /* 0x019C */ s16 unk_19C[4]; + /* 0x01A4 */ s16 unk_1A4; + /* 0x01A6 */ s16 unk_1A6; + /* 0x01A8 */ s16 unk_1A8; + /* 0x01AA */ s16 unk_1AA; + /* 0x01AC */ char unk_1AC[2]; + /* 0x01AE */ s16 unk_1AE; + /* 0x01B0 */ Vec3s rot; + /* 0x01B8 */ f32 unk_1B8; + /* 0x01BC */ ColliderCylinder collider; + /* 0x0208 */ s16 camId; } EnKakasi3; // size = 0x020C extern const ActorInit En_Kakasi3_InitVars; diff --git a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c index 62a0ca27de..9792a5c0a3 100644 --- a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c +++ b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c @@ -1,4 +1,13 @@ + +/* + * File: z_en_reeba.c + * Overlay: ovl_En_Reeba + * Description: Leever + */ + #include "z_en_reeba.h" +#include "overlays/actors/ovl_En_Encount1/z_en_encount1.h" +#include "vt.h" #define FLAGS 0x08000015 @@ -9,7 +18,24 @@ void EnReeba_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnReeba_Update(Actor* thisx, GlobalContext* globalCtx); void EnReeba_Draw(Actor* thisx, GlobalContext* globalCtx); -/* +void func_80AE4F40(EnReeba* this, GlobalContext* globalCtx); +void func_80AE5054(EnReeba* this, GlobalContext* globalCtx); +void func_80AE5270(EnReeba* this, GlobalContext* globalCtx); +void func_80AE5688(EnReeba* this, GlobalContext* globalCtx); +void func_80AE56E0(EnReeba* this, GlobalContext* globalCtx); +void func_80AE538C(EnReeba* this, GlobalContext* globalCtx); +void func_80AE53AC(EnReeba* this, GlobalContext* globalCtx); +void func_80AE5E48(EnReeba* this, GlobalContext* globalCtx); +void func_80AE5854(EnReeba* this, GlobalContext* globalCtx); +void func_80AE5C38(EnReeba* this, GlobalContext* globalCtx); +void func_80AE5938(EnReeba* this, GlobalContext* globalCtx); +void func_80AE5A9C(EnReeba* this, GlobalContext* globalCtx); + +static DamageTable sDamageTable = { + 0x00, 0xE2, 0xE1, 0xE2, 0xC1, 0xE2, 0xE2, 0xD2, 0xE1, 0xE4, 0xE6, 0xE2, 0x34, 0xE2, 0xE2, 0xE2, + 0xE2, 0x00, 0x34, 0x00, 0x00, 0x00, 0xE2, 0xE8, 0xE4, 0xE2, 0xE8, 0xE4, 0x10, 0x00, 0x00, 0x00, +}; + const ActorInit En_Reeba_InitVars = { ACTOR_EN_REEBA, ACTORTYPE_MISC, @@ -21,45 +47,611 @@ const ActorInit En_Reeba_InitVars = { (ActorFunc)EnReeba_Update, (ActorFunc)EnReeba_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Init.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Destroy.s") +static ColliderCylinderInit sCylinderInit = { + { COLTYPE_UNK5, 0x11, 0x09, 0x39, 0x10, COLSHAPE_CYLINDER }, + { 0x00, { 0xFFCFFFFF, 0x08, 0x08 }, { 0xFFCFFFFF, 0x00, 0x00 }, 0x01, 0x05, 0x01 }, + { 20, 40, 0, { 0, 0, 0 } }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE4F40.s") +extern AnimationHeader D_060001E4; +extern SkeletonHeader D_06001EE8; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5054.s") +void EnReeba_Init(Actor* thisx, GlobalContext* globalCtx) { + EnReeba* this = THIS; + f32 temp_f0; + s32 surfaceType; + s32 pad; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5270.s") + this->actor.naviEnemyId = 0x47; + this->actor.unk_1F = 3; + this->actor.gravity = -3.5f; + this->actor.posRot2.pos = this->actor.posRot.pos; + SkelAnime_Init(globalCtx, &this->skelanime, &D_06001EE8, &D_060001E4, this->limbDrawTable, + this->transitionDrawTable, 18); + this->actor.colChkInfo.mass = 0xFE; + this->actor.colChkInfo.health = 4; + Collider_InitCylinder(globalCtx, &this->collider); + Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); + this->isBig = this->actor.params; + this->scale = 0.04f; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE538C.s") + if (this->isBig) { + this->collider.dim.radius = 35; + this->collider.dim.height = 45; + this->scale *= 1.5f; + osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ リーバぼす登場 ☆☆☆☆☆ %f\n" VT_RST, this->scale); + this->actor.colChkInfo.health = 20; + this->collider.body.toucher.effect = 4; + this->collider.body.toucher.damage = 16; + Actor_ChangeType(globalCtx, &globalCtx->actorCtx, &this->actor, ACTORTYPE_ENEMY); + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE53AC.s") + temp_f0 = this->scale * -27500.0f; + this->unk_284 = temp_f0; + this->actor.shape.unk_08 = temp_f0; + ActorShape_Init(&this->actor.shape, temp_f0, ActorShadow_DrawFunc_Circle, 0.0f); + this->actor.colChkInfo.damageTable = &sDamageTable; + func_8002E4B4(globalCtx, &this->actor, 35.0f, 60.0f, 60.0f, 0x1D); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE561C.s") + surfaceType = func_80041D4C(&globalCtx->colCtx, this->actor.floorPoly, this->actor.floorPolySource); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5688.s") + if ((surfaceType != 4) && (surfaceType != 7)) { + Actor_Kill(&this->actor); + return; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE56E0.s") + this->actionfunc = func_80AE4F40; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE57F0.s") +void EnReeba_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnReeba* this = THIS; + EnEncount1* spawner; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5854.s") + Collider_DestroyCylinder(globalCtx, &this->collider); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE58EC.s") + if (this->actor.parent != NULL) { + spawner = (EnEncount1*)this->actor.parent; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5938.s") + if (spawner->actor.update != NULL) { -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5A9C.s") + if (spawner->unk_152 > 0) { + spawner->unk_152--; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5BC4.s") + if (this->isBig) { + spawner->unk_16C = 0; + spawner->unk_164 = 0x258; + } + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5C38.s") +void func_80AE4F40(EnReeba* this, GlobalContext* globalCtx) { + f32 frames = SkelAnime_GetFrameCount(&D_060001E4.genericHeader); + Player* player = PLAYER; + s16 absPlayerVel; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5E48.s") + SkelAnime_ChangeAnim(&this->skelanime, &D_060001E4, 2.0f, 0.0f, frames, 0, -10.0f); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5EDC.s") + absPlayerVel = fabsf(player->linearVelocity); + this->unk_278 = (20 - (absPlayerVel * 2)); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Update.s") + if (this->unk_278 < 0) { + this->unk_278 = 2; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Draw.s") + if (this->unk_278 > 20) { + this->unk_278 = 20; + } + + this->actor.flags &= ~0x08000000; + this->actor.posRot.pos.y = this->actor.groundY; + + if (this->isBig) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_RIVA_BIG_APPEAR); + } else { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_RIVA_APPEAR); + } + + this->actionfunc = func_80AE5054; +} + +void func_80AE5054(EnReeba* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + f32 playerLinearVel; + + SkelAnime_FrameUpdateMatrix(&this->skelanime); + + if ((globalCtx->gameplayFrames % 4) == 0) { + func_80033260(globalCtx, &this->actor, &this->actor.posRot.pos, this->actor.shape.unk_10, 1, 8.0f, 0x1F4, 0xA, + 1); + } + + if (this->unk_278 == 0) { + Math_SmoothScaleMaxF(&this->actor.shape.unk_10, 12.0f, 1.0f, 1.0f); + if (this->actor.shape.unk_08 < 0.0f) { + Math_SmoothDownscaleMaxF(&this->actor.shape.unk_08, 1.0f, this->unk_288); + Math_SmoothScaleMaxF(&this->unk_288, 300.0f, 1.0f, 5.0f); + + } else { + this->unk_288 = 0.0f; + this->actor.shape.unk_08 = 0.0f; + playerLinearVel = player->linearVelocity; + + switch (this->unk_280) { + case 0: + this->actor.posRot.rot.y = this->actor.yawTowardsLink; + break; + case 1: + this->actor.posRot.rot.y = this->actor.yawTowardsLink + (800.0f * playerLinearVel); + break; + case 2: + case 3: + this->actor.posRot.rot.y = + this->actor.yawTowardsLink + + (player->actor.shape.rot.y - this->actor.yawTowardsLink) * (playerLinearVel * 0.15f); + break; + case 4: + this->actor.posRot.rot.y = this->actor.yawTowardsLink - (800.0f * playerLinearVel); + } + + if (this->isBig) { + this->actionfunc = func_80AE538C; + } else { + this->unk_272 = 130; + this->actor.speedXZ = Math_Rand_ZeroFloat(4.0f) + 6.0f; + this->actionfunc = func_80AE5270; + } + } + } +} + +void func_80AE5270(EnReeba* this, GlobalContext* globalCtx) { + s32 surfaceType; + + SkelAnime_FrameUpdateMatrix(&this->skelanime); + + if (this->actor.shape.unk_10 < 12.0f) { + Math_SmoothScaleMaxF(&this->actor.shape.unk_10, 12.0f, 3.0f, 1.0f); + } + + surfaceType = func_80041D4C(&globalCtx->colCtx, this->actor.floorPoly, this->actor.floorPolySource); + + if ((surfaceType != 4) && (surfaceType != 7)) { + this->actor.speedXZ = 0.0f; + this->actionfunc = func_80AE5688; + return; + } + + if ((this->unk_272 == 0) || (this->actor.xzDistFromLink < 30.0f) || (this->actor.xzDistFromLink > 400.0f) || + (this->actor.bgCheckFlags & 8)) { + this->actionfunc = func_80AE5688; + return; + } + + if (this->unk_274 == 0) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_RIVA_MOVE); + this->unk_274 = 10; + } + +} + +void func_80AE538C(EnReeba* this, GlobalContext* globalCtx) { + this->actor.flags |= 5; + this->actionfunc = func_80AE53AC; +} + +void func_80AE53AC(EnReeba* this, GlobalContext* globalCtx) { + f32 speed; + s16 yawDiff; + s16 yaw; + s32 surfaceType; + + SkelAnime_FrameUpdateMatrix(&this->skelanime); + + if (this->actor.shape.unk_10 < 12.0f) { + Math_SmoothScaleMaxF(&this->actor.shape.unk_10, 12.0f, 3.0f, 1.0f); + } + + surfaceType = func_80041D4C(&globalCtx->colCtx, this->actor.floorPoly, this->actor.floorPolySource); + + if (((surfaceType != 4) && (surfaceType != 7)) || (this->actor.xzDistFromLink > 400.0f) || + (this->actor.bgCheckFlags & 8)) { + this->actionfunc = func_80AE5688; + return; + } + + if ((this->actor.xzDistFromLink < 70.0f) && (this->unk_270 == 0)) { + this->unk_270 = 30; + } + + speed = (this->actor.xzDistFromLink - 20.0f) / ((Math_Rand_ZeroOne() * 50.0f) + 150.0f); + this->actor.speedXZ += speed * 1.8f; + + if (this->actor.speedXZ >= 3.0f) { + this->actor.speedXZ = 3.0f; + } + + if (this->actor.speedXZ < -3.0f) { + this->actor.speedXZ = -3.0f; + } + + yawDiff = (this->unk_270 == 0) ? this->actor.yawTowardsLink : -this->actor.yawTowardsLink; + yawDiff = yawDiff - this->actor.posRot.rot.y; + yaw = (yawDiff > 0) ? ((yawDiff / 31.0f) + 10.0f) : ((yawDiff / 31.0f) - 10.0f); + this->actor.posRot.rot.y += (yaw * 2.0f); + + if (this->unk_274 == 0) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_RIVA_MOVE); + this->unk_274 = 20; + } +} + +void func_80AE561C(EnReeba* this, GlobalContext* globalCtx) { + Math_SmoothDownscaleMaxF(&this->actor.speedXZ, 1.0f, 0.3f); + + if (this->unk_272 == 0) { + if (this->isBig) { + this->actionfunc = func_80AE538C; + } else { + this->actionfunc = func_80AE5688; + } + } +} + +void func_80AE5688(EnReeba* this, GlobalContext* globalCtx) { + this->unk_27E = 0; + Audio_PlayActorSound2(&this->actor, NA_SE_EN_AKINDONUTS_HIDE); + this->actor.flags |= 0x8000000; + this->actor.flags &= ~5; + this->actionfunc = func_80AE56E0; +} + +void func_80AE56E0(EnReeba* this, GlobalContext* globalCtx) { + Math_SmoothDownscaleMaxF(&this->actor.shape.unk_10, 1.0f, 0.3f); + Math_SmoothDownscaleMaxF(&this->actor.speedXZ, 0.1f, 0.3f); + SkelAnime_FrameUpdateMatrix(&this->skelanime); + + if ((this->unk_284 + 10.0f) <= this->actor.shape.unk_08) { + if ((globalCtx->gameplayFrames & 3) == 0) { + func_80033260(globalCtx, &this->actor, &this->actor.posRot.pos, this->actor.shape.unk_10, 1, 8.0f, 500, 10, + 1); + } + + Math_SmoothScaleMaxF(&this->actor.shape.unk_08, this->unk_284, 1.0f, this->unk_288); + Math_SmoothScaleMaxF(&this->unk_288, 300.0f, 1.0f, 5.0f); + } else { + Actor_Kill(&this->actor); + } +} + +void func_80AE57F0(EnReeba* this, GlobalContext* globalCtx) { + this->unk_276 = 14; + this->actor.speedXZ = -8.0f; + this->actor.posRot.rot.y = this->actor.yawTowardsLink; + func_8003426C(&this->actor, 0x4000, 0xFF, 0, 8); + this->actionfunc = func_80AE5854; +} + +void func_80AE5854(EnReeba* this, GlobalContext* globalCtx) { + SkelAnime_FrameUpdateMatrix(&this->skelanime); + + if (this->actor.speedXZ < 0.0f) { + this->actor.speedXZ++; + } + + if (this->unk_276 == 0) { + if (this->isBig) { + this->unk_270 = 30; + this->actionfunc = func_80AE538C; + } else { + this->actionfunc = func_80AE5688; + } + } +} + +void func_80AE58EC(EnReeba* this, GlobalContext* globalCtx) { + this->unk_278 = 14; + this->actor.posRot.rot.y = this->actor.yawTowardsLink; + this->actor.speedXZ = -8.0f; + this->actor.flags |= 0x8000000; + this->actor.flags &= ~5; + this->actionfunc = func_80AE5938; +} + +void func_80AE5938(EnReeba* this, GlobalContext* globalCtx) { + Vec3f pos; + f32 scale; + + if (this->unk_278 != 0) { + if (this->actor.speedXZ < 0.0f) { + this->actor.speedXZ += 1.0f; + } + } else { + this->actor.speedXZ = 0.0f; + + if ((this->unk_27E == 4) || (this->actor.colChkInfo.health != 0)) { + if (this->unk_27E == 2) { + pos.x = this->actor.posRot.pos.x + Math_Rand_CenteredFloat(20.0f); + pos.y = this->actor.posRot.pos.y + Math_Rand_CenteredFloat(20.0f); + pos.z = this->actor.posRot.pos.z + Math_Rand_CenteredFloat(20.0f); + scale = 3.0f; + + if (this->isBig) { + scale = 6.0f; + } + + EffectSsEnIce_SpawnFlyingVec3f(globalCtx, &this->actor, &pos, 150, 150, 150, 250, 235, 245, 255, scale); + } + + this->unk_278 = 66; + this->actionfunc = func_80AE5E48; + } else { + this->unk_278 = 30; + this->actionfunc = func_80AE5A9C; + } + } +} + +void func_80AE5A9C(EnReeba* this, GlobalContext* globalCtx) { + Vec3f randPos; + f32 scale; + + if (this->unk_278 != 0) { + if ((this->unk_27E == 2) && ((this->unk_278 & 0xF) == 0)) { + randPos.x = this->actor.posRot.pos.x + Math_Rand_CenteredFloat(20.0f); + randPos.y = this->actor.posRot.pos.y + Math_Rand_CenteredFloat(20.0f); + randPos.z = this->actor.posRot.pos.z + Math_Rand_CenteredFloat(20.0f); + scale = 3.0f; + + if (this->isBig) { + scale = 6.0f; + } + + EffectSsEnIce_SpawnFlyingVec3f(globalCtx, &this->actor, &randPos, 150, 150, 150, 250, 235, 245, 255, scale); + } + } else { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_RIVA_DEAD); + func_80032C7C(globalCtx, &this->actor); + this->actionfunc = func_80AE5C38; + } +} + +void func_80AE5BC4(EnReeba* this, GlobalContext* globalCtx) { + this->actor.speedXZ = -8.0f; + this->actor.posRot.rot.y = this->actor.yawTowardsLink; + func_8003426C(&this->actor, 0x4000, 0xFF, 0, 8); + this->unk_278 = 14; + this->actor.flags &= ~1; + this->actionfunc = func_80AE5C38; +} + +void func_80AE5C38(EnReeba* this, GlobalContext* globalCtx) { + Vec3f pos; + Vec3f accel = { 0.0f, 0.0f, 0.0f }; + Vec3f velocity = { 0.0f, 0.0f, 0.0f }; + EnEncount1* spawner; + + if (this->unk_278 != 0) { + if (this->actor.speedXZ < 0.0f) { + this->actor.speedXZ++; + } + } else { + this->actor.speedXZ = 0.0f; + Math_SmoothDownscaleMaxF(&this->scale, 0.1f, 0.01f); + + if (this->scale < 0.01f) { + pos.x = this->actor.posRot.pos.x; + pos.y = this->actor.posRot.pos.y; + pos.z = this->actor.posRot.pos.z; + velocity.y = 4.0f; + EffectSsDeadDb_Spawn(globalCtx, &pos, &velocity, &accel, 120, 0, 255, 255, 255, 255, 255, 0, 0, 1, 9, true); + + if (!this->isBig) { + Item_DropCollectibleRandom(globalCtx, &this->actor, &pos, 0xE0); + } else { + Item_DropCollectibleRandom(globalCtx, &this->actor, &pos, 0xC0); + } + + if (this->actor.parent != NULL) { + spawner = (EnEncount1*)this->actor.parent; + + if (spawner->actor.update != NULL) { + if (!this->isBig) { + if (spawner->numLeeversDead < 10) { + spawner->numLeeversDead++; + } + // How many are dead? + osSyncPrintf("\n\n"); + osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 何匹ＤＥＡＤ？ ☆☆☆☆☆%d\n" VT_RST, spawner->numLeeversDead); + osSyncPrintf("\n\n"); + } + } + + Actor_Kill(&this->actor); + } + } + } +} + +void func_80AE5E48(EnReeba* this, GlobalContext* globalCtx) { + if (this->unk_278 < 37) { + this->actor.shape.rot.x = Math_Rand_CenteredFloat(3000.0f); + this->actor.shape.rot.z = Math_Rand_CenteredFloat(3000.0f); + + if (this->unk_278 == 0) { + if (this->isBig) { + this->actionfunc = func_80AE538C; + } else { + this->actionfunc = func_80AE5688; + } + } + } +} + +void func_80AE5EDC(EnReeba* this, GlobalContext* globalCtx) { + if (this->collider.base.acFlags & 2) { + this->collider.base.acFlags &= ~2; + + if ((this->actionfunc != func_80AE5C38) && (this->actionfunc != func_80AE5854)) { + this->actor.shape.rot.z = 0; + this->unk_27E = 0; + this->actor.shape.rot.x = this->actor.shape.rot.z; + + switch (this->actor.colChkInfo.damageEffect) { + case 11: // none + case 12: // boomerang + if ((this->actor.colChkInfo.health > 1) && (this->unk_27E != 4)) { + this->unk_27E = 4; + Audio_PlayActorSound2(&this->actor, NA_SE_EN_GOMA_JR_FREEZE); + func_8003426C(&this->actor, 0, 0xFF, 0, 0x50); + this->actionfunc = func_80AE58EC; + break; + } + case 13: // hookshot/longshot + if ((this->actor.colChkInfo.health > 2) && (this->unk_27E != 4)) { + this->unk_27E = 4; + func_8003426C(&this->actor, 0, 0xFF, 0, 0x50); + Audio_PlayActorSound2(&this->actor, NA_SE_EN_GOMA_JR_FREEZE); + this->actionfunc = func_80AE58EC; + break; + } + case 14: + this->unk_27C = 6; + Actor_ApplyDamage(&this->actor); + if (this->actor.colChkInfo.health == 0) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_RIVA_DEAD); + func_80032C7C(globalCtx, &this->actor); + this->actionfunc = func_80AE5BC4; + break; + } + if (this->actionfunc == func_80AE5E48) { + this->actor.shape.rot.z = 0; + this->actor.shape.rot.x = this->actor.shape.rot.z; + } + Audio_PlayActorSound2(&this->actor, NA_SE_EN_RIVA_DAMAGE); + this->actionfunc = func_80AE57F0; + break; + case 3: // ice arrows/ice magic + Actor_ApplyDamage(&this->actor); + this->unk_27C = 2; + this->unk_27E = 2; + func_8003426C(&this->actor, 0, 0xFF, 0, 0x50); + this->actionfunc = func_80AE58EC; + break; + case 1: // unknown + if (this->unk_27E != 4) { + this->unk_27E = 4; + func_8003426C(&this->actor, 0, 0xFF, 0, 0x50); + this->actionfunc = func_80AE58EC; + } + break; + } + } + } +} + +void EnReeba_Update(Actor* thisx, GlobalContext* globalCtx) { + GlobalContext* globalCtx2 = globalCtx; + EnReeba* this = THIS; + Player* player = PLAYER; + + func_80AE5EDC(this, globalCtx); + this->actionfunc(this, globalCtx2); + Actor_SetScale(&this->actor, this->scale); + + if (this->unk_270 != 0) { + this->unk_270--; + } + + if (this->unk_272 != 0) { + this->unk_272--; + } + + if (this->unk_278 != 0) { + this->unk_278--; + } + + if (this->unk_274 != 0) { + this->unk_274--; + } + + if (this->unk_276 != 0) { + this->unk_276--; + } + + Actor_MoveForward(&this->actor); + func_8002E4B4(globalCtx2, &this->actor, 35.0f, 60.0f, 60.0f, 0x1D); + + if (this->collider.base.atFlags & 4) { + this->collider.base.atFlags &= ~4; + + if ((this->actionfunc == func_80AE5270) || (this->actionfunc == func_80AE53AC)) { + this->actor.speedXZ = 8.0f; + this->actor.posRot.rot.y *= -1.0f; + this->unk_272 = 14; + this->actionfunc = func_80AE561C; + return; + } + } + + if (this->collider.base.atFlags & 2) { + this->collider.base.atFlags &= ~2; + if ((this->collider.base.at == &player->actor) && !this->isBig && (this->actionfunc != func_80AE56E0)) { + this->actionfunc = func_80AE5688; + } + } + + this->actor.posRot2.pos = this->actor.posRot.pos; + + if (!this->isBig) { + this->actor.posRot2.pos.y += 15.0f; + } else { + this->actor.posRot2.pos.y += 30.0f; + } + + Collider_CylinderUpdate(&this->actor, &this->collider); + + if ((this->actor.shape.unk_08 >= -700.0f) && (this->actor.colChkInfo.health > 0) && + (this->actionfunc != func_80AE56E0)) { + CollisionCheck_SetOC(globalCtx2, &globalCtx2->colChkCtx, &this->collider.base); + + if (!(this->actor.shape.unk_08 < 0.0f)) { + CollisionCheck_SetAC(globalCtx2, &globalCtx2->colChkCtx, &this->collider.base); + + if ((this->actionfunc == func_80AE5270) || (this->actionfunc == func_80AE53AC)) { + CollisionCheck_SetAT(globalCtx2, &globalCtx2->colChkCtx, &this->collider.base); + } + } + } +} + +void EnReeba_Draw(Actor* thisx, GlobalContext* globalCtx) { + EnReeba* this = THIS; + s32 pad; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_reeba.c", 1062); + + func_80093D18(globalCtx->state.gfxCtx); + + if (this->isBig) { + gDPSetPrimColor(oGfxCtx->polyOpa.p++, 0x0, 0x01, 155, 55, 255, 255); + } else { + gDPSetPrimColor(oGfxCtx->polyOpa.p++, 0x0, 0x01, 255, 255, 255, 255); + } + + SkelAnime_Draw(globalCtx, this->skelanime.skeleton, this->skelanime.limbDrawTbl, NULL, NULL, &this->actor); + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_reeba.c", 1088); + + if (BREG(0)) { + Vec3f debugPos; + + debugPos.x = (Math_Sins(this->actor.posRot.rot.y) * 30.0f) + this->actor.posRot.pos.x; + debugPos.y = this->actor.posRot.pos.y + 20.0f; + debugPos.z = (Math_Coss(this->actor.posRot.rot.y) * 30.0f) + this->actor.posRot.pos.z; + DebugDisplay_AddObject(debugPos.x, debugPos.y, debugPos.z, this->actor.posRot.rot.x, this->actor.posRot.rot.y, + this->actor.posRot.rot.z, 1.0f, 1.0f, 1.0f, 255, 0, 0, 255, 4, globalCtx->state.gfxCtx); + } +} diff --git a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.h b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.h index 299d19bdf0..c469ab7387 100644 --- a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.h +++ b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.h @@ -6,9 +6,28 @@ struct EnReeba; +typedef void (*EnReebaActionFunc)(struct EnReeba*, GlobalContext*); + typedef struct EnReeba { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x190]; + /* 0x014C */ SkelAnime skelanime; + /* 0x0190 */ Vec3s limbDrawTable[18]; + /* 0x01FC */ Vec3s transitionDrawTable[18]; + /* 0x0268 */ char unk_268[0x4]; + /* 0x026C */ EnReebaActionFunc actionfunc; + /* 0x0270 */ s16 unk_270; + /* 0x0272 */ s16 unk_272; + /* 0x0274 */ s16 unk_274; + /* 0x0276 */ s16 unk_276; + /* 0x0278 */ s16 unk_278; + /* 0x027A */ s16 isBig; + /* 0x027C */ s16 unk_27C; + /* 0x027E */ s16 unk_27E; + /* 0x0280 */ s16 unk_280; + /* 0x0284 */ f32 unk_284; + /* 0x0288 */ f32 unk_288; + /* 0x028C */ f32 scale; + /* 0x0290 */ ColliderCylinder collider; } EnReeba; // size = 0x02DC extern const ActorInit En_Reeba_InitVars; diff --git a/src/overlays/actors/ovl_En_Rl/z_en_rl.c b/src/overlays/actors/ovl_En_Rl/z_en_rl.c index bb849aa836..78ea321bbb 100644 --- a/src/overlays/actors/ovl_En_Rl/z_en_rl.c +++ b/src/overlays/actors/ovl_En_Rl/z_en_rl.c @@ -1,4 +1,11 @@ +/* + * File: z_en_rl.c + * Overlay: En_Rl + * Description: Rauru + */ + #include "z_en_rl.h" +#include "vt.h" #define FLAGS 0x00000010 @@ -9,7 +16,376 @@ void EnRl_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnRl_Update(Actor* thisx, GlobalContext* globalCtx); void EnRl_Draw(Actor* thisx, GlobalContext* globalCtx); -/* +void func_80AE7798(EnRl* this, GlobalContext* globalCtx); +void func_80AE77B8(EnRl* this, GlobalContext* globalCtx); +void func_80AE77F8(EnRl* this, GlobalContext* globalCtx); +void func_80AE7838(EnRl* this, GlobalContext* globalCtx); +void func_80AE7C64(EnRl* this, GlobalContext* globalCtx); +void func_80AE7C94(EnRl* this, GlobalContext* globalCtx); +void func_80AE7CE8(EnRl* this, GlobalContext* globalCtx); +void func_80AE7D40(EnRl* this, GlobalContext* globalCtx); +void func_80AE7FD0(EnRl* this, GlobalContext* globalCtx); +void func_80AE7FDC(EnRl* this, GlobalContext* globalCtx); +void func_80AE7D94(EnRl* this, GlobalContext* globalCtx); + +UNK_PTR D_80AE81A0[] = { 0x06003620, 0x06003960, 0x06003B60 }; + +extern SkeletonHeader D_06007B38; +extern AnimationHeader D_06000A3C; +extern AnimationHeader D_06000830; +extern AnimationHeader D_0600040C; + +void EnRl_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnRl* this = THIS; + + SkelAnime_Free(&this->skelAnime, globalCtx); +} + +void func_80AE72D0(EnRl* this) { + s32 pad[3]; + s16* timer = &this->timer; + s16* eyeTextureIndex = &this->eyeTextureIndex; + + if (DECR(*timer) == 0) { + *timer = Math_Rand_S16Offset(60, 60); + } + + *eyeTextureIndex = *timer; + if (*eyeTextureIndex > 2) { + *eyeTextureIndex = 0; + } +} + +void func_80AE7358(EnRl* this) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_06000A3C, 1.0f, 0.0f, SkelAnime_GetFrameCount(&D_06000A3C.genericHeader), + 0, 0.0f); + this->action = 4; + this->drawConfig = 0; + this->alpha = 0; + this->lightBallSpawned = 0; + this->actor.shape.unk_14 = 0; + this->unk_19C = 0.0f; +} + +void func_80AE73D8(EnRl* this, GlobalContext* globalCtx) { + static s32 D_80AE81AC = 0; + + if (globalCtx->csCtx.state == 0) { + if (D_80AE81AC) { + if (this->actor.params == 2) { + func_80AE7358(this); + } + D_80AE81AC = 0; + } + } else if (!D_80AE81AC) { + D_80AE81AC = 1; + } +} + +void func_80AE744C(EnRl* this, GlobalContext* globalCtx) { + func_8002E4B4(globalCtx, &this->actor, 75.0f, 30.0f, 30.0f, 5); +} + +s32 func_80AE7494(EnRl* this) { + return SkelAnime_FrameUpdateMatrix(&this->skelAnime); +} + +s32 func_80AE74B4(EnRl* this, GlobalContext* globalCtx, u16 arg2, s32 arg3) { + CsCmdActorAction* csCmdActorAction; + + if (globalCtx->csCtx.state != 0) { + csCmdActorAction = globalCtx->csCtx.npcActions[arg3]; + if (csCmdActorAction != NULL && csCmdActorAction->action == arg2) { + return 1; + } + } + return 0; +} + +s32 func_80AE74FC(EnRl* this, GlobalContext* globalCtx, u16 arg2, s32 arg3) { + CsCmdActorAction* csCmdActorAction; + + if (globalCtx->csCtx.state != 0) { + csCmdActorAction = globalCtx->csCtx.npcActions[arg3]; + if (csCmdActorAction != NULL && csCmdActorAction->action != arg2) { + return 1; + } + } + return 0; +} + +void func_80AE7544(EnRl* this, GlobalContext* globalCtx) { + SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_06007B38, &D_06000A3C, 0, 0, 0); +} + +void func_80AE7590(EnRl* this, GlobalContext* globalCtx) { + s32 pad; + Player* player; + Vec3f pos; + s16 sceneNum = globalCtx->sceneNum; + + if (gSaveContext.sceneSetupIndex == 4 && sceneNum == SCENE_KENJYANOMA && globalCtx->csCtx.state != 0 && + globalCtx->csCtx.npcActions[6] != NULL && globalCtx->csCtx.npcActions[6]->action == 2 && + !this->lightMedallionGiven) { + player = PLAYER; + pos.x = player->actor.posRot.pos.x; + pos.y = player->actor.posRot.pos.y + 80.0f; + pos.z = player->actor.posRot.pos.z; + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_DEMO_EFFECT, pos.x, pos.y, pos.z, 0, 0, 0, 0xE); + Item_Give(globalCtx, ITEM_MEDALLION_LIGHT); + this->lightMedallionGiven = 1; + } +} + +void func_80AE7668(EnRl* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + this->drawConfig = 1; + this->action = 1; + player->actor.posRot.rot.y = player->actor.shape.rot.y = this->actor.posRot.rot.y + 0x8000; +} + +void func_80AE7698(EnRl* this, GlobalContext* globalCtx) { + CsCmdActorAction* csCmdActorAction; + + if (globalCtx->csCtx.state != 0) { + csCmdActorAction = globalCtx->csCtx.npcActions[0]; + if (csCmdActorAction != NULL && csCmdActorAction->action == 3) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_0600040C, 1.0f, 0.0f, + SkelAnime_GetFrameCount(&D_0600040C.genericHeader), 2, 0.0f); + this->action = 2; + } + } +} + +void func_80AE772C(EnRl* this, s32 arg1) { + if (arg1) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_06000830, 1.0f, 0.0f, + SkelAnime_GetFrameCount(&D_06000830.genericHeader), 0, 0.0f); + this->action = 3; + } +} + +void func_80AE7798(EnRl* this, GlobalContext* globalCtx) { + func_80AE7668(this, globalCtx); +} + +void func_80AE77B8(EnRl* this, GlobalContext* globalCtx) { + func_80AE744C(this, globalCtx); + func_80AE7494(this); + func_80AE72D0(this); + func_80AE7698(this, globalCtx); +} + +void func_80AE77F8(EnRl* this, GlobalContext* globalCtx) { + s32 temp; + + func_80AE744C(this, globalCtx); + temp = func_80AE7494(this); + func_80AE72D0(this); + func_80AE772C(this, temp); +} + +void func_80AE7838(EnRl* this, GlobalContext* globalCtx) { + func_80AE744C(this, globalCtx); + func_80AE7494(this); + func_80AE72D0(this); + func_80AE7590(this, globalCtx); +} + +void func_80AE7878(EnRl* this, GlobalContext* globalCtx) { + SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_06007B38, &D_06000A3C, 0, 0, 0); + this->action = 4; + this->actor.shape.unk_14 = 0; +} + +void func_80AE78D4(EnRl* this, GlobalContext* globalCtx) { + Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DEMO_6K, this->actor.posRot.pos.x, + kREG(18) + 22.0f + this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, 0, 0, 5); +} + +void func_80AE7954(EnRl* this, GlobalContext* globalCtx) { + if (func_80AE74B4(this, globalCtx, 4, 0)) { + this->action = 5; + this->drawConfig = 2; + this->alpha = 0; + this->actor.shape.unk_14 = 0; + this->unk_19C = 0.0f; + } +} + +void func_80AE79A4(EnRl* this, GlobalContext* globalCtx) { + f32* unk_19C = &this->unk_19C; + s32 alpha = 255; + + if (func_80AE74B4(this, globalCtx, 4, 0)) { + *unk_19C += 1.0f; + if (*unk_19C >= kREG(5) + 10.0f) { + this->action = 7; + this->drawConfig = 1; + *unk_19C = kREG(5) + 10.0f; + this->alpha = alpha; + this->actor.shape.unk_14 = alpha; + return; + } + } else { + *unk_19C -= 1.0f; + if (*unk_19C <= 0.0f) { + this->action = 4; + this->drawConfig = 0; + *unk_19C = 0.0f; + this->alpha = 0; + this->actor.shape.unk_14 = 0; + return; + } + } + alpha = (*unk_19C / (kREG(5) + 10.0f)) * 255.0f; + this->alpha = alpha; + this->actor.shape.unk_14 = alpha; +} + +void func_80AE7AF8(EnRl* this, GlobalContext* globalCtx) { + if (func_80AE74B4(this, globalCtx, 3, 0)) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_0600040C, 1.0f, 0.0f, + SkelAnime_GetFrameCount(&D_0600040C.genericHeader), 2, -8.0f); + this->action = 6; + } else if (func_80AE74FC(this, globalCtx, 4, 0)) { + this->action = 5; + this->drawConfig = 2; + this->unk_19C = kREG(5) + 10.0f; + this->alpha = 255; + if (!this->lightBallSpawned) { + func_80AE78D4(this, globalCtx); + this->lightBallSpawned = 1; + } + this->actor.shape.unk_14 = 0xFF; + } +} + +void func_80AE7BF8(EnRl* this, s32 arg1) { + if (arg1 != 0) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_06000830, 1.0f, 0.0f, + SkelAnime_GetFrameCount(&D_06000830.genericHeader), 0, 0.0f); + this->action = 7; + } +} + +void func_80AE7C64(EnRl* this, GlobalContext* globalCtx) { + func_80AE7954(this, globalCtx); + func_80AE73D8(this, globalCtx); +} + +void func_80AE7C94(EnRl* this, GlobalContext* globalCtx) { + func_80AE744C(this, globalCtx); + func_80AE7494(this); + func_80AE72D0(this); + func_80AE79A4(this, globalCtx); + func_80AE73D8(this, globalCtx); +} + +void func_80AE7CE8(EnRl* this, GlobalContext* globalCtx) { + s32 temp; + + func_80AE744C(this, globalCtx); + temp = func_80AE7494(this); + func_80AE72D0(this); + func_80AE7BF8(this, temp); + func_80AE73D8(this, globalCtx); +} + +void func_80AE7D40(EnRl* this, GlobalContext* globalCtx) { + func_80AE744C(this, globalCtx); + func_80AE7494(this); + func_80AE72D0(this); + func_80AE7AF8(this, globalCtx); + func_80AE73D8(this, globalCtx); +} + +void func_80AE7D94(EnRl* this, GlobalContext* globalCtx) { + s32 pad[2]; + s16 temp = this->eyeTextureIndex; + s32 addr = D_80AE81A0[temp]; + SkelAnime* skelAnime = &this->skelAnime; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_rl_inKenjyanomaDemo02.c", 304); + + func_80093D84(globalCtx->state.gfxCtx); + + gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(addr)); + gSPSegment(oGfxCtx->polyXlu.p++, 0x09, SEGMENTED_TO_VIRTUAL(addr)); + gDPSetEnvColor(oGfxCtx->polyXlu.p++, 0, 0, 0, this->alpha); + gSPSegment(oGfxCtx->polyXlu.p++, 0x0C, D_80116280); + + oGfxCtx->polyXlu.p = SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, + skelAnime->dListCount, NULL, NULL, NULL, oGfxCtx->polyXlu.p); + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_rl_inKenjyanomaDemo02.c", 331); +} + +EnRlActionFunc sActionFuncs[] = { + func_80AE7798, func_80AE77B8, func_80AE77F8, func_80AE7838, + func_80AE7C64, func_80AE7C94, func_80AE7CE8, func_80AE7D40, +}; + +void EnRl_Update(Actor* thisx, GlobalContext* globalCtx) { + EnRl* this = THIS; + + if ((this->action < 0) || (this->action > 7) || (sActionFuncs[this->action] == NULL)) { + osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + return; + } + sActionFuncs[this->action](this, globalCtx); +} + +void EnRl_Init(Actor* thisx, GlobalContext* globalCtx) { + EnRl* this = THIS; + + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 50.0f); + if (this->actor.params == 2) { + func_80AE7878(this, globalCtx); + } else { + func_80AE7544(this, globalCtx); + } +} +void func_80AE7FD0(EnRl* this, GlobalContext* globalCtx) { +} + +void func_80AE7FDC(EnRl* this, GlobalContext* globalCtx) { + s32 pad[2]; + s16 temp = this->eyeTextureIndex; + s32 addr = D_80AE81A0[temp]; + SkelAnime* skelAnime = &this->skelAnime; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_rl.c", 416); + + func_80093D18(globalCtx->state.gfxCtx); + + gSPSegment(oGfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(addr)); + gSPSegment(oGfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(addr)); + gDPSetEnvColor(oGfxCtx->polyOpa.p++, 0, 0, 0, 255); + gSPSegment(oGfxCtx->polyOpa.p++, 0x0C, &D_80116280[2]); + + SkelAnime_DrawSV(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, skelAnime->dListCount, NULL, NULL, + &this->actor); + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_rl.c", 437); +} + +EnRlDrawFunc sDrawFuncs[] = { + func_80AE7FD0, + func_80AE7FDC, + func_80AE7D94, +}; + +void EnRl_Draw(Actor* thisx, GlobalContext* globalCtx) { + EnRl* this = THIS; + + if (this->drawConfig < 0 || this->drawConfig >= 3 || sDrawFuncs[this->drawConfig] == NULL) { + osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + return; + } + sDrawFuncs[this->drawConfig](this, globalCtx); +} + const ActorInit En_Rl_InitVars = { ACTOR_EN_RL, ACTORTYPE_NPC, @@ -20,70 +396,4 @@ const ActorInit En_Rl_InitVars = { (ActorFunc)EnRl_Destroy, (ActorFunc)EnRl_Update, (ActorFunc)EnRl_Draw, -}; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Destroy.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE72D0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7358.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE73D8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE744C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7494.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE74B4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE74FC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7544.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7590.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7668.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7698.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE772C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7798.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE77B8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE77F8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7838.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7878.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE78D4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7954.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE79A4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7AF8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7BF8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7C64.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7C94.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7CE8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7D40.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7D94.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Update.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Init.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7FD0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7FDC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Draw.s") +}; \ No newline at end of file diff --git a/src/overlays/actors/ovl_En_Rl/z_en_rl.h b/src/overlays/actors/ovl_En_Rl/z_en_rl.h index c0ab9c7d6c..6a6dc234e6 100644 --- a/src/overlays/actors/ovl_En_Rl/z_en_rl.h +++ b/src/overlays/actors/ovl_En_Rl/z_en_rl.h @@ -6,9 +6,20 @@ struct EnRl; +typedef void (*EnRlActionFunc)(struct EnRl*, GlobalContext*); +typedef void (*EnRlDrawFunc)(struct EnRl*, GlobalContext*); + typedef struct EnRl { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x60]; + /* 0x014C */ SkelAnime skelAnime; + /* 0x0190 */ s16 eyeTextureIndex; + /* 0x0192 */ s16 timer; + /* 0x0194 */ s32 action; + /* 0x0198 */ s32 drawConfig; + /* 0x019C */ f32 unk_19C; + /* 0x01A0 */ s32 alpha; + /* 0x01A4 */ u32 lightBallSpawned; + /* 0x01A8 */ s32 lightMedallionGiven; } EnRl; // size = 0x01AC extern const ActorInit En_Rl_InitVars; diff --git a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c index 24bc9bb154..3d81f6fe42 100644 --- a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c +++ b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c @@ -1,10 +1,11 @@ /* * File: z_obj_kibako.c * Overlay: ovl_Obj_Kibako - * Description: Small, Liftable Crate + * Description: Small wooden box */ #include "z_obj_kibako.h" +#include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" #define FLAGS 0x04000010 @@ -15,7 +16,16 @@ void ObjKibako_Destroy(Actor* thisx, GlobalContext* globalCtx); void ObjKibako_Update(Actor* thisx, GlobalContext* globalCtx); void ObjKibako_Draw(Actor* thisx, GlobalContext* globalCtx); -/* +void ObjKibako_SetupIdle(ObjKibako* this); +void ObjKibako_Idle(ObjKibako* this, GlobalContext* globalCtx); +void ObjKibako_SetupHeld(ObjKibako* this); +void ObjKibako_Held(ObjKibako* this, GlobalContext* globalCtx); +void ObjKibako_SetupThrown(ObjKibako* this); +void ObjKibako_Thrown(ObjKibako* this, GlobalContext* globalCtx); + +extern Gfx D_05005290[]; +extern Gfx D_05005380[]; + const ActorInit Obj_Kibako_InitVars = { ACTOR_OBJ_KIBAKO, ACTORTYPE_PROP, @@ -27,33 +37,242 @@ const ActorInit Obj_Kibako_InitVars = { (ActorFunc)ObjKibako_Update, (ActorFunc)ObjKibako_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B94CA0.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B94D00.s") +static ColliderCylinderInit sCylinderInit = { + { COLTYPE_UNK10, 0x09, 0x09, 0x39, 0x20, COLSHAPE_CYLINDER }, + { 0x00, { 0x00000002, 0x00, 0x01 }, { 0x4FC00748, 0x00, 0x00 }, 0x01, 0x01, 0x01 }, + { 12, 27, 0, { 0, 0, 0 } }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B94D34.s") +static CollisionCheckInfoInit sCCInfoInit = { 0, 0xC, 0x3C, 0xFE }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Kibako/ObjKibako_Init.s") +static InitChainEntry sInitChain[] = { + ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneScale, 60, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Kibako/ObjKibako_Destroy.s") +void ObjKibako_SpawnCollectible(ObjKibako* this, GlobalContext* globalCtx) { + s16 collectible; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B94E38.s") + collectible = this->actor.params & 0x1F; + if ((collectible >= 0) && (collectible <= 0x19)) { + Item_DropCollectible(globalCtx, &this->actor.posRot.pos, + collectible | (((this->actor.params >> 8) & 0x3F) << 8)); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B950B8.s") +void ObjKibako_ApplyGravity(ObjKibako* this) { + this->actor.velocity.y += this->actor.gravity; + if (this->actor.velocity.y < this->actor.minVelocityY) { + this->actor.velocity.y = this->actor.minVelocityY; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B95334.s") +void ObjKibako_InitCollider(Actor* thisx, GlobalContext* globalCtx) { + ObjKibako* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B9534C.s") + Collider_InitCylinder(globalCtx, &this->collider); + Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); + Collider_CylinderUpdate(&this->actor, &this->collider); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B95540.s") +void ObjKibako_Init(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + ObjKibako* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B95574.s") + Actor_ProcessInitChain(&this->actor, sInitChain); + this->actor.gravity = -1.2f; + this->actor.minVelocityY = -13.0f; + ObjKibako_InitCollider(&this->actor, globalCtx); + func_80061ED4(&this->actor.colChkInfo, NULL, &sCCInfoInit); + ObjKibako_SetupIdle(this); + // wooden box + osSyncPrintf("(dungeon keep 木箱)(arg_data 0x%04x)\n", this->actor.params); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B95638.s") +void ObjKibako_Destroy(Actor* thisx, GlobalContext* globalCtx2) { + GlobalContext* globalCtx = globalCtx2; + ObjKibako* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B9569C.s") + Collider_DestroyCylinder(globalCtx, &this->collider); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Kibako/ObjKibako_Update.s") +void ObjKibako_AirBreak(ObjKibako* this, GlobalContext* globalCtx) { + s16 angle; + s32 i; + Vec3f* breakPos = &this->actor.posRot.pos; + Vec3f pos; + Vec3f velocity; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Kibako/ObjKibako_Draw.s") + for (i = 0, angle = 0; i < 12; i++, angle += 0x4E20) { + f32 sn = Math_Sins(angle); + f32 cs = Math_Coss(angle); + f32 temp_rand; + s16 phi_s0; + + pos.x = sn * 16.0f; + pos.y = (Math_Rand_ZeroOne() * 5.0f) + 2.0f; + pos.z = cs * 16.0f; + velocity.x = pos.x * 0.2f; + velocity.y = (Math_Rand_ZeroOne() * 6.0f) + 2.0f; + velocity.z = pos.z * 0.2f; + pos.x += breakPos->x; + pos.y += breakPos->y; + pos.z += breakPos->z; + temp_rand = Math_Rand_ZeroOne(); + if (temp_rand < 0.1f) { + phi_s0 = 0x60; + } else if (temp_rand < 0.7f) { + phi_s0 = 0x40; + } else { + phi_s0 = 0x20; + } + EffectSsKakera_Spawn(globalCtx, &pos, &velocity, breakPos, -200, phi_s0, 10, 10, 0, + (Math_Rand_ZeroOne() * 30.0f) + 10.0f, 0, 32, 60, KAKERA_COLOR_NONE, + OBJECT_GAMEPLAY_DANGEON_KEEP, D_05005380); + } + func_80033480(globalCtx, &this->actor.posRot.pos, 40.0f, 3, 50, 140, 1); +} + +void ObjKibako_WaterBreak(ObjKibako* this, GlobalContext* globalCtx) { + s16 angle; + s32 i; + Vec3f* breakPos = &this->actor.posRot.pos; + Vec3f pos; + Vec3f velocity; + + pos = *breakPos; + pos.y += this->actor.waterY; + EffectSsGSplash_Spawn(globalCtx, &pos, NULL, NULL, 0, 500); + + for (i = 0, angle = 0; i < 12; i++, angle += 0x4E20) { + f32 sn = Math_Sins(angle); + f32 cs = Math_Coss(angle); + f32 temp_rand; + s16 phi_s0; + + pos.x = sn * 16.0f; + pos.y = (Math_Rand_ZeroOne() * 5.0f) + 2.0f; + pos.z = cs * 16.0f; + velocity.x = pos.x * 0.18f; + velocity.y = (Math_Rand_ZeroOne() * 4.0f) + 2.0f; + velocity.z = pos.z * 0.18f; + pos.x += breakPos->x; + pos.y += breakPos->y; + pos.z += breakPos->z; + temp_rand = Math_Rand_ZeroOne(); + phi_s0 = (temp_rand < 0.2f) ? 0x40 : 0x20; + EffectSsKakera_Spawn(globalCtx, &pos, &velocity, breakPos, -180, phi_s0, 30, 30, 0, + (Math_Rand_ZeroOne() * 30.0f) + 10.0f, 0, 32, 70, KAKERA_COLOR_NONE, + OBJECT_GAMEPLAY_DANGEON_KEEP, D_05005380); + } +} + +void ObjKibako_SetupIdle(ObjKibako* this) { + this->actionFunc = ObjKibako_Idle; + this->actor.colChkInfo.mass = 0xFE; +} + +void ObjKibako_Idle(ObjKibako* this, GlobalContext* globalCtx) { + if (Actor_HasParent(&this->actor, globalCtx)) { + ObjKibako_SetupHeld(this); + } else if ((this->actor.bgCheckFlags & 0x20) && (this->actor.waterY > 19.0f)) { + ObjKibako_WaterBreak(this, globalCtx); + Audio_PlaySoundAtPosition(globalCtx, &this->actor.posRot.pos, 20, NA_SE_EV_WOODBOX_BREAK); + ObjKibako_SpawnCollectible(this, globalCtx); + Actor_Kill(&this->actor); + } else if (this->collider.base.acFlags & 2) { + ObjKibako_AirBreak(this, globalCtx); + Audio_PlaySoundAtPosition(globalCtx, &this->actor.posRot.pos, 20, NA_SE_EV_WOODBOX_BREAK); + ObjKibako_SpawnCollectible(this, globalCtx); + Actor_Kill(&this->actor); + } else { + Actor_MoveForward(&this->actor); + func_8002E4B4(globalCtx, &this->actor, 19.0f, 20.0f, 0.0f, 5); + if (!(this->collider.base.maskA & 8) && (this->actor.xzDistFromLink > 28.0f)) { + this->collider.base.maskA |= 8; + } + if (this->actor.xzDistFromLink < 600.0f) { + ColliderCylinder* collider = &this->collider; + + Collider_CylinderUpdate(&this->actor, collider); + CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &collider->base); + if (this->actor.xzDistFromLink < 180.0f) { + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &collider->base); + } + } + if (this->actor.xzDistFromLink < 100.0f) { + func_8002F580(&this->actor, globalCtx); + } + } +} + +void ObjKibako_SetupHeld(ObjKibako* this) { + this->actionFunc = ObjKibako_Held; + this->actor.room = -1; + func_8002F7DC(&this->actor, 0x878); +} + +void ObjKibako_Held(ObjKibako* this, GlobalContext* globalCtx) { + if (Actor_HasNoParent(&this->actor, globalCtx)) { + this->actor.room = globalCtx->roomCtx.curRoom.num; + if (fabsf(this->actor.speedXZ) < 0.1f) { + Audio_PlayActorSound2(&this->actor, NA_SE_EV_PUT_DOWN_WOODBOX); + ObjKibako_SetupIdle(this); + this->collider.base.maskA &= ~8; + } else { + ObjKibako_SetupThrown(this); + ObjKibako_ApplyGravity(this); + func_8002D7EC(&this->actor); + } + func_8002E4B4(globalCtx, &this->actor, 19.0f, 20.0f, 0.0f, 5); + } +} + +void ObjKibako_SetupThrown(ObjKibako* this) { + this->actor.velocity.x = Math_Sins(this->actor.posRot.rot.y) * this->actor.speedXZ; + this->actor.velocity.z = Math_Coss(this->actor.posRot.rot.y) * this->actor.speedXZ; + this->actor.colChkInfo.mass = 240; + this->actionFunc = ObjKibako_Thrown; +} + +void ObjKibako_Thrown(ObjKibako* this, GlobalContext* globalCtx) { + Actor* thisx = &this->actor; + + if ((thisx->bgCheckFlags & 0xB) || (this->collider.base.atFlags & 2)) { + ObjKibako_AirBreak(this, globalCtx); + Audio_PlaySoundAtPosition(globalCtx, &thisx->posRot.pos, 20, NA_SE_EV_WOODBOX_BREAK); + ObjKibako_SpawnCollectible(this, globalCtx); + Actor_Kill(thisx); + } else if (this->actor.bgCheckFlags & 0x40) { + ObjKibako_WaterBreak(this, globalCtx); + Audio_PlaySoundAtPosition(globalCtx, &thisx->posRot.pos, 20, NA_SE_EV_WOODBOX_BREAK); + ObjKibako_SpawnCollectible(this, globalCtx); + Actor_Kill(thisx); + } else { + ColliderCylinder* collider = &this->collider; + + ObjKibako_ApplyGravity(this); + func_8002D7EC(thisx); + func_8002E4B4(globalCtx, thisx, 19.0f, 20.0f, 0.0f, 5); + Collider_CylinderUpdate(thisx, collider); + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &collider->base); + CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, &collider->base); + } +} + +void ObjKibako_Update(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + ObjKibako* this = THIS; + + this->actionFunc(this, globalCtx); +} + +void ObjKibako_Draw(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + ObjKibako* this = THIS; + + Gfx_DrawDListOpa(globalCtx, D_05005290); +} diff --git a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.h b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.h index 5bdb58faca..47a1382f63 100644 --- a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.h +++ b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.h @@ -6,9 +6,12 @@ struct ObjKibako; +typedef void (*ObjKibakoActionFunc)(struct ObjKibako*, GlobalContext*); + typedef struct ObjKibako { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x50]; + /* 0x014C */ ObjKibakoActionFunc actionFunc; + /* 0x0150 */ ColliderCylinder collider; } ObjKibako; // size = 0x019C extern const ActorInit Obj_Kibako_InitVars; diff --git a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c index 8b5664b1e8..daa7d7477b 100644 --- a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c +++ b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c @@ -5,6 +5,7 @@ */ #include "z_obj_syokudai.h" +#include "overlays/actors/ovl_En_Arrow/z_en_arrow.h" #define FLAGS 0x00000410 @@ -15,7 +16,8 @@ void ObjSyokudai_Destroy(Actor* thisx, GlobalContext* globalCtx); void ObjSyokudai_Update(Actor* thisx, GlobalContext* globalCtx); void ObjSyokudai_Draw(Actor* thisx, GlobalContext* globalCtx); -/* +extern Gfx D_0404D4E0[]; + const ActorInit Obj_Syokudai_InitVars = { ACTOR_OBJ_SYOKUDAI, ACTORTYPE_PROP, @@ -27,11 +29,255 @@ const ActorInit Obj_Syokudai_InitVars = { (ActorFunc)ObjSyokudai_Update, (ActorFunc)ObjSyokudai_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Init.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Destroy.s") +static ColliderCylinderInit sCylInitStand = { + { COLTYPE_METAL_SHIELD, 0x00, 0x0D, 0x39, 0x20, COLSHAPE_CYLINDER }, + { 0x02, { 0x00100000, 0x00, 0x00 }, { 0xEE01FFFF, 0x00, 0x00 }, 0x00, 0x05, 0x01 }, + { 12, 45, 0, { 0, 0, 0 } }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Update.s") +static ColliderCylinderInit sCylInitFlame = { + { COLTYPE_UNK10, 0x00, 0x09, 0x00, 0x00, COLSHAPE_CYLINDER }, + { 0x02, { 0x00000000, 0x00, 0x00 }, { 0x00020820, 0x00, 0x00 }, 0x00, 0x01, 0x00 }, + { 15, 45, 45, { 0, 0, 0 } }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Draw.s") +static InitChainEntry sInitChain[] = { + ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneScale, 800, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneDownward, 800, ICHAIN_STOP), +}; + +static s32 sLitTorchCount; + +void ObjSyokudai_Init(Actor* thisx, GlobalContext* globalCtx) { + static u8 sColTypesStand[] = { 0x09, 0x0B, 0x0B }; + s32 pad; + ObjSyokudai* this = THIS; + s32 torchType = this->actor.params & 0xF000; + + Actor_ProcessInitChain(&this->actor, sInitChain); + ActorShape_Init(&this->actor.shape, 0.0f, NULL, 0.0f); + + Collider_InitCylinder(globalCtx, &this->colliderStand); + Collider_SetCylinder(globalCtx, &this->colliderStand, &this->actor, &sCylInitStand); + this->colliderStand.base.type = sColTypesStand[this->actor.params >> 0xC]; + + Collider_InitCylinder(globalCtx, &this->colliderFlame); + Collider_SetCylinder(globalCtx, &this->colliderFlame, &this->actor, &sCylInitFlame); + + this->actor.colChkInfo.mass = 0xFF; + + Lights_PointGlowSetInfo(&this->lightInfo, this->actor.posRot.pos.x, this->actor.posRot.pos.y + 70.0f, + this->actor.posRot.pos.z, 255, 255, 180, -1); + this->lightNode = LightContext_InsertLight(globalCtx, &globalCtx->lightCtx, &this->lightInfo); + + if ((this->actor.params & 0x400) || ((torchType != 2) && Flags_GetSwitch(globalCtx, this->actor.params & 0x3F))) { + this->litTimer = -1; + } + + this->flameTexScroll = (s32)(Math_Rand_ZeroOne() * 20.0f); + sLitTorchCount = 0; + Actor_SetHeight(&this->actor, 60.0f); +} + +void ObjSyokudai_Destroy(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + ObjSyokudai* this = THIS; + + Collider_DestroyCylinder(globalCtx, &this->colliderStand); + Collider_DestroyCylinder(globalCtx, &this->colliderFlame); + LightContext_RemoveLight(globalCtx, &globalCtx->lightCtx, this->lightNode); +} + +void ObjSyokudai_Update(Actor* thisx, GlobalContext* globalCtx2) { + GlobalContext* globalCtx = globalCtx2; + ObjSyokudai* this = THIS; + s32 torchCount = (this->actor.params >> 6) & 0xF; + s32 switchFlag = this->actor.params & 0x3F; + s32 torchType = this->actor.params & 0xF000; + s32 litTimeScale; + WaterBox* dummy; + f32 waterSurface; + s32 lightRadius = -1; + u8 brightness = 0; + Player* player; + EnArrow* arrow; + s32 interactionType; + u32 toucherFlags; + Vec3f tipToFlame; + ColliderCylinder* colliderStand; + ColliderCylinder* colliderFlame; + + litTimeScale = torchCount; + if (torchCount == 10) { + torchCount = 24; + } + if (func_80042244(globalCtx, &globalCtx->colCtx, this->actor.posRot.pos.x, this->actor.posRot.pos.z, &waterSurface, + &dummy) && + ((waterSurface - this->actor.posRot.pos.y) > 52.0f)) { + this->litTimer = 0; + if (torchType == 1) { + Flags_UnsetSwitch(globalCtx, switchFlag); + if (torchCount != 0) { + this->litTimer = 1; + } + } + } else { + player = PLAYER; + interactionType = 0; + if (this->actor.params & 0x400) { + this->litTimer = -1; + } + if (torchCount != 0) { + if (Flags_GetSwitch(globalCtx, switchFlag)) { + if (this->litTimer == 0) { + this->litTimer = -1; + if (torchType == 0) { + func_80080480(globalCtx, &this->actor); + } + } else if (this->litTimer > 0) { + this->litTimer = -1; + } + } else if (this->litTimer < 0) { + this->litTimer = 20; + } + } + if (this->colliderFlame.base.acFlags & 2) { + toucherFlags = this->colliderFlame.body.acHitItem->toucher.flags; + if (toucherFlags & 0x20820) { + interactionType = 1; + } + } else if (player->heldItemActionParam == 6) { + Math_Vec3f_Diff(&player->swordInfo[0].tip, &this->actor.posRot.pos, &tipToFlame); + tipToFlame.y -= 67.0f; + if ((SQ(tipToFlame.x) + SQ(tipToFlame.y) + SQ(tipToFlame.z)) < SQ(20.0f)) { + interactionType = -1; + } + } + if (interactionType != 0) { + if (this->litTimer != 0) { + if (interactionType < 0) { + if (player->unk_860 == 0) { + player->unk_860 = 210; + Audio_PlaySoundGeneral(NA_SE_EV_FLAME_IGNITION, &this->actor.projectedPos, 4, &D_801333E0, + &D_801333E0, &D_801333E8); + } else if (player->unk_860 < 200) { + player->unk_860 = 200; + } + } else if (toucherFlags & 0x20) { + arrow = (EnArrow*)this->colliderFlame.base.ac; + if ((arrow->actor.update != NULL) && (arrow->actor.id == ACTOR_EN_ARROW)) { + arrow->actor.params = 0; + arrow->unk_1A8 = 0x800; + } + } + if ((0 <= this->litTimer) && (this->litTimer < (50 * litTimeScale + 100)) && (torchType != 0)) { + this->litTimer = 50 * litTimeScale + 100; + } + } else if ((torchType != 0) && (((interactionType > 0) && (toucherFlags & 0x20800)) || + ((interactionType < 0) && (player->unk_860 != 0)))) { + + if ((interactionType < 0) && (player->unk_860 < 200)) { + player->unk_860 = 200; + } + if (torchCount == 0) { + this->litTimer = -1; + if (torchType != 2) { + Flags_SetSwitch(globalCtx, switchFlag); + func_80080480(globalCtx, &this->actor); + } + } else { + sLitTorchCount++; + if (sLitTorchCount >= torchCount) { + Flags_SetSwitch(globalCtx, switchFlag); + func_80080480(globalCtx, &this->actor); + this->litTimer = -1; + } else { + this->litTimer = (litTimeScale * 50) + 110; + } + } + Audio_PlaySoundGeneral(NA_SE_EV_FLAME_IGNITION, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0, + &D_801333E8); + } + } + } + colliderStand = &this->colliderStand; + Collider_CylinderUpdate(&this->actor, colliderStand); + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &colliderStand->base); + CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &colliderStand->base); + + colliderFlame = &this->colliderFlame; + Collider_CylinderUpdate(&this->actor, colliderFlame); + CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &colliderFlame->base); + + if (this->litTimer > 0) { + this->litTimer--; + if ((this->litTimer == 0) && (torchType != 0)) { + sLitTorchCount--; + } + } + if (this->litTimer != 0) { + if ((this->litTimer < 0) || (this->litTimer >= 20)) { + lightRadius = 200; + } else { + lightRadius = (this->litTimer * 200.0f) / 20.0f; + } + brightness = (u8)(Math_Rand_ZeroOne() * 127.0f) + 128; + func_8002F974(&this->actor, NA_SE_EV_TORCH - SFX_FLAG); + } + Lights_PointSetColorAndRadius(&this->lightInfo, brightness, brightness, 0, lightRadius); + this->flameTexScroll++; +} + +void ObjSyokudai_Draw(Actor* thisx, GlobalContext* globalCtx) { + static Gfx* displayLists[] = { 0x060003A0, 0x06000B90, 0x06000870 }; + s32 pad; + ObjSyokudai* this = THIS; + s32 timerMax; + + timerMax = (((this->actor.params >> 6) & 0xF) * 50) + 100; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_obj_syokudai.c", 707); + func_80093D18(globalCtx->state.gfxCtx); + + gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_syokudai.c", 714), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + + gSPDisplayList(oGfxCtx->polyOpa.p++, displayLists[(u16)this->actor.params >> 0xC]); + + if (this->litTimer != 0) { + f32 flameScale = 1.0f; + + if (this->litTimer > timerMax) { + flameScale = (timerMax - this->litTimer + 10) / 10.0f; + } else if ((this->litTimer > 0) && (this->litTimer < 20)) { + flameScale = this->litTimer / 20.0f; + } + flameScale *= 0.0027f; + + func_80093D84(globalCtx->state.gfxCtx); + + gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 0x20, 0x40, 1, 0, + (this->flameTexScroll * -20) & 0x1FF, 0x20, 0x80)); + + gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0x80, 0x80, 255, 255, 0, 255); + + gDPSetEnvColor(oGfxCtx->polyXlu.p++, 255, 0, 0, 0); + + Matrix_Translate(0.0f, 52.0f, 0.0f, MTXMODE_APPLY); + Matrix_RotateY( + (s16)(func_8005A9F4(ACTIVE_CAM) - this->actor.shape.rot.y + 0x8000) * + (M_PI / 0x8000), + MTXMODE_APPLY); + Matrix_Scale(flameScale, flameScale, flameScale, MTXMODE_APPLY); + + gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_syokudai.c", 745), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + + gSPDisplayList(oGfxCtx->polyXlu.p++, D_0404D4E0); + } + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_obj_syokudai.c", 749); +} diff --git a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.h b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.h index 1c2a780889..4a6f1f479b 100644 --- a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.h +++ b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.h @@ -8,7 +8,12 @@ struct ObjSyokudai; typedef struct ObjSyokudai { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0xB0]; + /* 0x014C */ ColliderCylinder colliderStand; + /* 0x0198 */ ColliderCylinder colliderFlame; + /* 0x01E4 */ s16 litTimer; + /* 0x01E6 */ u8 flameTexScroll; + /* 0x01E8 */ LightNode* lightNode; + /* 0x01EC */ LightInfo lightInfo; } ObjSyokudai; // size = 0x01FC extern const ActorInit Obj_Syokudai_InitVars; diff --git a/tools/ichaindis.py b/tools/ichaindis.py index 017b1ba0d8..50d909972a 100755 --- a/tools/ichaindis.py +++ b/tools/ichaindis.py @@ -92,6 +92,8 @@ def main(): t = (entry >> 27) & 0xF offset = ((entry) >> 16) & 0x7FF value = (entry) & 0xFFFF + if value >= 0x8000 and not ICHAIN_MACROS[t].startswith('ICHAIN_U'): + value -= 0x10000 var_name = '{0:X}'.format(offset) diff --git a/undefined_syms.txt b/undefined_syms.txt index 0af4e75986..c7147b3c1a 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -870,6 +870,12 @@ D_06001080 = 0x06001080; D_06004768 = 0x06004768; D_0600039C = 0x0600039C; +// z_en_kakasi +// z_en_kakasi2 +// z_en_kakasi3 +D_060065B0 = 0x060065B0; +D_06000214 = 0x06000214; + // z_en_kz D_060086D0 = 0x060086D0; @@ -952,6 +958,10 @@ D_0E000000 = 0x0E000000; // z_vismono D_0F000000 = 0x0F000000; +// en_reeba +D_060001E4 = 0x060001E4; +D_06001EE8 = 0x06001EE8; + // z_en_dha D_06000BD8 = 0x06000BD8; D_060015B0 = 0x060015B0; @@ -1125,6 +1135,10 @@ D_0600FCF8 = 0x0600FCF8; D_060105E0 = 0x060105E0; D_06012160 = 0x06012160; +// z_obj_kibako +D_05005290 = 0x05005290; +D_05005380 = 0x05005380; + // z_en_bg_hidan_rsekizou D_0600AD00 = 0x0600AD00; D_0600D5C0 = 0x0600D5C0; @@ -1152,6 +1166,11 @@ D_060205C0 = 0x060205C0; D_04035590 = 0x04035590; D_040341FC = 0x040341FC; +// z_en_ishi +D_0500A3B8 = 0x0500A3B8; +D_0500A5E8 = 0x0500A5E8; +D_0500A880 = 0x0500A880; + // z_obj_dekujr D_060030D0 = 0x060030D0; D_060032D8 = 0x060032D8; @@ -1221,16 +1240,33 @@ D_0600C080 = 0x0600C080; D_060088B0 = 0x060088B0; D_0600BEC0 = 0x0600BEC0; +// z_bg_mori_rakkatenjo +D_06007690 = 0x06007690; +D_060087AC = 0x060087AC; + +// z_bg_mori_kaitenkabe +D_060056B0 = 0x060056B0; +D_060063B8 = 0x060063B8; + // z_en_st D_06005298 = 0x06005298; D_06000304 = 0x06000304; D_06005B98 = 0x06005B98; D_060055A8 = 0x060055A8; +// z_bg_hidan_curtain +D_040184B0 = 0x040184B0; + // z_en_dy_extra D_0601BFB0 = 0x0601BFB0; D_0601C160 = 0x0601C160; +// z_en_rl +D_06007B38 = 0x06007B38; +D_06000A3C = 0x06000A3C; +D_06000830 = 0x06000830; +D_0600040C = 0x0600040C; + // z_en_takara_man D_06004FE0 = 0x06004FE0; D_06000498 = 0x06000498; @@ -1238,6 +1274,22 @@ D_06000498 = 0x06000498; // z_bg_menkuri_eye D_06002D20 = 0x06002D20; +// z_bg_spot03_taki +D_06000C98 = 0x06000C98; +D_06000800 = 0x06000800; +D_06000990 = 0x06000990; +D_06000B20 = 0x06000B20; +D_06000BC0 = 0x06000BC0; +D_06001580 = 0x06001580; + +// z_bg_po_event +D_06007860 = 0x06007860; +D_060075A0 = 0x060075A0; +D_060079E0 = 0x060079E0; +D_06006830 = 0x06006830; +D_06006D60 = 0x06006D60; +D_06007230 = 0x06007230; + // z_bg_mori_idomizu D_060049D0 = 0x060049D0;