diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/EnWeatherTag_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/EnWeatherTag_Destroy.s deleted file mode 100644 index b8ccffdcd2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/EnWeatherTag_Destroy.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel EnWeatherTag_Destroy -/* 00008 80B31028 AFA40000 */ sw $a0, 0x0000($sp) -/* 0000C 80B3102C 03E00008 */ jr $ra -/* 00010 80B31030 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/EnWeatherTag_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/EnWeatherTag_Init.s deleted file mode 100644 index 0c6027e0e5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/EnWeatherTag_Init.s +++ /dev/null @@ -1,282 +0,0 @@ -.rdata -glabel D_80B31E40 - .asciz "\n\n" - .balign 4 - -glabel D_80B31E44 - .asciz "\x1b[33m☆☆☆☆☆ （;o;) くらいよー ☆☆☆☆☆ \n\x1b[m" - .balign 4 - -glabel D_80B31E78 - .asciz "\n\n" - .balign 4 - -glabel D_80B31E7C - .asciz "\x1b[33m☆☆☆☆☆ くもり (._.) あーあ 憂鬱 ☆☆☆☆☆ \n\x1b[m" - .balign 4 - -glabel D_80B31EB8 - .asciz "\n\n" - .balign 4 - -glabel D_80B31EBC - .asciz "\x1b[33m☆☆☆☆☆ ゆきがふるー あなたはこないー (._.) ☆☆☆☆☆ \n\x1b[m" - .balign 4 - -glabel D_80B31F00 - .asciz "\n\n" - .balign 4 - -glabel D_80B31F04 - .asciz "\x1b[33m☆☆☆☆☆ わわわわー なーがーさーきーはー (^o^) ☆☆☆☆☆ \n\x1b[m" - .balign 4 - -glabel D_80B31F4C - .asciz "\n\n" - .balign 4 - -glabel D_80B31F50 - .asciz "\x1b[33m☆☆☆☆☆ くもり (._.) あーあ 憂鬱 ☆☆☆☆☆ \n\x1b[m" - .balign 4 - -glabel D_80B31F8C - .asciz "\n\n" - .balign 4 - -glabel D_80B31F90 - .asciz "\x1b[33m☆☆☆☆☆ くもり雨雷 (;O;) うおお 憂鬱 ☆☆☆☆☆ \n\x1b[m" - .balign 4 - -glabel D_80B31FD0 - .asciz "\n\n" - .balign 4 - -glabel D_80B31FD4 - .asciz "\x1b[33m☆☆☆☆☆ 砂漠が濃くなります ☆☆☆☆☆ \n\x1b[m" - .balign 4 - -glabel D_80B32008 - .asciz "\n\n" - .balign 4 - -glabel D_80B3200C - .asciz "\x1b[33m☆☆☆☆☆ わわわわー なーがーさーきーはー (^o^) ☆☆☆☆☆ \n\x1b[m" - .balign 4 - -.late_rodata -glabel jtbl_80B32054 -.word L80B31080 -.word L80B310B0 -.word L80B310F8 -.word L80B31148 -.word L80B31198 -.word L80B311E8 -.word L80B3125C -.word L80B3128C -.word 0x00000000, 0x00000000, 0x00000000 - -.text -glabel EnWeatherTag_Init -/* 00014 80B31034 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00018 80B31038 AFBF001C */ sw $ra, 0x001C($sp) -/* 0001C 80B3103C AFB00018 */ sw $s0, 0x0018($sp) -/* 00020 80B31040 AFA50024 */ sw $a1, 0x0024($sp) -/* 00024 80B31044 8C8E0004 */ lw $t6, 0x0004($a0) ## 00000004 -/* 00028 80B31048 8498001C */ lh $t8, 0x001C($a0) ## 0000001C -/* 0002C 80B3104C 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 00030 80B31050 01C17824 */ and $t7, $t6, $at -/* 00034 80B31054 3319000F */ andi $t9, $t8, 0x000F ## $t9 = 00000000 -/* 00038 80B31058 2F210008 */ sltiu $at, $t9, 0x0008 -/* 0003C 80B3105C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00040 80B31060 10200094 */ beq $at, $zero, .L80B312B4 -/* 00044 80B31064 AC8F0004 */ sw $t7, 0x0004($a0) ## 00000004 -/* 00048 80B31068 0019C880 */ sll $t9, $t9, 2 -/* 0004C 80B3106C 3C0180B3 */ lui $at, %hi(jtbl_80B32054) ## $at = 80B30000 -/* 00050 80B31070 00390821 */ addu $at, $at, $t9 -/* 00054 80B31074 8C392054 */ lw $t9, %lo(jtbl_80B32054)($at) -/* 00058 80B31078 03200008 */ jr $t9 -/* 0005C 80B3107C 00000000 */ nop -glabel L80B31080 -/* 00060 80B31080 3C0480B3 */ lui $a0, %hi(D_80B31E40) ## $a0 = 80B30000 -/* 00064 80B31084 0C00084C */ jal osSyncPrintf - -/* 00068 80B31088 24841E40 */ addiu $a0, $a0, %lo(D_80B31E40) ## $a0 = 80B31E40 -/* 0006C 80B3108C 3C0480B3 */ lui $a0, %hi(D_80B31E44) ## $a0 = 80B30000 -/* 00070 80B31090 0C00084C */ jal osSyncPrintf - -/* 00074 80B31094 24841E44 */ addiu $a0, $a0, %lo(D_80B31E44) ## $a0 = 80B31E44 -/* 00078 80B31098 3C0580B3 */ lui $a1, %hi(func_80B31658) ## $a1 = 80B30000 -/* 0007C 80B3109C 24A51658 */ addiu $a1, $a1, %lo(func_80B31658) ## $a1 = 80B31658 -/* 00080 80B310A0 0C2CC408 */ jal func_80B31020 -/* 00084 80B310A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00088 80B310A8 10000083 */ beq $zero, $zero, .L80B312B8 -/* 0008C 80B310AC 8FBF001C */ lw $ra, 0x001C($sp) -glabel L80B310B0 -/* 00090 80B310B0 3C0480B3 */ lui $a0, %hi(D_80B31E78) ## $a0 = 80B30000 -/* 00094 80B310B4 0C00084C */ jal osSyncPrintf - -/* 00098 80B310B8 24841E78 */ addiu $a0, $a0, %lo(D_80B31E78) ## $a0 = 80B31E78 -/* 0009C 80B310BC 3C0480B3 */ lui $a0, %hi(D_80B31E7C) ## $a0 = 80B30000 -/* 000A0 80B310C0 0C00084C */ jal osSyncPrintf - -/* 000A4 80B310C4 24841E7C */ addiu $a0, $a0, %lo(D_80B31E7C) ## $a0 = 80B31E7C -/* 000A8 80B310C8 0C00D6D3 */ jal Flags_GetEventChkInf - -/* 000AC 80B310CC 24040018 */ addiu $a0, $zero, 0x0018 ## $a0 = 00000018 -/* 000B0 80B310D0 10400003 */ beq $v0, $zero, .L80B310E0 -/* 000B4 80B310D4 00000000 */ nop -/* 000B8 80B310D8 0C00B55C */ jal Actor_Kill - -/* 000BC 80B310DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80B310E0: -/* 000C0 80B310E0 3C0580B3 */ lui $a1, %hi(func_80B31700) ## $a1 = 80B30000 -/* 000C4 80B310E4 24A51700 */ addiu $a1, $a1, %lo(func_80B31700) ## $a1 = 80B31700 -/* 000C8 80B310E8 0C2CC408 */ jal func_80B31020 -/* 000CC 80B310EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000D0 80B310F0 10000071 */ beq $zero, $zero, .L80B312B8 -/* 000D4 80B310F4 8FBF001C */ lw $ra, 0x001C($sp) -glabel L80B310F8 -/* 000D8 80B310F8 3C0480B3 */ lui $a0, %hi(D_80B31EB8) ## $a0 = 80B30000 -/* 000DC 80B310FC 0C00084C */ jal osSyncPrintf - -/* 000E0 80B31100 24841EB8 */ addiu $a0, $a0, %lo(D_80B31EB8) ## $a0 = 80B31EB8 -/* 000E4 80B31104 3C0480B3 */ lui $a0, %hi(D_80B31EBC) ## $a0 = 80B30000 -/* 000E8 80B31108 0C00084C */ jal osSyncPrintf - -/* 000EC 80B3110C 24841EBC */ addiu $a0, $a0, %lo(D_80B31EBC) ## $a0 = 80B31EBC -/* 000F0 80B31110 3C038016 */ lui $v1, %hi(gSaveContext) -/* 000F4 80B31114 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 000F8 80B31118 94680EDC */ lhu $t0, 0x0EDC($v1) ## 8015F53C -/* 000FC 80B3111C 31090400 */ andi $t1, $t0, 0x0400 ## $t1 = 00000000 -/* 00100 80B31120 11200003 */ beq $t1, $zero, .L80B31130 -/* 00104 80B31124 00000000 */ nop -/* 00108 80B31128 0C00B55C */ jal Actor_Kill - -/* 0010C 80B3112C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80B31130: -/* 00110 80B31130 3C0580B3 */ lui $a1, %hi(func_80B31850) ## $a1 = 80B30000 -/* 00114 80B31134 24A51850 */ addiu $a1, $a1, %lo(func_80B31850) ## $a1 = 80B31850 -/* 00118 80B31138 0C2CC408 */ jal func_80B31020 -/* 0011C 80B3113C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00120 80B31140 1000005D */ beq $zero, $zero, .L80B312B8 -/* 00124 80B31144 8FBF001C */ lw $ra, 0x001C($sp) -glabel L80B31148 -/* 00128 80B31148 3C0480B3 */ lui $a0, %hi(D_80B31F00) ## $a0 = 80B30000 -/* 0012C 80B3114C 0C00084C */ jal osSyncPrintf - -/* 00130 80B31150 24841F00 */ addiu $a0, $a0, %lo(D_80B31F00) ## $a0 = 80B31F00 -/* 00134 80B31154 3C0480B3 */ lui $a0, %hi(D_80B31F04) ## $a0 = 80B30000 -/* 00138 80B31158 0C00084C */ jal osSyncPrintf - -/* 0013C 80B3115C 24841F04 */ addiu $a0, $a0, %lo(D_80B31F04) ## $a0 = 80B31F04 -/* 00140 80B31160 3C038016 */ lui $v1, %hi(gSaveContext) -/* 00144 80B31164 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 00148 80B31168 946A0EDC */ lhu $t2, 0x0EDC($v1) ## 8015F53C -/* 0014C 80B3116C 314B0400 */ andi $t3, $t2, 0x0400 ## $t3 = 00000000 -/* 00150 80B31170 11600003 */ beq $t3, $zero, .L80B31180 -/* 00154 80B31174 00000000 */ nop -/* 00158 80B31178 0C00B55C */ jal Actor_Kill - -/* 0015C 80B3117C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80B31180: -/* 00160 80B31180 3C0580B3 */ lui $a1, %hi(func_80B31924) ## $a1 = 80B30000 -/* 00164 80B31184 24A51924 */ addiu $a1, $a1, %lo(func_80B31924) ## $a1 = 80B31924 -/* 00168 80B31188 0C2CC408 */ jal func_80B31020 -/* 0016C 80B3118C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00170 80B31190 10000049 */ beq $zero, $zero, .L80B312B8 -/* 00174 80B31194 8FBF001C */ lw $ra, 0x001C($sp) -glabel L80B31198 -/* 00178 80B31198 3C0480B3 */ lui $a0, %hi(D_80B31F4C) ## $a0 = 80B30000 -/* 0017C 80B3119C 0C00084C */ jal osSyncPrintf - -/* 00180 80B311A0 24841F4C */ addiu $a0, $a0, %lo(D_80B31F4C) ## $a0 = 80B31F4C -/* 00184 80B311A4 3C0480B3 */ lui $a0, %hi(D_80B31F50) ## $a0 = 80B30000 -/* 00188 80B311A8 0C00084C */ jal osSyncPrintf - -/* 0018C 80B311AC 24841F50 */ addiu $a0, $a0, %lo(D_80B31F50) ## $a0 = 80B31F50 -/* 00190 80B311B0 3C038016 */ lui $v1, %hi(gSaveContext) -/* 00194 80B311B4 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 00198 80B311B8 946C0EDC */ lhu $t4, 0x0EDC($v1) ## 8015F53C -/* 0019C 80B311BC 318D0200 */ andi $t5, $t4, 0x0200 ## $t5 = 00000000 -/* 001A0 80B311C0 11A00003 */ beq $t5, $zero, .L80B311D0 -/* 001A4 80B311C4 00000000 */ nop -/* 001A8 80B311C8 0C00B55C */ jal Actor_Kill - -/* 001AC 80B311CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80B311D0: -/* 001B0 80B311D0 3C0580B3 */ lui $a1, %hi(func_80B317A8) ## $a1 = 80B30000 -/* 001B4 80B311D4 24A517A8 */ addiu $a1, $a1, %lo(func_80B317A8) ## $a1 = 80B317A8 -/* 001B8 80B311D8 0C2CC408 */ jal func_80B31020 -/* 001BC 80B311DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 001C0 80B311E0 10000035 */ beq $zero, $zero, .L80B312B8 -/* 001C4 80B311E4 8FBF001C */ lw $ra, 0x001C($sp) -glabel L80B311E8 -/* 001C8 80B311E8 3C0480B3 */ lui $a0, %hi(D_80B31F8C) ## $a0 = 80B30000 -/* 001CC 80B311EC 0C00084C */ jal osSyncPrintf - -/* 001D0 80B311F0 24841F8C */ addiu $a0, $a0, %lo(D_80B31F8C) ## $a0 = 80B31F8C -/* 001D4 80B311F4 3C0480B3 */ lui $a0, %hi(D_80B31F90) ## $a0 = 80B30000 -/* 001D8 80B311F8 0C00084C */ jal osSyncPrintf - -/* 001DC 80B311FC 24841F90 */ addiu $a0, $a0, %lo(D_80B31F90) ## $a0 = 80B31F90 -/* 001E0 80B31200 3C038016 */ lui $v1, %hi(gSaveContext) -/* 001E4 80B31204 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 001E8 80B31208 94620EDC */ lhu $v0, 0x0EDC($v1) ## 8015F53C -/* 001EC 80B3120C 304E0100 */ andi $t6, $v0, 0x0100 ## $t6 = 00000000 -/* 001F0 80B31210 11C0000A */ beq $t6, $zero, .L80B3123C -/* 001F4 80B31214 304F0200 */ andi $t7, $v0, 0x0200 ## $t7 = 00000000 -/* 001F8 80B31218 11E00008 */ beq $t7, $zero, .L80B3123C -/* 001FC 80B3121C 30580400 */ andi $t8, $v0, 0x0400 ## $t8 = 00000000 -/* 00200 80B31220 13000006 */ beq $t8, $zero, .L80B3123C -/* 00204 80B31224 3C198012 */ lui $t9, %hi(gBitFlags+0x10) -/* 00208 80B31228 8F397130 */ lw $t9, %lo(gBitFlags+0x10)($t9) -/* 0020C 80B3122C 8C6800A4 */ lw $t0, 0x00A4($v1) ## 8015E704 -/* 00210 80B31230 03284824 */ and $t1, $t9, $t0 -/* 00214 80B31234 11200003 */ beq $t1, $zero, .L80B31244 -/* 00218 80B31238 00000000 */ nop -.L80B3123C: -/* 0021C 80B3123C 0C00B55C */ jal Actor_Kill - -/* 00220 80B31240 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80B31244: -/* 00224 80B31244 3C0580B3 */ lui $a1, %hi(func_80B31A10) ## $a1 = 80B30000 -/* 00228 80B31248 24A51A10 */ addiu $a1, $a1, %lo(func_80B31A10) ## $a1 = 80B31A10 -/* 0022C 80B3124C 0C2CC408 */ jal func_80B31020 -/* 00230 80B31250 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00234 80B31254 10000018 */ beq $zero, $zero, .L80B312B8 -/* 00238 80B31258 8FBF001C */ lw $ra, 0x001C($sp) -glabel L80B3125C -/* 0023C 80B3125C 3C0480B3 */ lui $a0, %hi(D_80B31FD0) ## $a0 = 80B30000 -/* 00240 80B31260 0C00084C */ jal osSyncPrintf - -/* 00244 80B31264 24841FD0 */ addiu $a0, $a0, %lo(D_80B31FD0) ## $a0 = 80B31FD0 -/* 00248 80B31268 3C0480B3 */ lui $a0, %hi(D_80B31FD4) ## $a0 = 80B30000 -/* 0024C 80B3126C 0C00084C */ jal osSyncPrintf - -/* 00250 80B31270 24841FD4 */ addiu $a0, $a0, %lo(D_80B31FD4) ## $a0 = 80B31FD4 -/* 00254 80B31274 3C0580B3 */ lui $a1, %hi(func_80B31B24) ## $a1 = 80B30000 -/* 00258 80B31278 24A51B24 */ addiu $a1, $a1, %lo(func_80B31B24) ## $a1 = 80B31B24 -/* 0025C 80B3127C 0C2CC408 */ jal func_80B31020 -/* 00260 80B31280 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00264 80B31284 1000000C */ beq $zero, $zero, .L80B312B8 -/* 00268 80B31288 8FBF001C */ lw $ra, 0x001C($sp) -glabel L80B3128C -/* 0026C 80B3128C 3C0480B3 */ lui $a0, %hi(D_80B32008) ## $a0 = 80B30000 -/* 00270 80B31290 0C00084C */ jal osSyncPrintf - -/* 00274 80B31294 24842008 */ addiu $a0, $a0, %lo(D_80B32008) ## $a0 = 80B32008 -/* 00278 80B31298 3C0480B3 */ lui $a0, %hi(D_80B3200C) ## $a0 = 80B30000 -/* 0027C 80B3129C 0C00084C */ jal osSyncPrintf - -/* 00280 80B312A0 2484200C */ addiu $a0, $a0, %lo(D_80B3200C) ## $a0 = 80B3200C -/* 00284 80B312A4 3C0580B3 */ lui $a1, %hi(func_80B31C20) ## $a1 = 80B30000 -/* 00288 80B312A8 24A51C20 */ addiu $a1, $a1, %lo(func_80B31C20) ## $a1 = 80B31C20 -/* 0028C 80B312AC 0C2CC408 */ jal func_80B31020 -/* 00290 80B312B0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80B312B4: -/* 00294 80B312B4 8FBF001C */ lw $ra, 0x001C($sp) -.L80B312B8: -/* 00298 80B312B8 8FB00018 */ lw $s0, 0x0018($sp) -/* 0029C 80B312BC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 002A0 80B312C0 03E00008 */ jr $ra -/* 002A4 80B312C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/EnWeatherTag_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/EnWeatherTag_Update.s deleted file mode 100644 index e7b41f0bf1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/EnWeatherTag_Update.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel EnWeatherTag_Update -/* 00D50 80B31D70 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 00D54 80B31D74 AFBF0044 */ sw $ra, 0x0044($sp) -/* 00D58 80B31D78 AFA5004C */ sw $a1, 0x004C($sp) -/* 00D5C 80B31D7C AFA40048 */ sw $a0, 0x0048($sp) -/* 00D60 80B31D80 8C99014C */ lw $t9, 0x014C($a0) ## 0000014C -/* 00D64 80B31D84 0320F809 */ jalr $ra, $t9 -/* 00D68 80B31D88 00000000 */ nop -/* 00D6C 80B31D8C 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* 00D70 80B31D90 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* 00D74 80B31D94 8FA40048 */ lw $a0, 0x0048($sp) -/* 00D78 80B31D98 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00D7C 80B31D9C 85CF12D4 */ lh $t7, 0x12D4($t6) ## 801612D4 -/* 00D80 80B31DA0 240900FF */ addiu $t1, $zero, 0x00FF ## $t1 = 000000FF -/* 00D84 80B31DA4 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF -/* 00D88 80B31DA8 11E00017 */ beq $t7, $zero, .L80B31E08 -/* 00D8C 80B31DAC 240B00FF */ addiu $t3, $zero, 0x00FF ## $t3 = 000000FF -/* 00D90 80B31DB0 84980032 */ lh $t8, 0x0032($a0) ## 00000032 -/* 00D94 80B31DB4 C48C0024 */ lwc1 $f12, 0x0024($a0) ## 00000024 -/* 00D98 80B31DB8 C48E0028 */ lwc1 $f14, 0x0028($a0) ## 00000028 -/* 00D9C 80B31DBC 8C86002C */ lw $a2, 0x002C($a0) ## 0000002C -/* 00DA0 80B31DC0 84870030 */ lh $a3, 0x0030($a0) ## 00000030 -/* 00DA4 80B31DC4 AFB80010 */ sw $t8, 0x0010($sp) -/* 00DA8 80B31DC8 84880034 */ lh $t0, 0x0034($a0) ## 00000034 -/* 00DAC 80B31DCC 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 00DB0 80B31DD0 8FAD004C */ lw $t5, 0x004C($sp) -/* 00DB4 80B31DD4 240C0004 */ addiu $t4, $zero, 0x0004 ## $t4 = 00000004 -/* 00DB8 80B31DD8 AFAC0034 */ sw $t4, 0x0034($sp) -/* 00DBC 80B31DDC AFAB0030 */ sw $t3, 0x0030($sp) -/* 00DC0 80B31DE0 AFAA002C */ sw $t2, 0x002C($sp) -/* 00DC4 80B31DE4 AFA00028 */ sw $zero, 0x0028($sp) -/* 00DC8 80B31DE8 AFA90024 */ sw $t1, 0x0024($sp) -/* 00DCC 80B31DEC AFA80014 */ sw $t0, 0x0014($sp) -/* 00DD0 80B31DF0 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00DD4 80B31DF4 E7A0001C */ swc1 $f0, 0x001C($sp) -/* 00DD8 80B31DF8 E7A00020 */ swc1 $f0, 0x0020($sp) -/* 00DDC 80B31DFC 8DB90000 */ lw $t9, 0x0000($t5) ## 00000000 -/* 00DE0 80B31E00 0C018FA7 */ jal DebugDisplay_AddObject - -/* 00DE4 80B31E04 AFB90038 */ sw $t9, 0x0038($sp) -.L80B31E08: -/* 00DE8 80B31E08 8FBF0044 */ lw $ra, 0x0044($sp) -/* 00DEC 80B31E0C 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 00DF0 80B31E10 03E00008 */ jr $ra -/* 00DF4 80B31E14 00000000 */ nop -/* 00DF8 80B31E18 00000000 */ nop -/* 00DFC 80B31E1C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31020.s b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31020.s deleted file mode 100644 index 031170119c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31020.s +++ /dev/null @@ -1,3 +0,0 @@ -glabel func_80B31020 -/* 00000 80B31020 03E00008 */ jr $ra -/* 00004 80B31024 AC85014C */ sw $a1, 0x014C($a0) ## 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B312C8.s b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B312C8.s deleted file mode 100644 index aeb83df69e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B312C8.s +++ /dev/null @@ -1,124 +0,0 @@ -glabel func_80B312C8 -/* 002A8 80B312C8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 002AC 80B312CC AFB00018 */ sw $s0, 0x0018($sp) -/* 002B0 80B312D0 AFBF001C */ sw $ra, 0x001C($sp) -/* 002B4 80B312D4 AFA40028 */ sw $a0, 0x0028($sp) -/* 002B8 80B312D8 AFA60030 */ sw $a2, 0x0030($sp) -/* 002BC 80B312DC AFA70034 */ sw $a3, 0x0034($sp) -/* 002C0 80B312E0 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 002C4 80B312E4 8CA41C44 */ lw $a0, 0x1C44($a1) ## 00001C44 -/* 002C8 80B312E8 A3A00023 */ sb $zero, 0x0023($sp) -/* 002CC 80B312EC 0C00B6E3 */ jal func_8002DB8C -/* 002D0 80B312F0 8FA50028 */ lw $a1, 0x0028($sp) -/* 002D4 80B312F4 8FAE0028 */ lw $t6, 0x0028($sp) -/* 002D8 80B312F8 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 002DC 80B312FC 44814000 */ mtc1 $at, $f8 ## $f8 = 100.00 -/* 002E0 80B31300 85CF001C */ lh $t7, 0x001C($t6) ## 0000001C -/* 002E4 80B31304 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 002E8 80B31308 93A30023 */ lbu $v1, 0x0023($sp) -/* 002EC 80B3130C 000FC203 */ sra $t8, $t7, 8 -/* 002F0 80B31310 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 002F4 80B31314 02011021 */ addu $v0, $s0, $at -/* 002F8 80B31318 468021A0 */ cvt.s.w $f6, $f4 -/* 002FC 80B3131C 46083282 */ mul.s $f10, $f6, $f8 -/* 00300 80B31320 460A003C */ c.lt.s $f0, $f10 -/* 00304 80B31324 00000000 */ nop -/* 00308 80B31328 45020058 */ bc1fl .L80B3148C -/* 0030C 80B3132C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00310 80B31330 90590A42 */ lbu $t9, 0x0A42($v0) ## 00000A42 -/* 00314 80B31334 3C088012 */ lui $t0, %hi(D_8011FB3C) -/* 00318 80B31338 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0031C 80B3133C 1720000C */ bne $t9, $zero, .L80B31370 -/* 00320 80B31340 3C068012 */ lui $a2, %hi(D_8011FB38) -/* 00324 80B31344 9108FB3C */ lbu $t0, %lo(D_8011FB3C)($t0) -/* 00328 80B31348 11000009 */ beq $t0, $zero, .L80B31370 -/* 0032C 80B3134C 00000000 */ nop -/* 00330 80B31350 90491E14 */ lbu $t1, 0x1E14($v0) ## 00001E14 -/* 00334 80B31354 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00338 80B31358 3C0C8012 */ lui $t4, %hi(D_8011FB40) -/* 0033C 80B3135C 11210042 */ beq $t1, $at, .L80B31468 -/* 00340 80B31360 00000000 */ nop -/* 00344 80B31364 904A0A44 */ lbu $t2, 0x0A44($v0) ## 00000A44 -/* 00348 80B31368 904B0A43 */ lbu $t3, 0x0A43($v0) ## 00000A43 -/* 0034C 80B3136C 154B003E */ bne $t2, $t3, .L80B31468 -.L80B31370: -/* 00350 80B31370 24C6FB38 */ addiu $a2, %lo(D_8011FB38) -/* 00354 80B31374 A0C50000 */ sb $a1, 0x0000($a2) ## 8011FB38 -/* 00358 80B31378 904C0B01 */ lbu $t4, 0x0B01($v0) ## 00000B01 -/* 0035C 80B3137C 55800043 */ bnel $t4, $zero, .L80B3148C -/* 00360 80B31380 8FBF001C */ lw $ra, 0x001C($sp) -/* 00364 80B31384 904D0A42 */ lbu $t5, 0x0A42($v0) ## 00000A42 -/* 00368 80B31388 3C048012 */ lui $a0, %hi(D_8011FB30) -/* 0036C 80B3138C 2484FB30 */ addiu $a0, %lo(D_8011FB30) -/* 00370 80B31390 55A00009 */ bnel $t5, $zero, .L80B313B8 -/* 00374 80B31394 93A30047 */ lbu $v1, 0x0047($sp) -/* 00378 80B31398 904E0A43 */ lbu $t6, 0x0A43($v0) ## 00000A43 -/* 0037C 80B3139C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00380 80B313A0 51C1003A */ beql $t6, $at, .L80B3148C -/* 00384 80B313A4 8FBF001C */ lw $ra, 0x001C($sp) -/* 00388 80B313A8 904F0A45 */ lbu $t7, 0x0A45($v0) ## 00000A45 -/* 0038C 80B313AC 55E00037 */ bnel $t7, $zero, .L80B3148C -/* 00390 80B313B0 8FBF001C */ lw $ra, 0x001C($sp) -/* 00394 80B313B4 93A30047 */ lbu $v1, 0x0047($sp) -.L80B313B8: -/* 00398 80B313B8 90980000 */ lbu $t8, 0x0000($a0) ## 8011FB30 -/* 0039C 80B313BC A0C00000 */ sb $zero, 0x0000($a2) ## 8011FB38 -/* 003A0 80B313C0 10780027 */ beq $v1, $t8, .L80B31460 -/* 003A4 80B313C4 00000000 */ nop -/* 003A8 80B313C8 A0830000 */ sb $v1, 0x0000($a0) ## 8011FB30 -/* 003AC 80B313CC 90590B01 */ lbu $t9, 0x0B01($v0) ## 00000B01 -/* 003B0 80B313D0 93A4003F */ lbu $a0, 0x003F($sp) -/* 003B4 80B313D4 97A30042 */ lhu $v1, 0x0042($sp) -/* 003B8 80B313D8 17200021 */ bne $t9, $zero, .L80B31460 -/* 003BC 80B313DC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 003C0 80B313E0 00300821 */ addu $at, $at, $s0 -/* 003C4 80B313E4 A0250A3D */ sb $a1, 0x0A3D($at) ## 00010A3D -/* 003C8 80B313E8 93A80033 */ lbu $t0, 0x0033($sp) -/* 003CC 80B313EC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 003D0 80B313F0 00300821 */ addu $at, $at, $s0 -/* 003D4 80B313F4 A0280A3B */ sb $t0, 0x0A3B($at) ## 00010A3B -/* 003D8 80B313F8 93A90037 */ lbu $t1, 0x0037($sp) -/* 003DC 80B313FC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 003E0 80B31400 00300821 */ addu $at, $at, $s0 -/* 003E4 80B31404 A0290A3C */ sb $t1, 0x0A3C($at) ## 00010A3C -/* 003E8 80B31408 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 003EC 80B3140C 00300821 */ addu $at, $at, $s0 -/* 003F0 80B31410 A4230A3E */ sh $v1, 0x0A3E($at) ## 00010A3E -/* 003F4 80B31414 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 003F8 80B31418 00300821 */ addu $at, $at, $s0 -/* 003FC 80B3141C A0250A45 */ sb $a1, 0x0A45($at) ## 00010A45 -/* 00400 80B31420 93AA003B */ lbu $t2, 0x003B($sp) -/* 00404 80B31424 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00408 80B31428 00300821 */ addu $at, $at, $s0 -/* 0040C 80B3142C A02A0A43 */ sb $t2, 0x0A43($at) ## 00010A43 -/* 00410 80B31430 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00414 80B31434 00300821 */ addu $at, $at, $s0 -/* 00418 80B31438 A0240A44 */ sb $a0, 0x0A44($at) ## 00010A44 -/* 0041C 80B3143C 3C018012 */ lui $at, %hi(D_8011FB34) -/* 00420 80B31440 A024FB34 */ sb $a0, %lo(D_8011FB34)($at) -/* 00424 80B31444 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00428 80B31448 00300821 */ addu $at, $at, $s0 -/* 0042C 80B3144C A4230A48 */ sh $v1, 0x0A48($at) ## 00010A48 -/* 00430 80B31450 944B0A48 */ lhu $t3, 0x0A48($v0) ## 00000A48 -/* 00434 80B31454 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00438 80B31458 00300821 */ addu $at, $at, $s0 -/* 0043C 80B3145C A42B0A46 */ sh $t3, 0x0A46($at) ## 00010A46 -.L80B31460: -/* 00440 80B31460 10000009 */ beq $zero, $zero, .L80B31488 -/* 00444 80B31464 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -.L80B31468: -/* 00448 80B31468 958CFB40 */ lhu $t4, %lo(D_8011FB40)($t4) -/* 0044C 80B3146C 3C028016 */ lui $v0, %hi(gSaveContext) -/* 00450 80B31470 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00454 80B31474 51800005 */ beql $t4, $zero, .L80B3148C -/* 00458 80B31478 8FBF001C */ lw $ra, 0x001C($sp) -/* 0045C 80B3147C 944D000C */ lhu $t5, 0x000C($v0) ## 8015E66C -/* 00460 80B31480 25AE0014 */ addiu $t6, $t5, 0x0014 ## $t6 = 00000014 -/* 00464 80B31484 A44E000C */ sh $t6, 0x000C($v0) ## 8015E66C -.L80B31488: -/* 00468 80B31488 8FBF001C */ lw $ra, 0x001C($sp) -.L80B3148C: -/* 0046C 80B3148C 8FB00018 */ lw $s0, 0x0018($sp) -/* 00470 80B31490 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00474 80B31494 03E00008 */ jr $ra -/* 00478 80B31498 00601025 */ or $v0, $v1, $zero ## $v0 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B3149C.s b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B3149C.s deleted file mode 100644 index f28d7b5e23..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B3149C.s +++ /dev/null @@ -1,117 +0,0 @@ -glabel func_80B3149C -/* 0047C 80B3149C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00480 80B314A0 AFB00018 */ sw $s0, 0x0018($sp) -/* 00484 80B314A4 AFBF001C */ sw $ra, 0x001C($sp) -/* 00488 80B314A8 AFA40028 */ sw $a0, 0x0028($sp) -/* 0048C 80B314AC AFA60030 */ sw $a2, 0x0030($sp) -/* 00490 80B314B0 AFA70034 */ sw $a3, 0x0034($sp) -/* 00494 80B314B4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00498 80B314B8 8CA41C44 */ lw $a0, 0x1C44($a1) ## 00001C44 -/* 0049C 80B314BC A3A00023 */ sb $zero, 0x0023($sp) -/* 004A0 80B314C0 0C00B6E3 */ jal func_8002DB8C -/* 004A4 80B314C4 8FA50028 */ lw $a1, 0x0028($sp) -/* 004A8 80B314C8 8FAE0028 */ lw $t6, 0x0028($sp) -/* 004AC 80B314CC 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 004B0 80B314D0 44811000 */ mtc1 $at, $f2 ## $f2 = 100.00 -/* 004B4 80B314D4 85CF001C */ lh $t7, 0x001C($t6) ## 0000001C -/* 004B8 80B314D8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 004BC 80B314DC 93A80023 */ lbu $t0, 0x0023($sp) -/* 004C0 80B314E0 000FC203 */ sra $t8, $t7, 8 -/* 004C4 80B314E4 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 004C8 80B314E8 02011021 */ addu $v0, $s0, $at -/* 004CC 80B314EC 468021A0 */ cvt.s.w $f6, $f4 -/* 004D0 80B314F0 46023202 */ mul.s $f8, $f6, $f2 -/* 004D4 80B314F4 46024280 */ add.s $f10, $f8, $f2 -/* 004D8 80B314F8 4600503C */ c.lt.s $f10, $f0 -/* 004DC 80B314FC 00000000 */ nop -/* 004E0 80B31500 45020051 */ bc1fl .L80B31648 -/* 004E4 80B31504 8FBF001C */ lw $ra, 0x001C($sp) -/* 004E8 80B31508 90590A42 */ lbu $t9, 0x0A42($v0) ## 00000A42 -/* 004EC 80B3150C 3C098012 */ lui $t1, %hi(D_8011FB3C) -/* 004F0 80B31510 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 004F4 80B31514 1720000B */ bne $t9, $zero, .L80B31544 -/* 004F8 80B31518 3C068012 */ lui $a2, %hi(D_8011FB38) -/* 004FC 80B3151C 9129FB3C */ lbu $t1, %lo(D_8011FB3C)($t1) -/* 00500 80B31520 11200008 */ beq $t1, $zero, .L80B31544 -/* 00504 80B31524 00000000 */ nop -/* 00508 80B31528 904A1E14 */ lbu $t2, 0x1E14($v0) ## 00001E14 -/* 0050C 80B3152C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00510 80B31530 1141003B */ beq $t2, $at, .L80B31620 -/* 00514 80B31534 00000000 */ nop -/* 00518 80B31538 904B0A44 */ lbu $t3, 0x0A44($v0) ## 00000A44 -/* 0051C 80B3153C 904C0A43 */ lbu $t4, 0x0A43($v0) ## 00000A43 -/* 00520 80B31540 156C0037 */ bne $t3, $t4, .L80B31620 -.L80B31544: -/* 00524 80B31544 24C6FB38 */ addiu $a2, %lo(D_8011FB38) -/* 00528 80B31548 A0C50000 */ sb $a1, 0x0000($a2) ## 8011FB38 -/* 0052C 80B3154C 904D0B01 */ lbu $t5, 0x0B01($v0) ## 00000B01 -/* 00530 80B31550 55A0003D */ bnel $t5, $zero, .L80B31648 -/* 00534 80B31554 8FBF001C */ lw $ra, 0x001C($sp) -/* 00538 80B31558 904E0A42 */ lbu $t6, 0x0A42($v0) ## 00000A42 -/* 0053C 80B3155C 97A30042 */ lhu $v1, 0x0042($sp) -/* 00540 80B31560 93A4003F */ lbu $a0, 0x003F($sp) -/* 00544 80B31564 55C00009 */ bnel $t6, $zero, .L80B3158C -/* 00548 80B31568 A0C00000 */ sb $zero, 0x0000($a2) ## 8011FB38 -/* 0054C 80B3156C 904F0A43 */ lbu $t7, 0x0A43($v0) ## 00000A43 -/* 00550 80B31570 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00554 80B31574 51E10034 */ beql $t7, $at, .L80B31648 -/* 00558 80B31578 8FBF001C */ lw $ra, 0x001C($sp) -/* 0055C 80B3157C 90580A45 */ lbu $t8, 0x0A45($v0) ## 00000A45 -/* 00560 80B31580 57000031 */ bnel $t8, $zero, .L80B31648 -/* 00564 80B31584 8FBF001C */ lw $ra, 0x001C($sp) -/* 00568 80B31588 A0C00000 */ sb $zero, 0x0000($a2) ## 8011FB38 -.L80B3158C: -/* 0056C 80B3158C 3C018012 */ lui $at, %hi(D_8011FB30) -/* 00570 80B31590 A020FB30 */ sb $zero, %lo(D_8011FB30)($at) -/* 00574 80B31594 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00578 80B31598 00300821 */ addu $at, $at, $s0 -/* 0057C 80B3159C A0250A3D */ sb $a1, 0x0A3D($at) ## 00010A3D -/* 00580 80B315A0 93B90033 */ lbu $t9, 0x0033($sp) -/* 00584 80B315A4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00588 80B315A8 00300821 */ addu $at, $at, $s0 -/* 0058C 80B315AC A0390A3B */ sb $t9, 0x0A3B($at) ## 00010A3B -/* 00590 80B315B0 93A90037 */ lbu $t1, 0x0037($sp) -/* 00594 80B315B4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00598 80B315B8 00300821 */ addu $at, $at, $s0 -/* 0059C 80B315BC A0290A3C */ sb $t1, 0x0A3C($at) ## 00010A3C -/* 005A0 80B315C0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 005A4 80B315C4 00300821 */ addu $at, $at, $s0 -/* 005A8 80B315C8 A4230A3E */ sh $v1, 0x0A3E($at) ## 00010A3E -/* 005AC 80B315CC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 005B0 80B315D0 00300821 */ addu $at, $at, $s0 -/* 005B4 80B315D4 A0250A45 */ sb $a1, 0x0A45($at) ## 00010A45 -/* 005B8 80B315D8 93AA003B */ lbu $t2, 0x003B($sp) -/* 005BC 80B315DC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 005C0 80B315E0 00300821 */ addu $at, $at, $s0 -/* 005C4 80B315E4 A02A0A43 */ sb $t2, 0x0A43($at) ## 00010A43 -/* 005C8 80B315E8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 005CC 80B315EC 00300821 */ addu $at, $at, $s0 -/* 005D0 80B315F0 A0240A44 */ sb $a0, 0x0A44($at) ## 00010A44 -/* 005D4 80B315F4 3C018012 */ lui $at, %hi(D_8011FB34) -/* 005D8 80B315F8 A024FB34 */ sb $a0, %lo(D_8011FB34)($at) -/* 005DC 80B315FC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 005E0 80B31600 00300821 */ addu $at, $at, $s0 -/* 005E4 80B31604 A4230A48 */ sh $v1, 0x0A48($at) ## 00010A48 -/* 005E8 80B31608 944B0A48 */ lhu $t3, 0x0A48($v0) ## 00000A48 -/* 005EC 80B3160C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 005F0 80B31610 00300821 */ addu $at, $at, $s0 -/* 005F4 80B31614 30A800FF */ andi $t0, $a1, 0x00FF ## $t0 = 00000001 -/* 005F8 80B31618 1000000A */ beq $zero, $zero, .L80B31644 -/* 005FC 80B3161C A42B0A46 */ sh $t3, 0x0A46($at) ## 00010A46 -.L80B31620: -/* 00600 80B31620 3C0C8012 */ lui $t4, %hi(D_8011FB40) -/* 00604 80B31624 958CFB40 */ lhu $t4, %lo(D_8011FB40)($t4) -/* 00608 80B31628 3C028016 */ lui $v0, %hi(gSaveContext) -/* 0060C 80B3162C 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 00610 80B31630 51800005 */ beql $t4, $zero, .L80B31648 -/* 00614 80B31634 8FBF001C */ lw $ra, 0x001C($sp) -/* 00618 80B31638 944D000C */ lhu $t5, 0x000C($v0) ## 8015E66C -/* 0061C 80B3163C 25AE0014 */ addiu $t6, $t5, 0x0014 ## $t6 = 00000014 -/* 00620 80B31640 A44E000C */ sh $t6, 0x000C($v0) ## 8015E66C -.L80B31644: -/* 00624 80B31644 8FBF001C */ lw $ra, 0x001C($sp) -.L80B31648: -/* 00628 80B31648 8FB00018 */ lw $s0, 0x0018($sp) -/* 0062C 80B3164C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00630 80B31650 03E00008 */ jr $ra -/* 00634 80B31654 01001025 */ or $v0, $t0, $zero ## $v0 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31658.s b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31658.s deleted file mode 100644 index 4db9be98ef..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31658.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80B31658 -/* 00638 80B31658 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0063C 80B3165C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00640 80B31660 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 -/* 00644 80B31664 240F003C */ addiu $t7, $zero, 0x003C ## $t7 = 0000003C -/* 00648 80B31668 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 0064C 80B3166C AFA40028 */ sw $a0, 0x0028($sp) -/* 00650 80B31670 AFB8001C */ sw $t8, 0x001C($sp) -/* 00654 80B31674 AFAF0018 */ sw $t7, 0x0018($sp) -/* 00658 80B31678 AFAE0014 */ sw $t6, 0x0014($sp) -/* 0065C 80B3167C AFA00010 */ sw $zero, 0x0010($sp) -/* 00660 80B31680 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00664 80B31684 0C2CC4B2 */ jal func_80B312C8 -/* 00668 80B31688 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0066C 80B3168C 10400004 */ beq $v0, $zero, .L80B316A0 -/* 00670 80B31690 8FA40028 */ lw $a0, 0x0028($sp) -/* 00674 80B31694 3C0580B3 */ lui $a1, %hi(func_80B316B0) ## $a1 = 80B30000 -/* 00678 80B31698 0C2CC408 */ jal func_80B31020 -/* 0067C 80B3169C 24A516B0 */ addiu $a1, $a1, %lo(func_80B316B0) ## $a1 = 80B316B0 -.L80B316A0: -/* 00680 80B316A0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00684 80B316A4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00688 80B316A8 03E00008 */ jr $ra -/* 0068C 80B316AC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B316B0.s b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B316B0.s deleted file mode 100644 index 1f214f884b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B316B0.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80B316B0 -/* 00690 80B316B0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00694 80B316B4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00698 80B316B8 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 -/* 0069C 80B316BC 240F003C */ addiu $t7, $zero, 0x003C ## $t7 = 0000003C -/* 006A0 80B316C0 AFA40028 */ sw $a0, 0x0028($sp) -/* 006A4 80B316C4 AFAF0018 */ sw $t7, 0x0018($sp) -/* 006A8 80B316C8 AFAE0010 */ sw $t6, 0x0010($sp) -/* 006AC 80B316CC AFA00014 */ sw $zero, 0x0014($sp) -/* 006B0 80B316D0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 006B4 80B316D4 0C2CC527 */ jal func_80B3149C -/* 006B8 80B316D8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 006BC 80B316DC 10400004 */ beq $v0, $zero, .L80B316F0 -/* 006C0 80B316E0 8FA40028 */ lw $a0, 0x0028($sp) -/* 006C4 80B316E4 3C0580B3 */ lui $a1, %hi(func_80B31658) ## $a1 = 80B30000 -/* 006C8 80B316E8 0C2CC408 */ jal func_80B31020 -/* 006CC 80B316EC 24A51658 */ addiu $a1, $a1, %lo(func_80B31658) ## $a1 = 80B31658 -.L80B316F0: -/* 006D0 80B316F0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 006D4 80B316F4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 006D8 80B316F8 03E00008 */ jr $ra -/* 006DC 80B316FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31700.s b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31700.s deleted file mode 100644 index 225e325c2d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31700.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80B31700 -/* 006E0 80B31700 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 006E4 80B31704 AFBF0024 */ sw $ra, 0x0024($sp) -/* 006E8 80B31708 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 006EC 80B3170C 240F0064 */ addiu $t7, $zero, 0x0064 ## $t7 = 00000064 -/* 006F0 80B31710 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 006F4 80B31714 AFA40028 */ sw $a0, 0x0028($sp) -/* 006F8 80B31718 AFB8001C */ sw $t8, 0x001C($sp) -/* 006FC 80B3171C AFAF0018 */ sw $t7, 0x0018($sp) -/* 00700 80B31720 AFAE0014 */ sw $t6, 0x0014($sp) -/* 00704 80B31724 AFA00010 */ sw $zero, 0x0010($sp) -/* 00708 80B31728 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0070C 80B3172C 0C2CC4B2 */ jal func_80B312C8 -/* 00710 80B31730 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00714 80B31734 10400004 */ beq $v0, $zero, .L80B31748 -/* 00718 80B31738 8FA40028 */ lw $a0, 0x0028($sp) -/* 0071C 80B3173C 3C0580B3 */ lui $a1, %hi(func_80B31758) ## $a1 = 80B30000 -/* 00720 80B31740 0C2CC408 */ jal func_80B31020 -/* 00724 80B31744 24A51758 */ addiu $a1, $a1, %lo(func_80B31758) ## $a1 = 80B31758 -.L80B31748: -/* 00728 80B31748 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0072C 80B3174C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00730 80B31750 03E00008 */ jr $ra -/* 00734 80B31754 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31758.s b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31758.s deleted file mode 100644 index 436257b067..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31758.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80B31758 -/* 00738 80B31758 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0073C 80B3175C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00740 80B31760 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00744 80B31764 240F0064 */ addiu $t7, $zero, 0x0064 ## $t7 = 00000064 -/* 00748 80B31768 AFA40028 */ sw $a0, 0x0028($sp) -/* 0074C 80B3176C AFAF0018 */ sw $t7, 0x0018($sp) -/* 00750 80B31770 AFAE0010 */ sw $t6, 0x0010($sp) -/* 00754 80B31774 AFA00014 */ sw $zero, 0x0014($sp) -/* 00758 80B31778 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 0075C 80B3177C 0C2CC527 */ jal func_80B3149C -/* 00760 80B31780 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00764 80B31784 10400004 */ beq $v0, $zero, .L80B31798 -/* 00768 80B31788 8FA40028 */ lw $a0, 0x0028($sp) -/* 0076C 80B3178C 3C0580B3 */ lui $a1, %hi(func_80B31700) ## $a1 = 80B30000 -/* 00770 80B31790 0C2CC408 */ jal func_80B31020 -/* 00774 80B31794 24A51700 */ addiu $a1, $a1, %lo(func_80B31700) ## $a1 = 80B31700 -.L80B31798: -/* 00778 80B31798 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0077C 80B3179C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00780 80B317A0 03E00008 */ jr $ra -/* 00784 80B317A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B317A8.s b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B317A8.s deleted file mode 100644 index 92a873baca..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B317A8.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80B317A8 -/* 00788 80B317A8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0078C 80B317AC AFBF0024 */ sw $ra, 0x0024($sp) -/* 00790 80B317B0 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00794 80B317B4 240F003C */ addiu $t7, $zero, 0x003C ## $t7 = 0000003C -/* 00798 80B317B8 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 0079C 80B317BC AFA40028 */ sw $a0, 0x0028($sp) -/* 007A0 80B317C0 AFB8001C */ sw $t8, 0x001C($sp) -/* 007A4 80B317C4 AFAF0018 */ sw $t7, 0x0018($sp) -/* 007A8 80B317C8 AFAE0014 */ sw $t6, 0x0014($sp) -/* 007AC 80B317CC AFA00010 */ sw $zero, 0x0010($sp) -/* 007B0 80B317D0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 007B4 80B317D4 0C2CC4B2 */ jal func_80B312C8 -/* 007B8 80B317D8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 007BC 80B317DC 10400004 */ beq $v0, $zero, .L80B317F0 -/* 007C0 80B317E0 8FA40028 */ lw $a0, 0x0028($sp) -/* 007C4 80B317E4 3C0580B3 */ lui $a1, %hi(func_80B31800) ## $a1 = 80B30000 -/* 007C8 80B317E8 0C2CC408 */ jal func_80B31020 -/* 007CC 80B317EC 24A51800 */ addiu $a1, $a1, %lo(func_80B31800) ## $a1 = 80B31800 -.L80B317F0: -/* 007D0 80B317F0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 007D4 80B317F4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 007D8 80B317F8 03E00008 */ jr $ra -/* 007DC 80B317FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31800.s b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31800.s deleted file mode 100644 index 8865e51c5c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31800.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80B31800 -/* 007E0 80B31800 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 007E4 80B31804 AFBF0024 */ sw $ra, 0x0024($sp) -/* 007E8 80B31808 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 007EC 80B3180C 240F003C */ addiu $t7, $zero, 0x003C ## $t7 = 0000003C -/* 007F0 80B31810 AFA40028 */ sw $a0, 0x0028($sp) -/* 007F4 80B31814 AFAF0018 */ sw $t7, 0x0018($sp) -/* 007F8 80B31818 AFAE0010 */ sw $t6, 0x0010($sp) -/* 007FC 80B3181C AFA00014 */ sw $zero, 0x0014($sp) -/* 00800 80B31820 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00804 80B31824 0C2CC527 */ jal func_80B3149C -/* 00808 80B31828 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0080C 80B3182C 10400004 */ beq $v0, $zero, .L80B31840 -/* 00810 80B31830 8FA40028 */ lw $a0, 0x0028($sp) -/* 00814 80B31834 3C0580B3 */ lui $a1, %hi(func_80B31700) ## $a1 = 80B30000 -/* 00818 80B31838 0C2CC408 */ jal func_80B31020 -/* 0081C 80B3183C 24A51700 */ addiu $a1, $a1, %lo(func_80B31700) ## $a1 = 80B31700 -.L80B31840: -/* 00820 80B31840 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00824 80B31844 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00828 80B31848 03E00008 */ jr $ra -/* 0082C 80B3184C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31850.s b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31850.s deleted file mode 100644 index d4c25b826c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31850.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_80B31850 -/* 00830 80B31850 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00834 80B31854 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00838 80B31858 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 0083C 80B3185C 240F003C */ addiu $t7, $zero, 0x003C ## $t7 = 0000003C -/* 00840 80B31860 24180003 */ addiu $t8, $zero, 0x0003 ## $t8 = 00000003 -/* 00844 80B31864 AFA40028 */ sw $a0, 0x0028($sp) -/* 00848 80B31868 AFA5002C */ sw $a1, 0x002C($sp) -/* 0084C 80B3186C AFB8001C */ sw $t8, 0x001C($sp) -/* 00850 80B31870 AFAF0018 */ sw $t7, 0x0018($sp) -/* 00854 80B31874 AFAE0014 */ sw $t6, 0x0014($sp) -/* 00858 80B31878 AFA00010 */ sw $zero, 0x0010($sp) -/* 0085C 80B3187C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00860 80B31880 0C2CC4B2 */ jal func_80B312C8 -/* 00864 80B31884 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00868 80B31888 10400009 */ beq $v0, $zero, .L80B318B0 -/* 0086C 80B3188C 24190040 */ addiu $t9, $zero, 0x0040 ## $t9 = 00000040 -/* 00870 80B31890 8FA8002C */ lw $t0, 0x002C($sp) -/* 00874 80B31894 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00878 80B31898 3C0580B3 */ lui $a1, %hi(func_80B318C0) ## $a1 = 80B30000 -/* 0087C 80B3189C 00280821 */ addu $at, $at, $t0 -/* 00880 80B318A0 A0390B15 */ sb $t9, 0x0B15($at) ## 00010B15 -/* 00884 80B318A4 8FA40028 */ lw $a0, 0x0028($sp) -/* 00888 80B318A8 0C2CC408 */ jal func_80B31020 -/* 0088C 80B318AC 24A518C0 */ addiu $a1, $a1, %lo(func_80B318C0) ## $a1 = 80B318C0 -.L80B318B0: -/* 00890 80B318B0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00894 80B318B4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00898 80B318B8 03E00008 */ jr $ra -/* 0089C 80B318BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B318C0.s b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B318C0.s deleted file mode 100644 index 03eb496320..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B318C0.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_80B318C0 -/* 008A0 80B318C0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 008A4 80B318C4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 008A8 80B318C8 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 008AC 80B318CC 240F003C */ addiu $t7, $zero, 0x003C ## $t7 = 0000003C -/* 008B0 80B318D0 AFA40028 */ sw $a0, 0x0028($sp) -/* 008B4 80B318D4 AFA5002C */ sw $a1, 0x002C($sp) -/* 008B8 80B318D8 AFAF0018 */ sw $t7, 0x0018($sp) -/* 008BC 80B318DC AFAE0010 */ sw $t6, 0x0010($sp) -/* 008C0 80B318E0 AFA00014 */ sw $zero, 0x0014($sp) -/* 008C4 80B318E4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 008C8 80B318E8 0C2CC527 */ jal func_80B3149C -/* 008CC 80B318EC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 008D0 80B318F0 10400008 */ beq $v0, $zero, .L80B31914 -/* 008D4 80B318F4 8FB8002C */ lw $t8, 0x002C($sp) -/* 008D8 80B318F8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 008DC 80B318FC 00380821 */ addu $at, $at, $t8 -/* 008E0 80B31900 A0200B15 */ sb $zero, 0x0B15($at) ## 00010B15 -/* 008E4 80B31904 3C0580B3 */ lui $a1, %hi(func_80B31850) ## $a1 = 80B30000 -/* 008E8 80B31908 24A51850 */ addiu $a1, $a1, %lo(func_80B31850) ## $a1 = 80B31850 -/* 008EC 80B3190C 0C2CC408 */ jal func_80B31020 -/* 008F0 80B31910 8FA40028 */ lw $a0, 0x0028($sp) -.L80B31914: -/* 008F4 80B31914 8FBF0024 */ lw $ra, 0x0024($sp) -/* 008F8 80B31918 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 008FC 80B3191C 03E00008 */ jr $ra -/* 00900 80B31920 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31924.s b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31924.s deleted file mode 100644 index 5b96a8a7a3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31924.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_80B31924 -/* 00904 80B31924 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00908 80B31928 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0090C 80B3192C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00910 80B31930 240F0064 */ addiu $t7, $zero, 0x0064 ## $t7 = 00000064 -/* 00914 80B31934 24180004 */ addiu $t8, $zero, 0x0004 ## $t8 = 00000004 -/* 00918 80B31938 AFA40028 */ sw $a0, 0x0028($sp) -/* 0091C 80B3193C AFA5002C */ sw $a1, 0x002C($sp) -/* 00920 80B31940 AFB8001C */ sw $t8, 0x001C($sp) -/* 00924 80B31944 AFAF0018 */ sw $t7, 0x0018($sp) -/* 00928 80B31948 AFAE0014 */ sw $t6, 0x0014($sp) -/* 0092C 80B3194C AFA00010 */ sw $zero, 0x0010($sp) -/* 00930 80B31950 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00934 80B31954 0C2CC4B2 */ jal func_80B312C8 -/* 00938 80B31958 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0093C 80B3195C 5040000D */ beql $v0, $zero, .L80B31994 -/* 00940 80B31960 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00944 80B31964 0C01DD89 */ jal func_80077624 -/* 00948 80B31968 8FA4002C */ lw $a0, 0x002C($sp) -/* 0094C 80B3196C 8FA8002C */ lw $t0, 0x002C($sp) -/* 00950 80B31970 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00954 80B31974 24190019 */ addiu $t9, $zero, 0x0019 ## $t9 = 00000019 -/* 00958 80B31978 00280821 */ addu $at, $at, $t0 -/* 0095C 80B3197C A0390B12 */ sb $t9, 0x0B12($at) ## 00010B12 -/* 00960 80B31980 3C0580B3 */ lui $a1, %hi(func_80B319A0) ## $a1 = 80B30000 -/* 00964 80B31984 24A519A0 */ addiu $a1, $a1, %lo(func_80B319A0) ## $a1 = 80B319A0 -/* 00968 80B31988 0C2CC408 */ jal func_80B31020 -/* 0096C 80B3198C 8FA40028 */ lw $a0, 0x0028($sp) -/* 00970 80B31990 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B31994: -/* 00974 80B31994 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00978 80B31998 03E00008 */ jr $ra -/* 0097C 80B3199C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B319A0.s b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B319A0.s deleted file mode 100644 index 1fbda9b730..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B319A0.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_80B319A0 -/* 00980 80B319A0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00984 80B319A4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00988 80B319A8 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 0098C 80B319AC 240F0064 */ addiu $t7, $zero, 0x0064 ## $t7 = 00000064 -/* 00990 80B319B0 AFA40028 */ sw $a0, 0x0028($sp) -/* 00994 80B319B4 AFA5002C */ sw $a1, 0x002C($sp) -/* 00998 80B319B8 AFAF0018 */ sw $t7, 0x0018($sp) -/* 0099C 80B319BC AFAE0010 */ sw $t6, 0x0010($sp) -/* 009A0 80B319C0 AFA00014 */ sw $zero, 0x0014($sp) -/* 009A4 80B319C4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 009A8 80B319C8 0C2CC527 */ jal func_80B3149C -/* 009AC 80B319CC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 009B0 80B319D0 5040000C */ beql $v0, $zero, .L80B31A04 -/* 009B4 80B319D4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 009B8 80B319D8 0C01DDA1 */ jal func_80077684 -/* 009BC 80B319DC 8FA4002C */ lw $a0, 0x002C($sp) -/* 009C0 80B319E0 8FB8002C */ lw $t8, 0x002C($sp) -/* 009C4 80B319E4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 009C8 80B319E8 3C0580B3 */ lui $a1, %hi(func_80B31924) ## $a1 = 80B30000 -/* 009CC 80B319EC 00380821 */ addu $at, $at, $t8 -/* 009D0 80B319F0 A0200B12 */ sb $zero, 0x0B12($at) ## 00010B12 -/* 009D4 80B319F4 8FA40028 */ lw $a0, 0x0028($sp) -/* 009D8 80B319F8 0C2CC408 */ jal func_80B31020 -/* 009DC 80B319FC 24A51924 */ addiu $a1, $a1, %lo(func_80B31924) ## $a1 = 80B31924 -/* 009E0 80B31A00 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B31A04: -/* 009E4 80B31A04 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 009E8 80B31A08 03E00008 */ jr $ra -/* 009EC 80B31A0C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31A10.s b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31A10.s deleted file mode 100644 index 84e15873b6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31A10.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_80B31A10 -/* 009F0 80B31A10 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 009F4 80B31A14 AFBF0024 */ sw $ra, 0x0024($sp) -/* 009F8 80B31A18 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 -/* 009FC 80B31A1C 240F0064 */ addiu $t7, $zero, 0x0064 ## $t7 = 00000064 -/* 00A00 80B31A20 24180005 */ addiu $t8, $zero, 0x0005 ## $t8 = 00000005 -/* 00A04 80B31A24 AFA40028 */ sw $a0, 0x0028($sp) -/* 00A08 80B31A28 AFA5002C */ sw $a1, 0x002C($sp) -/* 00A0C 80B31A2C AFB8001C */ sw $t8, 0x001C($sp) -/* 00A10 80B31A30 AFAF0018 */ sw $t7, 0x0018($sp) -/* 00A14 80B31A34 AFAE0014 */ sw $t6, 0x0014($sp) -/* 00A18 80B31A38 AFA00010 */ sw $zero, 0x0010($sp) -/* 00A1C 80B31A3C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00A20 80B31A40 0C2CC4B2 */ jal func_80B312C8 -/* 00A24 80B31A44 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00A28 80B31A48 50400012 */ beql $v0, $zero, .L80B31A94 -/* 00A2C 80B31A4C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00A30 80B31A50 0C01DD89 */ jal func_80077624 -/* 00A34 80B31A54 8FA4002C */ lw $a0, 0x002C($sp) -/* 00A38 80B31A58 8FA8002C */ lw $t0, 0x002C($sp) -/* 00A3C 80B31A5C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00A40 80B31A60 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 00A44 80B31A64 00280821 */ addu $at, $at, $t0 -/* 00A48 80B31A68 A0390B03 */ sb $t9, 0x0B03($at) ## 00010B03 -/* 00A4C 80B31A6C 8FAA002C */ lw $t2, 0x002C($sp) -/* 00A50 80B31A70 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00A54 80B31A74 2409001E */ addiu $t1, $zero, 0x001E ## $t1 = 0000001E -/* 00A58 80B31A78 002A0821 */ addu $at, $at, $t2 -/* 00A5C 80B31A7C A0290B12 */ sb $t1, 0x0B12($at) ## 00010B12 -/* 00A60 80B31A80 3C0580B3 */ lui $a1, %hi(func_80B31AA0) ## $a1 = 80B30000 -/* 00A64 80B31A84 24A51AA0 */ addiu $a1, $a1, %lo(func_80B31AA0) ## $a1 = 80B31AA0 -/* 00A68 80B31A88 0C2CC408 */ jal func_80B31020 -/* 00A6C 80B31A8C 8FA40028 */ lw $a0, 0x0028($sp) -/* 00A70 80B31A90 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B31A94: -/* 00A74 80B31A94 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00A78 80B31A98 03E00008 */ jr $ra -/* 00A7C 80B31A9C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31AA0.s b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31AA0.s deleted file mode 100644 index 75314443f2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31AA0.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_80B31AA0 -/* 00A80 80B31AA0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00A84 80B31AA4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00A88 80B31AA8 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 -/* 00A8C 80B31AAC 240F0064 */ addiu $t7, $zero, 0x0064 ## $t7 = 00000064 -/* 00A90 80B31AB0 AFA40028 */ sw $a0, 0x0028($sp) -/* 00A94 80B31AB4 AFA5002C */ sw $a1, 0x002C($sp) -/* 00A98 80B31AB8 AFAF0018 */ sw $t7, 0x0018($sp) -/* 00A9C 80B31ABC AFAE0010 */ sw $t6, 0x0010($sp) -/* 00AA0 80B31AC0 AFA00014 */ sw $zero, 0x0014($sp) -/* 00AA4 80B31AC4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00AA8 80B31AC8 0C2CC527 */ jal func_80B3149C -/* 00AAC 80B31ACC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00AB0 80B31AD0 50400011 */ beql $v0, $zero, .L80B31B18 -/* 00AB4 80B31AD4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00AB8 80B31AD8 0C01DDA1 */ jal func_80077684 -/* 00ABC 80B31ADC 8FA4002C */ lw $a0, 0x002C($sp) -/* 00AC0 80B31AE0 8FB9002C */ lw $t9, 0x002C($sp) -/* 00AC4 80B31AE4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00AC8 80B31AE8 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 00ACC 80B31AEC 00390821 */ addu $at, $at, $t9 -/* 00AD0 80B31AF0 A0380B03 */ sb $t8, 0x0B03($at) ## 00010B03 -/* 00AD4 80B31AF4 8FA8002C */ lw $t0, 0x002C($sp) -/* 00AD8 80B31AF8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00ADC 80B31AFC 3C0580B3 */ lui $a1, %hi(func_80B31A10) ## $a1 = 80B30000 -/* 00AE0 80B31B00 00280821 */ addu $at, $at, $t0 -/* 00AE4 80B31B04 A0200B12 */ sb $zero, 0x0B12($at) ## 00010B12 -/* 00AE8 80B31B08 8FA40028 */ lw $a0, 0x0028($sp) -/* 00AEC 80B31B0C 0C2CC408 */ jal func_80B31020 -/* 00AF0 80B31B10 24A51A10 */ addiu $a1, $a1, %lo(func_80B31A10) ## $a1 = 80B31A10 -/* 00AF4 80B31B14 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B31B18: -/* 00AF8 80B31B18 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00AFC 80B31B1C 03E00008 */ jr $ra -/* 00B00 80B31B20 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31B24.s b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31B24.s deleted file mode 100644 index 2b44246e04..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31B24.s +++ /dev/null @@ -1,70 +0,0 @@ -glabel func_80B31B24 -/* 00B04 80B31B24 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00B08 80B31B28 AFB00020 */ sw $s0, 0x0020($sp) -/* 00B0C 80B31B2C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00B10 80B31B30 AFA40028 */ sw $a0, 0x0028($sp) -/* 00B14 80B31B34 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00B18 80B31B38 8CA41C44 */ lw $a0, 0x1C44($a1) ## 00001C44 -/* 00B1C 80B31B3C 0C00B6E3 */ jal func_8002DB8C -/* 00B20 80B31B40 8FA50028 */ lw $a1, 0x0028($sp) -/* 00B24 80B31B44 8FAE0028 */ lw $t6, 0x0028($sp) -/* 00B28 80B31B48 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 00B2C 80B31B4C 44814000 */ mtc1 $at, $f8 ## $f8 = 100.00 -/* 00B30 80B31B50 85CF001C */ lh $t7, 0x001C($t6) ## 0000001C -/* 00B34 80B31B54 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00B38 80B31B58 34210AC2 */ ori $at, $at, 0x0AC2 ## $at = 00010AC2 -/* 00B3C 80B31B5C 000FC203 */ sra $t8, $t7, 8 -/* 00B40 80B31B60 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 00B44 80B31B64 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 00B48 80B31B68 02012021 */ addu $a0, $s0, $at -/* 00B4C 80B31B6C 468021A0 */ cvt.s.w $f6, $f4 -/* 00B50 80B31B70 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00B54 80B31B74 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00B58 80B31B78 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00B5C 80B31B7C 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 00B60 80B31B80 46083282 */ mul.s $f10, $f6, $f8 -/* 00B64 80B31B84 460A003C */ c.lt.s $f0, $f10 -/* 00B68 80B31B88 00000000 */ nop -/* 00B6C 80B31B8C 45000014 */ bc1f .L80B31BE0 -/* 00B70 80B31B90 00000000 */ nop -/* 00B74 80B31B94 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00B78 80B31B98 34210AC2 */ ori $at, $at, 0x0AC2 ## $at = 00010AC2 -/* 00B7C 80B31B9C 02012021 */ addu $a0, $s0, $at -/* 00B80 80B31BA0 2405FFB0 */ addiu $a1, $zero, 0xFFB0 ## $a1 = FFFFFFB0 -/* 00B84 80B31BA4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00B88 80B31BA8 24070002 */ addiu $a3, $zero, 0x0002 ## $a3 = 00000002 -/* 00B8C 80B31BAC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00B90 80B31BB0 AFB90010 */ sw $t9, 0x0010($sp) -/* 00B94 80B31BB4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00B98 80B31BB8 34210AC4 */ ori $at, $at, 0x0AC4 ## $at = 00010AC4 -/* 00B9C 80B31BBC 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 00BA0 80B31BC0 AFA80010 */ sw $t0, 0x0010($sp) -/* 00BA4 80B31BC4 02012021 */ addu $a0, $s0, $at -/* 00BA8 80B31BC8 2405F830 */ addiu $a1, $zero, 0xF830 ## $a1 = FFFFF830 -/* 00BAC 80B31BCC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00BB0 80B31BD0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00BB4 80B31BD4 24070032 */ addiu $a3, $zero, 0x0032 ## $a3 = 00000032 -/* 00BB8 80B31BD8 1000000D */ beq $zero, $zero, .L80B31C10 -/* 00BBC 80B31BDC 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B31BE0: -/* 00BC0 80B31BE0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00BC4 80B31BE4 AFA90010 */ sw $t1, 0x0010($sp) -/* 00BC8 80B31BE8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00BCC 80B31BEC 34210AC4 */ ori $at, $at, 0x0AC4 ## $at = 00010AC4 -/* 00BD0 80B31BF0 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 00BD4 80B31BF4 AFAA0010 */ sw $t2, 0x0010($sp) -/* 00BD8 80B31BF8 02012021 */ addu $a0, $s0, $at -/* 00BDC 80B31BFC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00BE0 80B31C00 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00BE4 80B31C04 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00BE8 80B31C08 24070019 */ addiu $a3, $zero, 0x0019 ## $a3 = 00000019 -/* 00BEC 80B31C0C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B31C10: -/* 00BF0 80B31C10 8FB00020 */ lw $s0, 0x0020($sp) -/* 00BF4 80B31C14 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00BF8 80B31C18 03E00008 */ jr $ra -/* 00BFC 80B31C1C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31C20.s b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31C20.s deleted file mode 100644 index 3e5618f70c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31C20.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_80B31C20 -/* 00C00 80B31C20 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00C04 80B31C24 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00C08 80B31C28 AFA40018 */ sw $a0, 0x0018($sp) -/* 00C0C 80B31C2C AFA5001C */ sw $a1, 0x001C($sp) -/* 00C10 80B31C30 8CA41C44 */ lw $a0, 0x1C44($a1) ## 00001C44 -/* 00C14 80B31C34 0C00B6E3 */ jal func_8002DB8C -/* 00C18 80B31C38 8FA50018 */ lw $a1, 0x0018($sp) -/* 00C1C 80B31C3C 8FAF0018 */ lw $t7, 0x0018($sp) -/* 00C20 80B31C40 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 00C24 80B31C44 44814000 */ mtc1 $at, $f8 ## $f8 = 100.00 -/* 00C28 80B31C48 85F8001C */ lh $t8, 0x001C($t7) ## 0000001C -/* 00C2C 80B31C4C 0018CA03 */ sra $t9, $t8, 8 -/* 00C30 80B31C50 44992000 */ mtc1 $t9, $f4 ## $f4 = 0.00 -/* 00C34 80B31C54 00000000 */ nop -/* 00C38 80B31C58 468021A0 */ cvt.s.w $f6, $f4 -/* 00C3C 80B31C5C 46083282 */ mul.s $f10, $f6, $f8 -/* 00C40 80B31C60 460A003C */ c.lt.s $f0, $f10 -/* 00C44 80B31C64 00000000 */ nop -/* 00C48 80B31C68 45020012 */ bc1fl .L80B31CB4 -/* 00C4C 80B31C6C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00C50 80B31C70 0C01DD89 */ jal func_80077624 -/* 00C54 80B31C74 8FA4001C */ lw $a0, 0x001C($sp) -/* 00C58 80B31C78 8FA9001C */ lw $t1, 0x001C($sp) -/* 00C5C 80B31C7C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00C60 80B31C80 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 00C64 80B31C84 00290821 */ addu $at, $at, $t1 -/* 00C68 80B31C88 A0280B03 */ sb $t0, 0x0B03($at) ## 00010B03 -/* 00C6C 80B31C8C 8FAB001C */ lw $t3, 0x001C($sp) -/* 00C70 80B31C90 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00C74 80B31C94 240A0019 */ addiu $t2, $zero, 0x0019 ## $t2 = 00000019 -/* 00C78 80B31C98 002B0821 */ addu $at, $at, $t3 -/* 00C7C 80B31C9C A02A0B12 */ sb $t2, 0x0B12($at) ## 00010B12 -/* 00C80 80B31CA0 3C0580B3 */ lui $a1, %hi(func_80B31CC0) ## $a1 = 80B30000 -/* 00C84 80B31CA4 24A51CC0 */ addiu $a1, $a1, %lo(func_80B31CC0) ## $a1 = 80B31CC0 -/* 00C88 80B31CA8 0C2CC408 */ jal func_80B31020 -/* 00C8C 80B31CAC 8FA40018 */ lw $a0, 0x0018($sp) -/* 00C90 80B31CB0 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B31CB4: -/* 00C94 80B31CB4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00C98 80B31CB8 03E00008 */ jr $ra -/* 00C9C 80B31CBC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31CC0.s b/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31CC0.s deleted file mode 100644 index 05b54fff31..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31CC0.s +++ /dev/null @@ -1,46 +0,0 @@ -glabel func_80B31CC0 -/* 00CA0 80B31CC0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00CA4 80B31CC4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00CA8 80B31CC8 AFA40018 */ sw $a0, 0x0018($sp) -/* 00CAC 80B31CCC AFA5001C */ sw $a1, 0x001C($sp) -/* 00CB0 80B31CD0 8CA41C44 */ lw $a0, 0x1C44($a1) ## 00001C44 -/* 00CB4 80B31CD4 0C00B6E3 */ jal func_8002DB8C -/* 00CB8 80B31CD8 8FA50018 */ lw $a1, 0x0018($sp) -/* 00CBC 80B31CDC 8FAF0018 */ lw $t7, 0x0018($sp) -/* 00CC0 80B31CE0 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 00CC4 80B31CE4 44814000 */ mtc1 $at, $f8 ## $f8 = 100.00 -/* 00CC8 80B31CE8 85F8001C */ lh $t8, 0x001C($t7) ## 0000001C -/* 00CCC 80B31CEC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00CD0 80B31CF0 44818000 */ mtc1 $at, $f16 ## $f16 = 10.00 -/* 00CD4 80B31CF4 0018CA03 */ sra $t9, $t8, 8 -/* 00CD8 80B31CF8 44992000 */ mtc1 $t9, $f4 ## $f4 = 0.00 -/* 00CDC 80B31CFC 00000000 */ nop -/* 00CE0 80B31D00 468021A0 */ cvt.s.w $f6, $f4 -/* 00CE4 80B31D04 46083282 */ mul.s $f10, $f6, $f8 -/* 00CE8 80B31D08 46105480 */ add.s $f18, $f10, $f16 -/* 00CEC 80B31D0C 4600903C */ c.lt.s $f18, $f0 -/* 00CF0 80B31D10 00000000 */ nop -/* 00CF4 80B31D14 45020013 */ bc1fl .L80B31D64 -/* 00CF8 80B31D18 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00CFC 80B31D1C 0C01DDA1 */ jal func_80077684 -/* 00D00 80B31D20 8FA4001C */ lw $a0, 0x001C($sp) -/* 00D04 80B31D24 8FA9001C */ lw $t1, 0x001C($sp) -/* 00D08 80B31D28 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00D0C 80B31D2C 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 00D10 80B31D30 00290821 */ addu $at, $at, $t1 -/* 00D14 80B31D34 A0280B03 */ sb $t0, 0x0B03($at) ## 00010B03 -/* 00D18 80B31D38 8FA2001C */ lw $v0, 0x001C($sp) -/* 00D1C 80B31D3C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00D20 80B31D40 240A000A */ addiu $t2, $zero, 0x000A ## $t2 = 0000000A -/* 00D24 80B31D44 00411021 */ addu $v0, $v0, $at -/* 00D28 80B31D48 A0400B12 */ sb $zero, 0x0B12($v0) ## 00000B12 -/* 00D2C 80B31D4C A04A0B13 */ sb $t2, 0x0B13($v0) ## 00000B13 -/* 00D30 80B31D50 3C0580B3 */ lui $a1, %hi(func_80B31C20) ## $a1 = 80B30000 -/* 00D34 80B31D54 24A51C20 */ addiu $a1, $a1, %lo(func_80B31C20) ## $a1 = 80B31C20 -/* 00D38 80B31D58 0C2CC408 */ jal func_80B31020 -/* 00D3C 80B31D5C 8FA40018 */ lw $a0, 0x0018($sp) -/* 00D40 80B31D60 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B31D64: -/* 00D44 80B31D64 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00D48 80B31D68 03E00008 */ jr $ra -/* 00D4C 80B31D6C 00000000 */ nop diff --git a/data/overlays/actors/z_en_weather_tag.data.s b/data/overlays/actors/z_en_weather_tag.data.s deleted file mode 100644 index e3be38f014..0000000000 --- a/data/overlays/actors/z_en_weather_tag.data.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel En_Weather_Tag_InitVars - .word 0x01650600, 0x00000010, 0x00010000, 0x00000154 -.word EnWeatherTag_Init -.word EnWeatherTag_Destroy -.word EnWeatherTag_Update -.word 0x00000000 - diff --git a/data/overlays/actors/z_en_weather_tag.reloc.s b/data/overlays/actors/z_en_weather_tag.reloc.s deleted file mode 100644 index 37cecf2efa..0000000000 --- a/data/overlays/actors/z_en_weather_tag.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_80B32080 - .incbin "baserom/ovl_En_Weather_Tag", 0x1060, 0x00000210 diff --git a/include/variables.h b/include/variables.h index 2a0cd513b9..af9edc5a2f 100644 --- a/include/variables.h +++ b/include/variables.h @@ -256,9 +256,9 @@ extern Color_RGBA8 D_8011E0B4[]; extern GameStateOverlay gGameStateOverlayTable[6]; //extern ? D_8011FAF0; extern u8 D_8011FB30; -//extern ? D_8011FB34; +extern u8 D_8011FB34; extern u8 D_8011FB38; -//extern ? D_8011FB3C; +extern u8 D_8011FB3C; extern u16 D_8011FB40; //extern ? D_8011FB44; //extern ? D_8011FB48; diff --git a/include/z64.h b/include/z64.h index b944fcfca3..6977b5d6c1 100644 --- a/include/z64.h +++ b/include/z64.h @@ -885,8 +885,8 @@ typedef struct { /* 0x2B */ s8 unk_2B; /* 0x2C */ s8 unk_2C; /* 0x2D */ char unk_2D[0x5E]; - /* 0x8C */ s16 unk_8C[6]; - /* 0x98 */ char unk_98[0x08]; + /* 0x8C */ s16 unk_8C[3][3]; + /* 0x9E */ s16 unk_9E; /* 0xA0 */ s16 unk_A0; /* 0xA2 */ char unk_A2[0x06]; /* 0xA8 */ s16 unk_A8; diff --git a/spec b/spec index f5609ddb56..60e2a0febb 100644 --- a/spec +++ b/spec @@ -3329,8 +3329,7 @@ endseg beginseg name "ovl_En_Weather_Tag" include "build/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.o" - include "build/data/overlays/actors/z_en_weather_tag.data.o" - include "build/data/overlays/actors/z_en_weather_tag.reloc.o" + include "build/src/overlays/actors/ovl_En_Weather_Tag/ovl_En_Weather_Tag_reloc.o" endseg beginseg diff --git a/src/code/z_demo.c b/src/code/z_demo.c index 1e03b4e610..8bbc1d9b52 100644 --- a/src/code/z_demo.c +++ b/src/code/z_demo.c @@ -329,16 +329,16 @@ void func_80064824(GlobalContext* globalCtx, CutsceneContext* csCtx, CsCmdBase* break; case 27: if (globalCtx->state.frames & 8) { - if (globalCtx->envCtx.unk_8C[0] < 40) { - globalCtx->envCtx.unk_8C[0] += 2; - globalCtx->envCtx.unk_8C[4] -= 3; - globalCtx->envCtx.unk_8C[5] -= 3; + if (globalCtx->envCtx.unk_8C[0][0] < 40) { + globalCtx->envCtx.unk_8C[0][0] += 2; + globalCtx->envCtx.unk_8C[1][1] -= 3; + globalCtx->envCtx.unk_8C[1][2] -= 3; } } else { - if (globalCtx->envCtx.unk_8C[0] > 2) { - globalCtx->envCtx.unk_8C[0] -= 2; - globalCtx->envCtx.unk_8C[4] += 3; - globalCtx->envCtx.unk_8C[5] += 3; + if (globalCtx->envCtx.unk_8C[0][0] > 2) { + globalCtx->envCtx.unk_8C[0][0] -= 2; + globalCtx->envCtx.unk_8C[1][1] += 3; + globalCtx->envCtx.unk_8C[1][2] += 3; } } break; diff --git a/src/overlays/actors/ovl_En_Bom/z_en_bom.c b/src/overlays/actors/ovl_En_Bom/z_en_bom.c index 14f56a035a..450f73998a 100644 --- a/src/overlays/actors/ovl_En_Bom/z_en_bom.c +++ b/src/overlays/actors/ovl_En_Bom/z_en_bom.c @@ -155,28 +155,28 @@ void EnBom_Explode(EnBom* this, GlobalContext* globalCtx) { CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, &this->explosionCollider.base); } - if (globalCtx->envCtx.unk_8C[3] != 0) { - globalCtx->envCtx.unk_8C[3] -= 0x19; + if (globalCtx->envCtx.unk_8C[1][0] != 0) { + globalCtx->envCtx.unk_8C[1][0] -= 0x19; } - if (globalCtx->envCtx.unk_8C[4] != 0) { - globalCtx->envCtx.unk_8C[4] -= 0x19; + if (globalCtx->envCtx.unk_8C[1][1] != 0) { + globalCtx->envCtx.unk_8C[1][1] -= 0x19; } - if (globalCtx->envCtx.unk_8C[5] != 0) { - globalCtx->envCtx.unk_8C[5] -= 0x19; + if (globalCtx->envCtx.unk_8C[1][2] != 0) { + globalCtx->envCtx.unk_8C[1][2] -= 0x19; } - if (globalCtx->envCtx.unk_8C[0] != 0) { - globalCtx->envCtx.unk_8C[0] -= 0x19; + if (globalCtx->envCtx.unk_8C[0][0] != 0) { + globalCtx->envCtx.unk_8C[0][0] -= 0x19; } - if (globalCtx->envCtx.unk_8C[1] != 0) { - globalCtx->envCtx.unk_8C[1] -= 0x19; + if (globalCtx->envCtx.unk_8C[0][1] != 0) { + globalCtx->envCtx.unk_8C[0][1] -= 0x19; } - if (globalCtx->envCtx.unk_8C[2] != 0) { - globalCtx->envCtx.unk_8C[2] -= 0x19; + if (globalCtx->envCtx.unk_8C[0][2] != 0) { + globalCtx->envCtx.unk_8C[0][2] -= 0x19; } if (this->timer == 0) { @@ -289,8 +289,8 @@ void EnBom_Update(Actor* thisx, GlobalContext* globalCtx) { Audio_PlayActorSound2(thisx, NA_SE_IT_BOMB_EXPLOSION); if (globalCtx) {}; - globalCtx->envCtx.unk_8C[3] = globalCtx->envCtx.unk_8C[4] = globalCtx->envCtx.unk_8C[5] = 0xFA; - globalCtx->envCtx.unk_8C[0] = globalCtx->envCtx.unk_8C[1] = globalCtx->envCtx.unk_8C[2] = 0xFA; + globalCtx->envCtx.unk_8C[1][0] = globalCtx->envCtx.unk_8C[1][1] = globalCtx->envCtx.unk_8C[1][2] = 0xFA; + globalCtx->envCtx.unk_8C[0][0] = globalCtx->envCtx.unk_8C[0][1] = globalCtx->envCtx.unk_8C[0][2] = 0xFA; func_8005AA1C(&globalCtx->cameras[0], 2, 0xB, 8); thisx->params = BOMB_EXPLOSION; this->timer = 10; diff --git a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c index 819cdb9e29..4b8a1032f9 100644 --- a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c +++ b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c @@ -250,28 +250,28 @@ void EnBombf_Explode(EnBombf* this, GlobalContext* globalCtx) { CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, &this->explosionCollider.base); } - if (globalCtx->envCtx.unk_8C[3] != 0) { - globalCtx->envCtx.unk_8C[3] -= 0x19; + if (globalCtx->envCtx.unk_8C[1][0] != 0) { + globalCtx->envCtx.unk_8C[1][0] -= 0x19; } - if (globalCtx->envCtx.unk_8C[4] != 0) { - globalCtx->envCtx.unk_8C[4] -= 0x19; + if (globalCtx->envCtx.unk_8C[1][1] != 0) { + globalCtx->envCtx.unk_8C[1][1] -= 0x19; } - if (globalCtx->envCtx.unk_8C[5] != 0) { - globalCtx->envCtx.unk_8C[5] -= 0x19; + if (globalCtx->envCtx.unk_8C[1][2] != 0) { + globalCtx->envCtx.unk_8C[1][2] -= 0x19; } - if (globalCtx->envCtx.unk_8C[0] != 0) { - globalCtx->envCtx.unk_8C[0] -= 0x19; + if (globalCtx->envCtx.unk_8C[0][0] != 0) { + globalCtx->envCtx.unk_8C[0][0] -= 0x19; } - if (globalCtx->envCtx.unk_8C[1] != 0) { - globalCtx->envCtx.unk_8C[1] -= 0x19; + if (globalCtx->envCtx.unk_8C[0][1] != 0) { + globalCtx->envCtx.unk_8C[0][1] -= 0x19; } - if (globalCtx->envCtx.unk_8C[2] != 0) { - globalCtx->envCtx.unk_8C[2] -= 0x19; + if (globalCtx->envCtx.unk_8C[0][2] != 0) { + globalCtx->envCtx.unk_8C[0][2] -= 0x19; } if (this->timer == 0) { @@ -399,8 +399,8 @@ void EnBombf_Update(Actor* thisx, GlobalContext* globalCtx) { } Audio_PlayActorSound2(thisx, NA_SE_IT_BOMB_EXPLOSION); - globalCtx->envCtx.unk_8C[3] = globalCtx->envCtx.unk_8C[4] = globalCtx->envCtx.unk_8C[5] = 0xFA; - globalCtx->envCtx.unk_8C[0] = globalCtx->envCtx.unk_8C[1] = globalCtx->envCtx.unk_8C[2] = 0xFA; + globalCtx->envCtx.unk_8C[1][0] = globalCtx->envCtx.unk_8C[1][1] = globalCtx->envCtx.unk_8C[1][2] = 0xFA; + globalCtx->envCtx.unk_8C[0][0] = globalCtx->envCtx.unk_8C[0][1] = globalCtx->envCtx.unk_8C[0][2] = 0xFA; func_8005AA1C(&globalCtx->cameras[0], 2, 0xB, 8); thisx->params = BOMBFLOWER_EXPLOSION; this->timer = 10; diff --git a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c index bbe75a48b3..ca408f8080 100644 --- a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c +++ b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c @@ -5,6 +5,7 @@ */ #include "z_en_weather_tag.h" +#include "vt.h" #define FLAGS 0x00000010 @@ -14,7 +15,22 @@ void EnWeatherTag_Init(Actor* thisx, GlobalContext* globalCtx); void EnWeatherTag_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnWeatherTag_Update(Actor* thisx, GlobalContext* globalCtx); -/* +void func_80B31658(EnWeatherTag* this, GlobalContext* globalCtx); +void func_80B31700(EnWeatherTag* this, GlobalContext* globalCtx); +void func_80B31850(EnWeatherTag* this, GlobalContext* globalCtx); +void func_80B31924(EnWeatherTag* this, GlobalContext* globalCtx); +void func_80B317A8(EnWeatherTag* this, GlobalContext* globalCtx); +void func_80B31A10(EnWeatherTag* this, GlobalContext* globalCtx); +void func_80B31B24(EnWeatherTag* this, GlobalContext* globalCtx); +void func_80B31C20(EnWeatherTag* this, GlobalContext* globalCtx); +void func_80B316B0(EnWeatherTag* this, GlobalContext* globalCtx); +void func_80B31758(EnWeatherTag* this, GlobalContext* globalCtx); +void func_80B31800(EnWeatherTag* this, GlobalContext* globalCtx); +void func_80B318C0(EnWeatherTag* this, GlobalContext* globalCtx); +void func_80B319A0(EnWeatherTag* this, GlobalContext* globalCtx); +void func_80B31AA0(EnWeatherTag* this, GlobalContext* globalCtx); +void func_80B31CC0(EnWeatherTag* this, GlobalContext* globalCtx); + const ActorInit En_Weather_Tag_InitVars = { ACTOR_EN_WEATHER_TAG, ACTORTYPE_PROP, @@ -26,45 +42,296 @@ const ActorInit En_Weather_Tag_InitVars = { (ActorFunc)EnWeatherTag_Update, NULL, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31020.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/EnWeatherTag_Destroy.s") +void EnWeatherTag_SetupAction(EnWeatherTag* this, EnWeatherTagActionFunc actionFunc) { + this->actionFunc = actionFunc; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/EnWeatherTag_Init.s") +void EnWeatherTag_Destroy(Actor* thisx, GlobalContext* globalCtx) { +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B312C8.s") +void EnWeatherTag_Init(Actor* thisx, GlobalContext* globalCtx) { + EnWeatherTag* this = THIS; + u32 temp_v0; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B3149C.s") + this->actor.flags &= ~1; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31658.s") + switch (this->actor.params & 0xF) { + case 0: + osSyncPrintf("\n\n"); + //"☆☆☆☆☆ (;o;) About ☆☆☆☆☆☆" + osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ （;o;) くらいよー ☆☆☆☆☆ \n" VT_RST); + EnWeatherTag_SetupAction(this, func_80B31658); + break; + case 1: + osSyncPrintf("\n\n"); + //"☆☆☆☆☆ Cloudy (._.) Ah Melancholy ☆☆☆☆☆" + osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ くもり (._.) あーあ 憂鬱 ☆☆☆☆☆ \n" VT_RST); + if (Flags_GetEventChkInf(0x18)) { + Actor_Kill(&this->actor); + } + EnWeatherTag_SetupAction(this, func_80B31700); + break; + case 2: + osSyncPrintf("\n\n"); + //"☆☆☆☆☆ Yukigafuru You won't come (._.) ☆☆☆☆☆" + osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ ゆきがふるー あなたはこないー (._.) ☆☆☆☆☆ \n" VT_RST); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B316B0.s") + if (gSaveContext.eventChkInf[4] & 0x400) { + Actor_Kill(&this->actor); + } + EnWeatherTag_SetupAction(this, func_80B31850); + break; + case 3: + osSyncPrintf("\n\n"); + //"☆☆☆☆☆ Wow wa wa na wa saa ki ha (^o^) ☆☆☆☆☆" + osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ わわわわー なーがーさーきーはー (^o^) ☆☆☆☆☆ \n" VT_RST); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31700.s") + if (gSaveContext.eventChkInf[4] & 0x400) { + Actor_Kill(&this->actor); + } + EnWeatherTag_SetupAction(this, func_80B31924); + break; + case 4: + osSyncPrintf("\n\n"); + //"☆☆☆☆☆ Cloudy (._.) Ah Melancholy ☆☆☆☆☆" + osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ くもり (._.) あーあ 憂鬱 ☆☆☆☆☆ \n" VT_RST); + if (gSaveContext.eventChkInf[4] & 0x200) { + Actor_Kill(&this->actor); + } + EnWeatherTag_SetupAction(this, func_80B317A8); + break; + case 5: + osSyncPrintf("\n\n"); + //"☆☆☆☆☆ Cloudy Rain Thunder (;O;) Uo Melancholy ☆☆☆☆☆" + osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ くもり雨雷 (;O;) うおお 憂鬱 ☆☆☆☆☆ \n" VT_RST); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31758.s") + temp_v0 = gSaveContext.eventChkInf[4]; + if ((((temp_v0 & 0x100) == 0) || ((temp_v0 & 0x200) == 0) || ((temp_v0 & 0x400) == 0)) || + CHECK_QUEST_ITEM(QUEST_MEDALLION_SHADOW)) { + Actor_Kill(&this->actor); + } + EnWeatherTag_SetupAction(this, func_80B31A10); + break; + case 6: + osSyncPrintf("\n\n"); + //"☆☆☆☆☆ The desert becomes thicker ☆☆☆☆☆" + osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 砂漠が濃くなります ☆☆☆☆☆ \n" VT_RST); + EnWeatherTag_SetupAction(this, func_80B31B24); + break; + case 7: + osSyncPrintf("\n\n"); + //"☆☆☆☆☆ Wow wa wa na wa saa ki ha (^o^) ☆☆☆☆☆" + osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ わわわわー なーがーさーきーはー (^o^) ☆☆☆☆☆ \n" VT_RST); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B317A8.s") + EnWeatherTag_SetupAction(this, func_80B31C20); + break; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31800.s") +u8 func_80B312C8(EnWeatherTag* this, GlobalContext* globalCtx, u8 arg2, u8 arg3, u8 arg4, u8 arg5, u16 arg6, u8 arg7) { + s32 pad; + u8 ret = 0; + Player* player = PLAYER; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31850.s") + if (func_8002DB8C(&player->actor, &this->actor) < (this->actor.params >> 8) * 100.0f) { + if ((globalCtx->envCtx.unk_1E != 0) || + (!D_8011FB3C || !(globalCtx->skyboxId == 1 || globalCtx->envCtx.unk_1F != globalCtx->envCtx.unk_20))) { + D_8011FB38 = 1; + if (globalCtx->envCtx.gloomySkyEvent == 0 && + ((globalCtx->envCtx.unk_1E != 0) || + (!(globalCtx->envCtx.unk_1F == 1 || globalCtx->envCtx.unk_21 != 0)))) { + D_8011FB38 = 0; + if (D_8011FB30 != arg7) { + D_8011FB30 = arg7; + if (globalCtx->envCtx.gloomySkyEvent == 0) { + globalCtx->envCtx.unk_19 = 1; + globalCtx->envCtx.gloomySky = arg2; + globalCtx->envCtx.unk_18 = arg3; + globalCtx->envCtx.unk_1A = arg6; + globalCtx->envCtx.unk_21 = 1; + globalCtx->envCtx.unk_1F = arg4; + globalCtx->envCtx.unk_20 = arg5; + D_8011FB34 = arg5; + globalCtx->envCtx.unk_24 = arg6; + globalCtx->envCtx.unk_22 = globalCtx->envCtx.unk_24; + } + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B318C0.s") + ret = 1; + } + } else { + if (D_8011FB40 != 0) { + gSaveContext.dayTime += 0x14; + } + } + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31924.s") + return ret; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B319A0.s") +u8 func_80B3149C(EnWeatherTag* this, GlobalContext* globalCtx, u8 arg2, u8 arg3, u8 arg4, u8 arg5, u16 arg6) { + s32 pad; + u8 ret = 0; + Player* player = PLAYER; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31A10.s") + if ((((this->actor.params >> 8) * 100.0f) + 100.0f) < func_8002DB8C(&player->actor, &this->actor)) { + if ((globalCtx->envCtx.unk_1E != 0) || + (!D_8011FB3C || !(globalCtx->skyboxId == 1 || globalCtx->envCtx.unk_1F != globalCtx->envCtx.unk_20))) { + D_8011FB38 = 1; + if ((globalCtx->envCtx.gloomySkyEvent == 0) && + ((globalCtx->envCtx.unk_1E != 0) || + (!(globalCtx->envCtx.unk_1F == 1 || globalCtx->envCtx.unk_21 != 0)))) { + D_8011FB38 = 0; + D_8011FB30 = 0; + globalCtx->envCtx.unk_19 = 1; + globalCtx->envCtx.gloomySky = arg2; + globalCtx->envCtx.unk_18 = arg3; + globalCtx->envCtx.unk_1A = arg6; + globalCtx->envCtx.unk_21 = 1; + globalCtx->envCtx.unk_1F = arg4; + globalCtx->envCtx.unk_20 = arg5; + D_8011FB34 = arg5; + globalCtx->envCtx.unk_24 = arg6; + globalCtx->envCtx.unk_22 = globalCtx->envCtx.unk_24; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31AA0.s") + ret = 1; + } + } else { + if (D_8011FB40 != 0) { + gSaveContext.dayTime += 0x14; + } + } + } + return ret; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31B24.s") +void func_80B31658(EnWeatherTag* this, GlobalContext* globalCtx) { + if (func_80B312C8(this, globalCtx, 0, 1, 0, 3, 0x3C, 1) != 0) { + EnWeatherTag_SetupAction(this, func_80B316B0); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31C20.s") +void func_80B316B0(EnWeatherTag* this, GlobalContext* globalCtx) { + if (func_80B3149C(this, globalCtx, 1, 0, 3, 0, 0x3C) != 0) { + EnWeatherTag_SetupAction(this, func_80B31658); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/func_80B31CC0.s") +void func_80B31700(EnWeatherTag* this, GlobalContext* globalCtx) { + if (func_80B312C8(this, globalCtx, 0, 1, 0, 2, 0x64, 2) != 0) { + EnWeatherTag_SetupAction(this, func_80B31758); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Weather_Tag/EnWeatherTag_Update.s") +void func_80B31758(EnWeatherTag* this, GlobalContext* globalCtx) { + if (func_80B3149C(this, globalCtx, 1, 0, 2, 0, 0x64) != 0) { + EnWeatherTag_SetupAction(this, func_80B31700); + } +} + +void func_80B317A8(EnWeatherTag* this, GlobalContext* globalCtx) { + if (func_80B312C8(this, globalCtx, 0, 1, 0, 2, 0x3C, 2) != 0) { + EnWeatherTag_SetupAction(this, func_80B31800); + } +} + +void func_80B31800(EnWeatherTag* this, GlobalContext* globalCtx) { + if (func_80B3149C(this, globalCtx, 1, 0, 2, 0, 0x3C) != 0) { + EnWeatherTag_SetupAction(this, func_80B31700); + } +} + +void func_80B31850(EnWeatherTag* this, GlobalContext* globalCtx) { + if (func_80B312C8(this, globalCtx, 0, 1, 0, 2, 0x3C, 3) != 0) { + globalCtx->envCtx.unk_EE[3] = 0x40; + EnWeatherTag_SetupAction(this, func_80B318C0); + } +} + +void func_80B318C0(EnWeatherTag* this, GlobalContext* globalCtx) { + if (func_80B3149C(this, globalCtx, 1, 0, 2, 0, 0x3C) != 0) { + globalCtx->envCtx.unk_EE[3] = 0; + EnWeatherTag_SetupAction(this, func_80B31850); + } +} + +void func_80B31924(EnWeatherTag* this, GlobalContext* globalCtx) { + if (func_80B312C8(this, globalCtx, 0, 1, 0, 2, 0x64, 4) != 0) { + func_80077624(globalCtx); + globalCtx->envCtx.unk_EE[0] = 0x19; + EnWeatherTag_SetupAction(this, func_80B319A0); + } +} + +void func_80B319A0(EnWeatherTag* this, GlobalContext* globalCtx) { + if (func_80B3149C(this, globalCtx, 1, 0, 2, 0, 0x64) != 0) { + func_80077684(globalCtx); + globalCtx->envCtx.unk_EE[0] = 0; + EnWeatherTag_SetupAction(this, func_80B31924); + } +} + +void func_80B31A10(EnWeatherTag* this, GlobalContext* globalCtx) { + if (func_80B312C8(this, globalCtx, 0, 1, 0, 4, 0x64, 5) != 0) { + func_80077624(globalCtx); + globalCtx->envCtx.lightning = 1; + globalCtx->envCtx.unk_EE[0] = 0x1E; + EnWeatherTag_SetupAction(this, func_80B31AA0); + } +} + +void func_80B31AA0(EnWeatherTag* this, GlobalContext* globalCtx) { + if (func_80B3149C(this, globalCtx, 1, 0, 4, 0, 0x64) != 0) { + func_80077684(globalCtx); + globalCtx->envCtx.lightning = 2; + globalCtx->envCtx.unk_EE[0] = 0; + EnWeatherTag_SetupAction(this, func_80B31A10); + } +} + +void func_80B31B24(EnWeatherTag* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + if (func_8002DB8C(&player->actor, &this->actor) < ((this->actor.params >> 8) * 100.0f)) { + Math_SmoothScaleMaxMinS(&globalCtx->envCtx.unk_9E, -0x50, 1, 2, 1); + Math_SmoothScaleMaxMinS(&globalCtx->envCtx.unk_A0, -0x7D0, 1, 0x32, 1); + } else { + Math_SmoothScaleMaxMinS(&globalCtx->envCtx.unk_9E, 0, 1, 1, 1); + Math_SmoothScaleMaxMinS(&globalCtx->envCtx.unk_A0, 0, 1, 0x19, 1); + } +} + +void func_80B31C20(EnWeatherTag* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + if (func_8002DB8C(&player->actor, &this->actor) < ((this->actor.params >> 8) * 100.0f)) { + func_80077624(globalCtx); + globalCtx->envCtx.lightning = 1; + globalCtx->envCtx.unk_EE[0] = 0x19; + EnWeatherTag_SetupAction(this, func_80B31CC0); + } +} + +void func_80B31CC0(EnWeatherTag* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + if ((((this->actor.params >> 8) * 100.0f) + 10.0f) < func_8002DB8C(&player->actor, &this->actor)) { + func_80077684(globalCtx); + globalCtx->envCtx.lightning = 2; + globalCtx->envCtx.unk_EE[0] = 0; + globalCtx->envCtx.unk_EE[1] = 0xA; + EnWeatherTag_SetupAction(this, func_80B31C20); + } +} + +void EnWeatherTag_Update(Actor* thisx, GlobalContext* globalCtx) { + EnWeatherTag* this = THIS; + + this->actionFunc(this, globalCtx); + if (BREG(0) != 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, 255, 0, 255, 255, 4, globalCtx->state.gfxCtx); + } +} diff --git a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.h b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.h index d7bcb0b362..19c1b7a2b7 100644 --- a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.h +++ b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.h @@ -6,9 +6,12 @@ struct EnWeatherTag; +typedef void (*EnWeatherTagActionFunc)(struct EnWeatherTag*, GlobalContext*); + typedef struct EnWeatherTag { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x8]; + /* 0x014C */ EnWeatherTagActionFunc actionFunc; + /* 0x0150 */ char unk_150[0x04]; } EnWeatherTag; // size = 0x0154 extern const ActorInit En_Weather_Tag_InitVars;