From 353684c63863266ef1f3f680312ef424b75c0a70 Mon Sep 17 00:00:00 2001 From: Kenix3 Date: Mon, 7 Dec 2020 12:48:29 -0500 Subject: [PATCH] ovl_demo_effect 100% OK (#466) * Fully decompiles demo_effect actor. * Formats z_demo_effect.c * GET_ACTOR_TYPE is renamed to GET_EFFECT_TYPE * Implements OPEN_DISPS macros for all draw functions. * Fixes ugly float values * Removes unnecessary union structs in the DemoEffect actor struct * Renames DemoEffect SkelAnimeCurve member to skelCurve * Names initObjectBankIndex DemoEffect struct member * Renames jewel display list holders * Renames initialization function pointers to initUpdateFunc and initDrawFunc * Renames primitive and environment color DemoEffect struct members. * Fixes a couple missed floats. * Renames most draw and update functions. * Finishes naming all update functions. * Adds additional SFX defines. * Renames the rest of the functions * Renames all external object display lists and vertex references * Renames DemoEffect global data variables * Renames DemoEffect Medal function to GetItem because it's used by LightArrows too * Fixes DemoEffect Timewarp_Timeblock documentation. * DemoEffect_TimewarpTimeblock updates shrink functions to use decimal * Converts DemoEffect hex to decimal where appopriate * Names the rest of DemoEffect struct members. * Names DemoEffect triforceSpot crystalLightOpacity * Adds DemoEffect enums for light effect color and god lgt types. * Renames DemoEffect_UpdateBlueOrb to DemoEffect_UpdateBlueOrbGrow * Fixes compiler warning in DemoEffect_JewelSparkle * Renames DemoEffect_MedalSparkle argument * Reformatting DemoEffect struct offset comments. * Formats z_demo_effect * Updates DemoEffect oGfxCtx to use the new macros. * Adds comments detailing what each function in the DemoEffect system does. * Removes z_demo_effect.data.s * Renames DemoEffect global variables and sets them to static * Removes pointer from DemoEffect function references * Removes unncecessary default: break; statements in DemoEffect * Converts rotation values to hex in DemoEffect * DemoEffect effectFlags now uses ~1 rather than 65534 * DemoEffect_DrawGodLgt now uses a cleaner conditional statement * eventChkInf in DemoEffect now uses 1 << 9 and 1 << 11 * DemoEffect now uses VT macros. * Converts DemoEffect colors to hex. * Changes M_PI / 32768.0f to M_PI / 0x8000 * Updates demo_effect enums to be all caps * ovl_demo_effect reloc info is now included via build process rather than included from original asm * Adds param packing macro * DemoEffect struct unions are now typedef'd outside of the main struct * Reformats DemoEffect sJewelSparkleColors * Removes an if(globalCtx){} in DemoEffect_Init * Removes ActorFunc cast in DemoEffect_Wait * Removes unncessary comment in DemoEffect_MedalSparkle * Timer check in DemoEffect_UpdateLightRingShrinking now uses <= 255 rather than < 256 * Removes unnecessary comment in DemoEffect_SetJewelColor * Removes unncessary comment in DemoEffect_MoveJewelActivateDoorOfTime * Converts an angle to hex in DemoEffect_MoveJewelActivateDoorOfTime * Converts a while to for loop in DemoEffect_JewelSparkle * Moves stack variables in DemoEffect_UpdateDust to a new line for each one * Removes globalCtx2 assignment to the beginning of the function in DemoEffect_DrawJewel * Removes unnecessary comment in DemoEffect_DrawCrystalLight * No longer wrapping rotation reset in if(1){} in DemoEffect_DrawGodLgt * Converts DemoEffect if statements to use != 0 and == 0 when non-boolean ints are checked. * DemoEffect initDrawFunc now uses type ActorFunc rather than DemoEffectFunc * review 2 Co-authored-by: fig --- .../ovl_Demo_Effect/DemoEffect_Destroy.s | 22 - .../actors/ovl_Demo_Effect/DemoEffect_Init.s | 665 ----- .../ovl_Demo_Effect/DemoEffect_Update.s | 10 - .../actors/ovl_Demo_Effect/func_80970F50.s | 3 - .../actors/ovl_Demo_Effect/func_80970F58.s | 25 - .../actors/ovl_Demo_Effect/func_80970FB4.s | 54 - .../actors/ovl_Demo_Effect/func_80971070.s | 22 - .../actors/ovl_Demo_Effect/func_80971960.s | 34 - .../actors/ovl_Demo_Effect/func_809719C0.s | 14 - .../actors/ovl_Demo_Effect/func_809719F0.s | 15 - .../actors/ovl_Demo_Effect/func_80971A28.s | 118 - .../actors/ovl_Demo_Effect/func_80971BBC.s | 172 -- .../actors/ovl_Demo_Effect/func_80971DFC.s | 168 -- .../actors/ovl_Demo_Effect/func_80972008.s | 44 - .../actors/ovl_Demo_Effect/func_809720AC.s | 80 - .../actors/ovl_Demo_Effect/func_809721D0.s | 57 - .../actors/ovl_Demo_Effect/func_80972288.s | 63 - .../actors/ovl_Demo_Effect/func_80972344.s | 34 - .../actors/ovl_Demo_Effect/func_809723C4.s | 202 -- .../actors/ovl_Demo_Effect/func_809726AC.s | 43 - .../actors/ovl_Demo_Effect/func_8097273C.s | 33 - .../actors/ovl_Demo_Effect/func_809727B0.s | 52 - .../actors/ovl_Demo_Effect/func_80972868.s | 98 - .../actors/ovl_Demo_Effect/func_809729B8.s | 25 - .../actors/ovl_Demo_Effect/func_80972A04.s | 35 - .../actors/ovl_Demo_Effect/func_80972A6C.s | 71 - .../actors/ovl_Demo_Effect/func_80972B4C.s | 237 -- .../actors/ovl_Demo_Effect/func_80972E3C.s | 36 - .../actors/ovl_Demo_Effect/func_80972EA8.s | 115 - .../actors/ovl_Demo_Effect/func_8097303C.s | 141 -- .../actors/ovl_Demo_Effect/func_8097322C.s | 123 - .../actors/ovl_Demo_Effect/func_809733C8.s | 24 - .../actors/ovl_Demo_Effect/func_80973424.s | 68 - .../actors/ovl_Demo_Effect/func_80973524.s | 516 ---- .../actors/ovl_Demo_Effect/func_80973CA0.s | 28 - .../actors/ovl_Demo_Effect/func_80973CFC.s | 143 -- .../actors/ovl_Demo_Effect/func_80973EE0.s | 171 -- .../actors/ovl_Demo_Effect/func_8097414C.s | 99 - .../actors/ovl_Demo_Effect/func_809742B0.s | 29 - .../actors/ovl_Demo_Effect/func_80974314.s | 18 - .../actors/ovl_Demo_Effect/func_80974358.s | 146 -- .../actors/ovl_Demo_Effect/func_8097456C.s | 82 - .../actors/ovl_Demo_Effect/func_809746B4.s | 20 - .../actors/ovl_Demo_Effect/func_809746F8.s | 316 --- .../actors/ovl_Demo_Effect/func_80974B80.s | 246 -- .../actors/ovl_Demo_Effect/func_80974EB4.s | 127 - .../actors/ovl_Demo_Effect/func_80975074.s | 298 --- .../actors/ovl_Demo_Effect/func_80975494.s | 194 -- .../actors/ovl_Demo_Effect/func_8097571C.s | 107 - .../actors/ovl_Demo_Effect/func_8097587C.s | 127 - .../actors/ovl_Demo_Effect/func_80975A3C.s | 117 - .../actors/ovl_Demo_Effect/func_80975BD4.s | 424 ---- .../actors/ovl_Demo_Effect/func_809761C4.s | 40 - .../actors/ovl_Demo_Effect/func_80976254.s | 120 - .../actors/ovl_Demo_Effect/func_80976404.s | 75 - .../actors/ovl_Demo_Effect/func_809764FC.s | 53 - .../actors/ovl_Demo_Effect/func_809765AC.s | 90 - .../actors/ovl_Demo_Effect/func_8097670C.s | 42 - .../actors/ovl_Demo_Effect/func_809767B0.s | 17 - data/overlays/actors/z_demo_effect.data.s | 28 - data/overlays/actors/z_demo_effect.reloc.s | 13 - include/functions.h | 2 +- spec | 3 +- src/code/z_fcurve_data_skelanime.c | 2 +- .../actors/ovl_Demo_Effect/z_demo_effect.c | 2148 ++++++++++++++++- .../actors/ovl_Demo_Effect/z_demo_effect.h | 152 +- undefined_syms.txt | 21 + 67 files changed, 2260 insertions(+), 6657 deletions(-) delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/DemoEffect_Destroy.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/DemoEffect_Init.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/DemoEffect_Update.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80970F50.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80970F58.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80970FB4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971070.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971960.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809719C0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809719F0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971A28.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971BBC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971DFC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972008.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809720AC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809721D0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972288.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972344.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809723C4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809726AC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097273C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809727B0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972868.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809729B8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972A04.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972A6C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972B4C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972E3C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972EA8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097303C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097322C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809733C8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80973424.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80973524.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80973CA0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80973CFC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80973EE0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097414C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809742B0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974314.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974358.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097456C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809746B4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809746F8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974B80.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974EB4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975074.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975494.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097571C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097587C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975A3C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975BD4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809761C4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80976254.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80976404.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809764FC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809765AC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097670C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809767B0.s delete mode 100644 data/overlays/actors/z_demo_effect.data.s delete mode 100644 data/overlays/actors/z_demo_effect.reloc.s diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/DemoEffect_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/DemoEffect_Destroy.s deleted file mode 100644 index 45c05f7729..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/DemoEffect_Destroy.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel DemoEffect_Destroy -/* 009C4 80971914 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 009C8 80971918 AFBF0014 */ sw $ra, 0x0014($sp) -/* 009CC 8097191C 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 009D0 80971920 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 009D4 80971924 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 009D8 80971928 304200FF */ andi $v0, $v0, 0x00FF ## $v0 = 00000000 -/* 009DC 8097192C 10410005 */ beq $v0, $at, .L80971944 -/* 009E0 80971930 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 009E4 80971934 24010018 */ addiu $at, $zero, 0x0018 ## $at = 00000018 -/* 009E8 80971938 10410002 */ beq $v0, $at, .L80971944 -/* 009EC 8097193C 24010019 */ addiu $at, $zero, 0x0019 ## $at = 00000019 -/* 009F0 80971940 14410003 */ bne $v0, $at, .L80971950 -.L80971944: -/* 009F4 80971944 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 009F8 80971948 0C01B217 */ jal SkelCurve_Destroy -/* 009FC 8097194C 24C5014C */ addiu $a1, $a2, 0x014C ## $a1 = 0000014C -.L80971950: -/* 00A00 80971950 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00A04 80971954 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00A08 80971958 03E00008 */ jr $ra -/* 00A0C 8097195C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/DemoEffect_Init.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/DemoEffect_Init.s deleted file mode 100644 index 8f6fc864e0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/DemoEffect_Init.s +++ /dev/null @@ -1,665 +0,0 @@ -.rdata -glabel D_80976880 - .asciz "\x1b[36m no = %d\n\x1b[m" - .balign 4 - -glabel D_80976894 - .asciz "\x1b[36m bank_ID = %d\n\x1b[m" - .balign 4 - -glabel D_809768AC - .asciz "0" - .balign 4 - -glabel D_809768B0 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_809768C4 - .asciz "0" - .balign 4 - -glabel D_809768C8 - .asciz "../z_demo_effect.c" - .balign 4 - -.late_rodata -glabel jtbl_80976C58 -.word L809711AC -.word L809711C8 -.word L809711F8 -.word L809713A8 -.word L809713CC -.word L80971424 -.word L809714B8 -.word L80971544 -.word L809715E0 -.word L809716D8 -.word L809716EC -.word L80971700 -.word L80971714 -.word L80971728 -.word L8097173C -.word L80971774 -.word L809715B0 -.word L80971578 -.word L8097125C -.word L809717B0 -.word L809717E8 -.word L80971820 -.word L8097189C -.word L80971750 -.word L80971764 -.word L80971764 -glabel jtbl_80976CC0 -.word L809712AC -.word L809712CC -.word L809712EC -.word L8097130C -.word L8097132C -.word L8097134C -.word L80971370 - -.text -glabel DemoEffect_Init -/* 00170 809710C0 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 -/* 00174 809710C4 AFBF003C */ sw $ra, 0x003C($sp) -/* 00178 809710C8 AFB00038 */ sw $s0, 0x0038($sp) -/* 0017C 809710CC AFA50064 */ sw $a1, 0x0064($sp) -/* 00180 809710D0 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 00184 809710D4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00188 809710D8 3C048097 */ lui $a0, %hi(D_80976880) ## $a0 = 80970000 -/* 0018C 809710DC 304EF000 */ andi $t6, $v0, 0xF000 ## $t6 = 00000000 -/* 00190 809710E0 000E7B03 */ sra $t7, $t6, 12 -/* 00194 809710E4 304500FF */ andi $a1, $v0, 0x00FF ## $a1 = 00000000 -/* 00198 809710E8 AFAF0050 */ sw $t7, 0x0050($sp) -/* 0019C 809710EC AFA50054 */ sw $a1, 0x0054($sp) -/* 001A0 809710F0 0C00084C */ jal osSyncPrintf - -/* 001A4 809710F4 24846880 */ addiu $a0, $a0, %lo(D_80976880) ## $a0 = 80976880 -/* 001A8 809710F8 8FB80054 */ lw $t8, 0x0054($sp) -/* 001AC 809710FC 3C058097 */ lui $a1, %hi(D_80976814) ## $a1 = 80970000 -/* 001B0 80971100 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 001B4 80971104 0018C840 */ sll $t9, $t8, 1 -/* 001B8 80971108 00B92821 */ addu $a1, $a1, $t9 -/* 001BC 8097110C 84A56814 */ lh $a1, %lo(D_80976814)($a1) -/* 001C0 80971110 8FA40064 */ lw $a0, 0x0064($sp) -/* 001C4 80971114 54A10004 */ bnel $a1, $at, .L80971128 -/* 001C8 80971118 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 001CC 8097111C 10000006 */ beq $zero, $zero, .L80971138 -/* 001D0 80971120 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 001D4 80971124 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -.L80971128: -/* 001D8 80971128 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 001DC 8097112C 0C02604B */ jal Object_GetIndex - ## ObjectIndex -/* 001E0 80971130 00812021 */ addu $a0, $a0, $at -/* 001E4 80971134 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -.L80971138: -/* 001E8 80971138 3C048097 */ lui $a0, %hi(D_80976894) ## $a0 = 80970000 -/* 001EC 8097113C 24846894 */ addiu $a0, $a0, %lo(D_80976894) ## $a0 = 80976894 -/* 001F0 80971140 0C00084C */ jal osSyncPrintf - -/* 001F4 80971144 AFA5004C */ sw $a1, 0x004C($sp) -/* 001F8 80971148 8FA5004C */ lw $a1, 0x004C($sp) -/* 001FC 8097114C 3C048097 */ lui $a0, %hi(D_809768AC) ## $a0 = 80970000 -/* 00200 80971150 248468AC */ addiu $a0, $a0, %lo(D_809768AC) ## $a0 = 809768AC -/* 00204 80971154 04A10006 */ bgez $a1, .L80971170 -/* 00208 80971158 240602D3 */ addiu $a2, $zero, 0x02D3 ## $a2 = 000002D3 -/* 0020C 8097115C 3C058097 */ lui $a1, %hi(D_809768B0) ## $a1 = 80970000 -/* 00210 80971160 0C0007FC */ jal __assert - -/* 00214 80971164 24A568B0 */ addiu $a1, $a1, %lo(D_809768B0) ## $a1 = 809768B0 -/* 00218 80971168 10000003 */ beq $zero, $zero, .L80971178 -/* 0021C 8097116C 3C053E4C */ lui $a1, 0x3E4C ## $a1 = 3E4C0000 -.L80971170: -/* 00220 80971170 A205016C */ sb $a1, 0x016C($s0) ## 0000016C -/* 00224 80971174 3C053E4C */ lui $a1, 0x3E4C ## $a1 = 3E4C0000 -.L80971178: -/* 00228 80971178 A600018A */ sh $zero, 0x018A($s0) ## 0000018A -/* 0022C 8097117C 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3E4CCCCD -/* 00230 80971180 0C00B58B */ jal Actor_SetScale - -/* 00234 80971184 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00238 80971188 8FA80054 */ lw $t0, 0x0054($sp) -/* 0023C 8097118C 2D01001A */ sltiu $at, $t0, 0x001A -/* 00240 80971190 102001CA */ beq $at, $zero, .L809718BC -/* 00244 80971194 00084080 */ sll $t0, $t0, 2 -/* 00248 80971198 3C018097 */ lui $at, %hi(jtbl_80976C58) ## $at = 80970000 -/* 0024C 8097119C 00280821 */ addu $at, $at, $t0 -/* 00250 809711A0 8C286C58 */ lw $t0, %lo(jtbl_80976C58)($at) -/* 00254 809711A4 01000008 */ jr $t0 -/* 00258 809711A8 00000000 */ nop -glabel L809711AC -/* 0025C 809711AC 3C098097 */ lui $t1, %hi(func_80974B80) ## $t1 = 80970000 -/* 00260 809711B0 3C0A8097 */ lui $t2, %hi(func_809719F0) ## $t2 = 80970000 -/* 00264 809711B4 25294B80 */ addiu $t1, $t1, %lo(func_80974B80) ## $t1 = 80974B80 -/* 00268 809711B8 254A19F0 */ addiu $t2, $t2, %lo(func_809719F0) ## $t2 = 809719F0 -/* 0026C 809711BC AE090198 */ sw $t1, 0x0198($s0) ## 00000198 -/* 00270 809711C0 100001C4 */ beq $zero, $zero, .L809718D4 -/* 00274 809711C4 AE0A0194 */ sw $t2, 0x0194($s0) ## 00000194 -glabel L809711C8 -/* 00278 809711C8 3C0B8097 */ lui $t3, %hi(func_80974EB4) ## $t3 = 80970000 -/* 0027C 809711CC 3C0C8097 */ lui $t4, %hi(func_809719C0) ## $t4 = 80970000 -/* 00280 809711D0 256B4EB4 */ addiu $t3, $t3, %lo(func_80974EB4) ## $t3 = 80974EB4 -/* 00284 809711D4 258C19C0 */ addiu $t4, $t4, %lo(func_809719C0) ## $t4 = 809719C0 -/* 00288 809711D8 3C053DCC */ lui $a1, 0x3DCC ## $a1 = 3DCC0000 -/* 0028C 809711DC AE0B0198 */ sw $t3, 0x0198($s0) ## 00000198 -/* 00290 809711E0 AE0C0194 */ sw $t4, 0x0194($s0) ## 00000194 -/* 00294 809711E4 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3DCCCCCD -/* 00298 809711E8 0C00B58B */ jal Actor_SetScale - -/* 0029C 809711EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 002A0 809711F0 100001B9 */ beq $zero, $zero, .L809718D8 -/* 002A4 809711F4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -glabel L809711F8 -/* 002A8 809711F8 3C0D8097 */ lui $t5, %hi(func_8097571C) ## $t5 = 80970000 -/* 002AC 809711FC 3C0E8097 */ lui $t6, %hi(func_80972A6C) ## $t6 = 80970000 -/* 002B0 80971200 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF -/* 002B4 80971204 25AD571C */ addiu $t5, $t5, %lo(func_8097571C) ## $t5 = 8097571C -/* 002B8 80971208 25CE2A6C */ addiu $t6, $t6, %lo(func_80972A6C) ## $t6 = 80972A6C -/* 002BC 8097120C 240F0005 */ addiu $t7, $zero, 0x0005 ## $t7 = 00000005 -/* 002C0 80971210 3C053D4C */ lui $a1, 0x3D4C ## $a1 = 3D4C0000 -/* 002C4 80971214 AE0D0198 */ sw $t5, 0x0198($s0) ## 00000198 -/* 002C8 80971218 AE0E0194 */ sw $t6, 0x0194($s0) ## 00000194 -/* 002CC 8097121C A2020184 */ sb $v0, 0x0184($s0) ## 00000184 -/* 002D0 80971220 A20F0185 */ sb $t7, 0x0185($s0) ## 00000185 -/* 002D4 80971224 A6000188 */ sh $zero, 0x0188($s0) ## 00000188 -/* 002D8 80971228 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3D4CCCCD -/* 002DC 8097122C 0C00B58B */ jal Actor_SetScale - -/* 002E0 80971230 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 002E4 80971234 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF -/* 002E8 80971238 241800BC */ addiu $t8, $zero, 0x00BC ## $t8 = 000000BC -/* 002EC 8097123C 24190064 */ addiu $t9, $zero, 0x0064 ## $t9 = 00000064 -/* 002F0 80971240 A2180178 */ sb $t8, 0x0178($s0) ## 00000178 -/* 002F4 80971244 A2020179 */ sb $v0, 0x0179($s0) ## 00000179 -/* 002F8 80971248 A202017A */ sb $v0, 0x017A($s0) ## 0000017A -/* 002FC 8097124C A219017C */ sb $t9, 0x017C($s0) ## 0000017C -/* 00300 80971250 A202017D */ sb $v0, 0x017D($s0) ## 0000017D -/* 00304 80971254 1000019F */ beq $zero, $zero, .L809718D4 -/* 00308 80971258 A200017B */ sb $zero, 0x017B($s0) ## 0000017B -glabel L8097125C -/* 0030C 8097125C 3C088097 */ lui $t0, %hi(func_80975494) ## $t0 = 80970000 -/* 00310 80971260 3C098097 */ lui $t1, %hi(func_80972B4C) ## $t1 = 80970000 -/* 00314 80971264 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF -/* 00318 80971268 25085494 */ addiu $t0, $t0, %lo(func_80975494) ## $t0 = 80975494 -/* 0031C 8097126C 25292B4C */ addiu $t1, $t1, %lo(func_80972B4C) ## $t1 = 80972B4C -/* 00320 80971270 AE080198 */ sw $t0, 0x0198($s0) ## 00000198 -/* 00324 80971274 AE090194 */ sw $t1, 0x0194($s0) ## 00000194 -/* 00328 80971278 A2020184 */ sb $v0, 0x0184($s0) ## 00000184 -/* 0032C 8097127C A2000185 */ sb $zero, 0x0185($s0) ## 00000185 -/* 00330 80971280 A2000186 */ sb $zero, 0x0186($s0) ## 00000186 -/* 00334 80971284 A6000188 */ sh $zero, 0x0188($s0) ## 00000188 -/* 00338 80971288 8FAA0050 */ lw $t2, 0x0050($sp) -/* 0033C 8097128C 2D410007 */ sltiu $at, $t2, 0x0007 -/* 00340 80971290 1020003E */ beq $at, $zero, .L8097138C -/* 00344 80971294 000A5080 */ sll $t2, $t2, 2 -/* 00348 80971298 3C018097 */ lui $at, %hi(jtbl_80976CC0) ## $at = 80970000 -/* 0034C 8097129C 002A0821 */ addu $at, $at, $t2 -/* 00350 809712A0 8C2A6CC0 */ lw $t2, %lo(jtbl_80976CC0)($at) -/* 00354 809712A4 01400008 */ jr $t2 -/* 00358 809712A8 00000000 */ nop -glabel L809712AC -/* 0035C 809712AC 240B0032 */ addiu $t3, $zero, 0x0032 ## $t3 = 00000032 -/* 00360 809712B0 A2020178 */ sb $v0, 0x0178($s0) ## 00000178 -/* 00364 809712B4 A2020179 */ sb $v0, 0x0179($s0) ## 00000179 -/* 00368 809712B8 A202017A */ sb $v0, 0x017A($s0) ## 0000017A -/* 0036C 809712BC A20B017C */ sb $t3, 0x017C($s0) ## 0000017C -/* 00370 809712C0 A202017B */ sb $v0, 0x017B($s0) ## 0000017B -/* 00374 809712C4 10000031 */ beq $zero, $zero, .L8097138C -/* 00378 809712C8 A200017D */ sb $zero, 0x017D($s0) ## 0000017D -glabel L809712CC -/* 0037C 809712CC 240C0096 */ addiu $t4, $zero, 0x0096 ## $t4 = 00000096 -/* 00380 809712D0 A2020178 */ sb $v0, 0x0178($s0) ## 00000178 -/* 00384 809712D4 A2020179 */ sb $v0, 0x0179($s0) ## 00000179 -/* 00388 809712D8 A202017A */ sb $v0, 0x017A($s0) ## 0000017A -/* 0038C 809712DC A20C017C */ sb $t4, 0x017C($s0) ## 0000017C -/* 00390 809712E0 A200017B */ sb $zero, 0x017B($s0) ## 0000017B -/* 00394 809712E4 10000029 */ beq $zero, $zero, .L8097138C -/* 00398 809712E8 A202017D */ sb $v0, 0x017D($s0) ## 0000017D -glabel L809712EC -/* 0039C 809712EC 240D00C8 */ addiu $t5, $zero, 0x00C8 ## $t5 = 000000C8 -/* 003A0 809712F0 A2020178 */ sb $v0, 0x0178($s0) ## 00000178 -/* 003A4 809712F4 A2020179 */ sb $v0, 0x0179($s0) ## 00000179 -/* 003A8 809712F8 A202017A */ sb $v0, 0x017A($s0) ## 0000017A -/* 003AC 809712FC A20D017C */ sb $t5, 0x017C($s0) ## 0000017C -/* 003B0 80971300 A200017B */ sb $zero, 0x017B($s0) ## 0000017B -/* 003B4 80971304 10000021 */ beq $zero, $zero, .L8097138C -/* 003B8 80971308 A200017D */ sb $zero, 0x017D($s0) ## 0000017D -glabel L8097130C -/* 003BC 8097130C 240E0096 */ addiu $t6, $zero, 0x0096 ## $t6 = 00000096 -/* 003C0 80971310 A2020178 */ sb $v0, 0x0178($s0) ## 00000178 -/* 003C4 80971314 A2020179 */ sb $v0, 0x0179($s0) ## 00000179 -/* 003C8 80971318 A202017A */ sb $v0, 0x017A($s0) ## 0000017A -/* 003CC 8097131C A20E017C */ sb $t6, 0x017C($s0) ## 0000017C -/* 003D0 80971320 A202017B */ sb $v0, 0x017B($s0) ## 0000017B -/* 003D4 80971324 10000019 */ beq $zero, $zero, .L8097138C -/* 003D8 80971328 A200017D */ sb $zero, 0x017D($s0) ## 0000017D -glabel L8097132C -/* 003DC 8097132C 240F00C8 */ addiu $t7, $zero, 0x00C8 ## $t7 = 000000C8 -/* 003E0 80971330 A2020178 */ sb $v0, 0x0178($s0) ## 00000178 -/* 003E4 80971334 A2020179 */ sb $v0, 0x0179($s0) ## 00000179 -/* 003E8 80971338 A202017A */ sb $v0, 0x017A($s0) ## 0000017A -/* 003EC 8097133C A20F017B */ sb $t7, 0x017B($s0) ## 0000017B -/* 003F0 80971340 A202017C */ sb $v0, 0x017C($s0) ## 0000017C -/* 003F4 80971344 10000011 */ beq $zero, $zero, .L8097138C -/* 003F8 80971348 A200017D */ sb $zero, 0x017D($s0) ## 0000017D -glabel L8097134C -/* 003FC 8097134C 241800C8 */ addiu $t8, $zero, 0x00C8 ## $t8 = 000000C8 -/* 00400 80971350 24190032 */ addiu $t9, $zero, 0x0032 ## $t9 = 00000032 -/* 00404 80971354 A2020178 */ sb $v0, 0x0178($s0) ## 00000178 -/* 00408 80971358 A2020179 */ sb $v0, 0x0179($s0) ## 00000179 -/* 0040C 8097135C A202017A */ sb $v0, 0x017A($s0) ## 0000017A -/* 00410 80971360 A219017C */ sb $t9, 0x017C($s0) ## 0000017C -/* 00414 80971364 A218017B */ sb $t8, 0x017B($s0) ## 0000017B -/* 00418 80971368 10000008 */ beq $zero, $zero, .L8097138C -/* 0041C 8097136C A202017D */ sb $v0, 0x017D($s0) ## 0000017D -glabel L80971370 -/* 00420 80971370 240800C8 */ addiu $t0, $zero, 0x00C8 ## $t0 = 000000C8 -/* 00424 80971374 A2020178 */ sb $v0, 0x0178($s0) ## 00000178 -/* 00428 80971378 A2020179 */ sb $v0, 0x0179($s0) ## 00000179 -/* 0042C 8097137C A202017A */ sb $v0, 0x017A($s0) ## 0000017A -/* 00430 80971380 A208017C */ sb $t0, 0x017C($s0) ## 0000017C -/* 00434 80971384 A200017B */ sb $zero, 0x017B($s0) ## 0000017B -/* 00438 80971388 A200017D */ sb $zero, 0x017D($s0) ## 0000017D -.L8097138C: -/* 0043C 8097138C 24090007 */ addiu $t1, $zero, 0x0007 ## $t1 = 00000007 -/* 00440 80971390 A609018C */ sh $t1, 0x018C($s0) ## 0000018C -/* 00444 80971394 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00448 80971398 0C00B58B */ jal Actor_SetScale - -/* 0044C 8097139C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 00450 809713A0 1000014D */ beq $zero, $zero, .L809718D8 -/* 00454 809713A4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -glabel L809713A8 -/* 00458 809713A8 3C0A8097 */ lui $t2, %hi(func_8097587C) ## $t2 = 80970000 -/* 0045C 809713AC 3C0B8097 */ lui $t3, %hi(func_80972E3C) ## $t3 = 80970000 -/* 00460 809713B0 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF -/* 00464 809713B4 254A587C */ addiu $t2, $t2, %lo(func_8097587C) ## $t2 = 8097587C -/* 00468 809713B8 256B2E3C */ addiu $t3, $t3, %lo(func_80972E3C) ## $t3 = 80972E3C -/* 0046C 809713BC A2020184 */ sb $v0, 0x0184($s0) ## 00000184 -/* 00470 809713C0 AE0A0198 */ sw $t2, 0x0198($s0) ## 00000198 -/* 00474 809713C4 10000143 */ beq $zero, $zero, .L809718D4 -/* 00478 809713C8 AE0B0194 */ sw $t3, 0x0194($s0) ## 00000194 -glabel L809713CC -/* 0047C 809713CC 3C053DCC */ lui $a1, 0x3DCC ## $a1 = 3DCC0000 -/* 00480 809713D0 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3DCCCCCD -/* 00484 809713D4 0C00B58B */ jal Actor_SetScale - -/* 00488 809713D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0048C 809713DC 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF -/* 00490 809713E0 3C0C8097 */ lui $t4, %hi(func_80975074) ## $t4 = 80970000 -/* 00494 809713E4 3C0D8097 */ lui $t5, %hi(func_80972EA8) ## $t5 = 80970000 -/* 00498 809713E8 240300AA */ addiu $v1, $zero, 0x00AA ## $v1 = 000000AA -/* 0049C 809713EC 258C5074 */ addiu $t4, $t4, %lo(func_80975074) ## $t4 = 80975074 -/* 004A0 809713F0 25AD2EA8 */ addiu $t5, $t5, %lo(func_80972EA8) ## $t5 = 80972EA8 -/* 004A4 809713F4 AE0C0198 */ sw $t4, 0x0198($s0) ## 00000198 -/* 004A8 809713F8 A2030179 */ sb $v1, 0x0179($s0) ## 00000179 -/* 004AC 809713FC A2020178 */ sb $v0, 0x0178($s0) ## 00000178 -/* 004B0 80971400 A202017A */ sb $v0, 0x017A($s0) ## 0000017A -/* 004B4 80971404 A202017B */ sb $v0, 0x017B($s0) ## 0000017B -/* 004B8 80971408 A202017D */ sb $v0, 0x017D($s0) ## 0000017D -/* 004BC 8097140C A200017C */ sb $zero, 0x017C($s0) ## 0000017C -/* 004C0 80971410 A2000184 */ sb $zero, 0x0184($s0) ## 00000184 -/* 004C4 80971414 A2000186 */ sb $zero, 0x0186($s0) ## 00000186 -/* 004C8 80971418 AE0D0194 */ sw $t5, 0x0194($s0) ## 00000194 -/* 004CC 8097141C 1000012D */ beq $zero, $zero, .L809718D4 -/* 004D0 80971420 A600018C */ sh $zero, 0x018C($s0) ## 0000018C -glabel L80971424 -/* 004D4 80971424 3C0E8016 */ lui $t6, %hi(gSaveContext) -/* 004D8 80971428 8DCEE660 */ lw $t6, %lo(gSaveContext)($t6) -/* 004DC 8097142C 2401013D */ addiu $at, $zero, 0x013D ## $at = 0000013D -/* 004E0 80971430 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 004E4 80971434 15C10006 */ bne $t6, $at, .L80971450 -/* 004E8 80971438 3C053DCC */ lui $a1, 0x3DCC ## $a1 = 3DCC0000 -/* 004EC 8097143C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 004F0 80971440 0C00B58B */ jal Actor_SetScale - -/* 004F4 80971444 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 004F8 80971448 10000004 */ beq $zero, $zero, .L8097145C -/* 004FC 8097144C 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF -.L80971450: -/* 00500 80971450 0C00B58B */ jal Actor_SetScale - -/* 00504 80971454 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 0000CCCD -/* 00508 80971458 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF -.L8097145C: -/* 0050C 8097145C 3C0F8097 */ lui $t7, %hi(func_80975074) ## $t7 = 80970000 -/* 00510 80971460 3C098097 */ lui $t1, %hi(func_8097303C) ## $t1 = 80970000 -/* 00514 80971464 240300AA */ addiu $v1, $zero, 0x00AA ## $v1 = 000000AA -/* 00518 80971468 25EF5074 */ addiu $t7, $t7, %lo(func_80975074) ## $t7 = 80975074 -/* 0051C 8097146C 24180028 */ addiu $t8, $zero, 0x0028 ## $t8 = 00000028 -/* 00520 80971470 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 00524 80971474 24080004 */ addiu $t0, $zero, 0x0004 ## $t0 = 00000004 -/* 00528 80971478 2529303C */ addiu $t1, $t1, %lo(func_8097303C) ## $t1 = 8097303C -/* 0052C 8097147C 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 00530 80971480 AE0F0198 */ sw $t7, 0x0198($s0) ## 00000198 -/* 00534 80971484 A2030178 */ sb $v1, 0x0178($s0) ## 00000178 -/* 00538 80971488 A2020179 */ sb $v0, 0x0179($s0) ## 00000179 -/* 0053C 8097148C A202017A */ sb $v0, 0x017A($s0) ## 0000017A -/* 00540 80971490 A218017C */ sb $t8, 0x017C($s0) ## 0000017C -/* 00544 80971494 A202017D */ sb $v0, 0x017D($s0) ## 0000017D -/* 00548 80971498 A200017B */ sb $zero, 0x017B($s0) ## 0000017B -/* 0054C 8097149C A2190184 */ sb $t9, 0x0184($s0) ## 00000184 -/* 00550 809714A0 A2080185 */ sb $t0, 0x0185($s0) ## 00000185 -/* 00554 809714A4 A2000186 */ sb $zero, 0x0186($s0) ## 00000186 -/* 00558 809714A8 A6000188 */ sh $zero, 0x0188($s0) ## 00000188 -/* 0055C 809714AC AE090194 */ sw $t1, 0x0194($s0) ## 00000194 -/* 00560 809714B0 10000108 */ beq $zero, $zero, .L809718D4 -/* 00564 809714B4 A60A018C */ sh $t2, 0x018C($s0) ## 0000018C -glabel L809714B8 -/* 00568 809714B8 3C0B8016 */ lui $t3, %hi(gSaveContext) -/* 0056C 809714BC 8D6BE660 */ lw $t3, %lo(gSaveContext)($t3) -/* 00570 809714C0 240100EE */ addiu $at, $zero, 0x00EE ## $at = 000000EE -/* 00574 809714C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00578 809714C8 15610007 */ bne $t3, $at, .L809714E8 -/* 0057C 809714CC 3C053DCC */ lui $a1, 0x3DCC ## $a1 = 3DCC0000 -/* 00580 809714D0 3C054019 */ lui $a1, 0x4019 ## $a1 = 40190000 -/* 00584 809714D4 34A5999A */ ori $a1, $a1, 0x999A ## $a1 = 4019999A -/* 00588 809714D8 0C00B58B */ jal Actor_SetScale - -/* 0058C 809714DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00590 809714E0 10000003 */ beq $zero, $zero, .L809714F0 -/* 00594 809714E4 00000000 */ nop -.L809714E8: -/* 00598 809714E8 0C00B58B */ jal Actor_SetScale - -/* 0059C 809714EC 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 0000CCCD -.L809714F0: -/* 005A0 809714F0 3C0C8097 */ lui $t4, %hi(func_80975074) ## $t4 = 80970000 -/* 005A4 809714F4 3C0F8097 */ lui $t7, %hi(func_8097322C) ## $t7 = 80970000 -/* 005A8 809714F8 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF -/* 005AC 809714FC 240300AA */ addiu $v1, $zero, 0x00AA ## $v1 = 000000AA -/* 005B0 80971500 258C5074 */ addiu $t4, $t4, %lo(func_80975074) ## $t4 = 80975074 -/* 005B4 80971504 240D00C8 */ addiu $t5, $zero, 0x00C8 ## $t5 = 000000C8 -/* 005B8 80971508 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 005BC 8097150C 25EF322C */ addiu $t7, $t7, %lo(func_8097322C) ## $t7 = 8097322C -/* 005C0 80971510 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 005C4 80971514 AE0C0198 */ sw $t4, 0x0198($s0) ## 00000198 -/* 005C8 80971518 A2030178 */ sb $v1, 0x0178($s0) ## 00000178 -/* 005CC 8097151C A203017A */ sb $v1, 0x017A($s0) ## 0000017A -/* 005D0 80971520 A2020179 */ sb $v0, 0x0179($s0) ## 00000179 -/* 005D4 80971524 A20D017C */ sb $t5, 0x017C($s0) ## 0000017C -/* 005D8 80971528 A200017B */ sb $zero, 0x017B($s0) ## 0000017B -/* 005DC 8097152C A200017D */ sb $zero, 0x017D($s0) ## 0000017D -/* 005E0 80971530 A20E0184 */ sb $t6, 0x0184($s0) ## 00000184 -/* 005E4 80971534 A2000186 */ sb $zero, 0x0186($s0) ## 00000186 -/* 005E8 80971538 AE0F0194 */ sw $t7, 0x0194($s0) ## 00000194 -/* 005EC 8097153C 100000E5 */ beq $zero, $zero, .L809718D4 -/* 005F0 80971540 A618018C */ sh $t8, 0x018C($s0) ## 0000018C -glabel L80971544 -/* 005F4 80971544 3C198097 */ lui $t9, %hi(func_80975A3C) ## $t9 = 80970000 -/* 005F8 80971548 3C088097 */ lui $t0, %hi(func_8097273C) ## $t0 = 80970000 -/* 005FC 8097154C 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF -/* 00600 80971550 27395A3C */ addiu $t9, $t9, %lo(func_80975A3C) ## $t9 = 80975A3C -/* 00604 80971554 2508273C */ addiu $t0, $t0, %lo(func_8097273C) ## $t0 = 8097273C -/* 00608 80971558 24090014 */ addiu $t1, $zero, 0x0014 ## $t1 = 00000014 -/* 0060C 8097155C 240A0004 */ addiu $t2, $zero, 0x0004 ## $t2 = 00000004 -/* 00610 80971560 AE190198 */ sw $t9, 0x0198($s0) ## 00000198 -/* 00614 80971564 AE080194 */ sw $t0, 0x0194($s0) ## 00000194 -/* 00618 80971568 A6090188 */ sh $t1, 0x0188($s0) ## 00000188 -/* 0061C 8097156C A20A0184 */ sb $t2, 0x0184($s0) ## 00000184 -/* 00620 80971570 100000D8 */ beq $zero, $zero, .L809718D4 -/* 00624 80971574 A2020185 */ sb $v0, 0x0185($s0) ## 00000185 -glabel L80971578 -/* 00628 80971578 3C0B8097 */ lui $t3, %hi(func_80975A3C) ## $t3 = 80970000 -/* 0062C 8097157C 3C0C8097 */ lui $t4, %hi(func_809727B0) ## $t4 = 80970000 -/* 00630 80971580 256B5A3C */ addiu $t3, $t3, %lo(func_80975A3C) ## $t3 = 80975A3C -/* 00634 80971584 258C27B0 */ addiu $t4, $t4, %lo(func_809727B0) ## $t4 = 809727B0 -/* 00638 80971588 240D0014 */ addiu $t5, $zero, 0x0014 ## $t5 = 00000014 -/* 0063C 8097158C 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 -/* 00640 80971590 240F0004 */ addiu $t7, $zero, 0x0004 ## $t7 = 00000004 -/* 00644 80971594 AE0B0198 */ sw $t3, 0x0198($s0) ## 00000198 -/* 00648 80971598 AE0C0194 */ sw $t4, 0x0194($s0) ## 00000194 -/* 0064C 8097159C A60D0188 */ sh $t5, 0x0188($s0) ## 00000188 -/* 00650 809715A0 A20E0184 */ sb $t6, 0x0184($s0) ## 00000184 -/* 00654 809715A4 A2000185 */ sb $zero, 0x0185($s0) ## 00000185 -/* 00658 809715A8 100000CA */ beq $zero, $zero, .L809718D4 -/* 0065C 809715AC A60F018C */ sh $t7, 0x018C($s0) ## 0000018C -glabel L809715B0 -/* 00660 809715B0 3C188097 */ lui $t8, %hi(func_80975A3C) ## $t8 = 80970000 -/* 00664 809715B4 3C198097 */ lui $t9, %hi(func_809726AC) ## $t9 = 80970000 -/* 00668 809715B8 27185A3C */ addiu $t8, $t8, %lo(func_80975A3C) ## $t8 = 80975A3C -/* 0066C 809715BC 273926AC */ addiu $t9, $t9, %lo(func_809726AC) ## $t9 = 809726AC -/* 00670 809715C0 2408015F */ addiu $t0, $zero, 0x015F ## $t0 = 0000015F -/* 00674 809715C4 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 00678 809715C8 AE180198 */ sw $t8, 0x0198($s0) ## 00000198 -/* 0067C 809715CC AE190194 */ sw $t9, 0x0194($s0) ## 00000194 -/* 00680 809715D0 A6080188 */ sh $t0, 0x0188($s0) ## 00000188 -/* 00684 809715D4 A2090184 */ sb $t1, 0x0184($s0) ## 00000184 -/* 00688 809715D8 100000BE */ beq $zero, $zero, .L809718D4 -/* 0068C 809715DC A2000185 */ sb $zero, 0x0185($s0) ## 00000185 -glabel L809715E0 -/* 00690 809715E0 3C0A8097 */ lui $t2, %hi(func_80975BD4) ## $t2 = 80970000 -/* 00694 809715E4 3C0B8097 */ lui $t3, %hi(func_809723C4) ## $t3 = 80970000 -/* 00698 809715E8 254A5BD4 */ addiu $t2, $t2, %lo(func_80975BD4) ## $t2 = 80975BD4 -/* 0069C 809715EC 256B23C4 */ addiu $t3, $t3, %lo(func_809723C4) ## $t3 = 809723C4 -/* 006A0 809715F0 240C0003 */ addiu $t4, $zero, 0x0003 ## $t4 = 00000003 -/* 006A4 809715F4 3C053CA3 */ lui $a1, 0x3CA3 ## $a1 = 3CA30000 -/* 006A8 809715F8 AE0A0198 */ sw $t2, 0x0198($s0) ## 00000198 -/* 006AC 809715FC AE0B0194 */ sw $t3, 0x0194($s0) ## 00000194 -/* 006B0 80971600 A2000186 */ sb $zero, 0x0186($s0) ## 00000186 -/* 006B4 80971604 A2000185 */ sb $zero, 0x0185($s0) ## 00000185 -/* 006B8 80971608 A2000184 */ sb $zero, 0x0184($s0) ## 00000184 -/* 006BC 8097160C A6000188 */ sh $zero, 0x0188($s0) ## 00000188 -/* 006C0 80971610 A2000178 */ sb $zero, 0x0178($s0) ## 00000178 -/* 006C4 80971614 A60C018C */ sh $t4, 0x018C($s0) ## 0000018C -/* 006C8 80971618 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3CA3D70A -/* 006CC 8097161C 0C00B58B */ jal Actor_SetScale - -/* 006D0 80971620 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 006D4 80971624 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 006D8 80971628 8FA60064 */ lw $a2, 0x0064($sp) -/* 006DC 8097162C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 006E0 80971630 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 006E4 80971634 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 006E8 80971638 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 006EC 8097163C 2407008B */ addiu $a3, $zero, 0x008B ## $a3 = 0000008B -/* 006F0 80971640 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 006F4 80971644 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 006F8 80971648 AFA40040 */ sw $a0, 0x0040($sp) -/* 006FC 8097164C AFA00028 */ sw $zero, 0x0028($sp) -/* 00700 80971650 AFA00024 */ sw $zero, 0x0024($sp) -/* 00704 80971654 AFA00020 */ sw $zero, 0x0020($sp) -/* 00708 80971658 AFA0001C */ sw $zero, 0x001C($sp) -/* 0070C 8097165C 0C00C916 */ jal Actor_SpawnAsChild - -/* 00710 80971660 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00714 80971664 10400005 */ beq $v0, $zero, .L8097167C -/* 00718 80971668 AFA20048 */ sw $v0, 0x0048($sp) -/* 0071C 8097166C 3C053F19 */ lui $a1, 0x3F19 ## $a1 = 3F190000 -/* 00720 80971670 34A5999A */ ori $a1, $a1, 0x999A ## $a1 = 3F19999A -/* 00724 80971674 0C00B58B */ jal Actor_SetScale - -/* 00728 80971678 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -.L8097167C: -/* 0072C 8097167C C60A0024 */ lwc1 $f10, 0x0024($s0) ## 00000024 -/* 00730 80971680 240D0011 */ addiu $t5, $zero, 0x0011 ## $t5 = 00000011 -/* 00734 80971684 8FA60064 */ lw $a2, 0x0064($sp) -/* 00738 80971688 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 0073C 8097168C C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 00740 80971690 8FA40040 */ lw $a0, 0x0040($sp) -/* 00744 80971694 8FA50048 */ lw $a1, 0x0048($sp) -/* 00748 80971698 E7B00014 */ swc1 $f16, 0x0014($sp) -/* 0074C 8097169C C612002C */ lwc1 $f18, 0x002C($s0) ## 0000002C -/* 00750 809716A0 AFAD0028 */ sw $t5, 0x0028($sp) -/* 00754 809716A4 AFA00024 */ sw $zero, 0x0024($sp) -/* 00758 809716A8 AFA00020 */ sw $zero, 0x0020($sp) -/* 0075C 809716AC AFA0001C */ sw $zero, 0x001C($sp) -/* 00760 809716B0 2407008B */ addiu $a3, $zero, 0x008B ## $a3 = 0000008B -/* 00764 809716B4 0C00C916 */ jal Actor_SpawnAsChild - -/* 00768 809716B8 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 0076C 809716BC 10400085 */ beq $v0, $zero, .L809718D4 -/* 00770 809716C0 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 00774 809716C4 3C053ECC */ lui $a1, 0x3ECC ## $a1 = 3ECC0000 -/* 00778 809716C8 0C00B58B */ jal Actor_SetScale - -/* 0077C 809716CC 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3ECCCCCD -/* 00780 809716D0 10000081 */ beq $zero, $zero, .L809718D8 -/* 00784 809716D4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -glabel L809716D8 -/* 00788 809716D8 0C25C41C */ jal func_80971070 -/* 0078C 809716DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00790 809716E0 240E000C */ addiu $t6, $zero, 0x000C ## $t6 = 0000000C -/* 00794 809716E4 1000007B */ beq $zero, $zero, .L809718D4 -/* 00798 809716E8 A20E0186 */ sb $t6, 0x0186($s0) ## 00000186 -glabel L809716EC -/* 0079C 809716EC 0C25C41C */ jal func_80971070 -/* 007A0 809716F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 007A4 809716F4 240F000D */ addiu $t7, $zero, 0x000D ## $t7 = 0000000D -/* 007A8 809716F8 10000076 */ beq $zero, $zero, .L809718D4 -/* 007AC 809716FC A20F0186 */ sb $t7, 0x0186($s0) ## 00000186 -glabel L80971700 -/* 007B0 80971700 0C25C41C */ jal func_80971070 -/* 007B4 80971704 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 007B8 80971708 2418000B */ addiu $t8, $zero, 0x000B ## $t8 = 0000000B -/* 007BC 8097170C 10000071 */ beq $zero, $zero, .L809718D4 -/* 007C0 80971710 A2180186 */ sb $t8, 0x0186($s0) ## 00000186 -glabel L80971714 -/* 007C4 80971714 0C25C41C */ jal func_80971070 -/* 007C8 80971718 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 007CC 8097171C 2419000E */ addiu $t9, $zero, 0x000E ## $t9 = 0000000E -/* 007D0 80971720 1000006C */ beq $zero, $zero, .L809718D4 -/* 007D4 80971724 A2190186 */ sb $t9, 0x0186($s0) ## 00000186 -glabel L80971728 -/* 007D8 80971728 0C25C41C */ jal func_80971070 -/* 007DC 8097172C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 007E0 80971730 2408000F */ addiu $t0, $zero, 0x000F ## $t0 = 0000000F -/* 007E4 80971734 10000067 */ beq $zero, $zero, .L809718D4 -/* 007E8 80971738 A2080186 */ sb $t0, 0x0186($s0) ## 00000186 -glabel L8097173C -/* 007EC 8097173C 0C25C41C */ jal func_80971070 -/* 007F0 80971740 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 007F4 80971744 24090010 */ addiu $t1, $zero, 0x0010 ## $t1 = 00000010 -/* 007F8 80971748 10000062 */ beq $zero, $zero, .L809718D4 -/* 007FC 8097174C A2090186 */ sb $t1, 0x0186($s0) ## 00000186 -glabel L80971750 -/* 00800 80971750 0C25C41C */ jal func_80971070 -/* 00804 80971754 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00808 80971758 240A0061 */ addiu $t2, $zero, 0x0061 ## $t2 = 00000061 -/* 0080C 8097175C 1000005D */ beq $zero, $zero, .L809718D4 -/* 00810 80971760 A20A0186 */ sb $t2, 0x0186($s0) ## 00000186 -glabel L80971764 -/* 00814 80971764 8E0B0004 */ lw $t3, 0x0004($s0) ## 00000004 -/* 00818 80971768 3C010200 */ lui $at, 0x0200 ## $at = 02000000 -/* 0081C 8097176C 01616025 */ or $t4, $t3, $at ## $t4 = 02000000 -/* 00820 80971770 AE0C0004 */ sw $t4, 0x0004($s0) ## 00000004 -glabel L80971774 -/* 00824 80971774 3C0D8097 */ lui $t5, %hi(func_80976404) ## $t5 = 80970000 -/* 00828 80971778 3C0E8097 */ lui $t6, %hi(func_80971DFC) ## $t6 = 80970000 -/* 0082C 8097177C 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF -/* 00830 80971780 25AD6404 */ addiu $t5, $t5, %lo(func_80976404) ## $t5 = 80976404 -/* 00834 80971784 25CE1DFC */ addiu $t6, $t6, %lo(func_80971DFC) ## $t6 = 80971DFC -/* 00838 80971788 240F0064 */ addiu $t7, $zero, 0x0064 ## $t7 = 00000064 -/* 0083C 8097178C AE0D0198 */ sw $t5, 0x0198($s0) ## 00000198 -/* 00840 80971790 AE0E0194 */ sw $t6, 0x0194($s0) ## 00000194 -/* 00844 80971794 A200017B */ sb $zero, 0x017B($s0) ## 0000017B -/* 00848 80971798 A20F017C */ sb $t7, 0x017C($s0) ## 0000017C -/* 0084C 8097179C A202017D */ sb $v0, 0x017D($s0) ## 0000017D -/* 00850 809717A0 0C01B1D4 */ jal SkelCurve_Clear -/* 00854 809717A4 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00858 809717A8 1000004A */ beq $zero, $zero, .L809718D4 -/* 0085C 809717AC A6000188 */ sh $zero, 0x0188($s0) ## 00000188 -glabel L809717B0 -/* 00860 809717B0 3C180600 */ lui $t8, 0x0600 ## $t8 = 06000000 -/* 00864 809717B4 3C190600 */ lui $t9, 0x0600 ## $t9 = 06000000 -/* 00868 809717B8 27181240 */ addiu $t8, $t8, 0x1240 ## $t8 = 06001240 -/* 0086C 809717BC 273910E0 */ addiu $t9, $t9, 0x10E0 ## $t9 = 060010E0 -/* 00870 809717C0 24080013 */ addiu $t0, $zero, 0x0013 ## $t0 = 00000013 -/* 00874 809717C4 AE180170 */ sw $t8, 0x0170($s0) ## 00000170 -/* 00878 809717C8 AE190174 */ sw $t9, 0x0174($s0) ## 00000174 -/* 0087C 809717CC A2080184 */ sb $t0, 0x0184($s0) ## 00000184 -/* 00880 809717D0 A2000185 */ sb $zero, 0x0185($s0) ## 00000185 -/* 00884 809717D4 8FA40064 */ lw $a0, 0x0064($sp) -/* 00888 809717D8 0C25C3ED */ jal func_80970FB4 -/* 0088C 809717DC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00890 809717E0 1000003D */ beq $zero, $zero, .L809718D8 -/* 00894 809717E4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -glabel L809717E8 -/* 00898 809717E8 3C090600 */ lui $t1, 0x0600 ## $t1 = 06000000 -/* 0089C 809717EC 3C0A0600 */ lui $t2, 0x0600 ## $t2 = 06000000 -/* 008A0 809717F0 252920A0 */ addiu $t1, $t1, 0x20A0 ## $t1 = 060020A0 -/* 008A4 809717F4 254A1FB0 */ addiu $t2, $t2, 0x1FB0 ## $t2 = 06001FB0 -/* 008A8 809717F8 240B0014 */ addiu $t3, $zero, 0x0014 ## $t3 = 00000014 -/* 008AC 809717FC AE090170 */ sw $t1, 0x0170($s0) ## 00000170 -/* 008B0 80971800 AE0A0174 */ sw $t2, 0x0174($s0) ## 00000174 -/* 008B4 80971804 A20B0184 */ sb $t3, 0x0184($s0) ## 00000184 -/* 008B8 80971808 A2000185 */ sb $zero, 0x0185($s0) ## 00000185 -/* 008BC 8097180C 8FA40064 */ lw $a0, 0x0064($sp) -/* 008C0 80971810 0C25C3ED */ jal func_80970FB4 -/* 008C4 80971814 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 008C8 80971818 1000002F */ beq $zero, $zero, .L809718D8 -/* 008CC 8097181C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -glabel L80971820 -/* 008D0 80971820 3C0C0600 */ lui $t4, 0x0600 ## $t4 = 06000000 -/* 008D4 80971824 3C0D0600 */ lui $t5, 0x0600 ## $t5 = 06000000 -/* 008D8 80971828 258C3530 */ addiu $t4, $t4, 0x3530 ## $t4 = 06003530 -/* 008DC 8097182C 25AD3370 */ addiu $t5, $t5, 0x3370 ## $t5 = 06003370 -/* 008E0 80971830 240E0015 */ addiu $t6, $zero, 0x0015 ## $t6 = 00000015 -/* 008E4 80971834 AE0C0170 */ sw $t4, 0x0170($s0) ## 00000170 -/* 008E8 80971838 AE0D0174 */ sw $t5, 0x0174($s0) ## 00000174 -/* 008EC 8097183C A20E0184 */ sb $t6, 0x0184($s0) ## 00000184 -/* 008F0 80971840 A2000185 */ sb $zero, 0x0185($s0) ## 00000185 -/* 008F4 80971844 8FA40064 */ lw $a0, 0x0064($sp) -/* 008F8 80971848 0C25C3ED */ jal func_80970FB4 -/* 008FC 8097184C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00900 80971850 8FA40064 */ lw $a0, 0x0064($sp) -/* 00904 80971854 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00908 80971858 24070009 */ addiu $a3, $zero, 0x0009 ## $a3 = 00000009 -/* 0090C 8097185C 0C00CDD2 */ jal Actor_ChangeType - -/* 00910 80971860 24851C24 */ addiu $a1, $a0, 0x1C24 ## $a1 = 00001C24 -/* 00914 80971864 8FAF0064 */ lw $t7, 0x0064($sp) -/* 00918 80971868 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0091C 8097186C 3C198016 */ lui $t9, %hi(gSaveContext+0xf20) -/* 00920 80971870 85F800A4 */ lh $t8, 0x00A4($t7) ## 000000A4 -/* 00924 80971874 57010018 */ bnel $t8, $at, .L809718D8 -/* 00928 80971878 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 0092C 8097187C 9739F580 */ lhu $t9, %lo(gSaveContext+0xf20)($t9) -/* 00930 80971880 33280020 */ andi $t0, $t9, 0x0020 ## $t0 = 00000000 -/* 00934 80971884 51000014 */ beql $t0, $zero, .L809718D8 -/* 00938 80971888 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 0093C 8097188C 0C00B55C */ jal Actor_Kill - -/* 00940 80971890 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00944 80971894 1000001B */ beq $zero, $zero, .L80971904 -/* 00948 80971898 8FBF003C */ lw $ra, 0x003C($sp) -glabel L8097189C -/* 0094C 8097189C 3C098097 */ lui $t1, %hi(func_8097456C) ## $t1 = 80970000 -/* 00950 809718A0 2529456C */ addiu $t1, $t1, %lo(func_8097456C) ## $t1 = 8097456C -/* 00954 809718A4 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 -/* 00958 809718A8 AE000198 */ sw $zero, 0x0198($s0) ## 00000198 -/* 0095C 809718AC AE090194 */ sw $t1, 0x0194($s0) ## 00000194 -/* 00960 809718B0 A2000184 */ sb $zero, 0x0184($s0) ## 00000184 -/* 00964 809718B4 10000007 */ beq $zero, $zero, .L809718D4 -/* 00968 809718B8 A60A018C */ sh $t2, 0x018C($s0) ## 0000018C -.L809718BC: -/* 0096C 809718BC 3C048097 */ lui $a0, %hi(D_809768C4) ## $a0 = 80970000 -/* 00970 809718C0 3C058097 */ lui $a1, %hi(D_809768C8) ## $a1 = 80970000 -/* 00974 809718C4 24A568C8 */ addiu $a1, $a1, %lo(D_809768C8) ## $a1 = 809768C8 -/* 00978 809718C8 248468C4 */ addiu $a0, $a0, %lo(D_809768C4) ## $a0 = 809768C4 -/* 0097C 809718CC 0C0007FC */ jal __assert - -/* 00980 809718D0 24060426 */ addiu $a2, $zero, 0x0426 ## $a2 = 00000426 -.L809718D4: -/* 00984 809718D4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -.L809718D8: -/* 00988 809718D8 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 0098C 809718DC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00990 809718E0 44050000 */ mfc1 $a1, $f0 -/* 00994 809718E4 44070000 */ mfc1 $a3, $f0 -/* 00998 809718E8 0C00AC78 */ jal ActorShape_Init - -/* 0099C 809718EC 00000000 */ nop -/* 009A0 809718F0 3C058097 */ lui $a1, %hi(func_80971960) ## $a1 = 80970000 -/* 009A4 809718F4 24A51960 */ addiu $a1, $a1, %lo(func_80971960) ## $a1 = 80971960 -/* 009A8 809718F8 0C25C3D4 */ jal func_80970F50 -/* 009AC 809718FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 009B0 80971900 8FBF003C */ lw $ra, 0x003C($sp) -.L80971904: -/* 009B4 80971904 8FB00038 */ lw $s0, 0x0038($sp) -/* 009B8 80971908 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 -/* 009BC 8097190C 03E00008 */ jr $ra -/* 009C0 80971910 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/DemoEffect_Update.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/DemoEffect_Update.s deleted file mode 100644 index 9bbcf0f173..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/DemoEffect_Update.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel DemoEffect_Update -/* 03740 80974690 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03744 80974694 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03748 80974698 8C99019C */ lw $t9, 0x019C($a0) ## 0000019C -/* 0374C 8097469C 0320F809 */ jalr $ra, $t9 -/* 03750 809746A0 00000000 */ nop -/* 03754 809746A4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03758 809746A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0375C 809746AC 03E00008 */ jr $ra -/* 03760 809746B0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80970F50.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80970F50.s deleted file mode 100644 index 5bdee26c69..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80970F50.s +++ /dev/null @@ -1,3 +0,0 @@ -glabel func_80970F50 -/* 00000 80970F50 03E00008 */ jr $ra -/* 00004 80970F54 AC85019C */ sw $a1, 0x019C($a0) ## 0000019C diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80970F58.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80970F58.s deleted file mode 100644 index 54c654d5a3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80970F58.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80970F58 -/* 00008 80970F58 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0000C 80970F5C 00057880 */ sll $t7, $a1, 2 -/* 00010 80970F60 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00014 80970F64 AFA5001C */ sw $a1, 0x001C($sp) -/* 00018 80970F68 008FC021 */ addu $t8, $a0, $t7 -/* 0001C 80970F6C 8F021D8C */ lw $v0, 0x1D8C($t8) ## 00001D8C -/* 00020 80970F70 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00024 80970F74 94E61D74 */ lhu $a2, 0x1D74($a3) ## 00001D74 -/* 00028 80970F78 94440004 */ lhu $a0, 0x0004($v0) ## 00000004 -/* 0002C 80970F7C 0C01BE4F */ jal func_8006F93C -/* 00030 80970F80 94450002 */ lhu $a1, 0x0002($v0) ## 00000002 -/* 00034 80970F84 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00038 80970F88 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 0003C 80970F8C 46000086 */ mov.s $f2, $f0 -/* 00040 80970F90 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00044 80970F94 4600603C */ c.lt.s $f12, $f0 -/* 00048 80970F98 00000000 */ nop -/* 0004C 80970F9C 45020003 */ bc1fl .L80970FAC -/* 00050 80970FA0 46001006 */ mov.s $f0, $f2 -/* 00054 80970FA4 46006086 */ mov.s $f2, $f12 -/* 00058 80970FA8 46001006 */ mov.s $f0, $f2 -.L80970FAC: -/* 0005C 80970FAC 03E00008 */ jr $ra -/* 00060 80970FB0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80970FB4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80970FB4.s deleted file mode 100644 index 89cb629c0d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80970FB4.s +++ /dev/null @@ -1,54 +0,0 @@ -glabel func_80970FB4 -/* 00064 80970FB4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00068 80970FB8 3C0E8097 */ lui $t6, %hi(func_809746F8) ## $t6 = 80970000 -/* 0006C 80970FBC AFBF001C */ sw $ra, 0x001C($sp) -/* 00070 80970FC0 AFB00018 */ sw $s0, 0x0018($sp) -/* 00074 80970FC4 25CE46F8 */ addiu $t6, $t6, %lo(func_809746F8) ## $t6 = 809746F8 -/* 00078 80970FC8 ACAE0198 */ sw $t6, 0x0198($a1) ## 00000198 -/* 0007C 80970FCC 3C0F8016 */ lui $t7, %hi(gSaveContext+4) -/* 00080 80970FD0 8DEFE664 */ lw $t7, %lo(gSaveContext+4)($t7) -/* 00084 80970FD4 3C198097 */ lui $t9, %hi(func_80974314) ## $t9 = 80970000 -/* 00088 80970FD8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 0008C 80970FDC 11E00005 */ beq $t7, $zero, .L80970FF4 -/* 00090 80970FE0 27394314 */ addiu $t9, $t9, %lo(func_80974314) ## $t9 = 80974314 -/* 00094 80970FE4 3C188097 */ lui $t8, %hi(func_80974358) ## $t8 = 80970000 -/* 00098 80970FE8 27184358 */ addiu $t8, $t8, %lo(func_80974358) ## $t8 = 80974358 -/* 0009C 80970FEC 10000002 */ beq $zero, $zero, .L80970FF8 -/* 000A0 80970FF0 ACB80194 */ sw $t8, 0x0194($a1) ## 00000194 -.L80970FF4: -/* 000A4 80970FF4 AE190194 */ sw $t9, 0x0194($s0) ## 00000194 -.L80970FF8: -/* 000A8 80970FF8 848800A4 */ lh $t0, 0x00A4($a0) ## 000000A4 -/* 000AC 80970FFC 24010043 */ addiu $at, $zero, 0x0043 ## $at = 00000043 -/* 000B0 80971000 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000B4 80971004 15010007 */ bne $t0, $at, .L80971024 -/* 000B8 80971008 3C053DCC */ lui $a1, 0x3DCC ## $a1 = 3DCC0000 -/* 000BC 8097100C 3C053EB3 */ lui $a1, 0x3EB3 ## $a1 = 3EB30000 -/* 000C0 80971010 34A53333 */ ori $a1, $a1, 0x3333 ## $a1 = 3EB33333 -/* 000C4 80971014 0C00B58B */ jal Actor_SetScale - -/* 000C8 80971018 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000CC 8097101C 10000004 */ beq $zero, $zero, .L80971030 -/* 000D0 80971020 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -.L80971024: -/* 000D4 80971024 0C00B58B */ jal Actor_SetScale - -/* 000D8 80971028 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 0000CCCD -/* 000DC 8097102C 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -.L80971030: -/* 000E0 80971030 240A4000 */ addiu $t2, $zero, 0x4000 ## $t2 = 00004000 -/* 000E4 80971034 A609018C */ sh $t1, 0x018C($s0) ## 0000018C -/* 000E8 80971038 A60A00B4 */ sh $t2, 0x00B4($s0) ## 000000B4 -/* 000EC 8097103C 0C25CD09 */ jal func_80973424 -/* 000F0 80971040 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000F4 80971044 A6000192 */ sh $zero, 0x0192($s0) ## 00000192 -/* 000F8 80971048 86020192 */ lh $v0, 0x0192($s0) ## 00000192 -/* 000FC 8097104C A2000186 */ sb $zero, 0x0186($s0) ## 00000186 -/* 00100 80971050 3C018097 */ lui $at, %hi(D_80976810) ## $at = 80970000 -/* 00104 80971054 A6020190 */ sh $v0, 0x0190($s0) ## 00000190 -/* 00108 80971058 A602018E */ sh $v0, 0x018E($s0) ## 0000018E -/* 0010C 8097105C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00110 80971060 8FB00018 */ lw $s0, 0x0018($sp) -/* 00114 80971064 A4206810 */ sh $zero, %lo(D_80976810)($at) -/* 00118 80971068 03E00008 */ jr $ra -/* 0011C 8097106C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971070.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971070.s deleted file mode 100644 index ab224857f1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971070.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80971070 -/* 00120 80971070 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00124 80971074 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00128 80971078 3C0E8097 */ lui $t6, %hi(func_809761C4) ## $t6 = 80970000 -/* 0012C 8097107C 3C0F8097 */ lui $t7, %hi(func_80971BBC) ## $t7 = 80970000 -/* 00130 80971080 25CE61C4 */ addiu $t6, $t6, %lo(func_809761C4) ## $t6 = 809761C4 -/* 00134 80971084 25EF1BBC */ addiu $t7, $t7, %lo(func_80971BBC) ## $t7 = 80971BBC -/* 00138 80971088 A0800184 */ sb $zero, 0x0184($a0) ## 00000184 -/* 0013C 8097108C A0800185 */ sb $zero, 0x0185($a0) ## 00000185 -/* 00140 80971090 AC8E0198 */ sw $t6, 0x0198($a0) ## 00000198 -/* 00144 80971094 AC8F0194 */ sw $t7, 0x0194($a0) ## 00000194 -/* 00148 80971098 AFA40018 */ sw $a0, 0x0018($sp) -/* 0014C 8097109C 0C00B58B */ jal Actor_SetScale - -/* 00150 809710A0 3C053E80 */ lui $a1, 0x3E80 ## $a1 = 3E800000 -/* 00154 809710A4 8FA40018 */ lw $a0, 0x0018($sp) -/* 00158 809710A8 24180006 */ addiu $t8, $zero, 0x0006 ## $t8 = 00000006 -/* 0015C 809710AC A498018C */ sh $t8, 0x018C($a0) ## 0000018C -/* 00160 809710B0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00164 809710B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00168 809710B8 03E00008 */ jr $ra -/* 0016C 809710BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971960.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971960.s deleted file mode 100644 index a50e97cf35..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971960.s +++ /dev/null @@ -1,34 +0,0 @@ -.rdata -glabel D_809768DC - .asciz "\x1b[36m 転送終了 move_wait \x1b[m" - .balign 4 - -.text -glabel func_80971960 -/* 00A10 80971960 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00A14 80971964 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00A18 80971968 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00A1C 8097196C 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 00A20 80971970 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00A24 80971974 00A12021 */ addu $a0, $a1, $at -/* 00A28 80971978 90C5016C */ lbu $a1, 0x016C($a2) ## 0000016C -/* 00A2C 8097197C 0C026062 */ jal Object_IsLoaded - -/* 00A30 80971980 AFA60018 */ sw $a2, 0x0018($sp) -/* 00A34 80971984 1040000A */ beq $v0, $zero, .L809719B0 -/* 00A38 80971988 8FA60018 */ lw $a2, 0x0018($sp) -/* 00A3C 8097198C 90CE016C */ lbu $t6, 0x016C($a2) ## 0000016C -/* 00A40 80971990 8CCF0198 */ lw $t7, 0x0198($a2) ## 00000198 -/* 00A44 80971994 8CD80194 */ lw $t8, 0x0194($a2) ## 00000194 -/* 00A48 80971998 3C048097 */ lui $a0, %hi(D_809768DC) ## $a0 = 80970000 -/* 00A4C 8097199C 248468DC */ addiu $a0, $a0, %lo(D_809768DC) ## $a0 = 809768DC -/* 00A50 809719A0 A0CE001E */ sb $t6, 0x001E($a2) ## 0000001E -/* 00A54 809719A4 ACCF0134 */ sw $t7, 0x0134($a2) ## 00000134 -/* 00A58 809719A8 0C00084C */ jal osSyncPrintf - -/* 00A5C 809719AC ACD8019C */ sw $t8, 0x019C($a2) ## 0000019C -.L809719B0: -/* 00A60 809719B0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00A64 809719B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00A68 809719B8 03E00008 */ jr $ra -/* 00A6C 809719BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809719C0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809719C0.s deleted file mode 100644 index 588069da35..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809719C0.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_809719C0 -/* 00A70 809719C0 AFA50004 */ sw $a1, 0x0004($sp) -/* 00A74 809719C4 8C820118 */ lw $v0, 0x0118($a0) ## 00000118 -/* 00A78 809719C8 10400007 */ beq $v0, $zero, .L809719E8 -/* 00A7C 809719CC 00000000 */ nop -/* 00A80 809719D0 C4440024 */ lwc1 $f4, 0x0024($v0) ## 00000024 -/* 00A84 809719D4 E4840024 */ swc1 $f4, 0x0024($a0) ## 00000024 -/* 00A88 809719D8 C4460028 */ lwc1 $f6, 0x0028($v0) ## 00000028 -/* 00A8C 809719DC E4860028 */ swc1 $f6, 0x0028($a0) ## 00000028 -/* 00A90 809719E0 C448002C */ lwc1 $f8, 0x002C($v0) ## 0000002C -/* 00A94 809719E4 E488002C */ swc1 $f8, 0x002C($a0) ## 0000002C -.L809719E8: -/* 00A98 809719E8 03E00008 */ jr $ra -/* 00A9C 809719EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809719F0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809719F0.s deleted file mode 100644 index b6ef4683ef..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809719F0.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_809719F0 -/* 00AA0 809719F0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00AA4 809719F4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00AA8 809719F8 0C25C670 */ jal func_809719C0 -/* 00AAC 809719FC AFA40018 */ sw $a0, 0x0018($sp) -/* 00AB0 80971A00 8FA40018 */ lw $a0, 0x0018($sp) -/* 00AB4 80971A04 3C014160 */ lui $at, 0x4160 ## $at = 41600000 -/* 00AB8 80971A08 44813000 */ mtc1 $at, $f6 ## $f6 = 14.00 -/* 00ABC 80971A0C C4840028 */ lwc1 $f4, 0x0028($a0) ## 00000028 -/* 00AC0 80971A10 46062200 */ add.s $f8, $f4, $f6 -/* 00AC4 80971A14 E4880028 */ swc1 $f8, 0x0028($a0) ## 00000028 -/* 00AC8 80971A18 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00ACC 80971A1C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00AD0 80971A20 03E00008 */ jr $ra -/* 00AD4 80971A24 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971A28.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971A28.s deleted file mode 100644 index d7861fd4ee..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971A28.s +++ /dev/null @@ -1,118 +0,0 @@ -.late_rodata -glabel D_80976CDC - .float -0.1 - -.text -glabel func_80971A28 -/* 00AD8 80971A28 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 00ADC 80971A2C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00AE0 80971A30 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00AE4 80971A34 AFA40058 */ sw $a0, 0x0058($sp) -/* 00AE8 80971A38 14C10007 */ bne $a2, $at, .L80971A58 -/* 00AEC 80971A3C AFA5005C */ sw $a1, 0x005C($sp) -/* 00AF0 80971A40 3C0F0001 */ lui $t7, 0x0001 ## $t7 = 00010000 -/* 00AF4 80971A44 01E57821 */ addu $t7, $t7, $a1 -/* 00AF8 80971A48 8DEF1DE4 */ lw $t7, 0x1DE4($t7) ## 00011DE4 -/* 00AFC 80971A4C 31F80001 */ andi $t8, $t7, 0x0001 ## $t8 = 00000000 -/* 00B00 80971A50 57000057 */ bnel $t8, $zero, .L80971BB0 -/* 00B04 80971A54 8FBF0024 */ lw $ra, 0x0024($sp) -.L80971A58: -/* 00B08 80971A58 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00B0C 80971A5C 3C018097 */ lui $at, %hi(D_80976CDC) ## $at = 80970000 -/* 00B10 80971A60 C4246CDC */ lwc1 $f4, %lo(D_80976CDC)($at) -/* 00B14 80971A64 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 00B18 80971A68 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF -/* 00B1C 80971A6C 240900FF */ addiu $t1, $zero, 0x00FF ## $t1 = 000000FF -/* 00B20 80971A70 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF -/* 00B24 80971A74 240B00FF */ addiu $t3, $zero, 0x00FF ## $t3 = 000000FF -/* 00B28 80971A78 240C0064 */ addiu $t4, $zero, 0x0064 ## $t4 = 00000064 -/* 00B2C 80971A7C A3B90030 */ sb $t9, 0x0030($sp) -/* 00B30 80971A80 A3A80031 */ sb $t0, 0x0031($sp) -/* 00B34 80971A84 A3A90032 */ sb $t1, 0x0032($sp) -/* 00B38 80971A88 A3AA002C */ sb $t2, 0x002C($sp) -/* 00B3C 80971A8C A3AB002D */ sb $t3, 0x002D($sp) -/* 00B40 80971A90 A3AC002E */ sb $t4, 0x002E($sp) -/* 00B44 80971A94 A3A00033 */ sb $zero, 0x0033($sp) -/* 00B48 80971A98 E7A00050 */ swc1 $f0, 0x0050($sp) -/* 00B4C 80971A9C E7A00040 */ swc1 $f0, 0x0040($sp) -/* 00B50 80971AA0 E7A00048 */ swc1 $f0, 0x0048($sp) -/* 00B54 80971AA4 10C0000F */ beq $a2, $zero, .L80971AE4 -/* 00B58 80971AA8 E7A40044 */ swc1 $f4, 0x0044($sp) -/* 00B5C 80971AAC 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00B60 80971AB0 00000000 */ nop -/* 00B64 80971AB4 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00B68 80971AB8 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 -/* 00B6C 80971ABC 00000000 */ nop -/* 00B70 80971AC0 46060201 */ sub.s $f8, $f0, $f6 -/* 00B74 80971AC4 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00B78 80971AC8 E7A8004C */ swc1 $f8, 0x004C($sp) -/* 00B7C 80971ACC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00B80 80971AD0 44815000 */ mtc1 $at, $f10 ## $f10 = 0.50 -/* 00B84 80971AD4 00000000 */ nop -/* 00B88 80971AD8 460A0401 */ sub.s $f16, $f0, $f10 -/* 00B8C 80971ADC 10000010 */ beq $zero, $zero, .L80971B20 -/* 00B90 80971AE0 E7B00054 */ swc1 $f16, 0x0054($sp) -.L80971AE4: -/* 00B94 80971AE4 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00B98 80971AE8 00000000 */ nop -/* 00B9C 80971AEC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00BA0 80971AF0 44819000 */ mtc1 $at, $f18 ## $f18 = 0.50 -/* 00BA4 80971AF4 00000000 */ nop -/* 00BA8 80971AF8 46120081 */ sub.s $f2, $f0, $f18 -/* 00BAC 80971AFC 46021100 */ add.s $f4, $f2, $f2 -/* 00BB0 80971B00 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00BB4 80971B04 E7A4004C */ swc1 $f4, 0x004C($sp) -/* 00BB8 80971B08 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00BBC 80971B0C 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 -/* 00BC0 80971B10 00000000 */ nop -/* 00BC4 80971B14 46060081 */ sub.s $f2, $f0, $f6 -/* 00BC8 80971B18 46021200 */ add.s $f8, $f2, $f2 -/* 00BCC 80971B1C E7A80054 */ swc1 $f8, 0x0054($sp) -.L80971B20: -/* 00BD0 80971B20 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00BD4 80971B24 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 -/* 00BD8 80971B28 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 00BDC 80971B2C 00000000 */ nop -/* 00BE0 80971B30 8FAD0058 */ lw $t5, 0x0058($sp) -/* 00BE4 80971B34 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00BE8 80971B38 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 -/* 00BEC 80971B3C C5AA0024 */ lwc1 $f10, 0x0024($t5) ## 00000024 -/* 00BF0 80971B40 460A0400 */ add.s $f16, $f0, $f10 -/* 00BF4 80971B44 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 00BF8 80971B48 E7B00034 */ swc1 $f16, 0x0034($sp) -/* 00BFC 80971B4C 8FAE0058 */ lw $t6, 0x0058($sp) -/* 00C00 80971B50 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00C04 80971B54 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 -/* 00C08 80971B58 C5D20028 */ lwc1 $f18, 0x0028($t6) ## 00000028 -/* 00C0C 80971B5C 46120100 */ add.s $f4, $f0, $f18 -/* 00C10 80971B60 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 00C14 80971B64 E7A40038 */ swc1 $f4, 0x0038($sp) -/* 00C18 80971B68 8FAF0058 */ lw $t7, 0x0058($sp) -/* 00C1C 80971B6C 27B80030 */ addiu $t8, $sp, 0x0030 ## $t8 = FFFFFFD8 -/* 00C20 80971B70 27B9002C */ addiu $t9, $sp, 0x002C ## $t9 = FFFFFFD4 -/* 00C24 80971B74 C5E6002C */ lwc1 $f6, 0x002C($t7) ## 0000002C -/* 00C28 80971B78 240803E8 */ addiu $t0, $zero, 0x03E8 ## $t0 = 000003E8 -/* 00C2C 80971B7C 24090010 */ addiu $t1, $zero, 0x0010 ## $t1 = 00000010 -/* 00C30 80971B80 46060200 */ add.s $f8, $f0, $f6 -/* 00C34 80971B84 AFA9001C */ sw $t1, 0x001C($sp) -/* 00C38 80971B88 AFA80018 */ sw $t0, 0x0018($sp) -/* 00C3C 80971B8C AFB90014 */ sw $t9, 0x0014($sp) -/* 00C40 80971B90 E7A8003C */ swc1 $f8, 0x003C($sp) -/* 00C44 80971B94 AFB80010 */ sw $t8, 0x0010($sp) -/* 00C48 80971B98 8FA4005C */ lw $a0, 0x005C($sp) -/* 00C4C 80971B9C 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFDC -/* 00C50 80971BA0 27A6004C */ addiu $a2, $sp, 0x004C ## $a2 = FFFFFFF4 -/* 00C54 80971BA4 0C00A2EC */ jal EffectSsKiraKira_SpawnDispersed -/* 00C58 80971BA8 27A70040 */ addiu $a3, $sp, 0x0040 ## $a3 = FFFFFFE8 -/* 00C5C 80971BAC 8FBF0024 */ lw $ra, 0x0024($sp) -.L80971BB0: -/* 00C60 80971BB0 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 00C64 80971BB4 03E00008 */ jr $ra -/* 00C68 80971BB8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971BBC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971BBC.s deleted file mode 100644 index 20baf8b9b2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971BBC.s +++ /dev/null @@ -1,172 +0,0 @@ -.late_rodata -glabel D_80976CE0 - .float 0.1 - -.text -glabel func_80971BBC -/* 00C6C 80971BBC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00C70 80971BC0 AFBF001C */ sw $ra, 0x001C($sp) -/* 00C74 80971BC4 AFB00018 */ sw $s0, 0x0018($sp) -/* 00C78 80971BC8 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 00C7C 80971BCC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00C80 80971BD0 51C00086 */ beql $t6, $zero, .L80971DEC -/* 00C84 80971BD4 8FBF001C */ lw $ra, 0x001C($sp) -/* 00C88 80971BD8 8486018C */ lh $a2, 0x018C($a0) ## 0000018C -/* 00C8C 80971BDC 00067880 */ sll $t7, $a2, 2 -/* 00C90 80971BE0 00AFC021 */ addu $t8, $a1, $t7 -/* 00C94 80971BE4 8F191D8C */ lw $t9, 0x1D8C($t8) ## 00001D8C -/* 00C98 80971BE8 53200080 */ beql $t9, $zero, .L80971DEC -/* 00C9C 80971BEC 8FBF001C */ lw $ra, 0x001C($sp) -/* 00CA0 80971BF0 90880184 */ lbu $t0, 0x0184($a0) ## 00000184 -/* 00CA4 80971BF4 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 -/* 00CA8 80971BF8 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD -/* 00CAC 80971BFC 51000006 */ beql $t0, $zero, .L80971C18 -/* 00CB0 80971C00 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00CB4 80971C04 0C25D9C3 */ jal func_8097670C -/* 00CB8 80971C08 AFA50024 */ sw $a1, 0x0024($sp) -/* 00CBC 80971C0C 10000007 */ beq $zero, $zero, .L80971C2C -/* 00CC0 80971C10 920A0186 */ lbu $t2, 0x0186($s0) ## 00000186 -/* 00CC4 80971C14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80971C18: -/* 00CC8 80971C18 0C25D9EC */ jal func_809767B0 -/* 00CCC 80971C1C AFA50024 */ sw $a1, 0x0024($sp) -/* 00CD0 80971C20 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 00CD4 80971C24 A2090184 */ sb $t1, 0x0184($s0) ## 00000184 -/* 00CD8 80971C28 920A0186 */ lbu $t2, 0x0186($s0) ## 00000186 -.L80971C2C: -/* 00CDC 80971C2C 24010061 */ addiu $at, $zero, 0x0061 ## $at = 00000061 -/* 00CE0 80971C30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00CE4 80971C34 11410004 */ beq $t2, $at, .L80971C48 -/* 00CE8 80971C38 3C053E4C */ lui $a1, 0x3E4C ## $a1 = 3E4C0000 -/* 00CEC 80971C3C 240BE0C0 */ addiu $t3, $zero, 0xE0C0 ## $t3 = FFFFE0C0 -/* 00CF0 80971C40 10000004 */ beq $zero, $zero, .L80971C54 -/* 00CF4 80971C44 A60B00B4 */ sh $t3, 0x00B4($s0) ## 000000B4 -.L80971C48: -/* 00CF8 80971C48 860C00B6 */ lh $t4, 0x00B6($s0) ## 000000B6 -/* 00CFC 80971C4C 258D0400 */ addiu $t5, $t4, 0x0400 ## $t5 = 00000400 -/* 00D00 80971C50 A60D00B6 */ sh $t5, 0x00B6($s0) ## 000000B6 -.L80971C54: -/* 00D04 80971C54 0C00B58B */ jal Actor_SetScale - -/* 00D08 80971C58 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3E4CCCCD -/* 00D0C 80971C5C 3C078016 */ lui $a3, %hi(gSaveContext) -/* 00D10 80971C60 24E7E660 */ addiu $a3, %lo(gSaveContext) -/* 00D14 80971C64 8CEE0000 */ lw $t6, 0x0000($a3) ## 8015E660 -/* 00D18 80971C68 24030053 */ addiu $v1, $zero, 0x0053 ## $v1 = 00000053 -/* 00D1C 80971C6C 546E001B */ bnel $v1, $t6, .L80971CDC -/* 00D20 80971C70 8609018C */ lh $t1, 0x018C($s0) ## 0000018C -/* 00D24 80971C74 860F018C */ lh $t7, 0x018C($s0) ## 0000018C -/* 00D28 80971C78 8FA50024 */ lw $a1, 0x0024($sp) -/* 00D2C 80971C7C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00D30 80971C80 000FC080 */ sll $t8, $t7, 2 -/* 00D34 80971C84 00B8C821 */ addu $t9, $a1, $t8 -/* 00D38 80971C88 8F281D8C */ lw $t0, 0x1D8C($t9) ## 00001D8C -/* 00D3C 80971C8C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D40 80971C90 95020000 */ lhu $v0, 0x0000($t0) ## 00000000 -/* 00D44 80971C94 10410005 */ beq $v0, $at, .L80971CAC -/* 00D48 80971C98 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00D4C 80971C9C 10410009 */ beq $v0, $at, .L80971CC4 -/* 00D50 80971CA0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D54 80971CA4 1000000D */ beq $zero, $zero, .L80971CDC -/* 00D58 80971CA8 8609018C */ lh $t1, 0x018C($s0) ## 0000018C -.L80971CAC: -/* 00D5C 80971CAC 0C25C68A */ jal func_80971A28 -/* 00D60 80971CB0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00D64 80971CB4 3C078016 */ lui $a3, %hi(gSaveContext) -/* 00D68 80971CB8 24E7E660 */ addiu $a3, %lo(gSaveContext) -/* 00D6C 80971CBC 10000006 */ beq $zero, $zero, .L80971CD8 -/* 00D70 80971CC0 24030053 */ addiu $v1, $zero, 0x0053 ## $v1 = 00000053 -.L80971CC4: -/* 00D74 80971CC4 0C25C68A */ jal func_80971A28 -/* 00D78 80971CC8 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00D7C 80971CCC 3C078016 */ lui $a3, %hi(gSaveContext) -/* 00D80 80971CD0 24E7E660 */ addiu $a3, %lo(gSaveContext) -/* 00D84 80971CD4 24030053 */ addiu $v1, $zero, 0x0053 ## $v1 = 00000053 -.L80971CD8: -/* 00D88 80971CD8 8609018C */ lh $t1, 0x018C($s0) ## 0000018C -.L80971CDC: -/* 00D8C 80971CDC 8FA50024 */ lw $a1, 0x0024($sp) -/* 00D90 80971CE0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00D94 80971CE4 00095080 */ sll $t2, $t1, 2 -/* 00D98 80971CE8 00AA5821 */ addu $t3, $a1, $t2 -/* 00D9C 80971CEC 8D6C1D8C */ lw $t4, 0x1D8C($t3) ## 00001D8C -/* 00DA0 80971CF0 95820000 */ lhu $v0, 0x0000($t4) ## 00000000 -/* 00DA4 80971CF4 10410007 */ beq $v0, $at, .L80971D14 -/* 00DA8 80971CF8 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00DAC 80971CFC 10410019 */ beq $v0, $at, .L80971D64 -/* 00DB0 80971D00 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00DB4 80971D04 10410036 */ beq $v0, $at, .L80971DE0 -/* 00DB8 80971D08 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00DBC 80971D0C 10000037 */ beq $zero, $zero, .L80971DEC -/* 00DC0 80971D10 8FBF001C */ lw $ra, 0x001C($sp) -.L80971D14: -/* 00DC4 80971D14 8CED0000 */ lw $t5, 0x0000($a3) ## 8015E660 -/* 00DC8 80971D18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00DCC 80971D1C 146D0005 */ bne $v1, $t5, .L80971D34 -/* 00DD0 80971D20 00000000 */ nop -/* 00DD4 80971D24 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00DD8 80971D28 24052097 */ addiu $a1, $zero, 0x2097 ## $a1 = 00002097 -/* 00DDC 80971D2C 10000004 */ beq $zero, $zero, .L80971D40 -/* 00DE0 80971D30 920E0186 */ lbu $t6, 0x0186($s0) ## 00000186 -.L80971D34: -/* 00DE4 80971D34 0C01E233 */ jal func_800788CC -/* 00DE8 80971D38 24042095 */ addiu $a0, $zero, 0x2095 ## $a0 = 00002095 -/* 00DEC 80971D3C 920E0186 */ lbu $t6, 0x0186($s0) ## 00000186 -.L80971D40: -/* 00DF0 80971D40 24010061 */ addiu $at, $zero, 0x0061 ## $at = 00000061 -/* 00DF4 80971D44 24193E80 */ addiu $t9, $zero, 0x3E80 ## $t9 = 00003E80 -/* 00DF8 80971D48 11C10004 */ beq $t6, $at, .L80971D5C -/* 00DFC 80971D4C 00000000 */ nop -/* 00E00 80971D50 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6 -/* 00E04 80971D54 25F83E80 */ addiu $t8, $t7, 0x3E80 ## $t8 = 00003E80 -/* 00E08 80971D58 A61800B6 */ sh $t8, 0x00B6($s0) ## 000000B6 -.L80971D5C: -/* 00E0C 80971D5C 10000022 */ beq $zero, $zero, .L80971DE8 -/* 00E10 80971D60 A6190188 */ sh $t9, 0x0188($s0) ## 00000188 -.L80971D64: -/* 00E14 80971D64 86020188 */ lh $v0, 0x0188($s0) ## 00000188 -/* 00E18 80971D68 3C018097 */ lui $at, %hi(D_80976CE0) ## $at = 80970000 -/* 00E1C 80971D6C C4286CE0 */ lwc1 $f8, %lo(D_80976CE0)($at) -/* 00E20 80971D70 2448FC18 */ addiu $t0, $v0, 0xFC18 ## $t0 = FFFFFC18 -/* 00E24 80971D74 44882000 */ mtc1 $t0, $f4 ## $f4 = NaN -/* 00E28 80971D78 920E0186 */ lbu $t6, 0x0186($s0) ## 00000186 -/* 00E2C 80971D7C 24010061 */ addiu $at, $zero, 0x0061 ## $at = 00000061 -/* 00E30 80971D80 468021A0 */ cvt.s.w $f6, $f4 -/* 00E34 80971D84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E38 80971D88 46083282 */ mul.s $f10, $f6, $f8 -/* 00E3C 80971D8C 4600540D */ trunc.w.s $f16, $f10 -/* 00E40 80971D90 440C8000 */ mfc1 $t4, $f16 -/* 00E44 80971D94 00000000 */ nop -/* 00E48 80971D98 004C6823 */ subu $t5, $v0, $t4 -/* 00E4C 80971D9C 11C10005 */ beq $t6, $at, .L80971DB4 -/* 00E50 80971DA0 A60D0188 */ sh $t5, 0x0188($s0) ## 00000188 -/* 00E54 80971DA4 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6 -/* 00E58 80971DA8 86180188 */ lh $t8, 0x0188($s0) ## 00000188 -/* 00E5C 80971DAC 01F8C821 */ addu $t9, $t7, $t8 -/* 00E60 80971DB0 A61900B6 */ sh $t9, 0x00B6($s0) ## 000000B6 -.L80971DB4: -/* 00E64 80971DB4 8CE80000 */ lw $t0, 0x0000($a3) ## 00000000 -/* 00E68 80971DB8 14680005 */ bne $v1, $t0, .L80971DD0 -/* 00E6C 80971DBC 00000000 */ nop -/* 00E70 80971DC0 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00E74 80971DC4 24052097 */ addiu $a1, $zero, 0x2097 ## $a1 = 00002097 -/* 00E78 80971DC8 10000008 */ beq $zero, $zero, .L80971DEC -/* 00E7C 80971DCC 8FBF001C */ lw $ra, 0x001C($sp) -.L80971DD0: -/* 00E80 80971DD0 0C01E233 */ jal func_800788CC -/* 00E84 80971DD4 24042095 */ addiu $a0, $zero, 0x2095 ## $a0 = 00002095 -/* 00E88 80971DD8 10000004 */ beq $zero, $zero, .L80971DEC -/* 00E8C 80971DDC 8FBF001C */ lw $ra, 0x001C($sp) -.L80971DE0: -/* 00E90 80971DE0 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00E94 80971DE4 24052095 */ addiu $a1, $zero, 0x2095 ## $a1 = 00002095 -.L80971DE8: -/* 00E98 80971DE8 8FBF001C */ lw $ra, 0x001C($sp) -.L80971DEC: -/* 00E9C 80971DEC 8FB00018 */ lw $s0, 0x0018($sp) -/* 00EA0 80971DF0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00EA4 80971DF4 03E00008 */ jr $ra -/* 00EA8 80971DF8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971DFC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971DFC.s deleted file mode 100644 index bbffced096..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971DFC.s +++ /dev/null @@ -1,168 +0,0 @@ -.rdata -glabel D_809768FC - .asciz "0" - .balign 4 - -glabel D_80976900 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976914 - .asciz "\x1b[36m 縮むバージョン \n\x1b[m" - .balign 4 - -glabel D_80976930 - .asciz "\x1b[36m 通常 バージョン \n\x1b[m" - .balign 4 - -.late_rodata -glabel D_80976CE4 - .float 1.7 - -.text -glabel func_80971DFC -/* 00EAC 80971DFC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00EB0 80971E00 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00EB4 80971E04 AFB00020 */ sw $s0, 0x0020($sp) -/* 00EB8 80971E08 AFA40030 */ sw $a0, 0x0030($sp) -/* 00EBC 80971E0C AFA50034 */ sw $a1, 0x0034($sp) -/* 00EC0 80971E10 848F001C */ lh $t7, 0x001C($a0) ## 0000001C -/* 00EC4 80971E14 00807025 */ or $t6, $a0, $zero ## $t6 = 00000000 -/* 00EC8 80971E18 25D0014C */ addiu $s0, $t6, 0x014C ## $s0 = 0000014C -/* 00ECC 80971E1C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00ED0 80971E20 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 00ED4 80971E24 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 00ED8 80971E28 31F800FF */ andi $t8, $t7, 0x00FF ## $t8 = 00000000 -/* 00EDC 80971E2C AFB8002C */ sw $t8, 0x002C($sp) -/* 00EE0 80971E30 24E70050 */ addiu $a3, $a3, 0x0050 ## $a3 = 06000050 -/* 00EE4 80971E34 24C612E8 */ addiu $a2, $a2, 0x12E8 ## $a2 = 060012E8 -/* 00EE8 80971E38 0C01B1DE */ jal SkelCurve_Init -/* 00EEC 80971E3C 02002825 */ or $a1, $s0, $zero ## $a1 = 0000014C -/* 00EF0 80971E40 14400006 */ bne $v0, $zero, .L80971E5C -/* 00EF4 80971E44 3C048097 */ lui $a0, %hi(D_809768FC) ## $a0 = 80970000 -/* 00EF8 80971E48 3C058097 */ lui $a1, %hi(D_80976900) ## $a1 = 80970000 -/* 00EFC 80971E4C 24A56900 */ addiu $a1, $a1, %lo(D_80976900) ## $a1 = 80976900 -/* 00F00 80971E50 248468FC */ addiu $a0, $a0, %lo(D_809768FC) ## $a0 = 809768FC -/* 00F04 80971E54 0C0007FC */ jal __assert - -/* 00F08 80971E58 24060503 */ addiu $a2, $zero, 0x0503 ## $a2 = 00000503 -.L80971E5C: -/* 00F0C 80971E5C 8FA2002C */ lw $v0, 0x002C($sp) -/* 00F10 80971E60 24010018 */ addiu $at, $zero, 0x0018 ## $at = 00000018 -/* 00F14 80971E64 02002025 */ or $a0, $s0, $zero ## $a0 = 0000014C -/* 00F18 80971E68 10410004 */ beq $v0, $at, .L80971E7C -/* 00F1C 80971E6C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00F20 80971E70 24010019 */ addiu $at, $zero, 0x0019 ## $at = 00000019 -/* 00F24 80971E74 14410022 */ bne $v0, $at, .L80971F00 -/* 00F28 80971E78 3C038016 */ lui $v1, %hi(gSaveContext) -.L80971E7C: -/* 00F2C 80971E7C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00F30 80971E80 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 00F34 80971E84 3C01426C */ lui $at, 0x426C ## $at = 426C0000 -/* 00F38 80971E88 44811000 */ mtc1 $at, $f2 ## $f2 = 59.00 -/* 00F3C 80971E8C 3C018097 */ lui $at, %hi(D_80976CE4) ## $at = 80970000 -/* 00F40 80971E90 C4246CE4 */ lwc1 $f4, %lo(D_80976CE4)($at) -/* 00F44 80971E94 44060000 */ mfc1 $a2, $f0 -/* 00F48 80971E98 44071000 */ mfc1 $a3, $f2 -/* 00F4C 80971E9C 24A50050 */ addiu $a1, $a1, 0x0050 ## $a1 = 06000050 -/* 00F50 80971EA0 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00F54 80971EA4 0C01B225 */ jal SkelCurve_SetAnim -/* 00F58 80971EA8 E7A40014 */ swc1 $f4, 0x0014($sp) -/* 00F5C 80971EAC 8FA40034 */ lw $a0, 0x0034($sp) -/* 00F60 80971EB0 0C01B231 */ jal SkelCurve_Update -/* 00F64 80971EB4 02002825 */ or $a1, $s0, $zero ## $a1 = 0000014C -/* 00F68 80971EB8 8FA40030 */ lw $a0, 0x0030($sp) -/* 00F6C 80971EBC 3C198097 */ lui $t9, %hi(func_80972344) ## $t9 = 80970000 -/* 00F70 80971EC0 27392344 */ addiu $t9, $t9, %lo(func_80972344) ## $t9 = 80972344 -/* 00F74 80971EC4 AC99019C */ sw $t9, 0x019C($a0) ## 0000019C -/* 00F78 80971EC8 8FA8002C */ lw $t0, 0x002C($sp) -/* 00F7C 80971ECC 24010018 */ addiu $at, $zero, 0x0018 ## $at = 00000018 -/* 00F80 80971ED0 3C053DAC */ lui $a1, 0x3DAC ## $a1 = 3DAC0000 -/* 00F84 80971ED4 15010006 */ bne $t0, $at, .L80971EF0 -/* 00F88 80971ED8 00000000 */ nop -/* 00F8C 80971EDC 3C053E0F */ lui $a1, 0x3E0F ## $a1 = 3E0F0000 -/* 00F90 80971EE0 0C00B58B */ jal Actor_SetScale - -/* 00F94 80971EE4 34A55C29 */ ori $a1, $a1, 0x5C29 ## $a1 = 3E0F5C29 -/* 00F98 80971EE8 10000043 */ beq $zero, $zero, .L80971FF8 -/* 00F9C 80971EEC 8FBF0024 */ lw $ra, 0x0024($sp) -.L80971EF0: -/* 00FA0 80971EF0 0C00B58B */ jal Actor_SetScale - -/* 00FA4 80971EF4 34A50832 */ ori $a1, $a1, 0x0832 ## $a1 = 00000832 -/* 00FA8 80971EF8 1000003F */ beq $zero, $zero, .L80971FF8 -/* 00FAC 80971EFC 8FBF0024 */ lw $ra, 0x0024($sp) -.L80971F00: -/* 00FB0 80971F00 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 00FB4 80971F04 8C621360 */ lw $v0, 0x1360($v1) ## FFFFF9C0 -/* 00FB8 80971F08 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00FBC 80971F0C 02002025 */ or $a0, $s0, $zero ## $a0 = 0000014C -/* 00FC0 80971F10 1041000B */ beq $v0, $at, .L80971F40 -/* 00FC4 80971F14 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00FC8 80971F18 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00FCC 80971F1C 50410009 */ beql $v0, $at, .L80971F44 -/* 00FD0 80971F20 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00FD4 80971F24 8C690000 */ lw $t1, 0x0000($v1) ## FFFFE660 -/* 00FD8 80971F28 24010324 */ addiu $at, $zero, 0x0324 ## $at = 00000324 -/* 00FDC 80971F2C 5521001C */ bnel $t1, $at, .L80971FA0 -/* 00FE0 80971F30 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00FE4 80971F34 946A0EEC */ lhu $t2, 0x0EEC($v1) ## FFFFF54C -/* 00FE8 80971F38 314B0200 */ andi $t3, $t2, 0x0200 ## $t3 = 00000000 -/* 00FEC 80971F3C 15600017 */ bne $t3, $zero, .L80971F9C -.L80971F40: -/* 00FF0 80971F40 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -.L80971F44: -/* 00FF4 80971F44 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 00FF8 80971F48 3C01426C */ lui $at, 0x426C ## $at = 426C0000 -/* 00FFC 80971F4C 44811000 */ mtc1 $at, $f2 ## $f2 = 59.00 -/* 01000 80971F50 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 01004 80971F54 44060000 */ mfc1 $a2, $f0 -/* 01008 80971F58 44071000 */ mfc1 $a3, $f2 -/* 0100C 80971F5C 24A50050 */ addiu $a1, $a1, 0x0050 ## $a1 = 06000050 -/* 01010 80971F60 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 01014 80971F64 0C01B225 */ jal SkelCurve_SetAnim -/* 01018 80971F68 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 0101C 80971F6C 8FA40034 */ lw $a0, 0x0034($sp) -/* 01020 80971F70 0C01B231 */ jal SkelCurve_Update -/* 01024 80971F74 02002825 */ or $a1, $s0, $zero ## $a1 = 0000014C -/* 01028 80971F78 8FAD0030 */ lw $t5, 0x0030($sp) -/* 0102C 80971F7C 3C0C8097 */ lui $t4, %hi(func_809721D0) ## $t4 = 80970000 -/* 01030 80971F80 258C21D0 */ addiu $t4, $t4, %lo(func_809721D0) ## $t4 = 809721D0 -/* 01034 80971F84 3C048097 */ lui $a0, %hi(D_80976914) ## $a0 = 80970000 -/* 01038 80971F88 24846914 */ addiu $a0, $a0, %lo(D_80976914) ## $a0 = 80976914 -/* 0103C 80971F8C 0C00084C */ jal osSyncPrintf - -/* 01040 80971F90 ADAC019C */ sw $t4, 0x019C($t5) ## 0000019C -/* 01044 80971F94 10000018 */ beq $zero, $zero, .L80971FF8 -/* 01048 80971F98 8FBF0024 */ lw $ra, 0x0024($sp) -.L80971F9C: -/* 0104C 80971F9C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -.L80971FA0: -/* 01050 80971FA0 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 01054 80971FA4 3C01426C */ lui $at, 0x426C ## $at = 426C0000 -/* 01058 80971FA8 44811000 */ mtc1 $at, $f2 ## $f2 = 59.00 -/* 0105C 80971FAC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01060 80971FB0 44060000 */ mfc1 $a2, $f0 -/* 01064 80971FB4 44071000 */ mfc1 $a3, $f2 -/* 01068 80971FB8 24A50050 */ addiu $a1, $a1, 0x0050 ## $a1 = 06000050 -/* 0106C 80971FBC 02002025 */ or $a0, $s0, $zero ## $a0 = 0000014C -/* 01070 80971FC0 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 01074 80971FC4 0C01B225 */ jal SkelCurve_SetAnim -/* 01078 80971FC8 E7A00014 */ swc1 $f0, 0x0014($sp) -/* 0107C 80971FCC 8FA40034 */ lw $a0, 0x0034($sp) -/* 01080 80971FD0 0C01B231 */ jal SkelCurve_Update -/* 01084 80971FD4 02002825 */ or $a1, $s0, $zero ## $a1 = 0000014C -/* 01088 80971FD8 8FB80030 */ lw $t8, 0x0030($sp) -/* 0108C 80971FDC 3C0F8097 */ lui $t7, %hi(func_80972008) ## $t7 = 80970000 -/* 01090 80971FE0 25EF2008 */ addiu $t7, $t7, %lo(func_80972008) ## $t7 = 80972008 -/* 01094 80971FE4 3C048097 */ lui $a0, %hi(D_80976930) ## $a0 = 80970000 -/* 01098 80971FE8 24846930 */ addiu $a0, $a0, %lo(D_80976930) ## $a0 = 80976930 -/* 0109C 80971FEC 0C00084C */ jal osSyncPrintf - -/* 010A0 80971FF0 AF0F019C */ sw $t7, 0x019C($t8) ## 0000019C -/* 010A4 80971FF4 8FBF0024 */ lw $ra, 0x0024($sp) -.L80971FF8: -/* 010A8 80971FF8 8FB00020 */ lw $s0, 0x0020($sp) -/* 010AC 80971FFC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 010B0 80972000 03E00008 */ jr $ra -/* 010B4 80972004 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972008.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972008.s deleted file mode 100644 index b57c05b991..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972008.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_80972008 -/* 010B8 80972008 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 010BC 8097200C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 010C0 80972010 AFBF001C */ sw $ra, 0x001C($sp) -/* 010C4 80972014 AFA5002C */ sw $a1, 0x002C($sp) -/* 010C8 80972018 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 010CC 8097201C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 010D0 80972020 0C01B129 */ jal Flags_GetEnv -/* 010D4 80972024 AFA60028 */ sw $a2, 0x0028($sp) -/* 010D8 80972028 1040001C */ beq $v0, $zero, .L8097209C -/* 010DC 8097202C 8FA60028 */ lw $a2, 0x0028($sp) -/* 010E0 80972030 84CE018A */ lh $t6, 0x018A($a2) ## 0000018A -/* 010E4 80972034 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 -/* 010E8 80972038 31CF0002 */ andi $t7, $t6, 0x0002 ## $t7 = 00000000 -/* 010EC 8097203C 55E00008 */ bnel $t7, $zero, .L80972060 -/* 010F0 80972040 24C5014C */ addiu $a1, $a2, 0x014C ## $a1 = 0000014C -/* 010F4 80972044 0C03CFCF */ jal func_800F3F3C -/* 010F8 80972048 AFA60028 */ sw $a2, 0x0028($sp) -/* 010FC 8097204C 8FA60028 */ lw $a2, 0x0028($sp) -/* 01100 80972050 84D8018A */ lh $t8, 0x018A($a2) ## 0000018A -/* 01104 80972054 37190002 */ ori $t9, $t8, 0x0002 ## $t9 = 00000002 -/* 01108 80972058 A4D9018A */ sh $t9, 0x018A($a2) ## 0000018A -/* 0110C 8097205C 24C5014C */ addiu $a1, $a2, 0x014C ## $a1 = 0000014C -.L80972060: -/* 01110 80972060 AFA50024 */ sw $a1, 0x0024($sp) -/* 01114 80972064 0C01B231 */ jal SkelCurve_Update -/* 01118 80972068 8FA4002C */ lw $a0, 0x002C($sp) -/* 0111C 8097206C 1040000B */ beq $v0, $zero, .L8097209C -/* 01120 80972070 8FA40024 */ lw $a0, 0x0024($sp) -/* 01124 80972074 3C01426C */ lui $at, 0x426C ## $at = 426C0000 -/* 01128 80972078 44812000 */ mtc1 $at, $f4 ## $f4 = 59.00 -/* 0112C 8097207C 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 01130 80972080 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01134 80972084 24A50050 */ addiu $a1, $a1, 0x0050 ## $a1 = 06000050 -/* 01138 80972088 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0113C 8097208C 3C074270 */ lui $a3, 0x4270 ## $a3 = 42700000 -/* 01140 80972090 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 01144 80972094 0C01B225 */ jal SkelCurve_SetAnim -/* 01148 80972098 E7A60014 */ swc1 $f6, 0x0014($sp) -.L8097209C: -/* 0114C 8097209C 8FBF001C */ lw $ra, 0x001C($sp) -/* 01150 809720A0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01154 809720A4 03E00008 */ jr $ra -/* 01158 809720A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809720AC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809720AC.s deleted file mode 100644 index 1e1e92c6fe..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809720AC.s +++ /dev/null @@ -1,80 +0,0 @@ -glabel func_809720AC -/* 0115C 809720AC 3C030600 */ lui $v1, 0x0600 ## $v1 = 06000000 -/* 01160 809720B0 24630060 */ addiu $v1, $v1, 0x0060 ## $v1 = 06000060 -/* 01164 809720B4 00037100 */ sll $t6, $v1, 4 -/* 01168 809720B8 000E7F02 */ srl $t7, $t6, 28 -/* 0116C 809720BC 000FC080 */ sll $t8, $t7, 2 -/* 01170 809720C0 3C198016 */ lui $t9, %hi(gSegments) -/* 01174 809720C4 0338C821 */ addu $t9, $t9, $t8 -/* 01178 809720C8 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 0117C 809720CC 8F396FA8 */ lw $t9, %lo(gSegments)($t9) -/* 01180 809720D0 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 01184 809720D4 00614024 */ and $t0, $v1, $at -/* 01188 809720D8 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0118C 809720DC 03281021 */ addu $v0, $t9, $t0 -/* 01190 809720E0 00411021 */ addu $v0, $v0, $at -/* 01194 809720E4 3C01434A */ lui $at, 0x434A ## $at = 434A0000 -/* 01198 809720E8 44812000 */ mtc1 $at, $f4 ## $f4 = 202.00 -/* 0119C 809720EC 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 011A0 809720F0 44815000 */ mtc1 $at, $f10 ## $f10 = 255.00 -/* 011A4 809720F4 460C2182 */ mul.s $f6, $f4, $f12 -/* 011A8 809720F8 3C0D8097 */ lui $t5, %hi(D_80976848) ## $t5 = 80970000 -/* 011AC 809720FC 91AD6848 */ lbu $t5, %lo(D_80976848)($t5) -/* 011B0 80972100 460C5402 */ mul.s $f16, $f10, $f12 -/* 011B4 80972104 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 011B8 80972108 27A6000C */ addiu $a2, $sp, 0x000C ## $a2 = FFFFFFF4 -/* 011BC 8097210C 3C048097 */ lui $a0, %hi(D_80976849) ## $a0 = 80970000 -/* 011C0 80972110 A3A0000C */ sb $zero, 0x000C($sp) -/* 011C4 80972114 24846849 */ addiu $a0, $a0, %lo(D_80976849) ## $a0 = 80976849 -/* 011C8 80972118 4600320D */ trunc.w.s $f8, $f6 -/* 011CC 8097211C 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 011D0 80972120 24070015 */ addiu $a3, $zero, 0x0015 ## $a3 = 00000015 -/* 011D4 80972124 4600848D */ trunc.w.s $f18, $f16 -/* 011D8 80972128 440A4000 */ mfc1 $t2, $f8 -/* 011DC 8097212C 00CD7021 */ addu $t6, $a2, $t5 -/* 011E0 80972130 440C9000 */ mfc1 $t4, $f18 -/* 011E4 80972134 A3AA000D */ sb $t2, 0x000D($sp) -/* 011E8 80972138 11A00003 */ beq $t5, $zero, .L80972148 -/* 011EC 8097213C A3AC000E */ sb $t4, 0x000E($sp) -/* 011F0 80972140 91CF0000 */ lbu $t7, 0x0000($t6) ## 00000000 -/* 011F4 80972144 A04F000F */ sb $t7, 0x000F($v0) ## 0000000F -.L80972148: -/* 011F8 80972148 27A6000C */ addiu $a2, $sp, 0x000C ## $a2 = FFFFFFF4 -.L8097214C: -/* 011FC 8097214C 90850000 */ lbu $a1, 0x0000($a0) ## 80976849 -/* 01200 80972150 10A00005 */ beq $a1, $zero, .L80972168 -/* 01204 80972154 00C5C021 */ addu $t8, $a2, $a1 -/* 01208 80972158 93190000 */ lbu $t9, 0x0000($t8) ## 00000000 -/* 0120C 8097215C 00034100 */ sll $t0, $v1, 4 -/* 01210 80972160 00484821 */ addu $t1, $v0, $t0 -/* 01214 80972164 A139000F */ sb $t9, 0x000F($t1) ## 0000000F -.L80972168: -/* 01218 80972168 90850001 */ lbu $a1, 0x0001($a0) ## 8097684A -/* 0121C 8097216C 10A00005 */ beq $a1, $zero, .L80972184 -/* 01220 80972170 00C55021 */ addu $t2, $a2, $a1 -/* 01224 80972174 914B0000 */ lbu $t3, 0x0000($t2) ## 00000000 -/* 01228 80972178 00036100 */ sll $t4, $v1, 4 -/* 0122C 8097217C 004C6821 */ addu $t5, $v0, $t4 -/* 01230 80972180 A1AB001F */ sb $t3, 0x001F($t5) ## 8097001F -.L80972184: -/* 01234 80972184 90850002 */ lbu $a1, 0x0002($a0) ## 8097684B -/* 01238 80972188 10A00005 */ beq $a1, $zero, .L809721A0 -/* 0123C 8097218C 00C57021 */ addu $t6, $a2, $a1 -/* 01240 80972190 91CF0000 */ lbu $t7, 0x0000($t6) ## 00000000 -/* 01244 80972194 0003C100 */ sll $t8, $v1, 4 -/* 01248 80972198 00584021 */ addu $t0, $v0, $t8 -/* 0124C 8097219C A10F002F */ sb $t7, 0x002F($t0) ## 0000002F -.L809721A0: -/* 01250 809721A0 90850003 */ lbu $a1, 0x0003($a0) ## 8097684C -/* 01254 809721A4 10A00005 */ beq $a1, $zero, .L809721BC -/* 01258 809721A8 00C5C821 */ addu $t9, $a2, $a1 -/* 0125C 809721AC 93290000 */ lbu $t1, 0x0000($t9) ## 80160000 -/* 01260 809721B0 00035100 */ sll $t2, $v1, 4 -/* 01264 809721B4 004A6021 */ addu $t4, $v0, $t2 -/* 01268 809721B8 A189003F */ sb $t1, 0x003F($t4) ## 0000003F -.L809721BC: -/* 0126C 809721BC 24630004 */ addiu $v1, $v1, 0x0004 ## $v1 = 00000005 -/* 01270 809721C0 1467FFE2 */ bne $v1, $a3, .L8097214C -/* 01274 809721C4 24840004 */ addiu $a0, $a0, 0x0004 ## $a0 = 8097684D -/* 01278 809721C8 03E00008 */ jr $ra -/* 0127C 809721CC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809721D0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809721D0.s deleted file mode 100644 index ff287412c6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809721D0.s +++ /dev/null @@ -1,57 +0,0 @@ -.late_rodata -glabel D_80976CE8 - .float 0.0013333333 - -.text -glabel func_809721D0 -/* 01280 809721D0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01284 809721D4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01288 809721D8 AFA5001C */ sw $a1, 0x001C($sp) -/* 0128C 809721DC 848E0188 */ lh $t6, 0x0188($a0) ## 00000188 -/* 01290 809721E0 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 01294 809721E4 A48F0188 */ sh $t7, 0x0188($a0) ## 00000188 -/* 01298 809721E8 84820188 */ lh $v0, 0x0188($a0) ## 00000188 -/* 0129C 809721EC 284100FB */ slti $at, $v0, 0x00FB -/* 012A0 809721F0 5420000F */ bnel $at, $zero, .L80972230 -/* 012A4 809721F4 28410065 */ slti $at, $v0, 0x0065 -/* 012A8 809721F8 3C028016 */ lui $v0, %hi(gSaveContext) -/* 012AC 809721FC 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 012B0 80972200 8C580000 */ lw $t8, 0x0000($v0) ## 8015E660 -/* 012B4 80972204 24010324 */ addiu $at, $zero, 0x0324 ## $at = 00000324 -/* 012B8 80972208 17010004 */ bne $t8, $at, .L8097221C -/* 012BC 8097220C 00000000 */ nop -/* 012C0 80972210 94590EEC */ lhu $t9, 0x0EEC($v0) ## 8015F54C -/* 012C4 80972214 37280200 */ ori $t0, $t9, 0x0200 ## $t0 = 00000200 -/* 012C8 80972218 A4480EEC */ sh $t0, 0x0EEC($v0) ## 8015F54C -.L8097221C: -/* 012CC 8097221C 0C00B55C */ jal Actor_Kill - -/* 012D0 80972220 00000000 */ nop -/* 012D4 80972224 10000015 */ beq $zero, $zero, .L8097227C -/* 012D8 80972228 8FBF0014 */ lw $ra, 0x0014($sp) -/* 012DC 8097222C 28410065 */ slti $at, $v0, 0x0065 -.L80972230: -/* 012E0 80972230 1420000F */ bne $at, $zero, .L80972270 -/* 012E4 80972234 240900FA */ addiu $t1, $zero, 0x00FA ## $t1 = 000000FA -/* 012E8 80972238 01225023 */ subu $t2, $t1, $v0 -/* 012EC 8097223C 448A2000 */ mtc1 $t2, $f4 ## $f4 = 0.00 -/* 012F0 80972240 3C018097 */ lui $at, %hi(D_80976CE8) ## $at = 80970000 -/* 012F4 80972244 C4286CE8 */ lwc1 $f8, %lo(D_80976CE8)($at) -/* 012F8 80972248 468021A0 */ cvt.s.w $f6, $f4 -/* 012FC 8097224C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 01300 80972250 44815000 */ mtc1 $at, $f10 ## $f10 = 5.00 -/* 01304 80972254 46083002 */ mul.s $f0, $f6, $f8 -/* 01308 80972258 E4800050 */ swc1 $f0, 0x0050($a0) ## 00000050 -/* 0130C 8097225C E4800058 */ swc1 $f0, 0x0058($a0) ## 00000058 -/* 01310 80972260 460A0302 */ mul.s $f12, $f0, $f10 -/* 01314 80972264 0C25C82B */ jal func_809720AC -/* 01318 80972268 AFA40018 */ sw $a0, 0x0018($sp) -/* 0131C 8097226C 8FA40018 */ lw $a0, 0x0018($sp) -.L80972270: -/* 01320 80972270 0C00BE52 */ jal func_8002F948 -/* 01324 80972274 2405209D */ addiu $a1, $zero, 0x209D ## $a1 = 0000209D -/* 01328 80972278 8FBF0014 */ lw $ra, 0x0014($sp) -.L8097227C: -/* 0132C 8097227C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01330 80972280 03E00008 */ jr $ra -/* 01334 80972284 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972288.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972288.s deleted file mode 100644 index 5963b361aa..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972288.s +++ /dev/null @@ -1,63 +0,0 @@ -.late_rodata -glabel D_80976CEC - .float 0.01 - -glabel D_80976CF0 - .float 0.14 - -glabel D_80976CF4 - .float 0.6 - -.text -glabel func_80972288 -/* 01338 80972288 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0133C 8097228C AFBF0014 */ sw $ra, 0x0014($sp) -/* 01340 80972290 AFA5001C */ sw $a1, 0x001C($sp) -/* 01344 80972294 848E0188 */ lh $t6, 0x0188($a0) ## 00000188 -/* 01348 80972298 24180064 */ addiu $t8, $zero, 0x0064 ## $t8 = 00000064 -/* 0134C 8097229C 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 01350 809722A0 A48F0188 */ sh $t7, 0x0188($a0) ## 00000188 -/* 01354 809722A4 84820188 */ lh $v0, 0x0188($a0) ## 00000188 -/* 01358 809722A8 28410065 */ slti $at, $v0, 0x0065 -/* 0135C 809722AC 1020001B */ beq $at, $zero, .L8097231C -/* 01360 809722B0 0302C823 */ subu $t9, $t8, $v0 -/* 01364 809722B4 44992000 */ mtc1 $t9, $f4 ## $f4 = 0.00 -/* 01368 809722B8 3C018097 */ lui $at, %hi(D_80976CEC) ## $at = 80970000 -/* 0136C 809722BC C4286CEC */ lwc1 $f8, %lo(D_80976CEC)($at) -/* 01370 809722C0 468021A0 */ cvt.s.w $f6, $f4 -/* 01374 809722C4 3C018097 */ lui $at, %hi(D_80976CF0) ## $at = 80970000 -/* 01378 809722C8 C42A6CF0 */ lwc1 $f10, %lo(D_80976CF0)($at) -/* 0137C 809722CC 8488001C */ lh $t0, 0x001C($a0) ## 0000001C -/* 01380 809722D0 24010019 */ addiu $at, $zero, 0x0019 ## $at = 00000019 -/* 01384 809722D4 46083302 */ mul.s $f12, $f6, $f8 -/* 01388 809722D8 310900FF */ andi $t1, $t0, 0x00FF ## $t1 = 00000000 -/* 0138C 809722DC 460A6082 */ mul.s $f2, $f12, $f10 -/* 01390 809722E0 15210005 */ bne $t1, $at, .L809722F8 -/* 01394 809722E4 46001006 */ mov.s $f0, $f2 -/* 01398 809722E8 3C018097 */ lui $at, %hi(D_80976CF4) ## $at = 80970000 -/* 0139C 809722EC C4306CF4 */ lwc1 $f16, %lo(D_80976CF4)($at) -/* 013A0 809722F0 46101002 */ mul.s $f0, $f2, $f16 -/* 013A4 809722F4 00000000 */ nop -.L809722F8: -/* 013A8 809722F8 E4800050 */ swc1 $f0, 0x0050($a0) ## 00000050 -/* 013AC 809722FC E4800058 */ swc1 $f0, 0x0058($a0) ## 00000058 -/* 013B0 80972300 0C25C82B */ jal func_809720AC -/* 013B4 80972304 AFA40018 */ sw $a0, 0x0018($sp) -/* 013B8 80972308 8FA40018 */ lw $a0, 0x0018($sp) -/* 013BC 8097230C 0C00BE52 */ jal func_8002F948 -/* 013C0 80972310 2405209D */ addiu $a1, $zero, 0x209D ## $a1 = 0000209D -/* 013C4 80972314 10000008 */ beq $zero, $zero, .L80972338 -/* 013C8 80972318 8FBF0014 */ lw $ra, 0x0014($sp) -.L8097231C: -/* 013CC 8097231C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 013D0 80972320 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 013D4 80972324 0C25C82B */ jal func_809720AC -/* 013D8 80972328 AFA40018 */ sw $a0, 0x0018($sp) -/* 013DC 8097232C 0C00B55C */ jal Actor_Kill - -/* 013E0 80972330 8FA40018 */ lw $a0, 0x0018($sp) -/* 013E4 80972334 8FBF0014 */ lw $ra, 0x0014($sp) -.L80972338: -/* 013E8 80972338 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 013EC 8097233C 03E00008 */ jr $ra -/* 013F0 80972340 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972344.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972344.s deleted file mode 100644 index 47b6733015..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972344.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80972344 -/* 013F4 80972344 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 013F8 80972348 AFBF001C */ sw $ra, 0x001C($sp) -/* 013FC 8097234C AFA5002C */ sw $a1, 0x002C($sp) -/* 01400 80972350 AFA40028 */ sw $a0, 0x0028($sp) -/* 01404 80972354 0C00BE52 */ jal func_8002F948 -/* 01408 80972358 2405209D */ addiu $a1, $zero, 0x209D ## $a1 = 0000209D -/* 0140C 8097235C 8FA50028 */ lw $a1, 0x0028($sp) -/* 01410 80972360 8FA4002C */ lw $a0, 0x002C($sp) -/* 01414 80972364 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 01418 80972368 0C01B231 */ jal SkelCurve_Update -/* 0141C 8097236C AFA50024 */ sw $a1, 0x0024($sp) -/* 01420 80972370 10400010 */ beq $v0, $zero, .L809723B4 -/* 01424 80972374 8FA40024 */ lw $a0, 0x0024($sp) -/* 01428 80972378 3C01426C */ lui $at, 0x426C ## $at = 426C0000 -/* 0142C 8097237C 44812000 */ mtc1 $at, $f4 ## $f4 = 59.00 -/* 01430 80972380 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 01434 80972384 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01438 80972388 24A50050 */ addiu $a1, $a1, 0x0050 ## $a1 = 06000050 -/* 0143C 8097238C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01440 80972390 3C074270 */ lui $a3, 0x4270 ## $a3 = 42700000 -/* 01444 80972394 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 01448 80972398 0C01B225 */ jal SkelCurve_SetAnim -/* 0144C 8097239C E7A60014 */ swc1 $f6, 0x0014($sp) -/* 01450 809723A0 8FA20028 */ lw $v0, 0x0028($sp) -/* 01454 809723A4 3C0E8097 */ lui $t6, %hi(func_80972288) ## $t6 = 80970000 -/* 01458 809723A8 25CE2288 */ addiu $t6, $t6, %lo(func_80972288) ## $t6 = 80972288 -/* 0145C 809723AC AC4E019C */ sw $t6, 0x019C($v0) ## 0000019C -/* 01460 809723B0 A4400188 */ sh $zero, 0x0188($v0) ## 00000188 -.L809723B4: -/* 01464 809723B4 8FBF001C */ lw $ra, 0x001C($sp) -/* 01468 809723B8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0146C 809723BC 03E00008 */ jr $ra -/* 01470 809723C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809723C4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809723C4.s deleted file mode 100644 index 5876956990..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809723C4.s +++ /dev/null @@ -1,202 +0,0 @@ -glabel func_809723C4 -/* 01474 809723C4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01478 809723C8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0147C 809723CC 848E0188 */ lh $t6, 0x0188($a0) ## 00000188 -/* 01480 809723D0 25CF03E8 */ addiu $t7, $t6, 0x03E8 ## $t7 = 000003E8 -/* 01484 809723D4 A48F0188 */ sh $t7, 0x0188($a0) ## 00000188 -/* 01488 809723D8 90B81D6C */ lbu $t8, 0x1D6C($a1) ## 00001D6C -/* 0148C 809723DC 530000B0 */ beql $t8, $zero, .L809726A0 -/* 01490 809723E0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01494 809723E4 8486018C */ lh $a2, 0x018C($a0) ## 0000018C -/* 01498 809723E8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0149C 809723EC 0006C880 */ sll $t9, $a2, 2 -/* 014A0 809723F0 00B94021 */ addu $t0, $a1, $t9 -/* 014A4 809723F4 8D091D8C */ lw $t1, 0x1D8C($t0) ## 00001D8C -/* 014A8 809723F8 512000A9 */ beql $t1, $zero, .L809726A0 -/* 014AC 809723FC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 014B0 80972400 AFA40018 */ sw $a0, 0x0018($sp) -/* 014B4 80972404 0C25D96B */ jal func_809765AC -/* 014B8 80972408 AFA5001C */ sw $a1, 0x001C($sp) -/* 014BC 8097240C 8FA40018 */ lw $a0, 0x0018($sp) -/* 014C0 80972410 8FA5001C */ lw $a1, 0x001C($sp) -/* 014C4 80972414 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 014C8 80972418 848A018C */ lh $t2, 0x018C($a0) ## 0000018C -/* 014CC 8097241C 000A5880 */ sll $t3, $t2, 2 -/* 014D0 80972420 00AB6021 */ addu $t4, $a1, $t3 -/* 014D4 80972424 8D8D1D8C */ lw $t5, 0x1D8C($t4) ## 00001D8C -/* 014D8 80972428 95AE0000 */ lhu $t6, 0x0000($t5) ## 00000000 -/* 014DC 8097242C 15C1008B */ bne $t6, $at, .L8097265C -/* 014E0 80972430 00000000 */ nop -/* 014E4 80972434 90830178 */ lbu $v1, 0x0178($a0) ## 00000178 -/* 014E8 80972438 2861008C */ slti $at, $v1, 0x008C -/* 014EC 8097243C 10200004 */ beq $at, $zero, .L80972450 -/* 014F0 80972440 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -/* 014F4 80972444 246F0001 */ addiu $t7, $v1, 0x0001 ## $t7 = 00000001 -/* 014F8 80972448 A08F0178 */ sb $t7, 0x0178($a0) ## 00000178 -/* 014FC 8097244C 31E200FF */ andi $v0, $t7, 0x00FF ## $v0 = 00000001 -.L80972450: -/* 01500 80972450 2841001E */ slti $at, $v0, 0x001E -/* 01504 80972454 10200029 */ beq $at, $zero, .L809724FC -/* 01508 80972458 240300FF */ addiu $v1, $zero, 0x00FF ## $v1 = 000000FF -/* 0150C 8097245C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 01510 80972460 3C014108 */ lui $at, 0x4108 ## $at = 41080000 -/* 01514 80972464 44814000 */ mtc1 $at, $f8 ## $f8 = 8.50 -/* 01518 80972468 468021A0 */ cvt.s.w $f6, $f4 -/* 0151C 8097246C 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 01520 80972470 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 01524 80972474 46083282 */ mul.s $f10, $f6, $f8 -/* 01528 80972478 4458F800 */ cfc1 $t8, $31 -/* 0152C 8097247C 44D9F800 */ ctc1 $t9, $31 -/* 01530 80972480 00000000 */ nop -/* 01534 80972484 46005424 */ cvt.w.s $f16, $f10 -/* 01538 80972488 4459F800 */ cfc1 $t9, $31 -/* 0153C 8097248C 00000000 */ nop -/* 01540 80972490 33390078 */ andi $t9, $t9, 0x0078 ## $t9 = 00000000 -/* 01544 80972494 53200013 */ beql $t9, $zero, .L809724E4 -/* 01548 80972498 44198000 */ mfc1 $t9, $f16 -/* 0154C 8097249C 44818000 */ mtc1 $at, $f16 ## $f16 = 2147483648.00 -/* 01550 809724A0 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 01554 809724A4 46105401 */ sub.s $f16, $f10, $f16 -/* 01558 809724A8 44D9F800 */ ctc1 $t9, $31 -/* 0155C 809724AC 00000000 */ nop -/* 01560 809724B0 46008424 */ cvt.w.s $f16, $f16 -/* 01564 809724B4 4459F800 */ cfc1 $t9, $31 -/* 01568 809724B8 00000000 */ nop -/* 0156C 809724BC 33390078 */ andi $t9, $t9, 0x0078 ## $t9 = 00000000 -/* 01570 809724C0 17200005 */ bne $t9, $zero, .L809724D8 -/* 01574 809724C4 00000000 */ nop -/* 01578 809724C8 44198000 */ mfc1 $t9, $f16 -/* 0157C 809724CC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01580 809724D0 10000007 */ beq $zero, $zero, .L809724F0 -/* 01584 809724D4 0321C825 */ or $t9, $t9, $at ## $t9 = 80000000 -.L809724D8: -/* 01588 809724D8 10000005 */ beq $zero, $zero, .L809724F0 -/* 0158C 809724DC 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF -/* 01590 809724E0 44198000 */ mfc1 $t9, $f16 -.L809724E4: -/* 01594 809724E4 00000000 */ nop -/* 01598 809724E8 0720FFFB */ bltz $t9, .L809724D8 -/* 0159C 809724EC 00000000 */ nop -.L809724F0: -/* 015A0 809724F0 44D8F800 */ ctc1 $t8, $31 -/* 015A4 809724F4 10000059 */ beq $zero, $zero, .L8097265C -/* 015A8 809724F8 A0990184 */ sb $t9, 0x0184($a0) ## 00000184 -.L809724FC: -/* 015AC 809724FC 2841003C */ slti $at, $v0, 0x003C -/* 015B0 80972500 1020002A */ beq $at, $zero, .L809725AC -/* 015B4 80972504 A0830184 */ sb $v1, 0x0184($a0) ## 00000184 -/* 015B8 80972508 2448FFE2 */ addiu $t0, $v0, 0xFFE2 ## $t0 = FFFFFFE3 -/* 015BC 8097250C 44889000 */ mtc1 $t0, $f18 ## $f18 = NaN -/* 015C0 80972510 3C014108 */ lui $at, 0x4108 ## $at = 41080000 -/* 015C4 80972514 44813000 */ mtc1 $at, $f6 ## $f6 = 8.50 -/* 015C8 80972518 46809120 */ cvt.s.w $f4, $f18 -/* 015CC 8097251C 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 015D0 80972520 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 015D4 80972524 46062202 */ mul.s $f8, $f4, $f6 -/* 015D8 80972528 4449F800 */ cfc1 $t1, $31 -/* 015DC 8097252C 44CAF800 */ ctc1 $t2, $31 -/* 015E0 80972530 00000000 */ nop -/* 015E4 80972534 460042A4 */ cvt.w.s $f10, $f8 -/* 015E8 80972538 444AF800 */ cfc1 $t2, $31 -/* 015EC 8097253C 00000000 */ nop -/* 015F0 80972540 314A0078 */ andi $t2, $t2, 0x0078 ## $t2 = 00000000 -/* 015F4 80972544 51400013 */ beql $t2, $zero, .L80972594 -/* 015F8 80972548 440A5000 */ mfc1 $t2, $f10 -/* 015FC 8097254C 44815000 */ mtc1 $at, $f10 ## $f10 = 2147483648.00 -/* 01600 80972550 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 01604 80972554 460A4281 */ sub.s $f10, $f8, $f10 -/* 01608 80972558 44CAF800 */ ctc1 $t2, $31 -/* 0160C 8097255C 00000000 */ nop -/* 01610 80972560 460052A4 */ cvt.w.s $f10, $f10 -/* 01614 80972564 444AF800 */ cfc1 $t2, $31 -/* 01618 80972568 00000000 */ nop -/* 0161C 8097256C 314A0078 */ andi $t2, $t2, 0x0078 ## $t2 = 00000000 -/* 01620 80972570 15400005 */ bne $t2, $zero, .L80972588 -/* 01624 80972574 00000000 */ nop -/* 01628 80972578 440A5000 */ mfc1 $t2, $f10 -/* 0162C 8097257C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01630 80972580 10000007 */ beq $zero, $zero, .L809725A0 -/* 01634 80972584 01415025 */ or $t2, $t2, $at ## $t2 = 80000000 -.L80972588: -/* 01638 80972588 10000005 */ beq $zero, $zero, .L809725A0 -/* 0163C 8097258C 240AFFFF */ addiu $t2, $zero, 0xFFFF ## $t2 = FFFFFFFF -/* 01640 80972590 440A5000 */ mfc1 $t2, $f10 -.L80972594: -/* 01644 80972594 00000000 */ nop -/* 01648 80972598 0540FFFB */ bltz $t2, .L80972588 -/* 0164C 8097259C 00000000 */ nop -.L809725A0: -/* 01650 809725A0 44C9F800 */ ctc1 $t1, $31 -/* 01654 809725A4 1000002D */ beq $zero, $zero, .L8097265C -/* 01658 809725A8 A08A0185 */ sb $t2, 0x0185($a0) ## 00000185 -.L809725AC: -/* 0165C 809725AC 2841008D */ slti $at, $v0, 0x008D -/* 01660 809725B0 1020002A */ beq $at, $zero, .L8097265C -/* 01664 809725B4 244BFFC4 */ addiu $t3, $v0, 0xFFC4 ## $t3 = FFFFFFC5 -/* 01668 809725B8 448B8000 */ mtc1 $t3, $f16 ## $f16 = NaN -/* 0166C 809725BC 3C01404C */ lui $at, 0x404C ## $at = 404C0000 -/* 01670 809725C0 44812000 */ mtc1 $at, $f4 ## $f4 = 3.19 -/* 01674 809725C4 468084A0 */ cvt.s.w $f18, $f16 -/* 01678 809725C8 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 0167C 809725CC A0830185 */ sb $v1, 0x0185($a0) ## 00000185 -/* 01680 809725D0 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 01684 809725D4 46049182 */ mul.s $f6, $f18, $f4 -/* 01688 809725D8 444CF800 */ cfc1 $t4, $31 -/* 0168C 809725DC 44CDF800 */ ctc1 $t5, $31 -/* 01690 809725E0 00000000 */ nop -/* 01694 809725E4 46003224 */ cvt.w.s $f8, $f6 -/* 01698 809725E8 444DF800 */ cfc1 $t5, $31 -/* 0169C 809725EC 00000000 */ nop -/* 016A0 809725F0 31AD0078 */ andi $t5, $t5, 0x0078 ## $t5 = 00000000 -/* 016A4 809725F4 51A00013 */ beql $t5, $zero, .L80972644 -/* 016A8 809725F8 440D4000 */ mfc1 $t5, $f8 -/* 016AC 809725FC 44814000 */ mtc1 $at, $f8 ## $f8 = 2147483648.00 -/* 016B0 80972600 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 016B4 80972604 46083201 */ sub.s $f8, $f6, $f8 -/* 016B8 80972608 44CDF800 */ ctc1 $t5, $31 -/* 016BC 8097260C 00000000 */ nop -/* 016C0 80972610 46004224 */ cvt.w.s $f8, $f8 -/* 016C4 80972614 444DF800 */ cfc1 $t5, $31 -/* 016C8 80972618 00000000 */ nop -/* 016CC 8097261C 31AD0078 */ andi $t5, $t5, 0x0078 ## $t5 = 00000000 -/* 016D0 80972620 15A00005 */ bne $t5, $zero, .L80972638 -/* 016D4 80972624 00000000 */ nop -/* 016D8 80972628 440D4000 */ mfc1 $t5, $f8 -/* 016DC 8097262C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 016E0 80972630 10000007 */ beq $zero, $zero, .L80972650 -/* 016E4 80972634 01A16825 */ or $t5, $t5, $at ## $t5 = 80000000 -.L80972638: -/* 016E8 80972638 10000005 */ beq $zero, $zero, .L80972650 -/* 016EC 8097263C 240DFFFF */ addiu $t5, $zero, 0xFFFF ## $t5 = FFFFFFFF -/* 016F0 80972640 440D4000 */ mfc1 $t5, $f8 -.L80972644: -/* 016F4 80972644 00000000 */ nop -/* 016F8 80972648 05A0FFFB */ bltz $t5, .L80972638 -/* 016FC 8097264C 00000000 */ nop -.L80972650: -/* 01700 80972650 44CCF800 */ ctc1 $t4, $31 -/* 01704 80972654 A08D0186 */ sb $t5, 0x0186($a0) ## 00000186 -/* 01708 80972658 00000000 */ nop -.L8097265C: -/* 0170C 8097265C 3C028016 */ lui $v0, %hi(gSaveContext) -/* 01710 80972660 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 01714 80972664 8C4E0000 */ lw $t6, 0x0000($v0) ## 8015E660 -/* 01718 80972668 240100A0 */ addiu $at, $zero, 0x00A0 ## $at = 000000A0 -/* 0171C 8097266C 55C1000C */ bnel $t6, $at, .L809726A0 -/* 01720 80972670 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01724 80972674 8C4F1360 */ lw $t7, 0x1360($v0) ## 8015F9C0 -/* 01728 80972678 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 0172C 8097267C 55E10008 */ bnel $t7, $at, .L809726A0 -/* 01730 80972680 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01734 80972684 94B81D74 */ lhu $t8, 0x1D74($a1) ## 00001D74 -/* 01738 80972688 2401008F */ addiu $at, $zero, 0x008F ## $at = 0000008F -/* 0173C 8097268C 57010004 */ bnel $t8, $at, .L809726A0 -/* 01740 80972690 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01744 80972694 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01748 80972698 24051842 */ addiu $a1, $zero, 0x1842 ## $a1 = 00001842 -/* 0174C 8097269C 8FBF0014 */ lw $ra, 0x0014($sp) -.L809726A0: -/* 01750 809726A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01754 809726A4 03E00008 */ jr $ra -/* 01758 809726A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809726AC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809726AC.s deleted file mode 100644 index 1d85e61705..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809726AC.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_809726AC -/* 0175C 809726AC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01760 809726B0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01764 809726B4 AFA5001C */ sw $a1, 0x001C($sp) -/* 01768 809726B8 90830184 */ lbu $v1, 0x0184($a0) ## 00000184 -/* 0176C 809726BC 84820188 */ lh $v0, 0x0188($a0) ## 00000188 -/* 01770 809726C0 0043082A */ slt $at, $v0, $v1 -/* 01774 809726C4 10200006 */ beq $at, $zero, .L809726E0 -/* 01778 809726C8 00437023 */ subu $t6, $v0, $v1 -/* 0177C 809726CC 0C00B55C */ jal Actor_Kill - -/* 01780 809726D0 AFA40018 */ sw $a0, 0x0018($sp) -/* 01784 809726D4 8FA40018 */ lw $a0, 0x0018($sp) -/* 01788 809726D8 10000002 */ beq $zero, $zero, .L809726E4 -/* 0178C 809726DC A4800188 */ sh $zero, 0x0188($a0) ## 00000188 -.L809726E0: -/* 01790 809726E0 A48E0188 */ sh $t6, 0x0188($a0) ## 00000188 -.L809726E4: -/* 01794 809726E4 84820188 */ lh $v0, 0x0188($a0) ## 00000188 -/* 01798 809726E8 28410100 */ slti $at, $v0, 0x0100 -/* 0179C 809726EC 1020000A */ beq $at, $zero, .L80972718 -/* 017A0 809726F0 284100E1 */ slti $at, $v0, 0x00E1 -/* 017A4 809726F4 14200006 */ bne $at, $zero, .L80972710 -/* 017A8 809726F8 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF -/* 017AC 809726FC 00027823 */ subu $t7, $zero, $v0 -/* 017B0 80972700 000FC0C0 */ sll $t8, $t7, 3 -/* 017B4 80972704 27190800 */ addiu $t9, $t8, 0x0800 ## $t9 = 00000800 -/* 017B8 80972708 10000003 */ beq $zero, $zero, .L80972718 -/* 017BC 8097270C A0990185 */ sb $t9, 0x0185($a0) ## 00000185 -.L80972710: -/* 017C0 80972710 A0880185 */ sb $t0, 0x0185($a0) ## 00000185 -/* 017C4 80972714 84820188 */ lh $v0, 0x0188($a0) ## 00000188 -.L80972718: -/* 017C8 80972718 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 017CC 8097271C 54410004 */ bnel $v0, $at, .L80972730 -/* 017D0 80972720 8FBF0014 */ lw $ra, 0x0014($sp) -/* 017D4 80972724 0C03CFCF */ jal func_800F3F3C -/* 017D8 80972728 24040005 */ addiu $a0, $zero, 0x0005 ## $a0 = 00000005 -/* 017DC 8097272C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80972730: -/* 017E0 80972730 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 017E4 80972734 03E00008 */ jr $ra -/* 017E8 80972738 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097273C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097273C.s deleted file mode 100644 index f7ba11c5bc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097273C.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_8097273C -/* 017EC 8097273C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 017F0 80972740 AFBF0014 */ sw $ra, 0x0014($sp) -/* 017F4 80972744 0C25C670 */ jal func_809719C0 -/* 017F8 80972748 AFA40018 */ sw $a0, 0x0018($sp) -/* 017FC 8097274C 8FA40018 */ lw $a0, 0x0018($sp) -/* 01800 80972750 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF -/* 01804 80972754 848E0188 */ lh $t6, 0x0188($a0) ## 00000188 -/* 01808 80972758 908F0184 */ lbu $t7, 0x0184($a0) ## 00000184 -/* 0180C 8097275C 01CFC021 */ addu $t8, $t6, $t7 -/* 01810 80972760 A4980188 */ sh $t8, 0x0188($a0) ## 00000188 -/* 01814 80972764 84820188 */ lh $v0, 0x0188($a0) ## 00000188 -/* 01818 80972768 284100E1 */ slti $at, $v0, 0x00E1 -/* 0181C 8097276C 14200004 */ bne $at, $zero, .L80972780 -/* 01820 80972770 0002C823 */ subu $t9, $zero, $v0 -/* 01824 80972774 001940C0 */ sll $t0, $t9, 3 -/* 01828 80972778 25090800 */ addiu $t1, $t0, 0x0800 ## $t1 = 00000800 -/* 0182C 8097277C A0890185 */ sb $t1, 0x0185($a0) ## 00000185 -.L80972780: -/* 01830 80972780 28410100 */ slti $at, $v0, 0x0100 -/* 01834 80972784 54200007 */ bnel $at, $zero, .L809727A4 -/* 01838 80972788 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0183C 8097278C A48A0188 */ sh $t2, 0x0188($a0) ## 00000188 -/* 01840 80972790 0C00B55C */ jal Actor_Kill - -/* 01844 80972794 AFA40018 */ sw $a0, 0x0018($sp) -/* 01848 80972798 8FA40018 */ lw $a0, 0x0018($sp) -/* 0184C 8097279C A4800188 */ sh $zero, 0x0188($a0) ## 00000188 -/* 01850 809727A0 8FBF0014 */ lw $ra, 0x0014($sp) -.L809727A4: -/* 01854 809727A4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01858 809727A8 03E00008 */ jr $ra -/* 0185C 809727AC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809727B0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809727B0.s deleted file mode 100644 index 9b9236366e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809727B0.s +++ /dev/null @@ -1,52 +0,0 @@ -glabel func_809727B0 -/* 01860 809727B0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 01864 809727B4 AFBF0034 */ sw $ra, 0x0034($sp) -/* 01868 809727B8 AFB00030 */ sw $s0, 0x0030($sp) -/* 0186C 809727BC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01870 809727C0 0C25C670 */ jal func_809719C0 -/* 01874 809727C4 AFA5003C */ sw $a1, 0x003C($sp) -/* 01878 809727C8 8FA5003C */ lw $a1, 0x003C($sp) -/* 0187C 809727CC 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 01880 809727D0 51C00021 */ beql $t6, $zero, .L80972858 -/* 01884 809727D4 8FBF0034 */ lw $ra, 0x0034($sp) -/* 01888 809727D8 860F018C */ lh $t7, 0x018C($s0) ## 0000018C -/* 0188C 809727DC 000FC080 */ sll $t8, $t7, 2 -/* 01890 809727E0 00B8C821 */ addu $t9, $a1, $t8 -/* 01894 809727E4 8F221D8C */ lw $v0, 0x1D8C($t9) ## 00001D8C -/* 01898 809727E8 5040001B */ beql $v0, $zero, .L80972858 -/* 0189C 809727EC 8FBF0034 */ lw $ra, 0x0034($sp) -/* 018A0 809727F0 94480000 */ lhu $t0, 0x0000($v0) ## 00000000 -/* 018A4 809727F4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 018A8 809727F8 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 00001C24 -/* 018AC 809727FC 15010015 */ bne $t0, $at, .L80972854 -/* 018B0 80972800 2406008B */ addiu $a2, $zero, 0x008B ## $a2 = 0000008B -/* 018B4 80972804 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 018B8 80972808 8E070024 */ lw $a3, 0x0024($s0) ## 00000024 -/* 018BC 8097280C 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 018C0 80972810 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 018C4 80972814 C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C -/* 018C8 80972818 AFA90024 */ sw $t1, 0x0024($sp) -/* 018CC 8097281C AFA00020 */ sw $zero, 0x0020($sp) -/* 018D0 80972820 AFA0001C */ sw $zero, 0x001C($sp) -/* 018D4 80972824 AFA00018 */ sw $zero, 0x0018($sp) -/* 018D8 80972828 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 018DC 8097282C E7A60014 */ swc1 $f6, 0x0014($sp) -/* 018E0 80972830 10400003 */ beq $v0, $zero, .L80972840 -/* 018E4 80972834 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 018E8 80972838 0C00B58B */ jal Actor_SetScale - -/* 018EC 8097283C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -.L80972840: -/* 018F0 80972840 3C0A8097 */ lui $t2, %hi(func_8097273C) ## $t2 = 80970000 -/* 018F4 80972844 254A273C */ addiu $t2, $t2, %lo(func_8097273C) ## $t2 = 8097273C -/* 018F8 80972848 240B00FF */ addiu $t3, $zero, 0x00FF ## $t3 = 000000FF -/* 018FC 8097284C AE0A019C */ sw $t2, 0x019C($s0) ## 0000019C -/* 01900 80972850 A20B0185 */ sb $t3, 0x0185($s0) ## 00000185 -.L80972854: -/* 01904 80972854 8FBF0034 */ lw $ra, 0x0034($sp) -.L80972858: -/* 01908 80972858 8FB00030 */ lw $s0, 0x0030($sp) -/* 0190C 8097285C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 01910 80972860 03E00008 */ jr $ra -/* 01914 80972864 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972868.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972868.s deleted file mode 100644 index 050d0a6e42..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972868.s +++ /dev/null @@ -1,98 +0,0 @@ -glabel func_80972868 -/* 01918 80972868 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 0191C 8097286C AFBF0034 */ sw $ra, 0x0034($sp) -/* 01920 80972870 AFB00030 */ sw $s0, 0x0030($sp) -/* 01924 80972874 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01928 80972878 0C00B638 */ jal Actor_MoveForward - -/* 0192C 8097287C AFA50044 */ sw $a1, 0x0044($sp) -/* 01930 80972880 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 01934 80972884 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 -/* 01938 80972888 C604006C */ lwc1 $f4, 0x006C($s0) ## 0000006C -/* 0193C 8097288C C60A0068 */ lwc1 $f10, 0x0068($s0) ## 00000068 -/* 01940 80972890 92020184 */ lbu $v0, 0x0184($s0) ## 00000184 -/* 01944 80972894 46062202 */ mul.s $f8, $f4, $f6 -/* 01948 80972898 2406008B */ addiu $a2, $zero, 0x008B ## $a2 = 0000008B -/* 0194C 8097289C 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 01950 809728A0 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 01954 809728A4 46085400 */ add.s $f16, $f10, $f8 -/* 01958 809728A8 10400003 */ beq $v0, $zero, .L809728B8 -/* 0195C 809728AC E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 -/* 01960 809728B0 1000003C */ beq $zero, $zero, .L809729A4 -/* 01964 809728B4 A20E0184 */ sb $t6, 0x0184($s0) ## 00000184 -.L809728B8: -/* 01968 809728B8 C6120028 */ lwc1 $f18, 0x0028($s0) ## 00000028 -/* 0196C 809728BC 8E070024 */ lw $a3, 0x0024($s0) ## 00000024 -/* 01970 809728C0 8FA50044 */ lw $a1, 0x0044($sp) -/* 01974 809728C4 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 01978 809728C8 C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C -/* 0197C 809728CC 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 00001C24 -/* 01980 809728D0 AFA40038 */ sw $a0, 0x0038($sp) -/* 01984 809728D4 AFAF0024 */ sw $t7, 0x0024($sp) -/* 01988 809728D8 AFA00020 */ sw $zero, 0x0020($sp) -/* 0198C 809728DC AFA0001C */ sw $zero, 0x001C($sp) -/* 01990 809728E0 AFA00018 */ sw $zero, 0x0018($sp) -/* 01994 809728E4 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 01998 809728E8 E7A40014 */ swc1 $f4, 0x0014($sp) -/* 0199C 809728EC 10400003 */ beq $v0, $zero, .L809728FC -/* 019A0 809728F0 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 019A4 809728F4 0C00B58B */ jal Actor_SetScale - -/* 019A8 809728F8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -.L809728FC: -/* 019AC 809728FC C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 019B0 80972900 8E070024 */ lw $a3, 0x0024($s0) ## 00000024 -/* 019B4 80972904 24180007 */ addiu $t8, $zero, 0x0007 ## $t8 = 00000007 -/* 019B8 80972908 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 019BC 8097290C C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 019C0 80972910 AFB80024 */ sw $t8, 0x0024($sp) -/* 019C4 80972914 AFA00020 */ sw $zero, 0x0020($sp) -/* 019C8 80972918 AFA0001C */ sw $zero, 0x001C($sp) -/* 019CC 8097291C AFA00018 */ sw $zero, 0x0018($sp) -/* 019D0 80972920 8FA40038 */ lw $a0, 0x0038($sp) -/* 019D4 80972924 8FA50044 */ lw $a1, 0x0044($sp) -/* 019D8 80972928 2406008B */ addiu $a2, $zero, 0x008B ## $a2 = 0000008B -/* 019DC 8097292C 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 019E0 80972930 E7AA0014 */ swc1 $f10, 0x0014($sp) -/* 019E4 80972934 10400004 */ beq $v0, $zero, .L80972948 -/* 019E8 80972938 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 019EC 8097293C 3C053DCC */ lui $a1, 0x3DCC ## $a1 = 3DCC0000 -/* 019F0 80972940 0C00B58B */ jal Actor_SetScale - -/* 019F4 80972944 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3DCCCCCD -.L80972948: -/* 019F8 80972948 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 019FC 8097294C 8E070024 */ lw $a3, 0x0024($s0) ## 00000024 -/* 01A00 80972950 24190010 */ addiu $t9, $zero, 0x0010 ## $t9 = 00000010 -/* 01A04 80972954 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 01A08 80972958 C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C -/* 01A0C 8097295C AFB90024 */ sw $t9, 0x0024($sp) -/* 01A10 80972960 AFA00020 */ sw $zero, 0x0020($sp) -/* 01A14 80972964 AFA0001C */ sw $zero, 0x001C($sp) -/* 01A18 80972968 AFA00018 */ sw $zero, 0x0018($sp) -/* 01A1C 8097296C 8FA40038 */ lw $a0, 0x0038($sp) -/* 01A20 80972970 8FA50044 */ lw $a1, 0x0044($sp) -/* 01A24 80972974 2406008B */ addiu $a2, $zero, 0x008B ## $a2 = 0000008B -/* 01A28 80972978 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 01A2C 8097297C E7B00014 */ swc1 $f16, 0x0014($sp) -/* 01A30 80972980 10400004 */ beq $v0, $zero, .L80972994 -/* 01A34 80972984 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 01A38 80972988 3C053E4C */ lui $a1, 0x3E4C ## $a1 = 3E4C0000 -/* 01A3C 8097298C 0C00B58B */ jal Actor_SetScale - -/* 01A40 80972990 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3E4CCCCD -.L80972994: -/* 01A44 80972994 0C01E233 */ jal func_800788CC -/* 01A48 80972998 24041842 */ addiu $a0, $zero, 0x1842 ## $a0 = 00001842 -/* 01A4C 8097299C 0C00B55C */ jal Actor_Kill - -/* 01A50 809729A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L809729A4: -/* 01A54 809729A4 8FBF0034 */ lw $ra, 0x0034($sp) -/* 01A58 809729A8 8FB00030 */ lw $s0, 0x0030($sp) -/* 01A5C 809729AC 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 01A60 809729B0 03E00008 */ jr $ra -/* 01A64 809729B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809729B8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809729B8.s deleted file mode 100644 index bd221db213..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809729B8.s +++ /dev/null @@ -1,25 +0,0 @@ -.late_rodata -glabel D_80976CF8 - .float -0.03 - -.text -glabel func_809729B8 -/* 01A68 809729B8 AFA50004 */ sw $a1, 0x0004($sp) -/* 01A6C 809729BC 8C820118 */ lw $v0, 0x0118($a0) ## 00000118 -/* 01A70 809729C0 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 01A74 809729C4 44812000 */ mtc1 $at, $f4 ## $f4 = 1.50 -/* 01A78 809729C8 844E00B6 */ lh $t6, 0x00B6($v0) ## 000000B6 -/* 01A7C 809729CC 3C01BFC0 */ lui $at, 0xBFC0 ## $at = BFC00000 -/* 01A80 809729D0 44813000 */ mtc1 $at, $f6 ## $f6 = -1.50 -/* 01A84 809729D4 240F0032 */ addiu $t7, $zero, 0x0032 ## $t7 = 00000032 -/* 01A88 809729D8 A08F0184 */ sb $t7, 0x0184($a0) ## 00000184 -/* 01A8C 809729DC 3C018097 */ lui $at, %hi(D_80976CF8) ## $at = 80970000 -/* 01A90 809729E0 A48E0032 */ sh $t6, 0x0032($a0) ## 00000032 -/* 01A94 809729E4 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 01A98 809729E8 E4860070 */ swc1 $f6, 0x0070($a0) ## 00000070 -/* 01A9C 809729EC C4286CF8 */ lwc1 $f8, %lo(D_80976CF8)($at) -/* 01AA0 809729F0 3C188097 */ lui $t8, %hi(func_80972868) ## $t8 = 80970000 -/* 01AA4 809729F4 27182868 */ addiu $t8, $t8, %lo(func_80972868) ## $t8 = 80972868 -/* 01AA8 809729F8 AC98019C */ sw $t8, 0x019C($a0) ## 0000019C -/* 01AAC 809729FC 03E00008 */ jr $ra -/* 01AB0 80972A00 E488006C */ swc1 $f8, 0x006C($a0) ## 0000006C diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972A04.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972A04.s deleted file mode 100644 index 79a28bdfcf..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972A04.s +++ /dev/null @@ -1,35 +0,0 @@ -.late_rodata -glabel D_80976CFC - .float 0.9 - -.text -glabel func_80972A04 -/* 01AB4 80972A04 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01AB8 80972A08 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01ABC 80972A0C AFA5001C */ sw $a1, 0x001C($sp) -/* 01AC0 80972A10 90820185 */ lbu $v0, 0x0185($a0) ## 00000185 -/* 01AC4 80972A14 3C018097 */ lui $at, %hi(D_80976CFC) ## $at = 80970000 -/* 01AC8 80972A18 C4840050 */ lwc1 $f4, 0x0050($a0) ## 00000050 -/* 01ACC 80972A1C 00027100 */ sll $t6, $v0, 4 -/* 01AD0 80972A20 244FFFFF */ addiu $t7, $v0, 0xFFFF ## $t7 = FFFFFFFF -/* 01AD4 80972A24 A08E0184 */ sb $t6, 0x0184($a0) ## 00000184 -/* 01AD8 80972A28 A08F0185 */ sb $t7, 0x0185($a0) ## 00000185 -/* 01ADC 80972A2C C4266CFC */ lwc1 $f6, %lo(D_80976CFC)($at) -/* 01AE0 80972A30 AFA40018 */ sw $a0, 0x0018($sp) -/* 01AE4 80972A34 46062202 */ mul.s $f8, $f4, $f6 -/* 01AE8 80972A38 44054000 */ mfc1 $a1, $f8 -/* 01AEC 80972A3C 0C00B58B */ jal Actor_SetScale - -/* 01AF0 80972A40 00000000 */ nop -/* 01AF4 80972A44 8FA40018 */ lw $a0, 0x0018($sp) -/* 01AF8 80972A48 90980185 */ lbu $t8, 0x0185($a0) ## 00000185 -/* 01AFC 80972A4C 57000004 */ bnel $t8, $zero, .L80972A60 -/* 01B00 80972A50 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01B04 80972A54 0C00B55C */ jal Actor_Kill - -/* 01B08 80972A58 00000000 */ nop -/* 01B0C 80972A5C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80972A60: -/* 01B10 80972A60 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01B14 80972A64 03E00008 */ jr $ra -/* 01B18 80972A68 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972A6C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972A6C.s deleted file mode 100644 index 4d41233724..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972A6C.s +++ /dev/null @@ -1,71 +0,0 @@ -.late_rodata -glabel D_80976D00 - .float 0.01 - -glabel D_80976D04 - .float 0.01 - -.text -glabel func_80972A6C -/* 01B1C 80972A6C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01B20 80972A70 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01B24 80972A74 AFA5001C */ sw $a1, 0x001C($sp) -/* 01B28 80972A78 8C820118 */ lw $v0, 0x0118($a0) ## 00000118 -/* 01B2C 80972A7C 50400018 */ beql $v0, $zero, .L80972AE0 -/* 01B30 80972A80 908F0185 */ lbu $t7, 0x0185($a0) ## 00000185 -/* 01B34 80972A84 908E0185 */ lbu $t6, 0x0185($a0) ## 00000185 -/* 01B38 80972A88 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 01B3C 80972A8C 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 -/* 01B40 80972A90 448E3000 */ mtc1 $t6, $f6 ## $f6 = 0.00 -/* 01B44 80972A94 3C018097 */ lui $at, %hi(D_80976D00) ## $at = 80970000 -/* 01B48 80972A98 C4306D00 */ lwc1 $f16, %lo(D_80976D00)($at) -/* 01B4C 80972A9C 46803220 */ cvt.s.w $f8, $f6 -/* 01B50 80972AA0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 01B54 80972AA4 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 -/* 01B58 80972AA8 46082281 */ sub.s $f10, $f4, $f8 -/* 01B5C 80972AAC C4480050 */ lwc1 $f8, 0x0050($v0) ## 00000050 -/* 01B60 80972AB0 AFA40018 */ sw $a0, 0x0018($sp) -/* 01B64 80972AB4 46105482 */ mul.s $f18, $f10, $f16 -/* 01B68 80972AB8 00000000 */ nop -/* 01B6C 80972ABC 46069102 */ mul.s $f4, $f18, $f6 -/* 01B70 80972AC0 00000000 */ nop -/* 01B74 80972AC4 46082282 */ mul.s $f10, $f4, $f8 -/* 01B78 80972AC8 44055000 */ mfc1 $a1, $f10 -/* 01B7C 80972ACC 0C00B58B */ jal Actor_SetScale - -/* 01B80 80972AD0 00000000 */ nop -/* 01B84 80972AD4 1000000F */ beq $zero, $zero, .L80972B14 -/* 01B88 80972AD8 8FA40018 */ lw $a0, 0x0018($sp) -/* 01B8C 80972ADC 908F0185 */ lbu $t7, 0x0185($a0) ## 00000185 -.L80972AE0: -/* 01B90 80972AE0 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 01B94 80972AE4 44818000 */ mtc1 $at, $f16 ## $f16 = 5.00 -/* 01B98 80972AE8 448F9000 */ mtc1 $t7, $f18 ## $f18 = 0.00 -/* 01B9C 80972AEC 3C018097 */ lui $at, %hi(D_80976D04) ## $at = 80970000 -/* 01BA0 80972AF0 C4286D04 */ lwc1 $f8, %lo(D_80976D04)($at) -/* 01BA4 80972AF4 468091A0 */ cvt.s.w $f6, $f18 -/* 01BA8 80972AF8 AFA40018 */ sw $a0, 0x0018($sp) -/* 01BAC 80972AFC 46068101 */ sub.s $f4, $f16, $f6 -/* 01BB0 80972B00 46082282 */ mul.s $f10, $f4, $f8 -/* 01BB4 80972B04 44055000 */ mfc1 $a1, $f10 -/* 01BB8 80972B08 0C00B58B */ jal Actor_SetScale - -/* 01BBC 80972B0C 00000000 */ nop -/* 01BC0 80972B10 8FA40018 */ lw $a0, 0x0018($sp) -.L80972B14: -/* 01BC4 80972B14 90820185 */ lbu $v0, 0x0185($a0) ## 00000185 -/* 01BC8 80972B18 3C088097 */ lui $t0, %hi(func_80972A04) ## $t0 = 80970000 -/* 01BCC 80972B1C 2419000F */ addiu $t9, $zero, 0x000F ## $t9 = 0000000F -/* 01BD0 80972B20 10400004 */ beq $v0, $zero, .L80972B34 -/* 01BD4 80972B24 25082A04 */ addiu $t0, $t0, %lo(func_80972A04) ## $t0 = 80972A04 -/* 01BD8 80972B28 2458FFFF */ addiu $t8, $v0, 0xFFFF ## $t8 = FFFFFFFF -/* 01BDC 80972B2C 10000003 */ beq $zero, $zero, .L80972B3C -/* 01BE0 80972B30 A0980185 */ sb $t8, 0x0185($a0) ## 00000185 -.L80972B34: -/* 01BE4 80972B34 A0990185 */ sb $t9, 0x0185($a0) ## 00000185 -/* 01BE8 80972B38 AC88019C */ sw $t0, 0x019C($a0) ## 0000019C -.L80972B3C: -/* 01BEC 80972B3C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01BF0 80972B40 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01BF4 80972B44 03E00008 */ jr $ra -/* 01BF8 80972B48 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972B4C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972B4C.s deleted file mode 100644 index f920784310..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972B4C.s +++ /dev/null @@ -1,237 +0,0 @@ -.late_rodata -glabel D_80976D08 - .float 0.23 - -glabel D_80976D0C - .float 0.001 - -glabel D_80976D10 - .float 2.03 - -glabel D_80976D14 - .float 0.05 - -glabel D_80976D18 - .float 0.1 - -glabel D_80976D1C - .float 0.005 - -.text -glabel func_80972B4C -/* 01BFC 80972B4C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01C00 80972B50 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01C04 80972B54 AFB10020 */ sw $s1, 0x0020($sp) -/* 01C08 80972B58 AFB0001C */ sw $s0, 0x001C($sp) -/* 01C0C 80972B5C 8483001C */ lh $v1, 0x001C($a0) ## 0000001C -/* 01C10 80972B60 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 01C14 80972B64 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01C18 80972B68 30630F00 */ andi $v1, $v1, 0x0F00 ## $v1 = 00000000 -/* 01C1C 80972B6C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 01C20 80972B70 11C000AD */ beq $t6, $zero, .L80972E28 -/* 01C24 80972B74 00031A03 */ sra $v1, $v1, 8 -/* 01C28 80972B78 8486018C */ lh $a2, 0x018C($a0) ## 0000018C -/* 01C2C 80972B7C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01C30 80972B80 00067880 */ sll $t7, $a2, 2 -/* 01C34 80972B84 00AFC021 */ addu $t8, $a1, $t7 -/* 01C38 80972B88 8F191D8C */ lw $t9, 0x1D8C($t8) ## 00001D8C -/* 01C3C 80972B8C 532000A7 */ beql $t9, $zero, .L80972E2C -/* 01C40 80972B90 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01C44 80972B94 0C25D96B */ jal func_809765AC -/* 01C48 80972B98 AFA30028 */ sw $v1, 0x0028($sp) -/* 01C4C 80972B9C 8608018C */ lh $t0, 0x018C($s0) ## 0000018C -/* 01C50 80972BA0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01C54 80972BA4 8FA30028 */ lw $v1, 0x0028($sp) -/* 01C58 80972BA8 00084880 */ sll $t1, $t0, 2 -/* 01C5C 80972BAC 02295021 */ addu $t2, $s1, $t1 -/* 01C60 80972BB0 8D4B1D8C */ lw $t3, 0x1D8C($t2) ## 00001D8C -/* 01C64 80972BB4 95620000 */ lhu $v0, 0x0000($t3) ## 00000000 -/* 01C68 80972BB8 10410005 */ beq $v0, $at, .L80972BD0 -/* 01C6C 80972BBC 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 01C70 80972BC0 1041002D */ beq $v0, $at, .L80972C78 -/* 01C74 80972BC4 26040050 */ addiu $a0, $s0, 0x0050 ## $a0 = 00000050 -/* 01C78 80972BC8 10000038 */ beq $zero, $zero, .L80972CAC -/* 01C7C 80972BCC 862200A4 */ lh $v0, 0x00A4($s1) ## 000000A4 -.L80972BD0: -/* 01C80 80972BD0 86020188 */ lh $v0, 0x0188($s0) ## 00000188 -/* 01C84 80972BD4 284100F0 */ slti $at, $v0, 0x00F0 -/* 01C88 80972BD8 50200022 */ beql $at, $zero, .L80972C64 -/* 01C8C 80972BDC 920D0185 */ lbu $t5, 0x0185($s0) ## 00000185 -/* 01C90 80972BE0 14600011 */ bne $v1, $zero, .L80972C28 -/* 01C94 80972BE4 3C018097 */ lui $at, %hi(D_80976D10) ## $at = 80970000 -/* 01C98 80972BE8 3C018097 */ lui $at, %hi(D_80976D08) ## $at = 80970000 -/* 01C9C 80972BEC C4246D08 */ lwc1 $f4, %lo(D_80976D08)($at) -/* 01CA0 80972BF0 C6000050 */ lwc1 $f0, 0x0050($s0) ## 00000050 -/* 01CA4 80972BF4 3C018097 */ lui $at, %hi(D_80976D0C) ## $at = 80970000 -/* 01CA8 80972BF8 4604003C */ c.lt.s $f0, $f4 -/* 01CAC 80972BFC 00000000 */ nop -/* 01CB0 80972C00 45020018 */ bc1fl .L80972C64 -/* 01CB4 80972C04 920D0185 */ lbu $t5, 0x0185($s0) ## 00000185 -/* 01CB8 80972C08 C4266D0C */ lwc1 $f6, %lo(D_80976D0C)($at) -/* 01CBC 80972C0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01CC0 80972C10 46060200 */ add.s $f8, $f0, $f6 -/* 01CC4 80972C14 E6080050 */ swc1 $f8, 0x0050($s0) ## 00000050 -/* 01CC8 80972C18 0C00B58B */ jal Actor_SetScale - -/* 01CCC 80972C1C 8E050050 */ lw $a1, 0x0050($s0) ## 00000050 -/* 01CD0 80972C20 1000000F */ beq $zero, $zero, .L80972C60 -/* 01CD4 80972C24 86020188 */ lh $v0, 0x0188($s0) ## 00000188 -.L80972C28: -/* 01CD8 80972C28 C6000050 */ lwc1 $f0, 0x0050($s0) ## 00000050 -/* 01CDC 80972C2C C42A6D10 */ lwc1 $f10, %lo(D_80976D10)($at) -/* 01CE0 80972C30 3C018097 */ lui $at, %hi(D_80976D14) ## $at = 80970000 -/* 01CE4 80972C34 460A003C */ c.lt.s $f0, $f10 -/* 01CE8 80972C38 00000000 */ nop -/* 01CEC 80972C3C 45020009 */ bc1fl .L80972C64 -/* 01CF0 80972C40 920D0185 */ lbu $t5, 0x0185($s0) ## 00000185 -/* 01CF4 80972C44 C4306D14 */ lwc1 $f16, %lo(D_80976D14)($at) -/* 01CF8 80972C48 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01CFC 80972C4C 46100480 */ add.s $f18, $f0, $f16 -/* 01D00 80972C50 E6120050 */ swc1 $f18, 0x0050($s0) ## 00000050 -/* 01D04 80972C54 0C00B58B */ jal Actor_SetScale - -/* 01D08 80972C58 8E050050 */ lw $a1, 0x0050($s0) ## 00000050 -/* 01D0C 80972C5C 86020188 */ lh $v0, 0x0188($s0) ## 00000188 -.L80972C60: -/* 01D10 80972C60 920D0185 */ lbu $t5, 0x0185($s0) ## 00000185 -.L80972C64: -/* 01D14 80972C64 244C0006 */ addiu $t4, $v0, 0x0006 ## $t4 = 00000006 -/* 01D18 80972C68 A60C0188 */ sh $t4, 0x0188($s0) ## 00000188 -/* 01D1C 80972C6C 25AE0001 */ addiu $t6, $t5, 0x0001 ## $t6 = 00000001 -/* 01D20 80972C70 1000000D */ beq $zero, $zero, .L80972CA8 -/* 01D24 80972C74 A20E0185 */ sb $t6, 0x0185($s0) ## 00000185 -.L80972C78: -/* 01D28 80972C78 3C018097 */ lui $at, %hi(D_80976D18) ## $at = 80970000 -/* 01D2C 80972C7C C4206D18 */ lwc1 $f0, %lo(D_80976D18)($at) -/* 01D30 80972C80 3C018097 */ lui $at, %hi(D_80976D1C) ## $at = 80970000 -/* 01D34 80972C84 C4246D1C */ lwc1 $f4, %lo(D_80976D1C)($at) -/* 01D38 80972C88 44060000 */ mfc1 $a2, $f0 -/* 01D3C 80972C8C 44070000 */ mfc1 $a3, $f0 -/* 01D40 80972C90 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 01D44 80972C94 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 01D48 80972C98 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 01D4C 80972C9C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01D50 80972CA0 0C00B58B */ jal Actor_SetScale - -/* 01D54 80972CA4 8E050050 */ lw $a1, 0x0050($s0) ## 00000050 -.L80972CA8: -/* 01D58 80972CA8 862200A4 */ lh $v0, 0x00A4($s1) ## 000000A4 -.L80972CAC: -/* 01D5C 80972CAC 24010055 */ addiu $at, $zero, 0x0055 ## $at = 00000055 -/* 01D60 80972CB0 3C0F8016 */ lui $t7, %hi(gSaveContext+0x1360) -/* 01D64 80972CB4 5441000E */ bnel $v0, $at, .L80972CF0 -/* 01D68 80972CB8 24010060 */ addiu $at, $zero, 0x0060 ## $at = 00000060 -/* 01D6C 80972CBC 8DEFF9C0 */ lw $t7, %lo(gSaveContext+0x1360)($t7) -/* 01D70 80972CC0 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 01D74 80972CC4 55E1000A */ bnel $t7, $at, .L80972CF0 -/* 01D78 80972CC8 24010060 */ addiu $at, $zero, 0x0060 ## $at = 00000060 -/* 01D7C 80972CCC 96381D74 */ lhu $t8, 0x1D74($s1) ## 00001D74 -/* 01D80 80972CD0 240100C5 */ addiu $at, $zero, 0x00C5 ## $at = 000000C5 -/* 01D84 80972CD4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01D88 80972CD8 57010005 */ bnel $t8, $at, .L80972CF0 -/* 01D8C 80972CDC 24010060 */ addiu $at, $zero, 0x0060 ## $at = 00000060 -/* 01D90 80972CE0 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01D94 80972CE4 24052846 */ addiu $a1, $zero, 0x2846 ## $a1 = 00002846 -/* 01D98 80972CE8 862200A4 */ lh $v0, 0x00A4($s1) ## 000000A4 -/* 01D9C 80972CEC 24010060 */ addiu $at, $zero, 0x0060 ## $at = 00000060 -.L80972CF0: -/* 01DA0 80972CF0 14410014 */ bne $v0, $at, .L80972D44 -/* 01DA4 80972CF4 3C198016 */ lui $t9, %hi(gSaveContext+0x1360) -/* 01DA8 80972CF8 8F39F9C0 */ lw $t9, %lo(gSaveContext+0x1360)($t9) -/* 01DAC 80972CFC 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 01DB0 80972D00 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01DB4 80972D04 1721000F */ bne $t9, $at, .L80972D44 -/* 01DB8 80972D08 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01DBC 80972D0C 0C25D1AD */ jal func_809746B4 -/* 01DC0 80972D10 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01DC4 80972D14 14400003 */ bne $v0, $zero, .L80972D24 -/* 01DC8 80972D18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01DCC 80972D1C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01DD0 80972D20 24052047 */ addiu $a1, $zero, 0x2047 ## $a1 = 00002047 -.L80972D24: -/* 01DD4 80972D24 96281D74 */ lhu $t0, 0x1D74($s1) ## 00001D74 -/* 01DD8 80972D28 24010280 */ addiu $at, $zero, 0x0280 ## $at = 00000280 -/* 01DDC 80972D2C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01DE0 80972D30 55010004 */ bnel $t0, $at, .L80972D44 -/* 01DE4 80972D34 862200A4 */ lh $v0, 0x00A4($s1) ## 000000A4 -/* 01DE8 80972D38 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01DEC 80972D3C 24052846 */ addiu $a1, $zero, 0x2846 ## $a1 = 00002846 -/* 01DF0 80972D40 862200A4 */ lh $v0, 0x00A4($s1) ## 000000A4 -.L80972D44: -/* 01DF4 80972D44 24010059 */ addiu $at, $zero, 0x0059 ## $at = 00000059 -/* 01DF8 80972D48 14410014 */ bne $v0, $at, .L80972D9C -/* 01DFC 80972D4C 3C098016 */ lui $t1, %hi(gSaveContext+0x1360) -/* 01E00 80972D50 8D29F9C0 */ lw $t1, %lo(gSaveContext+0x1360)($t1) -/* 01E04 80972D54 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 01E08 80972D58 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01E0C 80972D5C 1521000F */ bne $t1, $at, .L80972D9C -/* 01E10 80972D60 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01E14 80972D64 0C25D1AD */ jal func_809746B4 -/* 01E18 80972D68 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01E1C 80972D6C 14400003 */ bne $v0, $zero, .L80972D7C -/* 01E20 80972D70 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01E24 80972D74 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01E28 80972D78 24052047 */ addiu $a1, $zero, 0x2047 ## $a1 = 00002047 -.L80972D7C: -/* 01E2C 80972D7C 962A1D74 */ lhu $t2, 0x1D74($s1) ## 00001D74 -/* 01E30 80972D80 24010288 */ addiu $at, $zero, 0x0288 ## $at = 00000288 -/* 01E34 80972D84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01E38 80972D88 55410004 */ bnel $t2, $at, .L80972D9C -/* 01E3C 80972D8C 862200A4 */ lh $v0, 0x00A4($s1) ## 000000A4 -/* 01E40 80972D90 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01E44 80972D94 24052846 */ addiu $a1, $zero, 0x2846 ## $a1 = 00002846 -/* 01E48 80972D98 862200A4 */ lh $v0, 0x00A4($s1) ## 000000A4 -.L80972D9C: -/* 01E4C 80972D9C 24010043 */ addiu $at, $zero, 0x0043 ## $at = 00000043 -/* 01E50 80972DA0 14410011 */ bne $v0, $at, .L80972DE8 -/* 01E54 80972DA4 3C0B8016 */ lui $t3, %hi(gSaveContext+0x1360) -/* 01E58 80972DA8 8D6BF9C0 */ lw $t3, %lo(gSaveContext+0x1360)($t3) -/* 01E5C 80972DAC 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 01E60 80972DB0 5561000E */ bnel $t3, $at, .L80972DEC -/* 01E64 80972DB4 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B -/* 01E68 80972DB8 860C018C */ lh $t4, 0x018C($s0) ## 0000018C -/* 01E6C 80972DBC 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01E70 80972DC0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01E74 80972DC4 000C6880 */ sll $t5, $t4, 2 -/* 01E78 80972DC8 022D7021 */ addu $t6, $s1, $t5 -/* 01E7C 80972DCC 8DCF1D8C */ lw $t7, 0x1D8C($t6) ## 00001D8C -/* 01E80 80972DD0 95E30000 */ lhu $v1, 0x0000($t7) ## 00000000 -/* 01E84 80972DD4 54610005 */ bnel $v1, $at, .L80972DEC -/* 01E88 80972DD8 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B -/* 01E8C 80972DDC 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01E90 80972DE0 24052047 */ addiu $a1, $zero, 0x2047 ## $a1 = 00002047 -/* 01E94 80972DE4 862200A4 */ lh $v0, 0x00A4($s1) ## 000000A4 -.L80972DE8: -/* 01E98 80972DE8 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B -.L80972DEC: -/* 01E9C 80972DEC 10410003 */ beq $v0, $at, .L80972DFC -/* 01EA0 80972DF0 2401003D */ addiu $at, $zero, 0x003D ## $at = 0000003D -/* 01EA4 80972DF4 5441000D */ bnel $v0, $at, .L80972E2C -/* 01EA8 80972DF8 8FBF0024 */ lw $ra, 0x0024($sp) -.L80972DFC: -/* 01EAC 80972DFC 8618018C */ lh $t8, 0x018C($s0) ## 0000018C -/* 01EB0 80972E00 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01EB4 80972E04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01EB8 80972E08 0018C880 */ sll $t9, $t8, 2 -/* 01EBC 80972E0C 02394021 */ addu $t0, $s1, $t9 -/* 01EC0 80972E10 8D091D8C */ lw $t1, 0x1D8C($t0) ## 00001D8C -/* 01EC4 80972E14 952A0000 */ lhu $t2, 0x0000($t1) ## 00000000 -/* 01EC8 80972E18 55410004 */ bnel $t2, $at, .L80972E2C -/* 01ECC 80972E1C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01ED0 80972E20 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01ED4 80972E24 24052047 */ addiu $a1, $zero, 0x2047 ## $a1 = 00002047 -.L80972E28: -/* 01ED8 80972E28 8FBF0024 */ lw $ra, 0x0024($sp) -.L80972E2C: -/* 01EDC 80972E2C 8FB0001C */ lw $s0, 0x001C($sp) -/* 01EE0 80972E30 8FB10020 */ lw $s1, 0x0020($sp) -/* 01EE4 80972E34 03E00008 */ jr $ra -/* 01EE8 80972E38 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972E3C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972E3C.s deleted file mode 100644 index 20349dc931..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972E3C.s +++ /dev/null @@ -1,36 +0,0 @@ -.late_rodata -glabel D_80976D20 - .float 1.05 - -.text -glabel func_80972E3C -/* 01EEC 80972E3C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01EF0 80972E40 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01EF4 80972E44 AFA5001C */ sw $a1, 0x001C($sp) -/* 01EF8 80972E48 90820184 */ lbu $v0, 0x0184($a0) ## 00000184 -/* 01EFC 80972E4C 28410004 */ slti $at, $v0, 0x0004 -/* 01F00 80972E50 1420000F */ bne $at, $zero, .L80972E90 -/* 01F04 80972E54 3C018097 */ lui $at, %hi(D_80976D20) ## $at = 80970000 -/* 01F08 80972E58 C4206D20 */ lwc1 $f0, %lo(D_80976D20)($at) -/* 01F0C 80972E5C C4840050 */ lwc1 $f4, 0x0050($a0) ## 00000050 -/* 01F10 80972E60 C4880054 */ lwc1 $f8, 0x0054($a0) ## 00000054 -/* 01F14 80972E64 C4900058 */ lwc1 $f16, 0x0058($a0) ## 00000058 -/* 01F18 80972E68 46002182 */ mul.s $f6, $f4, $f0 -/* 01F1C 80972E6C 244EFFFD */ addiu $t6, $v0, 0xFFFD ## $t6 = FFFFFFFD -/* 01F20 80972E70 A08E0184 */ sb $t6, 0x0184($a0) ## 00000184 -/* 01F24 80972E74 46004282 */ mul.s $f10, $f8, $f0 -/* 01F28 80972E78 00000000 */ nop -/* 01F2C 80972E7C 46008482 */ mul.s $f18, $f16, $f0 -/* 01F30 80972E80 E4860050 */ swc1 $f6, 0x0050($a0) ## 00000050 -/* 01F34 80972E84 E48A0054 */ swc1 $f10, 0x0054($a0) ## 00000054 -/* 01F38 80972E88 10000003 */ beq $zero, $zero, .L80972E98 -/* 01F3C 80972E8C E4920058 */ swc1 $f18, 0x0058($a0) ## 00000058 -.L80972E90: -/* 01F40 80972E90 0C00B55C */ jal Actor_Kill - -/* 01F44 80972E94 00000000 */ nop -.L80972E98: -/* 01F48 80972E98 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01F4C 80972E9C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01F50 80972EA0 03E00008 */ jr $ra -/* 01F54 80972EA4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972EA8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972EA8.s deleted file mode 100644 index 22fd530dd6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972EA8.s +++ /dev/null @@ -1,115 +0,0 @@ -glabel func_80972EA8 -/* 01F58 80972EA8 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 01F5C 80972EAC AFBF003C */ sw $ra, 0x003C($sp) -/* 01F60 80972EB0 AFB10038 */ sw $s1, 0x0038($sp) -/* 01F64 80972EB4 AFB00034 */ sw $s0, 0x0034($sp) -/* 01F68 80972EB8 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 01F6C 80972EBC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 01F70 80972EC0 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 01F74 80972EC4 51C00059 */ beql $t6, $zero, .L8097302C -/* 01F78 80972EC8 8FBF003C */ lw $ra, 0x003C($sp) -/* 01F7C 80972ECC 8486018C */ lh $a2, 0x018C($a0) ## 0000018C -/* 01F80 80972ED0 00067880 */ sll $t7, $a2, 2 -/* 01F84 80972ED4 00AFC021 */ addu $t8, $a1, $t7 -/* 01F88 80972ED8 8F191D8C */ lw $t9, 0x1D8C($t8) ## 00001D8C -/* 01F8C 80972EDC 53200053 */ beql $t9, $zero, .L8097302C -/* 01F90 80972EE0 8FBF003C */ lw $ra, 0x003C($sp) -/* 01F94 80972EE4 0C25D96B */ jal func_809765AC -/* 01F98 80972EE8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01F9C 80972EEC 8628018C */ lh $t0, 0x018C($s1) ## 0000018C -/* 01FA0 80972EF0 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 01FA4 80972EF4 26041C24 */ addiu $a0, $s0, 0x1C24 ## $a0 = 00001C24 -/* 01FA8 80972EF8 00084880 */ sll $t1, $t0, 2 -/* 01FAC 80972EFC 02095021 */ addu $t2, $s0, $t1 -/* 01FB0 80972F00 8D4B1D8C */ lw $t3, 0x1D8C($t2) ## 00001D8C -/* 01FB4 80972F04 956C0000 */ lhu $t4, 0x0000($t3) ## 00000000 -/* 01FB8 80972F08 15810018 */ bne $t4, $at, .L80972F6C -/* 01FBC 80972F0C 00000000 */ nop -/* 01FC0 80972F10 C6240024 */ lwc1 $f4, 0x0024($s1) ## 00000024 -/* 01FC4 80972F14 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 01FC8 80972F18 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01FCC 80972F1C E7A40010 */ swc1 $f4, 0x0010($sp) -/* 01FD0 80972F20 C6260028 */ lwc1 $f6, 0x0028($s1) ## 00000028 -/* 01FD4 80972F24 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 01FD8 80972F28 2407008B */ addiu $a3, $zero, 0x008B ## $a3 = 0000008B -/* 01FDC 80972F2C E7A60014 */ swc1 $f6, 0x0014($sp) -/* 01FE0 80972F30 C628002C */ lwc1 $f8, 0x002C($s1) ## 0000002C -/* 01FE4 80972F34 AFAD0028 */ sw $t5, 0x0028($sp) -/* 01FE8 80972F38 AFA00024 */ sw $zero, 0x0024($sp) -/* 01FEC 80972F3C AFA00020 */ sw $zero, 0x0020($sp) -/* 01FF0 80972F40 AFA0001C */ sw $zero, 0x001C($sp) -/* 01FF4 80972F44 0C00C916 */ jal Actor_SpawnAsChild - -/* 01FF8 80972F48 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 01FFC 80972F4C 10400007 */ beq $v0, $zero, .L80972F6C -/* 02000 80972F50 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 02004 80972F54 3C0E8097 */ lui $t6, %hi(func_809729B8) ## $t6 = 80970000 -/* 02008 80972F58 25CE29B8 */ addiu $t6, $t6, %lo(func_809729B8) ## $t6 = 809729B8 -/* 0200C 80972F5C 3C053CA3 */ lui $a1, 0x3CA3 ## $a1 = 3CA30000 -/* 02010 80972F60 AC4E0194 */ sw $t6, 0x0194($v0) ## 00000194 -/* 02014 80972F64 0C00B58B */ jal Actor_SetScale - -/* 02018 80972F68 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3CA3D70A -.L80972F6C: -/* 0201C 80972F6C 3C038016 */ lui $v1, %hi(gSaveContext) -/* 02020 80972F70 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 02024 80972F74 8C6F0000 */ lw $t7, 0x0000($v1) ## 8015E660 -/* 02028 80972F78 240100A0 */ addiu $at, $zero, 0x00A0 ## $at = 000000A0 -/* 0202C 80972F7C 55E1002B */ bnel $t7, $at, .L8097302C -/* 02030 80972F80 8FBF003C */ lw $ra, 0x003C($sp) -/* 02034 80972F84 8C621360 */ lw $v0, 0x1360($v1) ## 8015F9C0 -/* 02038 80972F88 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 0203C 80972F8C 10410007 */ beq $v0, $at, .L80972FAC -/* 02040 80972F90 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 02044 80972F94 10410014 */ beq $v0, $at, .L80972FE8 -/* 02048 80972F98 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 0204C 80972F9C 5041001C */ beql $v0, $at, .L80973010 -/* 02050 80972FA0 96191D74 */ lhu $t9, 0x1D74($s0) ## 00001D74 -/* 02054 80972FA4 10000021 */ beq $zero, $zero, .L8097302C -/* 02058 80972FA8 8FBF003C */ lw $ra, 0x003C($sp) -.L80972FAC: -/* 0205C 80972FAC 96021D74 */ lhu $v0, 0x1D74($s0) ## 00001D74 -/* 02060 80972FB0 24010120 */ addiu $at, $zero, 0x0120 ## $at = 00000120 -/* 02064 80972FB4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02068 80972FB8 54410005 */ bnel $v0, $at, .L80972FD0 -/* 0206C 80972FBC 2401027B */ addiu $at, $zero, 0x027B ## $at = 0000027B -/* 02070 80972FC0 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 02074 80972FC4 24051840 */ addiu $a1, $zero, 0x1840 ## $a1 = 00001840 -/* 02078 80972FC8 96021D74 */ lhu $v0, 0x1D74($s0) ## 00001D74 -/* 0207C 80972FCC 2401027B */ addiu $at, $zero, 0x027B ## $at = 0000027B -.L80972FD0: -/* 02080 80972FD0 14410015 */ bne $v0, $at, .L80973028 -/* 02084 80972FD4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02088 80972FD8 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0208C 80972FDC 24051840 */ addiu $a1, $zero, 0x1840 ## $a1 = 00001840 -/* 02090 80972FE0 10000012 */ beq $zero, $zero, .L8097302C -/* 02094 80972FE4 8FBF003C */ lw $ra, 0x003C($sp) -.L80972FE8: -/* 02098 80972FE8 96181D74 */ lhu $t8, 0x1D74($s0) ## 00001D74 -/* 0209C 80972FEC 24010037 */ addiu $at, $zero, 0x0037 ## $at = 00000037 -/* 020A0 80972FF0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 020A4 80972FF4 5701000D */ bnel $t8, $at, .L8097302C -/* 020A8 80972FF8 8FBF003C */ lw $ra, 0x003C($sp) -/* 020AC 80972FFC 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 020B0 80973000 24051841 */ addiu $a1, $zero, 0x1841 ## $a1 = 00001841 -/* 020B4 80973004 10000009 */ beq $zero, $zero, .L8097302C -/* 020B8 80973008 8FBF003C */ lw $ra, 0x003C($sp) -/* 020BC 8097300C 96191D74 */ lhu $t9, 0x1D74($s0) ## 00001D74 -.L80973010: -/* 020C0 80973010 2401015E */ addiu $at, $zero, 0x015E ## $at = 0000015E -/* 020C4 80973014 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 020C8 80973018 57210004 */ bnel $t9, $at, .L8097302C -/* 020CC 8097301C 8FBF003C */ lw $ra, 0x003C($sp) -/* 020D0 80973020 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 020D4 80973024 24051841 */ addiu $a1, $zero, 0x1841 ## $a1 = 00001841 -.L80973028: -/* 020D8 80973028 8FBF003C */ lw $ra, 0x003C($sp) -.L8097302C: -/* 020DC 8097302C 8FB00034 */ lw $s0, 0x0034($sp) -/* 020E0 80973030 8FB10038 */ lw $s1, 0x0038($sp) -/* 020E4 80973034 03E00008 */ jr $ra -/* 020E8 80973038 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097303C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097303C.s deleted file mode 100644 index 1442f1ba6b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097303C.s +++ /dev/null @@ -1,141 +0,0 @@ -glabel func_8097303C -/* 020EC 8097303C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 020F0 80973040 AFBF0034 */ sw $ra, 0x0034($sp) -/* 020F4 80973044 AFB10030 */ sw $s1, 0x0030($sp) -/* 020F8 80973048 AFB0002C */ sw $s0, 0x002C($sp) -/* 020FC 8097304C 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 02100 80973050 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02104 80973054 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 02108 80973058 51C00070 */ beql $t6, $zero, .L8097321C -/* 0210C 8097305C 8FBF0034 */ lw $ra, 0x0034($sp) -/* 02110 80973060 8486018C */ lh $a2, 0x018C($a0) ## 0000018C -/* 02114 80973064 00067880 */ sll $t7, $a2, 2 -/* 02118 80973068 00AFC021 */ addu $t8, $a1, $t7 -/* 0211C 8097306C 8F191D8C */ lw $t9, 0x1D8C($t8) ## 00001D8C -/* 02120 80973070 5320006A */ beql $t9, $zero, .L8097321C -/* 02124 80973074 8FBF0034 */ lw $ra, 0x0034($sp) -/* 02128 80973078 0C25D96B */ jal func_809765AC -/* 0212C 8097307C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 02130 80973080 8608018C */ lh $t0, 0x018C($s0) ## 0000018C -/* 02134 80973084 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 02138 80973088 00084880 */ sll $t1, $t0, 2 -/* 0213C 8097308C 02295021 */ addu $t2, $s1, $t1 -/* 02140 80973090 8D4B1D8C */ lw $t3, 0x1D8C($t2) ## 00001D8C -/* 02144 80973094 956C0000 */ lhu $t4, 0x0000($t3) ## 00000000 -/* 02148 80973098 1581001E */ bne $t4, $at, .L80973114 -/* 0214C 8097309C 00000000 */ nop -/* 02150 809730A0 86020188 */ lh $v0, 0x0188($s0) ## 00000188 -/* 02154 809730A4 10400003 */ beq $v0, $zero, .L809730B4 -/* 02158 809730A8 244DFFFF */ addiu $t5, $v0, 0xFFFF ## $t5 = FFFFFFFF -/* 0215C 809730AC 10000019 */ beq $zero, $zero, .L80973114 -/* 02160 809730B0 A60D0188 */ sh $t5, 0x0188($s0) ## 00000188 -.L809730B4: -/* 02164 809730B4 920E0185 */ lbu $t6, 0x0185($s0) ## 00000185 -/* 02168 809730B8 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 0216C 809730BC 8E070024 */ lw $a3, 0x0024($s0) ## 00000024 -/* 02170 809730C0 A60E0188 */ sh $t6, 0x0188($s0) ## 00000188 -/* 02174 809730C4 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 02178 809730C8 C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C -/* 0217C 809730CC 24090007 */ addiu $t1, $zero, 0x0007 ## $t1 = 00000007 -/* 02180 809730D0 26241C24 */ addiu $a0, $s1, 0x1C24 ## $a0 = 00001C24 -/* 02184 809730D4 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 02188 809730D8 860F0030 */ lh $t7, 0x0030($s0) ## 00000030 -/* 0218C 809730DC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 02190 809730E0 2406008B */ addiu $a2, $zero, 0x008B ## $a2 = 0000008B -/* 02194 809730E4 25F84000 */ addiu $t8, $t7, 0x4000 ## $t8 = 00004000 -/* 02198 809730E8 AFB80018 */ sw $t8, 0x0018($sp) -/* 0219C 809730EC 86190032 */ lh $t9, 0x0032($s0) ## 00000032 -/* 021A0 809730F0 AFB9001C */ sw $t9, 0x001C($sp) -/* 021A4 809730F4 86080034 */ lh $t0, 0x0034($s0) ## 00000034 -/* 021A8 809730F8 AFA90024 */ sw $t1, 0x0024($sp) -/* 021AC 809730FC 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 021B0 80973100 AFA80020 */ sw $t0, 0x0020($sp) -/* 021B4 80973104 10400003 */ beq $v0, $zero, .L80973114 -/* 021B8 80973108 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 021BC 8097310C 0C00B58B */ jal Actor_SetScale - -/* 021C0 80973110 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -.L80973114: -/* 021C4 80973114 3C038016 */ lui $v1, %hi(gSaveContext) -/* 021C8 80973118 8C63E660 */ lw $v1, %lo(gSaveContext)($v1) -/* 021CC 8097311C 240100A0 */ addiu $at, $zero, 0x00A0 ## $at = 000000A0 -/* 021D0 80973120 3C028016 */ lui $v0, %hi(gSaveContext+0x1360) -/* 021D4 80973124 54610029 */ bnel $v1, $at, .L809731CC -/* 021D8 80973128 2401013D */ addiu $at, $zero, 0x013D ## $at = 0000013D -/* 021DC 8097312C 8C42F9C0 */ lw $v0, %lo(gSaveContext+0x1360)($v0) -/* 021E0 80973130 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 021E4 80973134 10410007 */ beq $v0, $at, .L80973154 -/* 021E8 80973138 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 021EC 8097313C 1041000F */ beq $v0, $at, .L8097317C -/* 021F0 80973140 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 021F4 80973144 50410018 */ beql $v0, $at, .L809731A8 -/* 021F8 80973148 962C1D74 */ lhu $t4, 0x1D74($s1) ## 00001D74 -/* 021FC 8097314C 1000001F */ beq $zero, $zero, .L809731CC -/* 02200 80973150 2401013D */ addiu $at, $zero, 0x013D ## $at = 0000013D -.L80973154: -/* 02204 80973154 962A1D74 */ lhu $t2, 0x1D74($s1) ## 00001D74 -/* 02208 80973158 2401012A */ addiu $at, $zero, 0x012A ## $at = 0000012A -/* 0220C 8097315C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02210 80973160 5541001A */ bnel $t2, $at, .L809731CC -/* 02214 80973164 2401013D */ addiu $at, $zero, 0x013D ## $at = 0000013D -/* 02218 80973168 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0221C 8097316C 24051840 */ addiu $a1, $zero, 0x1840 ## $a1 = 00001840 -/* 02220 80973170 3C038016 */ lui $v1, %hi(gSaveContext) -/* 02224 80973174 10000014 */ beq $zero, $zero, .L809731C8 -/* 02228 80973178 8C63E660 */ lw $v1, %lo(gSaveContext)($v1) -.L8097317C: -/* 0222C 8097317C 962B1D74 */ lhu $t3, 0x1D74($s1) ## 00001D74 -/* 02230 80973180 24010069 */ addiu $at, $zero, 0x0069 ## $at = 00000069 -/* 02234 80973184 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02238 80973188 55610010 */ bnel $t3, $at, .L809731CC -/* 0223C 8097318C 2401013D */ addiu $at, $zero, 0x013D ## $at = 0000013D -/* 02240 80973190 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 02244 80973194 24051841 */ addiu $a1, $zero, 0x1841 ## $a1 = 00001841 -/* 02248 80973198 3C038016 */ lui $v1, %hi(gSaveContext) -/* 0224C 8097319C 1000000A */ beq $zero, $zero, .L809731C8 -/* 02250 809731A0 8C63E660 */ lw $v1, %lo(gSaveContext)($v1) -/* 02254 809731A4 962C1D74 */ lhu $t4, 0x1D74($s1) ## 00001D74 -.L809731A8: -/* 02258 809731A8 24010168 */ addiu $at, $zero, 0x0168 ## $at = 00000168 -/* 0225C 809731AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02260 809731B0 55810006 */ bnel $t4, $at, .L809731CC -/* 02264 809731B4 2401013D */ addiu $at, $zero, 0x013D ## $at = 0000013D -/* 02268 809731B8 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0226C 809731BC 24051841 */ addiu $a1, $zero, 0x1841 ## $a1 = 00001841 -/* 02270 809731C0 3C038016 */ lui $v1, %hi(gSaveContext) -/* 02274 809731C4 8C63E660 */ lw $v1, %lo(gSaveContext)($v1) -.L809731C8: -/* 02278 809731C8 2401013D */ addiu $at, $zero, 0x013D ## $at = 0000013D -.L809731CC: -/* 0227C 809731CC 14610012 */ bne $v1, $at, .L80973218 -/* 02280 809731D0 3C0D8016 */ lui $t5, %hi(gSaveContext+0x1360) -/* 02284 809731D4 8DADF9C0 */ lw $t5, %lo(gSaveContext+0x1360)($t5) -/* 02288 809731D8 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 0228C 809731DC 55A1000F */ bnel $t5, $at, .L8097321C -/* 02290 809731E0 8FBF0034 */ lw $ra, 0x0034($sp) -/* 02294 809731E4 96221D74 */ lhu $v0, 0x1D74($s1) ## 00001D74 -/* 02298 809731E8 24010048 */ addiu $at, $zero, 0x0048 ## $at = 00000048 -/* 0229C 809731EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 022A0 809731F0 54410005 */ bnel $v0, $at, .L80973208 -/* 022A4 809731F4 24010050 */ addiu $at, $zero, 0x0050 ## $at = 00000050 -/* 022A8 809731F8 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 022AC 809731FC 24051841 */ addiu $a1, $zero, 0x1841 ## $a1 = 00001841 -/* 022B0 80973200 96221D74 */ lhu $v0, 0x1D74($s1) ## 00001D74 -/* 022B4 80973204 24010050 */ addiu $at, $zero, 0x0050 ## $at = 00000050 -.L80973208: -/* 022B8 80973208 54410004 */ bnel $v0, $at, .L8097321C -/* 022BC 8097320C 8FBF0034 */ lw $ra, 0x0034($sp) -/* 022C0 80973210 0C03CFCF */ jal func_800F3F3C -/* 022C4 80973214 24040004 */ addiu $a0, $zero, 0x0004 ## $a0 = 00000004 -.L80973218: -/* 022C8 80973218 8FBF0034 */ lw $ra, 0x0034($sp) -.L8097321C: -/* 022CC 8097321C 8FB0002C */ lw $s0, 0x002C($sp) -/* 022D0 80973220 8FB10030 */ lw $s1, 0x0030($sp) -/* 022D4 80973224 03E00008 */ jr $ra -/* 022D8 80973228 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097322C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097322C.s deleted file mode 100644 index 4fa42fab12..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097322C.s +++ /dev/null @@ -1,123 +0,0 @@ -.late_rodata -glabel D_80976D24 - .float 0.23 - -glabel D_80976D28 - .float 0.15 - -.text -glabel func_8097322C -/* 022DC 8097322C 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 022E0 80973230 AFBF003C */ sw $ra, 0x003C($sp) -/* 022E4 80973234 AFB10038 */ sw $s1, 0x0038($sp) -/* 022E8 80973238 AFB00034 */ sw $s0, 0x0034($sp) -/* 022EC 8097323C 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 022F0 80973240 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 022F4 80973244 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 022F8 80973248 51C0005B */ beql $t6, $zero, .L809733B8 -/* 022FC 8097324C 8FBF003C */ lw $ra, 0x003C($sp) -/* 02300 80973250 8486018C */ lh $a2, 0x018C($a0) ## 0000018C -/* 02304 80973254 00067880 */ sll $t7, $a2, 2 -/* 02308 80973258 00AFC021 */ addu $t8, $a1, $t7 -/* 0230C 8097325C 8F191D8C */ lw $t9, 0x1D8C($t8) ## 00001D8C -/* 02310 80973260 53200055 */ beql $t9, $zero, .L809733B8 -/* 02314 80973264 8FBF003C */ lw $ra, 0x003C($sp) -/* 02318 80973268 0C25D96B */ jal func_809765AC -/* 0231C 8097326C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 02320 80973270 8608018C */ lh $t0, 0x018C($s0) ## 0000018C -/* 02324 80973274 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 02328 80973278 00084880 */ sll $t1, $t0, 2 -/* 0232C 8097327C 02295021 */ addu $t2, $s1, $t1 -/* 02330 80973280 8D4B1D8C */ lw $t3, 0x1D8C($t2) ## 00001D8C -/* 02334 80973284 956C0000 */ lhu $t4, 0x0000($t3) ## 00000000 -/* 02338 80973288 15810021 */ bne $t4, $at, .L80973310 -/* 0233C 8097328C 00000000 */ nop -/* 02340 80973290 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 02344 80973294 3C014316 */ lui $at, 0x4316 ## $at = 43160000 -/* 02348 80973298 44814000 */ mtc1 $at, $f8 ## $f8 = 150.00 -/* 0234C 8097329C E7A40010 */ swc1 $f4, 0x0010($sp) -/* 02350 809732A0 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 02354 809732A4 240D0003 */ addiu $t5, $zero, 0x0003 ## $t5 = 00000003 -/* 02358 809732A8 26241C24 */ addiu $a0, $s1, 0x1C24 ## $a0 = 00001C24 -/* 0235C 809732AC 46083281 */ sub.s $f10, $f6, $f8 -/* 02360 809732B0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02364 809732B4 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 -/* 02368 809732B8 2407008B */ addiu $a3, $zero, 0x008B ## $a3 = 0000008B -/* 0236C 809732BC E7AA0014 */ swc1 $f10, 0x0014($sp) -/* 02370 809732C0 C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C -/* 02374 809732C4 AFAD0028 */ sw $t5, 0x0028($sp) -/* 02378 809732C8 AFA00024 */ sw $zero, 0x0024($sp) -/* 0237C 809732CC AFA00020 */ sw $zero, 0x0020($sp) -/* 02380 809732D0 AFA0001C */ sw $zero, 0x001C($sp) -/* 02384 809732D4 0C00C916 */ jal Actor_SpawnAsChild - -/* 02388 809732D8 E7B00018 */ swc1 $f16, 0x0018($sp) -/* 0238C 809732DC 10400008 */ beq $v0, $zero, .L80973300 -/* 02390 809732E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02394 809732E4 3C018097 */ lui $at, %hi(D_80976D24) ## $at = 80970000 -/* 02398 809732E8 C4206D24 */ lwc1 $f0, %lo(D_80976D24)($at) -/* 0239C 809732EC 3C018097 */ lui $at, %hi(D_80976D28) ## $at = 80970000 -/* 023A0 809732F0 E4400050 */ swc1 $f0, 0x0050($v0) ## 00000050 -/* 023A4 809732F4 C4326D28 */ lwc1 $f18, %lo(D_80976D28)($at) -/* 023A8 809732F8 E4400058 */ swc1 $f0, 0x0058($v0) ## 00000058 -/* 023AC 809732FC E4520054 */ swc1 $f18, 0x0054($v0) ## 00000054 -.L80973300: -/* 023B0 80973300 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 023B4 80973304 24051841 */ addiu $a1, $zero, 0x1841 ## $a1 = 00001841 -/* 023B8 80973308 0C03CFCF */ jal func_800F3F3C -/* 023BC 8097330C 24040003 */ addiu $a0, $zero, 0x0003 ## $a0 = 00000003 -.L80973310: -/* 023C0 80973310 3C038016 */ lui $v1, %hi(gSaveContext) -/* 023C4 80973314 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 023C8 80973318 8C6E0000 */ lw $t6, 0x0000($v1) ## 8015E660 -/* 023CC 8097331C 240100A0 */ addiu $at, $zero, 0x00A0 ## $at = 000000A0 -/* 023D0 80973320 55C10025 */ bnel $t6, $at, .L809733B8 -/* 023D4 80973324 8FBF003C */ lw $ra, 0x003C($sp) -/* 023D8 80973328 8C621360 */ lw $v0, 0x1360($v1) ## 8015F9C0 -/* 023DC 8097332C 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 023E0 80973330 10410007 */ beq $v0, $at, .L80973350 -/* 023E4 80973334 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 023E8 80973338 1041000E */ beq $v0, $at, .L80973374 -/* 023EC 8097333C 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 023F0 80973340 50410016 */ beql $v0, $at, .L8097339C -/* 023F4 80973344 96391D74 */ lhu $t9, 0x1D74($s1) ## 00001D74 -/* 023F8 80973348 1000001B */ beq $zero, $zero, .L809733B8 -/* 023FC 8097334C 8FBF003C */ lw $ra, 0x003C($sp) -.L80973350: -/* 02400 80973350 962F1D74 */ lhu $t7, 0x1D74($s1) ## 00001D74 -/* 02404 80973354 2401013B */ addiu $at, $zero, 0x013B ## $at = 0000013B -/* 02408 80973358 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0240C 8097335C 55E10016 */ bnel $t7, $at, .L809733B8 -/* 02410 80973360 8FBF003C */ lw $ra, 0x003C($sp) -/* 02414 80973364 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 02418 80973368 24051840 */ addiu $a1, $zero, 0x1840 ## $a1 = 00001840 -/* 0241C 8097336C 10000012 */ beq $zero, $zero, .L809733B8 -/* 02420 80973370 8FBF003C */ lw $ra, 0x003C($sp) -.L80973374: -/* 02424 80973374 96381D74 */ lhu $t8, 0x1D74($s1) ## 00001D74 -/* 02428 80973378 24010050 */ addiu $at, $zero, 0x0050 ## $at = 00000050 -/* 0242C 8097337C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02430 80973380 5701000D */ bnel $t8, $at, .L809733B8 -/* 02434 80973384 8FBF003C */ lw $ra, 0x003C($sp) -/* 02438 80973388 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0243C 8097338C 24051841 */ addiu $a1, $zero, 0x1841 ## $a1 = 00001841 -/* 02440 80973390 10000009 */ beq $zero, $zero, .L809733B8 -/* 02444 80973394 8FBF003C */ lw $ra, 0x003C($sp) -/* 02448 80973398 96391D74 */ lhu $t9, 0x1D74($s1) ## 00001D74 -.L8097339C: -/* 0244C 8097339C 24010172 */ addiu $at, $zero, 0x0172 ## $at = 00000172 -/* 02450 809733A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02454 809733A4 57210004 */ bnel $t9, $at, .L809733B8 -/* 02458 809733A8 8FBF003C */ lw $ra, 0x003C($sp) -/* 0245C 809733AC 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 02460 809733B0 24051841 */ addiu $a1, $zero, 0x1841 ## $a1 = 00001841 -/* 02464 809733B4 8FBF003C */ lw $ra, 0x003C($sp) -.L809733B8: -/* 02468 809733B8 8FB00034 */ lw $s0, 0x0034($sp) -/* 0246C 809733BC 8FB10038 */ lw $s1, 0x0038($sp) -/* 02470 809733C0 03E00008 */ jr $ra -/* 02474 809733C4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809733C8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809733C8.s deleted file mode 100644 index 44c23ac2db..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809733C8.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_809733C8 -/* 02478 809733C8 AFA40000 */ sw $a0, 0x0000($sp) -/* 0247C 809733CC AFA50004 */ sw $a1, 0x0004($sp) -/* 02480 809733D0 AFA60008 */ sw $a2, 0x0008($sp) -/* 02484 809733D4 C4E00024 */ lwc1 $f0, 0x0024($a3) ## 00000024 -/* 02488 809733D8 C7A40000 */ lwc1 $f4, 0x0000($sp) -/* 0248C 809733DC C7AC0010 */ lwc1 $f12, 0x0010($sp) -/* 02490 809733E0 C4E20028 */ lwc1 $f2, 0x0028($a3) ## 00000028 -/* 02494 809733E4 46002181 */ sub.s $f6, $f4, $f0 -/* 02498 809733E8 C4EE002C */ lwc1 $f14, 0x002C($a3) ## 0000002C -/* 0249C 809733EC 460C3202 */ mul.s $f8, $f6, $f12 -/* 024A0 809733F0 46080280 */ add.s $f10, $f0, $f8 -/* 024A4 809733F4 E4EA0024 */ swc1 $f10, 0x0024($a3) ## 00000024 -/* 024A8 809733F8 C7B00004 */ lwc1 $f16, 0x0004($sp) -/* 024AC 809733FC 46028481 */ sub.s $f18, $f16, $f2 -/* 024B0 80973400 460C9102 */ mul.s $f4, $f18, $f12 -/* 024B4 80973404 46041180 */ add.s $f6, $f2, $f4 -/* 024B8 80973408 E4E60028 */ swc1 $f6, 0x0028($a3) ## 00000028 -/* 024BC 8097340C C7A80008 */ lwc1 $f8, 0x0008($sp) -/* 024C0 80973410 460E4281 */ sub.s $f10, $f8, $f14 -/* 024C4 80973414 460C5402 */ mul.s $f16, $f10, $f12 -/* 024C8 80973418 46107480 */ add.s $f18, $f14, $f16 -/* 024CC 8097341C 03E00008 */ jr $ra -/* 024D0 80973420 E4F2002C */ swc1 $f18, 0x002C($a3) ## 0000002C diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80973424.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80973424.s deleted file mode 100644 index a28179396d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80973424.s +++ /dev/null @@ -1,68 +0,0 @@ -glabel func_80973424 -/* 024D4 80973424 90820184 */ lbu $v0, 0x0184($a0) ## 00000184 -/* 024D8 80973428 24010013 */ addiu $at, $zero, 0x0013 ## $at = 00000013 -/* 024DC 8097342C 240300FF */ addiu $v1, $zero, 0x00FF ## $v1 = 000000FF -/* 024E0 80973430 10410009 */ beq $v0, $at, .L80973458 -/* 024E4 80973434 24050096 */ addiu $a1, $zero, 0x0096 ## $a1 = 00000096 -/* 024E8 80973438 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 -/* 024EC 8097343C 10410016 */ beq $v0, $at, .L80973498 -/* 024F0 80973440 240300FF */ addiu $v1, $zero, 0x00FF ## $v1 = 000000FF -/* 024F4 80973444 24010015 */ addiu $at, $zero, 0x0015 ## $at = 00000015 -/* 024F8 80973448 10410024 */ beq $v0, $at, .L809734DC -/* 024FC 8097344C 240300FF */ addiu $v1, $zero, 0x00FF ## $v1 = 000000FF -/* 02500 80973450 03E00008 */ jr $ra -/* 02504 80973454 00000000 */ nop -.L80973458: -/* 02508 80973458 240600AA */ addiu $a2, $zero, 0x00AA ## $a2 = 000000AA -/* 0250C 8097345C 240E00A0 */ addiu $t6, $zero, 0x00A0 ## $t6 = 000000A0 -/* 02510 80973460 240F0078 */ addiu $t7, $zero, 0x0078 ## $t7 = 00000078 -/* 02514 80973464 A08E017A */ sb $t6, 0x017A($a0) ## 0000017A -/* 02518 80973468 A0830178 */ sb $v1, 0x0178($a0) ## 00000178 -/* 0251C 8097346C A0830179 */ sb $v1, 0x0179($a0) ## 00000179 -/* 02520 80973470 A080017B */ sb $zero, 0x017B($a0) ## 0000017B -/* 02524 80973474 A083017C */ sb $v1, 0x017C($a0) ## 0000017C -/* 02528 80973478 A080017D */ sb $zero, 0x017D($a0) ## 0000017D -/* 0252C 8097347C A0860180 */ sb $a2, 0x0180($a0) ## 00000180 -/* 02530 80973480 A083017E */ sb $v1, 0x017E($a0) ## 0000017E -/* 02534 80973484 A083017F */ sb $v1, 0x017F($a0) ## 0000017F -/* 02538 80973488 A08F0182 */ sb $t7, 0x0182($a0) ## 00000182 -/* 0253C 8097348C A0850181 */ sb $a1, 0x0181($a0) ## 00000181 -/* 02540 80973490 03E00008 */ jr $ra -/* 02544 80973494 A0800183 */ sb $zero, 0x0183($a0) ## 00000183 -.L80973498: -/* 02548 80973498 24050096 */ addiu $a1, $zero, 0x0096 ## $a1 = 00000096 -/* 0254C 8097349C 240600AA */ addiu $a2, $zero, 0x00AA ## $a2 = 000000AA -/* 02550 809734A0 24180064 */ addiu $t8, $zero, 0x0064 ## $t8 = 00000064 -/* 02554 809734A4 24190078 */ addiu $t9, $zero, 0x0078 ## $t9 = 00000078 -/* 02558 809734A8 A0860179 */ sb $a2, 0x0179($a0) ## 00000179 -/* 0255C 809734AC A0830178 */ sb $v1, 0x0178($a0) ## 00000178 -/* 02560 809734B0 A083017A */ sb $v1, 0x017A($a0) ## 0000017A -/* 02564 809734B4 A098017D */ sb $t8, 0x017D($a0) ## 0000017D -/* 02568 809734B8 A083017B */ sb $v1, 0x017B($a0) ## 0000017B -/* 0256C 809734BC A080017C */ sb $zero, 0x017C($a0) ## 0000017C -/* 02570 809734C0 A0860180 */ sb $a2, 0x0180($a0) ## 00000180 -/* 02574 809734C4 A083017E */ sb $v1, 0x017E($a0) ## 0000017E -/* 02578 809734C8 A083017F */ sb $v1, 0x017F($a0) ## 0000017F -/* 0257C 809734CC A0990182 */ sb $t9, 0x0182($a0) ## 00000182 -/* 02580 809734D0 A0850181 */ sb $a1, 0x0181($a0) ## 00000181 -/* 02584 809734D4 03E00008 */ jr $ra -/* 02588 809734D8 A0800183 */ sb $zero, 0x0183($a0) ## 00000183 -.L809734DC: -/* 0258C 809734DC 24020032 */ addiu $v0, $zero, 0x0032 ## $v0 = 00000032 -/* 02590 809734E0 24050096 */ addiu $a1, $zero, 0x0096 ## $a1 = 00000096 -/* 02594 809734E4 240600AA */ addiu $a2, $zero, 0x00AA ## $a2 = 000000AA -/* 02598 809734E8 24080078 */ addiu $t0, $zero, 0x0078 ## $t0 = 00000078 -/* 0259C 809734EC A0820178 */ sb $v0, 0x0178($a0) ## 00000178 -/* 025A0 809734F0 A0830179 */ sb $v1, 0x0179($a0) ## 00000179 -/* 025A4 809734F4 A083017A */ sb $v1, 0x017A($a0) ## 0000017A -/* 025A8 809734F8 A085017D */ sb $a1, 0x017D($a0) ## 0000017D -/* 025AC 809734FC A082017B */ sb $v0, 0x017B($a0) ## 0000017B -/* 025B0 80973500 A080017C */ sb $zero, 0x017C($a0) ## 0000017C -/* 025B4 80973504 A0860180 */ sb $a2, 0x0180($a0) ## 00000180 -/* 025B8 80973508 A083017E */ sb $v1, 0x017E($a0) ## 0000017E -/* 025BC 8097350C A083017F */ sb $v1, 0x017F($a0) ## 0000017F -/* 025C0 80973510 A0880182 */ sb $t0, 0x0182($a0) ## 00000182 -/* 025C4 80973514 A0850181 */ sb $a1, 0x0181($a0) ## 00000181 -/* 025C8 80973518 A0800183 */ sb $zero, 0x0183($a0) ## 00000183 -/* 025CC 8097351C 03E00008 */ jr $ra -/* 025D0 80973520 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80973524.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80973524.s deleted file mode 100644 index 1bb10ee05a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80973524.s +++ /dev/null @@ -1,516 +0,0 @@ -glabel func_80973524 -/* 025D4 80973524 44856000 */ mtc1 $a1, $f12 ## $f12 = 0.00 -/* 025D8 80973528 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 025DC 8097352C AFBF0014 */ sw $ra, 0x0014($sp) -/* 025E0 80973530 AFA40018 */ sw $a0, 0x0018($sp) -/* 025E4 80973534 0C25CD09 */ jal func_80973424 -/* 025E8 80973538 E7AC001C */ swc1 $f12, 0x001C($sp) -/* 025EC 8097353C 8FA40018 */ lw $a0, 0x0018($sp) -/* 025F0 80973540 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 025F4 80973544 44812000 */ mtc1 $at, $f4 ## $f4 = 255.00 -/* 025F8 80973548 908E0178 */ lbu $t6, 0x0178($a0) ## 00000178 -/* 025FC 8097354C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 02600 80973550 C7AC001C */ lwc1 $f12, 0x001C($sp) -/* 02604 80973554 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 02608 80973558 448E5000 */ mtc1 $t6, $f10 ## $f10 = 0.00 -/* 0260C 8097355C 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 02610 80973560 460C3201 */ sub.s $f8, $f6, $f12 -/* 02614 80973564 46805420 */ cvt.s.w $f16, $f10 -/* 02618 80973568 46082002 */ mul.s $f0, $f4, $f8 -/* 0261C 8097356C 00000000 */ nop -/* 02620 80973570 460C8482 */ mul.s $f18, $f16, $f12 -/* 02624 80973574 46009180 */ add.s $f6, $f18, $f0 -/* 02628 80973578 444FF800 */ cfc1 $t7, $31 -/* 0262C 8097357C 44D8F800 */ ctc1 $t8, $31 -/* 02630 80973580 00000000 */ nop -/* 02634 80973584 46003124 */ cvt.w.s $f4, $f6 -/* 02638 80973588 4458F800 */ cfc1 $t8, $31 -/* 0263C 8097358C 00000000 */ nop -/* 02640 80973590 33180078 */ andi $t8, $t8, 0x0078 ## $t8 = 00000000 -/* 02644 80973594 13000013 */ beq $t8, $zero, .L809735E4 -/* 02648 80973598 00000000 */ nop -/* 0264C 8097359C 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 02650 809735A0 44812000 */ mtc1 $at, $f4 ## $f4 = 2147483648.00 -/* 02654 809735A4 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 02658 809735A8 46043101 */ sub.s $f4, $f6, $f4 -/* 0265C 809735AC 44D8F800 */ ctc1 $t8, $31 -/* 02660 809735B0 00000000 */ nop -/* 02664 809735B4 46002124 */ cvt.w.s $f4, $f4 -/* 02668 809735B8 4458F800 */ cfc1 $t8, $31 -/* 0266C 809735BC 00000000 */ nop -/* 02670 809735C0 33180078 */ andi $t8, $t8, 0x0078 ## $t8 = 00000000 -/* 02674 809735C4 17000005 */ bne $t8, $zero, .L809735DC -/* 02678 809735C8 00000000 */ nop -/* 0267C 809735CC 44182000 */ mfc1 $t8, $f4 -/* 02680 809735D0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 02684 809735D4 10000007 */ beq $zero, $zero, .L809735F4 -/* 02688 809735D8 0301C025 */ or $t8, $t8, $at ## $t8 = 80000000 -.L809735DC: -/* 0268C 809735DC 10000005 */ beq $zero, $zero, .L809735F4 -/* 02690 809735E0 2418FFFF */ addiu $t8, $zero, 0xFFFF ## $t8 = FFFFFFFF -.L809735E4: -/* 02694 809735E4 44182000 */ mfc1 $t8, $f4 -/* 02698 809735E8 00000000 */ nop -/* 0269C 809735EC 0700FFFB */ bltz $t8, .L809735DC -/* 026A0 809735F0 00000000 */ nop -.L809735F4: -/* 026A4 809735F4 90990179 */ lbu $t9, 0x0179($a0) ## 00000179 -/* 026A8 809735F8 44CFF800 */ ctc1 $t7, $31 -/* 026AC 809735FC 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 026B0 80973600 44994000 */ mtc1 $t9, $f8 ## $f8 = 0.00 -/* 026B4 80973604 A0980178 */ sb $t8, 0x0178($a0) ## 00000178 -/* 026B8 80973608 468042A0 */ cvt.s.w $f10, $f8 -/* 026BC 8097360C 460C5402 */ mul.s $f16, $f10, $f12 -/* 026C0 80973610 46008480 */ add.s $f18, $f16, $f0 -/* 026C4 80973614 4448F800 */ cfc1 $t0, $31 -/* 026C8 80973618 44C9F800 */ ctc1 $t1, $31 -/* 026CC 8097361C 00000000 */ nop -/* 026D0 80973620 460091A4 */ cvt.w.s $f6, $f18 -/* 026D4 80973624 4449F800 */ cfc1 $t1, $31 -/* 026D8 80973628 00000000 */ nop -/* 026DC 8097362C 31290078 */ andi $t1, $t1, 0x0078 ## $t1 = 00000000 -/* 026E0 80973630 11200012 */ beq $t1, $zero, .L8097367C -/* 026E4 80973634 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 026E8 80973638 44813000 */ mtc1 $at, $f6 ## $f6 = 2147483648.00 -/* 026EC 8097363C 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 026F0 80973640 46069181 */ sub.s $f6, $f18, $f6 -/* 026F4 80973644 44C9F800 */ ctc1 $t1, $31 -/* 026F8 80973648 00000000 */ nop -/* 026FC 8097364C 460031A4 */ cvt.w.s $f6, $f6 -/* 02700 80973650 4449F800 */ cfc1 $t1, $31 -/* 02704 80973654 00000000 */ nop -/* 02708 80973658 31290078 */ andi $t1, $t1, 0x0078 ## $t1 = 00000000 -/* 0270C 8097365C 15200005 */ bne $t1, $zero, .L80973674 -/* 02710 80973660 00000000 */ nop -/* 02714 80973664 44093000 */ mfc1 $t1, $f6 -/* 02718 80973668 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0271C 8097366C 10000007 */ beq $zero, $zero, .L8097368C -/* 02720 80973670 01214825 */ or $t1, $t1, $at ## $t1 = 80000000 -.L80973674: -/* 02724 80973674 10000005 */ beq $zero, $zero, .L8097368C -/* 02728 80973678 2409FFFF */ addiu $t1, $zero, 0xFFFF ## $t1 = FFFFFFFF -.L8097367C: -/* 0272C 8097367C 44093000 */ mfc1 $t1, $f6 -/* 02730 80973680 00000000 */ nop -/* 02734 80973684 0520FFFB */ bltz $t1, .L80973674 -/* 02738 80973688 00000000 */ nop -.L8097368C: -/* 0273C 8097368C 908A017A */ lbu $t2, 0x017A($a0) ## 0000017A -/* 02740 80973690 44C8F800 */ ctc1 $t0, $31 -/* 02744 80973694 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 02748 80973698 448A2000 */ mtc1 $t2, $f4 ## $f4 = 0.00 -/* 0274C 8097369C A0890179 */ sb $t1, 0x0179($a0) ## 00000179 -/* 02750 809736A0 46802220 */ cvt.s.w $f8, $f4 -/* 02754 809736A4 460C4282 */ mul.s $f10, $f8, $f12 -/* 02758 809736A8 46005400 */ add.s $f16, $f10, $f0 -/* 0275C 809736AC 444BF800 */ cfc1 $t3, $31 -/* 02760 809736B0 44CCF800 */ ctc1 $t4, $31 -/* 02764 809736B4 00000000 */ nop -/* 02768 809736B8 460084A4 */ cvt.w.s $f18, $f16 -/* 0276C 809736BC 444CF800 */ cfc1 $t4, $31 -/* 02770 809736C0 00000000 */ nop -/* 02774 809736C4 318C0078 */ andi $t4, $t4, 0x0078 ## $t4 = 00000000 -/* 02778 809736C8 11800012 */ beq $t4, $zero, .L80973714 -/* 0277C 809736CC 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 02780 809736D0 44819000 */ mtc1 $at, $f18 ## $f18 = 2147483648.00 -/* 02784 809736D4 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 02788 809736D8 46128481 */ sub.s $f18, $f16, $f18 -/* 0278C 809736DC 44CCF800 */ ctc1 $t4, $31 -/* 02790 809736E0 00000000 */ nop -/* 02794 809736E4 460094A4 */ cvt.w.s $f18, $f18 -/* 02798 809736E8 444CF800 */ cfc1 $t4, $31 -/* 0279C 809736EC 00000000 */ nop -/* 027A0 809736F0 318C0078 */ andi $t4, $t4, 0x0078 ## $t4 = 00000000 -/* 027A4 809736F4 15800005 */ bne $t4, $zero, .L8097370C -/* 027A8 809736F8 00000000 */ nop -/* 027AC 809736FC 440C9000 */ mfc1 $t4, $f18 -/* 027B0 80973700 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 027B4 80973704 10000007 */ beq $zero, $zero, .L80973724 -/* 027B8 80973708 01816025 */ or $t4, $t4, $at ## $t4 = 80000000 -.L8097370C: -/* 027BC 8097370C 10000005 */ beq $zero, $zero, .L80973724 -/* 027C0 80973710 240CFFFF */ addiu $t4, $zero, 0xFFFF ## $t4 = FFFFFFFF -.L80973714: -/* 027C4 80973714 440C9000 */ mfc1 $t4, $f18 -/* 027C8 80973718 00000000 */ nop -/* 027CC 8097371C 0580FFFB */ bltz $t4, .L8097370C -/* 027D0 80973720 00000000 */ nop -.L80973724: -/* 027D4 80973724 908D017E */ lbu $t5, 0x017E($a0) ## 0000017E -/* 027D8 80973728 44CBF800 */ ctc1 $t3, $31 -/* 027DC 8097372C 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 027E0 80973730 448D3000 */ mtc1 $t5, $f6 ## $f6 = 0.00 -/* 027E4 80973734 A08C017A */ sb $t4, 0x017A($a0) ## 0000017A -/* 027E8 80973738 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 027EC 8097373C 46803120 */ cvt.s.w $f4, $f6 -/* 027F0 80973740 460C2202 */ mul.s $f8, $f4, $f12 -/* 027F4 80973744 46004280 */ add.s $f10, $f8, $f0 -/* 027F8 80973748 444EF800 */ cfc1 $t6, $31 -/* 027FC 8097374C 44CFF800 */ ctc1 $t7, $31 -/* 02800 80973750 00000000 */ nop -/* 02804 80973754 46005424 */ cvt.w.s $f16, $f10 -/* 02808 80973758 444FF800 */ cfc1 $t7, $31 -/* 0280C 8097375C 00000000 */ nop -/* 02810 80973760 31EF0078 */ andi $t7, $t7, 0x0078 ## $t7 = 00000000 -/* 02814 80973764 51E00013 */ beql $t7, $zero, .L809737B4 -/* 02818 80973768 440F8000 */ mfc1 $t7, $f16 -/* 0281C 8097376C 44818000 */ mtc1 $at, $f16 ## $f16 = 2147483648.00 -/* 02820 80973770 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 02824 80973774 46105401 */ sub.s $f16, $f10, $f16 -/* 02828 80973778 44CFF800 */ ctc1 $t7, $31 -/* 0282C 8097377C 00000000 */ nop -/* 02830 80973780 46008424 */ cvt.w.s $f16, $f16 -/* 02834 80973784 444FF800 */ cfc1 $t7, $31 -/* 02838 80973788 00000000 */ nop -/* 0283C 8097378C 31EF0078 */ andi $t7, $t7, 0x0078 ## $t7 = 00000000 -/* 02840 80973790 15E00005 */ bne $t7, $zero, .L809737A8 -/* 02844 80973794 00000000 */ nop -/* 02848 80973798 440F8000 */ mfc1 $t7, $f16 -/* 0284C 8097379C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 02850 809737A0 10000007 */ beq $zero, $zero, .L809737C0 -/* 02854 809737A4 01E17825 */ or $t7, $t7, $at ## $t7 = 80000000 -.L809737A8: -/* 02858 809737A8 10000005 */ beq $zero, $zero, .L809737C0 -/* 0285C 809737AC 240FFFFF */ addiu $t7, $zero, 0xFFFF ## $t7 = FFFFFFFF -/* 02860 809737B0 440F8000 */ mfc1 $t7, $f16 -.L809737B4: -/* 02864 809737B4 00000000 */ nop -/* 02868 809737B8 05E0FFFB */ bltz $t7, .L809737A8 -/* 0286C 809737BC 00000000 */ nop -.L809737C0: -/* 02870 809737C0 9098017F */ lbu $t8, 0x017F($a0) ## 0000017F -/* 02874 809737C4 44CEF800 */ ctc1 $t6, $31 -/* 02878 809737C8 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 0287C 809737CC 44989000 */ mtc1 $t8, $f18 ## $f18 = NaN -/* 02880 809737D0 A08F017E */ sb $t7, 0x017E($a0) ## 0000017E -/* 02884 809737D4 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 02888 809737D8 468091A0 */ cvt.s.w $f6, $f18 -/* 0288C 809737DC 460C3102 */ mul.s $f4, $f6, $f12 -/* 02890 809737E0 46002200 */ add.s $f8, $f4, $f0 -/* 02894 809737E4 4459F800 */ cfc1 $t9, $31 -/* 02898 809737E8 44C8F800 */ ctc1 $t0, $31 -/* 0289C 809737EC 00000000 */ nop -/* 028A0 809737F0 460042A4 */ cvt.w.s $f10, $f8 -/* 028A4 809737F4 4448F800 */ cfc1 $t0, $31 -/* 028A8 809737F8 00000000 */ nop -/* 028AC 809737FC 31080078 */ andi $t0, $t0, 0x0078 ## $t0 = 00000000 -/* 028B0 80973800 51000013 */ beql $t0, $zero, .L80973850 -/* 028B4 80973804 44085000 */ mfc1 $t0, $f10 -/* 028B8 80973808 44815000 */ mtc1 $at, $f10 ## $f10 = 2147483648.00 -/* 028BC 8097380C 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 028C0 80973810 460A4281 */ sub.s $f10, $f8, $f10 -/* 028C4 80973814 44C8F800 */ ctc1 $t0, $31 -/* 028C8 80973818 00000000 */ nop -/* 028CC 8097381C 460052A4 */ cvt.w.s $f10, $f10 -/* 028D0 80973820 4448F800 */ cfc1 $t0, $31 -/* 028D4 80973824 00000000 */ nop -/* 028D8 80973828 31080078 */ andi $t0, $t0, 0x0078 ## $t0 = 00000000 -/* 028DC 8097382C 15000005 */ bne $t0, $zero, .L80973844 -/* 028E0 80973830 00000000 */ nop -/* 028E4 80973834 44085000 */ mfc1 $t0, $f10 -/* 028E8 80973838 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 028EC 8097383C 10000007 */ beq $zero, $zero, .L8097385C -/* 028F0 80973840 01014025 */ or $t0, $t0, $at ## $t0 = 80000000 -.L80973844: -/* 028F4 80973844 10000005 */ beq $zero, $zero, .L8097385C -/* 028F8 80973848 2408FFFF */ addiu $t0, $zero, 0xFFFF ## $t0 = FFFFFFFF -/* 028FC 8097384C 44085000 */ mfc1 $t0, $f10 -.L80973850: -/* 02900 80973850 00000000 */ nop -/* 02904 80973854 0500FFFB */ bltz $t0, .L80973844 -/* 02908 80973858 00000000 */ nop -.L8097385C: -/* 0290C 8097385C 90890180 */ lbu $t1, 0x0180($a0) ## 00000180 -/* 02910 80973860 44D9F800 */ ctc1 $t9, $31 -/* 02914 80973864 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 02918 80973868 44898000 */ mtc1 $t1, $f16 ## $f16 = NaN -/* 0291C 8097386C A088017F */ sb $t0, 0x017F($a0) ## 0000017F -/* 02920 80973870 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 02924 80973874 468084A0 */ cvt.s.w $f18, $f16 -/* 02928 80973878 460C9182 */ mul.s $f6, $f18, $f12 -/* 0292C 8097387C 46003100 */ add.s $f4, $f6, $f0 -/* 02930 80973880 444AF800 */ cfc1 $t2, $31 -/* 02934 80973884 44CBF800 */ ctc1 $t3, $31 -/* 02938 80973888 00000000 */ nop -/* 0293C 8097388C 46002224 */ cvt.w.s $f8, $f4 -/* 02940 80973890 444BF800 */ cfc1 $t3, $31 -/* 02944 80973894 00000000 */ nop -/* 02948 80973898 316B0078 */ andi $t3, $t3, 0x0078 ## $t3 = 00000000 -/* 0294C 8097389C 51600013 */ beql $t3, $zero, .L809738EC -/* 02950 809738A0 440B4000 */ mfc1 $t3, $f8 -/* 02954 809738A4 44814000 */ mtc1 $at, $f8 ## $f8 = 2147483648.00 -/* 02958 809738A8 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 0295C 809738AC 46082201 */ sub.s $f8, $f4, $f8 -/* 02960 809738B0 44CBF800 */ ctc1 $t3, $31 -/* 02964 809738B4 00000000 */ nop -/* 02968 809738B8 46004224 */ cvt.w.s $f8, $f8 -/* 0296C 809738BC 444BF800 */ cfc1 $t3, $31 -/* 02970 809738C0 00000000 */ nop -/* 02974 809738C4 316B0078 */ andi $t3, $t3, 0x0078 ## $t3 = 00000000 -/* 02978 809738C8 15600005 */ bne $t3, $zero, .L809738E0 -/* 0297C 809738CC 00000000 */ nop -/* 02980 809738D0 440B4000 */ mfc1 $t3, $f8 -/* 02984 809738D4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 02988 809738D8 10000007 */ beq $zero, $zero, .L809738F8 -/* 0298C 809738DC 01615825 */ or $t3, $t3, $at ## $t3 = 80000000 -.L809738E0: -/* 02990 809738E0 10000005 */ beq $zero, $zero, .L809738F8 -/* 02994 809738E4 240BFFFF */ addiu $t3, $zero, 0xFFFF ## $t3 = FFFFFFFF -/* 02998 809738E8 440B4000 */ mfc1 $t3, $f8 -.L809738EC: -/* 0299C 809738EC 00000000 */ nop -/* 029A0 809738F0 0560FFFB */ bltz $t3, .L809738E0 -/* 029A4 809738F4 00000000 */ nop -.L809738F8: -/* 029A8 809738F8 908C017B */ lbu $t4, 0x017B($a0) ## 0000017B -/* 029AC 809738FC 44CAF800 */ ctc1 $t2, $31 -/* 029B0 80973900 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 029B4 80973904 448C5000 */ mtc1 $t4, $f10 ## $f10 = NaN -/* 029B8 80973908 A08B0180 */ sb $t3, 0x0180($a0) ## 00000180 -/* 029BC 8097390C 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 029C0 80973910 46805420 */ cvt.s.w $f16, $f10 -/* 029C4 80973914 460C8482 */ mul.s $f18, $f16, $f12 -/* 029C8 80973918 444DF800 */ cfc1 $t5, $31 -/* 029CC 8097391C 44CEF800 */ ctc1 $t6, $31 -/* 029D0 80973920 00000000 */ nop -/* 029D4 80973924 460091A4 */ cvt.w.s $f6, $f18 -/* 029D8 80973928 444EF800 */ cfc1 $t6, $31 -/* 029DC 8097392C 00000000 */ nop -/* 029E0 80973930 31CE0078 */ andi $t6, $t6, 0x0078 ## $t6 = 00000000 -/* 029E4 80973934 51C00013 */ beql $t6, $zero, .L80973984 -/* 029E8 80973938 440E3000 */ mfc1 $t6, $f6 -/* 029EC 8097393C 44813000 */ mtc1 $at, $f6 ## $f6 = 2147483648.00 -/* 029F0 80973940 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 029F4 80973944 46069181 */ sub.s $f6, $f18, $f6 -/* 029F8 80973948 44CEF800 */ ctc1 $t6, $31 -/* 029FC 8097394C 00000000 */ nop -/* 02A00 80973950 460031A4 */ cvt.w.s $f6, $f6 -/* 02A04 80973954 444EF800 */ cfc1 $t6, $31 -/* 02A08 80973958 00000000 */ nop -/* 02A0C 8097395C 31CE0078 */ andi $t6, $t6, 0x0078 ## $t6 = 00000000 -/* 02A10 80973960 15C00005 */ bne $t6, $zero, .L80973978 -/* 02A14 80973964 00000000 */ nop -/* 02A18 80973968 440E3000 */ mfc1 $t6, $f6 -/* 02A1C 8097396C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 02A20 80973970 10000007 */ beq $zero, $zero, .L80973990 -/* 02A24 80973974 01C17025 */ or $t6, $t6, $at ## $t6 = 80000000 -.L80973978: -/* 02A28 80973978 10000005 */ beq $zero, $zero, .L80973990 -/* 02A2C 8097397C 240EFFFF */ addiu $t6, $zero, 0xFFFF ## $t6 = FFFFFFFF -/* 02A30 80973980 440E3000 */ mfc1 $t6, $f6 -.L80973984: -/* 02A34 80973984 00000000 */ nop -/* 02A38 80973988 05C0FFFB */ bltz $t6, .L80973978 -/* 02A3C 8097398C 00000000 */ nop -.L80973990: -/* 02A40 80973990 908F017C */ lbu $t7, 0x017C($a0) ## 0000017C -/* 02A44 80973994 44CDF800 */ ctc1 $t5, $31 -/* 02A48 80973998 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 02A4C 8097399C 448F2000 */ mtc1 $t7, $f4 ## $f4 = NaN -/* 02A50 809739A0 A08E017B */ sb $t6, 0x017B($a0) ## 0000017B -/* 02A54 809739A4 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 02A58 809739A8 46802220 */ cvt.s.w $f8, $f4 -/* 02A5C 809739AC 460C4282 */ mul.s $f10, $f8, $f12 -/* 02A60 809739B0 4458F800 */ cfc1 $t8, $31 -/* 02A64 809739B4 44D9F800 */ ctc1 $t9, $31 -/* 02A68 809739B8 00000000 */ nop -/* 02A6C 809739BC 46005424 */ cvt.w.s $f16, $f10 -/* 02A70 809739C0 4459F800 */ cfc1 $t9, $31 -/* 02A74 809739C4 00000000 */ nop -/* 02A78 809739C8 33390078 */ andi $t9, $t9, 0x0078 ## $t9 = 00000000 -/* 02A7C 809739CC 53200013 */ beql $t9, $zero, .L80973A1C -/* 02A80 809739D0 44198000 */ mfc1 $t9, $f16 -/* 02A84 809739D4 44818000 */ mtc1 $at, $f16 ## $f16 = 2147483648.00 -/* 02A88 809739D8 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 02A8C 809739DC 46105401 */ sub.s $f16, $f10, $f16 -/* 02A90 809739E0 44D9F800 */ ctc1 $t9, $31 -/* 02A94 809739E4 00000000 */ nop -/* 02A98 809739E8 46008424 */ cvt.w.s $f16, $f16 -/* 02A9C 809739EC 4459F800 */ cfc1 $t9, $31 -/* 02AA0 809739F0 00000000 */ nop -/* 02AA4 809739F4 33390078 */ andi $t9, $t9, 0x0078 ## $t9 = 00000000 -/* 02AA8 809739F8 17200005 */ bne $t9, $zero, .L80973A10 -/* 02AAC 809739FC 00000000 */ nop -/* 02AB0 80973A00 44198000 */ mfc1 $t9, $f16 -/* 02AB4 80973A04 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 02AB8 80973A08 10000007 */ beq $zero, $zero, .L80973A28 -/* 02ABC 80973A0C 0321C825 */ or $t9, $t9, $at ## $t9 = 80000000 -.L80973A10: -/* 02AC0 80973A10 10000005 */ beq $zero, $zero, .L80973A28 -/* 02AC4 80973A14 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF -/* 02AC8 80973A18 44198000 */ mfc1 $t9, $f16 -.L80973A1C: -/* 02ACC 80973A1C 00000000 */ nop -/* 02AD0 80973A20 0720FFFB */ bltz $t9, .L80973A10 -/* 02AD4 80973A24 00000000 */ nop -.L80973A28: -/* 02AD8 80973A28 9088017D */ lbu $t0, 0x017D($a0) ## 0000017D -/* 02ADC 80973A2C 44D8F800 */ ctc1 $t8, $31 -/* 02AE0 80973A30 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 02AE4 80973A34 44889000 */ mtc1 $t0, $f18 ## $f18 = NaN -/* 02AE8 80973A38 A099017C */ sb $t9, 0x017C($a0) ## 0000017C -/* 02AEC 80973A3C 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 02AF0 80973A40 468091A0 */ cvt.s.w $f6, $f18 -/* 02AF4 80973A44 460C3102 */ mul.s $f4, $f6, $f12 -/* 02AF8 80973A48 4449F800 */ cfc1 $t1, $31 -/* 02AFC 80973A4C 44CAF800 */ ctc1 $t2, $31 -/* 02B00 80973A50 00000000 */ nop -/* 02B04 80973A54 46002224 */ cvt.w.s $f8, $f4 -/* 02B08 80973A58 444AF800 */ cfc1 $t2, $31 -/* 02B0C 80973A5C 00000000 */ nop -/* 02B10 80973A60 314A0078 */ andi $t2, $t2, 0x0078 ## $t2 = 00000000 -/* 02B14 80973A64 51400013 */ beql $t2, $zero, .L80973AB4 -/* 02B18 80973A68 440A4000 */ mfc1 $t2, $f8 -/* 02B1C 80973A6C 44814000 */ mtc1 $at, $f8 ## $f8 = 2147483648.00 -/* 02B20 80973A70 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 02B24 80973A74 46082201 */ sub.s $f8, $f4, $f8 -/* 02B28 80973A78 44CAF800 */ ctc1 $t2, $31 -/* 02B2C 80973A7C 00000000 */ nop -/* 02B30 80973A80 46004224 */ cvt.w.s $f8, $f8 -/* 02B34 80973A84 444AF800 */ cfc1 $t2, $31 -/* 02B38 80973A88 00000000 */ nop -/* 02B3C 80973A8C 314A0078 */ andi $t2, $t2, 0x0078 ## $t2 = 00000000 -/* 02B40 80973A90 15400005 */ bne $t2, $zero, .L80973AA8 -/* 02B44 80973A94 00000000 */ nop -/* 02B48 80973A98 440A4000 */ mfc1 $t2, $f8 -/* 02B4C 80973A9C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 02B50 80973AA0 10000007 */ beq $zero, $zero, .L80973AC0 -/* 02B54 80973AA4 01415025 */ or $t2, $t2, $at ## $t2 = 80000000 -.L80973AA8: -/* 02B58 80973AA8 10000005 */ beq $zero, $zero, .L80973AC0 -/* 02B5C 80973AAC 240AFFFF */ addiu $t2, $zero, 0xFFFF ## $t2 = FFFFFFFF -/* 02B60 80973AB0 440A4000 */ mfc1 $t2, $f8 -.L80973AB4: -/* 02B64 80973AB4 00000000 */ nop -/* 02B68 80973AB8 0540FFFB */ bltz $t2, .L80973AA8 -/* 02B6C 80973ABC 00000000 */ nop -.L80973AC0: -/* 02B70 80973AC0 908B0181 */ lbu $t3, 0x0181($a0) ## 00000181 -/* 02B74 80973AC4 44C9F800 */ ctc1 $t1, $31 -/* 02B78 80973AC8 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 02B7C 80973ACC 448B5000 */ mtc1 $t3, $f10 ## $f10 = NaN -/* 02B80 80973AD0 A08A017D */ sb $t2, 0x017D($a0) ## 0000017D -/* 02B84 80973AD4 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 02B88 80973AD8 46805420 */ cvt.s.w $f16, $f10 -/* 02B8C 80973ADC 460C8482 */ mul.s $f18, $f16, $f12 -/* 02B90 80973AE0 444CF800 */ cfc1 $t4, $31 -/* 02B94 80973AE4 44CDF800 */ ctc1 $t5, $31 -/* 02B98 80973AE8 00000000 */ nop -/* 02B9C 80973AEC 460091A4 */ cvt.w.s $f6, $f18 -/* 02BA0 80973AF0 444DF800 */ cfc1 $t5, $31 -/* 02BA4 80973AF4 00000000 */ nop -/* 02BA8 80973AF8 31AD0078 */ andi $t5, $t5, 0x0078 ## $t5 = 00000000 -/* 02BAC 80973AFC 51A00013 */ beql $t5, $zero, .L80973B4C -/* 02BB0 80973B00 440D3000 */ mfc1 $t5, $f6 -/* 02BB4 80973B04 44813000 */ mtc1 $at, $f6 ## $f6 = 2147483648.00 -/* 02BB8 80973B08 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 02BBC 80973B0C 46069181 */ sub.s $f6, $f18, $f6 -/* 02BC0 80973B10 44CDF800 */ ctc1 $t5, $31 -/* 02BC4 80973B14 00000000 */ nop -/* 02BC8 80973B18 460031A4 */ cvt.w.s $f6, $f6 -/* 02BCC 80973B1C 444DF800 */ cfc1 $t5, $31 -/* 02BD0 80973B20 00000000 */ nop -/* 02BD4 80973B24 31AD0078 */ andi $t5, $t5, 0x0078 ## $t5 = 00000000 -/* 02BD8 80973B28 15A00005 */ bne $t5, $zero, .L80973B40 -/* 02BDC 80973B2C 00000000 */ nop -/* 02BE0 80973B30 440D3000 */ mfc1 $t5, $f6 -/* 02BE4 80973B34 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 02BE8 80973B38 10000007 */ beq $zero, $zero, .L80973B58 -/* 02BEC 80973B3C 01A16825 */ or $t5, $t5, $at ## $t5 = 80000000 -.L80973B40: -/* 02BF0 80973B40 10000005 */ beq $zero, $zero, .L80973B58 -/* 02BF4 80973B44 240DFFFF */ addiu $t5, $zero, 0xFFFF ## $t5 = FFFFFFFF -/* 02BF8 80973B48 440D3000 */ mfc1 $t5, $f6 -.L80973B4C: -/* 02BFC 80973B4C 00000000 */ nop -/* 02C00 80973B50 05A0FFFB */ bltz $t5, .L80973B40 -/* 02C04 80973B54 00000000 */ nop -.L80973B58: -/* 02C08 80973B58 908E0182 */ lbu $t6, 0x0182($a0) ## 00000182 -/* 02C0C 80973B5C 44CCF800 */ ctc1 $t4, $31 -/* 02C10 80973B60 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 02C14 80973B64 448E2000 */ mtc1 $t6, $f4 ## $f4 = NaN -/* 02C18 80973B68 A08D0181 */ sb $t5, 0x0181($a0) ## 00000181 -/* 02C1C 80973B6C 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 02C20 80973B70 46802220 */ cvt.s.w $f8, $f4 -/* 02C24 80973B74 460C4282 */ mul.s $f10, $f8, $f12 -/* 02C28 80973B78 444FF800 */ cfc1 $t7, $31 -/* 02C2C 80973B7C 44D8F800 */ ctc1 $t8, $31 -/* 02C30 80973B80 00000000 */ nop -/* 02C34 80973B84 46005424 */ cvt.w.s $f16, $f10 -/* 02C38 80973B88 4458F800 */ cfc1 $t8, $31 -/* 02C3C 80973B8C 00000000 */ nop -/* 02C40 80973B90 33180078 */ andi $t8, $t8, 0x0078 ## $t8 = 00000000 -/* 02C44 80973B94 53000013 */ beql $t8, $zero, .L80973BE4 -/* 02C48 80973B98 44188000 */ mfc1 $t8, $f16 -/* 02C4C 80973B9C 44818000 */ mtc1 $at, $f16 ## $f16 = 2147483648.00 -/* 02C50 80973BA0 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 02C54 80973BA4 46105401 */ sub.s $f16, $f10, $f16 -/* 02C58 80973BA8 44D8F800 */ ctc1 $t8, $31 -/* 02C5C 80973BAC 00000000 */ nop -/* 02C60 80973BB0 46008424 */ cvt.w.s $f16, $f16 -/* 02C64 80973BB4 4458F800 */ cfc1 $t8, $31 -/* 02C68 80973BB8 00000000 */ nop -/* 02C6C 80973BBC 33180078 */ andi $t8, $t8, 0x0078 ## $t8 = 00000000 -/* 02C70 80973BC0 17000005 */ bne $t8, $zero, .L80973BD8 -/* 02C74 80973BC4 00000000 */ nop -/* 02C78 80973BC8 44188000 */ mfc1 $t8, $f16 -/* 02C7C 80973BCC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 02C80 80973BD0 10000007 */ beq $zero, $zero, .L80973BF0 -/* 02C84 80973BD4 0301C025 */ or $t8, $t8, $at ## $t8 = 80000000 -.L80973BD8: -/* 02C88 80973BD8 10000005 */ beq $zero, $zero, .L80973BF0 -/* 02C8C 80973BDC 2418FFFF */ addiu $t8, $zero, 0xFFFF ## $t8 = FFFFFFFF -/* 02C90 80973BE0 44188000 */ mfc1 $t8, $f16 -.L80973BE4: -/* 02C94 80973BE4 00000000 */ nop -/* 02C98 80973BE8 0700FFFB */ bltz $t8, .L80973BD8 -/* 02C9C 80973BEC 00000000 */ nop -.L80973BF0: -/* 02CA0 80973BF0 90990183 */ lbu $t9, 0x0183($a0) ## 00000183 -/* 02CA4 80973BF4 44CFF800 */ ctc1 $t7, $31 -/* 02CA8 80973BF8 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 02CAC 80973BFC 44999000 */ mtc1 $t9, $f18 ## $f18 = NaN -/* 02CB0 80973C00 A0980182 */ sb $t8, 0x0182($a0) ## 00000182 -/* 02CB4 80973C04 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 02CB8 80973C08 468091A0 */ cvt.s.w $f6, $f18 -/* 02CBC 80973C0C 460C3102 */ mul.s $f4, $f6, $f12 -/* 02CC0 80973C10 4448F800 */ cfc1 $t0, $31 -/* 02CC4 80973C14 44C9F800 */ ctc1 $t1, $31 -/* 02CC8 80973C18 00000000 */ nop -/* 02CCC 80973C1C 46002224 */ cvt.w.s $f8, $f4 -/* 02CD0 80973C20 4449F800 */ cfc1 $t1, $31 -/* 02CD4 80973C24 00000000 */ nop -/* 02CD8 80973C28 31290078 */ andi $t1, $t1, 0x0078 ## $t1 = 00000000 -/* 02CDC 80973C2C 51200013 */ beql $t1, $zero, .L80973C7C -/* 02CE0 80973C30 44094000 */ mfc1 $t1, $f8 -/* 02CE4 80973C34 44814000 */ mtc1 $at, $f8 ## $f8 = 2147483648.00 -/* 02CE8 80973C38 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 02CEC 80973C3C 46082201 */ sub.s $f8, $f4, $f8 -/* 02CF0 80973C40 44C9F800 */ ctc1 $t1, $31 -/* 02CF4 80973C44 00000000 */ nop -/* 02CF8 80973C48 46004224 */ cvt.w.s $f8, $f8 -/* 02CFC 80973C4C 4449F800 */ cfc1 $t1, $31 -/* 02D00 80973C50 00000000 */ nop -/* 02D04 80973C54 31290078 */ andi $t1, $t1, 0x0078 ## $t1 = 00000000 -/* 02D08 80973C58 15200005 */ bne $t1, $zero, .L80973C70 -/* 02D0C 80973C5C 00000000 */ nop -/* 02D10 80973C60 44094000 */ mfc1 $t1, $f8 -/* 02D14 80973C64 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 02D18 80973C68 10000007 */ beq $zero, $zero, .L80973C88 -/* 02D1C 80973C6C 01214825 */ or $t1, $t1, $at ## $t1 = 80000000 -.L80973C70: -/* 02D20 80973C70 10000005 */ beq $zero, $zero, .L80973C88 -/* 02D24 80973C74 2409FFFF */ addiu $t1, $zero, 0xFFFF ## $t1 = FFFFFFFF -/* 02D28 80973C78 44094000 */ mfc1 $t1, $f8 -.L80973C7C: -/* 02D2C 80973C7C 00000000 */ nop -/* 02D30 80973C80 0520FFFB */ bltz $t1, .L80973C70 -/* 02D34 80973C84 00000000 */ nop -.L80973C88: -/* 02D38 80973C88 A0890183 */ sb $t1, 0x0183($a0) ## 00000183 -/* 02D3C 80973C8C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02D40 80973C90 44C8F800 */ ctc1 $t0, $31 -/* 02D44 80973C94 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02D48 80973C98 03E00008 */ jr $ra -/* 02D4C 80973C9C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80973CA0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80973CA0.s deleted file mode 100644 index 7b2e0c3445..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80973CA0.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_80973CA0 -/* 02D50 80973CA0 90A20184 */ lbu $v0, 0x0184($a1) ## 00000184 -/* 02D54 80973CA4 24010013 */ addiu $at, $zero, 0x0013 ## $at = 00000013 -/* 02D58 80973CA8 10410007 */ beq $v0, $at, .L80973CC8 -/* 02D5C 80973CAC 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 -/* 02D60 80973CB0 10410010 */ beq $v0, $at, .L80973CF4 -/* 02D64 80973CB4 24010015 */ addiu $at, $zero, 0x0015 ## $at = 00000015 -/* 02D68 80973CB8 5041000A */ beql $v0, $at, .L80973CE4 -/* 02D6C 80973CBC 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 02D70 80973CC0 03E00008 */ jr $ra -/* 02D74 80973CC4 00000000 */ nop -.L80973CC8: -/* 02D78 80973CC8 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 02D7C 80973CCC 44813000 */ mtc1 $at, $f6 ## $f6 = 40.00 -/* 02D80 80973CD0 C4840000 */ lwc1 $f4, 0x0000($a0) ## 00000000 -/* 02D84 80973CD4 46062201 */ sub.s $f8, $f4, $f6 -/* 02D88 80973CD8 03E00008 */ jr $ra -/* 02D8C 80973CDC E4880000 */ swc1 $f8, 0x0000($a0) ## 00000000 -.L80973CE0: -/* 02D90 80973CE0 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -.L80973CE4: -/* 02D94 80973CE4 44818000 */ mtc1 $at, $f16 ## $f16 = 40.00 -/* 02D98 80973CE8 C48A0000 */ lwc1 $f10, 0x0000($a0) ## 00000000 -/* 02D9C 80973CEC 46105480 */ add.s $f18, $f10, $f16 -/* 02DA0 80973CF0 E4920000 */ swc1 $f18, 0x0000($a0) ## 00000000 -.L80973CF4: -/* 02DA4 80973CF4 03E00008 */ jr $ra -/* 02DA8 80973CF8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80973CFC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80973CFC.s deleted file mode 100644 index 028e55f1a6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80973CFC.s +++ /dev/null @@ -1,143 +0,0 @@ -.late_rodata -glabel D_80976D2C - .float 0.017453292 - -glabel D_80976D30 - .float 9.58738019108e-05 - -glabel D_80976D34 - .float 9.58738019108e-05 - -.text -glabel func_80973CFC -/* 02DAC 80973CFC 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 02DB0 80973D00 AFA60050 */ sw $a2, 0x0050($sp) -/* 02DB4 80973D04 C7A60050 */ lwc1 $f6, 0x0050($sp) -/* 02DB8 80973D08 C7A4005C */ lwc1 $f4, 0x005C($sp) -/* 02DBC 80973D0C AFA70054 */ sw $a3, 0x0054($sp) -/* 02DC0 80973D10 C7AA0054 */ lwc1 $f10, 0x0054($sp) -/* 02DC4 80973D14 C7A80060 */ lwc1 $f8, 0x0060($sp) -/* 02DC8 80973D18 46062081 */ sub.s $f2, $f4, $f6 -/* 02DCC 80973D1C C7A60058 */ lwc1 $f6, 0x0058($sp) -/* 02DD0 80973D20 C7A40064 */ lwc1 $f4, 0x0064($sp) -/* 02DD4 80973D24 460A4401 */ sub.s $f16, $f8, $f10 -/* 02DD8 80973D28 46021202 */ mul.s $f8, $f2, $f2 -/* 02DDC 80973D2C F7B60020 */ sdc1 $f22, 0x0020($sp) -/* 02DE0 80973D30 46062481 */ sub.s $f18, $f4, $f6 -/* 02DE4 80973D34 46108282 */ mul.s $f10, $f16, $f16 -/* 02DE8 80973D38 E7AC0048 */ swc1 $f12, 0x0048($sp) -/* 02DEC 80973D3C 3C018097 */ lui $at, %hi(D_80976D2C) ## $at = 80970000 -/* 02DF0 80973D40 46129182 */ mul.s $f6, $f18, $f18 -/* 02DF4 80973D44 F7B40018 */ sdc1 $f20, 0x0018($sp) -/* 02DF8 80973D48 AFBF002C */ sw $ra, 0x002C($sp) -/* 02DFC 80973D4C AFB00028 */ sw $s0, 0x0028($sp) -/* 02E00 80973D50 460A4100 */ add.s $f4, $f8, $f10 -/* 02E04 80973D54 C42A6D2C */ lwc1 $f10, %lo(D_80976D2C)($at) -/* 02E08 80973D58 C7A80048 */ lwc1 $f8, 0x0048($sp) -/* 02E0C 80973D5C 46062000 */ add.s $f0, $f4, $f6 -/* 02E10 80973D60 46000004 */ sqrt.s $f0, $f0 -/* 02E14 80973D64 460E0582 */ mul.s $f22, $f0, $f14 -/* 02E18 80973D68 00000000 */ nop -/* 02E1C 80973D6C 460A4502 */ mul.s $f20, $f8, $f10 -/* 02E20 80973D70 0C041184 */ jal cosf - -/* 02E24 80973D74 4600A306 */ mov.s $f12, $f20 -/* 02E28 80973D78 C7A40068 */ lwc1 $f4, 0x0068($sp) -/* 02E2C 80973D7C 8FB00074 */ lw $s0, 0x0074($sp) -/* 02E30 80973D80 4600A306 */ mov.s $f12, $f20 -/* 02E34 80973D84 46040182 */ mul.s $f6, $f0, $f4 -/* 02E38 80973D88 E6160028 */ swc1 $f22, 0x0028($s0) ## 00000028 -/* 02E3C 80973D8C 0C0400A4 */ jal sinf - -/* 02E40 80973D90 E6060024 */ swc1 $f6, 0x0024($s0) ## 00000024 -/* 02E44 80973D94 C7A80068 */ lwc1 $f8, 0x0068($sp) -/* 02E48 80973D98 3C018097 */ lui $at, %hi(D_80976D30) ## $at = 80970000 -/* 02E4C 80973D9C C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 02E50 80973DA0 46080282 */ mul.s $f10, $f0, $f8 -/* 02E54 80973DA4 E60A002C */ swc1 $f10, 0x002C($s0) ## 0000002C -/* 02E58 80973DA8 87AE006C */ lh $t6, 0x006C($sp) -/* 02E5C 80973DAC C42A6D30 */ lwc1 $f10, %lo(D_80976D30)($at) -/* 02E60 80973DB0 E7A40038 */ swc1 $f4, 0x0038($sp) -/* 02E64 80973DB4 448E3000 */ mtc1 $t6, $f6 ## $f6 = 0.00 -/* 02E68 80973DB8 00000000 */ nop -/* 02E6C 80973DBC 46803220 */ cvt.s.w $f8, $f6 -/* 02E70 80973DC0 460A4582 */ mul.s $f22, $f8, $f10 -/* 02E74 80973DC4 0C041184 */ jal cosf - -/* 02E78 80973DC8 4600B306 */ mov.s $f12, $f22 -/* 02E7C 80973DCC 46000506 */ mov.s $f20, $f0 -/* 02E80 80973DD0 0C0400A4 */ jal sinf - -/* 02E84 80973DD4 4600B306 */ mov.s $f12, $f22 -/* 02E88 80973DD8 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 02E8C 80973DDC C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 02E90 80973DE0 4600B306 */ mov.s $f12, $f22 -/* 02E94 80973DE4 46142182 */ mul.s $f6, $f4, $f20 -/* 02E98 80973DE8 00000000 */ nop -/* 02E9C 80973DEC 46080282 */ mul.s $f10, $f0, $f8 -/* 02EA0 80973DF0 460A3101 */ sub.s $f4, $f6, $f10 -/* 02EA4 80973DF4 0C041184 */ jal cosf - -/* 02EA8 80973DF8 E7A40034 */ swc1 $f4, 0x0034($sp) -/* 02EAC 80973DFC 46000506 */ mov.s $f20, $f0 -/* 02EB0 80973E00 0C0400A4 */ jal sinf - -/* 02EB4 80973E04 4600B306 */ mov.s $f12, $f22 -/* 02EB8 80973E08 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 02EBC 80973E0C C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 02EC0 80973E10 87AF006E */ lh $t7, 0x006E($sp) -/* 02EC4 80973E14 46080182 */ mul.s $f6, $f0, $f8 -/* 02EC8 80973E18 3C018097 */ lui $at, %hi(D_80976D34) ## $at = 80970000 -/* 02ECC 80973E1C 46145102 */ mul.s $f4, $f10, $f20 -/* 02ED0 80973E20 448F5000 */ mtc1 $t7, $f10 ## $f10 = 0.00 -/* 02ED4 80973E24 46043200 */ add.s $f8, $f6, $f4 -/* 02ED8 80973E28 C4246D34 */ lwc1 $f4, %lo(D_80976D34)($at) -/* 02EDC 80973E2C 468051A0 */ cvt.s.w $f6, $f10 -/* 02EE0 80973E30 E7A80030 */ swc1 $f8, 0x0030($sp) -/* 02EE4 80973E34 46043582 */ mul.s $f22, $f6, $f4 -/* 02EE8 80973E38 0C041184 */ jal cosf - -/* 02EEC 80973E3C 4600B306 */ mov.s $f12, $f22 -/* 02EF0 80973E40 46000506 */ mov.s $f20, $f0 -/* 02EF4 80973E44 0C0400A4 */ jal sinf - -/* 02EF8 80973E48 4600B306 */ mov.s $f12, $f22 -/* 02EFC 80973E4C C7A80038 */ lwc1 $f8, 0x0038($sp) -/* 02F00 80973E50 C7A60030 */ lwc1 $f6, 0x0030($sp) -/* 02F04 80973E54 4600B306 */ mov.s $f12, $f22 -/* 02F08 80973E58 46144282 */ mul.s $f10, $f8, $f20 -/* 02F0C 80973E5C 00000000 */ nop -/* 02F10 80973E60 46060102 */ mul.s $f4, $f0, $f6 -/* 02F14 80973E64 46045201 */ sub.s $f8, $f10, $f4 -/* 02F18 80973E68 E6080024 */ swc1 $f8, 0x0024($s0) ## 00000024 -/* 02F1C 80973E6C C7A60034 */ lwc1 $f6, 0x0034($sp) -/* 02F20 80973E70 0C041184 */ jal cosf - -/* 02F24 80973E74 E6060028 */ swc1 $f6, 0x0028($s0) ## 00000028 -/* 02F28 80973E78 46000506 */ mov.s $f20, $f0 -/* 02F2C 80973E7C 0C0400A4 */ jal sinf - -/* 02F30 80973E80 4600B306 */ mov.s $f12, $f22 -/* 02F34 80973E84 C60A0024 */ lwc1 $f10, 0x0024($s0) ## 00000024 -/* 02F38 80973E88 C7A40050 */ lwc1 $f4, 0x0050($sp) -/* 02F3C 80973E8C C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 02F40 80973E90 46045200 */ add.s $f8, $f10, $f4 -/* 02F44 80973E94 E6080024 */ swc1 $f8, 0x0024($s0) ## 00000024 -/* 02F48 80973E98 C7AA0054 */ lwc1 $f10, 0x0054($sp) -/* 02F4C 80973E9C 460A3100 */ add.s $f4, $f6, $f10 -/* 02F50 80973EA0 E6040028 */ swc1 $f4, 0x0028($s0) ## 00000028 -/* 02F54 80973EA4 C7A80038 */ lwc1 $f8, 0x0038($sp) -/* 02F58 80973EA8 C7AA0030 */ lwc1 $f10, 0x0030($sp) -/* 02F5C 80973EAC 46080182 */ mul.s $f6, $f0, $f8 -/* 02F60 80973EB0 00000000 */ nop -/* 02F64 80973EB4 46145102 */ mul.s $f4, $f10, $f20 -/* 02F68 80973EB8 C7AA0058 */ lwc1 $f10, 0x0058($sp) -/* 02F6C 80973EBC 46043200 */ add.s $f8, $f6, $f4 -/* 02F70 80973EC0 460A4180 */ add.s $f6, $f8, $f10 -/* 02F74 80973EC4 E606002C */ swc1 $f6, 0x002C($s0) ## 0000002C -/* 02F78 80973EC8 8FBF002C */ lw $ra, 0x002C($sp) -/* 02F7C 80973ECC 8FB00028 */ lw $s0, 0x0028($sp) -/* 02F80 80973ED0 D7B60020 */ ldc1 $f22, 0x0020($sp) -/* 02F84 80973ED4 D7B40018 */ ldc1 $f20, 0x0018($sp) -/* 02F88 80973ED8 03E00008 */ jr $ra -/* 02F8C 80973EDC 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80973EE0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80973EE0.s deleted file mode 100644 index d9269db172..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80973EE0.s +++ /dev/null @@ -1,171 +0,0 @@ -.late_rodata -glabel D_80976D38 - .float 10430.378 - -.text -glabel func_80973EE0 -/* 02F90 80973EE0 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 02F94 80973EE4 AFBF003C */ sw $ra, 0x003C($sp) -/* 02F98 80973EE8 AFB00038 */ sw $s0, 0x0038($sp) -/* 02F9C 80973EEC 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 02FA0 80973EF0 8485018C */ lh $a1, 0x018C($a0) ## 0000018C -/* 02FA4 80973EF4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02FA8 80973EF8 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 02FAC 80973EFC 00057080 */ sll $t6, $a1, 2 -/* 02FB0 80973F00 00CE1021 */ addu $v0, $a2, $t6 -/* 02FB4 80973F04 8C4F1D8C */ lw $t7, 0x1D8C($v0) ## 00001D8C -/* 02FB8 80973F08 8DF8000C */ lw $t8, 0x000C($t7) ## 0000000C -/* 02FBC 80973F0C 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 02FC0 80973F10 00000000 */ nop -/* 02FC4 80973F14 468021A0 */ cvt.s.w $f6, $f4 -/* 02FC8 80973F18 E7A60064 */ swc1 $f6, 0x0064($sp) -/* 02FCC 80973F1C 8C591D8C */ lw $t9, 0x1D8C($v0) ## 00001D8C -/* 02FD0 80973F20 8F280010 */ lw $t0, 0x0010($t9) ## 00000010 -/* 02FD4 80973F24 44884000 */ mtc1 $t0, $f8 ## $f8 = 0.00 -/* 02FD8 80973F28 00000000 */ nop -/* 02FDC 80973F2C 468042A0 */ cvt.s.w $f10, $f8 -/* 02FE0 80973F30 E7AA0068 */ swc1 $f10, 0x0068($sp) -/* 02FE4 80973F34 8C491D8C */ lw $t1, 0x1D8C($v0) ## 00001D8C -/* 02FE8 80973F38 8D2A0014 */ lw $t2, 0x0014($t1) ## 00000014 -/* 02FEC 80973F3C 448A9000 */ mtc1 $t2, $f18 ## $f18 = 0.00 -/* 02FF0 80973F40 00000000 */ nop -/* 02FF4 80973F44 46809120 */ cvt.s.w $f4, $f18 -/* 02FF8 80973F48 E7A4006C */ swc1 $f4, 0x006C($sp) -/* 02FFC 80973F4C 8C4B1D8C */ lw $t3, 0x1D8C($v0) ## 00001D8C -/* 03000 80973F50 8D6C0018 */ lw $t4, 0x0018($t3) ## 00000018 -/* 03004 80973F54 448C3000 */ mtc1 $t4, $f6 ## $f6 = 0.00 -/* 03008 80973F58 00000000 */ nop -/* 0300C 80973F5C 46803220 */ cvt.s.w $f8, $f6 -/* 03010 80973F60 E7A80058 */ swc1 $f8, 0x0058($sp) -/* 03014 80973F64 8C4D1D8C */ lw $t5, 0x1D8C($v0) ## 00001D8C -/* 03018 80973F68 8DAE001C */ lw $t6, 0x001C($t5) ## 0000001C -/* 0301C 80973F6C 448E5000 */ mtc1 $t6, $f10 ## $f10 = 0.00 -/* 03020 80973F70 00000000 */ nop -/* 03024 80973F74 468054A0 */ cvt.s.w $f18, $f10 -/* 03028 80973F78 E7B2005C */ swc1 $f18, 0x005C($sp) -/* 0302C 80973F7C 8C4F1D8C */ lw $t7, 0x1D8C($v0) ## 00001D8C -/* 03030 80973F80 8DF80020 */ lw $t8, 0x0020($t7) ## 00000020 -/* 03034 80973F84 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 03038 80973F88 00000000 */ nop -/* 0303C 80973F8C 468021A0 */ cvt.s.w $f6, $f4 -/* 03040 80973F90 0C25C3D6 */ jal func_80970F58 -/* 03044 80973F94 E7A60060 */ swc1 $f6, 0x0060($sp) -/* 03048 80973F98 E7A00054 */ swc1 $f0, 0x0054($sp) -/* 0304C 80973F9C 92020184 */ lbu $v0, 0x0184($s0) ## 00000184 -/* 03050 80973FA0 24010013 */ addiu $at, $zero, 0x0013 ## $at = 00000013 -/* 03054 80973FA4 10410007 */ beq $v0, $at, .L80973FC4 -/* 03058 80973FA8 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 -/* 0305C 80973FAC 10410008 */ beq $v0, $at, .L80973FD0 -/* 03060 80973FB0 24010015 */ addiu $at, $zero, 0x0015 ## $at = 00000015 -/* 03064 80973FB4 5041000B */ beql $v0, $at, .L80973FE4 -/* 03068 80973FB8 3C014370 */ lui $at, 0x4370 ## $at = 43700000 -/* 0306C 80973FBC 1000000D */ beq $zero, $zero, .L80973FF4 -/* 03070 80973FC0 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -.L80973FC4: -/* 03074 80973FC4 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 03078 80973FC8 10000009 */ beq $zero, $zero, .L80973FF0 -/* 0307C 80973FCC E7A80050 */ swc1 $f8, 0x0050($sp) -.L80973FD0: -/* 03080 80973FD0 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 -/* 03084 80973FD4 44815000 */ mtc1 $at, $f10 ## $f10 = 120.00 -/* 03088 80973FD8 10000005 */ beq $zero, $zero, .L80973FF0 -/* 0308C 80973FDC E7AA0050 */ swc1 $f10, 0x0050($sp) -/* 03090 80973FE0 3C014370 */ lui $at, 0x4370 ## $at = 43700000 -.L80973FE4: -/* 03094 80973FE4 44819000 */ mtc1 $at, $f18 ## $f18 = 240.00 -/* 03098 80973FE8 00000000 */ nop -/* 0309C 80973FEC E7B20050 */ swc1 $f18, 0x0050($sp) -.L80973FF0: -/* 030A0 80973FF0 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -.L80973FF4: -/* 030A4 80973FF4 44816000 */ mtc1 $at, $f12 ## $f12 = 30.00 -/* 030A8 80973FF8 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 030AC 80973FFC 44812000 */ mtc1 $at, $f4 ## $f4 = 50.00 -/* 030B0 80974000 C7A20058 */ lwc1 $f2, 0x0058($sp) -/* 030B4 80974004 C7A60068 */ lwc1 $f6, 0x0068($sp) -/* 030B8 80974008 46002402 */ mul.s $f16, $f4, $f0 -/* 030BC 8097400C C7A00064 */ lwc1 $f0, 0x0064($sp) -/* 030C0 80974010 C7A8005C */ lwc1 $f8, 0x005C($sp) -/* 030C4 80974014 4610603C */ c.lt.s $f12, $f16 -/* 030C8 80974018 00000000 */ nop -/* 030CC 8097401C 45020003 */ bc1fl .L8097402C -/* 030D0 80974020 46020032 */ c.eq.s $f0, $f2 -/* 030D4 80974024 46006406 */ mov.s $f16, $f12 -/* 030D8 80974028 46020032 */ c.eq.s $f0, $f2 -.L8097402C: -/* 030DC 8097402C 00000000 */ nop -/* 030E0 80974030 4502000B */ bc1fl .L80974060 -/* 030E4 80974034 46001381 */ sub.s $f14, $f2, $f0 -/* 030E8 80974038 46083032 */ c.eq.s $f6, $f8 -/* 030EC 8097403C C7AA006C */ lwc1 $f10, 0x006C($sp) -/* 030F0 80974040 C7B20060 */ lwc1 $f18, 0x0060($sp) -/* 030F4 80974044 45020006 */ bc1fl .L80974060 -/* 030F8 80974048 46001381 */ sub.s $f14, $f2, $f0 -/* 030FC 8097404C 46125032 */ c.eq.s $f10, $f18 -/* 03100 80974050 00000000 */ nop -/* 03104 80974054 45030014 */ bc1tl .L809740A8 -/* 03108 80974058 86090192 */ lh $t1, 0x0192($s0) ## 00000192 -/* 0310C 8097405C 46001381 */ sub.s $f14, $f2, $f0 -.L80974060: -/* 03110 80974060 C7A40060 */ lwc1 $f4, 0x0060($sp) -/* 03114 80974064 C7A6006C */ lwc1 $f6, 0x006C($sp) -/* 03118 80974068 E7B0004C */ swc1 $f16, 0x004C($sp) -/* 0311C 8097406C 46007387 */ neg.s $f14, $f14 -/* 03120 80974070 0C0341F5 */ jal atan2f - -/* 03124 80974074 46062301 */ sub.s $f12, $f4, $f6 -/* 03128 80974078 3C018097 */ lui $at, %hi(D_80976D38) ## $at = 80970000 -/* 0312C 8097407C C4286D38 */ lwc1 $f8, %lo(D_80976D38)($at) -/* 03130 80974080 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFF4 -/* 03134 80974084 27A50058 */ addiu $a1, $sp, 0x0058 ## $a1 = FFFFFFE8 -/* 03138 80974088 46080282 */ mul.s $f10, $f0, $f8 -/* 0313C 8097408C 4600548D */ trunc.w.s $f18, $f10 -/* 03140 80974090 44089000 */ mfc1 $t0, $f18 -/* 03144 80974094 0C01E01A */ jal Math_Vec3f_Yaw - -/* 03148 80974098 A608018E */ sh $t0, 0x018E($s0) ## 0000018E -/* 0314C 8097409C C7B0004C */ lwc1 $f16, 0x004C($sp) -/* 03150 809740A0 A6020190 */ sh $v0, 0x0190($s0) ## 00000190 -/* 03154 809740A4 86090192 */ lh $t1, 0x0192($s0) ## 00000192 -.L809740A8: -/* 03158 809740A8 3C013BB4 */ lui $at, 0x3BB4 ## $at = 3BB40000 -/* 0315C 809740AC 44814000 */ mtc1 $at, $f8 ## $f8 = 0.01 -/* 03160 809740B0 252A0400 */ addiu $t2, $t1, 0x0400 ## $t2 = 00000400 -/* 03164 809740B4 A60A0192 */ sh $t2, 0x0192($s0) ## 00000192 -/* 03168 809740B8 860B0192 */ lh $t3, 0x0192($s0) ## 00000192 -/* 0316C 809740BC C7B20050 */ lwc1 $f18, 0x0050($sp) -/* 03170 809740C0 27AC0064 */ addiu $t4, $sp, 0x0064 ## $t4 = FFFFFFF4 -/* 03174 809740C4 448B2000 */ mtc1 $t3, $f4 ## $f4 = 0.00 -/* 03178 809740C8 27AF0058 */ addiu $t7, $sp, 0x0058 ## $t7 = FFFFFFE8 -/* 0317C 809740CC C7AE0054 */ lwc1 $f14, 0x0054($sp) -/* 03180 809740D0 468021A0 */ cvt.s.w $f6, $f4 -/* 03184 809740D4 46083282 */ mul.s $f10, $f6, $f8 -/* 03188 809740D8 460A9300 */ add.s $f12, $f18, $f10 -/* 0318C 809740DC E7AC0050 */ swc1 $f12, 0x0050($sp) -/* 03190 809740E0 8D8E0000 */ lw $t6, 0x0000($t4) ## FFFFFFF4 -/* 03194 809740E4 AFAE0008 */ sw $t6, 0x0008($sp) -/* 03198 809740E8 8D870004 */ lw $a3, 0x0004($t4) ## FFFFFFF8 -/* 0319C 809740EC 8FA60008 */ lw $a2, 0x0008($sp) -/* 031A0 809740F0 AFA7000C */ sw $a3, 0x000C($sp) -/* 031A4 809740F4 8D8E0008 */ lw $t6, 0x0008($t4) ## FFFFFFFC -/* 031A8 809740F8 AFAE0010 */ sw $t6, 0x0010($sp) -/* 031AC 809740FC 8DF90000 */ lw $t9, 0x0000($t7) ## FFFFFFE8 -/* 031B0 80974100 AFB90014 */ sw $t9, 0x0014($sp) -/* 031B4 80974104 8DF80004 */ lw $t8, 0x0004($t7) ## FFFFFFEC -/* 031B8 80974108 AFB80018 */ sw $t8, 0x0018($sp) -/* 031BC 8097410C 8DF90008 */ lw $t9, 0x0008($t7) ## FFFFFFF0 -/* 031C0 80974110 E7B00020 */ swc1 $f16, 0x0020($sp) -/* 031C4 80974114 AFB9001C */ sw $t9, 0x001C($sp) -/* 031C8 80974118 8A09018E */ lwl $t1, 0x018E($s0) ## 0000018E -/* 031CC 8097411C 9A090191 */ lwr $t1, 0x0191($s0) ## 00000191 -/* 031D0 80974120 ABA90024 */ swl $t1, 0x0024($sp) -/* 031D4 80974124 BBA90027 */ swr $t1, 0x0027($sp) -/* 031D8 80974128 96090192 */ lhu $t1, 0x0192($s0) ## 00000192 -/* 031DC 8097412C AFB0002C */ sw $s0, 0x002C($sp) -/* 031E0 80974130 0C25CF3F */ jal func_80973CFC -/* 031E4 80974134 A7A90028 */ sh $t1, 0x0028($sp) -/* 031E8 80974138 8FBF003C */ lw $ra, 0x003C($sp) -/* 031EC 8097413C 8FB00038 */ lw $s0, 0x0038($sp) -/* 031F0 80974140 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 -/* 031F4 80974144 03E00008 */ jr $ra -/* 031F8 80974148 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097414C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097414C.s deleted file mode 100644 index e2ad784362..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097414C.s +++ /dev/null @@ -1,99 +0,0 @@ -.late_rodata -glabel D_80976D3C - .float -0.1 - -.text -glabel func_8097414C -/* 031FC 8097414C 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 -/* 03200 80974150 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 03204 80974154 3C018097 */ lui $at, %hi(D_80976D3C) ## $at = 80970000 -/* 03208 80974158 C4246D3C */ lwc1 $f4, %lo(D_80976D3C)($at) -/* 0320C 8097415C AFBF0054 */ sw $ra, 0x0054($sp) -/* 03210 80974160 AFB70050 */ sw $s7, 0x0050($sp) -/* 03214 80974164 AFB6004C */ sw $s6, 0x004C($sp) -/* 03218 80974168 AFB50048 */ sw $s5, 0x0048($sp) -/* 0321C 8097416C AFB40044 */ sw $s4, 0x0044($sp) -/* 03220 80974170 AFB30040 */ sw $s3, 0x0040($sp) -/* 03224 80974174 AFB2003C */ sw $s2, 0x003C($sp) -/* 03228 80974178 AFB10038 */ sw $s1, 0x0038($sp) -/* 0322C 8097417C AFB00034 */ sw $s0, 0x0034($sp) -/* 03230 80974180 F7B60028 */ sdc1 $f22, 0x0028($sp) -/* 03234 80974184 F7B40020 */ sdc1 $f20, 0x0020($sp) -/* 03238 80974188 E7A00080 */ swc1 $f0, 0x0080($sp) -/* 0323C 8097418C E7A00070 */ swc1 $f0, 0x0070($sp) -/* 03240 80974190 E7A00078 */ swc1 $f0, 0x0078($sp) -/* 03244 80974194 E7A40074 */ swc1 $f4, 0x0074($sp) -/* 03248 80974198 908E0184 */ lbu $t6, 0x0184($a0) ## 00000184 -/* 0324C 8097419C 3C198097 */ lui $t9, %hi(D_80976860) ## $t9 = 80970000 -/* 03250 809741A0 27396860 */ addiu $t9, $t9, %lo(D_80976860) ## $t9 = 80976860 -/* 03254 809741A4 000E7880 */ sll $t7, $t6, 2 -/* 03258 809741A8 01EE7823 */ subu $t7, $t7, $t6 -/* 0325C 809741AC 000F7840 */ sll $t7, $t7, 1 -/* 03260 809741B0 25F8FF8E */ addiu $t8, $t7, 0xFF8E ## $t8 = FFFFFF8E -/* 03264 809741B4 03191021 */ addu $v0, $t8, $t9 -/* 03268 809741B8 90480000 */ lbu $t0, 0x0000($v0) ## 00000000 -/* 0326C 809741BC 00C0B025 */ or $s6, $a2, $zero ## $s6 = 00000000 -/* 03270 809741C0 00A0B825 */ or $s7, $a1, $zero ## $s7 = 00000000 -/* 03274 809741C4 A3A8006C */ sb $t0, 0x006C($sp) -/* 03278 809741C8 90490001 */ lbu $t1, 0x0001($v0) ## 00000001 -/* 0327C 809741CC 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 -/* 03280 809741D0 24910024 */ addiu $s1, $a0, 0x0024 ## $s1 = 00000024 -/* 03284 809741D4 A3A9006D */ sb $t1, 0x006D($sp) -/* 03288 809741D8 904A0002 */ lbu $t2, 0x0002($v0) ## 00000002 -/* 0328C 809741DC 27B30070 */ addiu $s3, $sp, 0x0070 ## $s3 = FFFFFFE8 -/* 03290 809741E0 27B4006C */ addiu $s4, $sp, 0x006C ## $s4 = FFFFFFE4 -/* 03294 809741E4 A3AA006E */ sb $t2, 0x006E($sp) -/* 03298 809741E8 904B0003 */ lbu $t3, 0x0003($v0) ## 00000003 -/* 0329C 809741EC 27B50068 */ addiu $s5, $sp, 0x0068 ## $s5 = FFFFFFE0 -/* 032A0 809741F0 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 032A4 809741F4 A3AB0068 */ sb $t3, 0x0068($sp) -/* 032A8 809741F8 904C0004 */ lbu $t4, 0x0004($v0) ## 00000004 -/* 032AC 809741FC A3AC0069 */ sb $t4, 0x0069($sp) -/* 032B0 80974200 904D0005 */ lbu $t5, 0x0005($v0) ## 00000005 -/* 032B4 80974204 A3A0006F */ sb $zero, 0x006F($sp) -/* 032B8 80974208 18C0001C */ blez $a2, .L8097427C -/* 032BC 8097420C A3AD006A */ sb $t5, 0x006A($sp) -/* 032C0 80974210 4481B000 */ mtc1 $at, $f22 ## $f22 = 1.50 -/* 032C4 80974214 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 032C8 80974218 4481A000 */ mtc1 $at, $f20 ## $f20 = 0.50 -/* 032CC 8097421C 27B2007C */ addiu $s2, $sp, 0x007C ## $s2 = FFFFFFF4 -.L80974220: -/* 032D0 80974220 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 032D4 80974224 00000000 */ nop -/* 032D8 80974228 46140181 */ sub.s $f6, $f0, $f20 -/* 032DC 8097422C 46163202 */ mul.s $f8, $f6, $f22 -/* 032E0 80974230 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 032E4 80974234 E7A8007C */ swc1 $f8, 0x007C($sp) -/* 032E8 80974238 46140281 */ sub.s $f10, $f0, $f20 -/* 032EC 8097423C 240E0BB8 */ addiu $t6, $zero, 0x0BB8 ## $t6 = 00000BB8 -/* 032F0 80974240 240F0010 */ addiu $t7, $zero, 0x0010 ## $t7 = 00000010 -/* 032F4 80974244 AFAF001C */ sw $t7, 0x001C($sp) -/* 032F8 80974248 46165402 */ mul.s $f16, $f10, $f22 -/* 032FC 8097424C AFAE0018 */ sw $t6, 0x0018($sp) -/* 03300 80974250 02E02025 */ or $a0, $s7, $zero ## $a0 = 00000000 -/* 03304 80974254 02202825 */ or $a1, $s1, $zero ## $a1 = 00000024 -/* 03308 80974258 02403025 */ or $a2, $s2, $zero ## $a2 = FFFFFFF4 -/* 0330C 8097425C 02603825 */ or $a3, $s3, $zero ## $a3 = FFFFFFE8 -/* 03310 80974260 AFB40010 */ sw $s4, 0x0010($sp) -/* 03314 80974264 E7B00084 */ swc1 $f16, 0x0084($sp) -/* 03318 80974268 0C00A2EC */ jal EffectSsKiraKira_SpawnDispersed -/* 0331C 8097426C AFB50014 */ sw $s5, 0x0014($sp) -/* 03320 80974270 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 03324 80974274 1616FFEA */ bne $s0, $s6, .L80974220 -/* 03328 80974278 00000000 */ nop -.L8097427C: -/* 0332C 8097427C 8FBF0054 */ lw $ra, 0x0054($sp) -/* 03330 80974280 D7B40020 */ ldc1 $f20, 0x0020($sp) -/* 03334 80974284 D7B60028 */ ldc1 $f22, 0x0028($sp) -/* 03338 80974288 8FB00034 */ lw $s0, 0x0034($sp) -/* 0333C 8097428C 8FB10038 */ lw $s1, 0x0038($sp) -/* 03340 80974290 8FB2003C */ lw $s2, 0x003C($sp) -/* 03344 80974294 8FB30040 */ lw $s3, 0x0040($sp) -/* 03348 80974298 8FB40044 */ lw $s4, 0x0044($sp) -/* 0334C 8097429C 8FB50048 */ lw $s5, 0x0048($sp) -/* 03350 809742A0 8FB6004C */ lw $s6, 0x004C($sp) -/* 03354 809742A4 8FB70050 */ lw $s7, 0x0050($sp) -/* 03358 809742A8 03E00008 */ jr $ra -/* 0335C 809742AC 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809742B0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809742B0.s deleted file mode 100644 index 0af6e9f98e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809742B0.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_809742B0 -/* 03360 809742B0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03364 809742B4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03368 809742B8 AFA40018 */ sw $a0, 0x0018($sp) -/* 0336C 809742BC 0C25D1AD */ jal func_809746B4 -/* 03370 809742C0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 03374 809742C4 1440000F */ bne $v0, $zero, .L80974304 -/* 03378 809742C8 8FA40018 */ lw $a0, 0x0018($sp) -/* 0337C 809742CC 3C068097 */ lui $a2, %hi(D_80976810) ## $a2 = 80970000 -/* 03380 809742D0 24C66810 */ addiu $a2, $a2, %lo(D_80976810) ## $a2 = 80976810 -/* 03384 809742D4 84C30000 */ lh $v1, 0x0000($a2) ## 80976810 -/* 03388 809742D8 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 0338C 809742DC 14430005 */ bne $v0, $v1, .L809742F4 -/* 03390 809742E0 00000000 */ nop -/* 03394 809742E4 0C00BE5D */ jal func_8002F974 -/* 03398 809742E8 2405206E */ addiu $a1, $zero, 0x206E ## $a1 = 0000206E -/* 0339C 809742EC 10000006 */ beq $zero, $zero, .L80974308 -/* 033A0 809742F0 8FBF0014 */ lw $ra, 0x0014($sp) -.L809742F4: -/* 033A4 809742F4 14600003 */ bne $v1, $zero, .L80974304 -/* 033A8 809742F8 2405206E */ addiu $a1, $zero, 0x206E ## $a1 = 0000206E -/* 033AC 809742FC 0C00BE5D */ jal func_8002F974 -/* 033B0 80974300 A4C20000 */ sh $v0, 0x0000($a2) ## 00000000 -.L80974304: -/* 033B4 80974304 8FBF0014 */ lw $ra, 0x0014($sp) -.L80974308: -/* 033B8 80974308 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 033BC 8097430C 03E00008 */ jr $ra -/* 033C0 80974310 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974314.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974314.s deleted file mode 100644 index 0f8c0bbf20..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974314.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80974314 -/* 033C4 80974314 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 033C8 80974318 AFBF0014 */ sw $ra, 0x0014($sp) -/* 033CC 8097431C 848E0188 */ lh $t6, 0x0188($a0) ## 00000188 -/* 033D0 80974320 849800B6 */ lh $t8, 0x00B6($a0) ## 000000B6 -/* 033D4 80974324 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 033D8 80974328 27190400 */ addiu $t9, $t8, 0x0400 ## $t9 = 00000400 -/* 033DC 8097432C A48F0188 */ sh $t7, 0x0188($a0) ## 00000188 -/* 033E0 80974330 A49900B6 */ sh $t9, 0x00B6($a0) ## 000000B6 -/* 033E4 80974334 0C25D0AC */ jal func_809742B0 -/* 033E8 80974338 AFA40018 */ sw $a0, 0x0018($sp) -/* 033EC 8097433C 8FA40018 */ lw $a0, 0x0018($sp) -/* 033F0 80974340 0C25CD49 */ jal func_80973524 -/* 033F4 80974344 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 033F8 80974348 8FBF0014 */ lw $ra, 0x0014($sp) -/* 033FC 8097434C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03400 80974350 03E00008 */ jr $ra -/* 03404 80974354 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974358.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974358.s deleted file mode 100644 index 8d46ce9de4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974358.s +++ /dev/null @@ -1,146 +0,0 @@ -glabel func_80974358 -/* 03408 80974358 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0340C 8097435C AFBF001C */ sw $ra, 0x001C($sp) -/* 03410 80974360 AFB10018 */ sw $s1, 0x0018($sp) -/* 03414 80974364 AFB00014 */ sw $s0, 0x0014($sp) -/* 03418 80974368 848E0188 */ lh $t6, 0x0188($a0) ## 00000188 -/* 0341C 8097436C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03420 80974370 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 03424 80974374 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 03428 80974378 A48F0188 */ sh $t7, 0x0188($a0) ## 00000188 -/* 0342C 8097437C 90B81D6C */ lbu $t8, 0x1D6C($a1) ## 00001D6C -/* 03430 80974380 13000053 */ beq $t8, $zero, .L809744D0 -/* 03434 80974384 00000000 */ nop -/* 03438 80974388 8486018C */ lh $a2, 0x018C($a0) ## 0000018C -/* 0343C 8097438C 0006C880 */ sll $t9, $a2, 2 -/* 03440 80974390 00B94021 */ addu $t0, $a1, $t9 -/* 03444 80974394 8D031D8C */ lw $v1, 0x1D8C($t0) ## 00001D8C -/* 03448 80974398 1060004D */ beq $v1, $zero, .L809744D0 -/* 0344C 8097439C 00000000 */ nop -/* 03450 809743A0 94620000 */ lhu $v0, 0x0000($v1) ## 00000000 -/* 03454 809743A4 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 03458 809743A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0345C 809743AC 10410007 */ beq $v0, $at, .L809743CC -/* 03460 809743B0 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 03464 809743B4 1041001A */ beq $v0, $at, .L80974420 -/* 03468 809743B8 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 0346C 809743BC 10410036 */ beq $v0, $at, .L80974498 -/* 03470 809743C0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03474 809743C4 10000038 */ beq $zero, $zero, .L809744A8 -/* 03478 809743C8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -.L809743CC: -/* 0347C 809743CC 3C028016 */ lui $v0, %hi(gSaveContext+0xedc) -/* 03480 809743D0 9442F53C */ lhu $v0, %lo(gSaveContext+0xedc)($v0) -/* 03484 809743D4 3C018016 */ lui $at, %hi(gSaveContext+0xedc) -/* 03488 809743D8 30490800 */ andi $t1, $v0, 0x0800 ## $t1 = 00000000 -/* 0348C 809743DC 11200002 */ beq $t1, $zero, .L809743E8 -/* 03490 809743E0 344A0800 */ ori $t2, $v0, 0x0800 ## $t2 = 80160800 -/* 03494 809743E4 A42AF53C */ sh $t2, %lo(gSaveContext+0xedc)($at) -.L809743E8: -/* 03498 809743E8 0C25CFB8 */ jal func_80973EE0 -/* 0349C 809743EC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 034A0 809743F0 3C0B0001 */ lui $t3, 0x0001 ## $t3 = 00010000 -/* 034A4 809743F4 01715821 */ addu $t3, $t3, $s1 -/* 034A8 809743F8 8D6B1DE4 */ lw $t3, 0x1DE4($t3) ## 00011DE4 -/* 034AC 809743FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 034B0 80974400 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 034B4 80974404 316C0001 */ andi $t4, $t3, 0x0001 ## $t4 = 00000000 -/* 034B8 80974408 15800031 */ bne $t4, $zero, .L809744D0 -/* 034BC 8097440C 00000000 */ nop -/* 034C0 80974410 0C25D053 */ jal func_8097414C -/* 034C4 80974414 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 034C8 80974418 1000002D */ beq $zero, $zero, .L809744D0 -/* 034CC 8097441C 00000000 */ nop -.L80974420: -/* 034D0 80974420 920D0185 */ lbu $t5, 0x0185($s0) ## 00000185 -/* 034D4 80974424 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 034D8 80974428 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 034DC 8097442C 11A00012 */ beq $t5, $zero, .L80974478 -/* 034E0 80974430 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 034E4 80974434 0C25D96B */ jal func_809765AC -/* 034E8 80974438 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 034EC 8097443C 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 034F0 80974440 0C25CF28 */ jal func_80973CA0 -/* 034F4 80974444 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 034F8 80974448 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 -/* 034FC 8097444C 01D17021 */ addu $t6, $t6, $s1 -/* 03500 80974450 8DCE1DE4 */ lw $t6, 0x1DE4($t6) ## 00011DE4 -/* 03504 80974454 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03508 80974458 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0350C 8097445C 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 03510 80974460 15E0001B */ bne $t7, $zero, .L809744D0 -/* 03514 80974464 00000000 */ nop -/* 03518 80974468 0C25D053 */ jal func_8097414C -/* 0351C 8097446C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 03520 80974470 10000017 */ beq $zero, $zero, .L809744D0 -/* 03524 80974474 00000000 */ nop -.L80974478: -/* 03528 80974478 0C25D9EC */ jal func_809767B0 -/* 0352C 8097447C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 03530 80974480 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 03534 80974484 0C25CF28 */ jal func_80973CA0 -/* 03538 80974488 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0353C 8097448C 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 03540 80974490 1000000F */ beq $zero, $zero, .L809744D0 -/* 03544 80974494 A2180185 */ sb $t8, 0x0185($s0) ## 00000185 -.L80974498: -/* 03548 80974498 0C00B55C */ jal Actor_Kill - -/* 0354C 8097449C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03550 809744A0 1000002E */ beq $zero, $zero, .L8097455C -/* 03554 809744A4 8FBF001C */ lw $ra, 0x001C($sp) -.L809744A8: -/* 03558 809744A8 0C25D96B */ jal func_809765AC -/* 0355C 809744AC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 03560 809744B0 3C198016 */ lui $t9, %hi(gSaveContext) -/* 03564 809744B4 8F39E660 */ lw $t9, %lo(gSaveContext)($t9) -/* 03568 809744B8 24010053 */ addiu $at, $zero, 0x0053 ## $at = 00000053 -/* 0356C 809744BC 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 03570 809744C0 17210003 */ bne $t9, $at, .L809744D0 -/* 03574 809744C4 00000000 */ nop -/* 03578 809744C8 0C25CF28 */ jal func_80973CA0 -/* 0357C 809744CC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -.L809744D0: -/* 03580 809744D0 3C088016 */ lui $t0, %hi(gSaveContext) -/* 03584 809744D4 8D08E660 */ lw $t0, %lo(gSaveContext)($t0) -/* 03588 809744D8 24010053 */ addiu $at, $zero, 0x0053 ## $at = 00000053 -/* 0358C 809744DC 3C098016 */ lui $t1, %hi(gSaveContext+0xedc) -/* 03590 809744E0 55010015 */ bnel $t0, $at, .L80974538 -/* 03594 809744E4 861800B6 */ lh $t8, 0x00B6($s0) ## 000000B6 -/* 03598 809744E8 9529F53C */ lhu $t1, %lo(gSaveContext+0xedc)($t1) -/* 0359C 809744EC 312A0800 */ andi $t2, $t1, 0x0800 ## $t2 = 00000000 -/* 035A0 809744F0 55400011 */ bnel $t2, $zero, .L80974538 -/* 035A4 809744F4 861800B6 */ lh $t8, 0x00B6($s0) ## 000000B6 -/* 035A8 809744F8 92221D6C */ lbu $v0, 0x1D6C($s1) ## 00001D6C -/* 035AC 809744FC 0002102B */ sltu $v0, $zero, $v0 -/* 035B0 80974500 10400006 */ beq $v0, $zero, .L8097451C -/* 035B4 80974504 00000000 */ nop -/* 035B8 80974508 860B018C */ lh $t3, 0x018C($s0) ## 0000018C -/* 035BC 8097450C 000B6080 */ sll $t4, $t3, 2 -/* 035C0 80974510 022C6821 */ addu $t5, $s1, $t4 -/* 035C4 80974514 8DA21D8C */ lw $v0, 0x1D8C($t5) ## 00001D8C -/* 035C8 80974518 0002102B */ sltu $v0, $zero, $v0 -.L8097451C: -/* 035CC 8097451C 54400006 */ bnel $v0, $zero, .L80974538 -/* 035D0 80974520 861800B6 */ lh $t8, 0x00B6($s0) ## 000000B6 -/* 035D4 80974524 860E018A */ lh $t6, 0x018A($s0) ## 0000018A -/* 035D8 80974528 35CF0001 */ ori $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 035DC 8097452C 1000000A */ beq $zero, $zero, .L80974558 -/* 035E0 80974530 A60F018A */ sh $t7, 0x018A($s0) ## 0000018A -/* 035E4 80974534 861800B6 */ lh $t8, 0x00B6($s0) ## 000000B6 -.L80974538: -/* 035E8 80974538 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 035EC 8097453C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 035F0 80974540 27190400 */ addiu $t9, $t8, 0x0400 ## $t9 = 00000400 -/* 035F4 80974544 0C25D0AC */ jal func_809742B0 -/* 035F8 80974548 A61900B6 */ sh $t9, 0x00B6($s0) ## 000000B6 -/* 035FC 8097454C 8608018A */ lh $t0, 0x018A($s0) ## 0000018A -/* 03600 80974550 3109FFFE */ andi $t1, $t0, 0xFFFE ## $t1 = 00000000 -/* 03604 80974554 A609018A */ sh $t1, 0x018A($s0) ## 0000018A -.L80974558: -/* 03608 80974558 8FBF001C */ lw $ra, 0x001C($sp) -.L8097455C: -/* 0360C 8097455C 8FB00014 */ lw $s0, 0x0014($sp) -/* 03610 80974560 8FB10018 */ lw $s1, 0x0018($sp) -/* 03614 80974564 03E00008 */ jr $ra -/* 03618 80974568 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097456C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097456C.s deleted file mode 100644 index 4cf84b6710..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097456C.s +++ /dev/null @@ -1,82 +0,0 @@ -.late_rodata -glabel D_80976D40 - .float 0.2 - -.text -glabel func_8097456C -/* 0361C 8097456C 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 03620 80974570 AFBF0024 */ sw $ra, 0x0024($sp) -/* 03624 80974574 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 03628 80974578 51C00042 */ beql $t6, $zero, .L80974684 -/* 0362C 8097457C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 03630 80974580 848F018C */ lh $t7, 0x018C($a0) ## 0000018C -/* 03634 80974584 000FC080 */ sll $t8, $t7, 2 -/* 03638 80974588 00B8C821 */ addu $t9, $a1, $t8 -/* 0363C 8097458C 8F221D8C */ lw $v0, 0x1D8C($t9) ## 00001D8C -/* 03640 80974590 5040003C */ beql $v0, $zero, .L80974684 -/* 03644 80974594 8FBF0024 */ lw $ra, 0x0024($sp) -/* 03648 80974598 94480000 */ lhu $t0, 0x0000($v0) ## 00000000 -/* 0364C 8097459C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 03650 809745A0 55010038 */ bnel $t0, $at, .L80974684 -/* 03654 809745A4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 03658 809745A8 8C8B0024 */ lw $t3, 0x0024($a0) ## 00000024 -/* 0365C 809745AC 27A9004C */ addiu $t1, $sp, 0x004C ## $t1 = FFFFFFF4 -/* 03660 809745B0 3C014416 */ lui $at, 0x4416 ## $at = 44160000 -/* 03664 809745B4 AD2B0000 */ sw $t3, 0x0000($t1) ## FFFFFFF4 -/* 03668 809745B8 8C8A0028 */ lw $t2, 0x0028($a0) ## 00000028 -/* 0366C 809745BC 44813000 */ mtc1 $at, $f6 ## $f6 = 600.00 -/* 03670 809745C0 3C014396 */ lui $at, 0x4396 ## $at = 43960000 -/* 03674 809745C4 AD2A0004 */ sw $t2, 0x0004($t1) ## FFFFFFF8 -/* 03678 809745C8 8C8B002C */ lw $t3, 0x002C($a0) ## 0000002C -/* 0367C 809745CC 44816000 */ mtc1 $at, $f12 ## $f12 = 300.00 -/* 03680 809745D0 AD2B0008 */ sw $t3, 0x0008($t1) ## FFFFFFFC -/* 03684 809745D4 C7A40050 */ lwc1 $f4, 0x0050($sp) -/* 03688 809745D8 AFA5005C */ sw $a1, 0x005C($sp) -/* 0368C 809745DC AFA40058 */ sw $a0, 0x0058($sp) -/* 03690 809745E0 46062200 */ add.s $f8, $f4, $f6 -/* 03694 809745E4 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 03698 809745E8 E7A80050 */ swc1 $f8, 0x0050($sp) -/* 0369C 809745EC C7AA004C */ lwc1 $f10, 0x004C($sp) -/* 036A0 809745F0 3C014396 */ lui $at, 0x4396 ## $at = 43960000 -/* 036A4 809745F4 44816000 */ mtc1 $at, $f12 ## $f12 = 300.00 -/* 036A8 809745F8 46005400 */ add.s $f16, $f10, $f0 -/* 036AC 809745FC 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 036B0 80974600 E7B0004C */ swc1 $f16, 0x004C($sp) -/* 036B4 80974604 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 036B8 80974608 44812000 */ mtc1 $at, $f4 ## $f4 = 200.00 -/* 036BC 8097460C C7B20054 */ lwc1 $f18, 0x0054($sp) -/* 036C0 80974610 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 036C4 80974614 46002180 */ add.s $f6, $f4, $f0 -/* 036C8 80974618 3C01C1A0 */ lui $at, 0xC1A0 ## $at = C1A00000 -/* 036CC 8097461C 44815000 */ mtc1 $at, $f10 ## $f10 = -20.00 -/* 036D0 80974620 3C018097 */ lui $at, %hi(D_80976D40) ## $at = 80970000 -/* 036D4 80974624 46069200 */ add.s $f8, $f18, $f6 -/* 036D8 80974628 C4306D40 */ lwc1 $f16, %lo(D_80976D40)($at) -/* 036DC 8097462C 240C012C */ addiu $t4, $zero, 0x012C ## $t4 = 0000012C -/* 036E0 80974630 240D001E */ addiu $t5, $zero, 0x001E ## $t5 = 0000001E -/* 036E4 80974634 E7A80054 */ swc1 $f8, 0x0054($sp) -/* 036E8 80974638 AFAD0018 */ sw $t5, 0x0018($sp) -/* 036EC 8097463C AFAC0010 */ sw $t4, 0x0010($sp) -/* 036F0 80974640 8FA4005C */ lw $a0, 0x005C($sp) -/* 036F4 80974644 27A5004C */ addiu $a1, $sp, 0x004C ## $a1 = FFFFFFF4 -/* 036F8 80974648 27A60040 */ addiu $a2, $sp, 0x0040 ## $a2 = FFFFFFE8 -/* 036FC 8097464C 27A70034 */ addiu $a3, $sp, 0x0034 ## $a3 = FFFFFFDC -/* 03700 80974650 AFA00014 */ sw $zero, 0x0014($sp) -/* 03704 80974654 E7A20048 */ swc1 $f2, 0x0048($sp) -/* 03708 80974658 E7A20040 */ swc1 $f2, 0x0040($sp) -/* 0370C 8097465C E7A2003C */ swc1 $f2, 0x003C($sp) -/* 03710 80974660 E7A20034 */ swc1 $f2, 0x0034($sp) -/* 03714 80974664 E7AA0044 */ swc1 $f10, 0x0044($sp) -/* 03718 80974668 0C00A1CF */ jal func_8002873C -/* 0371C 8097466C E7B00038 */ swc1 $f16, 0x0038($sp) -/* 03720 80974670 8FA20058 */ lw $v0, 0x0058($sp) -/* 03724 80974674 904E0184 */ lbu $t6, 0x0184($v0) ## 00000184 -/* 03728 80974678 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 0372C 8097467C A04F0184 */ sb $t7, 0x0184($v0) ## 00000184 -/* 03730 80974680 8FBF0024 */ lw $ra, 0x0024($sp) -.L80974684: -/* 03734 80974684 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 03738 80974688 03E00008 */ jr $ra -/* 0373C 8097468C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809746B4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809746B4.s deleted file mode 100644 index f997cfa0c5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809746B4.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_809746B4 -/* 03764 809746B4 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 03768 809746B8 51C0000D */ beql $t6, $zero, .L809746F0 -/* 0376C 809746BC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 03770 809746C0 848F018C */ lh $t7, 0x018C($a0) ## 0000018C -/* 03774 809746C4 000FC080 */ sll $t8, $t7, 2 -/* 03778 809746C8 00B8C821 */ addu $t9, $a1, $t8 -/* 0377C 809746CC 8F221D8C */ lw $v0, 0x1D8C($t9) ## 00001D8C -/* 03780 809746D0 50400007 */ beql $v0, $zero, .L809746F0 -/* 03784 809746D4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 03788 809746D8 94480000 */ lhu $t0, 0x0000($v0) ## 00000000 -/* 0378C 809746DC 54C80004 */ bnel $a2, $t0, .L809746F0 -/* 03790 809746E0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 03794 809746E4 03E00008 */ jr $ra -/* 03798 809746E8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L809746EC: -/* 0379C 809746EC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L809746F0: -/* 037A0 809746F0 03E00008 */ jr $ra -/* 037A4 809746F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809746F8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809746F8.s deleted file mode 100644 index f3bdc88e4f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809746F8.s +++ /dev/null @@ -1,316 +0,0 @@ -.rdata -glabel D_8097694C - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976960 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976974 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976988 - .asciz "../z_demo_effect.c" - .balign 4 - -.text -glabel func_809746F8 -/* 037A8 809746F8 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 -/* 037AC 809746FC AFBF003C */ sw $ra, 0x003C($sp) -/* 037B0 80974700 AFB10038 */ sw $s1, 0x0038($sp) -/* 037B4 80974704 AFB00034 */ sw $s0, 0x0034($sp) -/* 037B8 80974708 AFA5009C */ sw $a1, 0x009C($sp) -/* 037BC 8097470C 84880188 */ lh $t0, 0x0188($a0) ## 00000188 -/* 037C0 80974710 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 037C4 80974714 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 037C8 80974718 3C068097 */ lui $a2, %hi(D_8097694C) ## $a2 = 80970000 -/* 037CC 8097471C 24C6694C */ addiu $a2, $a2, %lo(D_8097694C) ## $a2 = 8097694C -/* 037D0 80974720 27A40078 */ addiu $a0, $sp, 0x0078 ## $a0 = FFFFFFE0 -/* 037D4 80974724 240709EF */ addiu $a3, $zero, 0x09EF ## $a3 = 000009EF -/* 037D8 80974728 AFA8008C */ sw $t0, 0x008C($sp) -/* 037DC 8097472C 0C031AB1 */ jal Graph_OpenDisps -/* 037E0 80974730 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 037E4 80974734 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 037E8 80974738 8FA5009C */ lw $a1, 0x009C($sp) -/* 037EC 8097473C 0C25D1AD */ jal func_809746B4 -/* 037F0 80974740 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 037F4 80974744 14400102 */ bne $v0, $zero, .L80974B50 -/* 037F8 80974748 8FA8008C */ lw $t0, 0x008C($sp) -/* 037FC 8097474C 862F018A */ lh $t7, 0x018A($s1) ## 0000018A -/* 03800 80974750 31F80001 */ andi $t8, $t7, 0x0001 ## $t8 = 00000000 -/* 03804 80974754 570000FF */ bnel $t8, $zero, .L80974B54 -/* 03808 80974758 8FAE009C */ lw $t6, 0x009C($sp) -/* 0380C 8097475C 92220184 */ lbu $v0, 0x0184($s1) ## 00000184 -/* 03810 80974760 24010013 */ addiu $at, $zero, 0x0013 ## $at = 00000013 -/* 03814 80974764 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF -/* 03818 80974768 10410009 */ beq $v0, $at, .L80974790 -/* 0381C 8097476C 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 03820 80974770 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 -/* 03824 80974774 10410028 */ beq $v0, $at, .L80974818 -/* 03828 80974778 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF -/* 0382C 8097477C 24010015 */ addiu $at, $zero, 0x0015 ## $at = 00000015 -/* 03830 80974780 10410048 */ beq $v0, $at, .L809748A4 -/* 03834 80974784 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF -/* 03838 80974788 10000069 */ beq $zero, $zero, .L80974930 -/* 0383C 8097478C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -.L80974790: -/* 03840 80974790 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 03844 80974794 356B0024 */ ori $t3, $t3, 0x0024 ## $t3 = DB060024 -/* 03848 80974798 00081840 */ sll $v1, $t0, 1 -/* 0384C 8097479C 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 03850 809747A0 AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0 -/* 03854 809747A4 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 03858 809747A8 8FAC009C */ lw $t4, 0x009C($sp) -/* 0385C 809747AC 311800FF */ andi $t8, $t0, 0x00FF ## $t8 = 00000000 -/* 03860 809747B0 0158C823 */ subu $t9, $t2, $t8 -/* 03864 809747B4 8D840000 */ lw $a0, 0x0000($t4) ## 00000000 -/* 03868 809747B8 240C0010 */ addiu $t4, $zero, 0x0010 ## $t4 = 00000010 -/* 0386C 809747BC 240B0010 */ addiu $t3, $zero, 0x0010 ## $t3 = 00000010 -/* 03870 809747C0 306300FF */ andi $v1, $v1, 0x00FF ## $v1 = 00000000 -/* 03874 809747C4 00083080 */ sll $a2, $t0, 2 -/* 03878 809747C8 240D0040 */ addiu $t5, $zero, 0x0040 ## $t5 = 00000040 -/* 0387C 809747CC 240E0040 */ addiu $t6, $zero, 0x0040 ## $t6 = 00000040 -/* 03880 809747D0 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 03884 809747D4 AFAF0018 */ sw $t7, 0x0018($sp) -/* 03888 809747D8 AFAE0014 */ sw $t6, 0x0014($sp) -/* 0388C 809747DC AFAD0010 */ sw $t5, 0x0010($sp) -/* 03890 809747E0 30C600FF */ andi $a2, $a2, 0x00FF ## $a2 = 00000000 -/* 03894 809747E4 01433823 */ subu $a3, $t2, $v1 -/* 03898 809747E8 AFA3001C */ sw $v1, 0x001C($sp) -/* 0389C 809747EC AFAB0024 */ sw $t3, 0x0024($sp) -/* 038A0 809747F0 AFAC0028 */ sw $t4, 0x0028($sp) -/* 038A4 809747F4 AFA8008C */ sw $t0, 0x008C($sp) -/* 038A8 809747F8 AFB90020 */ sw $t9, 0x0020($sp) -/* 038AC 809747FC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 038B0 80974800 0C0253D0 */ jal Gfx_TwoTexScroll -/* 038B4 80974804 AFA20074 */ sw $v0, 0x0074($sp) -/* 038B8 80974808 8FA90074 */ lw $t1, 0x0074($sp) -/* 038BC 8097480C 8FA8008C */ lw $t0, 0x008C($sp) -/* 038C0 80974810 10000046 */ beq $zero, $zero, .L8097492C -/* 038C4 80974814 AD220004 */ sw $v0, 0x0004($t1) ## 00000004 -.L80974818: -/* 038C8 80974818 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 038CC 8097481C 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 -/* 038D0 80974820 35CE0024 */ ori $t6, $t6, 0x0024 ## $t6 = DB060024 -/* 038D4 80974824 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 038D8 80974828 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 038DC 8097482C AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 038E0 80974830 8FAF009C */ lw $t7, 0x009C($sp) -/* 038E4 80974834 00081840 */ sll $v1, $t0, 1 -/* 038E8 80974838 310C00FF */ andi $t4, $t0, 0x00FF ## $t4 = 00000000 -/* 038EC 8097483C 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 038F0 80974840 240F0008 */ addiu $t7, $zero, 0x0008 ## $t7 = 00000008 -/* 038F4 80974844 014C6823 */ subu $t5, $t2, $t4 -/* 038F8 80974848 306300FF */ andi $v1, $v1, 0x00FF ## $v1 = 00000000 -/* 038FC 8097484C 240E0010 */ addiu $t6, $zero, 0x0010 ## $t6 = 00000010 -/* 03900 80974850 00083080 */ sll $a2, $t0, 2 -/* 03904 80974854 24180020 */ addiu $t8, $zero, 0x0020 ## $t8 = 00000020 -/* 03908 80974858 24190040 */ addiu $t9, $zero, 0x0040 ## $t9 = 00000040 -/* 0390C 8097485C 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 03910 80974860 AFAB0018 */ sw $t3, 0x0018($sp) -/* 03914 80974864 AFB90014 */ sw $t9, 0x0014($sp) -/* 03918 80974868 AFB80010 */ sw $t8, 0x0010($sp) -/* 0391C 8097486C 30C6007F */ andi $a2, $a2, 0x007F ## $a2 = 00000000 -/* 03920 80974870 AFAE0024 */ sw $t6, 0x0024($sp) -/* 03924 80974874 01433823 */ subu $a3, $t2, $v1 -/* 03928 80974878 AFA3001C */ sw $v1, 0x001C($sp) -/* 0392C 8097487C AFAD0020 */ sw $t5, 0x0020($sp) -/* 03930 80974880 AFAF0028 */ sw $t7, 0x0028($sp) -/* 03934 80974884 AFA8008C */ sw $t0, 0x008C($sp) -/* 03938 80974888 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0393C 8097488C 0C0253D0 */ jal Gfx_TwoTexScroll -/* 03940 80974890 AFA20070 */ sw $v0, 0x0070($sp) -/* 03944 80974894 8FA90070 */ lw $t1, 0x0070($sp) -/* 03948 80974898 8FA8008C */ lw $t0, 0x008C($sp) -/* 0394C 8097489C 10000023 */ beq $zero, $zero, .L8097492C -/* 03950 809748A0 AD220004 */ sw $v0, 0x0004($t1) ## 00000004 -.L809748A4: -/* 03954 809748A4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 03958 809748A8 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 -/* 0395C 809748AC 37390024 */ ori $t9, $t9, 0x0024 ## $t9 = DB060024 -/* 03960 809748B0 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 03964 809748B4 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 03968 809748B8 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 0396C 809748BC 8FAB009C */ lw $t3, 0x009C($sp) -/* 03970 809748C0 00081840 */ sll $v1, $t0, 1 -/* 03974 809748C4 310F00FF */ andi $t7, $t0, 0x00FF ## $t7 = 00000000 -/* 03978 809748C8 8D640000 */ lw $a0, 0x0000($t3) ## 00000000 -/* 0397C 809748CC 240B0010 */ addiu $t3, $zero, 0x0010 ## $t3 = 00000010 -/* 03980 809748D0 014FC023 */ subu $t8, $t2, $t7 -/* 03984 809748D4 306300FF */ andi $v1, $v1, 0x00FF ## $v1 = 00000000 -/* 03988 809748D8 24190010 */ addiu $t9, $zero, 0x0010 ## $t9 = 00000010 -/* 0398C 809748DC 00083080 */ sll $a2, $t0, 2 -/* 03990 809748E0 240C0020 */ addiu $t4, $zero, 0x0020 ## $t4 = 00000020 -/* 03994 809748E4 240D0020 */ addiu $t5, $zero, 0x0020 ## $t5 = 00000020 -/* 03998 809748E8 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 0399C 809748EC AFAE0018 */ sw $t6, 0x0018($sp) -/* 039A0 809748F0 AFAD0014 */ sw $t5, 0x0014($sp) -/* 039A4 809748F4 AFAC0010 */ sw $t4, 0x0010($sp) -/* 039A8 809748F8 30C600FF */ andi $a2, $a2, 0x00FF ## $a2 = 00000000 -/* 039AC 809748FC AFB90024 */ sw $t9, 0x0024($sp) -/* 039B0 80974900 01433823 */ subu $a3, $t2, $v1 -/* 039B4 80974904 AFA3001C */ sw $v1, 0x001C($sp) -/* 039B8 80974908 AFB80020 */ sw $t8, 0x0020($sp) -/* 039BC 8097490C AFAB0028 */ sw $t3, 0x0028($sp) -/* 039C0 80974910 AFA8008C */ sw $t0, 0x008C($sp) -/* 039C4 80974914 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 039C8 80974918 0C0253D0 */ jal Gfx_TwoTexScroll -/* 039CC 8097491C AFA2006C */ sw $v0, 0x006C($sp) -/* 039D0 80974920 8FA9006C */ lw $t1, 0x006C($sp) -/* 039D4 80974924 8FA8008C */ lw $t0, 0x008C($sp) -/* 039D8 80974928 AD220004 */ sw $v0, 0x0004($t1) ## 00000004 -.L8097492C: -/* 039DC 8097492C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -.L80974930: -/* 039E0 80974930 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 -/* 039E4 80974934 35AD0020 */ ori $t5, $t5, 0x0020 ## $t5 = DB060020 -/* 039E8 80974938 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 039EC 8097493C AE0C02C0 */ sw $t4, 0x02C0($s0) ## 000002C0 -/* 039F0 80974940 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 039F4 80974944 8FAE009C */ lw $t6, 0x009C($sp) -/* 039F8 80974948 310500FF */ andi $a1, $t0, 0x00FF ## $a1 = 00000000 -/* 039FC 8097494C 240F0010 */ addiu $t7, $zero, 0x0010 ## $t7 = 00000010 -/* 03A00 80974950 8DC40000 */ lw $a0, 0x0000($t6) ## 00000000 -/* 03A04 80974954 AFAF0010 */ sw $t7, 0x0010($sp) -/* 03A08 80974958 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 03A0C 8097495C 24070010 */ addiu $a3, $zero, 0x0010 ## $a3 = 00000010 -/* 03A10 80974960 0C0253A7 */ jal Gfx_TexScroll -/* 03A14 80974964 AFA20068 */ sw $v0, 0x0068($sp) -/* 03A18 80974968 8FA30068 */ lw $v1, 0x0068($sp) -/* 03A1C 8097496C 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 -/* 03A20 80974970 37390003 */ ori $t9, $t9, 0x0003 ## $t9 = DA380003 -/* 03A24 80974974 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 03A28 80974978 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 03A2C 8097497C 3C058097 */ lui $a1, %hi(D_80976960) ## $a1 = 80970000 -/* 03A30 80974980 24A56960 */ addiu $a1, $a1, %lo(D_80976960) ## $a1 = 80976960 -/* 03A34 80974984 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 03A38 80974988 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 03A3C 8097498C AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 03A40 80974990 8FAB009C */ lw $t3, 0x009C($sp) -/* 03A44 80974994 24060A25 */ addiu $a2, $zero, 0x0A25 ## $a2 = 00000A25 -/* 03A48 80974998 8D640000 */ lw $a0, 0x0000($t3) ## 00000000 -/* 03A4C 8097499C 0C0346A2 */ jal Matrix_NewMtx -/* 03A50 809749A0 AFA20064 */ sw $v0, 0x0064($sp) -/* 03A54 809749A4 8FA30064 */ lw $v1, 0x0064($sp) -/* 03A58 809749A8 3C0DDA38 */ lui $t5, 0xDA38 ## $t5 = DA380000 -/* 03A5C 809749AC 35AD0003 */ ori $t5, $t5, 0x0003 ## $t5 = DA380003 -/* 03A60 809749B0 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 03A64 809749B4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 03A68 809749B8 3C058097 */ lui $a1, %hi(D_80976974) ## $a1 = 80970000 -/* 03A6C 809749BC 24A56974 */ addiu $a1, $a1, %lo(D_80976974) ## $a1 = 80976974 -/* 03A70 809749C0 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 03A74 809749C4 AE0C02C0 */ sw $t4, 0x02C0($s0) ## 000002C0 -/* 03A78 809749C8 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 03A7C 809749CC 8FAE009C */ lw $t6, 0x009C($sp) -/* 03A80 809749D0 24060A27 */ addiu $a2, $zero, 0x0A27 ## $a2 = 00000A27 -/* 03A84 809749D4 8DC40000 */ lw $a0, 0x0000($t6) ## 00000000 -/* 03A88 809749D8 0C0346A2 */ jal Matrix_NewMtx -/* 03A8C 809749DC AFA20060 */ sw $v0, 0x0060($sp) -/* 03A90 809749E0 8FA30060 */ lw $v1, 0x0060($sp) -/* 03A94 809749E4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 03A98 809749E8 8FAF009C */ lw $t7, 0x009C($sp) -/* 03A9C 809749EC 0C024F61 */ jal func_80093D84 -/* 03AA0 809749F0 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 03AA4 809749F4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 03AA8 809749F8 8FA5009C */ lw $a1, 0x009C($sp) -/* 03AAC 809749FC 0C00BB60 */ jal func_8002ED80 -/* 03AB0 80974A00 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 03AB4 80974A04 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 03AB8 80974A08 3C19FA00 */ lui $t9, 0xFA00 ## $t9 = FA000000 -/* 03ABC 80974A0C 37390080 */ ori $t9, $t9, 0x0080 ## $t9 = FA000080 -/* 03AC0 80974A10 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 03AC4 80974A14 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 03AC8 80974A18 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 03ACC 80974A1C 922C017A */ lbu $t4, 0x017A($s1) ## 0000017A -/* 03AD0 80974A20 922F0178 */ lbu $t7, 0x0178($s1) ## 00000178 -/* 03AD4 80974A24 3C0BFB00 */ lui $t3, 0xFB00 ## $t3 = FB000000 -/* 03AD8 80974A28 000C6A00 */ sll $t5, $t4, 8 -/* 03ADC 80974A2C 922C0179 */ lbu $t4, 0x0179($s1) ## 00000179 -/* 03AE0 80974A30 000FC600 */ sll $t8, $t7, 24 -/* 03AE4 80974A34 01B8C825 */ or $t9, $t5, $t8 ## $t9 = 00000008 -/* 03AE8 80974A38 000C7400 */ sll $t6, $t4, 16 -/* 03AEC 80974A3C 032E7825 */ or $t7, $t9, $t6 ## $t7 = 00000008 -/* 03AF0 80974A40 35ED00FF */ ori $t5, $t7, 0x00FF ## $t5 = 000000FF -/* 03AF4 80974A44 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 03AF8 80974A48 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 03AFC 80974A4C 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 -/* 03B00 80974A50 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 03B04 80974A54 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 03B08 80974A58 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 03B0C 80974A5C 9239017D */ lbu $t9, 0x017D($s1) ## 0000017D -/* 03B10 80974A60 922D017B */ lbu $t5, 0x017B($s1) ## 0000017B -/* 03B14 80974A64 00197200 */ sll $t6, $t9, 8 -/* 03B18 80974A68 9239017C */ lbu $t9, 0x017C($s1) ## 0000017C -/* 03B1C 80974A6C 000DC600 */ sll $t8, $t5, 24 -/* 03B20 80974A70 01D85825 */ or $t3, $t6, $t8 ## $t3 = 00000008 -/* 03B24 80974A74 00197C00 */ sll $t7, $t9, 16 -/* 03B28 80974A78 016F6825 */ or $t5, $t3, $t7 ## $t5 = 00000008 -/* 03B2C 80974A7C 35AE00FF */ ori $t6, $t5, 0x00FF ## $t6 = 000000FF -/* 03B30 80974A80 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 03B34 80974A84 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 03B38 80974A88 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 03B3C 80974A8C AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 03B40 80974A90 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 03B44 80974A94 8E390170 */ lw $t9, 0x0170($s1) ## 00000170 -/* 03B48 80974A98 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 03B4C 80974A9C 8FAB009C */ lw $t3, 0x009C($sp) -/* 03B50 80974AA0 0C024F46 */ jal func_80093D18 -/* 03B54 80974AA4 8D640000 */ lw $a0, 0x0000($t3) ## 00000008 -/* 03B58 80974AA8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 03B5C 80974AAC 8FA5009C */ lw $a1, 0x009C($sp) -/* 03B60 80974AB0 0C00BAF3 */ jal func_8002EBCC -/* 03B64 80974AB4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 03B68 80974AB8 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 03B6C 80974ABC 3C0DFA00 */ lui $t5, 0xFA00 ## $t5 = FA000000 -/* 03B70 80974AC0 35AD0080 */ ori $t5, $t5, 0x0080 ## $t5 = FA000080 -/* 03B74 80974AC4 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 03B78 80974AC8 AE0F02C0 */ sw $t7, 0x02C0($s0) ## 000002C0 -/* 03B7C 80974ACC AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 03B80 80974AD0 92380180 */ lbu $t8, 0x0180($s1) ## 00000180 -/* 03B84 80974AD4 922B017E */ lbu $t3, 0x017E($s1) ## 0000017E -/* 03B88 80974AD8 3C0EFB00 */ lui $t6, 0xFB00 ## $t6 = FB000000 -/* 03B8C 80974ADC 00186200 */ sll $t4, $t8, 8 -/* 03B90 80974AE0 9238017F */ lbu $t8, 0x017F($s1) ## 0000017F -/* 03B94 80974AE4 000B7E00 */ sll $t7, $t3, 24 -/* 03B98 80974AE8 018F6825 */ or $t5, $t4, $t7 ## $t5 = 00000008 -/* 03B9C 80974AEC 0018CC00 */ sll $t9, $t8, 16 -/* 03BA0 80974AF0 01B95825 */ or $t3, $t5, $t9 ## $t3 = 00000008 -/* 03BA4 80974AF4 356C00FF */ ori $t4, $t3, 0x00FF ## $t4 = 000000FF -/* 03BA8 80974AF8 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 03BAC 80974AFC 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 03BB0 80974B00 3C18DE00 */ lui $t8, 0xDE00 ## $t8 = DE000000 -/* 03BB4 80974B04 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 03BB8 80974B08 AE0F02C0 */ sw $t7, 0x02C0($s0) ## 000002C0 -/* 03BBC 80974B0C AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 03BC0 80974B10 922D0183 */ lbu $t5, 0x0183($s1) ## 00000183 -/* 03BC4 80974B14 922C0181 */ lbu $t4, 0x0181($s1) ## 00000181 -/* 03BC8 80974B18 000DCA00 */ sll $t9, $t5, 8 -/* 03BCC 80974B1C 922D0182 */ lbu $t5, 0x0182($s1) ## 00000182 -/* 03BD0 80974B20 000C7E00 */ sll $t7, $t4, 24 -/* 03BD4 80974B24 032F7025 */ or $t6, $t9, $t7 ## $t6 = 00000008 -/* 03BD8 80974B28 000D5C00 */ sll $t3, $t5, 16 -/* 03BDC 80974B2C 01CB6025 */ or $t4, $t6, $t3 ## $t4 = 00000008 -/* 03BE0 80974B30 359900FF */ ori $t9, $t4, 0x00FF ## $t9 = 000000FF -/* 03BE4 80974B34 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 03BE8 80974B38 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 03BEC 80974B3C 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 03BF0 80974B40 AE0F02C0 */ sw $t7, 0x02C0($s0) ## 000002C0 -/* 03BF4 80974B44 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 03BF8 80974B48 8E2D0174 */ lw $t5, 0x0174($s1) ## 00000174 -/* 03BFC 80974B4C AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -.L80974B50: -/* 03C00 80974B50 8FAE009C */ lw $t6, 0x009C($sp) -.L80974B54: -/* 03C04 80974B54 3C068097 */ lui $a2, %hi(D_80976988) ## $a2 = 80970000 -/* 03C08 80974B58 24C66988 */ addiu $a2, $a2, %lo(D_80976988) ## $a2 = 80976988 -/* 03C0C 80974B5C 27A40078 */ addiu $a0, $sp, 0x0078 ## $a0 = FFFFFFE0 -/* 03C10 80974B60 24070A3C */ addiu $a3, $zero, 0x0A3C ## $a3 = 00000A3C -/* 03C14 80974B64 0C031AD5 */ jal Graph_CloseDisps -/* 03C18 80974B68 8DC50000 */ lw $a1, 0x0000($t6) ## 00000008 -/* 03C1C 80974B6C 8FBF003C */ lw $ra, 0x003C($sp) -/* 03C20 80974B70 8FB00034 */ lw $s0, 0x0034($sp) -/* 03C24 80974B74 8FB10038 */ lw $s1, 0x0038($sp) -/* 03C28 80974B78 03E00008 */ jr $ra -/* 03C2C 80974B7C 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974B80.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974B80.s deleted file mode 100644 index 03bc3838e1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974B80.s +++ /dev/null @@ -1,246 +0,0 @@ -.rdata -glabel D_8097699C - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_809769B0 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_809769C4 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_809769D8 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_809769EC - .asciz "../z_demo_effect.c" - .balign 4 - -.late_rodata -glabel D_80976D44 - .float 0.19198622 - -glabel D_80976D48 - .float 2.0943952 - -glabel D_80976D4C - .float 0.19198622 - -glabel D_80976D50 - .float 4.1887903 - -glabel D_80976D54 - .float 0.19198622 - -.text -glabel func_80974B80 -/* 03C30 80974B80 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 -/* 03C34 80974B84 3C180001 */ lui $t8, 0x0001 ## $t8 = 00010000 -/* 03C38 80974B88 AFBF003C */ sw $ra, 0x003C($sp) -/* 03C3C 80974B8C AFB00038 */ sw $s0, 0x0038($sp) -/* 03C40 80974B90 AFA40090 */ sw $a0, 0x0090($sp) -/* 03C44 80974B94 AFA50094 */ sw $a1, 0x0094($sp) -/* 03C48 80974B98 0305C021 */ addu $t8, $t8, $a1 -/* 03C4C 80974B9C 8F181DE4 */ lw $t8, 0x1DE4($t8) ## 00011DE4 -/* 03C50 80974BA0 8C880118 */ lw $t0, 0x0118($a0) ## 00000118 -/* 03C54 80974BA4 3C068097 */ lui $a2, %hi(D_8097699C) ## $a2 = 80970000 -/* 03C58 80974BA8 3319FFFF */ andi $t9, $t8, 0xFFFF ## $t9 = 00000000 -/* 03C5C 80974BAC AFB90084 */ sw $t9, 0x0084($sp) -/* 03C60 80974BB0 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 03C64 80974BB4 24C6699C */ addiu $a2, $a2, %lo(D_8097699C) ## $a2 = 8097699C -/* 03C68 80974BB8 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFE0 -/* 03C6C 80974BBC 24070A4A */ addiu $a3, $zero, 0x0A4A ## $a3 = 00000A4A -/* 03C70 80974BC0 AFA80088 */ sw $t0, 0x0088($sp) -/* 03C74 80974BC4 0C031AB1 */ jal Graph_OpenDisps -/* 03C78 80974BC8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 03C7C 80974BCC 8FA80088 */ lw $t0, 0x0088($sp) -/* 03C80 80974BD0 5100000D */ beql $t0, $zero, .L80974C08 -/* 03C84 80974BD4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 03C88 80974BD8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 03C8C 80974BDC 3C0BFA00 */ lui $t3, 0xFA00 ## $t3 = FA000000 -/* 03C90 80974BE0 356B8080 */ ori $t3, $t3, 0x8080 ## $t3 = FA008080 -/* 03C94 80974BE4 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 03C98 80974BE8 AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 -/* 03C9C 80974BEC AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 03CA0 80974BF0 910D0186 */ lbu $t5, 0x0186($t0) ## 00000186 -/* 03CA4 80974BF4 2401AA00 */ addiu $at, $zero, 0xAA00 ## $at = FFFFAA00 -/* 03CA8 80974BF8 01A17025 */ or $t6, $t5, $at ## $t6 = FFFFAA00 -/* 03CAC 80974BFC 10000009 */ beq $zero, $zero, .L80974C24 -/* 03CB0 80974C00 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 03CB4 80974C04 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -.L80974C08: -/* 03CB8 80974C08 3C19FA00 */ lui $t9, 0xFA00 ## $t9 = FA000000 -/* 03CBC 80974C0C 37398080 */ ori $t9, $t9, 0x8080 ## $t9 = FA008080 -/* 03CC0 80974C10 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 03CC4 80974C14 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 03CC8 80974C18 240FAAFF */ addiu $t7, $zero, 0xAAFF ## $t7 = FFFFAAFF -/* 03CCC 80974C1C AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 03CD0 80974C20 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -.L80974C24: -/* 03CD4 80974C24 8FAA0094 */ lw $t2, 0x0094($sp) -/* 03CD8 80974C28 0C024F61 */ jal func_80093D84 -/* 03CDC 80974C2C 8D440000 */ lw $a0, 0x0000($t2) ## 00000008 -/* 03CE0 80974C30 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 03CE4 80974C34 8FA90084 */ lw $t1, 0x0084($sp) -/* 03CE8 80974C38 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 -/* 03CEC 80974C3C 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 03CF0 80974C40 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 -/* 03CF4 80974C44 358C0020 */ ori $t4, $t4, 0x0020 ## $t4 = DB060020 -/* 03CF8 80974C48 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 03CFC 80974C4C 8FAD0094 */ lw $t5, 0x0094($sp) -/* 03D00 80974C50 00093040 */ sll $a2, $t1, 1 -/* 03D04 80974C54 30C601FF */ andi $a2, $a2, 0x01FF ## $a2 = 00000000 -/* 03D08 80974C58 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 -/* 03D0C 80974C5C 240801FF */ addiu $t0, $zero, 0x01FF ## $t0 = 000001FF -/* 03D10 80974C60 01065023 */ subu $t2, $t0, $a2 -/* 03D14 80974C64 240C0040 */ addiu $t4, $zero, 0x0040 ## $t4 = 00000040 -/* 03D18 80974C68 240B0040 */ addiu $t3, $zero, 0x0040 ## $t3 = 00000040 -/* 03D1C 80974C6C 24180080 */ addiu $t8, $zero, 0x0080 ## $t8 = 00000080 -/* 03D20 80974C70 24190080 */ addiu $t9, $zero, 0x0080 ## $t9 = 00000080 -/* 03D24 80974C74 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 03D28 80974C78 312E01FF */ andi $t6, $t1, 0x01FF ## $t6 = 00000000 -/* 03D2C 80974C7C 010E3823 */ subu $a3, $t0, $t6 -/* 03D30 80974C80 AFAF0018 */ sw $t7, 0x0018($sp) -/* 03D34 80974C84 AFB90014 */ sw $t9, 0x0014($sp) -/* 03D38 80974C88 AFB80010 */ sw $t8, 0x0010($sp) -/* 03D3C 80974C8C AFAB0024 */ sw $t3, 0x0024($sp) -/* 03D40 80974C90 AFAC0028 */ sw $t4, 0x0028($sp) -/* 03D44 80974C94 AFAA001C */ sw $t2, 0x001C($sp) -/* 03D48 80974C98 AFA00020 */ sw $zero, 0x0020($sp) -/* 03D4C 80974C9C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 03D50 80974CA0 0C0253D0 */ jal Gfx_TwoTexScroll -/* 03D54 80974CA4 AFA20064 */ sw $v0, 0x0064($sp) -/* 03D58 80974CA8 8FA30064 */ lw $v1, 0x0064($sp) -/* 03D5C 80974CAC 0C034213 */ jal Matrix_Push -/* 03D60 80974CB0 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 03D64 80974CB4 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 03D68 80974CB8 0C034348 */ jal Matrix_RotateY -/* 03D6C 80974CBC 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 03D70 80974CC0 3C018097 */ lui $at, %hi(D_80976D44) ## $at = 80970000 -/* 03D74 80974CC4 C42C6D44 */ lwc1 $f12, %lo(D_80976D44)($at) -/* 03D78 80974CC8 0C0342DC */ jal Matrix_RotateX -/* 03D7C 80974CCC 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 03D80 80974CD0 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 03D84 80974CD4 3C014316 */ lui $at, 0x4316 ## $at = 43160000 -/* 03D88 80974CD8 44817000 */ mtc1 $at, $f14 ## $f14 = 150.00 -/* 03D8C 80974CDC 44066000 */ mfc1 $a2, $f12 -/* 03D90 80974CE0 0C034261 */ jal Matrix_Translate -/* 03D94 80974CE4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 03D98 80974CE8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 03D9C 80974CEC 3C0EDA38 */ lui $t6, 0xDA38 ## $t6 = DA380000 -/* 03DA0 80974CF0 35CE0003 */ ori $t6, $t6, 0x0003 ## $t6 = DA380003 -/* 03DA4 80974CF4 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 03DA8 80974CF8 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 03DAC 80974CFC AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 03DB0 80974D00 8FB80094 */ lw $t8, 0x0094($sp) -/* 03DB4 80974D04 3C058097 */ lui $a1, %hi(D_809769B0) ## $a1 = 80970000 -/* 03DB8 80974D08 24A569B0 */ addiu $a1, $a1, %lo(D_809769B0) ## $a1 = 809769B0 -/* 03DBC 80974D0C 8F040000 */ lw $a0, 0x0000($t8) ## 00000000 -/* 03DC0 80974D10 24060A65 */ addiu $a2, $zero, 0x0A65 ## $a2 = 00000A65 -/* 03DC4 80974D14 0C0346A2 */ jal Matrix_NewMtx -/* 03DC8 80974D18 AFA20060 */ sw $v0, 0x0060($sp) -/* 03DCC 80974D1C 8FA30060 */ lw $v1, 0x0060($sp) -/* 03DD0 80974D20 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 03DD4 80974D24 24840980 */ addiu $a0, $a0, 0x0980 ## $a0 = 06000980 -/* 03DD8 80974D28 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 03DDC 80974D2C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 03DE0 80974D30 3C0FDE00 */ lui $t7, 0xDE00 ## $t7 = DE000000 -/* 03DE4 80974D34 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 03DE8 80974D38 AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0 -/* 03DEC 80974D3C AC440004 */ sw $a0, 0x0004($v0) ## 00000004 -/* 03DF0 80974D40 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 03DF4 80974D44 0C034221 */ jal Matrix_Pull -/* 03DF8 80974D48 AFA40048 */ sw $a0, 0x0048($sp) -/* 03DFC 80974D4C 0C034213 */ jal Matrix_Push -/* 03E00 80974D50 00000000 */ nop -/* 03E04 80974D54 3C018097 */ lui $at, %hi(D_80976D48) ## $at = 80970000 -/* 03E08 80974D58 C42C6D48 */ lwc1 $f12, %lo(D_80976D48)($at) -/* 03E0C 80974D5C 0C034348 */ jal Matrix_RotateY -/* 03E10 80974D60 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 03E14 80974D64 3C018097 */ lui $at, %hi(D_80976D4C) ## $at = 80970000 -/* 03E18 80974D68 C42C6D4C */ lwc1 $f12, %lo(D_80976D4C)($at) -/* 03E1C 80974D6C 0C0342DC */ jal Matrix_RotateX -/* 03E20 80974D70 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 03E24 80974D74 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 03E28 80974D78 3C014316 */ lui $at, 0x4316 ## $at = 43160000 -/* 03E2C 80974D7C 44817000 */ mtc1 $at, $f14 ## $f14 = 150.00 -/* 03E30 80974D80 44066000 */ mfc1 $a2, $f12 -/* 03E34 80974D84 0C034261 */ jal Matrix_Translate -/* 03E38 80974D88 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 03E3C 80974D8C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 03E40 80974D90 3C0BDA38 */ lui $t3, 0xDA38 ## $t3 = DA380000 -/* 03E44 80974D94 356B0003 */ ori $t3, $t3, 0x0003 ## $t3 = DA380003 -/* 03E48 80974D98 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 03E4C 80974D9C AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 -/* 03E50 80974DA0 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 03E54 80974DA4 8FAC0094 */ lw $t4, 0x0094($sp) -/* 03E58 80974DA8 3C058097 */ lui $a1, %hi(D_809769C4) ## $a1 = 80970000 -/* 03E5C 80974DAC 24A569C4 */ addiu $a1, $a1, %lo(D_809769C4) ## $a1 = 809769C4 -/* 03E60 80974DB0 8D840000 */ lw $a0, 0x0000($t4) ## 00000000 -/* 03E64 80974DB4 24060A70 */ addiu $a2, $zero, 0x0A70 ## $a2 = 00000A70 -/* 03E68 80974DB8 0C0346A2 */ jal Matrix_NewMtx -/* 03E6C 80974DBC AFA20058 */ sw $v0, 0x0058($sp) -/* 03E70 80974DC0 8FA30058 */ lw $v1, 0x0058($sp) -/* 03E74 80974DC4 3C0EDE00 */ lui $t6, 0xDE00 ## $t6 = DE000000 -/* 03E78 80974DC8 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 03E7C 80974DCC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 03E80 80974DD0 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 03E84 80974DD4 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 03E88 80974DD8 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 03E8C 80974DDC 8FB80048 */ lw $t8, 0x0048($sp) -/* 03E90 80974DE0 0C034221 */ jal Matrix_Pull -/* 03E94 80974DE4 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 03E98 80974DE8 0C034213 */ jal Matrix_Push -/* 03E9C 80974DEC 00000000 */ nop -/* 03EA0 80974DF0 3C018097 */ lui $at, %hi(D_80976D50) ## $at = 80970000 -/* 03EA4 80974DF4 C42C6D50 */ lwc1 $f12, %lo(D_80976D50)($at) -/* 03EA8 80974DF8 0C034348 */ jal Matrix_RotateY -/* 03EAC 80974DFC 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 03EB0 80974E00 3C018097 */ lui $at, %hi(D_80976D54) ## $at = 80970000 -/* 03EB4 80974E04 C42C6D54 */ lwc1 $f12, %lo(D_80976D54)($at) -/* 03EB8 80974E08 0C0342DC */ jal Matrix_RotateX -/* 03EBC 80974E0C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 03EC0 80974E10 3C014316 */ lui $at, 0x4316 ## $at = 43160000 -/* 03EC4 80974E14 44817000 */ mtc1 $at, $f14 ## $f14 = 150.00 -/* 03EC8 80974E18 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 03ECC 80974E1C 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 03ED0 80974E20 0C034261 */ jal Matrix_Translate -/* 03ED4 80974E24 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 03ED8 80974E28 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 03EDC 80974E2C 3C0FDA38 */ lui $t7, 0xDA38 ## $t7 = DA380000 -/* 03EE0 80974E30 35EF0003 */ ori $t7, $t7, 0x0003 ## $t7 = DA380003 -/* 03EE4 80974E34 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 03EE8 80974E38 AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0 -/* 03EEC 80974E3C AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 03EF0 80974E40 8FAA0094 */ lw $t2, 0x0094($sp) -/* 03EF4 80974E44 3C058097 */ lui $a1, %hi(D_809769D8) ## $a1 = 80970000 -/* 03EF8 80974E48 24A569D8 */ addiu $a1, $a1, %lo(D_809769D8) ## $a1 = 809769D8 -/* 03EFC 80974E4C 8D440000 */ lw $a0, 0x0000($t2) ## 00000000 -/* 03F00 80974E50 24060A7B */ addiu $a2, $zero, 0x0A7B ## $a2 = 00000A7B -/* 03F04 80974E54 0C0346A2 */ jal Matrix_NewMtx -/* 03F08 80974E58 AFA20050 */ sw $v0, 0x0050($sp) -/* 03F0C 80974E5C 8FA30050 */ lw $v1, 0x0050($sp) -/* 03F10 80974E60 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 -/* 03F14 80974E64 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 03F18 80974E68 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 03F1C 80974E6C 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 03F20 80974E70 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 -/* 03F24 80974E74 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 03F28 80974E78 8FAD0048 */ lw $t5, 0x0048($sp) -/* 03F2C 80974E7C 0C034221 */ jal Matrix_Pull -/* 03F30 80974E80 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 03F34 80974E84 8FAE0094 */ lw $t6, 0x0094($sp) -/* 03F38 80974E88 3C068097 */ lui $a2, %hi(D_809769EC) ## $a2 = 80970000 -/* 03F3C 80974E8C 24C669EC */ addiu $a2, $a2, %lo(D_809769EC) ## $a2 = 809769EC -/* 03F40 80974E90 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFE0 -/* 03F44 80974E94 24070A80 */ addiu $a3, $zero, 0x0A80 ## $a3 = 00000A80 -/* 03F48 80974E98 0C031AD5 */ jal Graph_CloseDisps -/* 03F4C 80974E9C 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 03F50 80974EA0 8FBF003C */ lw $ra, 0x003C($sp) -/* 03F54 80974EA4 8FB00038 */ lw $s0, 0x0038($sp) -/* 03F58 80974EA8 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 -/* 03F5C 80974EAC 03E00008 */ jr $ra -/* 03F60 80974EB0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974EB4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974EB4.s deleted file mode 100644 index 335955623f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974EB4.s +++ /dev/null @@ -1,127 +0,0 @@ -.rdata -glabel D_80976A00 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976A14 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976A28 - .asciz "../z_demo_effect.c" - .balign 4 - -.text -glabel func_80974EB4 -/* 03F64 80974EB4 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 -/* 03F68 80974EB8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 03F6C 80974EBC AFBF003C */ sw $ra, 0x003C($sp) -/* 03F70 80974EC0 AFB10038 */ sw $s1, 0x0038($sp) -/* 03F74 80974EC4 AFB00034 */ sw $s0, 0x0034($sp) -/* 03F78 80974EC8 AFA40080 */ sw $a0, 0x0080($sp) -/* 03F7C 80974ECC 00A11021 */ addu $v0, $a1, $at -/* 03F80 80974ED0 8C4E1DE4 */ lw $t6, 0x1DE4($v0) ## 00001DE4 -/* 03F84 80974ED4 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 03F88 80974ED8 3C068097 */ lui $a2, %hi(D_80976A00) ## $a2 = 80970000 -/* 03F8C 80974EDC AFAE0078 */ sw $t6, 0x0078($sp) -/* 03F90 80974EE0 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 03F94 80974EE4 AFA20048 */ sw $v0, 0x0048($sp) -/* 03F98 80974EE8 24C66A00 */ addiu $a2, $a2, %lo(D_80976A00) ## $a2 = 80976A00 -/* 03F9C 80974EEC 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFE4 -/* 03FA0 80974EF0 24070A8D */ addiu $a3, $zero, 0x0A8D ## $a3 = 00000A8D -/* 03FA4 80974EF4 0C031AB1 */ jal Graph_OpenDisps -/* 03FA8 80974EF8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 03FAC 80974EFC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 03FB0 80974F00 3C18FA00 */ lui $t8, 0xFA00 ## $t8 = FA000000 -/* 03FB4 80974F04 3C19FFC8 */ lui $t9, 0xFFC8 ## $t9 = FFC80000 -/* 03FB8 80974F08 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 03FBC 80974F0C AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 -/* 03FC0 80974F10 373900FF */ ori $t9, $t9, 0x00FF ## $t9 = FFC800FF -/* 03FC4 80974F14 37184040 */ ori $t8, $t8, 0x4040 ## $t8 = FA004040 -/* 03FC8 80974F18 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 03FCC 80974F1C AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 03FD0 80974F20 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 03FD4 80974F24 3C0AFF00 */ lui $t2, 0xFF00 ## $t2 = FF000000 -/* 03FD8 80974F28 354A00FF */ ori $t2, $t2, 0x00FF ## $t2 = FF0000FF -/* 03FDC 80974F2C 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 -/* 03FE0 80974F30 AE0802D0 */ sw $t0, 0x02D0($s0) ## 000002D0 -/* 03FE4 80974F34 3C09FB00 */ lui $t1, 0xFB00 ## $t1 = FB000000 -/* 03FE8 80974F38 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 03FEC 80974F3C AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 -/* 03FF0 80974F40 0C024F61 */ jal func_80093D84 -/* 03FF4 80974F44 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 03FF8 80974F48 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 03FFC 80974F4C 3C0CDA38 */ lui $t4, 0xDA38 ## $t4 = DA380000 -/* 04000 80974F50 358C0003 */ ori $t4, $t4, 0x0003 ## $t4 = DA380003 -/* 04004 80974F54 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 04008 80974F58 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 -/* 0400C 80974F5C AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 04010 80974F60 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 04014 80974F64 3C058097 */ lui $a1, %hi(D_80976A14) ## $a1 = 80970000 -/* 04018 80974F68 24A56A14 */ addiu $a1, $a1, %lo(D_80976A14) ## $a1 = 80976A14 -/* 0401C 80974F6C 24060A95 */ addiu $a2, $zero, 0x0A95 ## $a2 = 00000A95 -/* 04020 80974F70 0C0346A2 */ jal Matrix_NewMtx -/* 04024 80974F74 AFA20058 */ sw $v0, 0x0058($sp) -/* 04028 80974F78 8FA30058 */ lw $v1, 0x0058($sp) -/* 0402C 80974F7C 3C0EDA38 */ lui $t6, 0xDA38 ## $t6 = DA380000 -/* 04030 80974F80 35CE0001 */ ori $t6, $t6, 0x0001 ## $t6 = DA380001 -/* 04034 80974F84 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 04038 80974F88 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 0403C 80974F8C 3C08DB06 */ lui $t0, 0xDB06 ## $t0 = DB060000 -/* 04040 80974F90 35080020 */ ori $t0, $t0, 0x0020 ## $t0 = DB060020 -/* 04044 80974F94 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 04048 80974F98 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 0404C 80974F9C AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 04050 80974FA0 8FAF0048 */ lw $t7, 0x0048($sp) -/* 04054 80974FA4 24090020 */ addiu $t1, $zero, 0x0020 ## $t1 = 00000020 -/* 04058 80974FA8 240A0020 */ addiu $t2, $zero, 0x0020 ## $t2 = 00000020 -/* 0405C 80974FAC 8DF81DE0 */ lw $t8, 0x1DE0($t7) ## 00001DE0 -/* 04060 80974FB0 240F007F */ addiu $t7, $zero, 0x007F ## $t7 = 0000007F -/* 04064 80974FB4 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 04068 80974FB8 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 0406C 80974FBC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 04070 80974FC0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 04074 80974FC4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 04078 80974FC8 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 0407C 80974FCC AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0 -/* 04080 80974FD0 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 -/* 04084 80974FD4 8FAC0078 */ lw $t4, 0x0078($sp) -/* 04088 80974FD8 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 0408C 80974FDC 24080020 */ addiu $t0, $zero, 0x0020 ## $t0 = 00000020 -/* 04090 80974FE0 000C6880 */ sll $t5, $t4, 2 -/* 04094 80974FE4 01AC6821 */ addu $t5, $t5, $t4 -/* 04098 80974FE8 000D6880 */ sll $t5, $t5, 2 -/* 0409C 80974FEC 31AE007F */ andi $t6, $t5, 0x007F ## $t6 = 00000008 -/* 040A0 80974FF0 01EEC023 */ subu $t8, $t7, $t6 -/* 040A4 80974FF4 24190020 */ addiu $t9, $zero, 0x0020 ## $t9 = 00000020 -/* 040A8 80974FF8 AFB90024 */ sw $t9, 0x0024($sp) -/* 040AC 80974FFC AFB80020 */ sw $t8, 0x0020($sp) -/* 040B0 80975000 AFA80028 */ sw $t0, 0x0028($sp) -/* 040B4 80975004 AFA0001C */ sw $zero, 0x001C($sp) -/* 040B8 80975008 AFAB0018 */ sw $t3, 0x0018($sp) -/* 040BC 8097500C AFAA0014 */ sw $t2, 0x0014($sp) -/* 040C0 80975010 AFA90010 */ sw $t1, 0x0010($sp) -/* 040C4 80975014 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 040C8 80975018 0C0253D0 */ jal Gfx_TwoTexScroll -/* 040CC 8097501C AFA20050 */ sw $v0, 0x0050($sp) -/* 040D0 80975020 8FA30050 */ lw $v1, 0x0050($sp) -/* 040D4 80975024 3C0B0600 */ lui $t3, 0x0600 ## $t3 = 06000000 -/* 040D8 80975028 256B0040 */ addiu $t3, $t3, 0x0040 ## $t3 = 06000040 -/* 040DC 8097502C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 040E0 80975030 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 040E4 80975034 3C0ADE00 */ lui $t2, 0xDE00 ## $t2 = DE000000 -/* 040E8 80975038 3C068097 */ lui $a2, %hi(D_80976A28) ## $a2 = 80970000 -/* 040EC 8097503C 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 040F0 80975040 AE0902D0 */ sw $t1, 0x02D0($s0) ## 000002D0 -/* 040F4 80975044 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 040F8 80975048 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 040FC 8097504C 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 04100 80975050 24C66A28 */ addiu $a2, $a2, %lo(D_80976A28) ## $a2 = 80976A28 -/* 04104 80975054 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFE4 -/* 04108 80975058 0C031AD5 */ jal Graph_CloseDisps -/* 0410C 8097505C 24070AA3 */ addiu $a3, $zero, 0x0AA3 ## $a3 = 00000AA3 -/* 04110 80975060 8FBF003C */ lw $ra, 0x003C($sp) -/* 04114 80975064 8FB00034 */ lw $s0, 0x0034($sp) -/* 04118 80975068 8FB10038 */ lw $s1, 0x0038($sp) -/* 0411C 8097506C 03E00008 */ jr $ra -/* 04120 80975070 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975074.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975074.s deleted file mode 100644 index 8260046a81..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975074.s +++ /dev/null @@ -1,298 +0,0 @@ -.rdata -glabel D_80976A3C - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976A50 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976A64 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976A78 - .asciz "../z_demo_effect.c" - .balign 4 - -.late_rodata -glabel D_80976D58 - .float 0.017453292 - -glabel D_80976D5C - .float 1.57079637051 - -glabel D_80976D60 - .float 0.03 - -.text -glabel func_80975074 -/* 04124 80975074 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 -/* 04128 80975078 3C0F0001 */ lui $t7, 0x0001 ## $t7 = 00010000 -/* 0412C 8097507C AFBF003C */ sw $ra, 0x003C($sp) -/* 04130 80975080 AFB10038 */ sw $s1, 0x0038($sp) -/* 04134 80975084 AFB00034 */ sw $s0, 0x0034($sp) -/* 04138 80975088 AFA5008C */ sw $a1, 0x008C($sp) -/* 0413C 8097508C 01E57821 */ addu $t7, $t7, $a1 -/* 04140 80975090 8DEF1DE4 */ lw $t7, 0x1DE4($t7) ## 00011DE4 -/* 04144 80975094 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04148 80975098 3C068097 */ lui $a2, %hi(D_80976A3C) ## $a2 = 80970000 -/* 0414C 8097509C AFAF007C */ sw $t7, 0x007C($sp) -/* 04150 809750A0 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 04154 809750A4 24C66A3C */ addiu $a2, $a2, %lo(D_80976A3C) ## $a2 = 80976A3C -/* 04158 809750A8 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFE0 -/* 0415C 809750AC 24070AB1 */ addiu $a3, $zero, 0x0AB1 ## $a3 = 00000AB1 -/* 04160 809750B0 0C031AB1 */ jal Graph_OpenDisps -/* 04164 809750B4 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 04168 809750B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0416C 809750BC 8FA5008C */ lw $a1, 0x008C($sp) -/* 04170 809750C0 0C25D1AD */ jal func_809746B4 -/* 04174 809750C4 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 04178 809750C8 144000E6 */ bne $v0, $zero, .L80975464 -/* 0417C 809750CC 3C028016 */ lui $v0, %hi(gSaveContext) -/* 04180 809750D0 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 04184 809750D4 8C580000 */ lw $t8, 0x0000($v0) ## 8015E660 -/* 04188 809750D8 240100A0 */ addiu $at, $zero, 0x00A0 ## $at = 000000A0 -/* 0418C 809750DC 57010014 */ bnel $t8, $at, .L80975130 -/* 04190 809750E0 260400E4 */ addiu $a0, $s0, 0x00E4 ## $a0 = 000000E4 -/* 04194 809750E4 8C591360 */ lw $t9, 0x1360($v0) ## 8015F9C0 -/* 04198 809750E8 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 0419C 809750EC 8FA9008C */ lw $t1, 0x008C($sp) -/* 041A0 809750F0 1721000A */ bne $t9, $at, .L8097511C -/* 041A4 809750F4 260400E4 */ addiu $a0, $s0, 0x00E4 ## $a0 = 000000E4 -/* 041A8 809750F8 952A1D74 */ lhu $t2, 0x1D74($t1) ## 00001D74 -/* 041AC 809750FC 260400E4 */ addiu $a0, $s0, 0x00E4 ## $a0 = 000000E4 -/* 041B0 80975100 294102A9 */ slti $at, $t2, 0x02A9 -/* 041B4 80975104 5020000D */ beql $at, $zero, .L8097513C -/* 041B8 80975108 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 041BC 8097510C 0C01E245 */ jal func_80078914 -/* 041C0 80975110 2405208B */ addiu $a1, $zero, 0x208B ## $a1 = 0000208B -/* 041C4 80975114 10000009 */ beq $zero, $zero, .L8097513C -/* 041C8 80975118 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -.L8097511C: -/* 041CC 8097511C 0C01E245 */ jal func_80078914 -/* 041D0 80975120 2405208B */ addiu $a1, $zero, 0x208B ## $a1 = 0000208B -/* 041D4 80975124 10000005 */ beq $zero, $zero, .L8097513C -/* 041D8 80975128 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 041DC 8097512C 260400E4 */ addiu $a0, $s0, 0x00E4 ## $a0 = 000000E4 -.L80975130: -/* 041E0 80975130 0C01E245 */ jal func_80078914 -/* 041E4 80975134 2405208B */ addiu $a1, $zero, 0x208B ## $a1 = 0000208B -/* 041E8 80975138 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -.L8097513C: -/* 041EC 8097513C 8FA8007C */ lw $t0, 0x007C($sp) -/* 041F0 80975140 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 -/* 041F4 80975144 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 041F8 80975148 AE2B02D0 */ sw $t3, 0x02D0($s1) ## 000002D0 -/* 041FC 8097514C 358C0020 */ ori $t4, $t4, 0x0020 ## $t4 = DB060020 -/* 04200 80975150 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 04204 80975154 8FAD008C */ lw $t5, 0x008C($sp) -/* 04208 80975158 000850C0 */ sll $t2, $t0, 3 -/* 0420C 8097515C 01485021 */ addu $t2, $t2, $t0 -/* 04210 80975160 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 -/* 04214 80975164 000A5080 */ sll $t2, $t2, 2 -/* 04218 80975168 01485023 */ subu $t2, $t2, $t0 -/* 0421C 8097516C 000A5040 */ sll $t2, $t2, 1 -/* 04220 80975170 240F0080 */ addiu $t7, $zero, 0x0080 ## $t7 = 00000080 -/* 04224 80975174 240E0040 */ addiu $t6, $zero, 0x0040 ## $t6 = 00000040 -/* 04228 80975178 AFAE0014 */ sw $t6, 0x0014($sp) -/* 0422C 8097517C AFAF0010 */ sw $t7, 0x0010($sp) -/* 04230 80975180 314B01FF */ andi $t3, $t2, 0x01FF ## $t3 = 00000000 -/* 04234 80975184 240C01FF */ addiu $t4, $zero, 0x01FF ## $t4 = 000001FF -/* 04238 80975188 0008C840 */ sll $t9, $t0, 1 -/* 0423C 8097518C 332900FF */ andi $t1, $t9, 0x00FF ## $t1 = 00000000 -/* 04240 80975190 018B6823 */ subu $t5, $t4, $t3 -/* 04244 80975194 240F0040 */ addiu $t7, $zero, 0x0040 ## $t7 = 00000040 -/* 04248 80975198 240E0020 */ addiu $t6, $zero, 0x0020 ## $t6 = 00000020 -/* 0424C 8097519C 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 04250 809751A0 00083080 */ sll $a2, $t0, 2 -/* 04254 809751A4 30C601FF */ andi $a2, $a2, 0x01FF ## $a2 = 00000000 -/* 04258 809751A8 AFB80018 */ sw $t8, 0x0018($sp) -/* 0425C 809751AC AFAE0028 */ sw $t6, 0x0028($sp) -/* 04260 809751B0 AFAF0024 */ sw $t7, 0x0024($sp) -/* 04264 809751B4 AFAD0020 */ sw $t5, 0x0020($sp) -/* 04268 809751B8 AFA9001C */ sw $t1, 0x001C($sp) -/* 0426C 809751BC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 04270 809751C0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 04274 809751C4 0C0253D0 */ jal Gfx_TwoTexScroll -/* 04278 809751C8 AFA20064 */ sw $v0, 0x0064($sp) -/* 0427C 809751CC 8FA30064 */ lw $v1, 0x0064($sp) -/* 04280 809751D0 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 -/* 04284 809751D4 37390024 */ ori $t9, $t9, 0x0024 ## $t9 = DB060024 -/* 04288 809751D8 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 0428C 809751DC 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 04290 809751E0 240A0010 */ addiu $t2, $zero, 0x0010 ## $t2 = 00000010 -/* 04294 809751E4 240C0060 */ addiu $t4, $zero, 0x0060 ## $t4 = 00000060 -/* 04298 809751E8 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 0429C 809751EC AE3802D0 */ sw $t8, 0x02D0($s1) ## 000002D0 -/* 042A0 809751F0 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 042A4 809751F4 8FA9008C */ lw $t1, 0x008C($sp) -/* 042A8 809751F8 8FAD007C */ lw $t5, 0x007C($sp) -/* 042AC 809751FC 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 042B0 80975200 8D240000 */ lw $a0, 0x0000($t1) ## 00000000 -/* 042B4 80975204 000DC100 */ sll $t8, $t5, 4 -/* 042B8 80975208 030DC023 */ subu $t8, $t8, $t5 -/* 042BC 8097520C 000D7880 */ sll $t7, $t5, 2 -/* 042C0 80975210 0018C040 */ sll $t8, $t8, 1 -/* 042C4 80975214 01ED7821 */ addu $t7, $t7, $t5 -/* 042C8 80975218 000F7840 */ sll $t7, $t7, 1 -/* 042CC 8097521C 331901FF */ andi $t9, $t8, 0x01FF ## $t9 = 00000008 -/* 042D0 80975220 AFAB0018 */ sw $t3, 0x0018($sp) -/* 042D4 80975224 AFAC0014 */ sw $t4, 0x0014($sp) -/* 042D8 80975228 AFAA0010 */ sw $t2, 0x0010($sp) -/* 042DC 8097522C 240900FF */ addiu $t1, $zero, 0x00FF ## $t1 = 000000FF -/* 042E0 80975230 01395023 */ subu $t2, $t1, $t9 -/* 042E4 80975234 240C0008 */ addiu $t4, $zero, 0x0008 ## $t4 = 00000008 -/* 042E8 80975238 240B0020 */ addiu $t3, $zero, 0x0020 ## $t3 = 00000020 -/* 042EC 8097523C 31EE00FF */ andi $t6, $t7, 0x00FF ## $t6 = 00000000 -/* 042F0 80975240 AFAE001C */ sw $t6, 0x001C($sp) -/* 042F4 80975244 AFAB0028 */ sw $t3, 0x0028($sp) -/* 042F8 80975248 AFAC0024 */ sw $t4, 0x0024($sp) -/* 042FC 8097524C AFAA0020 */ sw $t2, 0x0020($sp) -/* 04300 80975250 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 04304 80975254 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 04308 80975258 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0430C 8097525C 0C0253D0 */ jal Gfx_TwoTexScroll -/* 04310 80975260 AFA20060 */ sw $v0, 0x0060($sp) -/* 04314 80975264 8FA30060 */ lw $v1, 0x0060($sp) -/* 04318 80975268 3C0EFA00 */ lui $t6, 0xFA00 ## $t6 = FA000000 -/* 0431C 8097526C 35CE8080 */ ori $t6, $t6, 0x8080 ## $t6 = FA008080 -/* 04320 80975270 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 04324 80975274 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 04328 80975278 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 0432C 8097527C AE2F02D0 */ sw $t7, 0x02D0($s1) ## 000002D0 -/* 04330 80975280 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 04334 80975284 920A0178 */ lbu $t2, 0x0178($s0) ## 00000178 -/* 04338 80975288 9218017A */ lbu $t8, 0x017A($s0) ## 0000017A -/* 0433C 8097528C 920E0179 */ lbu $t6, 0x0179($s0) ## 00000179 -/* 04340 80975290 000A6600 */ sll $t4, $t2, 24 -/* 04344 80975294 00184A00 */ sll $t1, $t8, 8 -/* 04348 80975298 012C5825 */ or $t3, $t1, $t4 ## $t3 = 00000000 -/* 0434C 8097529C 000E6C00 */ sll $t5, $t6, 16 -/* 04350 809752A0 016DC025 */ or $t8, $t3, $t5 ## $t8 = 00000000 -/* 04354 809752A4 371900FF */ ori $t9, $t8, 0x00FF ## $t9 = 000000FF -/* 04358 809752A8 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 0435C 809752AC 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 04360 809752B0 3C09FB00 */ lui $t1, 0xFB00 ## $t1 = FB000000 -/* 04364 809752B4 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 04368 809752B8 AE2A02D0 */ sw $t2, 0x02D0($s1) ## 000002D0 -/* 0436C 809752BC AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 04370 809752C0 920D017B */ lbu $t5, 0x017B($s0) ## 0000017B -/* 04374 809752C4 920F017D */ lbu $t7, 0x017D($s0) ## 0000017D -/* 04378 809752C8 9209017C */ lbu $t1, 0x017C($s0) ## 0000017C -/* 0437C 809752CC 000DC600 */ sll $t8, $t5, 24 -/* 04380 809752D0 000F7200 */ sll $t6, $t7, 8 -/* 04384 809752D4 01D8C825 */ or $t9, $t6, $t8 ## $t9 = FA008080 -/* 04388 809752D8 00096400 */ sll $t4, $t1, 16 -/* 0438C 809752DC 032C7825 */ or $t7, $t9, $t4 ## $t7 = FA008080 -/* 04390 809752E0 35EB00FF */ ori $t3, $t7, 0x00FF ## $t3 = FA0080FF -/* 04394 809752E4 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 04398 809752E8 8FAD008C */ lw $t5, 0x008C($sp) -/* 0439C 809752EC 0C024F61 */ jal func_80093D84 -/* 043A0 809752F0 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 -/* 043A4 809752F4 0C034213 */ jal Matrix_Push -/* 043A8 809752F8 00000000 */ nop -/* 043AC 809752FC 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 043B0 80975300 3C18DA38 */ lui $t8, 0xDA38 ## $t8 = DA380000 -/* 043B4 80975304 37180003 */ ori $t8, $t8, 0x0003 ## $t8 = DA380003 -/* 043B8 80975308 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 043BC 8097530C AE2E02D0 */ sw $t6, 0x02D0($s1) ## 000002D0 -/* 043C0 80975310 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 043C4 80975314 8FAA008C */ lw $t2, 0x008C($sp) -/* 043C8 80975318 3C058097 */ lui $a1, %hi(D_80976A50) ## $a1 = 80970000 -/* 043CC 8097531C 24A56A50 */ addiu $a1, $a1, %lo(D_80976A50) ## $a1 = 80976A50 -/* 043D0 80975320 8D440000 */ lw $a0, 0x0000($t2) ## 00000000 -/* 043D4 80975324 24060AF1 */ addiu $a2, $zero, 0x0AF1 ## $a2 = 00000AF1 -/* 043D8 80975328 0C0346A2 */ jal Matrix_NewMtx -/* 043DC 8097532C AFA20054 */ sw $v0, 0x0054($sp) -/* 043E0 80975330 8FA30054 */ lw $v1, 0x0054($sp) -/* 043E4 80975334 3C0C0600 */ lui $t4, 0x0600 ## $t4 = 06000000 -/* 043E8 80975338 258C0330 */ addiu $t4, $t4, 0x0330 ## $t4 = 06000330 -/* 043EC 8097533C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 043F0 80975340 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 043F4 80975344 3C19DE00 */ lui $t9, 0xDE00 ## $t9 = DE000000 -/* 043F8 80975348 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 043FC 8097534C AE2902D0 */ sw $t1, 0x02D0($s1) ## 000002D0 -/* 04400 80975350 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 04404 80975354 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 04408 80975358 8FAF008C */ lw $t7, 0x008C($sp) -/* 0440C 8097535C 0C024F46 */ jal func_80093D18 -/* 04410 80975360 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 04414 80975364 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04418 80975368 8FA5008C */ lw $a1, 0x008C($sp) -/* 0441C 8097536C 0C00BAF3 */ jal func_8002EBCC -/* 04420 80975370 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 04424 80975374 0C034221 */ jal Matrix_Pull -/* 04428 80975378 00000000 */ nop -/* 0442C 8097537C 920B0186 */ lbu $t3, 0x0186($s0) ## 00000186 -/* 04430 80975380 256D0001 */ addiu $t5, $t3, 0x0001 ## $t5 = 00000001 -/* 04434 80975384 31A200FF */ andi $v0, $t5, 0x00FF ## $v0 = 00000001 -/* 04438 80975388 28410079 */ slti $at, $v0, 0x0079 -/* 0443C 8097538C 14200003 */ bne $at, $zero, .L8097539C -/* 04440 80975390 A20D0186 */ sb $t5, 0x0186($s0) ## 00000186 -/* 04444 80975394 A2000186 */ sb $zero, 0x0186($s0) ## 00000186 -/* 04448 80975398 300200FF */ andi $v0, $zero, 0x00FF ## $v0 = 00000000 -.L8097539C: -/* 0444C 8097539C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 04450 809753A0 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 04454 809753A4 44814000 */ mtc1 $at, $f8 ## $f8 = 3.00 -/* 04458 809753A8 468021A0 */ cvt.s.w $f6, $f4 -/* 0445C 809753AC 3C018097 */ lui $at, %hi(D_80976D58) ## $at = 80970000 -/* 04460 809753B0 C4306D58 */ lwc1 $f16, %lo(D_80976D58)($at) -/* 04464 809753B4 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 04468 809753B8 46083282 */ mul.s $f10, $f6, $f8 -/* 0446C 809753BC 00000000 */ nop -/* 04470 809753C0 46105302 */ mul.s $f12, $f10, $f16 -/* 04474 809753C4 0C0343B5 */ jal Matrix_RotateZ -/* 04478 809753C8 00000000 */ nop -/* 0447C 809753CC 3C018097 */ lui $at, %hi(D_80976D5C) ## $at = 80970000 -/* 04480 809753D0 C42C6D5C */ lwc1 $f12, %lo(D_80976D5C)($at) -/* 04484 809753D4 0C0342DC */ jal Matrix_RotateX -/* 04488 809753D8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0448C 809753DC 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 04490 809753E0 3C01C30C */ lui $at, 0xC30C ## $at = C30C0000 -/* 04494 809753E4 44817000 */ mtc1 $at, $f14 ## $f14 = -140.00 -/* 04498 809753E8 44066000 */ mfc1 $a2, $f12 -/* 0449C 809753EC 0C034261 */ jal Matrix_Translate -/* 044A0 809753F0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 044A4 809753F4 3C018097 */ lui $at, %hi(D_80976D60) ## $at = 80970000 -/* 044A8 809753F8 C42C6D60 */ lwc1 $f12, %lo(D_80976D60)($at) -/* 044AC 809753FC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 044B0 80975400 44066000 */ mfc1 $a2, $f12 -/* 044B4 80975404 0C0342A3 */ jal Matrix_Scale -/* 044B8 80975408 46006386 */ mov.s $f14, $f12 -/* 044BC 8097540C 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 -/* 044C0 80975410 3C18DA38 */ lui $t8, 0xDA38 ## $t8 = DA380000 -/* 044C4 80975414 37180003 */ ori $t8, $t8, 0x0003 ## $t8 = DA380003 -/* 044C8 80975418 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 044CC 8097541C AE2E02C0 */ sw $t6, 0x02C0($s1) ## 000002C0 -/* 044D0 80975420 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 044D4 80975424 8FAA008C */ lw $t2, 0x008C($sp) -/* 044D8 80975428 3C058097 */ lui $a1, %hi(D_80976A64) ## $a1 = 80970000 -/* 044DC 8097542C 24A56A64 */ addiu $a1, $a1, %lo(D_80976A64) ## $a1 = 80976A64 -/* 044E0 80975430 24060B08 */ addiu $a2, $zero, 0x0B08 ## $a2 = 00000B08 -/* 044E4 80975434 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 044E8 80975438 0C0346A2 */ jal Matrix_NewMtx -/* 044EC 8097543C 8D440000 */ lw $a0, 0x0000($t2) ## 00000000 -/* 044F0 80975440 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 -/* 044F4 80975444 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 -/* 044F8 80975448 3C0C0600 */ lui $t4, 0x0600 ## $t4 = 06000000 -/* 044FC 8097544C 258C3C50 */ addiu $t4, $t4, 0x3C50 ## $t4 = 06003C50 -/* 04500 80975450 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 04504 80975454 AE2902C0 */ sw $t1, 0x02C0($s1) ## 000002C0 -/* 04508 80975458 3C19DE00 */ lui $t9, 0xDE00 ## $t9 = DE000000 -/* 0450C 8097545C AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 04510 80975460 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -.L80975464: -/* 04514 80975464 8FAF008C */ lw $t7, 0x008C($sp) -/* 04518 80975468 3C068097 */ lui $a2, %hi(D_80976A78) ## $a2 = 80970000 -/* 0451C 8097546C 24C66A78 */ addiu $a2, $a2, %lo(D_80976A78) ## $a2 = 80976A78 -/* 04520 80975470 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFE0 -/* 04524 80975474 24070B0D */ addiu $a3, $zero, 0x0B0D ## $a3 = 00000B0D -/* 04528 80975478 0C031AD5 */ jal Graph_CloseDisps -/* 0452C 8097547C 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 -/* 04530 80975480 8FBF003C */ lw $ra, 0x003C($sp) -/* 04534 80975484 8FB00034 */ lw $s0, 0x0034($sp) -/* 04538 80975488 8FB10038 */ lw $s1, 0x0038($sp) -/* 0453C 8097548C 03E00008 */ jr $ra -/* 04540 80975490 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975494.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975494.s deleted file mode 100644 index 9b21e2eb6d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975494.s +++ /dev/null @@ -1,194 +0,0 @@ -.rdata -glabel D_80976A8C - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976AA0 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976AB4 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976AC8 - .asciz "../z_demo_effect.c" - .balign 4 - -.late_rodata -glabel D_80976D64 - .float 0.05 - -glabel D_80976D68 - .float 0.017453292 - -glabel D_80976D6C - .float 0.017453292 - -.text -glabel func_80975494 -/* 04544 80975494 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 04548 80975498 AFBF001C */ sw $ra, 0x001C($sp) -/* 0454C 8097549C AFB10018 */ sw $s1, 0x0018($sp) -/* 04550 809754A0 AFB00014 */ sw $s0, 0x0014($sp) -/* 04554 809754A4 AFA5006C */ sw $a1, 0x006C($sp) -/* 04558 809754A8 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 0455C 809754AC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04560 809754B0 3C068097 */ lui $a2, %hi(D_80976A8C) ## $a2 = 80970000 -/* 04564 809754B4 24C66A8C */ addiu $a2, $a2, %lo(D_80976A8C) ## $a2 = 80976A8C -/* 04568 809754B8 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE0 -/* 0456C 809754BC 24070B1A */ addiu $a3, $zero, 0x0B1A ## $a3 = 00000B1A -/* 04570 809754C0 0C031AB1 */ jal Graph_OpenDisps -/* 04574 809754C4 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 04578 809754C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0457C 809754CC 8FA5006C */ lw $a1, 0x006C($sp) -/* 04580 809754D0 0C25D1AD */ jal func_809746B4 -/* 04584 809754D4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 04588 809754D8 54400085 */ bnel $v0, $zero, .L809756F0 -/* 0458C 809754DC 8FAE006C */ lw $t6, 0x006C($sp) -/* 04590 809754E0 920F0186 */ lbu $t7, 0x0186($s0) ## 00000186 -/* 04594 809754E4 8FB9006C */ lw $t9, 0x006C($sp) -/* 04598 809754E8 15E00003 */ bne $t7, $zero, .L809754F8 -/* 0459C 809754EC 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 045A0 809754F0 1000007E */ beq $zero, $zero, .L809756EC -/* 045A4 809754F4 A2180186 */ sb $t8, 0x0186($s0) ## 00000186 -.L809754F8: -/* 045A8 809754F8 0C024F61 */ jal func_80093D84 -/* 045AC 809754FC 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 -/* 045B0 80975500 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 045B4 80975504 3C09FA00 */ lui $t1, 0xFA00 ## $t1 = FA000000 -/* 045B8 80975508 35290080 */ ori $t1, $t1, 0x0080 ## $t1 = FA000080 -/* 045BC 8097550C 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 -/* 045C0 80975510 AE2802D0 */ sw $t0, 0x02D0($s1) ## 000002D0 -/* 045C4 80975514 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 045C8 80975518 920D0178 */ lbu $t5, 0x0178($s0) ## 00000178 -/* 045CC 8097551C 92190179 */ lbu $t9, 0x0179($s0) ## 00000179 -/* 045D0 80975520 920B0184 */ lbu $t3, 0x0184($s0) ## 00000184 -/* 045D4 80975524 920C017A */ lbu $t4, 0x017A($s0) ## 0000017A -/* 045D8 80975528 000D7600 */ sll $t6, $t5, 24 -/* 045DC 8097552C 00194400 */ sll $t0, $t9, 16 -/* 045E0 80975530 016E7825 */ or $t7, $t3, $t6 ## $t7 = 00000000 -/* 045E4 80975534 01E84825 */ or $t1, $t7, $t0 ## $t1 = 00000008 -/* 045E8 80975538 000C6A00 */ sll $t5, $t4, 8 -/* 045EC 8097553C 012D5825 */ or $t3, $t1, $t5 ## $t3 = 00000008 -/* 045F0 80975540 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 045F4 80975544 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 045F8 80975548 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 -/* 045FC 8097554C 3C018097 */ lui $at, %hi(D_80976D64) ## $at = 80970000 -/* 04600 80975550 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 04604 80975554 AE2E02D0 */ sw $t6, 0x02D0($s1) ## 000002D0 -/* 04608 80975558 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 0460C 8097555C 920C017B */ lbu $t4, 0x017B($s0) ## 0000017B -/* 04610 80975560 920F017D */ lbu $t7, 0x017D($s0) ## 0000017D -/* 04614 80975564 920E017C */ lbu $t6, 0x017C($s0) ## 0000017C -/* 04618 80975568 000C4E00 */ sll $t1, $t4, 24 -/* 0461C 8097556C 000F4200 */ sll $t0, $t7, 8 -/* 04620 80975570 01096825 */ or $t5, $t0, $t1 ## $t5 = 00000008 -/* 04624 80975574 000EC400 */ sll $t8, $t6, 16 -/* 04628 80975578 01B8C825 */ or $t9, $t5, $t8 ## $t9 = FB000008 -/* 0462C 8097557C 372F00FF */ ori $t7, $t9, 0x00FF ## $t7 = FB0000FF -/* 04630 80975580 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 04634 80975584 920A0185 */ lbu $t2, 0x0185($s0) ## 00000185 -/* 04638 80975588 C4286D64 */ lwc1 $f8, %lo(D_80976D64)($at) -/* 0463C 8097558C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 04640 80975590 314C0001 */ andi $t4, $t2, 0x0001 ## $t4 = 00000000 -/* 04644 80975594 448C2000 */ mtc1 $t4, $f4 ## $f4 = 0.00 -/* 04648 80975598 44818000 */ mtc1 $at, $f16 ## $f16 = 1.00 -/* 0464C 8097559C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 04650 809755A0 468021A0 */ cvt.s.w $f6, $f4 -/* 04654 809755A4 46083282 */ mul.s $f10, $f6, $f8 -/* 04658 809755A8 46105300 */ add.s $f12, $f10, $f16 -/* 0465C 809755AC 44066000 */ mfc1 $a2, $f12 -/* 04660 809755B0 0C0342A3 */ jal Matrix_Scale -/* 04664 809755B4 46006386 */ mov.s $f14, $f12 -/* 04668 809755B8 0C034213 */ jal Matrix_Push -/* 0466C 809755BC 00000000 */ nop -/* 04670 809755C0 8FA4006C */ lw $a0, 0x006C($sp) -/* 04674 809755C4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 04678 809755C8 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 -/* 0467C 809755CC 00812021 */ addu $a0, $a0, $at -/* 04680 809755D0 AFA40028 */ sw $a0, 0x0028($sp) -/* 04684 809755D4 0C03424C */ jal Matrix_Mult -/* 04688 809755D8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0468C 809755DC 86080188 */ lh $t0, 0x0188($s0) ## 00000188 -/* 04690 809755E0 3C018097 */ lui $at, %hi(D_80976D68) ## $at = 80970000 -/* 04694 809755E4 C4266D68 */ lwc1 $f6, %lo(D_80976D68)($at) -/* 04698 809755E8 44889000 */ mtc1 $t0, $f18 ## $f18 = 0.00 -/* 0469C 809755EC 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 046A0 809755F0 46809120 */ cvt.s.w $f4, $f18 -/* 046A4 809755F4 46062302 */ mul.s $f12, $f4, $f6 -/* 046A8 809755F8 0C0343B5 */ jal Matrix_RotateZ -/* 046AC 809755FC 00000000 */ nop -/* 046B0 80975600 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 046B4 80975604 3C0BDA38 */ lui $t3, 0xDA38 ## $t3 = DA380000 -/* 046B8 80975608 356B0003 */ ori $t3, $t3, 0x0003 ## $t3 = DA380003 -/* 046BC 8097560C 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 046C0 80975610 AE2902D0 */ sw $t1, 0x02D0($s1) ## 000002D0 -/* 046C4 80975614 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 046C8 80975618 8FAE006C */ lw $t6, 0x006C($sp) -/* 046CC 8097561C 3C058097 */ lui $a1, %hi(D_80976AA0) ## $a1 = 80970000 -/* 046D0 80975620 24A56AA0 */ addiu $a1, $a1, %lo(D_80976AA0) ## $a1 = 80976AA0 -/* 046D4 80975624 8DC40000 */ lw $a0, 0x0000($t6) ## 00000000 -/* 046D8 80975628 24060B32 */ addiu $a2, $zero, 0x0B32 ## $a2 = 00000B32 -/* 046DC 8097562C 0C0346A2 */ jal Matrix_NewMtx -/* 046E0 80975630 AFA2003C */ sw $v0, 0x003C($sp) -/* 046E4 80975634 8FA3003C */ lw $v1, 0x003C($sp) -/* 046E8 80975638 3C040401 */ lui $a0, 0x0401 ## $a0 = 04010000 -/* 046EC 8097563C 24840130 */ addiu $a0, $a0, 0x0130 ## $a0 = 04010130 -/* 046F0 80975640 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 046F4 80975644 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 046F8 80975648 3C18DE00 */ lui $t8, 0xDE00 ## $t8 = DE000000 -/* 046FC 8097564C 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 04700 80975650 AE2D02D0 */ sw $t5, 0x02D0($s1) ## 000002D0 -/* 04704 80975654 AC440004 */ sw $a0, 0x0004($v0) ## 00000004 -/* 04708 80975658 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 0470C 8097565C 0C034221 */ jal Matrix_Pull -/* 04710 80975660 AFA4002C */ sw $a0, 0x002C($sp) -/* 04714 80975664 8FA40028 */ lw $a0, 0x0028($sp) -/* 04718 80975668 0C03424C */ jal Matrix_Mult -/* 0471C 8097566C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 04720 80975670 86190188 */ lh $t9, 0x0188($s0) ## 00000188 -/* 04724 80975674 3C018097 */ lui $at, %hi(D_80976D6C) ## $at = 80970000 -/* 04728 80975678 C4326D6C */ lwc1 $f18, %lo(D_80976D6C)($at) -/* 0472C 8097567C 44994000 */ mtc1 $t9, $f8 ## $f8 = 0.00 -/* 04730 80975680 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 04734 80975684 468042A0 */ cvt.s.w $f10, $f8 -/* 04738 80975688 46005407 */ neg.s $f16, $f10 -/* 0473C 8097568C 46128302 */ mul.s $f12, $f16, $f18 -/* 04740 80975690 0C0343B5 */ jal Matrix_RotateZ -/* 04744 80975694 00000000 */ nop -/* 04748 80975698 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 0474C 8097569C 3C0ADA38 */ lui $t2, 0xDA38 ## $t2 = DA380000 -/* 04750 809756A0 354A0003 */ ori $t2, $t2, 0x0003 ## $t2 = DA380003 -/* 04754 809756A4 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 04758 809756A8 AE2F02D0 */ sw $t7, 0x02D0($s1) ## 000002D0 -/* 0475C 809756AC AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 04760 809756B0 8FAC006C */ lw $t4, 0x006C($sp) -/* 04764 809756B4 3C058097 */ lui $a1, %hi(D_80976AB4) ## $a1 = 80970000 -/* 04768 809756B8 24A56AB4 */ addiu $a1, $a1, %lo(D_80976AB4) ## $a1 = 80976AB4 -/* 0476C 809756BC 24060B3A */ addiu $a2, $zero, 0x0B3A ## $a2 = 00000B3A -/* 04770 809756C0 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 04774 809756C4 0C0346A2 */ jal Matrix_NewMtx -/* 04778 809756C8 8D840000 */ lw $a0, 0x0000($t4) ## 00000000 -/* 0477C 809756CC AE020004 */ sw $v0, 0x0004($s0) ## 00000004 -/* 04780 809756D0 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 04784 809756D4 3C09DE00 */ lui $t1, 0xDE00 ## $t1 = DE000000 -/* 04788 809756D8 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 -/* 0478C 809756DC AE2802D0 */ sw $t0, 0x02D0($s1) ## 000002D0 -/* 04790 809756E0 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 04794 809756E4 8FAB002C */ lw $t3, 0x002C($sp) -/* 04798 809756E8 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -.L809756EC: -/* 0479C 809756EC 8FAE006C */ lw $t6, 0x006C($sp) -.L809756F0: -/* 047A0 809756F0 3C068097 */ lui $a2, %hi(D_80976AC8) ## $a2 = 80970000 -/* 047A4 809756F4 24C66AC8 */ addiu $a2, $a2, %lo(D_80976AC8) ## $a2 = 80976AC8 -/* 047A8 809756F8 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE0 -/* 047AC 809756FC 24070B41 */ addiu $a3, $zero, 0x0B41 ## $a3 = 00000B41 -/* 047B0 80975700 0C031AD5 */ jal Graph_CloseDisps -/* 047B4 80975704 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 047B8 80975708 8FBF001C */ lw $ra, 0x001C($sp) -/* 047BC 8097570C 8FB00014 */ lw $s0, 0x0014($sp) -/* 047C0 80975710 8FB10018 */ lw $s1, 0x0018($sp) -/* 047C4 80975714 03E00008 */ jr $ra -/* 047C8 80975718 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097571C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097571C.s deleted file mode 100644 index 0fe1db9d33..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097571C.s +++ /dev/null @@ -1,107 +0,0 @@ -.rdata -glabel D_80976ADC - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976AF0 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976B04 - .asciz "../z_demo_effect.c" - .balign 4 - -.late_rodata -glabel D_80976D70 - .float 9.58738019108e-05 - -.text -glabel func_8097571C -/* 047CC 8097571C 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 047D0 80975720 AFB10018 */ sw $s1, 0x0018($sp) -/* 047D4 80975724 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 047D8 80975728 AFBF001C */ sw $ra, 0x001C($sp) -/* 047DC 8097572C AFB00014 */ sw $s0, 0x0014($sp) -/* 047E0 80975730 AFA40050 */ sw $a0, 0x0050($sp) -/* 047E4 80975734 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 047E8 80975738 3C068097 */ lui $a2, %hi(D_80976ADC) ## $a2 = 80970000 -/* 047EC 8097573C 24C66ADC */ addiu $a2, $a2, %lo(D_80976ADC) ## $a2 = 80976ADC -/* 047F0 80975740 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 -/* 047F4 80975744 24070B4C */ addiu $a3, $zero, 0x0B4C ## $a3 = 00000B4C -/* 047F8 80975748 0C031AB1 */ jal Graph_OpenDisps -/* 047FC 8097574C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 04800 80975750 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 04804 80975754 3C0FFA00 */ lui $t7, 0xFA00 ## $t7 = FA000000 -/* 04808 80975758 35EF8080 */ ori $t7, $t7, 0x8080 ## $t7 = FA008080 -/* 0480C 8097575C 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 04810 80975760 AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 -/* 04814 80975764 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 04818 80975768 8FB80050 */ lw $t8, 0x0050($sp) -/* 0481C 8097576C 3C01BCFF */ lui $at, 0xBCFF ## $at = BCFF0000 -/* 04820 80975770 3421FF00 */ ori $at, $at, 0xFF00 ## $at = BCFFFF00 -/* 04824 80975774 93080184 */ lbu $t0, 0x0184($t8) ## 00000184 -/* 04828 80975778 3C0C0064 */ lui $t4, 0x0064 ## $t4 = 00640000 -/* 0482C 8097577C 358CFFFF */ ori $t4, $t4, 0xFFFF ## $t4 = 0064FFFF -/* 04830 80975780 01014825 */ or $t1, $t0, $at ## $t1 = BCFFFF00 -/* 04834 80975784 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 04838 80975788 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 0483C 8097578C 3C0BFB00 */ lui $t3, 0xFB00 ## $t3 = FB000000 -/* 04840 80975790 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 04844 80975794 AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 -/* 04848 80975798 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 0484C 8097579C AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 04850 809757A0 0C024F61 */ jal func_80093D84 -/* 04854 809757A4 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 04858 809757A8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0485C 809757AC 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 -/* 04860 809757B0 02212021 */ addu $a0, $s1, $at -/* 04864 809757B4 0C03424C */ jal Matrix_Mult -/* 04868 809757B8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0486C 809757BC 8FAD0050 */ lw $t5, 0x0050($sp) -/* 04870 809757C0 3C018097 */ lui $at, %hi(D_80976D70) ## $at = 80970000 -/* 04874 809757C4 C4286D70 */ lwc1 $f8, %lo(D_80976D70)($at) -/* 04878 809757C8 85AE0188 */ lh $t6, 0x0188($t5) ## 00000188 -/* 0487C 809757CC 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 04880 809757D0 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 04884 809757D4 00000000 */ nop -/* 04888 809757D8 468021A0 */ cvt.s.w $f6, $f4 -/* 0488C 809757DC 46083302 */ mul.s $f12, $f6, $f8 -/* 04890 809757E0 0C0343B5 */ jal Matrix_RotateZ -/* 04894 809757E4 00000000 */ nop -/* 04898 809757E8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 0489C 809757EC 3C18DA38 */ lui $t8, 0xDA38 ## $t8 = DA380000 -/* 048A0 809757F0 37180003 */ ori $t8, $t8, 0x0003 ## $t8 = DA380003 -/* 048A4 809757F4 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 048A8 809757F8 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 -/* 048AC 809757FC AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 048B0 80975800 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 048B4 80975804 3C058097 */ lui $a1, %hi(D_80976AF0) ## $a1 = 80970000 -/* 048B8 80975808 24A56AF0 */ addiu $a1, $a1, %lo(D_80976AF0) ## $a1 = 80976AF0 -/* 048BC 8097580C 24060B55 */ addiu $a2, $zero, 0x0B55 ## $a2 = 00000B55 -/* 048C0 80975810 0C0346A2 */ jal Matrix_NewMtx -/* 048C4 80975814 AFA20028 */ sw $v0, 0x0028($sp) -/* 048C8 80975818 8FA30028 */ lw $v1, 0x0028($sp) -/* 048CC 8097581C 3C0C0401 */ lui $t4, 0x0401 ## $t4 = 04010000 -/* 048D0 80975820 258C0130 */ addiu $t4, $t4, 0x0130 ## $t4 = 04010130 -/* 048D4 80975824 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 048D8 80975828 8FB90050 */ lw $t9, 0x0050($sp) -/* 048DC 8097582C 3C0BDE00 */ lui $t3, 0xDE00 ## $t3 = DE000000 -/* 048E0 80975830 3C068097 */ lui $a2, %hi(D_80976B04) ## $a2 = 80970000 -/* 048E4 80975834 87280188 */ lh $t0, 0x0188($t9) ## 00000188 -/* 048E8 80975838 24C66B04 */ addiu $a2, $a2, %lo(D_80976B04) ## $a2 = 80976B04 -/* 048EC 8097583C 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 -/* 048F0 80975840 250901F4 */ addiu $t1, $t0, 0x01F4 ## $t1 = 000001F4 -/* 048F4 80975844 A7290188 */ sh $t1, 0x0188($t9) ## 00000188 -/* 048F8 80975848 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 048FC 8097584C 24070B5B */ addiu $a3, $zero, 0x0B5B ## $a3 = 00000B5B -/* 04900 80975850 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 04904 80975854 AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 -/* 04908 80975858 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 0490C 8097585C AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 04910 80975860 0C031AD5 */ jal Graph_CloseDisps -/* 04914 80975864 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 04918 80975868 8FBF001C */ lw $ra, 0x001C($sp) -/* 0491C 8097586C 8FB00014 */ lw $s0, 0x0014($sp) -/* 04920 80975870 8FB10018 */ lw $s1, 0x0018($sp) -/* 04924 80975874 03E00008 */ jr $ra -/* 04928 80975878 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097587C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097587C.s deleted file mode 100644 index 3c17a35aeb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097587C.s +++ /dev/null @@ -1,127 +0,0 @@ -.rdata -glabel D_80976B18 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976B2C - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976B40 - .asciz "../z_demo_effect.c" - .balign 4 - -.text -glabel func_8097587C -/* 0492C 8097587C 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 04930 80975880 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 -/* 04934 80975884 AFBF003C */ sw $ra, 0x003C($sp) -/* 04938 80975888 AFB10038 */ sw $s1, 0x0038($sp) -/* 0493C 8097588C AFB00034 */ sw $s0, 0x0034($sp) -/* 04940 80975890 AFA40078 */ sw $a0, 0x0078($sp) -/* 04944 80975894 01C57021 */ addu $t6, $t6, $a1 -/* 04948 80975898 8DCE1DE4 */ lw $t6, 0x1DE4($t6) ## 00011DE4 -/* 0494C 8097589C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 04950 809758A0 3C068097 */ lui $a2, %hi(D_80976B18) ## $a2 = 80970000 -/* 04954 809758A4 AFAE006C */ sw $t6, 0x006C($sp) -/* 04958 809758A8 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 0495C 809758AC 24C66B18 */ addiu $a2, $a2, %lo(D_80976B18) ## $a2 = 80976B18 -/* 04960 809758B0 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE0 -/* 04964 809758B4 24070B69 */ addiu $a3, $zero, 0x0B69 ## $a3 = 00000B69 -/* 04968 809758B8 0C031AB1 */ jal Graph_OpenDisps -/* 0496C 809758BC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 04970 809758C0 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 04974 809758C4 3C18FA00 */ lui $t8, 0xFA00 ## $t8 = FA000000 -/* 04978 809758C8 37184040 */ ori $t8, $t8, 0x4040 ## $t8 = FA004040 -/* 0497C 809758CC 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 04980 809758D0 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 -/* 04984 809758D4 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 04988 809758D8 8FB90078 */ lw $t9, 0x0078($sp) -/* 0498C 809758DC 2401A000 */ addiu $at, $zero, 0xA000 ## $at = FFFFA000 -/* 04990 809758E0 3C0E32C8 */ lui $t6, 0x32C8 ## $t6 = 32C80000 -/* 04994 809758E4 932A0184 */ lbu $t2, 0x0184($t9) ## 00000184 -/* 04998 809758E8 35CE00FF */ ori $t6, $t6, 0x00FF ## $t6 = 32C800FF -/* 0499C 809758EC 3C0DFB00 */ lui $t5, 0xFB00 ## $t5 = FB000000 -/* 049A0 809758F0 01415825 */ or $t3, $t2, $at ## $t3 = FFFFA000 -/* 049A4 809758F4 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 049A8 809758F8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 049AC 809758FC 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 049B0 80975900 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 -/* 049B4 80975904 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 049B8 80975908 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 049BC 8097590C 0C024F61 */ jal func_80093D84 -/* 049C0 80975910 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 049C4 80975914 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 049C8 80975918 3C18DA38 */ lui $t8, 0xDA38 ## $t8 = DA380000 -/* 049CC 8097591C 37180003 */ ori $t8, $t8, 0x0003 ## $t8 = DA380003 -/* 049D0 80975920 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 049D4 80975924 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 -/* 049D8 80975928 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 049DC 8097592C 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 049E0 80975930 3C058097 */ lui $a1, %hi(D_80976B2C) ## $a1 = 80970000 -/* 049E4 80975934 24A56B2C */ addiu $a1, $a1, %lo(D_80976B2C) ## $a1 = 80976B2C -/* 049E8 80975938 24060B6F */ addiu $a2, $zero, 0x0B6F ## $a2 = 00000B6F -/* 049EC 8097593C 0C0346A2 */ jal Matrix_NewMtx -/* 049F0 80975940 AFA2004C */ sw $v0, 0x004C($sp) -/* 049F4 80975944 8FA3004C */ lw $v1, 0x004C($sp) -/* 049F8 80975948 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 -/* 049FC 8097594C 35290020 */ ori $t1, $t1, 0x0020 ## $t1 = DB060020 -/* 04A00 80975950 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 04A04 80975954 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 04A08 80975958 8FA8006C */ lw $t0, 0x006C($sp) -/* 04A0C 8097595C 240A0100 */ addiu $t2, $zero, 0x0100 ## $t2 = 00000100 -/* 04A10 80975960 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 04A14 80975964 AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0 -/* 04A18 80975968 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 04A1C 8097596C 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 04A20 80975970 00087880 */ sll $t7, $t0, 2 -/* 04A24 80975974 01E87823 */ subu $t7, $t7, $t0 -/* 04A28 80975978 000F78C0 */ sll $t7, $t7, 3 -/* 04A2C 8097597C 01E87821 */ addu $t7, $t7, $t0 -/* 04A30 80975980 00086880 */ sll $t5, $t0, 2 -/* 04A34 80975984 000F7840 */ sll $t7, $t7, 1 -/* 04A38 80975988 240B0040 */ addiu $t3, $zero, 0x0040 ## $t3 = 00000040 -/* 04A3C 8097598C 01A86821 */ addu $t5, $t5, $t0 -/* 04A40 80975990 000D6840 */ sll $t5, $t5, 1 -/* 04A44 80975994 AFAB0014 */ sw $t3, 0x0014($sp) -/* 04A48 80975998 31F801FF */ andi $t8, $t7, 0x01FF ## $t8 = 00000000 -/* 04A4C 8097599C AFAA0010 */ sw $t2, 0x0010($sp) -/* 04A50 809759A0 24190200 */ addiu $t9, $zero, 0x0200 ## $t9 = 00000200 -/* 04A54 809759A4 00083080 */ sll $a2, $t0, 2 -/* 04A58 809759A8 03384823 */ subu $t1, $t9, $t8 -/* 04A5C 809759AC 240A0020 */ addiu $t2, $zero, 0x0020 ## $t2 = 00000020 -/* 04A60 809759B0 240B0010 */ addiu $t3, $zero, 0x0010 ## $t3 = 00000010 -/* 04A64 809759B4 31AE007F */ andi $t6, $t5, 0x007F ## $t6 = 00000000 -/* 04A68 809759B8 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 04A6C 809759BC 00C83021 */ addu $a2, $a2, $t0 -/* 04A70 809759C0 30C603FF */ andi $a2, $a2, 0x03FF ## $a2 = 00000000 -/* 04A74 809759C4 AFAC0018 */ sw $t4, 0x0018($sp) -/* 04A78 809759C8 AFAE001C */ sw $t6, 0x001C($sp) -/* 04A7C 809759CC AFAB0028 */ sw $t3, 0x0028($sp) -/* 04A80 809759D0 AFAA0024 */ sw $t2, 0x0024($sp) -/* 04A84 809759D4 AFA90020 */ sw $t1, 0x0020($sp) -/* 04A88 809759D8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 04A8C 809759DC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 04A90 809759E0 0C0253D0 */ jal Gfx_TwoTexScroll -/* 04A94 809759E4 AFA20048 */ sw $v0, 0x0048($sp) -/* 04A98 809759E8 8FA30048 */ lw $v1, 0x0048($sp) -/* 04A9C 809759EC 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 -/* 04AA0 809759F0 25CE11D0 */ addiu $t6, $t6, 0x11D0 ## $t6 = 060011D0 -/* 04AA4 809759F4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 04AA8 809759F8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 04AAC 809759FC 3C0DDE00 */ lui $t5, 0xDE00 ## $t5 = DE000000 -/* 04AB0 80975A00 3C068097 */ lui $a2, %hi(D_80976B40) ## $a2 = 80970000 -/* 04AB4 80975A04 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 04AB8 80975A08 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 -/* 04ABC 80975A0C AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 04AC0 80975A10 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 04AC4 80975A14 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 04AC8 80975A18 24C66B40 */ addiu $a2, $a2, %lo(D_80976B40) ## $a2 = 80976B40 -/* 04ACC 80975A1C 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE0 -/* 04AD0 80975A20 0C031AD5 */ jal Graph_CloseDisps -/* 04AD4 80975A24 24070B7E */ addiu $a3, $zero, 0x0B7E ## $a3 = 00000B7E -/* 04AD8 80975A28 8FBF003C */ lw $ra, 0x003C($sp) -/* 04ADC 80975A2C 8FB00034 */ lw $s0, 0x0034($sp) -/* 04AE0 80975A30 8FB10038 */ lw $s1, 0x0038($sp) -/* 04AE4 80975A34 03E00008 */ jr $ra -/* 04AE8 80975A38 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975A3C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975A3C.s deleted file mode 100644 index 92e8a88fb6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975A3C.s +++ /dev/null @@ -1,117 +0,0 @@ -.rdata -glabel D_80976B54 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976B68 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976B7C - .asciz "../z_demo_effect.c" - .balign 4 - -.text -glabel func_80975A3C -/* 04AEC 80975A3C 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 04AF0 80975A40 AFBF003C */ sw $ra, 0x003C($sp) -/* 04AF4 80975A44 AFB10038 */ sw $s1, 0x0038($sp) -/* 04AF8 80975A48 AFB00034 */ sw $s0, 0x0034($sp) -/* 04AFC 80975A4C AFA40078 */ sw $a0, 0x0078($sp) -/* 04B00 80975A50 848F0188 */ lh $t7, 0x0188($a0) ## 00000188 -/* 04B04 80975A54 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 04B08 80975A58 3C068097 */ lui $a2, %hi(D_80976B54) ## $a2 = 80970000 -/* 04B0C 80975A5C AFAF006C */ sw $t7, 0x006C($sp) -/* 04B10 80975A60 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 04B14 80975A64 24C66B54 */ addiu $a2, $a2, %lo(D_80976B54) ## $a2 = 80976B54 -/* 04B18 80975A68 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE0 -/* 04B1C 80975A6C 24070B8C */ addiu $a3, $zero, 0x0B8C ## $a3 = 00000B8C -/* 04B20 80975A70 0C031AB1 */ jal Graph_OpenDisps -/* 04B24 80975A74 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 04B28 80975A78 0C024F61 */ jal func_80093D84 -/* 04B2C 80975A7C 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 04B30 80975A80 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 04B34 80975A84 3C19FA00 */ lui $t9, 0xFA00 ## $t9 = FA000000 -/* 04B38 80975A88 37398080 */ ori $t9, $t9, 0x8080 ## $t9 = FA008080 -/* 04B3C 80975A8C 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 04B40 80975A90 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 04B44 80975A94 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 04B48 80975A98 8FA90078 */ lw $t1, 0x0078($sp) -/* 04B4C 80975A9C 3C01AAFF */ lui $at, 0xAAFF ## $at = AAFF0000 -/* 04B50 80975AA0 3421FF00 */ ori $at, $at, 0xFF00 ## $at = AAFFFF00 -/* 04B54 80975AA4 912B0185 */ lbu $t3, 0x0185($t1) ## 00000185 -/* 04B58 80975AA8 3C0F0064 */ lui $t7, 0x0064 ## $t7 = 00640000 -/* 04B5C 80975AAC 35EFFFFF */ ori $t7, $t7, 0xFFFF ## $t7 = 0064FFFF -/* 04B60 80975AB0 01616025 */ or $t4, $t3, $at ## $t4 = AAFFFF00 -/* 04B64 80975AB4 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 04B68 80975AB8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 04B6C 80975ABC 3C0EFB00 */ lui $t6, 0xFB00 ## $t6 = FB000000 -/* 04B70 80975AC0 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 -/* 04B74 80975AC4 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 04B78 80975AC8 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 04B7C 80975ACC AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 04B80 80975AD0 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 04B84 80975AD4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 04B88 80975AD8 37390003 */ ori $t9, $t9, 0x0003 ## $t9 = DA380003 -/* 04B8C 80975ADC 3C058097 */ lui $a1, %hi(D_80976B68) ## $a1 = 80970000 -/* 04B90 80975AE0 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 04B94 80975AE4 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 04B98 80975AE8 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 04B9C 80975AEC 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 04BA0 80975AF0 24A56B68 */ addiu $a1, $a1, %lo(D_80976B68) ## $a1 = 80976B68 -/* 04BA4 80975AF4 24060B93 */ addiu $a2, $zero, 0x0B93 ## $a2 = 00000B93 -/* 04BA8 80975AF8 0C0346A2 */ jal Matrix_NewMtx -/* 04BAC 80975AFC AFA2004C */ sw $v0, 0x004C($sp) -/* 04BB0 80975B00 8FA3004C */ lw $v1, 0x004C($sp) -/* 04BB4 80975B04 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 -/* 04BB8 80975B08 354A0020 */ ori $t2, $t2, 0x0020 ## $t2 = DB060020 -/* 04BBC 80975B0C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 04BC0 80975B10 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 04BC4 80975B14 8FA8006C */ lw $t0, 0x006C($sp) -/* 04BC8 80975B18 240D01FF */ addiu $t5, $zero, 0x01FF ## $t5 = 000001FF -/* 04BCC 80975B1C 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 04BD0 80975B20 AE0902D0 */ sw $t1, 0x02D0($s0) ## 000002D0 -/* 04BD4 80975B24 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 04BD8 80975B28 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 04BDC 80975B2C 00083080 */ sll $a2, $t0, 2 -/* 04BE0 80975B30 00085840 */ sll $t3, $t0, 1 -/* 04BE4 80975B34 316C01FF */ andi $t4, $t3, 0x01FF ## $t4 = 00000000 -/* 04BE8 80975B38 24090400 */ addiu $t1, $zero, 0x0400 ## $t1 = 00000400 -/* 04BEC 80975B3C 240E0010 */ addiu $t6, $zero, 0x0010 ## $t6 = 00000010 -/* 04BF0 80975B40 240F0080 */ addiu $t7, $zero, 0x0080 ## $t7 = 00000080 -/* 04BF4 80975B44 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 04BF8 80975B48 24190008 */ addiu $t9, $zero, 0x0008 ## $t9 = 00000008 -/* 04BFC 80975B4C 00C83021 */ addu $a2, $a2, $t0 -/* 04C00 80975B50 30C6003F */ andi $a2, $a2, 0x003F ## $a2 = 00000000 -/* 04C04 80975B54 AFB90024 */ sw $t9, 0x0024($sp) -/* 04C08 80975B58 AFB80018 */ sw $t8, 0x0018($sp) -/* 04C0C 80975B5C AFAF0014 */ sw $t7, 0x0014($sp) -/* 04C10 80975B60 AFAE0010 */ sw $t6, 0x0010($sp) -/* 04C14 80975B64 AFA90028 */ sw $t1, 0x0028($sp) -/* 04C18 80975B68 01AC3823 */ subu $a3, $t5, $t4 -/* 04C1C 80975B6C AFA00020 */ sw $zero, 0x0020($sp) -/* 04C20 80975B70 AFA0001C */ sw $zero, 0x001C($sp) -/* 04C24 80975B74 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 04C28 80975B78 0C0253D0 */ jal Gfx_TwoTexScroll -/* 04C2C 80975B7C AFA20048 */ sw $v0, 0x0048($sp) -/* 04C30 80975B80 8FA30048 */ lw $v1, 0x0048($sp) -/* 04C34 80975B84 3C0D0600 */ lui $t5, 0x0600 ## $t5 = 06000000 -/* 04C38 80975B88 25AD0190 */ addiu $t5, $t5, 0x0190 ## $t5 = 06000190 -/* 04C3C 80975B8C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 04C40 80975B90 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 04C44 80975B94 3C0BDE00 */ lui $t3, 0xDE00 ## $t3 = DE000000 -/* 04C48 80975B98 3C068097 */ lui $a2, %hi(D_80976B7C) ## $a2 = 80970000 -/* 04C4C 80975B9C 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 04C50 80975BA0 AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 -/* 04C54 80975BA4 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 04C58 80975BA8 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 04C5C 80975BAC 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 04C60 80975BB0 24C66B7C */ addiu $a2, $a2, %lo(D_80976B7C) ## $a2 = 80976B7C -/* 04C64 80975BB4 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE0 -/* 04C68 80975BB8 0C031AD5 */ jal Graph_CloseDisps -/* 04C6C 80975BBC 24070BA2 */ addiu $a3, $zero, 0x0BA2 ## $a3 = 00000BA2 -/* 04C70 80975BC0 8FBF003C */ lw $ra, 0x003C($sp) -/* 04C74 80975BC4 8FB00034 */ lw $s0, 0x0034($sp) -/* 04C78 80975BC8 8FB10038 */ lw $s1, 0x0038($sp) -/* 04C7C 80975BCC 03E00008 */ jr $ra -/* 04C80 80975BD0 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975BD4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975BD4.s deleted file mode 100644 index 3eccb88027..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975BD4.s +++ /dev/null @@ -1,424 +0,0 @@ -.rdata -glabel D_80976B90 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976BA4 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976BB8 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976BCC - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976BE0 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976BF4 - .asciz "../z_demo_effect.c" - .balign 4 - -.late_rodata -glabel D_80976D74 - .float 2.4 - -glabel D_80976D78 - .float 9.58738019108e-05 - -glabel D_80976D7C - .float 9.58738019108e-05 - -.text -glabel func_80975BD4 -/* 04C84 80975BD4 27BDFF48 */ addiu $sp, $sp, 0xFF48 ## $sp = FFFFFF48 -/* 04C88 80975BD8 3C020600 */ lui $v0, 0x0600 ## $v0 = 06000000 -/* 04C8C 80975BDC 24420000 */ addiu $v0, $v0, 0x0000 ## $v0 = 06000000 -/* 04C90 80975BE0 00027100 */ sll $t6, $v0, 4 -/* 04C94 80975BE4 000E7F02 */ srl $t7, $t6, 28 -/* 04C98 80975BE8 3C0D0001 */ lui $t5, 0x0001 ## $t5 = 00010000 -/* 04C9C 80975BEC AFBF003C */ sw $ra, 0x003C($sp) -/* 04CA0 80975BF0 AFB00038 */ sw $s0, 0x0038($sp) -/* 04CA4 80975BF4 AFA400B8 */ sw $a0, 0x00B8($sp) -/* 04CA8 80975BF8 AFA500BC */ sw $a1, 0x00BC($sp) -/* 04CAC 80975BFC 000FC080 */ sll $t8, $t7, 2 -/* 04CB0 80975C00 3C198016 */ lui $t9, %hi(gSegments) -/* 04CB4 80975C04 01A56821 */ addu $t5, $t5, $a1 -/* 04CB8 80975C08 8DAD1DE4 */ lw $t5, 0x1DE4($t5) ## 00011DE4 -/* 04CBC 80975C0C 0338C821 */ addu $t9, $t9, $t8 -/* 04CC0 80975C10 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 04CC4 80975C14 8F396FA8 */ lw $t9, %lo(gSegments)($t9) -/* 04CC8 80975C18 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 04CCC 80975C1C 00415824 */ and $t3, $v0, $at -/* 04CD0 80975C20 AFAD00A8 */ sw $t5, 0x00A8($sp) -/* 04CD4 80975C24 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 04CD8 80975C28 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 04CDC 80975C2C 032B1821 */ addu $v1, $t9, $t3 -/* 04CE0 80975C30 00611821 */ addu $v1, $v1, $at -/* 04CE4 80975C34 3C068097 */ lui $a2, %hi(D_80976B90) ## $a2 = 80970000 -/* 04CE8 80975C38 24C66B90 */ addiu $a2, $a2, %lo(D_80976B90) ## $a2 = 80976B90 -/* 04CEC 80975C3C AFA300AC */ sw $v1, 0x00AC($sp) -/* 04CF0 80975C40 27A40094 */ addiu $a0, $sp, 0x0094 ## $a0 = FFFFFFDC -/* 04CF4 80975C44 24070BB2 */ addiu $a3, $zero, 0x0BB2 ## $a3 = 00000BB2 -/* 04CF8 80975C48 0C031AB1 */ jal Graph_OpenDisps -/* 04CFC 80975C4C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 04D00 80975C50 3C0E8016 */ lui $t6, %hi(gSaveContext) -/* 04D04 80975C54 8DCEE660 */ lw $t6, %lo(gSaveContext)($t6) -/* 04D08 80975C58 24010400 */ addiu $at, $zero, 0x0400 ## $at = 00000400 -/* 04D0C 80975C5C 8FA300AC */ lw $v1, 0x00AC($sp) -/* 04D10 80975C60 15C10005 */ bne $t6, $at, .L80975C78 -/* 04D14 80975C64 8FAF00BC */ lw $t7, 0x00BC($sp) -/* 04D18 80975C68 95F81D74 */ lhu $t8, 0x1D74($t7) ## 00001D74 -/* 04D1C 80975C6C 2B010375 */ slti $at, $t8, 0x0375 -/* 04D20 80975C70 50200149 */ beql $at, $zero, .L80976198 -/* 04D24 80975C74 8FAF00BC */ lw $t7, 0x00BC($sp) -.L80975C78: -/* 04D28 80975C78 8FB900BC */ lw $t9, 0x00BC($sp) -/* 04D2C 80975C7C 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 -/* 04D30 80975C80 0C024F61 */ jal func_80093D84 -/* 04D34 80975C84 AFA300AC */ sw $v1, 0x00AC($sp) -/* 04D38 80975C88 8FA400B8 */ lw $a0, 0x00B8($sp) -/* 04D3C 80975C8C 8FA300AC */ lw $v1, 0x00AC($sp) -/* 04D40 80975C90 2405208D */ addiu $a1, $zero, 0x208D ## $a1 = 0000208D -/* 04D44 80975C94 908B0185 */ lbu $t3, 0x0185($a0) ## 00000185 -/* 04D48 80975C98 5960006A */ blezl $t3, .L80975E44 -/* 04D4C 80975C9C 908B0184 */ lbu $t3, 0x0184($a0) ## 00000184 -/* 04D50 80975CA0 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 04D54 80975CA4 AFA300AC */ sw $v1, 0x00AC($sp) -/* 04D58 80975CA8 0C034213 */ jal Matrix_Push -/* 04D5C 80975CAC 00000000 */ nop -/* 04D60 80975CB0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 04D64 80975CB4 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 04D68 80975CB8 3C018097 */ lui $at, %hi(D_80976D74) ## $at = 80970000 -/* 04D6C 80975CBC C42E6D74 */ lwc1 $f14, %lo(D_80976D74)($at) -/* 04D70 80975CC0 44066000 */ mfc1 $a2, $f12 -/* 04D74 80975CC4 0C0342A3 */ jal Matrix_Scale -/* 04D78 80975CC8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 04D7C 80975CCC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 04D80 80975CD0 8FA300AC */ lw $v1, 0x00AC($sp) -/* 04D84 80975CD4 3C0CDA38 */ lui $t4, 0xDA38 ## $t4 = DA380000 -/* 04D88 80975CD8 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 04D8C 80975CDC AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 04D90 80975CE0 358C0003 */ ori $t4, $t4, 0x0003 ## $t4 = DA380003 -/* 04D94 80975CE4 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 04D98 80975CE8 8FAE00BC */ lw $t6, 0x00BC($sp) -/* 04D9C 80975CEC 3C058097 */ lui $a1, %hi(D_80976BA4) ## $a1 = 80970000 -/* 04DA0 80975CF0 24A56BA4 */ addiu $a1, $a1, %lo(D_80976BA4) ## $a1 = 80976BA4 -/* 04DA4 80975CF4 8DC40000 */ lw $a0, 0x0000($t6) ## 00000000 -/* 04DA8 80975CF8 24060BC3 */ addiu $a2, $zero, 0x0BC3 ## $a2 = 00000BC3 -/* 04DAC 80975CFC AFA20090 */ sw $v0, 0x0090($sp) -/* 04DB0 80975D00 0C0346A2 */ jal Matrix_NewMtx -/* 04DB4 80975D04 AFA300AC */ sw $v1, 0x00AC($sp) -/* 04DB8 80975D08 8FA70090 */ lw $a3, 0x0090($sp) -/* 04DBC 80975D0C 8FA300AC */ lw $v1, 0x00AC($sp) -/* 04DC0 80975D10 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 -/* 04DC4 80975D14 ACE20004 */ sw $v0, 0x0004($a3) ## 00000004 -/* 04DC8 80975D18 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 04DCC 80975D1C 8FAA00A8 */ lw $t2, 0x00A8($sp) -/* 04DD0 80975D20 37180024 */ ori $t8, $t8, 0x0024 ## $t8 = DB060024 -/* 04DD4 80975D24 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 04DD8 80975D28 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 -/* 04DDC 80975D2C AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 04DE0 80975D30 8FB900BC */ lw $t9, 0x00BC($sp) -/* 04DE4 80975D34 000A5880 */ sll $t3, $t2, 2 -/* 04DE8 80975D38 316D00FF */ andi $t5, $t3, 0x00FF ## $t5 = 00000000 -/* 04DEC 80975D3C 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 -/* 04DF0 80975D40 240900FF */ addiu $t1, $zero, 0x00FF ## $t1 = 000000FF -/* 04DF4 80975D44 240C0040 */ addiu $t4, $zero, 0x0040 ## $t4 = 00000040 -/* 04DF8 80975D48 000AC040 */ sll $t8, $t2, 1 -/* 04DFC 80975D4C 331900FF */ andi $t9, $t8, 0x00FF ## $t9 = 00000024 -/* 04E00 80975D50 AFAC0010 */ sw $t4, 0x0010($sp) -/* 04E04 80975D54 012D3823 */ subu $a3, $t1, $t5 -/* 04E08 80975D58 240D0040 */ addiu $t5, $zero, 0x0040 ## $t5 = 00000040 -/* 04E0C 80975D5C 240C0020 */ addiu $t4, $zero, 0x0020 ## $t4 = 00000020 -/* 04E10 80975D60 01395823 */ subu $t3, $t1, $t9 -/* 04E14 80975D64 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 04E18 80975D68 240E0040 */ addiu $t6, $zero, 0x0040 ## $t6 = 00000040 -/* 04E1C 80975D6C AFAE0014 */ sw $t6, 0x0014($sp) -/* 04E20 80975D70 AFAF0018 */ sw $t7, 0x0018($sp) -/* 04E24 80975D74 AFAB0020 */ sw $t3, 0x0020($sp) -/* 04E28 80975D78 AFAC0028 */ sw $t4, 0x0028($sp) -/* 04E2C 80975D7C AFAD0024 */ sw $t5, 0x0024($sp) -/* 04E30 80975D80 AFA0001C */ sw $zero, 0x001C($sp) -/* 04E34 80975D84 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 04E38 80975D88 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 04E3C 80975D8C AFA300AC */ sw $v1, 0x00AC($sp) -/* 04E40 80975D90 0C0253D0 */ jal Gfx_TwoTexScroll -/* 04E44 80975D94 AFA2008C */ sw $v0, 0x008C($sp) -/* 04E48 80975D98 8FA8008C */ lw $t0, 0x008C($sp) -/* 04E4C 80975D9C 8FA300AC */ lw $v1, 0x00AC($sp) -/* 04E50 80975DA0 3C0FFA00 */ lui $t7, 0xFA00 ## $t7 = FA000000 -/* 04E54 80975DA4 AD020004 */ sw $v0, 0x0004($t0) ## 00000004 -/* 04E58 80975DA8 8FA400B8 */ lw $a0, 0x00B8($sp) -/* 04E5C 80975DAC 35EF8080 */ ori $t7, $t7, 0x8080 ## $t7 = FA008080 -/* 04E60 80975DB0 3C01B4FF */ lui $at, 0xB4FF ## $at = B4FF0000 -/* 04E64 80975DB4 90820185 */ lbu $v0, 0x0185($a0) ## 00000185 -/* 04E68 80975DB8 3421FF00 */ ori $at, $at, 0xFF00 ## $at = B4FFFF00 -/* 04E6C 80975DBC 3C0CFB00 */ lui $t4, 0xFB00 ## $t4 = FB000000 -/* 04E70 80975DC0 A06205FF */ sb $v0, 0x05FF($v1) ## 000005FF -/* 04E74 80975DC4 A06205EF */ sb $v0, 0x05EF($v1) ## 000005EF -/* 04E78 80975DC8 A06205DF */ sb $v0, 0x05DF($v1) ## 000005DF -/* 04E7C 80975DCC A06205CF */ sb $v0, 0x05CF($v1) ## 000005CF -/* 04E80 80975DD0 A062059F */ sb $v0, 0x059F($v1) ## 0000059F -/* 04E84 80975DD4 A062058F */ sb $v0, 0x058F($v1) ## 0000058F -/* 04E88 80975DD8 A062057F */ sb $v0, 0x057F($v1) ## 0000057F -/* 04E8C 80975DDC A062056F */ sb $v0, 0x056F($v1) ## 0000056F -/* 04E90 80975DE0 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 04E94 80975DE4 3C18DE00 */ lui $t8, 0xDE00 ## $t8 = DE000000 -/* 04E98 80975DE8 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 04E9C 80975DEC AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 -/* 04EA0 80975DF0 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 04EA4 80975DF4 90990185 */ lbu $t9, 0x0185($a0) ## 00000185 -/* 04EA8 80975DF8 3C0E00FF */ lui $t6, 0x00FF ## $t6 = 00FF0000 -/* 04EAC 80975DFC 35CE96FF */ ori $t6, $t6, 0x96FF ## $t6 = 00FF96FF -/* 04EB0 80975E00 03215825 */ or $t3, $t9, $at ## $t3 = B4FFFF00 -/* 04EB4 80975E04 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 04EB8 80975E08 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 04EBC 80975E0C 3C190600 */ lui $t9, 0x0600 ## $t9 = 06000000 -/* 04EC0 80975E10 27390840 */ addiu $t9, $t9, 0x0840 ## $t9 = 06000840 -/* 04EC4 80975E14 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 04EC8 80975E18 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 04ECC 80975E1C AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 04ED0 80975E20 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 04ED4 80975E24 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 04ED8 80975E28 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 04EDC 80975E2C AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 -/* 04EE0 80975E30 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 04EE4 80975E34 0C034221 */ jal Matrix_Pull -/* 04EE8 80975E38 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 04EEC 80975E3C 8FA400B8 */ lw $a0, 0x00B8($sp) -/* 04EF0 80975E40 908B0184 */ lbu $t3, 0x0184($a0) ## 00000184 -.L80975E44: -/* 04EF4 80975E44 516000D4 */ beql $t3, $zero, .L80976198 -/* 04EF8 80975E48 8FAF00BC */ lw $t7, 0x00BC($sp) -/* 04EFC 80975E4C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 04F00 80975E50 2405208C */ addiu $a1, $zero, 0x208C ## $a1 = 0000208C -/* 04F04 80975E54 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 04F08 80975E58 3C0CDA38 */ lui $t4, 0xDA38 ## $t4 = DA380000 -/* 04F0C 80975E5C 358C0003 */ ori $t4, $t4, 0x0003 ## $t4 = DA380003 -/* 04F10 80975E60 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 04F14 80975E64 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 04F18 80975E68 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 04F1C 80975E6C 8FAE00BC */ lw $t6, 0x00BC($sp) -/* 04F20 80975E70 3C058097 */ lui $a1, %hi(D_80976BB8) ## $a1 = 80970000 -/* 04F24 80975E74 24A56BB8 */ addiu $a1, $a1, %lo(D_80976BB8) ## $a1 = 80976BB8 -/* 04F28 80975E78 8DC40000 */ lw $a0, 0x0000($t6) ## 00000000 -/* 04F2C 80975E7C 24060BE2 */ addiu $a2, $zero, 0x0BE2 ## $a2 = 00000BE2 -/* 04F30 80975E80 0C0346A2 */ jal Matrix_NewMtx -/* 04F34 80975E84 AFA2007C */ sw $v0, 0x007C($sp) -/* 04F38 80975E88 8FA3007C */ lw $v1, 0x007C($sp) -/* 04F3C 80975E8C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 04F40 80975E90 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 04F44 80975E94 8FA400B8 */ lw $a0, 0x00B8($sp) -/* 04F48 80975E98 8FA500BC */ lw $a1, 0x00BC($sp) -/* 04F4C 80975E9C 908F0184 */ lbu $t7, 0x0184($a0) ## 00000184 -/* 04F50 80975EA0 29E100FA */ slti $at, $t7, 0x00FA -/* 04F54 80975EA4 10200060 */ beq $at, $zero, .L80976028 -/* 04F58 80975EA8 00000000 */ nop -/* 04F5C 80975EAC 0C00BB60 */ jal func_8002ED80 -/* 04F60 80975EB0 8FA500BC */ lw $a1, 0x00BC($sp) -/* 04F64 80975EB4 8FB800BC */ lw $t8, 0x00BC($sp) -/* 04F68 80975EB8 0C024F61 */ jal func_80093D84 -/* 04F6C 80975EBC 8F040000 */ lw $a0, 0x0000($t8) ## 00000000 -/* 04F70 80975EC0 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 04F74 80975EC4 3C0BE200 */ lui $t3, 0xE200 ## $t3 = E2000000 -/* 04F78 80975EC8 3C0D0C18 */ lui $t5, 0x0C18 ## $t5 = 0C180000 -/* 04F7C 80975ECC 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 04F80 80975ED0 AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0 -/* 04F84 80975ED4 35AD49D8 */ ori $t5, $t5, 0x49D8 ## $t5 = 0C1849D8 -/* 04F88 80975ED8 356B001C */ ori $t3, $t3, 0x001C ## $t3 = E200001C -/* 04F8C 80975EDC AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 04F90 80975EE0 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 04F94 80975EE4 8FAC00B8 */ lw $t4, 0x00B8($sp) -/* 04F98 80975EE8 3C018097 */ lui $at, %hi(D_80976D78) ## $at = 80970000 -/* 04F9C 80975EEC C4286D78 */ lwc1 $f8, %lo(D_80976D78)($at) -/* 04FA0 80975EF0 858E0188 */ lh $t6, 0x0188($t4) ## 00000188 -/* 04FA4 80975EF4 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 04FA8 80975EF8 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 04FAC 80975EFC 00000000 */ nop -/* 04FB0 80975F00 468021A0 */ cvt.s.w $f6, $f4 -/* 04FB4 80975F04 46083302 */ mul.s $f12, $f6, $f8 -/* 04FB8 80975F08 0C034348 */ jal Matrix_RotateY -/* 04FBC 80975F0C 00000000 */ nop -/* 04FC0 80975F10 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 04FC4 80975F14 3C18DA38 */ lui $t8, 0xDA38 ## $t8 = DA380000 -/* 04FC8 80975F18 37180003 */ ori $t8, $t8, 0x0003 ## $t8 = DA380003 -/* 04FCC 80975F1C 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 04FD0 80975F20 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 -/* 04FD4 80975F24 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 04FD8 80975F28 8FB900BC */ lw $t9, 0x00BC($sp) -/* 04FDC 80975F2C 3C058097 */ lui $a1, %hi(D_80976BCC) ## $a1 = 80970000 -/* 04FE0 80975F30 24A56BCC */ addiu $a1, $a1, %lo(D_80976BCC) ## $a1 = 80976BCC -/* 04FE4 80975F34 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 -/* 04FE8 80975F38 24060BED */ addiu $a2, $zero, 0x0BED ## $a2 = 00000BED -/* 04FEC 80975F3C 0C0346A2 */ jal Matrix_NewMtx -/* 04FF0 80975F40 AFA20074 */ sw $v0, 0x0074($sp) -/* 04FF4 80975F44 8FA30074 */ lw $v1, 0x0074($sp) -/* 04FF8 80975F48 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 -/* 04FFC 80975F4C 35AD0020 */ ori $t5, $t5, 0x0020 ## $t5 = DB060020 -/* 05000 80975F50 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 05004 80975F54 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 05008 80975F58 240E0020 */ addiu $t6, $zero, 0x0020 ## $t6 = 00000020 -/* 0500C 80975F5C 240F0010 */ addiu $t7, $zero, 0x0010 ## $t7 = 00000010 -/* 05010 80975F60 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 05014 80975F64 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 -/* 05018 80975F68 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 0501C 80975F6C 8FAC00BC */ lw $t4, 0x00BC($sp) -/* 05020 80975F70 240B0008 */ addiu $t3, $zero, 0x0008 ## $t3 = 00000008 -/* 05024 80975F74 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 05028 80975F78 8D840000 */ lw $a0, 0x0000($t4) ## 00000000 -/* 0502C 80975F7C 24190010 */ addiu $t9, $zero, 0x0010 ## $t9 = 00000010 -/* 05030 80975F80 AFB90024 */ sw $t9, 0x0024($sp) -/* 05034 80975F84 AFAB0028 */ sw $t3, 0x0028($sp) -/* 05038 80975F88 AFA00020 */ sw $zero, 0x0020($sp) -/* 0503C 80975F8C AFA0001C */ sw $zero, 0x001C($sp) -/* 05040 80975F90 AFB80018 */ sw $t8, 0x0018($sp) -/* 05044 80975F94 AFAF0014 */ sw $t7, 0x0014($sp) -/* 05048 80975F98 AFAE0010 */ sw $t6, 0x0010($sp) -/* 0504C 80975F9C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 05050 80975FA0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 05054 80975FA4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 05058 80975FA8 0C0253D0 */ jal Gfx_TwoTexScroll -/* 0505C 80975FAC AFA20070 */ sw $v0, 0x0070($sp) -/* 05060 80975FB0 8FA30070 */ lw $v1, 0x0070($sp) -/* 05064 80975FB4 3C0CFA00 */ lui $t4, 0xFA00 ## $t4 = FA000000 -/* 05068 80975FB8 358C8080 */ ori $t4, $t4, 0x8080 ## $t4 = FA008080 -/* 0506C 80975FBC AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 05070 80975FC0 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 05074 80975FC4 2401A000 */ addiu $at, $zero, 0xA000 ## $at = FFFFA000 -/* 05078 80975FC8 3C0FDE00 */ lui $t7, 0xDE00 ## $t7 = DE000000 -/* 0507C 80975FCC 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 05080 80975FD0 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 05084 80975FD4 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 05088 80975FD8 8FAE00B8 */ lw $t6, 0x00B8($sp) -/* 0508C 80975FDC 3C0CAA8C */ lui $t4, 0xAA8C ## $t4 = AA8C0000 -/* 05090 80975FE0 358C00FF */ ori $t4, $t4, 0x00FF ## $t4 = AA8C00FF -/* 05094 80975FE4 91D80184 */ lbu $t8, 0x0184($t6) ## 00000184 -/* 05098 80975FE8 3C0DFB00 */ lui $t5, 0xFB00 ## $t5 = FB000000 -/* 0509C 80975FEC 0301C825 */ or $t9, $t8, $at ## $t9 = FFFFA000 -/* 050A0 80975FF0 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 050A4 80975FF4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 050A8 80975FF8 3C180600 */ lui $t8, 0x0600 ## $t8 = 06000000 -/* 050AC 80975FFC 27180600 */ addiu $t8, $t8, 0x0600 ## $t8 = 06000600 -/* 050B0 80976000 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 050B4 80976004 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 -/* 050B8 80976008 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 050BC 8097600C AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 050C0 80976010 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 050C4 80976014 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 050C8 80976018 AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 -/* 050CC 8097601C AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 050D0 80976020 1000005C */ beq $zero, $zero, .L80976194 -/* 050D4 80976024 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -.L80976028: -/* 050D8 80976028 0C00BAF3 */ jal func_8002EBCC -/* 050DC 8097602C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 050E0 80976030 8FB900BC */ lw $t9, 0x00BC($sp) -/* 050E4 80976034 0C024F46 */ jal func_80093D18 -/* 050E8 80976038 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 -/* 050EC 8097603C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 050F0 80976040 3C0DE200 */ lui $t5, 0xE200 ## $t5 = E2000000 -/* 050F4 80976044 3C0C0C19 */ lui $t4, 0x0C19 ## $t4 = 0C190000 -/* 050F8 80976048 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 050FC 8097604C AE0B02C0 */ sw $t3, 0x02C0($s0) ## 000002C0 -/* 05100 80976050 358C2078 */ ori $t4, $t4, 0x2078 ## $t4 = 0C192078 -/* 05104 80976054 35AD001C */ ori $t5, $t5, 0x001C ## $t5 = E200001C -/* 05108 80976058 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 0510C 8097605C AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 05110 80976060 8FAE00B8 */ lw $t6, 0x00B8($sp) -/* 05114 80976064 3C018097 */ lui $at, %hi(D_80976D7C) ## $at = 80970000 -/* 05118 80976068 C4326D7C */ lwc1 $f18, %lo(D_80976D7C)($at) -/* 0511C 8097606C 85CF0188 */ lh $t7, 0x0188($t6) ## 00000188 -/* 05120 80976070 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 05124 80976074 448F5000 */ mtc1 $t7, $f10 ## $f10 = 0.00 -/* 05128 80976078 00000000 */ nop -/* 0512C 8097607C 46805420 */ cvt.s.w $f16, $f10 -/* 05130 80976080 46128302 */ mul.s $f12, $f16, $f18 -/* 05134 80976084 0C034348 */ jal Matrix_RotateY -/* 05138 80976088 00000000 */ nop -/* 0513C 8097608C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 05140 80976090 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 -/* 05144 80976094 37390003 */ ori $t9, $t9, 0x0003 ## $t9 = DA380003 -/* 05148 80976098 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 0514C 8097609C AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 -/* 05150 809760A0 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 05154 809760A4 8FAB00BC */ lw $t3, 0x00BC($sp) -/* 05158 809760A8 3C058097 */ lui $a1, %hi(D_80976BE0) ## $a1 = 80970000 -/* 0515C 809760AC 24A56BE0 */ addiu $a1, $a1, %lo(D_80976BE0) ## $a1 = 80976BE0 -/* 05160 809760B0 8D640000 */ lw $a0, 0x0000($t3) ## 00000000 -/* 05164 809760B4 24060C0D */ addiu $a2, $zero, 0x0C0D ## $a2 = 00000C0D -/* 05168 809760B8 0C0346A2 */ jal Matrix_NewMtx -/* 0516C 809760BC AFA2005C */ sw $v0, 0x005C($sp) -/* 05170 809760C0 8FA3005C */ lw $v1, 0x005C($sp) -/* 05174 809760C4 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 -/* 05178 809760C8 358C0020 */ ori $t4, $t4, 0x0020 ## $t4 = DB060020 -/* 0517C 809760CC AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 05180 809760D0 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 05184 809760D4 240F0020 */ addiu $t7, $zero, 0x0020 ## $t7 = 00000020 -/* 05188 809760D8 24180010 */ addiu $t8, $zero, 0x0010 ## $t8 = 00000010 -/* 0518C 809760DC 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 05190 809760E0 AE0D02C0 */ sw $t5, 0x02C0($s0) ## 000002C0 -/* 05194 809760E4 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 05198 809760E8 8FAE00BC */ lw $t6, 0x00BC($sp) -/* 0519C 809760EC 240D0008 */ addiu $t5, $zero, 0x0008 ## $t5 = 00000008 -/* 051A0 809760F0 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 051A4 809760F4 8DC40000 */ lw $a0, 0x0000($t6) ## 00000000 -/* 051A8 809760F8 240B0010 */ addiu $t3, $zero, 0x0010 ## $t3 = 00000010 -/* 051AC 809760FC AFAB0024 */ sw $t3, 0x0024($sp) -/* 051B0 80976100 AFAD0028 */ sw $t5, 0x0028($sp) -/* 051B4 80976104 AFA00020 */ sw $zero, 0x0020($sp) -/* 051B8 80976108 AFA0001C */ sw $zero, 0x001C($sp) -/* 051BC 8097610C AFB90018 */ sw $t9, 0x0018($sp) -/* 051C0 80976110 AFB80014 */ sw $t8, 0x0014($sp) -/* 051C4 80976114 AFAF0010 */ sw $t7, 0x0010($sp) -/* 051C8 80976118 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 051CC 8097611C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 051D0 80976120 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 051D4 80976124 0C0253D0 */ jal Gfx_TwoTexScroll -/* 051D8 80976128 AFA20058 */ sw $v0, 0x0058($sp) -/* 051DC 8097612C 8FA30058 */ lw $v1, 0x0058($sp) -/* 051E0 80976130 3C0EFA00 */ lui $t6, 0xFA00 ## $t6 = FA000000 -/* 051E4 80976134 35CE8080 */ ori $t6, $t6, 0x8080 ## $t6 = FA008080 -/* 051E8 80976138 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 051EC 8097613C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 051F0 80976140 240FA0FF */ addiu $t7, $zero, 0xA0FF ## $t7 = FFFFA0FF -/* 051F4 80976144 3C0BAA8C */ lui $t3, 0xAA8C ## $t3 = AA8C0000 -/* 051F8 80976148 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 051FC 8097614C AE0C02C0 */ sw $t4, 0x02C0($s0) ## 000002C0 -/* 05200 80976150 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 05204 80976154 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 05208 80976158 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 0520C 8097615C 356B00FF */ ori $t3, $t3, 0x00FF ## $t3 = AA8C00FF -/* 05210 80976160 3C19FB00 */ lui $t9, 0xFB00 ## $t9 = FB000000 -/* 05214 80976164 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 05218 80976168 AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 -/* 0521C 8097616C AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 05220 80976170 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 05224 80976174 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 05228 80976178 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 -/* 0522C 8097617C 25CE0600 */ addiu $t6, $t6, 0x0600 ## $t6 = 06000600 -/* 05230 80976180 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 05234 80976184 AE0D02C0 */ sw $t5, 0x02C0($s0) ## 000002C0 -/* 05238 80976188 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 -/* 0523C 8097618C AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 05240 80976190 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -.L80976194: -/* 05244 80976194 8FAF00BC */ lw $t7, 0x00BC($sp) -.L80976198: -/* 05248 80976198 3C068097 */ lui $a2, %hi(D_80976BF4) ## $a2 = 80970000 -/* 0524C 8097619C 24C66BF4 */ addiu $a2, $a2, %lo(D_80976BF4) ## $a2 = 80976BF4 -/* 05250 809761A0 27A40094 */ addiu $a0, $sp, 0x0094 ## $a0 = FFFFFFDC -/* 05254 809761A4 24070C28 */ addiu $a3, $zero, 0x0C28 ## $a3 = 00000C28 -/* 05258 809761A8 0C031AD5 */ jal Graph_CloseDisps -/* 0525C 809761AC 8DE50000 */ lw $a1, 0x0000($t7) ## FFFFA0FF -/* 05260 809761B0 8FBF003C */ lw $ra, 0x003C($sp) -/* 05264 809761B4 8FB00038 */ lw $s0, 0x0038($sp) -/* 05268 809761B8 27BD00B8 */ addiu $sp, $sp, 0x00B8 ## $sp = 00000000 -/* 0526C 809761BC 03E00008 */ jr $ra -/* 05270 809761C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809761C4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809761C4.s deleted file mode 100644 index b7bd6ce700..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809761C4.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_809761C4 -/* 05274 809761C4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 05278 809761C8 AFBF001C */ sw $ra, 0x001C($sp) -/* 0527C 809761CC AFB10018 */ sw $s1, 0x0018($sp) -/* 05280 809761D0 AFB00014 */ sw $s0, 0x0014($sp) -/* 05284 809761D4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 05288 809761D8 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 0528C 809761DC 0C25D1AD */ jal func_809746B4 -/* 05290 809761E0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 05294 809761E4 14400016 */ bne $v0, $zero, .L80976240 -/* 05298 809761E8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0529C 809761EC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 052A0 809761F0 0C25D1AD */ jal func_809746B4 -/* 052A4 809761F4 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 052A8 809761F8 54400012 */ bnel $v0, $zero, .L80976244 -/* 052AC 809761FC 8FBF001C */ lw $ra, 0x001C($sp) -/* 052B0 80976200 920E0185 */ lbu $t6, 0x0185($s0) ## 00000185 -/* 052B4 80976204 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 052B8 80976208 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 052BC 8097620C 15C00003 */ bne $t6, $zero, .L8097621C -/* 052C0 80976210 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 052C4 80976214 1000000A */ beq $zero, $zero, .L80976240 -/* 052C8 80976218 A20F0185 */ sb $t7, 0x0185($s0) ## 00000185 -.L8097621C: -/* 052CC 8097621C 0C00BAF3 */ jal func_8002EBCC -/* 052D0 80976220 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 052D4 80976224 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 052D8 80976228 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 052DC 8097622C 0C00BB60 */ jal func_8002ED80 -/* 052E0 80976230 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 052E4 80976234 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 052E8 80976238 0C01A528 */ jal func_800694A0 -/* 052EC 8097623C 92050186 */ lbu $a1, 0x0186($s0) ## 00000186 -.L80976240: -/* 052F0 80976240 8FBF001C */ lw $ra, 0x001C($sp) -.L80976244: -/* 052F4 80976244 8FB00014 */ lw $s0, 0x0014($sp) -/* 052F8 80976248 8FB10018 */ lw $s1, 0x0018($sp) -/* 052FC 8097624C 03E00008 */ jr $ra -/* 05300 80976250 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80976254.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80976254.s deleted file mode 100644 index 3a0a45b68e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80976254.s +++ /dev/null @@ -1,120 +0,0 @@ -.rdata -glabel D_80976C08 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976C1C - .asciz "../z_demo_effect.c" - .balign 4 - -.text -glabel func_80976254 -/* 05304 80976254 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 05308 80976258 AFBF003C */ sw $ra, 0x003C($sp) -/* 0530C 8097625C AFB00038 */ sw $s0, 0x0038($sp) -/* 05310 80976260 AFA5007C */ sw $a1, 0x007C($sp) -/* 05314 80976264 AFA60080 */ sw $a2, 0x0080($sp) -/* 05318 80976268 AFA70084 */ sw $a3, 0x0084($sp) -/* 0531C 8097626C 3C090001 */ lui $t1, 0x0001 ## $t1 = 00010000 -/* 05320 80976270 01244821 */ addu $t1, $t1, $a0 -/* 05324 80976274 8D291DE4 */ lw $t1, 0x1DE4($t1) ## 00011DE4 -/* 05328 80976278 8C850000 */ lw $a1, 0x0000($a0) ## 00000000 -/* 0532C 8097627C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 05330 80976280 3C068097 */ lui $a2, %hi(D_80976C08) ## $a2 = 80970000 -/* 05334 80976284 24C66C08 */ addiu $a2, $a2, %lo(D_80976C08) ## $a2 = 80976C08 -/* 05338 80976288 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE0 -/* 0533C 8097628C 24070C52 */ addiu $a3, $zero, 0x0C52 ## $a3 = 00000C52 -/* 05340 80976290 AFA9006C */ sw $t1, 0x006C($sp) -/* 05344 80976294 0C031AB1 */ jal Graph_OpenDisps -/* 05348 80976298 AFA50068 */ sw $a1, 0x0068($sp) -/* 0534C 8097629C 0C024F61 */ jal func_80093D84 -/* 05350 809762A0 8E040000 */ lw $a0, 0x0000($s0) ## 00000000 -/* 05354 809762A4 8FA80068 */ lw $t0, 0x0068($sp) -/* 05358 809762A8 8FA9006C */ lw $t1, 0x006C($sp) -/* 0535C 809762AC 3C0FFA00 */ lui $t7, 0xFA00 ## $t7 = FA000000 -/* 05360 809762B0 8D0202D0 */ lw $v0, 0x02D0($t0) ## 000002D0 -/* 05364 809762B4 3C18AAFF */ lui $t8, 0xAAFF ## $t8 = AAFF0000 -/* 05368 809762B8 3718FFFF */ ori $t8, $t8, 0xFFFF ## $t8 = AAFFFFFF -/* 0536C 809762BC 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 05370 809762C0 AD0E02D0 */ sw $t6, 0x02D0($t0) ## 000002D0 -/* 05374 809762C4 35EF0080 */ ori $t7, $t7, 0x0080 ## $t7 = FA000080 -/* 05378 809762C8 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 0537C 809762CC AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 05380 809762D0 8D0202D0 */ lw $v0, 0x02D0($t0) ## 000002D0 -/* 05384 809762D4 8FA40084 */ lw $a0, 0x0084($sp) -/* 05388 809762D8 3C0AFB00 */ lui $t2, 0xFB00 ## $t2 = FB000000 -/* 0538C 809762DC 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 05390 809762E0 AD1902D0 */ sw $t9, 0x02D0($t0) ## 000002D0 -/* 05394 809762E4 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 05398 809762E8 908C017D */ lbu $t4, 0x017D($a0) ## 0000017D -/* 0539C 809762EC 908F017B */ lbu $t7, 0x017B($a0) ## 0000017B -/* 053A0 809762F0 908B017C */ lbu $t3, 0x017C($a0) ## 0000017C -/* 053A4 809762F4 000C6A00 */ sll $t5, $t4, 8 -/* 053A8 809762F8 000FC600 */ sll $t8, $t7, 24 -/* 053AC 809762FC 01B8C825 */ or $t9, $t5, $t8 ## $t9 = AAFFFFFF -/* 053B0 80976300 000B6400 */ sll $t4, $t3, 16 -/* 053B4 80976304 032C7025 */ or $t6, $t9, $t4 ## $t6 = AAFFFFFF -/* 053B8 80976308 35CF00FF */ ori $t7, $t6, 0x00FF ## $t7 = AAFFFFFF -/* 053BC 8097630C AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 053C0 80976310 8D0202D0 */ lw $v0, 0x02D0($t0) ## 000002D0 -/* 053C4 80976314 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 -/* 053C8 80976318 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 -/* 053CC 8097631C 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 053D0 80976320 AD0D02D0 */ sw $t5, 0x02D0($t0) ## 000002D0 -/* 053D4 80976324 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 053D8 80976328 8E040000 */ lw $a0, 0x0000($s0) ## 00000000 -/* 053DC 8097632C 00095100 */ sll $t2, $t1, 4 -/* 053E0 80976330 314B00FF */ andi $t3, $t2, 0x00FF ## $t3 = 00000000 -/* 053E4 80976334 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 053E8 80976338 00095080 */ sll $t2, $t1, 2 -/* 053EC 8097633C 032B3823 */ subu $a3, $t9, $t3 -/* 053F0 80976340 01495023 */ subu $t2, $t2, $t1 -/* 053F4 80976344 000A5080 */ sll $t2, $t2, 2 -/* 053F8 80976348 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 053FC 8097634C 240E0040 */ addiu $t6, $zero, 0x0040 ## $t6 = 00000040 -/* 05400 80976350 240C0100 */ addiu $t4, $zero, 0x0100 ## $t4 = 00000100 -/* 05404 80976354 00093080 */ sll $a2, $t1, 2 -/* 05408 80976358 AFAC0010 */ sw $t4, 0x0010($sp) -/* 0540C 8097635C AFAE0014 */ sw $t6, 0x0014($sp) -/* 05410 80976360 AFAF0018 */ sw $t7, 0x0018($sp) -/* 05414 80976364 3159007F */ andi $t9, $t2, 0x007F ## $t9 = 00000000 -/* 05418 80976368 240B007F */ addiu $t3, $zero, 0x007F ## $t3 = 0000007F -/* 0541C 8097636C 00C93023 */ subu $a2, $a2, $t1 -/* 05420 80976370 00096880 */ sll $t5, $t1, 2 -/* 05424 80976374 31B801FF */ andi $t8, $t5, 0x01FF ## $t8 = 00000008 -/* 05428 80976378 00063040 */ sll $a2, $a2, 1 -/* 0542C 8097637C 01796023 */ subu $t4, $t3, $t9 -/* 05430 80976380 240F0020 */ addiu $t7, $zero, 0x0020 ## $t7 = 00000020 -/* 05434 80976384 240E0080 */ addiu $t6, $zero, 0x0080 ## $t6 = 00000080 -/* 05438 80976388 AFAE0024 */ sw $t6, 0x0024($sp) -/* 0543C 8097638C AFAF0028 */ sw $t7, 0x0028($sp) -/* 05440 80976390 AFAC0020 */ sw $t4, 0x0020($sp) -/* 05444 80976394 30C603FF */ andi $a2, $a2, 0x03FF ## $a2 = 00000000 -/* 05448 80976398 AFB8001C */ sw $t8, 0x001C($sp) -/* 0544C 8097639C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 05450 809763A0 0C0253D0 */ jal Gfx_TwoTexScroll -/* 05454 809763A4 AFA2004C */ sw $v0, 0x004C($sp) -/* 05458 809763A8 8FA3004C */ lw $v1, 0x004C($sp) -/* 0545C 809763AC 3C068097 */ lui $a2, %hi(D_80976C1C) ## $a2 = 80970000 -/* 05460 809763B0 24C66C1C */ addiu $a2, $a2, %lo(D_80976C1C) ## $a2 = 80976C1C -/* 05464 809763B4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 05468 809763B8 8E050000 */ lw $a1, 0x0000($s0) ## 00000000 -/* 0546C 809763BC 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE0 -/* 05470 809763C0 0C031AD5 */ jal Graph_CloseDisps -/* 05474 809763C4 24070C64 */ addiu $a3, $zero, 0x0C64 ## $a3 = 00000C64 -/* 05478 809763C8 8FAD0080 */ lw $t5, 0x0080($sp) -/* 0547C 809763CC 8FB8007C */ lw $t8, 0x007C($sp) -/* 05480 809763D0 55A00008 */ bnel $t5, $zero, .L809763F4 -/* 05484 809763D4 8FBF003C */ lw $ra, 0x003C($sp) -/* 05488 809763D8 8F02001C */ lw $v0, 0x001C($t8) ## 0000001C -/* 0548C 809763DC 24030400 */ addiu $v1, $zero, 0x0400 ## $v1 = 00000400 -/* 05490 809763E0 A4430000 */ sh $v1, 0x0000($v0) ## 00000000 -/* 05494 809763E4 844A0000 */ lh $t2, 0x0000($v0) ## 00000000 -/* 05498 809763E8 A4430002 */ sh $v1, 0x0002($v0) ## 00000002 -/* 0549C 809763EC A44A0004 */ sh $t2, 0x0004($v0) ## 00000004 -/* 054A0 809763F0 8FBF003C */ lw $ra, 0x003C($sp) -.L809763F4: -/* 054A4 809763F4 8FB00038 */ lw $s0, 0x0038($sp) -/* 054A8 809763F8 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 -/* 054AC 809763FC 03E00008 */ jr $ra -/* 054B0 80976400 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80976404.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80976404.s deleted file mode 100644 index f873b7b18d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80976404.s +++ /dev/null @@ -1,75 +0,0 @@ -.rdata -glabel D_80976C30 - .asciz "../z_demo_effect.c" - .balign 4 - -glabel D_80976C44 - .asciz "../z_demo_effect.c" - .balign 4 - -.text -glabel func_80976404 -/* 054B4 80976404 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 054B8 80976408 AFBF002C */ sw $ra, 0x002C($sp) -/* 054BC 8097640C AFB00028 */ sw $s0, 0x0028($sp) -/* 054C0 80976410 AFA40058 */ sw $a0, 0x0058($sp) -/* 054C4 80976414 AFA5005C */ sw $a1, 0x005C($sp) -/* 054C8 80976418 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 054CC 8097641C 24010018 */ addiu $at, $zero, 0x0018 ## $at = 00000018 -/* 054D0 80976420 8CB00000 */ lw $s0, 0x0000($a1) ## 00000000 -/* 054D4 80976424 304200FF */ andi $v0, $v0, 0x00FF ## $v0 = 00000000 -/* 054D8 80976428 1041000F */ beq $v0, $at, .L80976468 -/* 054DC 8097642C 24010019 */ addiu $at, $zero, 0x0019 ## $at = 00000019 -/* 054E0 80976430 1041000D */ beq $v0, $at, .L80976468 -/* 054E4 80976434 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 054E8 80976438 0C01B129 */ jal Flags_GetEnv -/* 054EC 8097643C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 054F0 80976440 14400009 */ bne $v0, $zero, .L80976468 -/* 054F4 80976444 3C028016 */ lui $v0, %hi(gSaveContext) -/* 054F8 80976448 2442E660 */ addiu $v0, %lo(gSaveContext) -/* 054FC 8097644C 8C581360 */ lw $t8, 0x1360($v0) ## 8015F9C0 -/* 05500 80976450 2B010004 */ slti $at, $t8, 0x0004 -/* 05504 80976454 10200004 */ beq $at, $zero, .L80976468 -/* 05508 80976458 00000000 */ nop -/* 0550C 8097645C 8C590000 */ lw $t9, 0x0000($v0) ## 8015E660 -/* 05510 80976460 24010324 */ addiu $at, $zero, 0x0324 ## $at = 00000324 -/* 05514 80976464 17210020 */ bne $t9, $at, .L809764E8 -.L80976468: -/* 05518 80976468 3C068097 */ lui $a2, %hi(D_80976C30) ## $a2 = 80970000 -/* 0551C 8097646C 24C66C30 */ addiu $a2, $a2, %lo(D_80976C30) ## $a2 = 80976C30 -/* 05520 80976470 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE0 -/* 05524 80976474 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 05528 80976478 0C031AB1 */ jal Graph_OpenDisps -/* 0552C 8097647C 24070C81 */ addiu $a3, $zero, 0x0C81 ## $a3 = 00000C81 -/* 05530 80976480 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 -/* 05534 80976484 0C024DDD */ jal Gfx_CallSetupDL -/* 05538 80976488 24050019 */ addiu $a1, $zero, 0x0019 ## $a1 = 00000019 -/* 0553C 8097648C 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 05540 80976490 44816000 */ mtc1 $at, $f12 ## $f12 = 2.00 -/* 05544 80976494 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 -/* 05548 80976498 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0554C 8097649C 44066000 */ mfc1 $a2, $f12 -/* 05550 809764A0 0C0342A3 */ jal Matrix_Scale -/* 05554 809764A4 46006386 */ mov.s $f14, $f12 -/* 05558 809764A8 8FA40058 */ lw $a0, 0x0058($sp) -/* 0555C 809764AC 3C078097 */ lui $a3, %hi(func_80976254) ## $a3 = 80970000 -/* 05560 809764B0 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 05564 809764B4 AFA80014 */ sw $t0, 0x0014($sp) -/* 05568 809764B8 24E76254 */ addiu $a3, $a3, %lo(func_80976254) ## $a3 = 80976254 -/* 0556C 809764BC 8FA5005C */ lw $a1, 0x005C($sp) -/* 05570 809764C0 AFA00010 */ sw $zero, 0x0010($sp) -/* 05574 809764C4 2486014C */ addiu $a2, $a0, 0x014C ## $a2 = 0000014C -/* 05578 809764C8 0C01B3DB */ jal SkelCurve_Draw -/* 0557C 809764CC AFA40018 */ sw $a0, 0x0018($sp) -/* 05580 809764D0 3C068097 */ lui $a2, %hi(D_80976C44) ## $a2 = 80970000 -/* 05584 809764D4 24C66C44 */ addiu $a2, $a2, %lo(D_80976C44) ## $a2 = 80976C44 -/* 05588 809764D8 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE0 -/* 0558C 809764DC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 05590 809764E0 0C031AD5 */ jal Graph_CloseDisps -/* 05594 809764E4 24070C90 */ addiu $a3, $zero, 0x0C90 ## $a3 = 00000C90 -.L809764E8: -/* 05598 809764E8 8FBF002C */ lw $ra, 0x002C($sp) -/* 0559C 809764EC 8FB00028 */ lw $s0, 0x0028($sp) -/* 055A0 809764F0 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 055A4 809764F4 03E00008 */ jr $ra -/* 055A8 809764F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809764FC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809764FC.s deleted file mode 100644 index e4975ffb27..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809764FC.s +++ /dev/null @@ -1,53 +0,0 @@ -.late_rodata -glabel D_80976D80 - .float 10430.378 - -glabel D_80976D84 - .float 10430.378 - -.text -glabel func_809764FC -/* 055AC 809764FC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 055B0 80976500 AFA5002C */ sw $a1, 0x002C($sp) -/* 055B4 80976504 C7A6002C */ lwc1 $f6, 0x002C($sp) -/* 055B8 80976508 C7A40038 */ lwc1 $f4, 0x0038($sp) -/* 055BC 8097650C AFA70034 */ sw $a3, 0x0034($sp) -/* 055C0 80976510 C7AA0034 */ lwc1 $f10, 0x0034($sp) -/* 055C4 80976514 46062301 */ sub.s $f12, $f4, $f6 -/* 055C8 80976518 C7A80040 */ lwc1 $f8, 0x0040($sp) -/* 055CC 8097651C AFBF0014 */ sw $ra, 0x0014($sp) -/* 055D0 80976520 AFA40028 */ sw $a0, 0x0028($sp) -/* 055D4 80976524 460A4381 */ sub.s $f14, $f8, $f10 -/* 055D8 80976528 460C6402 */ mul.s $f16, $f12, $f12 -/* 055DC 8097652C AFA60030 */ sw $a2, 0x0030($sp) -/* 055E0 80976530 460E7482 */ mul.s $f18, $f14, $f14 -/* 055E4 80976534 46128000 */ add.s $f0, $f16, $f18 -/* 055E8 80976538 46000004 */ sqrt.s $f0, $f0 -/* 055EC 8097653C 0C03F494 */ jal Math_atan2f -/* 055F0 80976540 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 055F4 80976544 3C018097 */ lui $at, %hi(D_80976D80) ## $at = 80970000 -/* 055F8 80976548 C4246D80 */ lwc1 $f4, %lo(D_80976D80)($at) -/* 055FC 8097654C 8FB80028 */ lw $t8, 0x0028($sp) -/* 05600 80976550 46040182 */ mul.s $f6, $f0, $f4 -/* 05604 80976554 4600320D */ trunc.w.s $f8, $f6 -/* 05608 80976558 440F4000 */ mfc1 $t7, $f8 -/* 0560C 8097655C 00000000 */ nop -/* 05610 80976560 A70F00B6 */ sh $t7, 0x00B6($t8) ## 000000B6 -/* 05614 80976564 C7B00030 */ lwc1 $f16, 0x0030($sp) -/* 05618 80976568 C7AA003C */ lwc1 $f10, 0x003C($sp) -/* 0561C 8097656C C7AE0018 */ lwc1 $f14, 0x0018($sp) -/* 05620 80976570 46105301 */ sub.s $f12, $f10, $f16 -/* 05624 80976574 0C03F494 */ jal Math_atan2f -/* 05628 80976578 46006307 */ neg.s $f12, $f12 -/* 0562C 8097657C 3C018097 */ lui $at, %hi(D_80976D84) ## $at = 80970000 -/* 05630 80976580 C4326D84 */ lwc1 $f18, %lo(D_80976D84)($at) -/* 05634 80976584 8FA90028 */ lw $t1, 0x0028($sp) -/* 05638 80976588 46120102 */ mul.s $f4, $f0, $f18 -/* 0563C 8097658C 4600218D */ trunc.w.s $f6, $f4 -/* 05640 80976590 44083000 */ mfc1 $t0, $f6 -/* 05644 80976594 00000000 */ nop -/* 05648 80976598 A52800B4 */ sh $t0, 0x00B4($t1) ## 000000B4 -/* 0564C 8097659C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 05650 809765A0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 05654 809765A4 03E00008 */ jr $ra -/* 05658 809765A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809765AC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809765AC.s deleted file mode 100644 index b4e943f751..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809765AC.s +++ /dev/null @@ -1,90 +0,0 @@ -glabel func_809765AC -/* 0565C 809765AC 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 05660 809765B0 00067880 */ sll $t7, $a2, 2 -/* 05664 809765B4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 05668 809765B8 AFA40048 */ sw $a0, 0x0048($sp) -/* 0566C 809765BC AFA5004C */ sw $a1, 0x004C($sp) -/* 05670 809765C0 AFA70054 */ sw $a3, 0x0054($sp) -/* 05674 809765C4 00AF1021 */ addu $v0, $a1, $t7 -/* 05678 809765C8 8C581D8C */ lw $t8, 0x1D8C($v0) ## 00001D8C -/* 0567C 809765CC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 05680 809765D0 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 05684 809765D4 8F19000C */ lw $t9, 0x000C($t8) ## 0000000C -/* 05688 809765D8 44992000 */ mtc1 $t9, $f4 ## $f4 = 0.00 -/* 0568C 809765DC 00000000 */ nop -/* 05690 809765E0 468021A0 */ cvt.s.w $f6, $f4 -/* 05694 809765E4 E7A6003C */ swc1 $f6, 0x003C($sp) -/* 05698 809765E8 8C481D8C */ lw $t0, 0x1D8C($v0) ## 00001D8C -/* 0569C 809765EC 8D090010 */ lw $t1, 0x0010($t0) ## 00000010 -/* 056A0 809765F0 44894000 */ mtc1 $t1, $f8 ## $f8 = 0.00 -/* 056A4 809765F4 00000000 */ nop -/* 056A8 809765F8 468042A0 */ cvt.s.w $f10, $f8 -/* 056AC 809765FC E7AA0040 */ swc1 $f10, 0x0040($sp) -/* 056B0 80976600 8C4A1D8C */ lw $t2, 0x1D8C($v0) ## 00001D8C -/* 056B4 80976604 8D4B0014 */ lw $t3, 0x0014($t2) ## 00000014 -/* 056B8 80976608 448B8000 */ mtc1 $t3, $f16 ## $f16 = 0.00 -/* 056BC 8097660C 00000000 */ nop -/* 056C0 80976610 468084A0 */ cvt.s.w $f18, $f16 -/* 056C4 80976614 E7B20044 */ swc1 $f18, 0x0044($sp) -/* 056C8 80976618 8C4C1D8C */ lw $t4, 0x1D8C($v0) ## 00001D8C -/* 056CC 8097661C 8D8D0018 */ lw $t5, 0x0018($t4) ## 00000018 -/* 056D0 80976620 448D2000 */ mtc1 $t5, $f4 ## $f4 = 0.00 -/* 056D4 80976624 00000000 */ nop -/* 056D8 80976628 468021A0 */ cvt.s.w $f6, $f4 -/* 056DC 8097662C E7A60030 */ swc1 $f6, 0x0030($sp) -/* 056E0 80976630 8C4F1D8C */ lw $t7, 0x1D8C($v0) ## 00001D8C -/* 056E4 80976634 8DF8001C */ lw $t8, 0x001C($t7) ## 0000001C -/* 056E8 80976638 44984000 */ mtc1 $t8, $f8 ## $f8 = 0.00 -/* 056EC 8097663C 00000000 */ nop -/* 056F0 80976640 468042A0 */ cvt.s.w $f10, $f8 -/* 056F4 80976644 E7AA0034 */ swc1 $f10, 0x0034($sp) -/* 056F8 80976648 8C591D8C */ lw $t9, 0x1D8C($v0) ## 00001D8C -/* 056FC 8097664C 8F280020 */ lw $t0, 0x0020($t9) ## 00000020 -/* 05700 80976650 44888000 */ mtc1 $t0, $f16 ## $f16 = 0.00 -/* 05704 80976654 00000000 */ nop -/* 05708 80976658 468084A0 */ cvt.s.w $f18, $f16 -/* 0570C 8097665C 0C25C3D6 */ jal func_80970F58 -/* 05710 80976660 E7B20038 */ swc1 $f18, 0x0038($sp) -/* 05714 80976664 C7A40030 */ lwc1 $f4, 0x0030($sp) -/* 05718 80976668 C7A6003C */ lwc1 $f6, 0x003C($sp) -/* 0571C 8097666C 8FA40048 */ lw $a0, 0x0048($sp) -/* 05720 80976670 27AA003C */ addiu $t2, $sp, 0x003C ## $t2 = FFFFFFF4 -/* 05724 80976674 46062201 */ sub.s $f8, $f4, $f6 -/* 05728 80976678 46004282 */ mul.s $f10, $f8, $f0 -/* 0572C 8097667C 46065400 */ add.s $f16, $f10, $f6 -/* 05730 80976680 E4900024 */ swc1 $f16, 0x0024($a0) ## 00000024 -/* 05734 80976684 C7A40040 */ lwc1 $f4, 0x0040($sp) -/* 05738 80976688 C7B20034 */ lwc1 $f18, 0x0034($sp) -/* 0573C 8097668C 46049201 */ sub.s $f8, $f18, $f4 -/* 05740 80976690 46004282 */ mul.s $f10, $f8, $f0 -/* 05744 80976694 46045180 */ add.s $f6, $f10, $f4 -/* 05748 80976698 E4860028 */ swc1 $f6, 0x0028($a0) ## 00000028 -/* 0574C 8097669C C7B20044 */ lwc1 $f18, 0x0044($sp) -/* 05750 809766A0 C7B00038 */ lwc1 $f16, 0x0038($sp) -/* 05754 809766A4 46128201 */ sub.s $f8, $f16, $f18 -/* 05758 809766A8 46004282 */ mul.s $f10, $f8, $f0 -/* 0575C 809766AC 46125100 */ add.s $f4, $f10, $f18 -/* 05760 809766B0 E484002C */ swc1 $f4, 0x002C($a0) ## 0000002C -/* 05764 809766B4 8FA90054 */ lw $t1, 0x0054($sp) -/* 05768 809766B8 51200011 */ beql $t1, $zero, .L80976700 -/* 0576C 809766BC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 05770 809766C0 8D4C0000 */ lw $t4, 0x0000($t2) ## FFFFFFF4 -/* 05774 809766C4 27AD0030 */ addiu $t5, $sp, 0x0030 ## $t5 = FFFFFFE8 -/* 05778 809766C8 AFAC0004 */ sw $t4, 0x0004($sp) -/* 0577C 809766CC 8D460004 */ lw $a2, 0x0004($t2) ## FFFFFFF8 -/* 05780 809766D0 8FA50004 */ lw $a1, 0x0004($sp) -/* 05784 809766D4 AFA60008 */ sw $a2, 0x0008($sp) -/* 05788 809766D8 8D470008 */ lw $a3, 0x0008($t2) ## FFFFFFFC -/* 0578C 809766DC AFA7000C */ sw $a3, 0x000C($sp) -/* 05790 809766E0 8DB80000 */ lw $t8, 0x0000($t5) ## FFFFFFE8 -/* 05794 809766E4 AFB80010 */ sw $t8, 0x0010($sp) -/* 05798 809766E8 8DAF0004 */ lw $t7, 0x0004($t5) ## FFFFFFEC -/* 0579C 809766EC AFAF0014 */ sw $t7, 0x0014($sp) -/* 057A0 809766F0 8DB80008 */ lw $t8, 0x0008($t5) ## FFFFFFF0 -/* 057A4 809766F4 0C25D93F */ jal func_809764FC -/* 057A8 809766F8 AFB80018 */ sw $t8, 0x0018($sp) -/* 057AC 809766FC 8FBF0024 */ lw $ra, 0x0024($sp) -.L80976700: -/* 057B0 80976700 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 057B4 80976704 03E00008 */ jr $ra -/* 057B8 80976708 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097670C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097670C.s deleted file mode 100644 index 87be75b47f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097670C.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_8097670C -/* 057BC 8097670C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 057C0 80976710 0006C080 */ sll $t8, $a2, 2 -/* 057C4 80976714 AFBF001C */ sw $ra, 0x001C($sp) -/* 057C8 80976718 AFA40030 */ sw $a0, 0x0030($sp) -/* 057CC 8097671C AFA50034 */ sw $a1, 0x0034($sp) -/* 057D0 80976720 AFA60038 */ sw $a2, 0x0038($sp) -/* 057D4 80976724 00B81021 */ addu $v0, $a1, $t8 -/* 057D8 80976728 8C591D8C */ lw $t9, 0x1D8C($v0) ## 00001D8C -/* 057DC 8097672C 27AD0024 */ addiu $t5, $sp, 0x0024 ## $t5 = FFFFFFF4 -/* 057E0 80976730 44876000 */ mtc1 $a3, $f12 ## $f12 = 0.00 -/* 057E4 80976734 8F280018 */ lw $t0, 0x0018($t9) ## 00000018 -/* 057E8 80976738 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 057EC 8097673C 44882000 */ mtc1 $t0, $f4 ## $f4 = 0.00 -/* 057F0 80976740 00000000 */ nop -/* 057F4 80976744 468021A0 */ cvt.s.w $f6, $f4 -/* 057F8 80976748 E7A60024 */ swc1 $f6, 0x0024($sp) -/* 057FC 8097674C 8C491D8C */ lw $t1, 0x1D8C($v0) ## 00001D8C -/* 05800 80976750 8D2A001C */ lw $t2, 0x001C($t1) ## 0000001C -/* 05804 80976754 448A4000 */ mtc1 $t2, $f8 ## $f8 = 0.00 -/* 05808 80976758 00000000 */ nop -/* 0580C 8097675C 468042A0 */ cvt.s.w $f10, $f8 -/* 05810 80976760 E7AA0028 */ swc1 $f10, 0x0028($sp) -/* 05814 80976764 8C4B1D8C */ lw $t3, 0x1D8C($v0) ## 00001D8C -/* 05818 80976768 8D6C0020 */ lw $t4, 0x0020($t3) ## 00000020 -/* 0581C 8097676C 448C8000 */ mtc1 $t4, $f16 ## $f16 = 0.00 -/* 05820 80976770 00000000 */ nop -/* 05824 80976774 468084A0 */ cvt.s.w $f18, $f16 -/* 05828 80976778 E7B2002C */ swc1 $f18, 0x002C($sp) -/* 0582C 8097677C 8DAE0000 */ lw $t6, 0x0000($t5) ## FFFFFFF4 -/* 05830 80976780 AFAE0000 */ sw $t6, 0x0000($sp) -/* 05834 80976784 8DA50004 */ lw $a1, 0x0004($t5) ## FFFFFFF8 -/* 05838 80976788 8FA40000 */ lw $a0, 0x0000($sp) -/* 0583C 8097678C AFA50004 */ sw $a1, 0x0004($sp) -/* 05840 80976790 8DA60008 */ lw $a2, 0x0008($t5) ## FFFFFFFC -/* 05844 80976794 E7AC0010 */ swc1 $f12, 0x0010($sp) -/* 05848 80976798 0C25CCF2 */ jal func_809733C8 -/* 0584C 8097679C AFA60008 */ sw $a2, 0x0008($sp) -/* 05850 809767A0 8FBF001C */ lw $ra, 0x001C($sp) -/* 05854 809767A4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 05858 809767A8 03E00008 */ jr $ra -/* 0585C 809767AC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809767B0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809767B0.s deleted file mode 100644 index 1131644654..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809767B0.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_809767B0 -/* 05860 809767B0 00067080 */ sll $t6, $a2, 2 -/* 05864 809767B4 00AE7821 */ addu $t7, $a1, $t6 -/* 05868 809767B8 8DE21D8C */ lw $v0, 0x1D8C($t7) ## 00001D8C -/* 0586C 809767BC 8C58000C */ lw $t8, 0x000C($v0) ## 0000000C -/* 05870 809767C0 8C590010 */ lw $t9, 0x0010($v0) ## 00000010 -/* 05874 809767C4 8C480014 */ lw $t0, 0x0014($v0) ## 00000014 -/* 05878 809767C8 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 0587C 809767CC 44993000 */ mtc1 $t9, $f6 ## $f6 = 0.00 -/* 05880 809767D0 44884000 */ mtc1 $t0, $f8 ## $f8 = 0.00 -/* 05884 809767D4 46802020 */ cvt.s.w $f0, $f4 -/* 05888 809767D8 468030A0 */ cvt.s.w $f2, $f6 -/* 0588C 809767DC E4800024 */ swc1 $f0, 0x0024($a0) ## 00000024 -/* 05890 809767E0 46804320 */ cvt.s.w $f12, $f8 -/* 05894 809767E4 E4820028 */ swc1 $f2, 0x0028($a0) ## 00000028 -/* 05898 809767E8 03E00008 */ jr $ra -/* 0589C 809767EC E48C002C */ swc1 $f12, 0x002C($a0) ## 0000002C diff --git a/data/overlays/actors/z_demo_effect.data.s b/data/overlays/actors/z_demo_effect.data.s deleted file mode 100644 index a9a8b02c09..0000000000 --- a/data/overlays/actors/z_demo_effect.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 Demo_Effect_InitVars - .word 0x008B0100, 0x00000030, 0x00010000, 0x000001A0 -.word DemoEffect_Init -.word DemoEffect_Destroy -.word DemoEffect_Update -.word 0x00000000 -glabel D_80976810 - .word 0x00000000 -glabel D_80976814 - .word 0x008E008F, 0x00010091, 0x00930093, 0x00930094, 0x009500BA, 0x00BA00BA, 0x00BA00BA, 0x00BA00A8, 0x00940094, 0x000100AD, 0x00AD00AD, 0x00AD0158, 0x00A800A8 -glabel D_80976848 - .byte 0x01 -glabel D_80976849 - .byte 0x01, 0x02, 0x00, 0x01, 0x01, 0x02, 0x00, 0x01, 0x02, 0x00, 0x02, 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00 -glabel D_80976860 - .word 0xFFFFFF64, 0xFF00FFFF, 0xFFC80096, 0xFFFFFF00, 0x64FF0000, 0x00000000, 0xDF000000, 0x00000000 - diff --git a/data/overlays/actors/z_demo_effect.reloc.s b/data/overlays/actors/z_demo_effect.reloc.s deleted file mode 100644 index 6efd357cea..0000000000 --- a/data/overlays/actors/z_demo_effect.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_80976D90 - .incbin "baserom/ovl_Demo_Effect", 0x5E40, 0x00000600 diff --git a/include/functions.h b/include/functions.h index 7ce5813bd2..87ac77906a 100644 --- a/include/functions.h +++ b/include/functions.h @@ -893,7 +893,7 @@ s32 Flags_GetEnv(GlobalContext* globalCtx, s16 flag); f32 func_8006C5A8(f32 target, TransformData* transData, s32 refIdx); void SkelCurve_Clear(SkelAnimeCurve* skelCurve); s32 SkelCurve_Init(GlobalContext* globalCtx, SkelAnimeCurve* skelCurve, SkelCurveLimbList* limbListSeg, - TransformData* transData); + TransformUpdateIndex* transUpdIdx); void SkelCurve_Destroy(GlobalContext* globalCtx, SkelAnimeCurve* skelCurve); void SkelCurve_SetAnim(SkelAnimeCurve* skelCurve, TransformUpdateIndex* transUpdIdx, f32 arg2, f32 animFinalFrame, f32 animCurFrame, f32 animSpeed); diff --git a/spec b/spec index fd56795a55..61a84a4b8a 100644 --- a/spec +++ b/spec @@ -1506,8 +1506,7 @@ endseg beginseg name "ovl_Demo_Effect" include "build/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.o" - include "build/data/overlays/actors/z_demo_effect.data.o" - include "build/data/overlays/actors/z_demo_effect.reloc.o" + include "build/src/overlays/actors/ovl_Demo_Effect/ovl_Demo_Effect_reloc.o" endseg beginseg diff --git a/src/code/z_fcurve_data_skelanime.c b/src/code/z_fcurve_data_skelanime.c index 92073b01c7..24c31d92dc 100644 --- a/src/code/z_fcurve_data_skelanime.c +++ b/src/code/z_fcurve_data_skelanime.c @@ -12,7 +12,7 @@ void SkelCurve_Clear(SkelAnimeCurve* skelCurve) { } s32 SkelCurve_Init(GlobalContext* globalCtx, SkelAnimeCurve* skelCurve, SkelCurveLimbList* limbListSeg, - TransformData* transData) { + TransformUpdateIndex* transUpdIdx) { SkelCurveLimb** limbs; SkelCurveLimbList* limbList = SEGMENTED_TO_VIRTUAL(limbListSeg); diff --git a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c index e4093eb13d..a5f8e88aa0 100644 --- a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c +++ b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c @@ -1,4 +1,5 @@ #include "z_demo_effect.h" +#include "vt.h" #define FLAGS 0x00000030 @@ -8,7 +9,74 @@ void DemoEffect_Init(Actor* thisx, GlobalContext* globalCtx); void DemoEffect_Destroy(Actor* thisx, GlobalContext* globalCtx); void DemoEffect_Update(Actor* thisx, GlobalContext* globalCtx); -/* +void DemoEffect_DrawCrystalLight(Actor* thisx, GlobalContext* globalCtx); +void DemoEffect_DrawFireBall(Actor* thisx, GlobalContext* globalCtx); +void DemoEffect_DrawBlueOrb(Actor* thisx, GlobalContext* globalCtx); +void DemoEffect_DrawLgtShower(Actor* thisx, GlobalContext* globalCtx); +void DemoEffect_DrawGodLgt(Actor* thisx, GlobalContext* globalCtx); +void DemoEffect_DrawLightRing(Actor* thisx, GlobalContext* globalCtx); +void DemoEffect_DrawTriforceSpot(Actor* thisx, GlobalContext* globalCtx); +void DemoEffect_DrawGetItem(Actor* thisx, GlobalContext* globalCtx); +void DemoEffect_DrawLightEffect(Actor* thisx, GlobalContext* globalCtx); +void DemoEffect_DrawTimeWarp(Actor* thisx, GlobalContext* globalCtx); +void DemoEffect_DrawJewel(Actor* thisx, GlobalContext* globalCtx); + +void DemoEffect_Wait(DemoEffect* this, GlobalContext* globalCtx); +void DemoEffect_InitTimeWarp(DemoEffect* this, GlobalContext* globalCtx); +void DemoEffect_InitTimeWarpTimeblock(DemoEffect* this, GlobalContext* globalCtx); +void DemoEffect_InitCreationFireball(DemoEffect* this, GlobalContext* globalCtx); +void DemoEffect_InitJewel(GlobalContext* globalCtx, DemoEffect* this); +void DemoEffect_InitJewelColor(DemoEffect* this); + +void DemoEffect_UpdateCrystalLight(DemoEffect* this, GlobalContext* globalCtx); +void DemoEffect_UpdatePositionToParent(DemoEffect* this, GlobalContext* globalCtx); +void DemoEffect_UpdateBlueOrbGrow(DemoEffect* this, GlobalContext* globalCtx); +void DemoEffect_UpdateBlueOrbShrink(DemoEffect* this, GlobalContext* globalCtx); +void DemoEffect_UpdateLgtShower(DemoEffect* this, GlobalContext* globalCtx); +void DemoEffect_UpdateGodLgtDin(DemoEffect* this, GlobalContext* globalCtx); +void DemoEffect_UpdateGodLgtNayru(DemoEffect* this, GlobalContext* globalCtx); +void DemoEffect_UpdateGodLgtFarore(DemoEffect* this, GlobalContext* globalCtx); +void DemoEffect_UpdateLightRingExpanding(DemoEffect* this, GlobalContext* globalCtx); +void DemoEffect_UpdateTriforceSpot(DemoEffect* this, GlobalContext* globalCtx); +void DemoEffect_UpdateGetItem(DemoEffect* this, GlobalContext* globalCtx); +void DemoEffect_UpdateLightRingShrinking(DemoEffect* this, GlobalContext* globalCtx); +void DemoEffect_UpdateLightRingTriforce(DemoEffect* this, GlobalContext* globalCtx); +void DemoEffect_UpdateLightEffect(DemoEffect* this, GlobalContext* globalCtx); +void DemoEffect_UpdateJewelChild(DemoEffect* this, GlobalContext* globalCtx); +void DemoEffect_UpdateJewelAdult(DemoEffect* this, GlobalContext* globalCtx); +void DemoEffect_UpdateDust(DemoEffect* this, GlobalContext* globalCtx); +void DemoEffect_UpdateCreationFireball(DemoEffect* this, GlobalContext* globalCtx); +void DemoEffect_UpdateTimeWarpReturnFromChamberOfSages(DemoEffect* this, GlobalContext* globalCtx); +void DemoEffect_UpdateTimeWarpPullMasterSword(DemoEffect* this, GlobalContext* globalCtx); +void DemoEffect_UpdateTimeWarpTimeblock(DemoEffect* this, GlobalContext* globalCtx); + +s32 DemoEffect_CheckCsAction(DemoEffect* this, GlobalContext* globalCtx, s32 csActionCompareId); +void DemoEffect_InitPositionFromCsAction(DemoEffect* this, GlobalContext* globalCtx, s32 csActionIndex); +void DemoEffect_MoveToCsEndpoint(DemoEffect* this, GlobalContext* globalCtx, s32 csActionId, s32 shouldUpdateFacing); +void DemoEffect_MoveGetItem(DemoEffect* this, GlobalContext* globalCtx, s32 csActionId, f32 speed); + +extern Gfx D_04010130[]; // lightBall + +extern Gfx D_06001240[]; // kokiriJewel +extern Gfx D_060010E0[]; // kokiriJewelHolder +extern Gfx D_060020A0[]; // goronJewel +extern Gfx D_06001FB0[]; // goronJewelHolder +extern Gfx D_06003530[]; // zoraJewel +extern Gfx D_06003370[]; // zoraJewelHolder +extern Gfx D_06000040[]; // fireBall +extern Gfx D_06000190[]; // lightRing +extern Gfx D_06000330[]; // godLgtTrail +extern Gfx D_06003C50[]; // godLgt +extern Gfx D_06000600[]; // triforceSpot +extern Gfx D_06000840[]; // triforceLightColumn +extern Gfx D_06000980[]; // crystalLight +extern Gfx D_060011D0[]; // lgtShower +extern Vtx D_06000000[]; // triforceLightColumnVertices +extern Vtx D_06000060[]; // timewarpVertices + +extern TransformUpdateIndex D_06000050; // timewarpTransformUpdateIndex +extern SkelCurveLimbList D_060012E8; // timewarpLimbList + const ActorInit Demo_Effect_InitVars = { ACTOR_DEMO_EFFECT, ACTORTYPE_BG, @@ -20,121 +88,2079 @@ const ActorInit Demo_Effect_InitVars = { (ActorFunc)DemoEffect_Update, NULL, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80970F50.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80970F58.s") +// This variable assures only one jewel will play SFX +static s16 sSfxJewelId[] = { 0 }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80970FB4.s") +// The object used by the effectType +static s16 sEffectTypeObjects[] = { + /* 0x00 */ OBJECT_EFC_CRYSTAL_LIGHT, + /* 0x01 */ OBJECT_EFC_FIRE_BALL, + /* 0x02 */ OBJECT_GAMEPLAY_KEEP, + /* 0x03 */ OBJECT_EFC_LGT_SHOWER, + /* 0x04 */ OBJECT_GOD_LGT, + /* 0x05 */ OBJECT_GOD_LGT, + /* 0x06 */ OBJECT_GOD_LGT, + /* 0x07 */ OBJECT_LIGHT_RING, + /* 0x08 */ OBJECT_TRIFORCE_SPOT, + /* 0x09 */ OBJECT_GI_MEDAL, + /* 0x0A */ OBJECT_GI_MEDAL, + /* 0x0B */ OBJECT_GI_MEDAL, + /* 0x0C */ OBJECT_GI_MEDAL, + /* 0x0D */ OBJECT_GI_MEDAL, + /* 0x0E */ OBJECT_GI_MEDAL, + /* 0x0F */ OBJECT_EFC_TW, + /* 0x10 */ OBJECT_LIGHT_RING, + /* 0x11 */ OBJECT_LIGHT_RING, + /* 0x12 */ OBJECT_GAMEPLAY_KEEP, + /* 0x13 */ OBJECT_GI_JEWEL, + /* 0x14 */ OBJECT_GI_JEWEL, + /* 0x15 */ OBJECT_GI_JEWEL, + /* 0x16 */ OBJECT_GI_JEWEL, + /* 0x17 */ OBJECT_GI_M_ARROW, + /* 0x18 */ OBJECT_EFC_TW, + /* 0x19 */ OBJECT_EFC_TW, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971070.s") +static u8 sTimewarpVertexSizeIndices[] = { 1, 1, 2, 0, 1, 1, 2, 0, 1, 2, 0, 2, 1, 0, 1, 0, 2, 0, 2, 2, 0 }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/DemoEffect_Init.s") +Color_RGB8 sJewelSparkleColors[5][2] = { + { { 255, 255, 255 }, { 100, 255, 0 } }, { { 255, 255, 255 }, { 200, 0, 150 } }, + { { 255, 255, 255 }, { 0, 100, 255 } }, { { 0, 0, 0 }, { 0, 0, 0 } }, + { { 223, 0, 0 }, { 0, 0, 0 } }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/DemoEffect_Destroy.s") +/** + * Sets up the update function. + */ +void DemoEffect_SetupUpdate(DemoEffect* this, DemoEffectFunc updateFunc) { + this->updateFunc = updateFunc; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971960.s") +/** + * Gives a number on the range of 0.0f - 1.0f representing current cutscene action completion percentage. + */ +f32 DemoEffect_InterpolateCsFrames(GlobalContext* globalCtx, s32 csActionId) { + f32 interpolated = func_8006F93C(globalCtx->csCtx.npcActions[csActionId]->endFrame, + globalCtx->csCtx.npcActions[csActionId]->startFrame, globalCtx->csCtx.frames); + if (interpolated > 1.0f) { + interpolated = 1.0f; + } + return interpolated; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809719C0.s") +/** + * Initializes information for Jewel/Spritual Stone actors. + */ +void DemoEffect_InitJewel(GlobalContext* globalCtx, DemoEffect* this) { + this->initDrawFunc = DemoEffect_DrawJewel; + if (LINK_IS_CHILD) { + this->initUpdateFunc = DemoEffect_UpdateJewelChild; + } else { + this->initUpdateFunc = DemoEffect_UpdateJewelAdult; + } + if (globalCtx->sceneNum == SCENE_TOKINOMA) { + Actor_SetScale(&this->actor, 0.35f); + } else { + Actor_SetScale(&this->actor, 0.10f); + } + this->csActionId = 1; + this->actor.shape.rot.x = 16384; + DemoEffect_InitJewelColor(this); + this->jewel.alpha = 0; + this->jewelCsRotation.x = this->jewelCsRotation.y = this->jewelCsRotation.z = 0; + sSfxJewelId[0] = 0; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809719F0.s") +/** + * Initializes information for Get Item actors. + * These are the Medal and Light Arrow actors. + */ +void DemoEffect_InitGetItem(DemoEffect* this) { + this->getItem.isPositionInit = 0; + this->getItem.isLoaded = 0; + this->initDrawFunc = DemoEffect_DrawGetItem; + this->initUpdateFunc = DemoEffect_UpdateGetItem; + Actor_SetScale(&this->actor, 0.25f); + this->csActionId = 6; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971A28.s") +/** + * Main Actor Init function + */ +void DemoEffect_Init(Actor* thisx, GlobalContext* globalCtx) { + GlobalContext* globalCtx2 = globalCtx; + DemoEffect* this = THIS; + s32 effectType; + s32 lightEffect; + s32 objectIndex; + DemoEffect* crystalLight; + DemoEffect* lightRing; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971BBC.s") + effectType = (this->actor.params & 0x00FF); + lightEffect = ((this->actor.params & 0xF000) >> 12); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971DFC.s") + osSyncPrintf(VT_FGCOL(CYAN) " no = %d\n" VT_RST, effectType); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972008.s") + objectIndex = sEffectTypeObjects[effectType] == OBJECT_GAMEPLAY_KEEP + ? 0 + : Object_GetIndex(&globalCtx->objectCtx, sEffectTypeObjects[effectType]); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809720AC.s") + osSyncPrintf(VT_FGCOL(CYAN) " bank_ID = %d\n" VT_RST, objectIndex); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809721D0.s") + if (objectIndex < 0) { + __assert("0", "../z_demo_effect.c", 723); + } else { + this->initObjectBankIndex = objectIndex; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972288.s") + this->effectFlags = 0; + Actor_SetScale(&this->actor, 0.2f); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972344.s") + switch (effectType) { + case DEMO_EFFECT_CRYSTAL_LIGHT: + this->initDrawFunc = DemoEffect_DrawCrystalLight; + this->initUpdateFunc = DemoEffect_UpdateCrystalLight; + break; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809723C4.s") + case DEMO_EFFECT_FIRE_BALL: + this->initDrawFunc = DemoEffect_DrawFireBall; + this->initUpdateFunc = DemoEffect_UpdatePositionToParent; + Actor_SetScale(&this->actor, 0.1f); + break; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809726AC.s") + case DEMO_EFFECT_BLUE_ORB: + this->initDrawFunc = DemoEffect_DrawBlueOrb; + this->initUpdateFunc = DemoEffect_UpdateBlueOrbGrow; + this->blueOrb.alpha = 255; + this->blueOrb.scale = 5; + this->blueOrb.rotation = 0; + Actor_SetScale(&this->actor, 0.05f); + this->primXluColor[0] = 188; + this->primXluColor[1] = 255; + this->primXluColor[2] = 255; + this->envXluColor[1] = 100; + this->envXluColor[2] = 255; + this->envXluColor[0] = 0; + break; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097273C.s") + case DEMO_EFFECT_LIGHT: + this->initDrawFunc = DemoEffect_DrawLightEffect; + this->initUpdateFunc = DemoEffect_UpdateLightEffect; + this->light.alpha = 255; + this->light.scaleFlag = 0; + this->light.flicker = 0; + this->light.rotation = 0; + switch (lightEffect) { + case DEMO_EFFECT_LIGHT_RED: + this->primXluColor[0] = 255; + this->primXluColor[1] = 255; + this->primXluColor[2] = 255; + this->envXluColor[1] = 50; + this->envXluColor[0] = 255; + this->envXluColor[2] = 0; + break; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809727B0.s") + case DEMO_EFFECT_LIGHT_BLUE: + this->primXluColor[0] = 255; + this->primXluColor[1] = 255; + this->primXluColor[2] = 255; + this->envXluColor[1] = 150; + this->envXluColor[0] = 0; + this->envXluColor[2] = 255; + break; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972868.s") + case DEMO_EFFECT_LIGHT_GREEN: + this->primXluColor[0] = 255; + this->primXluColor[1] = 255; + this->primXluColor[2] = 255; + this->envXluColor[1] = 200; + this->envXluColor[0] = 0; + this->envXluColor[2] = 0; + break; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809729B8.s") + case DEMO_EFFECT_LIGHT_ORANGE: + this->primXluColor[0] = 255; + this->primXluColor[1] = 255; + this->primXluColor[2] = 255; + this->envXluColor[1] = 150; + this->envXluColor[0] = 255; + this->envXluColor[2] = 0; + break; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972A04.s") + case DEMO_EFFECT_LIGHT_YELLOW: + this->primXluColor[0] = 255; + this->primXluColor[1] = 255; + this->primXluColor[2] = 255; + this->envXluColor[0] = 200; + this->envXluColor[1] = 255; + this->envXluColor[2] = 0; + break; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972A6C.s") + case DEMO_EFFECT_LIGHT_PURPLE: + this->primXluColor[0] = 255; + this->primXluColor[1] = 255; + this->primXluColor[2] = 255; + // clang-format off + this->envXluColor[0] = 200; this->envXluColor[1] = 50; this->envXluColor[2] = 255; // Sameline prevents reordering + // clang-format on + break; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972B4C.s") + case DEMO_EFFECT_LIGHT_GREEN2: + this->primXluColor[0] = 255; + this->primXluColor[1] = 255; + this->primXluColor[2] = 255; + this->envXluColor[1] = 200; + this->envXluColor[0] = 0; + this->envXluColor[2] = 0; + break; + } + this->csActionId = 7; + Actor_SetScale(thisx, 0.0f); + break; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972E3C.s") + case DEMO_EFFECT_LGT_SHOWER: + this->lgtShower.alpha = 255; + this->initDrawFunc = DemoEffect_DrawLgtShower; + this->initUpdateFunc = DemoEffect_UpdateLgtShower; + break; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80972EA8.s") + case DEMO_EFFECT_GOD_LGT_DIN: + Actor_SetScale(&this->actor, 0.1f); + this->initDrawFunc = DemoEffect_DrawGodLgt; + this->primXluColor[1] = 170; + this->primXluColor[0] = 255; + this->primXluColor[2] = 255; + this->envXluColor[0] = 255; + this->envXluColor[2] = 255; + this->envXluColor[1] = 0; + this->godLgt.type = GOD_LGT_DIN; + this->godLgt.rotation = 0; + this->initUpdateFunc = DemoEffect_UpdateGodLgtDin; + this->csActionId = 0; + break; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097303C.s") + case DEMO_EFFECT_GOD_LGT_NAYRU: + if (gSaveContext.entranceIndex == 0x013D) { + Actor_SetScale(&this->actor, 1.0f); + } else { + Actor_SetScale(&this->actor, 0.1f); + } + this->initDrawFunc = DemoEffect_DrawGodLgt; + this->primXluColor[0] = 170; + this->primXluColor[1] = 255; + this->primXluColor[2] = 255; + this->envXluColor[1] = 40; + this->envXluColor[2] = 255; + this->envXluColor[0] = 0; + this->godLgt.type = GOD_LGT_NAYRU; + this->godLgt.lightRingSpawnDelay = 4; + this->godLgt.rotation = 0; + this->godLgt.lightRingSpawnTimer = 0; + this->initUpdateFunc = DemoEffect_UpdateGodLgtNayru; + this->csActionId = 1; + break; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097322C.s") + case DEMO_EFFECT_GOD_LGT_FARORE: + if (gSaveContext.entranceIndex == 0x00EE) { + Actor_SetScale(&this->actor, 2.4f); + } else { + Actor_SetScale(&this->actor, 0.1f); + } + this->initDrawFunc = DemoEffect_DrawGodLgt; + this->primXluColor[0] = 170; + this->primXluColor[2] = 170; + this->primXluColor[1] = 255; + this->envXluColor[1] = 200; + this->envXluColor[0] = 0; + this->envXluColor[2] = 0; + this->godLgt.type = GOD_LGT_FARORE; + this->godLgt.rotation = 0; + this->initUpdateFunc = DemoEffect_UpdateGodLgtFarore; + this->csActionId = 2; + break; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809733C8.s") + case DEMO_EFFECT_LIGHTRING_EXPANDING: + this->initDrawFunc = DemoEffect_DrawLightRing; + this->initUpdateFunc = DemoEffect_UpdateLightRingExpanding; + this->lightRing.timer = 20; + this->lightRing.timerIncrement = 4; + this->lightRing.alpha = 255; + break; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80973424.s") + case DEMO_EFFECT_LIGHTRING_TRIFORCE: + this->initDrawFunc = DemoEffect_DrawLightRing; + this->initUpdateFunc = DemoEffect_UpdateLightRingTriforce; + this->lightRing.timer = 20; + this->lightRing.timerIncrement = 4; + this->lightRing.alpha = 0; + this->csActionId = 4; + break; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80973524.s") + case DEMO_EFFECT_LIGHTRING_SHRINKING: + this->initDrawFunc = DemoEffect_DrawLightRing; + this->initUpdateFunc = DemoEffect_UpdateLightRingShrinking; + this->lightRing.timer = 351; + this->lightRing.timerIncrement = 2; + this->lightRing.alpha = 0; + break; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80973CA0.s") + case DEMO_EFFECT_TRIFORCE_SPOT: + this->initDrawFunc = DemoEffect_DrawTriforceSpot; + this->initUpdateFunc = DemoEffect_UpdateTriforceSpot; + this->triforceSpot.crystalLightOpacity = 0; + this->triforceSpot.lightColumnOpacity = 0; + this->triforceSpot.triforceSpotOpacity = 0; + this->triforceSpot.rotation = 0; + this->primXluColor[0] = 0; + this->csActionId = 3; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80973CFC.s") + Actor_SetScale(&this->actor, 0.020f); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80973EE0.s") + crystalLight = (DemoEffect*)Actor_SpawnAsChild( + &globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DEMO_EFFECT, this->actor.posRot.pos.x, + this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, 0, 0, DEMO_EFFECT_CRYSTAL_LIGHT); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097414C.s") + if (crystalLight != NULL) { + Actor_SetScale(&crystalLight->actor, 0.6f); + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809742B0.s") + lightRing = (DemoEffect*)Actor_SpawnAsChild( + &globalCtx2->actorCtx, &crystalLight->actor, globalCtx2, ACTOR_DEMO_EFFECT, this->actor.posRot.pos.x, + this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, 0, 0, DEMO_EFFECT_LIGHTRING_TRIFORCE); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974314.s") + if (lightRing != NULL) { + Actor_SetScale(&lightRing->actor, 0.4f); + } + break; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974358.s") + case DEMO_EFFECT_MEDAL_FIRE: + DemoEffect_InitGetItem(this); + this->getItem.giIndex = 12; + break; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097456C.s") + case DEMO_EFFECT_MEDAL_WATER: + DemoEffect_InitGetItem(this); + this->getItem.giIndex = 13; + break; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/DemoEffect_Update.s") + case DEMO_EFFECT_MEDAL_FOREST: + DemoEffect_InitGetItem(this); + this->getItem.giIndex = 11; + break; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809746B4.s") + case DEMO_EFFECT_MEDAL_SPIRIT: + DemoEffect_InitGetItem(this); + this->getItem.giIndex = 14; + break; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809746F8.s") + case DEMO_EFFECT_MEDAL_SHADOW: + DemoEffect_InitGetItem(this); + this->getItem.giIndex = 15; + break; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974B80.s") + case DEMO_EFFECT_MEDAL_LIGHT: + DemoEffect_InitGetItem(this); + this->getItem.giIndex = 16; + break; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974EB4.s") + case DEMO_EFFECT_LIGHTARROW: + DemoEffect_InitGetItem(this); + this->getItem.giIndex = 97; + break; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975074.s") + case DEMO_EFFECT_TIMEWARP_TIMEBLOCK_LARGE: + case DEMO_EFFECT_TIMEWARP_TIMEBLOCK_SMALL: + this->actor.flags |= 0x2000000; + case DEMO_EFFECT_TIMEWARP_MASTERSWORD: + this->initDrawFunc = DemoEffect_DrawTimeWarp; + this->initUpdateFunc = DemoEffect_InitTimeWarp; + this->envXluColor[0] = 0; + this->envXluColor[1] = 100; + this->envXluColor[2] = 255; + SkelCurve_Clear(&this->skelCurve); + this->timeWarp.shrinkTimer = 0; + break; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975494.s") + case DEMO_EFFECT_JEWEL_KOKIRI: + this->jewelDisplayList = D_06001240; + this->jewelHolderDisplayList = D_060010E0; + this->jewel.type = DEMO_EFFECT_JEWEL_KOKIRI; + this->jewel.isPositionInit = 0; + DemoEffect_InitJewel(globalCtx, this); + break; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097571C.s") + case DEMO_EFFECT_JEWEL_GORON: + this->jewelDisplayList = D_060020A0; + this->jewelHolderDisplayList = D_06001FB0; + this->jewel.type = DEMO_EFFECT_JEWEL_GORON; + this->jewel.isPositionInit = 0; + DemoEffect_InitJewel(globalCtx, this); + break; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097587C.s") + case DEMO_EFFECT_JEWEL_ZORA: + this->jewelDisplayList = D_06003530; + this->jewelHolderDisplayList = D_06003370; + this->jewel.type = DEMO_EFFECT_JEWEL_ZORA; + this->jewel.isPositionInit = 0; + DemoEffect_InitJewel(globalCtx, this); + Actor_ChangeType(globalCtx, &globalCtx->actorCtx, &this->actor, ACTOR_EN_DOOR); + if ((globalCtx->sceneNum == SCENE_BDAN) && (gSaveContext.infTable[20] & 0x20)) { + Actor_Kill(&this->actor); + return; + } + break; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975A3C.s") + case DEMO_EFFECT_DUST: + this->initDrawFunc = NULL; + this->initUpdateFunc = DemoEffect_UpdateDust; + this->dust.timer = 0; + this->csActionId = 2; + break; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975BD4.s") + default: + __assert("0", "../z_demo_effect.c", 1062); + break; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809761C4.s") + ActorShape_Init(&thisx->shape, 0.0f, NULL, 0.0f); + DemoEffect_SetupUpdate(this, DemoEffect_Wait); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80976254.s") +/** + * Main Actor Destroy function + */ +void DemoEffect_Destroy(Actor* thisx, GlobalContext* globalCtx) { + DemoEffect* this = THIS; + s32 effectType = (this->actor.params & 0x00FF); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80976404.s") + if (effectType == DEMO_EFFECT_TIMEWARP_MASTERSWORD || effectType == DEMO_EFFECT_TIMEWARP_TIMEBLOCK_LARGE || + effectType == DEMO_EFFECT_TIMEWARP_TIMEBLOCK_SMALL) { + SkelCurve_Destroy(globalCtx, &this->skelCurve); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809764FC.s") +/** + * This update function waits until the associate object is loaded. + * Once the object is loaded, it will copy over the initUpdateFunc/initDrawFunc funcs to be active. + * They are copied to actor.draw and updateFunc. + * initUpdateFunc/initDrawFunc are set during initialization and are NOT executed. + */ +void DemoEffect_Wait(DemoEffect* this, GlobalContext* globalCtx) { + if (Object_IsLoaded(&globalCtx->objectCtx, this->initObjectBankIndex)) { + this->actor.objBankIndex = this->initObjectBankIndex; + this->actor.draw = this->initDrawFunc; + this->updateFunc = this->initUpdateFunc; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809765AC.s") + osSyncPrintf(VT_FGCOL(CYAN) " 転送終了 move_wait " VT_RST); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097670C.s") +/** + * Copies the current Actor's position to the parent Actor's position. + */ +void DemoEffect_UpdatePositionToParent(DemoEffect* this, GlobalContext* globalCtx) { + if (this->actor.parent != NULL) { + // Struct copy affects regalloc + this->actor.posRot.pos.x = this->actor.parent->posRot.pos.x; + this->actor.posRot.pos.y = this->actor.parent->posRot.pos.y; + this->actor.posRot.pos.z = this->actor.parent->posRot.pos.z; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809767B0.s") +/** + * Update function for the Crystal Light actor. + * The Crystal Light actor is the three beams of light under the Triforce that converge on it. + * The Crystal Light's position is set to the parent Actor (Triforce) each frame. + * If the Crystal Light has no parent Actor, then it will raise into the sky. + */ +void DemoEffect_UpdateCrystalLight(DemoEffect* this, GlobalContext* globalCtx) { + DemoEffect_UpdatePositionToParent(this, globalCtx); + this->actor.posRot.pos.y += 14.0f; +} + +/** + * Spawns sparkle effects for Medals + */ +void DemoEffect_MedalSparkle(DemoEffect* this, GlobalContext* globalCtx, s32 isSmallSpawner) { + Vec3f velocity; + Vec3f accel; + Vec3f pos; + Color_RGBA8 primColor; + Color_RGBA8 envColor; + + if (isSmallSpawner != 1 || (globalCtx->gameplayFrames & 1) == 0) { + primColor.r = 255; + primColor.g = 255; + primColor.b = 255; + envColor.r = 255; + envColor.g = 255; + envColor.b = 100; + primColor.a = 0; + + velocity.y = 0.0f; + + accel.x = 0.0f; + accel.y = -0.1f; + accel.z = 0.0f; + + if (isSmallSpawner) { + velocity.x = Math_Rand_ZeroOne() - 0.5f; + velocity.z = Math_Rand_ZeroOne() - 0.5f; + } else { + velocity.x = (Math_Rand_ZeroOne() - 0.5f) * 2.0f; + velocity.z = (Math_Rand_ZeroOne() - 0.5f) * 2.0f; + } + + pos.x = Math_Rand_CenteredFloat(10.0f) + this->actor.posRot.pos.x; + pos.y = Math_Rand_CenteredFloat(10.0f) + this->actor.posRot.pos.y; + pos.z = Math_Rand_CenteredFloat(10.0f) + this->actor.posRot.pos.z; + + EffectSsKiraKira_SpawnDispersed(globalCtx, &pos, &velocity, &accel, &primColor, &envColor, 1000, 16); + } +} + +/** + * Update function for the GetItem Actors. + * Medals and Light Arrows. + * It spawns Medal Sparkle Effects and scales/moves the Actor based on the current Cutscene Action + */ +void DemoEffect_UpdateGetItem(DemoEffect* this, GlobalContext* globalCtx) { + Actor* thisx = &this->actor; + + if (globalCtx->csCtx.state != 0 && globalCtx->csCtx.npcActions[this->csActionId] != NULL) { + if (this->getItem.isPositionInit) { + DemoEffect_MoveGetItem(this, globalCtx, this->csActionId, 0.1f); + } else { + DemoEffect_InitPositionFromCsAction(this, globalCtx, this->csActionId); + this->getItem.isPositionInit = 1; + } + + if (this->getItem.giIndex != 97) { + this->actor.shape.rot.x = 0xE0C0; + } else { + this->actor.shape.rot.y += 0x0400; + } + + Actor_SetScale(thisx, 0.20f); + + if (gSaveContext.entranceIndex == 0x0053) { + switch (globalCtx->csCtx.npcActions[this->csActionId]->action) { + case 2: + DemoEffect_MedalSparkle(this, globalCtx, 0); + break; + case 3: + DemoEffect_MedalSparkle(this, globalCtx, 1); + break; + } + } + switch (globalCtx->csCtx.npcActions[this->csActionId]->action) { + case 2: + if (gSaveContext.entranceIndex == 0x0053) { + Audio_PlayActorSound2(thisx, NA_SE_EV_MEDAL_APPEAR_L - SFX_FLAG); + } else { + func_800788CC(NA_SE_EV_MEDAL_APPEAR_S - SFX_FLAG); + } + if (this->getItem.giIndex != 97) { + this->actor.shape.rot.y += 0x3E80; + } + this->getItem.rotation = 0x3E80; + break; + case 3: + this->getItem.rotation -= (s16)((this->getItem.rotation - 0x03E8) * 0.10f); + if (this->getItem.giIndex != 97) { + this->actor.shape.rot.y += this->getItem.rotation; + } + if (gSaveContext.entranceIndex == 0x0053) { + Audio_PlayActorSound2(thisx, NA_SE_EV_MEDAL_APPEAR_L - SFX_FLAG); + } else { + func_800788CC(NA_SE_EV_MEDAL_APPEAR_S - SFX_FLAG); + } + break; + case 4: + Audio_PlayActorSound2(thisx, NA_SE_EV_MEDAL_APPEAR_S - SFX_FLAG); + break; + } + } +} + +/** + * Initializes Timewarp Actors. + * This is an Update Function that is only ran for one frame. + * Timewarp actors are spawned when Link... + * 1) Pulls the Master Sword + * 2) Returns from the Chamber of Sages for the first time + * 3) Timeblock is cleared with the Song of Time (Large and Small have different versions of Timewarp) + */ +void DemoEffect_InitTimeWarp(DemoEffect* this, GlobalContext* globalCtx) { + s32 effectType = (this->actor.params & 0x00FF); + + if (!SkelCurve_Init(globalCtx, &this->skelCurve, &D_060012E8, &D_06000050)) { + __assert("0", "../z_demo_effect.c", 1283); + } + + if (effectType == DEMO_EFFECT_TIMEWARP_TIMEBLOCK_LARGE || effectType == DEMO_EFFECT_TIMEWARP_TIMEBLOCK_SMALL) { + SkelCurve_SetAnim(&this->skelCurve, &D_06000050, 1.0f, 59.0f, 1.0f, 1.7f); + SkelCurve_Update(globalCtx, &this->skelCurve); + this->updateFunc = DemoEffect_InitTimeWarpTimeblock; + + if (effectType == DEMO_EFFECT_TIMEWARP_TIMEBLOCK_LARGE) { + Actor_SetScale(&this->actor, 0.14f); + } else { + Actor_SetScale(&this->actor, 84 * 0.001f); + } + } else if (gSaveContext.sceneSetupIndex == 5 || gSaveContext.sceneSetupIndex == 4 || + (gSaveContext.entranceIndex == 0x0324 && !((gSaveContext.eventChkInf[12] & 0x200)))) { + SkelCurve_SetAnim(&this->skelCurve, &D_06000050, 1.0f, 59.0f, 59.0f, 0.0f); + SkelCurve_Update(globalCtx, &this->skelCurve); + this->updateFunc = DemoEffect_UpdateTimeWarpReturnFromChamberOfSages; + osSyncPrintf(VT_FGCOL(CYAN) " 縮むバージョン \n" VT_RST); + } else { + SkelCurve_SetAnim(&this->skelCurve, &D_06000050, 1.0f, 59.0f, 1.0f, 1.0f); + SkelCurve_Update(globalCtx, &this->skelCurve); + this->updateFunc = DemoEffect_UpdateTimeWarpPullMasterSword; + osSyncPrintf(VT_FGCOL(CYAN) " 通常 バージョン \n" VT_RST); + } +} + +/** + * Update function for the Timewarp Actor that is used when Link pulls the Mastersword + * It changes the Background Music and updates it's SkelCurve animation. + */ +void DemoEffect_UpdateTimeWarpPullMasterSword(DemoEffect* this, GlobalContext* globalCtx) { + if (Flags_GetEnv(globalCtx, 1)) { + if (!(this->effectFlags & 0x2)) { + func_800F3F3C(0); + this->effectFlags |= 0x2; + } + + if (SkelCurve_Update(globalCtx, &this->skelCurve)) { + SkelCurve_SetAnim(&this->skelCurve, &D_06000050, 1.0f, 60.0f, 59.0f, 0.0f); + } + } +} + +/** + * Shrinks the Timewarp object vertices. + * Used by the Chamber of Sages return timewarp and Timeblock clear timewarp. + */ +void DemoEffect_TimewarpShrink(f32 size) { + Vtx* vertices; + s32 i; + u8 sizes[3]; + + // This function uses the data in obj_efc_tw offset 0x0060 to 0x01B0 + vertices = SEGMENTED_TO_VIRTUAL(D_06000060); + + sizes[0] = 0; + sizes[1] = (s32)(202.0f * size); + sizes[2] = (s32)(255.0f * size); + + for (i = 0; i < 21; i++) { + if (sTimewarpVertexSizeIndices[i] != 0) { + vertices[i].v.cn[3] = sizes[sTimewarpVertexSizeIndices[i]]; + } + } +} + +/** + * Update function for the Timewarp Actor that is used when Link returns from the Chamber of Sages for the first time. + * It shrinks the timewarp vertices and scales the Actor. + */ +void DemoEffect_UpdateTimeWarpReturnFromChamberOfSages(DemoEffect* this, GlobalContext* globalCtx) { + f32 shrinkProgress; + + this->timeWarp.shrinkTimer++; + + if (this->timeWarp.shrinkTimer > 250) { + if (gSaveContext.entranceIndex == 0x0324) { + gSaveContext.eventChkInf[12] |= 0x200; + } + + Actor_Kill(&this->actor); + return; + } + + if (this->timeWarp.shrinkTimer > 100) { + shrinkProgress = (250 - this->timeWarp.shrinkTimer) * (1.0f / 750.0f); + this->actor.scale.x = shrinkProgress; + this->actor.scale.z = shrinkProgress; + DemoEffect_TimewarpShrink(shrinkProgress * 5.0f); + } + + func_8002F948(&this->actor, NA_SE_EV_TIMETRIP_LIGHT - SFX_FLAG); +} + +/** + * Update function for the Timewarp Actor that is used when a Timeblock is cleared. + * It shrinks the timewarp vertices and scales the Actor. + */ +void DemoEffect_UpdateTimeWarpTimeblock(DemoEffect* this, GlobalContext* globalCtx) { + f32 shrinkProgress; + f32 scale; + + this->timeWarp.shrinkTimer++; + + if (this->timeWarp.shrinkTimer <= 100) { + shrinkProgress = (100 - this->timeWarp.shrinkTimer) * 0.010f; + scale = shrinkProgress * 0.14f; + + if ((this->actor.params & 0x00FF) == DEMO_EFFECT_TIMEWARP_TIMEBLOCK_SMALL) { + scale *= 0.6f; + } + + this->actor.scale.x = scale; + this->actor.scale.z = scale; + DemoEffect_TimewarpShrink(shrinkProgress); + func_8002F948(&this->actor, NA_SE_EV_TIMETRIP_LIGHT - SFX_FLAG); + return; + } + + DemoEffect_TimewarpShrink(1.0f); + Actor_Kill(&this->actor); +} + +/** + * Initializes information for the Timewarp Actor used for the Timeblock clear effect. + * This is an Update Func that is only ran for one frame. + */ +void DemoEffect_InitTimeWarpTimeblock(DemoEffect* this, GlobalContext* globalCtx) { + func_8002F948(&this->actor, NA_SE_EV_TIMETRIP_LIGHT - SFX_FLAG); + + if (SkelCurve_Update(globalCtx, &this->skelCurve)) { + SkelCurve_SetAnim(&this->skelCurve, &D_06000050, 1.0f, 60.0f, 59.0f, 0.0f); + this->updateFunc = DemoEffect_UpdateTimeWarpTimeblock; + this->timeWarp.shrinkTimer = 0; + } +} + +/** + * Update function for the Triforce Actor. + * It rotates and updates the alpha of the Triforce and child actors. + */ +void DemoEffect_UpdateTriforceSpot(DemoEffect* this, GlobalContext* globalCtx) { + this->triforceSpot.rotation += 0x03E8; + + if (globalCtx->csCtx.state != 0 && globalCtx->csCtx.npcActions[this->csActionId] != NULL) { + DemoEffect_MoveToCsEndpoint(this, globalCtx, this->csActionId, 0); + + if (globalCtx->csCtx.npcActions[this->csActionId]->action == 2) { + if (this->primXluColor[0] < 140) { + this->primXluColor[0]++; + } + + if (this->primXluColor[0] < 30) { + this->triforceSpot.triforceSpotOpacity = ((s32)this->primXluColor[0]) * 8.5f; + } else { + this->triforceSpot.triforceSpotOpacity = 255; + + if (this->primXluColor[0] < 60) { + this->triforceSpot.lightColumnOpacity = (((s32)this->primXluColor[0]) - 30) * 8.5f; + } else { + if (this->primXluColor[0] <= 140) { + this->triforceSpot.lightColumnOpacity = 255; + this->triforceSpot.crystalLightOpacity = (((s32)this->primXluColor[0]) - 60) * 3.1875f; + } + } + } + } + + if (gSaveContext.entranceIndex == 0x00A0 && gSaveContext.sceneSetupIndex == 6 && + globalCtx->csCtx.frames == 143) { + Audio_PlayActorSound2(&this->actor, NA_SE_IT_DM_RING_EXPLOSION); + } + } +} + +/** + * Update function for the LightRing actor that shrinks. + * This is used in the creation cutscene when Din leaves a fireball that explodes into Death Mountain. + */ +void DemoEffect_UpdateLightRingShrinking(DemoEffect* this, GlobalContext* globalCtx) { + if (this->lightRing.timer < this->lightRing.timerIncrement) { + Actor_Kill(&this->actor); + this->lightRing.timer = 0; + } else { + this->lightRing.timer -= this->lightRing.timerIncrement; + } + + if (this->lightRing.timer <= 255) { + if (this->lightRing.timer >= 225) { + this->lightRing.alpha = (-this->lightRing.timer * 8) + 2048; + } else { + this->lightRing.alpha = 255; + } + } + + if (this->lightRing.timer == 255) { + func_800F3F3C(5); + } +} + +/** + * Update function for the Lightring Actor that expands. + * These are spawned by Nayru. + * These are also used by Din in the creation cutscene when she leaves a fireball that explodes into Death Mountain. + */ +void DemoEffect_UpdateLightRingExpanding(DemoEffect* this, GlobalContext* globalCtx) { + DemoEffect_UpdatePositionToParent(this, globalCtx); + this->lightRing.timer += this->lightRing.timerIncrement; + + if (this->lightRing.timer >= 225) { + this->lightRing.alpha = (-this->lightRing.timer * 8) + 2048; + } + if (this->lightRing.timer > 255) { + this->lightRing.timer = 255; + Actor_Kill(&this->actor); + this->lightRing.timer = 0; + } +} + +/** + * Update function for the Lightring Actor that expands. This is a special version for the Triforce Actor. + * This version spawns a blue orb when the cutscene action state is set to 2. + * Once the Blue Orb Actor is spawned the Update Function is changed to the regular Light Ring Expanding Update Func. + */ +void DemoEffect_UpdateLightRingTriforce(DemoEffect* this, GlobalContext* globalCtx) { + DemoEffect* blueOrb; + + DemoEffect_UpdatePositionToParent(this, globalCtx); + + if (globalCtx->csCtx.state != 0) { + if (globalCtx->csCtx.npcActions[this->csActionId] != NULL && + globalCtx->csCtx.npcActions[this->csActionId]->action == 2) { + blueOrb = (DemoEffect*)Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_DEMO_EFFECT, + this->actor.posRot.pos.x, this->actor.posRot.pos.y, + this->actor.posRot.pos.z, 0, 0, 0, DEMO_EFFECT_BLUE_ORB); + + if (blueOrb != NULL) { + Actor_SetScale(&blueOrb->actor, 0.0f); + } + + this->updateFunc = DemoEffect_UpdateLightRingExpanding; + this->lightRing.alpha = 255; + } + } +} + +/** + * Update function for the FireBall Actor. + * This is a special version that is used in the creation cutscene. + * It moves based on gravity and decrements a timer until zero. Once the timer is zero it will spawn other Actors: + * A Blue Orb Actor, and a Light Ring Expanding Actor, and a Light Ring Shrinking Actor. + */ +void DemoEffect_UpdateCreationFireball(DemoEffect* this, GlobalContext* globalCtx) { + DemoEffect* effect; + + Actor_MoveForward(&this->actor); + this->actor.speedXZ = this->actor.speedXZ + (this->actor.gravity * 0.5f); + + if (this->fireBall.timer != 0) { + this->fireBall.timer--; + return; + } + + effect = + (DemoEffect*)Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_DEMO_EFFECT, this->actor.posRot.pos.x, + this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, 0, 0, DEMO_EFFECT_BLUE_ORB); + if (effect != NULL) { + Actor_SetScale(&effect->actor, 0.0f); + } + + effect = (DemoEffect*)Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_DEMO_EFFECT, this->actor.posRot.pos.x, + this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, 0, 0, + DEMO_EFFECT_LIGHTRING_EXPANDING); + if (effect != NULL) { + Actor_SetScale(&effect->actor, 0.1f); + } + + effect = (DemoEffect*)Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_DEMO_EFFECT, this->actor.posRot.pos.x, + this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, 0, 0, + DEMO_EFFECT_LIGHTRING_SHRINKING); + if (effect != NULL) { + Actor_SetScale(&effect->actor, 0.2f); + } + + func_800788CC(NA_SE_IT_DM_RING_EXPLOSION); + Actor_Kill(&this->actor); +} + +/** + * Initialization function for the FireBall Actor. + * This is a special version that is used in the creation cutscene. + * It is an Update Function only executed for one frame. The Update Function is then changed to UpdateCreationFireball. + */ +void DemoEffect_InitCreationFireball(DemoEffect* this, GlobalContext* globalCtx) { + Actor* parent = this->actor.parent; + + this->actor.posRot.rot.y = parent->shape.rot.y; + this->fireBall.timer = 50; + this->actor.speedXZ = 1.5f; + this->actor.minVelocityY = -1.5f; + this->actor.gravity = -0.03f; + this->updateFunc = DemoEffect_UpdateCreationFireball; +} + +/** + * Update action for the Blue Orb Actor. + * This Update Function is run while the Blue Orb is Shrinking. + * The Blue Orb Actor is the blue light sparkle that is in Din's creation cutscene. + * It's spawned in the middle of the expanding Light Ring. + * The Blue Orb Actor shrinks after it grows to max size. + */ +void DemoEffect_UpdateBlueOrbShrink(DemoEffect* this, GlobalContext* globalCtx) { + this->blueOrb.alpha = this->blueOrb.scale * 16; + this->blueOrb.scale--; + Actor_SetScale(&this->actor, this->actor.scale.x * 0.9f); + if (this->blueOrb.scale == 0) { + Actor_Kill(&this->actor); + } +} + +/** + * Update action for the Blue Orb Actor. + * This Update Function is run while the Blue Orb is Growing. + * The Blue Orb Actor is the blue light sparkle that is in Din's creation cutscene. + * It's spawned in the middle of the expanding Light Ring. + * When the scale timer value reaches 0 the Blue Orb's Update Function changes to UpdateBlueOrbShrink. + */ +void DemoEffect_UpdateBlueOrbGrow(DemoEffect* this, GlobalContext* globalCtx) { + if (this->actor.parent != NULL) { + // s32 cast necessary to match codegen. Without the explicit cast to u32 the compiler generates complex cast of + // u8 to float + Actor_SetScale(&this->actor, + (((5.0f - (s32)this->blueOrb.scale) * 0.01f) * 10.0f) * this->actor.parent->scale.x); + } else { + Actor_SetScale(&this->actor, (5.0f - (s32)this->blueOrb.scale) * 0.01f); + } + + if (this->blueOrb.scale != 0) { + this->blueOrb.scale--; + } else { + this->blueOrb.scale = 15; + this->updateFunc = DemoEffect_UpdateBlueOrbShrink; + } +} + +/** + * Update action for the Light Effect Actor. + * The Light Effect has various use cases. + * This function updates the position and scale of the actor based on the current cutscene command. + */ +void DemoEffect_UpdateLightEffect(DemoEffect* this, GlobalContext* globalCtx) { + u16 action; + s32 isLargeSize; + + isLargeSize = ((this->actor.params & 0x0F00) >> 8); + + if (globalCtx->csCtx.state != 0 && globalCtx->csCtx.npcActions[this->csActionId] != NULL) { + DemoEffect_MoveToCsEndpoint(this, globalCtx, this->csActionId, 0); + switch (globalCtx->csCtx.npcActions[this->csActionId]->action) { + case 2: + if (this->light.rotation < 240) { + if (!isLargeSize) { + if (this->actor.scale.x < 0.23f) { + this->actor.scale.x += 0.001f; + Actor_SetScale(&this->actor, this->actor.scale.x); + } + } else { + if (this->actor.scale.x < 2.03f) { + this->actor.scale.x += 0.05f; + Actor_SetScale(&this->actor, this->actor.scale.x); + } + } + } + this->light.rotation += 6; + this->light.scaleFlag += 1; + break; + + case 3: + Math_SmoothScaleMaxMinF(&this->actor.scale.x, 0.0f, 0.1f, 0.1f, 0.005f); + Actor_SetScale(&this->actor, this->actor.scale.x); + break; + + default: + break; + } + + if (globalCtx->sceneNum == SCENE_SPOT04 && gSaveContext.sceneSetupIndex == 6 && + globalCtx->csCtx.frames == 197) { + Audio_PlayActorSound2(&this->actor, NA_SE_EV_WHITE_OUT); + } + + if (globalCtx->sceneNum == SCENE_SPOT16 && gSaveContext.sceneSetupIndex == 5) { + if (!DemoEffect_CheckCsAction(this, globalCtx, 1)) { + Audio_PlayActorSound2(&this->actor, NA_SE_EV_LIGHT_GATHER - SFX_FLAG); + } + if (globalCtx->csCtx.frames == 640) { + Audio_PlayActorSound2(&this->actor, NA_SE_EV_WHITE_OUT); + } + + if (0) {} + } + + if (globalCtx->sceneNum == SCENE_SPOT08 && gSaveContext.sceneSetupIndex == 4) { + if (!DemoEffect_CheckCsAction(this, globalCtx, 1)) { + Audio_PlayActorSound2(&this->actor, NA_SE_EV_LIGHT_GATHER - SFX_FLAG); + } + if (globalCtx->csCtx.frames == 648) { + Audio_PlayActorSound2(&this->actor, NA_SE_EV_WHITE_OUT); + } + + // Necessary to match + if (0) {} + } + + if (globalCtx->sceneNum == SCENE_TOKINOMA && gSaveContext.sceneSetupIndex == 14) { + // do {} while(0) necessary to match + do { + if (globalCtx->csCtx.npcActions[this->csActionId]->action == 2) { + Audio_PlayActorSound2(&this->actor, NA_SE_EV_LIGHT_GATHER - SFX_FLAG); + } + } while (0); + } + + if (globalCtx->sceneNum == SCENE_DAIYOUSEI_IZUMI || globalCtx->sceneNum == SCENE_YOUSEI_IZUMI_YOKO) { + if (globalCtx->csCtx.npcActions[this->csActionId]->action == 2) { + Audio_PlayActorSound2(&this->actor, NA_SE_EV_LIGHT_GATHER - SFX_FLAG); + } + } + } +} + +/** + * Update action for the Lgt Shower Actor. + * The Lgt Shower Actor is the green light effect spawned by Farore in the Kokiri Forst creation cutscene. + * This function updates the scale and alpha of the Actor. + */ +void DemoEffect_UpdateLgtShower(DemoEffect* this, GlobalContext* globalCtx) { + if (this->lgtShower.alpha > 3) { + this->lgtShower.alpha -= 3; + this->actor.scale.x *= 1.05f; + this->actor.scale.y *= 1.05f; + this->actor.scale.z *= 1.05f; + } else { + Actor_Kill(&this->actor); + } +} + +/** + * Update action for the God Lgt Din Actor. + * This is the Goddess Din. + * This function moves God Lgt Din based on the current cutscene command. + * This function also spawns a Fireball Actor and sets it's update function to the special InitCreationFireball. + * The spawned Fireball Actor is also scaled to be smaller than regular by this function. + */ +void DemoEffect_UpdateGodLgtDin(DemoEffect* this, GlobalContext* globalCtx) { + DemoEffect* fireBall; + + if (globalCtx->csCtx.state != 0 && globalCtx->csCtx.npcActions[this->csActionId] != NULL) { + DemoEffect_MoveToCsEndpoint(this, globalCtx, this->csActionId, 1); + + if (globalCtx->csCtx.npcActions[this->csActionId]->action == 3) { + fireBall = (DemoEffect*)Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DEMO_EFFECT, + this->actor.posRot.pos.x, this->actor.posRot.pos.y, + this->actor.posRot.pos.z, 0, 0, 0, DEMO_EFFECT_FIRE_BALL); + + if (fireBall != NULL) { + fireBall->initUpdateFunc = DemoEffect_InitCreationFireball; + Actor_SetScale(&fireBall->actor, 0.020f); + } + } + + if (gSaveContext.entranceIndex == 0x00A0) { + switch (gSaveContext.sceneSetupIndex) { + case 4: + if (globalCtx->csCtx.frames == 288) { + Audio_PlayActorSound2(&this->actor, NA_SE_IT_DM_FLYING_GOD_PASS); + } + if (globalCtx->csCtx.frames == 635) { + Audio_PlayActorSound2(&this->actor, NA_SE_IT_DM_FLYING_GOD_PASS); + } + break; + + case 6: + if (globalCtx->csCtx.frames == 55) { + Audio_PlayActorSound2(&this->actor, NA_SE_IT_DM_FLYING_GOD_DASH); + } + break; + + case 11: + if (globalCtx->csCtx.frames == 350) { + Audio_PlayActorSound2(&this->actor, NA_SE_IT_DM_FLYING_GOD_DASH); + } + break; + } + } + } +} + +/** + * Update action for the God Lgt Nayru Actor. + * This is the Goddess Nayru. + * This function moves God Lgt Nayure based on the current cutscene command. + * This function also spawns expanding light rings around Nayru in the creation cutscene + */ +void DemoEffect_UpdateGodLgtNayru(DemoEffect* this, GlobalContext* globalCtx) { + DemoEffect* lightRing; + + if (globalCtx->csCtx.state != 0 && globalCtx->csCtx.npcActions[this->csActionId] != NULL) { + DemoEffect_MoveToCsEndpoint(this, globalCtx, this->csActionId, 1); + + if (globalCtx->csCtx.npcActions[this->csActionId]->action == 3) { + if (this->godLgt.lightRingSpawnTimer != 0) { + this->godLgt.lightRingSpawnTimer--; + } else { + this->godLgt.lightRingSpawnTimer = this->godLgt.lightRingSpawnDelay; + lightRing = (DemoEffect*)Actor_Spawn( + &globalCtx->actorCtx, globalCtx, ACTOR_DEMO_EFFECT, this->actor.posRot.pos.x, + this->actor.posRot.pos.y, this->actor.posRot.pos.z, this->actor.posRot.rot.x + 0x4000, + this->actor.posRot.rot.y, this->actor.posRot.rot.z, DEMO_EFFECT_LIGHTRING_EXPANDING); + + if (lightRing != NULL) { + Actor_SetScale(&lightRing->actor, 1.0f); + } + } + } + + if (gSaveContext.entranceIndex == 0x00A0) { + switch (gSaveContext.sceneSetupIndex) { + case 4: + if (globalCtx->csCtx.frames == 298) { + Audio_PlayActorSound2(&this->actor, NA_SE_IT_DM_FLYING_GOD_PASS); + } + break; + + case 6: + if (globalCtx->csCtx.frames == 105) { + Audio_PlayActorSound2(&this->actor, NA_SE_IT_DM_FLYING_GOD_DASH); + } + break; + + case 11: + if (globalCtx->csCtx.frames == 360) { + Audio_PlayActorSound2(&this->actor, NA_SE_IT_DM_FLYING_GOD_DASH); + } + break; + } + } + + if (gSaveContext.entranceIndex == 0x013D && gSaveContext.sceneSetupIndex == 4) { + if (globalCtx->csCtx.frames == 72) { + Audio_PlayActorSound2(&this->actor, NA_SE_IT_DM_FLYING_GOD_DASH); + } + if (globalCtx->csCtx.frames == 80) { + func_800F3F3C(4); + } + } + } +} + +/** + * Update action for the God Lgt Farore Actor. + * This is the Goddess Farore. + * This function moves God Lgt Farore based on the current cutscene command. + * This function also spawns an Lgt Shower Actor during the Kokiri creation cutscene. + */ +void DemoEffect_UpdateGodLgtFarore(DemoEffect* this, GlobalContext* globalCtx) { + DemoEffect* lgtShower; + + if (globalCtx->csCtx.state != 0 && globalCtx->csCtx.npcActions[this->csActionId] != NULL) { + DemoEffect_MoveToCsEndpoint(this, globalCtx, this->csActionId, 1); + + if (globalCtx->csCtx.npcActions[this->csActionId]->action == 3) { + lgtShower = (DemoEffect*)Actor_SpawnAsChild( + &globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DEMO_EFFECT, this->actor.posRot.pos.x, + this->actor.posRot.pos.y - 150.0f, this->actor.posRot.pos.z, 0, 0, 0, DEMO_EFFECT_LGT_SHOWER); + + if (lgtShower != NULL) { + lgtShower->actor.scale.x = 0.23f; + lgtShower->actor.scale.y = 0.15f; + lgtShower->actor.scale.z = 0.23f; + } + + Audio_PlayActorSound2(&this->actor, NA_SE_IT_DM_FLYING_GOD_DASH); + func_800F3F3C(3); + } + + if (gSaveContext.entranceIndex == 0x00A0) { + switch (gSaveContext.sceneSetupIndex) { + case 4: + if (globalCtx->csCtx.frames == 315) { + Audio_PlayActorSound2(&this->actor, NA_SE_IT_DM_FLYING_GOD_PASS); + } + break; + + case 6: + if (globalCtx->csCtx.frames == 80) { + Audio_PlayActorSound2(&this->actor, NA_SE_IT_DM_FLYING_GOD_DASH); + } + break; + + case 11: + if (globalCtx->csCtx.frames == 370) { + Audio_PlayActorSound2(&this->actor, NA_SE_IT_DM_FLYING_GOD_DASH); + } + break; + } + } + } +} + +/** + * Moves this actor towards the target position with a given speed. + */ +void DemoEffect_MoveTowardTarget(Vec3f targetPos, DemoEffect* this, f32 speed) { + this->actor.posRot.pos.x += (targetPos.x - this->actor.posRot.pos.x) * speed; + this->actor.posRot.pos.y += (targetPos.y - this->actor.posRot.pos.y) * speed; + this->actor.posRot.pos.z += (targetPos.z - this->actor.posRot.pos.z) * speed; +} + +/** + * Initializes Jewel colors. + */ +void DemoEffect_InitJewelColor(DemoEffect* this) { + u8 jewelType = this->jewel.type; + + switch (jewelType) { + case DEMO_EFFECT_JEWEL_KOKIRI: + this->primXluColor[2] = 160; + this->primXluColor[0] = 255; + this->primXluColor[1] = 255; + this->envXluColor[0] = 0; + this->envXluColor[1] = 255; + this->envXluColor[2] = 0; + this->primOpaColor[2] = 170; + this->primOpaColor[0] = 255; + this->primOpaColor[1] = 255; + this->envOpaColor[1] = 120; + this->envOpaColor[0] = 150; + this->envOpaColor[2] = 0; + break; + + case DEMO_EFFECT_JEWEL_GORON: + this->primXluColor[1] = 170; + this->primXluColor[0] = 255; + this->primXluColor[2] = 255; + this->envXluColor[2] = 100; + this->envXluColor[0] = 255; + this->envXluColor[1] = 0; + this->primOpaColor[2] = 170; + this->primOpaColor[0] = 255; + this->primOpaColor[1] = 255; + this->envOpaColor[1] = 120; + this->envOpaColor[0] = 150; + this->envOpaColor[2] = 0; + break; + + case DEMO_EFFECT_JEWEL_ZORA: + this->primXluColor[0] = 50; + this->primXluColor[1] = 255; + this->primXluColor[2] = 255; + this->envXluColor[2] = 150; + this->envXluColor[0] = 50; + this->envXluColor[1] = 0; + this->primOpaColor[2] = 170; + this->primOpaColor[0] = 255; + this->primOpaColor[1] = 255; + this->envOpaColor[1] = 120; + this->envOpaColor[0] = 150; + this->envOpaColor[2] = 0; + break; + } +} + +/** + * Sets the Jewel color based on the alpha variable. + * This function if a value of less than 1.0f is supplied will drain the color from the Jewels. + * This effect can be seen in prerelease screenshots. + */ +void DemoEffect_SetJewelColor(DemoEffect* this, f32 alpha) { + DemoEffect_InitJewelColor(this); + + this->primXluColor[0] = (((s32)this->primXluColor[0]) * alpha) + (255.0f * (1.0f - alpha)); + this->primXluColor[1] = (((s32)this->primXluColor[1]) * alpha) + (255.0f * (1.0f - alpha)); + this->primXluColor[2] = (((s32)this->primXluColor[2]) * alpha) + (255.0f * (1.0f - alpha)); + this->primOpaColor[0] = (((s32)this->primOpaColor[0]) * alpha) + (255.0f * (1.0f - alpha)); + this->primOpaColor[1] = (((s32)this->primOpaColor[1]) * alpha) + (255.0f * (1.0f - alpha)); + this->primOpaColor[2] = (((s32)this->primOpaColor[2]) * alpha) + (255.0f * (1.0f - alpha)); + this->envXluColor[0] = ((s32)this->envXluColor[0]) * alpha; + this->envXluColor[1] = ((s32)this->envXluColor[1]) * alpha; + this->envXluColor[2] = ((s32)this->envXluColor[2]) * alpha; + this->envOpaColor[0] = ((s32)this->envOpaColor[0]) * alpha; + this->envOpaColor[1] = ((s32)this->envOpaColor[1]) * alpha; + this->envOpaColor[2] = ((s32)this->envOpaColor[2]) * alpha; +} + +/** + * Moves the Jewel Actor during the activation of the Door of Time cutscene. + * This is used once the Jewel Actor is done orbiting Link and split up to move into the pedastal slots. + */ +void DemoEffect_MoveJewelSplit(PosRot* posRot, DemoEffect* this) { + switch (this->jewel.type) { + case DEMO_EFFECT_JEWEL_KOKIRI: + posRot->pos.x -= 40.0f; + break; + case DEMO_EFFECT_JEWEL_GORON: + break; + case DEMO_EFFECT_JEWEL_ZORA: + posRot->pos.x += 40.0f; + break; + } +} + +/** + * Moves the Jewel Actor spherically from startPos to endPos. + * This is used by the Jewel Actor during the Door of Time activation cutscene. + * This is run when the Jewels merge from Link and begin orbiting him. + */ +void DemoEffect_MoveJewelSpherical(f32 degrees, f32 frameDivisor, Vec3f startPos, Vec3f endPos, f32 radius, + Vec3s rotation, DemoEffect* this) { + s32 pad; + s32 pad2; + f32 distance; + f32 xPos; + f32 ySpherical; + f32 xzSpherical; + + distance = frameDivisor * sqrtf(SQ(endPos.x - startPos.x) + SQ(endPos.y - startPos.y) + SQ(endPos.z - startPos.z)); + + this->actor.posRot.pos.x = radius * cosf(degrees * (M_PI / 180.0f)); + this->actor.posRot.pos.y = distance; + this->actor.posRot.pos.z = radius * sinf(degrees * (M_PI / 180.0f)); + + xPos = this->actor.posRot.pos.x; + ySpherical = (this->actor.posRot.pos.y * cosf(rotation.x * (M_PI / 0x8000))) - + (sinf(rotation.x * (M_PI / 0x8000)) * this->actor.posRot.pos.z); + xzSpherical = (this->actor.posRot.pos.z * cosf(rotation.x * (M_PI / 0x8000))) + + (sinf(rotation.x * (M_PI / 0x8000)) * this->actor.posRot.pos.y); + + this->actor.posRot.pos.x = + (xPos * cosf(rotation.y * (M_PI / 0x8000))) - (sinf(rotation.y * (M_PI / 0x8000)) * xzSpherical); + this->actor.posRot.pos.y = ySpherical; + this->actor.posRot.pos.z = + (xzSpherical * cosf(rotation.y * (M_PI / 0x8000))) + (sinf(rotation.y * (M_PI / 0x8000)) * xPos); + + this->actor.posRot.pos.x += startPos.x; + this->actor.posRot.pos.y += startPos.y; + this->actor.posRot.pos.z += startPos.z; +} + +/** + * Moves the Jewel Actor spherically from startPos to endPos. + * This is used by the Jewel Actor during the Door of Time activation cutscene. + * This is run when the Jewels merge from Link and begin orbiting him. + */ +void DemoEffect_MoveJewelActivateDoorOfTime(DemoEffect* this, GlobalContext* globalCtx) { + Vec3f startPos; + Vec3f endPos; + f32 frameDivisor; + f32 degrees; + f32 radius; + s32 csActionId; + + csActionId = this->csActionId; + startPos.x = globalCtx->csCtx.npcActions[csActionId]->startPos.x; + startPos.y = globalCtx->csCtx.npcActions[csActionId]->startPos.y; + startPos.z = globalCtx->csCtx.npcActions[csActionId]->startPos.z; + endPos.x = globalCtx->csCtx.npcActions[csActionId]->endPos.x; + endPos.y = globalCtx->csCtx.npcActions[csActionId]->endPos.y; + endPos.z = globalCtx->csCtx.npcActions[csActionId]->endPos.z; + + frameDivisor = DemoEffect_InterpolateCsFrames(globalCtx, csActionId); + + switch (this->jewel.type) { + case DEMO_EFFECT_JEWEL_KOKIRI: + degrees = 0.0f; + break; + case DEMO_EFFECT_JEWEL_GORON: + degrees = 120.0f; + break; + case DEMO_EFFECT_JEWEL_ZORA: + degrees = 240.0f; + break; + } + + radius = 50.0f * frameDivisor; + if (radius > 30.0f) { + radius = 30.0f; + } + + if (startPos.x != endPos.x || startPos.y != endPos.y || startPos.z != endPos.z) { + this->jewelCsRotation.x = atan2f(endPos.z - startPos.z, -(endPos.x - startPos.x)) * (0x8000 / M_PI); + this->jewelCsRotation.y = Math_Vec3f_Yaw(&startPos, &endPos); + } + + this->jewelCsRotation.z += 0x0400; + + degrees += this->jewelCsRotation.z * (360.0f / 65536.0f); + DemoEffect_MoveJewelSpherical(degrees, frameDivisor, startPos, endPos, radius, this->jewelCsRotation, this); +} + +/** + * Spawns Sparkle Effects for the Jewel Actor. + */ +void DemoEffect_JewelSparkle(DemoEffect* this, GlobalContext* globalCtx, s32 spawnerCount) { + Vec3f velocity; + Vec3f accel; + Color_RGBA8 primColor; + Color_RGBA8 envColor; + Color_RGB8* sparkleColors; + s32 i; + + velocity.y = 0.0f; + + accel.x = 0.0f; + accel.y = -0.1f; + accel.z = 0.0f; + + sparkleColors = sJewelSparkleColors[this->jewel.type - DEMO_EFFECT_JEWEL_KOKIRI]; + + primColor.r = sparkleColors[0].r; + primColor.g = sparkleColors[0].g; + primColor.b = sparkleColors[0].b; + envColor.r = sparkleColors[1].r; + envColor.g = sparkleColors[1].g; + envColor.b = sparkleColors[1].b; + primColor.a = 0; + + for (i = 0; i < spawnerCount; i++) { + velocity.x = (Math_Rand_ZeroOne() - 0.5f) * 1.5f; + velocity.z = (Math_Rand_ZeroOne() - 0.5f) * 1.5f; + + EffectSsKiraKira_SpawnDispersed(globalCtx, &this->actor.posRot.pos, &velocity, &accel, &primColor, &envColor, + 3000, 16); + } +} + +/** + * Plays Jewel sound effects. + * The sSfxJewelId global variable is used to ensure only one Jewel Actor is playing SFX when all are spawned. + */ +void DemoEffect_PlayJewelSfx(DemoEffect* this, GlobalContext* globalCtx) { + if (!DemoEffect_CheckCsAction(this, globalCtx, 1)) { + if (this->actor.params == sSfxJewelId[0]) { + func_8002F974(&this->actor, NA_SE_EV_SPIRIT_STONE - SFX_FLAG); + } else if (sSfxJewelId[0] == 0) { + sSfxJewelId[0] = this->actor.params; + func_8002F974(&this->actor, NA_SE_EV_SPIRIT_STONE - SFX_FLAG); + } + } +} + +/** + * Update Function for the Jewel Actor that is run when Link is an adult. + * This rotates the Jewel and updates a timer that is used to scroll Jewel textures. + * There is a call SetJewelColor that does nothing since 1.0f is passed. + * If a value of less than 1.0f were passed to SetJewelColor, then it would appear to drain the Jewel's color. + * This can be seen in preprelease screenshots. + */ +void DemoEffect_UpdateJewelAdult(DemoEffect* this, GlobalContext* globalCtx) { + this->jewel.timer++; + this->actor.shape.rot.y += 0x0400; + DemoEffect_PlayJewelSfx(this, globalCtx); + DemoEffect_SetJewelColor(this, 1.0f); +} + +/** + * Update Function for the Jewel Actor that is run when Link is a child. + * This rotates the Jewel and updates a timer that is used to scroll Jewel textures. + * This also updates the Jewel's position based on different cutscenes. + */ +void DemoEffect_UpdateJewelChild(DemoEffect* this, GlobalContext* globalCtx) { + s32 hasCmdAction; + Actor* thisx = &this->actor; + + this->jewel.timer++; + + if (globalCtx->csCtx.state && globalCtx->csCtx.npcActions[this->csActionId]) { + switch (globalCtx->csCtx.npcActions[this->csActionId]->action) { + case 3: + if (gSaveContext.eventChkInf[4] & 0x800) { + gSaveContext.eventChkInf[4] |= 0x800; + } + DemoEffect_MoveJewelActivateDoorOfTime(this, globalCtx); + if ((globalCtx->gameplayFrames & 1) == 0) { + DemoEffect_JewelSparkle(this, globalCtx, 1); + } + break; + case 4: + if (this->jewel.isPositionInit) { + DemoEffect_MoveToCsEndpoint(this, globalCtx, this->csActionId, 0); + DemoEffect_MoveJewelSplit(&thisx->posRot, this); + if ((globalCtx->gameplayFrames & 1) == 0) { + DemoEffect_JewelSparkle(this, globalCtx, 1); + } + } else { + DemoEffect_InitPositionFromCsAction(this, globalCtx, this->csActionId); + DemoEffect_MoveJewelSplit(&thisx->posRot, this); + this->jewel.isPositionInit = 1; + } + break; + case 6: + Actor_Kill(thisx); + return; + default: + DemoEffect_MoveToCsEndpoint(this, globalCtx, this->csActionId, 0); + if (gSaveContext.entranceIndex == 0x0053) { + DemoEffect_MoveJewelSplit(&thisx->posRot, this); + } + break; + } + } + + if (gSaveContext.entranceIndex == 0x0053) { + if (!(gSaveContext.eventChkInf[4] & 0x800)) { + hasCmdAction = globalCtx->csCtx.state && globalCtx->csCtx.npcActions[this->csActionId]; + if (!hasCmdAction) { + this->effectFlags |= 0x1; + return; + } + } + } + + thisx->shape.rot.y += 0x0400; + DemoEffect_PlayJewelSfx(this, globalCtx); + this->effectFlags &= ~1; +} + +/** + * Update Function for the Dust Actor. + * This is the dust that is spawned in the Temple of Time during the Light Arrows cutscene. + * This spawns the dust particles and increments a timer + */ +void DemoEffect_UpdateDust(DemoEffect* this, GlobalContext* globalCtx) { + Vec3f pos; + Vec3f velocity; + Vec3f accel; + + if (globalCtx->csCtx.state != 0 && globalCtx->csCtx.npcActions[this->csActionId] != NULL && + globalCtx->csCtx.npcActions[this->csActionId]->action == 2) { + pos = this->actor.posRot.pos; + + pos.y += 600.0f; + pos.x += Math_Rand_CenteredFloat(300.0f); + pos.z += 200.0f + Math_Rand_CenteredFloat(300.0f); + + velocity.z = 0.0f; + velocity.x = 0.0f; + velocity.y = -20.0f; + + accel.z = 0.0f; + accel.x = 0.0f; + accel.y = 0.2f; + + func_8002873C(globalCtx, &pos, &velocity, &accel, 300, 0, 30); + + this->dust.timer++; + } +} + +/** + * This is the main Actor Update Function. + */ +void DemoEffect_Update(Actor* thisx, GlobalContext* globalCtx) { + DemoEffect* this = THIS; + this->updateFunc(this, globalCtx); +} + +/** + * Check if the current cutscene action matches the passed in cutscene action ID. + */ +s32 DemoEffect_CheckCsAction(DemoEffect* this, GlobalContext* globalCtx, s32 csActionCompareId) { + if (globalCtx->csCtx.state != 0 && globalCtx->csCtx.npcActions[this->csActionId] != NULL && + globalCtx->csCtx.npcActions[this->csActionId]->action == csActionCompareId) { + return 1; + } + + return 0; +} + +/** + * Draw function for the Jewel Actor. + */ +void DemoEffect_DrawJewel(Actor* thisx, GlobalContext* globalCtx) { + DemoEffect* this = THIS; + GlobalContext* globalCtx2 = globalCtx; + u32 frames = this->jewel.timer; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2543); + + if (!DemoEffect_CheckCsAction(this, globalCtx, 1)) { + if (1) {} + + if (!(this->effectFlags & 0x1)) { + switch (this->jewel.type) { + case DEMO_EFFECT_JEWEL_KOKIRI: + gSPSegment(POLY_XLU_DISP++, 9, + Gfx_TwoTexScroll(globalCtx2->state.gfxCtx, 0, (frames * 4) % 256, + (256 - ((frames * 2) % 256)) - 1, 64, 64, 1, (frames * 2) % 256, + (256 - (frames % 256)) - 1, 16, 16)); + break; + + case DEMO_EFFECT_JEWEL_GORON: + gSPSegment(POLY_XLU_DISP++, 9, + Gfx_TwoTexScroll(globalCtx2->state.gfxCtx, 0, (frames * 4) % 128, + (256 - ((frames * 2) % 256)) - 1, 32, 64, 1, (frames * 2) % 256, + (256 - (frames % 256)) - 1, 16, 8)); + break; + + case DEMO_EFFECT_JEWEL_ZORA: + gSPSegment(POLY_XLU_DISP++, 9, + Gfx_TwoTexScroll(globalCtx2->state.gfxCtx, 0, (frames * 4) % 256, + (256 - ((frames * 2) % 256)) - 1, 32, 32, 1, (frames * 2) % 256, + (256 - (frames % 256)) - 1, 16, 16)); + break; + } + + if (!frames) {} + + gSPSegment(POLY_OPA_DISP++, 8, Gfx_TexScroll(globalCtx->state.gfxCtx, (u8)frames, (u8)frames, 16, 16)); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2597), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2599), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + func_80093D84(globalCtx->state.gfxCtx); + func_8002ED80(&this->actor, globalCtx, 0); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 128, this->primXluColor[0], this->primXluColor[1], + this->primXluColor[2], 255); + gDPSetEnvColor(POLY_XLU_DISP++, this->envXluColor[0], this->envXluColor[1], this->envXluColor[2], 255); + gSPDisplayList(POLY_XLU_DISP++, this->jewelDisplayList); + func_80093D18(globalCtx->state.gfxCtx); + func_8002EBCC(&this->actor, globalCtx, 0); + gDPSetPrimColor(POLY_OPA_DISP++, 0, 128, this->primOpaColor[0], this->primOpaColor[1], + this->primOpaColor[2], 255); + gDPSetEnvColor(POLY_OPA_DISP++, this->envOpaColor[0], this->envOpaColor[1], this->envOpaColor[2], 255); + gSPDisplayList(POLY_OPA_DISP++, this->jewelHolderDisplayList); + } + } + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2620); +} + +/** + * Draw function for the Crystal Light Actor. + */ +void DemoEffect_DrawCrystalLight(Actor* thisx, GlobalContext* globalCtx) { + DemoEffect* this = THIS; + DemoEffect* parent = (DemoEffect*)this->actor.parent; + u32 frames = globalCtx->gameplayFrames & 0xFFFF; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2634); + + if (parent != NULL) { + gDPSetPrimColor(POLY_XLU_DISP++, 128, 128, 255, 255, 170, parent->triforceSpot.crystalLightOpacity); + } else { + gDPSetPrimColor(POLY_XLU_DISP++, 128, 128, 255, 255, 170, 255); + } + + func_80093D84(globalCtx->state.gfxCtx); + + gSPSegment(POLY_XLU_DISP++, 8, + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (frames * 2) % 512, 512 - (frames % 512) - 1, 128, 128, 1, + 512 - ((frames * 2) % 512) - 1, 0, 64, 64)); + Matrix_Push(); + Matrix_RotateY(0.0f, MTXMODE_APPLY); + Matrix_RotateX((11.0 * M_PI) / 180.0, MTXMODE_APPLY); + Matrix_Translate(0.0f, 150.0f, 0.0f, MTXMODE_APPLY); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2661), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_XLU_DISP++, D_06000980); + Matrix_Pull(); + Matrix_Push(); + Matrix_RotateY((2.0f * M_PI) / 3.0f, MTXMODE_APPLY); + Matrix_RotateX((11.0 * M_PI) / 180.0, MTXMODE_APPLY); + Matrix_Translate(0.0f, 150.0f, 0.0f, MTXMODE_APPLY); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2672), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_XLU_DISP++, D_06000980); + Matrix_Pull(); + Matrix_Push(); + Matrix_RotateY((4.0f * M_PI) / 3.0f, MTXMODE_APPLY); + Matrix_RotateX((11.0 * M_PI) / 180.0, MTXMODE_APPLY); + Matrix_Translate(0.0f, 150.0f, 0.0f, MTXMODE_APPLY); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2683), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_XLU_DISP++, D_06000980); + Matrix_Pull(); + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2688); +} + +/** + * Draw function for the Fire Ball Actor. + */ +void DemoEffect_DrawFireBall(Actor* thisx, GlobalContext* globalCtx) { + DemoEffect* this = THIS; + u32 frames = globalCtx->gameplayFrames; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2701); + gDPSetPrimColor(POLY_XLU_DISP++, 64, 64, 255, 200, 0, 255); + gDPSetEnvColor(POLY_XLU_DISP++, 255, 0, 0, 255); + func_80093D84(globalCtx->state.gfxCtx); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2709), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(POLY_XLU_DISP++, globalCtx->unk_11DE0, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPSegment( + POLY_XLU_DISP++, 8, + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 32, 1, 0, 128 - ((frames * 20) % 128) - 1, 32, 32)); + gSPDisplayList(POLY_XLU_DISP++, D_06000040); + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2723); +} + +/** + * Draw function for the God Lgt Actors. + * This draws either Din, Nayru, or Farore based on the colors set in the DemoEffect struct. + */ +void DemoEffect_DrawGodLgt(Actor* thisx, GlobalContext* globalCtx) { + DemoEffect* this = THIS; + s32 pad; + u32 frames = globalCtx->gameplayFrames; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2737); + + if (!DemoEffect_CheckCsAction(this, globalCtx, 2)) { + if (gSaveContext.entranceIndex == 0x00A0) { + if (gSaveContext.sceneSetupIndex == 4) { + if (globalCtx->csCtx.frames <= 680) { + func_80078914(&this->actor.projectedPos, NA_SE_EV_GOD_FLYING - SFX_FLAG); + } + } else { + func_80078914(&this->actor.projectedPos, NA_SE_EV_GOD_FLYING - SFX_FLAG); + } + } else { + func_80078914(&this->actor.projectedPos, NA_SE_EV_GOD_FLYING - SFX_FLAG); + } + + gSPSegment(POLY_XLU_DISP++, 8, + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (frames * 4) % 512, 0, 128, 64, 1, (frames * 2) % 256, + 512 - ((frames * 70) % 512) - 1, 64, 32)); + gSPSegment(POLY_XLU_DISP++, 9, + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 16, 96, 1, (frames * 10) % 256, + 256 - ((frames * 30) % 512) - 1, 8, 32)); + gDPSetPrimColor(POLY_XLU_DISP++, 128, 128, this->primXluColor[0], this->primXluColor[1], this->primXluColor[2], + 255); + gDPSetEnvColor(POLY_XLU_DISP++, this->envXluColor[0], this->envXluColor[1], this->envXluColor[2], 255); + func_80093D84(globalCtx->state.gfxCtx); + Matrix_Push(); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2801), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_XLU_DISP++, D_06000330); + func_80093D18(globalCtx->state.gfxCtx); + func_8002EBCC(&this->actor, globalCtx, 0); + Matrix_Pull(); + + this->godLgt.rotation++; + if (this->godLgt.rotation > 120) { + this->godLgt.rotation = 0; + if (1) {} + } + + Matrix_RotateZ((((s32)this->godLgt.rotation) * 3.0f) * (M_PI / 180.0f), MTXMODE_APPLY); + Matrix_RotateX(M_PI / 2.0f, MTXMODE_APPLY); + Matrix_Translate(0.0f, -140.0f, 0.0f, MTXMODE_APPLY); + Matrix_Scale(0.03f, 0.03f, 0.03f, MTXMODE_APPLY); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2824), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_OPA_DISP++, D_06003C50); + } + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2829); +} + +/** + * Draw function for the Light Effect Actor. + */ +void DemoEffect_DrawLightEffect(Actor* thisx, GlobalContext* globalCtx) { + DemoEffect* this = THIS; + u8* alpha; + Gfx* disp; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2842); + + if (!DemoEffect_CheckCsAction(this, globalCtx, 1)) { + + if (this->light.flicker == 0) { + this->light.flicker = 1; + } else { + disp = (u32)D_04010130; // necessary to match, should be able to remove after fake matches are fixed + alpha = &this->light.alpha; + func_80093D84(globalCtx->state.gfxCtx); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 128, this->primXluColor[0], this->primXluColor[1], + this->primXluColor[2], *alpha); + gDPSetEnvColor(POLY_XLU_DISP++, this->envXluColor[0], this->envXluColor[1], this->envXluColor[2], 255); + Matrix_Scale(((this->light.scaleFlag & 1) * 0.05f) + 1.0f, ((this->light.scaleFlag & 1) * 0.05f) + 1.0f, + ((this->light.scaleFlag & 1) * 0.05f) + 1.0f, MTXMODE_APPLY); + Matrix_Push(); + Matrix_Mult(&globalCtx->mf_11DA0, MTXMODE_APPLY); + Matrix_RotateZ(this->light.rotation * (M_PI / 180.0f), MTXMODE_APPLY); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2866), + G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH); + if (disp) {}; + gSPDisplayList(POLY_XLU_DISP++, disp); + Matrix_Pull(); + Matrix_Mult(&globalCtx->mf_11DA0, MTXMODE_APPLY); + Matrix_RotateZ(-(f32)this->light.rotation * (M_PI / 180.0f), MTXMODE_APPLY); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2874), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_XLU_DISP++, disp); + } + } + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2881); +} + +/** + * Draw function for the Blue Orb Actor. + */ +void DemoEffect_DrawBlueOrb(Actor* thisx, GlobalContext* globalCtx) { + DemoEffect* this = THIS; + s32 pad2; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2892); + gDPSetPrimColor(POLY_XLU_DISP++, 128, 128, 188, 255, 255, this->blueOrb.alpha); + gDPSetEnvColor(POLY_XLU_DISP++, 0, 100, 255, 255); + func_80093D84(globalCtx->state.gfxCtx); + Matrix_Mult(&globalCtx->mf_11DA0, MTXMODE_APPLY); + Matrix_RotateZ(this->blueOrb.rotation * (M_PI / 0x8000), MTXMODE_APPLY); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2901), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + this->blueOrb.rotation += 0x01F4; + gSPDisplayList(POLY_XLU_DISP++, D_04010130); + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2907); +} + +/** + * Draw function for the Lgt Shower Actor. + */ +void DemoEffect_DrawLgtShower(Actor* thisx, GlobalContext* globalCtx) { + DemoEffect* this = THIS; + s32 pad; + u32 frames = globalCtx->gameplayFrames; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2921); + gDPSetPrimColor(POLY_XLU_DISP++, 64, 64, 255, 255, 160, this->lgtShower.alpha); + gDPSetEnvColor(POLY_XLU_DISP++, 50, 200, 0, 255); + func_80093D84(globalCtx->state.gfxCtx); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2927), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPSegment(POLY_XLU_DISP++, 8, + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (frames * 5) % 1024, 0, 256, 64, 1, (frames * 10) % 128, + 512 - ((frames * 50) % 512), 32, 16)); + gSPDisplayList(POLY_XLU_DISP++, D_060011D0); + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2942); +} + +/** + * Draw function for the Light Ring Actor. + */ +void DemoEffect_DrawLightRing(Actor* thisx, GlobalContext* globalCtx) { + DemoEffect* this = THIS; + GlobalContext* globalCtx2 = globalCtx; + u32 frames = this->lightRing.timer; + + OPEN_DISPS(globalCtx2->state.gfxCtx, "../z_demo_effect.c", 2956); + + func_80093D84(globalCtx2->state.gfxCtx); + gDPSetPrimColor(POLY_XLU_DISP++, 128, 128, 170, 255, 255, this->lightRing.alpha); + gDPSetEnvColor(POLY_XLU_DISP++, 0, 100, 255, 255); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx2->state.gfxCtx, "../z_demo_effect.c", 2963), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPSegment(POLY_XLU_DISP++, 8, + Gfx_TwoTexScroll(globalCtx2->state.gfxCtx, 0, (frames * 5) % 64, 512 - ((frames * 2) % 512) - 1, 16, 128, + 1, 0, 0, 8, 1024)); + gSPDisplayList(POLY_XLU_DISP++, D_06000190); + + CLOSE_DISPS(globalCtx2->state.gfxCtx, "../z_demo_effect.c", 2978); +} + +/** + * Draw function for the Triforce Spot Actor. + */ +void DemoEffect_DrawTriforceSpot(Actor* thisx, GlobalContext* globalCtx) { + DemoEffect* this = THIS; + s32 pad; + Vtx* vertices = SEGMENTED_TO_VIRTUAL(D_06000000); + u32 frames = globalCtx->gameplayFrames; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2994); + if (gSaveContext.entranceIndex != 0x0400 || globalCtx->csCtx.frames < 885) { + func_80093D84(globalCtx->state.gfxCtx); + + if (this->triforceSpot.lightColumnOpacity > 0) { + Audio_PlayActorSound2(&this->actor, NA_SE_EV_AURORA - SFX_FLAG); + Matrix_Push(); + Matrix_Scale(1.0f, 2.4f, 1.0f, MTXMODE_APPLY); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 3011), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPSegment(POLY_XLU_DISP++, 9, + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 256 - ((frames * 4) % 256) - 1, 64, 64, 1, 0, + 256 - ((frames * 2) % 256) - 1, 64, 32)); + vertices[86].n.a = vertices[87].n.a = vertices[88].n.a = vertices[89].n.a = vertices[92].n.a = + vertices[93].n.a = vertices[94].n.a = vertices[95].n.a = (s8)this->triforceSpot.lightColumnOpacity; + gDPSetPrimColor(POLY_XLU_DISP++, 128, 128, 180, 255, 255, this->triforceSpot.lightColumnOpacity); + gDPSetEnvColor(POLY_XLU_DISP++, 0, 255, 150, 255); + gSPDisplayList(POLY_XLU_DISP++, D_06000840); + Matrix_Pull(); + } + + if (this->triforceSpot.triforceSpotOpacity != 0) { + Audio_PlayActorSound2(&this->actor, NA_SE_EV_TRIFORCE - SFX_FLAG); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 3042), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + + if (this->triforceSpot.triforceSpotOpacity < 250) { + func_8002ED80(&this->actor, globalCtx, 0); + func_80093D84(globalCtx->state.gfxCtx); + gDPSetRenderMode(POLY_XLU_DISP++, G_RM_PASS, G_RM_AA_ZB_XLU_SURF2); + Matrix_RotateY(this->triforceSpot.rotation * (M_PI / 0x8000), MTXMODE_APPLY); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 3053), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPSegment(POLY_XLU_DISP++, 8, + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 16, 1, 0, 0, 16, 8)); + gDPSetPrimColor(POLY_XLU_DISP++, 128, 128, 255, 255, 160, this->triforceSpot.triforceSpotOpacity); + gDPSetEnvColor(POLY_XLU_DISP++, 170, 140, 0, 255); + gSPDisplayList(POLY_XLU_DISP++, D_06000600); + } else { + func_8002EBCC(&this->actor, globalCtx, 0); + func_80093D18(globalCtx->state.gfxCtx); + gDPSetRenderMode(POLY_OPA_DISP++, G_RM_PASS, G_RM_AA_ZB_OPA_SURF2); + Matrix_RotateY(this->triforceSpot.rotation * (M_PI / 0x8000), MTXMODE_APPLY); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 3085), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPSegment(POLY_OPA_DISP++, 8, + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 16, 1, 0, 0, 16, 8)); + gDPSetPrimColor(POLY_OPA_DISP++, 128, 128, 255, 255, 160, 255); + gDPSetEnvColor(POLY_OPA_DISP++, 170, 140, 0, 255); + gSPDisplayList(POLY_OPA_DISP++, D_06000600); + } + } + } + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 3112); +} + +/** + * Draw function for the Get Item Actors. + * This is either Medals or Light Arrows based on the giIndex. + */ +void DemoEffect_DrawGetItem(Actor* thisx, GlobalContext* globalCtx) { + DemoEffect* this = THIS; + if (!DemoEffect_CheckCsAction(this, globalCtx, 1) && !DemoEffect_CheckCsAction(this, globalCtx, 4)) { + if (!this->getItem.isLoaded) { + this->getItem.isLoaded = 1; + return; + } + func_8002EBCC(thisx, globalCtx, 0); + func_8002ED80(thisx, globalCtx, 0); + func_800694A0(globalCtx, this->getItem.giIndex); + } +} + +/** + * Callback for the SkelCurve system to draw the animated limbs. + */ +s32 DemoEffect_DrawTimewarpLimbs(GlobalContext* globalCtx, SkelAnimeCurve* skelCuve, s32 limbIndex, void* thisx) { + s32 pad; + DemoEffect* this = THIS; + u32 frames = globalCtx->gameplayFrames; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 3154); + func_80093D84(globalCtx->state.gfxCtx); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 128, 170, 255, 255, 255); + gDPSetEnvColor(POLY_XLU_DISP++, this->envXluColor[0], this->envXluColor[1], this->envXluColor[2], 255); + gSPSegment(POLY_XLU_DISP++, 8, + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (frames * 6) % 1024, 256 - ((frames * 16) % 256) - 1, 256, + 64, 1, (frames * 4) % 512, 128 - ((frames * 12) % 128) - 1, 128, 32)); + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 3172); + + if (limbIndex == 0) { + LimbTransform* transform = &skelCuve->transforms[0]; + + transform->scale.y = 1024; + transform->scale.z = transform->scale.x = 1024; + } + + return 1; +} + +/** + * Draw function for the Time Warp Actors. + */ +void DemoEffect_DrawTimeWarp(Actor* thisx, GlobalContext* globalCtx) { + DemoEffect* this = THIS; + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + u8 effectType = (this->actor.params & 0x00FF); + + if (effectType == DEMO_EFFECT_TIMEWARP_TIMEBLOCK_LARGE || effectType == DEMO_EFFECT_TIMEWARP_TIMEBLOCK_SMALL || + Flags_GetEnv(globalCtx, 1) || gSaveContext.sceneSetupIndex >= 4 || gSaveContext.entranceIndex == 0x0324) { + OPEN_DISPS(gfxCtx, "../z_demo_effect.c", 3201); + POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 25); + Matrix_Scale(2.0f, 2.0f, 2.0f, MTXMODE_APPLY); + SkelCurve_Draw(thisx, globalCtx, &this->skelCurve, DemoEffect_DrawTimewarpLimbs, NULL, 1, this); + CLOSE_DISPS(gfxCtx, "../z_demo_effect.c", 3216); + } +} + +/** + * Faces/rotates the Actor towards the current cutscene action end point. + */ +void DemoEffect_FaceToCsEndpoint(DemoEffect* this, Vec3f startPos, Vec3f endPos) { + s32 pad; + f32 x = endPos.x - startPos.x; + f32 z = endPos.z - startPos.z; + f32 xzDistance = sqrtf(SQ(x) + SQ(z)); + + this->actor.shape.rot.y = Math_atan2f(x, z) * (32768.0f / M_PI); + this->actor.shape.rot.x = Math_atan2f(-(endPos.y - startPos.y), xzDistance) * (32768.0f / M_PI); +} + +/** + * Moves the Actor towards the current cutscene action end point. + * Will only update the Actor's facing/rotation if the shouldUpdateFacing argument is true. + * The speed is based on the current progress in the cutscene action. + */ +void DemoEffect_MoveToCsEndpoint(DemoEffect* this, GlobalContext* globalCtx, s32 csActionId, s32 shouldUpdateFacing) { + Vec3f startPos; + Vec3f endPos; + f32 speed; + + startPos.x = globalCtx->csCtx.npcActions[csActionId]->startPos.x; + startPos.y = globalCtx->csCtx.npcActions[csActionId]->startPos.y; + startPos.z = globalCtx->csCtx.npcActions[csActionId]->startPos.z; + endPos.x = globalCtx->csCtx.npcActions[csActionId]->endPos.x; + endPos.y = globalCtx->csCtx.npcActions[csActionId]->endPos.y; + endPos.z = globalCtx->csCtx.npcActions[csActionId]->endPos.z; + + speed = DemoEffect_InterpolateCsFrames(globalCtx, csActionId); + + this->actor.posRot.pos.x = ((endPos.x - startPos.x) * speed) + startPos.x; + this->actor.posRot.pos.y = ((endPos.y - startPos.y) * speed) + startPos.y; + this->actor.posRot.pos.z = ((endPos.z - startPos.z) * speed) + startPos.z; + + if (shouldUpdateFacing) { + DemoEffect_FaceToCsEndpoint(this, startPos, endPos); + } +} + +/** + * Moves a GetItem actor towards the current cutscene action's endpoint. + */ +void DemoEffect_MoveGetItem(DemoEffect* this, GlobalContext* globalCtx, s32 csActionId, f32 speed) { + Vec3f endPos; + endPos.x = globalCtx->csCtx.npcActions[csActionId]->endPos.x; + endPos.y = globalCtx->csCtx.npcActions[csActionId]->endPos.y; + endPos.z = globalCtx->csCtx.npcActions[csActionId]->endPos.z; + DemoEffect_MoveTowardTarget(endPos, this, speed); +} + +/** + * Initializes the Actor's position to the current cutscene action's start point. + */ +void DemoEffect_InitPositionFromCsAction(DemoEffect* this, GlobalContext* globalCtx, s32 csActionIndex) { + f32 x = globalCtx->csCtx.npcActions[csActionIndex]->startPos.x; + f32 y = globalCtx->csCtx.npcActions[csActionIndex]->startPos.y; + f32 z = globalCtx->csCtx.npcActions[csActionIndex]->startPos.z; + + this->actor.posRot.pos.x = x; + this->actor.posRot.pos.y = y; + this->actor.posRot.pos.z = z; +} diff --git a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h index ddb094474a..f138a50f33 100644 --- a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h +++ b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h @@ -6,11 +6,157 @@ struct DemoEffect; -typedef struct DemoEffect { +typedef void (*DemoEffectFunc)(struct DemoEffect* this, GlobalContext* globalCtx); + +typedef struct { + /* 0x00 */ u8 timer; +} DemoEffectFireBall; + +typedef struct { + /* 0x00 */ u8 alpha; + /* 0x01 */ u8 scale; + /* 0x02 */ u8 pad; + /* 0x04 */ s16 rotation; +} DemoEffectBlueOrb; + +typedef struct { + /* 0x00 */ u8 alpha; + /* 0x01 */ u8 scaleFlag; + /* 0x02 */ u8 flicker; + /* 0x04 */ s16 rotation; +} DemoEffectLight; + +typedef struct { + /* 0x00 */ u8 alpha; +} DemoEffectLgtShower; + +typedef struct { + /* 0x00 */ u8 type; + /* 0x01 */ u8 lightRingSpawnDelay; + /* 0x02 */ u8 rotation; + /* 0x04 */ s16 lightRingSpawnTimer; +} DemoEffectGodLgt; + +typedef struct { + /* 0x00 */ u8 timerIncrement; + /* 0x01 */ u8 alpha; + /* 0x02 */ u8 pad; + /* 0x04 */ s16 timer; +} DemoEffectLightRing; + +typedef struct { + /* 0x00 */ u8 triforceSpotOpacity; + /* 0x01 */ u8 lightColumnOpacity; + /* 0x02 */ u8 crystalLightOpacity; + /* 0x04 */ s16 rotation; +} DemoEffectTriforceSpot; + +typedef struct { + /* 0x00 */ u8 isPositionInit; + /* 0x01 */ u8 isLoaded; + /* 0x02 */ u8 giIndex; + /* 0x04 */ s16 rotation; +} DemoEffectGetItem; + +typedef struct { + /* 0x00 */ u8 pad; + /* 0x01 */ u8 pad2; + /* 0x02 */ u8 pad3; + /* 0x04 */ s16 shrinkTimer; +} DemoEffectTimeWarp; + +typedef struct { + /* 0x00 */ u8 type; + /* 0x01 */ u8 isPositionInit; + /* 0x02 */ u8 alpha; + /* 0x04 */ s16 timer; +} DemoEffectJewel; + +typedef struct { + /* 0x00 */ u8 timer; +} DemoEffectDust; + +typedef struct { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x54]; + /* 0x014C */ SkelAnimeCurve skelCurve; + /* 0x016C */ u8 initObjectBankIndex; + /* 0x0170 */ Gfx* jewelDisplayList; + /* 0x0174 */ Gfx* jewelHolderDisplayList; + /* 0x0178 */ u8 primXluColor[3]; + /* 0x017B */ u8 envXluColor[3]; + /* 0x017E */ u8 primOpaColor[3]; + /* 0x0181 */ u8 envOpaColor[3]; + /* 0x0184 */ union { + DemoEffectFireBall fireBall; + DemoEffectBlueOrb blueOrb; + DemoEffectLight light; + DemoEffectLgtShower lgtShower; + DemoEffectGodLgt godLgt; + DemoEffectLightRing lightRing; + DemoEffectTriforceSpot triforceSpot; + DemoEffectGetItem getItem; + DemoEffectTimeWarp timeWarp; + DemoEffectJewel jewel; + DemoEffectDust dust; + }; + /* 0x018A */ s16 effectFlags; + /* 0x018C */ s16 csActionId; + /* 0x018E */ Vec3s jewelCsRotation; + /* 0x0194 */ DemoEffectFunc initUpdateFunc; + /* 0x0198 */ ActorFunc initDrawFunc; + /* 0x019C */ DemoEffectFunc updateFunc; } DemoEffect; // size = 0x01A0 -extern const ActorInit Demo_Effect_InitVars; +// These names come from the objects that correspond to this actor type. +typedef enum { + /* 0x00 */ DEMO_EFFECT_CRYSTAL_LIGHT, + /* 0x01 */ DEMO_EFFECT_FIRE_BALL, + /* 0x02 */ DEMO_EFFECT_BLUE_ORB, // Object is in GAMEPLAY_KEEP. Not a name from object. It's a blue orb. + /* 0x03 */ DEMO_EFFECT_LGT_SHOWER, + /* 0x04 */ DEMO_EFFECT_GOD_LGT_DIN, + /* 0x05 */ DEMO_EFFECT_GOD_LGT_NAYRU, + /* 0x06 */ DEMO_EFFECT_GOD_LGT_FARORE, + /* 0x07 */ DEMO_EFFECT_LIGHTRING_EXPANDING, + /* 0x08 */ DEMO_EFFECT_TRIFORCE_SPOT, + /* 0x09 */ DEMO_EFFECT_MEDAL_FIRE, + /* 0x0A */ DEMO_EFFECT_MEDAL_WATER, + /* 0x0B */ DEMO_EFFECT_MEDAL_FOREST, + /* 0x0C */ DEMO_EFFECT_MEDAL_SPIRIT, + /* 0x0D */ DEMO_EFFECT_MEDAL_SHADOW, + /* 0x0E */ DEMO_EFFECT_MEDAL_LIGHT, + /* 0x0F */ DEMO_EFFECT_TIMEWARP_MASTERSWORD, + /* 0x10 */ DEMO_EFFECT_LIGHTRING_SHRINKING, + /* 0x11 */ DEMO_EFFECT_LIGHTRING_TRIFORCE, + /* 0x12 */ DEMO_EFFECT_LIGHT, + /* 0x13 */ DEMO_EFFECT_JEWEL_KOKIRI, + /* 0x14 */ DEMO_EFFECT_JEWEL_GORON, + /* 0x15 */ DEMO_EFFECT_JEWEL_ZORA, + /* 0x16 */ DEMO_EFFECT_DUST, // Object is jewel, but this is really the dust in the ToT light arrow cutscene. + /* 0x17 */ DEMO_EFFECT_LIGHTARROW, + /* 0x18 */ DEMO_EFFECT_TIMEWARP_TIMEBLOCK_LARGE, + /* 0x19 */ DEMO_EFFECT_TIMEWARP_TIMEBLOCK_SMALL, + /* 0x1A */ DEMO_EFFECT_MAX_TYPE +} DemoEffectType; + +typedef enum { + /* 0x00 */ DEMO_EFFECT_LIGHT_RED, + /* 0x01 */ DEMO_EFFECT_LIGHT_BLUE, + /* 0x02 */ DEMO_EFFECT_LIGHT_GREEN, + /* 0x03 */ DEMO_EFFECT_LIGHT_ORANGE, + /* 0x04 */ DEMO_EFFECT_LIGHT_YELLOW, + /* 0x05 */ DEMO_EFFECT_LIGHT_PURPLE, + /* 0x06 */ DEMO_EFFECT_LIGHT_GREEN2 +} DemoEffectLightColor; + +typedef enum { + /* 0x00 */ GOD_LGT_DIN, + /* 0x01 */ GOD_LGT_NAYRU, + /* 0x02 */ GOD_LGT_FARORE +} DemoEffectGodLgtType; + +// params info +// type: (params & 0x00FF) +// light size: ((params & 0x0F00) >> 8) +// light color: ((params & 0xF000) >> 12) #endif diff --git a/undefined_syms.txt b/undefined_syms.txt index 4813f64c4c..021ae4cdf1 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -1576,6 +1576,27 @@ D_0600045C = 0x0600045C; D_06005EA0 = 0x06005EA0; D_0600018C = 0x0600018C; +// z_demo_effect +D_04010130 = 0x04010130; +D_06001240 = 0x06001240; +D_060010E0 = 0x060010E0; +D_060020A0 = 0x060020A0; +D_06001FB0 = 0x06001FB0; +D_06003530 = 0x06003530; +D_06003370 = 0x06003370; +D_06000040 = 0x06000040; +D_06000190 = 0x06000190; +D_06000330 = 0x06000330; +D_06003C50 = 0x06003C50; +D_06000600 = 0x06000600; +D_06000840 = 0x06000840; +D_06000980 = 0x06000980; +D_060011D0 = 0x060011D0; +D_06000000 = 0x06000000; +D_06000060 = 0x06000060; +D_06000050 = 0x06000050; +D_060012E8 = 0x060012E8; + // z_bg_gnd_darkmeiro D_0600C080 = 0x0600C080; D_060088B0 = 0x060088B0;