diff --git a/asm/non_matchings/code/z_actor/func_8002FBAC.s b/asm/non_matchings/code/z_actor/func_8002FBAC.s index 053a3f38e4..77a07d8fc1 100644 --- a/asm/non_matchings/code/z_actor/func_8002FBAC.s +++ b/asm/non_matchings/code/z_actor/func_8002FBAC.s @@ -265,7 +265,7 @@ glabel func_8002FBAC /* AA706C 8002FECC AFAB0010 */ sw $t3, 0x10($sp) /* AA7070 8002FED0 AFAC0014 */ sw $t4, 0x14($sp) /* AA7074 8002FED4 8FA400F8 */ lw $a0, 0xf8($sp) -/* AA7078 8002FED8 0C00A2EC */ jal func_80028BB0 +/* AA7078 8002FED8 0C00A2EC */ jal EffectSsKiraKira_SpawnDispersed /* AA707C 8002FEDC 27A500A4 */ addiu $a1, $sp, 0xa4 /* AA7080 8002FEE0 3C018016 */ lui $at, %hi(D_8015BC18) /* AA7084 8002FEE4 C428BC18 */ lwc1 $f8, %lo(D_8015BC18)($at) diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80027F80.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80027F80.s deleted file mode 100644 index 2d613883c5..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80027F80.s +++ /dev/null @@ -1,171 +0,0 @@ -.rdata -glabel D_80135C00 - .asciz "../z_effect_soft_sprite_old_init.c" - .balign 4 - -glabel D_80135C24 - .asciz "../z_effect_soft_sprite_old_init.c" - .balign 4 - -.late_rodata -glabel D_80135C48 - .float 0.0025 - -.text -glabel func_80027F80 -/* A9F120 80027F80 27BDFE98 */ addiu $sp, $sp, -0x168 -/* A9F124 80027F84 AFBF001C */ sw $ra, 0x1c($sp) -/* A9F128 80027F88 AFB10018 */ sw $s1, 0x18($sp) -/* A9F12C 80027F8C AFB00014 */ sw $s0, 0x14($sp) -/* A9F130 80027F90 AFA40168 */ sw $a0, 0x168($sp) -/* A9F134 80027F94 AFA60170 */ sw $a2, 0x170($sp) -/* A9F138 80027F98 84AF0056 */ lh $t7, 0x56($a1) -/* A9F13C 80027F9C 3C080001 */ lui $t0, 1 -/* A9F140 80027FA0 8C900000 */ lw $s0, ($a0) -/* A9F144 80027FA4 000FC100 */ sll $t8, $t7, 4 -/* A9F148 80027FA8 030FC021 */ addu $t8, $t8, $t7 -/* A9F14C 80027FAC 0018C080 */ sll $t8, $t8, 2 -/* A9F150 80027FB0 0098C821 */ addu $t9, $a0, $t8 -/* A9F154 80027FB4 01194021 */ addu $t0, $t0, $t9 -/* A9F158 80027FB8 8D0817B4 */ lw $t0, 0x17b4($t0) -/* A9F15C 80027FBC 00A08825 */ move $s1, $a1 -/* A9F160 80027FC0 3C068013 */ lui $a2, %hi(D_80135C00) # $a2, 0x8013 -/* A9F164 80027FC4 24C65C00 */ addiu $a2, %lo(D_80135C00) # addiu $a2, $a2, 0x5c00 -/* A9F168 80027FC8 27A40040 */ addiu $a0, $sp, 0x40 -/* A9F16C 80027FCC 240700C4 */ li $a3, 196 -/* A9F170 80027FD0 02002825 */ move $a1, $s0 -/* A9F174 80027FD4 0C031AB1 */ jal Graph_OpenDisps -/* A9F178 80027FD8 AFA80054 */ sw $t0, 0x54($sp) -/* A9F17C 80027FDC 86290042 */ lh $t1, 0x42($s1) -/* A9F180 80027FE0 3C018013 */ lui $at, %hi(D_80135C48) -/* A9F184 80027FE4 C4285C48 */ lwc1 $f8, %lo(D_80135C48)($at) -/* A9F188 80027FE8 44892000 */ mtc1 $t1, $f4 -/* A9F18C 80027FEC 8E250000 */ lw $a1, ($s1) -/* A9F190 80027FF0 8E260004 */ lw $a2, 4($s1) -/* A9F194 80027FF4 468021A0 */ cvt.s.w $f6, $f4 -/* A9F198 80027FF8 8E270008 */ lw $a3, 8($s1) -/* A9F19C 80027FFC 27A40120 */ addiu $a0, $sp, 0x120 -/* A9F1A0 80028000 46083002 */ mul.s $f0, $f6, $f8 -/* A9F1A4 80028004 0C029E89 */ jal SkinMatrix_SetTranslate -/* A9F1A8 80028008 E7A00160 */ swc1 $f0, 0x160($sp) -/* A9F1AC 8002800C C7A00160 */ lwc1 $f0, 0x160($sp) -/* A9F1B0 80028010 27A400E0 */ addiu $a0, $sp, 0xe0 -/* A9F1B4 80028014 44050000 */ mfc1 $a1, $f0 -/* A9F1B8 80028018 44060000 */ mfc1 $a2, $f0 -/* A9F1BC 8002801C 44070000 */ mfc1 $a3, $f0 -/* A9F1C0 80028020 0C029DA9 */ jal SkinMatrix_SetScale -/* A9F1C4 80028024 00000000 */ nop -/* A9F1C8 80028028 8FA50168 */ lw $a1, 0x168($sp) -/* A9F1CC 8002802C 3C010001 */ lui $at, (0x00011DA0 >> 16) # lui $at, 1 -/* A9F1D0 80028030 34211DA0 */ ori $at, (0x00011DA0 & 0xFFFF) # ori $at, $at, 0x1da0 -/* A9F1D4 80028034 27A40120 */ addiu $a0, $sp, 0x120 -/* A9F1D8 80028038 27A60060 */ addiu $a2, $sp, 0x60 -/* A9F1DC 8002803C 0C029BE8 */ jal SkinMatrix_MtxFMtxFMult -/* A9F1E0 80028040 00A12821 */ addu $a1, $a1, $at -/* A9F1E4 80028044 27A40060 */ addiu $a0, $sp, 0x60 -/* A9F1E8 80028048 27A500E0 */ addiu $a1, $sp, 0xe0 -/* A9F1EC 8002804C 0C029BE8 */ jal SkinMatrix_MtxFMtxFMult -/* A9F1F0 80028050 27A600A0 */ addiu $a2, $sp, 0xa0 -/* A9F1F4 80028054 8FA40054 */ lw $a0, 0x54($sp) -/* A9F1F8 80028058 3C018000 */ lui $at, 0x8000 -/* A9F1FC 8002805C 3C0CDB06 */ lui $t4, (0xDB060018 >> 16) # lui $t4, 0xdb06 -/* A9F200 80028060 00815021 */ addu $t2, $a0, $at -/* A9F204 80028064 3C018016 */ lui $at, %hi(gSegments+0x18) # $at, 0x8016 -/* A9F208 80028068 AC2A6FC0 */ sw $t2, %lo(gSegments+0x18)($at) -/* A9F20C 8002806C 8E0302D0 */ lw $v1, 0x2d0($s0) -/* A9F210 80028070 358C0018 */ ori $t4, (0xDB060018 & 0xFFFF) # ori $t4, $t4, 0x18 -/* A9F214 80028074 27A500A0 */ addiu $a1, $sp, 0xa0 -/* A9F218 80028078 246B0008 */ addiu $t3, $v1, 8 -/* A9F21C 8002807C AE0B02D0 */ sw $t3, 0x2d0($s0) -/* A9F220 80028080 AC640004 */ sw $a0, 4($v1) -/* A9F224 80028084 02002025 */ move $a0, $s0 -/* A9F228 80028088 0C029F9C */ jal SkinMatrix_MtxFToNewMtx -/* A9F22C 8002808C AC6C0000 */ sw $t4, ($v1) -/* A9F230 80028090 1040004A */ beqz $v0, .L800281BC -/* A9F234 80028094 3C0FDA38 */ lui $t7, (0xDA380003 >> 16) # lui $t7, 0xda38 -/* A9F238 80028098 8E0302D0 */ lw $v1, 0x2d0($s0) -/* A9F23C 8002809C 35EF0003 */ ori $t7, (0xDA380003 & 0xFFFF) # ori $t7, $t7, 3 -/* A9F240 800280A0 3C18DB06 */ lui $t8, (0xDB060020 >> 16) # lui $t8, 0xdb06 -/* A9F244 800280A4 246D0008 */ addiu $t5, $v1, 8 -/* A9F248 800280A8 AE0D02D0 */ sw $t5, 0x2d0($s0) -/* A9F24C 800280AC AC620004 */ sw $v0, 4($v1) -/* A9F250 800280B0 AC6F0000 */ sw $t7, ($v1) -/* A9F254 800280B4 8FA40170 */ lw $a0, 0x170($sp) -/* A9F258 800280B8 8E0302D0 */ lw $v1, 0x2d0($s0) -/* A9F25C 800280BC 37180020 */ ori $t8, (0xDB060020 & 0xFFFF) # ori $t8, $t8, 0x20 -/* A9F260 800280C0 0004C900 */ sll $t9, $a0, 4 -/* A9F264 800280C4 00194702 */ srl $t0, $t9, 0x1c -/* A9F268 800280C8 246E0008 */ addiu $t6, $v1, 8 -/* A9F26C 800280CC AE0E02D0 */ sw $t6, 0x2d0($s0) -/* A9F270 800280D0 00084880 */ sll $t1, $t0, 2 -/* A9F274 800280D4 3C0A8016 */ lui $t2, %hi(gSegments) -/* A9F278 800280D8 01495021 */ addu $t2, $t2, $t1 -/* A9F27C 800280DC 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* A9F280 800280E0 AC780000 */ sw $t8, ($v1) -/* A9F284 800280E4 8D4A6FA8 */ lw $t2, %lo(gSegments)($t2) -/* A9F288 800280E8 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* A9F28C 800280EC 00815824 */ and $t3, $a0, $at -/* A9F290 800280F0 3C018000 */ lui $at, 0x8000 -/* A9F294 800280F4 014B6021 */ addu $t4, $t2, $t3 -/* A9F298 800280F8 01816821 */ addu $t5, $t4, $at -/* A9F29C 800280FC 02002025 */ move $a0, $s0 -/* A9F2A0 80028100 0C025314 */ jal func_80094C50 -/* A9F2A4 80028104 AC6D0004 */ sw $t5, 4($v1) -/* A9F2A8 80028108 8E0302D0 */ lw $v1, 0x2d0($s0) -/* A9F2AC 8002810C 3C0EFA00 */ lui $t6, 0xfa00 -/* A9F2B0 80028110 246F0008 */ addiu $t7, $v1, 8 -/* A9F2B4 80028114 AE0F02D0 */ sw $t7, 0x2d0($s0) -/* A9F2B8 80028118 AC6E0000 */ sw $t6, ($v1) -/* A9F2BC 8002811C 8638004C */ lh $t8, 0x4c($s1) -/* A9F2C0 80028120 862C0048 */ lh $t4, 0x48($s1) -/* A9F2C4 80028124 86290046 */ lh $t1, 0x46($s1) -/* A9F2C8 80028128 331900FF */ andi $t9, $t8, 0xff -/* A9F2CC 8002812C 8638004A */ lh $t8, 0x4a($s1) -/* A9F2D0 80028130 318D00FF */ andi $t5, $t4, 0xff -/* A9F2D4 80028134 00095600 */ sll $t2, $t1, 0x18 -/* A9F2D8 80028138 032A5825 */ or $t3, $t9, $t2 -/* A9F2DC 8002813C 000D7C00 */ sll $t7, $t5, 0x10 -/* A9F2E0 80028140 330800FF */ andi $t0, $t8, 0xff -/* A9F2E4 80028144 00084A00 */ sll $t1, $t0, 8 -/* A9F2E8 80028148 016F7025 */ or $t6, $t3, $t7 -/* A9F2EC 8002814C 01C9C825 */ or $t9, $t6, $t1 -/* A9F2F0 80028150 AC790004 */ sw $t9, 4($v1) -/* A9F2F4 80028154 8E0302D0 */ lw $v1, 0x2d0($s0) -/* A9F2F8 80028158 3C0CFB00 */ lui $t4, 0xfb00 -/* A9F2FC 8002815C 246A0008 */ addiu $t2, $v1, 8 -/* A9F300 80028160 AE0A02D0 */ sw $t2, 0x2d0($s0) -/* A9F304 80028164 AC6C0000 */ sw $t4, ($v1) -/* A9F308 80028168 862D0054 */ lh $t5, 0x54($s1) -/* A9F30C 8002816C 86290050 */ lh $t1, 0x50($s1) -/* A9F310 80028170 8638004E */ lh $t8, 0x4e($s1) -/* A9F314 80028174 31AB00FF */ andi $t3, $t5, 0xff -/* A9F318 80028178 862D0052 */ lh $t5, 0x52($s1) -/* A9F31C 8002817C 313900FF */ andi $t9, $t1, 0xff -/* A9F320 80028180 00184600 */ sll $t0, $t8, 0x18 -/* A9F324 80028184 01687025 */ or $t6, $t3, $t0 -/* A9F328 80028188 00195400 */ sll $t2, $t9, 0x10 -/* A9F32C 8002818C 31AF00FF */ andi $t7, $t5, 0xff -/* A9F330 80028190 000FC200 */ sll $t8, $t7, 8 -/* A9F334 80028194 01CA6025 */ or $t4, $t6, $t2 -/* A9F338 80028198 01985825 */ or $t3, $t4, $t8 -/* A9F33C 8002819C AC6B0004 */ sw $t3, 4($v1) -/* A9F340 800281A0 8E0302D0 */ lw $v1, 0x2d0($s0) -/* A9F344 800281A4 3C09DE00 */ lui $t1, 0xde00 -/* A9F348 800281A8 24680008 */ addiu $t0, $v1, 8 -/* A9F34C 800281AC AE0802D0 */ sw $t0, 0x2d0($s0) -/* A9F350 800281B0 AC690000 */ sw $t1, ($v1) -/* A9F354 800281B4 8E390038 */ lw $t9, 0x38($s1) -/* A9F358 800281B8 AC790004 */ sw $t9, 4($v1) -.L800281BC: -/* A9F35C 800281BC 3C068013 */ lui $a2, %hi(D_80135C24) # $a2, 0x8013 -/* A9F360 800281C0 24C65C24 */ addiu $a2, %lo(D_80135C24) # addiu $a2, $a2, 0x5c24 -/* A9F364 800281C4 27A40040 */ addiu $a0, $sp, 0x40 -/* A9F368 800281C8 02002825 */ move $a1, $s0 -/* A9F36C 800281CC 0C031AD5 */ jal Graph_CloseDisps -/* A9F370 800281D0 240700F3 */ li $a3, 243 -/* A9F374 800281D4 8FBF001C */ lw $ra, 0x1c($sp) -/* A9F378 800281D8 8FB00014 */ lw $s0, 0x14($sp) -/* A9F37C 800281DC 8FB10018 */ lw $s1, 0x18($sp) -/* A9F380 800281E0 03E00008 */ jr $ra -/* A9F384 800281E4 27BD0168 */ addiu $sp, $sp, 0x168 - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028B18.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028B18.s deleted file mode 100644 index b49396aa23..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028B18.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80028B18 -/* A9FCB8 80028B18 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* A9FCBC 80028B1C 3C0E8011 */ lui $t6, %hi(D_801158D4) # $t6, 0x8011 -/* A9FCC0 80028B20 AFBF0024 */ sw $ra, 0x24($sp) -/* A9FCC4 80028B24 25CE58D4 */ addiu $t6, %lo(D_801158D4) # addiu $t6, $t6, 0x58d4 -/* A9FCC8 80028B28 8DD80000 */ lw $t8, ($t6) -/* A9FCCC 80028B2C 27A2002C */ addiu $v0, $sp, 0x2c -/* A9FCD0 80028B30 3C198011 */ lui $t9, %hi(D_801158D8) # $t9, 0x8011 -/* A9FCD4 80028B34 273958D8 */ addiu $t9, %lo(D_801158D8) # addiu $t9, $t9, 0x58d8 -/* A9FCD8 80028B38 AC580000 */ sw $t8, ($v0) -/* A9FCDC 80028B3C 8F290000 */ lw $t1, ($t9) -/* A9FCE0 80028B40 27A30028 */ addiu $v1, $sp, 0x28 -/* A9FCE4 80028B44 240A03E8 */ li $t2, 1000 -/* A9FCE8 80028B48 AC690000 */ sw $t1, ($v1) -/* A9FCEC 80028B4C 240B0010 */ li $t3, 16 -/* A9FCF0 80028B50 AFAB001C */ sw $t3, 0x1c($sp) -/* A9FCF4 80028B54 AFAA0018 */ sw $t2, 0x18($sp) -/* A9FCF8 80028B58 AFA30014 */ sw $v1, 0x14($sp) -/* A9FCFC 80028B5C 0C00A2EC */ jal func_80028BB0 -/* A9FD00 80028B60 AFA20010 */ sw $v0, 0x10($sp) -/* A9FD04 80028B64 8FBF0024 */ lw $ra, 0x24($sp) -/* A9FD08 80028B68 27BD0030 */ addiu $sp, $sp, 0x30 -/* A9FD0C 80028B6C 03E00008 */ jr $ra -/* A9FD10 80028B70 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028B74.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028B74.s deleted file mode 100644 index ecee09105e..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028B74.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80028B74 -/* A9FD14 80028B74 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A9FD18 80028B78 8FAE0038 */ lw $t6, 0x38($sp) -/* A9FD1C 80028B7C 8FAF003C */ lw $t7, 0x3c($sp) -/* A9FD20 80028B80 AFBF0024 */ sw $ra, 0x24($sp) -/* A9FD24 80028B84 241803E8 */ li $t8, 1000 -/* A9FD28 80028B88 24190010 */ li $t9, 16 -/* A9FD2C 80028B8C AFB9001C */ sw $t9, 0x1c($sp) -/* A9FD30 80028B90 AFB80018 */ sw $t8, 0x18($sp) -/* A9FD34 80028B94 AFAE0010 */ sw $t6, 0x10($sp) -/* A9FD38 80028B98 0C00A2EC */ jal func_80028BB0 -/* A9FD3C 80028B9C AFAF0014 */ sw $t7, 0x14($sp) -/* A9FD40 80028BA0 8FBF0024 */ lw $ra, 0x24($sp) -/* A9FD44 80028BA4 27BD0028 */ addiu $sp, $sp, 0x28 -/* A9FD48 80028BA8 03E00008 */ jr $ra -/* A9FD4C 80028BAC 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028BB0.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028BB0.s deleted file mode 100644 index 11afa6c5e8..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028BB0.s +++ /dev/null @@ -1,81 +0,0 @@ -glabel func_80028BB0 -/* A9FD50 80028BB0 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* A9FD54 80028BB4 AFBF0014 */ sw $ra, 0x14($sp) -/* A9FD58 80028BB8 AFA40058 */ sw $a0, 0x58($sp) -/* A9FD5C 80028BBC AFA60060 */ sw $a2, 0x60($sp) -/* A9FD60 80028BC0 AFA70064 */ sw $a3, 0x64($sp) -/* A9FD64 80028BC4 0C01DF90 */ jal Math_Vec3f_Copy -/* A9FD68 80028BC8 27A4001C */ addiu $a0, $sp, 0x1c -/* A9FD6C 80028BCC 27A40028 */ addiu $a0, $sp, 0x28 -/* A9FD70 80028BD0 0C01DF90 */ jal Math_Vec3f_Copy -/* A9FD74 80028BD4 8FA50060 */ lw $a1, 0x60($sp) -/* A9FD78 80028BD8 0C03F66B */ jal Math_Rand_ZeroOne -/* A9FD7C 80028BDC 00000000 */ nop -/* A9FD80 80028BE0 C7A2002C */ lwc1 $f2, 0x2c($sp) -/* A9FD84 80028BE4 3C013F00 */ li $at, 0x3F000000 # 0.000000 -/* A9FD88 80028BE8 44814000 */ mtc1 $at, $f8 -/* A9FD8C 80028BEC 46020102 */ mul.s $f4, $f0, $f2 -/* A9FD90 80028BF0 27A40034 */ addiu $a0, $sp, 0x34 -/* A9FD94 80028BF4 8FA50064 */ lw $a1, 0x64($sp) -/* A9FD98 80028BF8 46022180 */ add.s $f6, $f4, $f2 -/* A9FD9C 80028BFC 46083082 */ mul.s $f2, $f6, $f8 -/* A9FDA0 80028C00 0C01DF90 */ jal Math_Vec3f_Copy -/* A9FDA4 80028C04 E7A2002C */ swc1 $f2, 0x2c($sp) -/* A9FDA8 80028C08 0C03F66B */ jal Math_Rand_ZeroOne -/* A9FDAC 80028C0C 00000000 */ nop -/* A9FDB0 80028C10 C7A20038 */ lwc1 $f2, 0x38($sp) -/* A9FDB4 80028C14 3C013F00 */ li $at, 0x3F000000 # 0.000000 -/* A9FDB8 80028C18 44819000 */ mtc1 $at, $f18 -/* A9FDBC 80028C1C 46020282 */ mul.s $f10, $f0, $f2 -/* A9FDC0 80028C20 8FAE0074 */ lw $t6, 0x74($sp) -/* A9FDC4 80028C24 240F1518 */ li $t7, 5400 -/* A9FDC8 80028C28 A3A00054 */ sb $zero, 0x54($sp) -/* A9FDCC 80028C2C A7AF0050 */ sh $t7, 0x50($sp) -/* A9FDD0 80028C30 AFAE004C */ sw $t6, 0x4c($sp) -/* A9FDD4 80028C34 46025400 */ add.s $f16, $f10, $f2 -/* A9FDD8 80028C38 46128082 */ mul.s $f2, $f16, $f18 -/* A9FDDC 80028C3C 0C03F66B */ jal Math_Rand_ZeroOne -/* A9FDE0 80028C40 E7A20038 */ swc1 $f2, 0x38($sp) -/* A9FDE4 80028C44 3C014680 */ li $at, 0x46800000 # 0.000000 -/* A9FDE8 80028C48 44812000 */ mtc1 $at, $f4 -/* A9FDEC 80028C4C 87A80072 */ lh $t0, 0x72($sp) -/* A9FDF0 80028C50 8FAA0068 */ lw $t2, 0x68($sp) -/* A9FDF4 80028C54 46040182 */ mul.s $f6, $f0, $f4 -/* A9FDF8 80028C58 A7A8004A */ sh $t0, 0x4a($sp) -/* A9FDFC 80028C5C 27A90040 */ addiu $t1, $sp, 0x40 -/* A9FE00 80028C60 27AD0044 */ addiu $t5, $sp, 0x44 -/* A9FE04 80028C64 3C01437F */ li $at, 0x437F0000 # 0.000000 -/* A9FE08 80028C68 44815000 */ mtc1 $at, $f10 -/* A9FE0C 80028C6C 24050001 */ li $a1, 1 -/* A9FE10 80028C70 4600320D */ trunc.w.s $f8, $f6 -/* A9FE14 80028C74 24060080 */ li $a2, 128 -/* A9FE18 80028C78 27A7001C */ addiu $a3, $sp, 0x1c -/* A9FE1C 80028C7C 44194000 */ mfc1 $t9, $f8 -/* A9FE20 80028C80 00000000 */ nop -/* A9FE24 80028C84 A7B90052 */ sh $t9, 0x52($sp) -/* A9FE28 80028C88 894C0000 */ lwl $t4, ($t2) -/* A9FE2C 80028C8C 994C0003 */ lwr $t4, 3($t2) -/* A9FE30 80028C90 A92C0000 */ swl $t4, ($t1) -/* A9FE34 80028C94 B92C0003 */ swr $t4, 3($t1) -/* A9FE38 80028C98 8FAE006C */ lw $t6, 0x6c($sp) -/* A9FE3C 80028C9C 89D80000 */ lwl $t8, ($t6) -/* A9FE40 80028CA0 99D80003 */ lwr $t8, 3($t6) -/* A9FE44 80028CA4 A9B80000 */ swl $t8, ($t5) -/* A9FE48 80028CA8 B9B80003 */ swr $t8, 3($t5) -/* A9FE4C 80028CAC 8FB9004C */ lw $t9, 0x4c($sp) -/* A9FE50 80028CB0 8FA40058 */ lw $a0, 0x58($sp) -/* A9FE54 80028CB4 44998000 */ mtc1 $t9, $f16 -/* A9FE58 80028CB8 00000000 */ nop -/* A9FE5C 80028CBC 468084A0 */ cvt.s.w $f18, $f16 -/* A9FE60 80028CC0 46125083 */ div.s $f2, $f10, $f18 -/* A9FE64 80028CC4 46001087 */ neg.s $f2, $f2 -/* A9FE68 80028CC8 46021100 */ add.s $f4, $f2, $f2 -/* A9FE6C 80028CCC 4600218D */ trunc.w.s $f6, $f4 -/* A9FE70 80028CD0 44093000 */ mfc1 $t1, $f6 -/* A9FE74 80028CD4 0C009DE6 */ jal EffectSs_Spawn -/* A9FE78 80028CD8 A7A90048 */ sh $t1, 0x48($sp) -/* A9FE7C 80028CDC 8FBF0014 */ lw $ra, 0x14($sp) -/* A9FE80 80028CE0 27BD0058 */ addiu $sp, $sp, 0x58 -/* A9FE84 80028CE4 03E00008 */ jr $ra -/* A9FE88 80028CE8 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028CEC.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028CEC.s deleted file mode 100644 index a4704a98af..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028CEC.s +++ /dev/null @@ -1,56 +0,0 @@ -glabel func_80028CEC -/* A9FE8C 80028CEC 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* A9FE90 80028CF0 AFBF0014 */ sw $ra, 0x14($sp) -/* A9FE94 80028CF4 AFA40058 */ sw $a0, 0x58($sp) -/* A9FE98 80028CF8 AFA60060 */ sw $a2, 0x60($sp) -/* A9FE9C 80028CFC AFA70064 */ sw $a3, 0x64($sp) -/* A9FEA0 80028D00 0C01DF90 */ jal Math_Vec3f_Copy -/* A9FEA4 80028D04 27A4001C */ addiu $a0, $sp, 0x1c -/* A9FEA8 80028D08 27A40028 */ addiu $a0, $sp, 0x28 -/* A9FEAC 80028D0C 0C01DF90 */ jal Math_Vec3f_Copy -/* A9FEB0 80028D10 8FA50060 */ lw $a1, 0x60($sp) -/* A9FEB4 80028D14 27A40034 */ addiu $a0, $sp, 0x34 -/* A9FEB8 80028D18 0C01DF90 */ jal Math_Vec3f_Copy -/* A9FEBC 80028D1C 8FA50064 */ lw $a1, 0x64($sp) -/* A9FEC0 80028D20 8FAE0074 */ lw $t6, 0x74($sp) -/* A9FEC4 80028D24 240F0001 */ li $t7, 1 -/* A9FEC8 80028D28 24181518 */ li $t8, 5400 -/* A9FECC 80028D2C A3AF0054 */ sb $t7, 0x54($sp) -/* A9FED0 80028D30 A7B80050 */ sh $t8, 0x50($sp) -/* A9FED4 80028D34 0C03F66B */ jal Math_Rand_ZeroOne -/* A9FED8 80028D38 AFAE004C */ sw $t6, 0x4c($sp) -/* A9FEDC 80028D3C 3C014680 */ li $at, 0x46800000 # 0.000000 -/* A9FEE0 80028D40 44812000 */ mtc1 $at, $f4 -/* A9FEE4 80028D44 87A90072 */ lh $t1, 0x72($sp) -/* A9FEE8 80028D48 27A40040 */ addiu $a0, $sp, 0x40 -/* A9FEEC 80028D4C 46040182 */ mul.s $f6, $f0, $f4 -/* A9FEF0 80028D50 8FA50068 */ lw $a1, 0x68($sp) -/* A9FEF4 80028D54 A7A9004A */ sh $t1, 0x4a($sp) -/* A9FEF8 80028D58 4600320D */ trunc.w.s $f8, $f6 -/* A9FEFC 80028D5C 44084000 */ mfc1 $t0, $f8 -/* A9FF00 80028D60 0C01E218 */ jal Color_RGBA8_Copy -/* A9FF04 80028D64 A7A80052 */ sh $t0, 0x52($sp) -/* A9FF08 80028D68 27A40044 */ addiu $a0, $sp, 0x44 -/* A9FF0C 80028D6C 0C01E218 */ jal Color_RGBA8_Copy -/* A9FF10 80028D70 8FA5006C */ lw $a1, 0x6c($sp) -/* A9FF14 80028D74 8FAA004C */ lw $t2, 0x4c($sp) -/* A9FF18 80028D78 3C01437F */ li $at, 0x437F0000 # 0.000000 -/* A9FF1C 80028D7C 44815000 */ mtc1 $at, $f10 -/* A9FF20 80028D80 448A8000 */ mtc1 $t2, $f16 -/* A9FF24 80028D84 8FA40058 */ lw $a0, 0x58($sp) -/* A9FF28 80028D88 24050001 */ li $a1, 1 -/* A9FF2C 80028D8C 468084A0 */ cvt.s.w $f18, $f16 -/* A9FF30 80028D90 24060080 */ li $a2, 128 -/* A9FF34 80028D94 27A7001C */ addiu $a3, $sp, 0x1c -/* A9FF38 80028D98 46125003 */ div.s $f0, $f10, $f18 -/* A9FF3C 80028D9C 46000007 */ neg.s $f0, $f0 -/* A9FF40 80028DA0 46000100 */ add.s $f4, $f0, $f0 -/* A9FF44 80028DA4 4600218D */ trunc.w.s $f6, $f4 -/* A9FF48 80028DA8 440C3000 */ mfc1 $t4, $f6 -/* A9FF4C 80028DAC 0C009DE6 */ jal EffectSs_Spawn -/* A9FF50 80028DB0 A7AC0048 */ sh $t4, 0x48($sp) -/* A9FF54 80028DB4 8FBF0014 */ lw $ra, 0x14($sp) -/* A9FF58 80028DB8 27BD0058 */ addiu $sp, $sp, 0x58 -/* A9FF5C 80028DBC 03E00008 */ jr $ra -/* A9FF60 80028DC0 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029320.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029320.s deleted file mode 100644 index ab1ae61a40..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029320.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80029320 -/* AA04C0 80029320 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* AA04C4 80029324 AFBF0014 */ sw $ra, 0x14($sp) -/* AA04C8 80029328 AFA40048 */ sw $a0, 0x48($sp) -/* AA04CC 8002932C AFA60050 */ sw $a2, 0x50($sp) -/* AA04D0 80029330 AFA70054 */ sw $a3, 0x54($sp) -/* AA04D4 80029334 0C01DF90 */ jal Math_Vec3f_Copy -/* AA04D8 80029338 27A40018 */ addiu $a0, $sp, 0x18 -/* AA04DC 8002933C 27A40024 */ addiu $a0, $sp, 0x24 -/* AA04E0 80029340 0C01DF90 */ jal Math_Vec3f_Copy -/* AA04E4 80029344 8FA50050 */ lw $a1, 0x50($sp) -/* AA04E8 80029348 27A40030 */ addiu $a0, $sp, 0x30 -/* AA04EC 8002934C 0C01DF90 */ jal Math_Vec3f_Copy -/* AA04F0 80029350 8FA50054 */ lw $a1, 0x54($sp) -/* AA04F4 80029354 87AE005A */ lh $t6, 0x5a($sp) -/* AA04F8 80029358 87AF005E */ lh $t7, 0x5e($sp) -/* AA04FC 8002935C 87B80062 */ lh $t8, 0x62($sp) -/* AA0500 80029360 87B90066 */ lh $t9, 0x66($sp) -/* AA0504 80029364 8FA80068 */ lw $t0, 0x68($sp) -/* AA0508 80029368 8FA40048 */ lw $a0, 0x48($sp) -/* AA050C 8002936C 24050006 */ li $a1, 6 -/* AA0510 80029370 24060080 */ li $a2, 128 -/* AA0514 80029374 27A70018 */ addiu $a3, $sp, 0x18 -/* AA0518 80029378 A7AE003C */ sh $t6, 0x3c($sp) -/* AA051C 8002937C A7AF003E */ sh $t7, 0x3e($sp) -/* AA0520 80029380 A7B80040 */ sh $t8, 0x40($sp) -/* AA0524 80029384 A7B90042 */ sh $t9, 0x42($sp) -/* AA0528 80029388 0C009DE6 */ jal EffectSs_Spawn -/* AA052C 8002938C AFA80044 */ sw $t0, 0x44($sp) -/* AA0530 80029390 8FBF0014 */ lw $ra, 0x14($sp) -/* AA0534 80029394 27BD0048 */ addiu $sp, $sp, 0x48 -/* AA0538 80029398 03E00008 */ jr $ra -/* AA053C 8002939C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800293A0.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800293A0.s deleted file mode 100644 index 63fb96fd38..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800293A0.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_800293A0 -/* AA0540 800293A0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* AA0544 800293A4 87B80042 */ lh $t8, 0x42($sp) -/* AA0548 800293A8 87B90046 */ lh $t9, 0x46($sp) -/* AA054C 800293AC AFBF002C */ sw $ra, 0x2c($sp) -/* AA0550 800293B0 240E0064 */ li $t6, 100 -/* AA0554 800293B4 240F0023 */ li $t7, 35 -/* AA0558 800293B8 24080008 */ li $t0, 8 -/* AA055C 800293BC AFA80020 */ sw $t0, 0x20($sp) -/* AA0560 800293C0 AFAF0014 */ sw $t7, 0x14($sp) -/* AA0564 800293C4 AFAE0010 */ sw $t6, 0x10($sp) -/* AA0568 800293C8 AFB80018 */ sw $t8, 0x18($sp) -/* AA056C 800293CC 0C00A4C8 */ jal func_80029320 -/* AA0570 800293D0 AFB9001C */ sw $t9, 0x1c($sp) -/* AA0574 800293D4 8FBF002C */ lw $ra, 0x2c($sp) -/* AA0578 800293D8 27BD0030 */ addiu $sp, $sp, 0x30 -/* AA057C 800293DC 03E00008 */ jr $ra -/* AA0580 800293E0 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800293E4.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800293E4.s deleted file mode 100644 index 97d8fedbdb..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800293E4.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_800293E4 -/* AA0584 800293E4 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* AA0588 800293E8 AFBF0014 */ sw $ra, 0x14($sp) -/* AA058C 800293EC AFA40038 */ sw $a0, 0x38($sp) -/* AA0590 800293F0 AFA60040 */ sw $a2, 0x40($sp) -/* AA0594 800293F4 AFA70044 */ sw $a3, 0x44($sp) -/* AA0598 800293F8 0C01DF90 */ jal Math_Vec3f_Copy -/* AA059C 800293FC 27A4001C */ addiu $a0, $sp, 0x1c -/* AA05A0 80029400 C7A40040 */ lwc1 $f4, 0x40($sp) -/* AA05A4 80029404 C7A60044 */ lwc1 $f6, 0x44($sp) -/* AA05A8 80029408 C7A80048 */ lwc1 $f8, 0x48($sp) -/* AA05AC 8002940C C7AA004C */ lwc1 $f10, 0x4c($sp) -/* AA05B0 80029410 8FA40038 */ lw $a0, 0x38($sp) -/* AA05B4 80029414 24050007 */ li $a1, 7 -/* AA05B8 80029418 24060080 */ li $a2, 128 -/* AA05BC 8002941C 27A7001C */ addiu $a3, $sp, 0x1c -/* AA05C0 80029420 E7A40028 */ swc1 $f4, 0x28($sp) -/* AA05C4 80029424 E7A6002C */ swc1 $f6, 0x2c($sp) -/* AA05C8 80029428 E7A80030 */ swc1 $f8, 0x30($sp) -/* AA05CC 8002942C 0C009DE6 */ jal EffectSs_Spawn -/* AA05D0 80029430 E7AA0034 */ swc1 $f10, 0x34($sp) -/* AA05D4 80029434 8FBF0014 */ lw $ra, 0x14($sp) -/* AA05D8 80029438 27BD0038 */ addiu $sp, $sp, 0x38 -/* AA05DC 8002943C 03E00008 */ jr $ra -/* AA05E0 80029440 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029444.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029444.s deleted file mode 100644 index b42e8f8b4c..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029444.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80029444 -/* AA05E4 80029444 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* AA05E8 80029448 AFBF0014 */ sw $ra, 0x14($sp) -/* AA05EC 8002944C AFA40030 */ sw $a0, 0x30($sp) -/* AA05F0 80029450 AFA60038 */ sw $a2, 0x38($sp) -/* AA05F4 80029454 AFA7003C */ sw $a3, 0x3c($sp) -/* AA05F8 80029458 0C01DF90 */ jal Math_Vec3f_Copy -/* AA05FC 8002945C 27A4001C */ addiu $a0, $sp, 0x1c -/* AA0600 80029460 87AE003A */ lh $t6, 0x3a($sp) -/* AA0604 80029464 87AF003E */ lh $t7, 0x3e($sp) -/* AA0608 80029468 87B80042 */ lh $t8, 0x42($sp) -/* AA060C 8002946C 8FA40030 */ lw $a0, 0x30($sp) -/* AA0610 80029470 24050009 */ li $a1, 9 -/* AA0614 80029474 24060080 */ li $a2, 128 -/* AA0618 80029478 27A7001C */ addiu $a3, $sp, 0x1c -/* AA061C 8002947C A7AE0028 */ sh $t6, 0x28($sp) -/* AA0620 80029480 A7AF002A */ sh $t7, 0x2a($sp) -/* AA0624 80029484 0C009DE6 */ jal EffectSs_Spawn -/* AA0628 80029488 A7B8002C */ sh $t8, 0x2c($sp) -/* AA062C 8002948C 8FBF0014 */ lw $ra, 0x14($sp) -/* AA0630 80029490 27BD0030 */ addiu $sp, $sp, 0x30 -/* AA0634 80029494 03E00008 */ jr $ra -/* AA0638 80029498 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002949C.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002949C.s deleted file mode 100644 index 9b0f37ff84..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002949C.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_8002949C -/* AA063C 8002949C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* AA0640 800294A0 AFBF0014 */ sw $ra, 0x14($sp) -/* AA0644 800294A4 AFA40030 */ sw $a0, 0x30($sp) -/* AA0648 800294A8 AFA60038 */ sw $a2, 0x38($sp) -/* AA064C 800294AC AFA7003C */ sw $a3, 0x3c($sp) -/* AA0650 800294B0 0C01DF90 */ jal Math_Vec3f_Copy -/* AA0654 800294B4 27A40018 */ addiu $a0, $sp, 0x18 -/* AA0658 800294B8 8FA20038 */ lw $v0, 0x38($sp) -/* AA065C 800294BC 87AE0042 */ lh $t6, 0x42($sp) -/* AA0660 800294C0 87AF0046 */ lh $t7, 0x46($sp) -/* AA0664 800294C4 2405000A */ li $a1, 10 -/* AA0668 800294C8 A3AE0024 */ sb $t6, 0x24($sp) -/* AA066C 800294CC 1040000F */ beqz $v0, .L8002950C -/* AA0670 800294D0 A7AF0026 */ sh $t7, 0x26($sp) -/* AA0674 800294D4 88480000 */ lwl $t0, ($v0) -/* AA0678 800294D8 98480003 */ lwr $t0, 3($v0) -/* AA067C 800294DC 27B80028 */ addiu $t8, $sp, 0x28 -/* AA0680 800294E0 27A9002C */ addiu $t1, $sp, 0x2c -/* AA0684 800294E4 AB080000 */ swl $t0, ($t8) -/* AA0688 800294E8 BB080003 */ swr $t0, 3($t8) -/* AA068C 800294EC 8FAA003C */ lw $t2, 0x3c($sp) -/* AA0690 800294F0 240D0001 */ li $t5, 1 -/* AA0694 800294F4 894C0000 */ lwl $t4, ($t2) -/* AA0698 800294F8 994C0003 */ lwr $t4, 3($t2) -/* AA069C 800294FC A92C0000 */ swl $t4, ($t1) -/* AA06A0 80029500 B92C0003 */ swr $t4, 3($t1) -/* AA06A4 80029504 10000002 */ b .L80029510 -/* AA06A8 80029508 A3AD0025 */ sb $t5, 0x25($sp) -.L8002950C: -/* AA06AC 8002950C A3A00025 */ sb $zero, 0x25($sp) -.L80029510: -/* AA06B0 80029510 8FA40030 */ lw $a0, 0x30($sp) -/* AA06B4 80029514 24060080 */ li $a2, 128 -/* AA06B8 80029518 0C009DE6 */ jal EffectSs_Spawn -/* AA06BC 8002951C 27A70018 */ addiu $a3, $sp, 0x18 -/* AA06C0 80029520 8FBF0014 */ lw $ra, 0x14($sp) -/* AA06C4 80029524 27BD0030 */ addiu $sp, $sp, 0x30 -/* AA06C8 80029528 03E00008 */ jr $ra -/* AA06CC 8002952C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029530.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029530.s deleted file mode 100644 index 075913b8c3..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029530.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80029530 -/* AA06D0 80029530 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* AA06D4 80029534 AFBF0014 */ sw $ra, 0x14($sp) -/* AA06D8 80029538 AFA40028 */ sw $a0, 0x28($sp) -/* AA06DC 8002953C 0C01DF90 */ jal Math_Vec3f_Copy -/* AA06E0 80029540 27A4001C */ addiu $a0, $sp, 0x1c -/* AA06E4 80029544 8FA40028 */ lw $a0, 0x28($sp) -/* AA06E8 80029548 2405000B */ li $a1, 11 -/* AA06EC 8002954C 24060080 */ li $a2, 128 -/* AA06F0 80029550 0C009DE6 */ jal EffectSs_Spawn -/* AA06F4 80029554 27A7001C */ addiu $a3, $sp, 0x1c -/* AA06F8 80029558 8FBF0014 */ lw $ra, 0x14($sp) -/* AA06FC 8002955C 27BD0028 */ addiu $sp, $sp, 0x28 -/* AA0700 80029560 03E00008 */ jr $ra -/* AA0704 80029564 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029568.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029568.s deleted file mode 100644 index 7ace1802c6..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029568.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80029568 -/* AA0708 80029568 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* AA070C 8002956C AFBF0014 */ sw $ra, 0x14($sp) -/* AA0710 80029570 AFA40028 */ sw $a0, 0x28($sp) -/* AA0714 80029574 0C01DF90 */ jal Math_Vec3f_Copy -/* AA0718 80029578 27A4001C */ addiu $a0, $sp, 0x1c -/* AA071C 8002957C 8FA40028 */ lw $a0, 0x28($sp) -/* AA0720 80029580 2405000C */ li $a1, 12 -/* AA0724 80029584 24060080 */ li $a2, 128 -/* AA0728 80029588 0C009DE6 */ jal EffectSs_Spawn -/* AA072C 8002958C 27A7001C */ addiu $a3, $sp, 0x1c -/* AA0730 80029590 8FBF0014 */ lw $ra, 0x14($sp) -/* AA0734 80029594 27BD0028 */ addiu $sp, $sp, 0x28 -/* AA0738 80029598 03E00008 */ jr $ra -/* AA073C 8002959C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800295A0.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800295A0.s deleted file mode 100644 index 2b67d562cc..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800295A0.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_800295A0 -/* AA0740 800295A0 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* AA0744 800295A4 AFBF0014 */ sw $ra, 0x14($sp) -/* AA0748 800295A8 AFA40038 */ sw $a0, 0x38($sp) -/* AA074C 800295AC AFA60040 */ sw $a2, 0x40($sp) -/* AA0750 800295B0 AFA70044 */ sw $a3, 0x44($sp) -/* AA0754 800295B4 0C01DF90 */ jal Math_Vec3f_Copy -/* AA0758 800295B8 27A4001C */ addiu $a0, $sp, 0x1c -/* AA075C 800295BC 27A40028 */ addiu $a0, $sp, 0x28 -/* AA0760 800295C0 0C01E218 */ jal Color_RGBA8_Copy -/* AA0764 800295C4 8FA50040 */ lw $a1, 0x40($sp) -/* AA0768 800295C8 27A4002C */ addiu $a0, $sp, 0x2c -/* AA076C 800295CC 0C01E218 */ jal Color_RGBA8_Copy -/* AA0770 800295D0 8FA50044 */ lw $a1, 0x44($sp) -/* AA0774 800295D4 87AE004A */ lh $t6, 0x4a($sp) -/* AA0778 800295D8 87AF004E */ lh $t7, 0x4e($sp) -/* AA077C 800295DC 87B80052 */ lh $t8, 0x52($sp) -/* AA0780 800295E0 87B90056 */ lh $t9, 0x56($sp) -/* AA0784 800295E4 8FA40038 */ lw $a0, 0x38($sp) -/* AA0788 800295E8 2405000D */ li $a1, 13 -/* AA078C 800295EC 24060080 */ li $a2, 128 -/* AA0790 800295F0 27A7001C */ addiu $a3, $sp, 0x1c -/* AA0794 800295F4 A7AE0030 */ sh $t6, 0x30($sp) -/* AA0798 800295F8 A7AF0032 */ sh $t7, 0x32($sp) -/* AA079C 800295FC A7B80034 */ sh $t8, 0x34($sp) -/* AA07A0 80029600 0C009DE6 */ jal EffectSs_Spawn -/* AA07A4 80029604 A7B90036 */ sh $t9, 0x36($sp) -/* AA07A8 80029608 8FBF0014 */ lw $ra, 0x14($sp) -/* AA07AC 8002960C 27BD0038 */ addiu $sp, $sp, 0x38 -/* AA07B0 80029610 03E00008 */ jr $ra -/* AA07B4 80029614 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029618.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029618.s deleted file mode 100644 index 00b86977c0..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029618.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_80029618 -/* AA07B8 80029618 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* AA07BC 8002961C AFBF0014 */ sw $ra, 0x14($sp) -/* AA07C0 80029620 AFA40050 */ sw $a0, 0x50($sp) -/* AA07C4 80029624 AFA60058 */ sw $a2, 0x58($sp) -/* AA07C8 80029628 AFA7005C */ sw $a3, 0x5c($sp) -/* AA07CC 8002962C 0C01DF90 */ jal Math_Vec3f_Copy -/* AA07D0 80029630 27A40018 */ addiu $a0, $sp, 0x18 -/* AA07D4 80029634 27A40024 */ addiu $a0, $sp, 0x24 -/* AA07D8 80029638 0C01DF90 */ jal Math_Vec3f_Copy -/* AA07DC 8002963C 8FA50058 */ lw $a1, 0x58($sp) -/* AA07E0 80029640 27A40030 */ addiu $a0, $sp, 0x30 -/* AA07E4 80029644 0C01DF90 */ jal Math_Vec3f_Copy -/* AA07E8 80029648 8FA5005C */ lw $a1, 0x5c($sp) -/* AA07EC 8002964C 87AE006A */ lh $t6, 0x6a($sp) -/* AA07F0 80029650 87AF0062 */ lh $t7, 0x62($sp) -/* AA07F4 80029654 87B80066 */ lh $t8, 0x66($sp) -/* AA07F8 80029658 87B9006E */ lh $t9, 0x6e($sp) -/* AA07FC 8002965C A3A0004C */ sb $zero, 0x4c($sp) -/* AA0800 80029660 8FA40050 */ lw $a0, 0x50($sp) -/* AA0804 80029664 2405000E */ li $a1, 14 -/* AA0808 80029668 24060080 */ li $a2, 128 -/* AA080C 8002966C 27A70018 */ addiu $a3, $sp, 0x18 -/* AA0810 80029670 A7AE0048 */ sh $t6, 0x48($sp) -/* AA0814 80029674 A7AF0044 */ sh $t7, 0x44($sp) -/* AA0818 80029678 A7B80046 */ sh $t8, 0x46($sp) -/* AA081C 8002967C 0C009DE6 */ jal EffectSs_Spawn -/* AA0820 80029680 A7B9004A */ sh $t9, 0x4a($sp) -/* AA0824 80029684 8FBF0014 */ lw $ra, 0x14($sp) -/* AA0828 80029688 27BD0050 */ addiu $sp, $sp, 0x50 -/* AA082C 8002968C 03E00008 */ jr $ra -/* AA0830 80029690 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029694.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029694.s deleted file mode 100644 index d804fe737b..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029694.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_80029694 -/* AA0834 80029694 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* AA0838 80029698 AFBF0014 */ sw $ra, 0x14($sp) -/* AA083C 8002969C AFA40050 */ sw $a0, 0x50($sp) -/* AA0840 800296A0 AFA60058 */ sw $a2, 0x58($sp) -/* AA0844 800296A4 AFA7005C */ sw $a3, 0x5c($sp) -/* AA0848 800296A8 0C01DF90 */ jal Math_Vec3f_Copy -/* AA084C 800296AC 27A40018 */ addiu $a0, $sp, 0x18 -/* AA0850 800296B0 27A40024 */ addiu $a0, $sp, 0x24 -/* AA0854 800296B4 0C01DF90 */ jal Math_Vec3f_Copy -/* AA0858 800296B8 8FA50058 */ lw $a1, 0x58($sp) -/* AA085C 800296BC 27A40030 */ addiu $a0, $sp, 0x30 -/* AA0860 800296C0 0C01DF90 */ jal Math_Vec3f_Copy -/* AA0864 800296C4 8FA5005C */ lw $a1, 0x5c($sp) -/* AA0868 800296C8 27A4003C */ addiu $a0, $sp, 0x3c -/* AA086C 800296CC 0C01E218 */ jal Color_RGBA8_Copy -/* AA0870 800296D0 8FA50060 */ lw $a1, 0x60($sp) -/* AA0874 800296D4 27A40040 */ addiu $a0, $sp, 0x40 -/* AA0878 800296D8 0C01E218 */ jal Color_RGBA8_Copy -/* AA087C 800296DC 8FA50064 */ lw $a1, 0x64($sp) -/* AA0880 800296E0 87AE006A */ lh $t6, 0x6a($sp) -/* AA0884 800296E4 87AF006E */ lh $t7, 0x6e($sp) -/* AA0888 800296E8 87B80072 */ lh $t8, 0x72($sp) -/* AA088C 800296EC 24190001 */ li $t9, 1 -/* AA0890 800296F0 A3B9004C */ sb $t9, 0x4c($sp) -/* AA0894 800296F4 8FA40050 */ lw $a0, 0x50($sp) -/* AA0898 800296F8 2405000E */ li $a1, 14 -/* AA089C 800296FC 24060080 */ li $a2, 128 -/* AA08A0 80029700 27A70018 */ addiu $a3, $sp, 0x18 -/* AA08A4 80029704 A7AE0044 */ sh $t6, 0x44($sp) -/* AA08A8 80029708 A7AF0046 */ sh $t7, 0x46($sp) -/* AA08AC 8002970C 0C009DE6 */ jal EffectSs_Spawn -/* AA08B0 80029710 A7B8004A */ sh $t8, 0x4a($sp) -/* AA08B4 80029714 8FBF0014 */ lw $ra, 0x14($sp) -/* AA08B8 80029718 27BD0050 */ addiu $sp, $sp, 0x50 -/* AA08BC 8002971C 03E00008 */ jr $ra -/* AA08C0 80029720 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029724.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029724.s deleted file mode 100644 index ce2ed37161..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029724.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80029724 -/* AA08C4 80029724 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* AA08C8 80029728 AFBF0014 */ sw $ra, 0x14($sp) -/* AA08CC 8002972C AFA40048 */ sw $a0, 0x48($sp) -/* AA08D0 80029730 AFA60050 */ sw $a2, 0x50($sp) -/* AA08D4 80029734 AFA70054 */ sw $a3, 0x54($sp) -/* AA08D8 80029738 0C01DF90 */ jal Math_Vec3f_Copy -/* AA08DC 8002973C 27A40018 */ addiu $a0, $sp, 0x18 -/* AA08E0 80029740 27A40024 */ addiu $a0, $sp, 0x24 -/* AA08E4 80029744 0C01DF90 */ jal Math_Vec3f_Copy -/* AA08E8 80029748 8FA50050 */ lw $a1, 0x50($sp) -/* AA08EC 8002974C 27A40030 */ addiu $a0, $sp, 0x30 -/* AA08F0 80029750 0C01DF90 */ jal Math_Vec3f_Copy -/* AA08F4 80029754 8FA50054 */ lw $a1, 0x54($sp) -/* AA08F8 80029758 8FAE0068 */ lw $t6, 0x68($sp) -/* AA08FC 8002975C 87AF005A */ lh $t7, 0x5a($sp) -/* AA0900 80029760 87B8005E */ lh $t8, 0x5e($sp) -/* AA0904 80029764 87B90062 */ lh $t9, 0x62($sp) -/* AA0908 80029768 87A80066 */ lh $t0, 0x66($sp) -/* AA090C 8002976C 8FA40048 */ lw $a0, 0x48($sp) -/* AA0910 80029770 2405000F */ li $a1, 15 -/* AA0914 80029774 24060080 */ li $a2, 128 -/* AA0918 80029778 27A70018 */ addiu $a3, $sp, 0x18 -/* AA091C 8002977C AFAE003C */ sw $t6, 0x3c($sp) -/* AA0920 80029780 A7AF0040 */ sh $t7, 0x40($sp) -/* AA0924 80029784 A7B80042 */ sh $t8, 0x42($sp) -/* AA0928 80029788 A7B90044 */ sh $t9, 0x44($sp) -/* AA092C 8002978C 0C009DE6 */ jal EffectSs_Spawn -/* AA0930 80029790 A7A80046 */ sh $t0, 0x46($sp) -/* AA0934 80029794 8FBF0014 */ lw $ra, 0x14($sp) -/* AA0938 80029798 27BD0048 */ addiu $sp, $sp, 0x48 -/* AA093C 8002979C 03E00008 */ jr $ra -/* AA0940 800297A0 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800297A4.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800297A4.s deleted file mode 100644 index 3f2b6c880e..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800297A4.s +++ /dev/null @@ -1,91 +0,0 @@ -.late_rodata -glabel D_80135C4C - .float -0.07 - -.text -glabel func_800297A4 -/* AA0944 800297A4 27BDFF78 */ addiu $sp, $sp, -0x88 -/* AA0948 800297A8 F7B60038 */ sdc1 $f22, 0x38($sp) -/* AA094C 800297AC 3C018013 */ lui $at, %hi(D_80135C4C) -/* AA0950 800297B0 4486B000 */ mtc1 $a2, $f22 -/* AA0954 800297B4 C4245C4C */ lwc1 $f4, %lo(D_80135C4C)($at) -/* AA0958 800297B8 AFB10044 */ sw $s1, 0x44($sp) -/* AA095C 800297BC 87B100A2 */ lh $s1, 0xa2($sp) -/* AA0960 800297C0 46162182 */ mul.s $f6, $f4, $f22 -/* AA0964 800297C4 44800000 */ mtc1 $zero, $f0 -/* AA0968 800297C8 AFB60058 */ sw $s6, 0x58($sp) -/* AA096C 800297CC 0007B400 */ sll $s6, $a3, 0x10 -/* AA0970 800297D0 AFB50054 */ sw $s5, 0x54($sp) -/* AA0974 800297D4 AFB40050 */ sw $s4, 0x50($sp) -/* AA0978 800297D8 AFB00040 */ sw $s0, 0x40($sp) -/* AA097C 800297DC 0080A025 */ move $s4, $a0 -/* AA0980 800297E0 00A0A825 */ move $s5, $a1 -/* AA0984 800297E4 0016B403 */ sra $s6, $s6, 0x10 -/* AA0988 800297E8 AFBF0064 */ sw $ra, 0x64($sp) -/* AA098C 800297EC AFBE0060 */ sw $fp, 0x60($sp) -/* AA0990 800297F0 AFB7005C */ sw $s7, 0x5c($sp) -/* AA0994 800297F4 AFB3004C */ sw $s3, 0x4c($sp) -/* AA0998 800297F8 AFB20048 */ sw $s2, 0x48($sp) -/* AA099C 800297FC F7B40030 */ sdc1 $f20, 0x30($sp) -/* AA09A0 80029800 AFA70094 */ sw $a3, 0x94($sp) -/* AA09A4 80029804 E7A60070 */ swc1 $f6, 0x70($sp) -/* AA09A8 80029808 00008025 */ move $s0, $zero -/* AA09AC 8002980C E7A00074 */ swc1 $f0, 0x74($sp) -/* AA09B0 80029810 1A200028 */ blez $s1, .L800298B4 -/* AA09B4 80029814 E7A0006C */ swc1 $f0, 0x6c($sp) -/* AA09B8 80029818 3C013F00 */ li $at, 0x3F000000 # 0.000000 -/* AA09BC 8002981C 4481A000 */ mtc1 $at, $f20 -/* AA09C0 80029820 87BE00AA */ lh $fp, 0xaa($sp) -/* AA09C4 80029824 87B700A6 */ lh $s7, 0xa6($sp) -/* AA09C8 80029828 87B3009E */ lh $s3, 0x9e($sp) -/* AA09CC 8002982C 87B2009A */ lh $s2, 0x9a($sp) -.L80029830: -/* AA09D0 80029830 0C03F66B */ jal Math_Rand_ZeroOne -/* AA09D4 80029834 00000000 */ nop -/* AA09D8 80029838 46140201 */ sub.s $f8, $f0, $f20 -/* AA09DC 8002983C 46164282 */ mul.s $f10, $f8, $f22 -/* AA09E0 80029840 0C03F66B */ jal Math_Rand_ZeroOne -/* AA09E4 80029844 E7AA0078 */ swc1 $f10, 0x78($sp) -/* AA09E8 80029848 46140401 */ sub.s $f16, $f0, $f20 -/* AA09EC 8002984C 46168482 */ mul.s $f18, $f16, $f22 -/* AA09F0 80029850 0C03F66B */ jal Math_Rand_ZeroOne -/* AA09F4 80029854 E7B20080 */ swc1 $f18, 0x80($sp) -/* AA09F8 80029858 46140102 */ mul.s $f4, $f0, $f20 -/* AA09FC 8002985C 00122400 */ sll $a0, $s2, 0x10 -/* AA0A00 80029860 00132C00 */ sll $a1, $s3, 0x10 -/* AA0A04 80029864 00052C03 */ sra $a1, $a1, 0x10 -/* AA0A08 80029868 00042403 */ sra $a0, $a0, 0x10 -/* AA0A0C 8002986C 46142180 */ add.s $f6, $f4, $f20 -/* AA0A10 80029870 46163202 */ mul.s $f8, $f6, $f22 -/* AA0A14 80029874 0C01DF64 */ jal Math_Rand_S16Offset -/* AA0A18 80029878 E7A8007C */ swc1 $f8, 0x7c($sp) -/* AA0A1C 8002987C 8FAE00AC */ lw $t6, 0xac($sp) -/* AA0A20 80029880 02802025 */ move $a0, $s4 -/* AA0A24 80029884 02A02825 */ move $a1, $s5 -/* AA0A28 80029888 27A60078 */ addiu $a2, $sp, 0x78 -/* AA0A2C 8002988C 27A7006C */ addiu $a3, $sp, 0x6c -/* AA0A30 80029890 AFB60010 */ sw $s6, 0x10($sp) -/* AA0A34 80029894 AFA20014 */ sw $v0, 0x14($sp) -/* AA0A38 80029898 AFB70018 */ sw $s7, 0x18($sp) -/* AA0A3C 8002989C AFBE001C */ sw $fp, 0x1c($sp) -/* AA0A40 800298A0 0C00A5C9 */ jal func_80029724 -/* AA0A44 800298A4 AFAE0020 */ sw $t6, 0x20($sp) -/* AA0A48 800298A8 26100001 */ addiu $s0, $s0, 1 -/* AA0A4C 800298AC 1611FFE0 */ bne $s0, $s1, .L80029830 -/* AA0A50 800298B0 00000000 */ nop -.L800298B4: -/* AA0A54 800298B4 8FBF0064 */ lw $ra, 0x64($sp) -/* AA0A58 800298B8 D7B40030 */ ldc1 $f20, 0x30($sp) -/* AA0A5C 800298BC D7B60038 */ ldc1 $f22, 0x38($sp) -/* AA0A60 800298C0 8FB00040 */ lw $s0, 0x40($sp) -/* AA0A64 800298C4 8FB10044 */ lw $s1, 0x44($sp) -/* AA0A68 800298C8 8FB20048 */ lw $s2, 0x48($sp) -/* AA0A6C 800298CC 8FB3004C */ lw $s3, 0x4c($sp) -/* AA0A70 800298D0 8FB40050 */ lw $s4, 0x50($sp) -/* AA0A74 800298D4 8FB50054 */ lw $s5, 0x54($sp) -/* AA0A78 800298D8 8FB60058 */ lw $s6, 0x58($sp) -/* AA0A7C 800298DC 8FB7005C */ lw $s7, 0x5c($sp) -/* AA0A80 800298E0 8FBE0060 */ lw $fp, 0x60($sp) -/* AA0A84 800298E4 03E00008 */ jr $ra -/* AA0A88 800298E8 27BD0088 */ addiu $sp, $sp, 0x88 - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800298EC.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800298EC.s deleted file mode 100644 index 56539bd226..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800298EC.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_800298EC -/* AA0A8C 800298EC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* AA0A90 800298F0 AFBF0014 */ sw $ra, 0x14($sp) -/* AA0A94 800298F4 AFA5002C */ sw $a1, 0x2c($sp) -/* AA0A98 800298F8 AFA60030 */ sw $a2, 0x30($sp) -/* AA0A9C 800298FC 8CB80000 */ lw $t8, ($a1) -/* AA0AA0 80029900 27A70018 */ addiu $a3, $sp, 0x18 -/* AA0AA4 80029904 24060080 */ li $a2, 128 -/* AA0AA8 80029908 ACF80000 */ sw $t8, ($a3) -/* AA0AAC 8002990C 8CAF0004 */ lw $t7, 4($a1) -/* AA0AB0 80029910 ACEF0004 */ sw $t7, 4($a3) -/* AA0AB4 80029914 8CB80008 */ lw $t8, 8($a1) -/* AA0AB8 80029918 24050010 */ li $a1, 16 -/* AA0ABC 8002991C ACF80008 */ sw $t8, 8($a3) -/* AA0AC0 80029920 87B90032 */ lh $t9, 0x32($sp) -/* AA0AC4 80029924 0C009DE6 */ jal EffectSs_Spawn -/* AA0AC8 80029928 A7B90024 */ sh $t9, 0x24($sp) -/* AA0ACC 8002992C 8FBF0014 */ lw $ra, 0x14($sp) -/* AA0AD0 80029930 27BD0028 */ addiu $sp, $sp, 0x28 -/* AA0AD4 80029934 03E00008 */ jr $ra -/* AA0AD8 80029938 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002993C.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002993C.s deleted file mode 100644 index 0da30733b3..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002993C.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_8002993C -/* AA0ADC 8002993C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* AA0AE0 80029940 AFBF0014 */ sw $ra, 0x14($sp) -/* AA0AE4 80029944 AFA40048 */ sw $a0, 0x48($sp) -/* AA0AE8 80029948 AFA60050 */ sw $a2, 0x50($sp) -/* AA0AEC 8002994C AFA70054 */ sw $a3, 0x54($sp) -/* AA0AF0 80029950 0C01DF90 */ jal Math_Vec3f_Copy -/* AA0AF4 80029954 27A4001C */ addiu $a0, $sp, 0x1c -/* AA0AF8 80029958 27A40028 */ addiu $a0, $sp, 0x28 -/* AA0AFC 8002995C 0C01DF90 */ jal Math_Vec3f_Copy -/* AA0B00 80029960 8FA50050 */ lw $a1, 0x50($sp) -/* AA0B04 80029964 27A40034 */ addiu $a0, $sp, 0x34 -/* AA0B08 80029968 0C01DF90 */ jal Math_Vec3f_Copy -/* AA0B0C 8002996C 8FA50054 */ lw $a1, 0x54($sp) -/* AA0B10 80029970 87AE005A */ lh $t6, 0x5a($sp) -/* AA0B14 80029974 87AF005E */ lh $t7, 0x5e($sp) -/* AA0B18 80029978 87B80062 */ lh $t8, 0x62($sp) -/* AA0B1C 8002997C 8FA40048 */ lw $a0, 0x48($sp) -/* AA0B20 80029980 24050011 */ li $a1, 17 -/* AA0B24 80029984 24060080 */ li $a2, 128 -/* AA0B28 80029988 27A7001C */ addiu $a3, $sp, 0x1c -/* AA0B2C 8002998C A7AE0040 */ sh $t6, 0x40($sp) -/* AA0B30 80029990 A7AF0042 */ sh $t7, 0x42($sp) -/* AA0B34 80029994 0C009DE6 */ jal EffectSs_Spawn -/* AA0B38 80029998 A7B80044 */ sh $t8, 0x44($sp) -/* AA0B3C 8002999C 8FBF0014 */ lw $ra, 0x14($sp) -/* AA0B40 800299A0 27BD0048 */ addiu $sp, $sp, 0x48 -/* AA0B44 800299A4 03E00008 */ jr $ra -/* AA0B48 800299A8 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800299AC.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800299AC.s deleted file mode 100644 index b2a3db198f..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800299AC.s +++ /dev/null @@ -1,108 +0,0 @@ -.late_rodata -glabel D_80135C50 - .float 1.99 - -.text -glabel func_800299AC -/* AA0B4C 800299AC 27BDFF88 */ addiu $sp, $sp, -0x78 -/* AA0B50 800299B0 3C0F8011 */ lui $t7, %hi(D_801158FC) # $t7, 0x8011 -/* AA0B54 800299B4 AFBF0044 */ sw $ra, 0x44($sp) -/* AA0B58 800299B8 AFB60040 */ sw $s6, 0x40($sp) -/* AA0B5C 800299BC AFB5003C */ sw $s5, 0x3c($sp) -/* AA0B60 800299C0 AFB40038 */ sw $s4, 0x38($sp) -/* AA0B64 800299C4 AFB30034 */ sw $s3, 0x34($sp) -/* AA0B68 800299C8 AFB20030 */ sw $s2, 0x30($sp) -/* AA0B6C 800299CC AFB1002C */ sw $s1, 0x2c($sp) -/* AA0B70 800299D0 AFB00028 */ sw $s0, 0x28($sp) -/* AA0B74 800299D4 25EF58FC */ addiu $t7, %lo(D_801158FC) # addiu $t7, $t7, 0x58fc -/* AA0B78 800299D8 8DF90000 */ lw $t9, ($t7) -/* AA0B7C 800299DC 27AE0068 */ addiu $t6, $sp, 0x68 -/* AA0B80 800299E0 8DF80004 */ lw $t8, 4($t7) -/* AA0B84 800299E4 ADD90000 */ sw $t9, ($t6) -/* AA0B88 800299E8 8DF90008 */ lw $t9, 8($t7) -/* AA0B8C 800299EC 3C098011 */ lui $t1, %hi(D_80115908) # $t1, 0x8011 -/* AA0B90 800299F0 25295908 */ addiu $t1, %lo(D_80115908) # addiu $t1, $t1, 0x5908 -/* AA0B94 800299F4 ADD80004 */ sw $t8, 4($t6) -/* AA0B98 800299F8 ADD90008 */ sw $t9, 8($t6) -/* AA0B9C 800299FC 8D2B0000 */ lw $t3, ($t1) -/* AA0BA0 80029A00 27A8005C */ addiu $t0, $sp, 0x5c -/* AA0BA4 80029A04 8D2A0004 */ lw $t2, 4($t1) -/* AA0BA8 80029A08 AD0B0000 */ sw $t3, ($t0) -/* AA0BAC 80029A0C 8D2B0008 */ lw $t3, 8($t1) -/* AA0BB0 80029A10 3C0C8011 */ lui $t4, %hi(D_80115914) # $t4, 0x8011 -/* AA0BB4 80029A14 258C5914 */ addiu $t4, %lo(D_80115914) # addiu $t4, $t4, 0x5914 -/* AA0BB8 80029A18 AD0A0004 */ sw $t2, 4($t0) -/* AA0BBC 80029A1C AD0B0008 */ sw $t3, 8($t0) -/* AA0BC0 80029A20 8D8E0000 */ lw $t6, ($t4) -/* AA0BC4 80029A24 27B20050 */ addiu $s2, $sp, 0x50 -/* AA0BC8 80029A28 0080A025 */ move $s4, $a0 -/* AA0BCC 80029A2C AE4E0000 */ sw $t6, ($s2) -/* AA0BD0 80029A30 8D8D0004 */ lw $t5, 4($t4) -/* AA0BD4 80029A34 00A0A825 */ move $s5, $a1 -/* AA0BD8 80029A38 AE4D0004 */ sw $t5, 4($s2) -/* AA0BDC 80029A3C 8D8E0008 */ lw $t6, 8($t4) -/* AA0BE0 80029A40 0C03F66B */ jal Math_Rand_ZeroOne -/* AA0BE4 80029A44 AE4E0008 */ sw $t6, 8($s2) -/* AA0BE8 80029A48 3C018013 */ lui $at, %hi(D_80135C50) -/* AA0BEC 80029A4C C4245C50 */ lwc1 $f4, %lo(D_80135C50)($at) -/* AA0BF0 80029A50 3C168016 */ lui $s6, %hi(gGameInfo) # $s6, 0x8016 -/* AA0BF4 80029A54 26D6FA90 */ addiu $s6, %lo(gGameInfo) # addiu $s6, $s6, -0x570 -/* AA0BF8 80029A58 46040182 */ mul.s $f6, $f0, $f4 -/* AA0BFC 80029A5C 8ED00000 */ lw $s0, ($s6) -/* AA0C00 80029A60 00008825 */ move $s1, $zero -/* AA0C04 80029A64 861809FA */ lh $t8, 0x9fa($s0) -/* AA0C08 80029A68 4600320D */ trunc.w.s $f8, $f6 -/* AA0C0C 80029A6C 2719001E */ addiu $t9, $t8, 0x1e -/* AA0C10 80029A70 44134000 */ mfc1 $s3, $f8 -/* AA0C14 80029A74 00000000 */ nop -/* AA0C18 80029A78 00139C00 */ sll $s3, $s3, 0x10 -/* AA0C1C 80029A7C 1B200022 */ blez $t9, .L80029B08 -/* AA0C20 80029A80 00139C03 */ sra $s3, $s3, 0x10 -/* AA0C24 80029A84 86080A0A */ lh $t0, 0xa0a($s0) -.L80029A88: -/* AA0C28 80029A88 AFB30014 */ sw $s3, 0x14($sp) -/* AA0C2C 80029A8C 02802025 */ move $a0, $s4 -/* AA0C30 80029A90 25090006 */ addiu $t1, $t0, 6 -/* AA0C34 80029A94 0229001A */ div $zero, $s1, $t1 -/* AA0C38 80029A98 00005012 */ mflo $t2 -/* AA0C3C 80029A9C AFAA0010 */ sw $t2, 0x10($sp) -/* AA0C40 80029AA0 860B09F8 */ lh $t3, 0x9f8($s0) -/* AA0C44 80029AA4 02A02825 */ move $a1, $s5 -/* AA0C48 80029AA8 02403025 */ move $a2, $s2 -/* AA0C4C 80029AAC 256C0028 */ addiu $t4, $t3, 0x28 -/* AA0C50 80029AB0 AFAC0018 */ sw $t4, 0x18($sp) -/* AA0C54 80029AB4 02403825 */ move $a3, $s2 -/* AA0C58 80029AB8 15200002 */ bnez $t1, .L80029AC4 -/* AA0C5C 80029ABC 00000000 */ nop -/* AA0C60 80029AC0 0007000D */ break 7 -.L80029AC4: -/* AA0C64 80029AC4 2401FFFF */ li $at, -1 -/* AA0C68 80029AC8 15210004 */ bne $t1, $at, .L80029ADC -/* AA0C6C 80029ACC 3C018000 */ lui $at, 0x8000 -/* AA0C70 80029AD0 16210002 */ bne $s1, $at, .L80029ADC -/* AA0C74 80029AD4 00000000 */ nop -/* AA0C78 80029AD8 0006000D */ break 6 -.L80029ADC: -/* AA0C7C 80029ADC 0C00A64F */ jal func_8002993C -/* AA0C80 80029AE0 00000000 */ nop -/* AA0C84 80029AE4 8ED00000 */ lw $s0, ($s6) -/* AA0C88 80029AE8 26310001 */ addiu $s1, $s1, 1 -/* AA0C8C 80029AEC 00118C00 */ sll $s1, $s1, 0x10 -/* AA0C90 80029AF0 860D09FA */ lh $t5, 0x9fa($s0) -/* AA0C94 80029AF4 00118C03 */ sra $s1, $s1, 0x10 -/* AA0C98 80029AF8 25AE001E */ addiu $t6, $t5, 0x1e -/* AA0C9C 80029AFC 022E082A */ slt $at, $s1, $t6 -/* AA0CA0 80029B00 5420FFE1 */ bnezl $at, .L80029A88 -/* AA0CA4 80029B04 86080A0A */ lh $t0, 0xa0a($s0) -.L80029B08: -/* AA0CA8 80029B08 8FBF0044 */ lw $ra, 0x44($sp) -/* AA0CAC 80029B0C 8FB00028 */ lw $s0, 0x28($sp) -/* AA0CB0 80029B10 8FB1002C */ lw $s1, 0x2c($sp) -/* AA0CB4 80029B14 8FB20030 */ lw $s2, 0x30($sp) -/* AA0CB8 80029B18 8FB30034 */ lw $s3, 0x34($sp) -/* AA0CBC 80029B1C 8FB40038 */ lw $s4, 0x38($sp) -/* AA0CC0 80029B20 8FB5003C */ lw $s5, 0x3c($sp) -/* AA0CC4 80029B24 8FB60040 */ lw $s6, 0x40($sp) -/* AA0CC8 80029B28 03E00008 */ jr $ra -/* AA0CCC 80029B2C 27BD0078 */ addiu $sp, $sp, 0x78 - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029B30.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029B30.s deleted file mode 100644 index d132276f33..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029B30.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80029B30 -/* AA0CD0 80029B30 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* AA0CD4 80029B34 AFBF0014 */ sw $ra, 0x14($sp) -/* AA0CD8 80029B38 AFA40040 */ sw $a0, 0x40($sp) -/* AA0CDC 80029B3C AFA60048 */ sw $a2, 0x48($sp) -/* AA0CE0 80029B40 AFA7004C */ sw $a3, 0x4c($sp) -/* AA0CE4 80029B44 0C01DF90 */ jal Math_Vec3f_Copy -/* AA0CE8 80029B48 27A40018 */ addiu $a0, $sp, 0x18 -/* AA0CEC 80029B4C 27A40024 */ addiu $a0, $sp, 0x24 -/* AA0CF0 80029B50 0C01DF90 */ jal Math_Vec3f_Copy -/* AA0CF4 80029B54 8FA50048 */ lw $a1, 0x48($sp) -/* AA0CF8 80029B58 27A40030 */ addiu $a0, $sp, 0x30 -/* AA0CFC 80029B5C 0C01DF90 */ jal Math_Vec3f_Copy -/* AA0D00 80029B60 8FA5004C */ lw $a1, 0x4c($sp) -/* AA0D04 80029B64 87AE0052 */ lh $t6, 0x52($sp) -/* AA0D08 80029B68 8FA40040 */ lw $a0, 0x40($sp) -/* AA0D0C 80029B6C 24050012 */ li $a1, 18 -/* AA0D10 80029B70 24060080 */ li $a2, 128 -/* AA0D14 80029B74 27A70018 */ addiu $a3, $sp, 0x18 -/* AA0D18 80029B78 0C009DE6 */ jal EffectSs_Spawn -/* AA0D1C 80029B7C A7AE003C */ sh $t6, 0x3c($sp) -/* AA0D20 80029B80 8FBF0014 */ lw $ra, 0x14($sp) -/* AA0D24 80029B84 27BD0040 */ addiu $sp, $sp, 0x40 -/* AA0D28 80029B88 03E00008 */ jr $ra -/* AA0D2C 80029B8C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029B90.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029B90.s deleted file mode 100644 index 8adfe8ebe8..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029B90.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_80029B90 -/* AA0D30 80029B90 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* AA0D34 80029B94 AFBF0014 */ sw $ra, 0x14($sp) -/* AA0D38 80029B98 AFA40038 */ sw $a0, 0x38($sp) -/* AA0D3C 80029B9C AFA60040 */ sw $a2, 0x40($sp) -/* AA0D40 80029BA0 AFA70044 */ sw $a3, 0x44($sp) -/* AA0D44 80029BA4 0C01DF90 */ jal Math_Vec3f_Copy -/* AA0D48 80029BA8 27A4001C */ addiu $a0, $sp, 0x1c -/* AA0D4C 80029BAC 27A40028 */ addiu $a0, $sp, 0x28 -/* AA0D50 80029BB0 0C01E218 */ jal Color_RGBA8_Copy -/* AA0D54 80029BB4 8FA50040 */ lw $a1, 0x40($sp) -/* AA0D58 80029BB8 27A4002C */ addiu $a0, $sp, 0x2c -/* AA0D5C 80029BBC 0C01E218 */ jal Color_RGBA8_Copy -/* AA0D60 80029BC0 8FA50044 */ lw $a1, 0x44($sp) -/* AA0D64 80029BC4 87AE004A */ lh $t6, 0x4a($sp) -/* AA0D68 80029BC8 87AF004E */ lh $t7, 0x4e($sp) -/* AA0D6C 80029BCC 87B80052 */ lh $t8, 0x52($sp) -/* AA0D70 80029BD0 8FA40038 */ lw $a0, 0x38($sp) -/* AA0D74 80029BD4 24050013 */ li $a1, 19 -/* AA0D78 80029BD8 24060080 */ li $a2, 128 -/* AA0D7C 80029BDC 27A7001C */ addiu $a3, $sp, 0x1c -/* AA0D80 80029BE0 A7AE0030 */ sh $t6, 0x30($sp) -/* AA0D84 80029BE4 A7AF0032 */ sh $t7, 0x32($sp) -/* AA0D88 80029BE8 0C009DE6 */ jal EffectSs_Spawn -/* AA0D8C 80029BEC A7B80034 */ sh $t8, 0x34($sp) -/* AA0D90 80029BF0 8FBF0014 */ lw $ra, 0x14($sp) -/* AA0D94 80029BF4 27BD0038 */ addiu $sp, $sp, 0x38 -/* AA0D98 80029BF8 03E00008 */ jr $ra -/* AA0D9C 80029BFC 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029C00.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029C00.s deleted file mode 100644 index a5be71efc5..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029C00.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80029C00 -/* AA0DA0 80029C00 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* AA0DA4 80029C04 AFBF0014 */ sw $ra, 0x14($sp) -/* AA0DA8 80029C08 AFA5002C */ sw $a1, 0x2c($sp) -/* AA0DAC 80029C0C AFA60030 */ sw $a2, 0x30($sp) -/* AA0DB0 80029C10 8CB80000 */ lw $t8, ($a1) -/* AA0DB4 80029C14 27A70018 */ addiu $a3, $sp, 0x18 -/* AA0DB8 80029C18 24060080 */ li $a2, 128 -/* AA0DBC 80029C1C ACF80000 */ sw $t8, ($a3) -/* AA0DC0 80029C20 8CAF0004 */ lw $t7, 4($a1) -/* AA0DC4 80029C24 ACEF0004 */ sw $t7, 4($a3) -/* AA0DC8 80029C28 8CB80008 */ lw $t8, 8($a1) -/* AA0DCC 80029C2C 24050014 */ li $a1, 20 -/* AA0DD0 80029C30 ACF80008 */ sw $t8, 8($a3) -/* AA0DD4 80029C34 8FB90030 */ lw $t9, 0x30($sp) -/* AA0DD8 80029C38 0C009DE6 */ jal EffectSs_Spawn -/* AA0DDC 80029C3C AFB90024 */ sw $t9, 0x24($sp) -/* AA0DE0 80029C40 8FBF0014 */ lw $ra, 0x14($sp) -/* AA0DE4 80029C44 27BD0028 */ addiu $sp, $sp, 0x28 -/* AA0DE8 80029C48 03E00008 */ jr $ra -/* AA0DEC 80029C4C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029C50.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029C50.s deleted file mode 100644 index 28c42d18e9..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029C50.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80029C50 -/* AA0DF0 80029C50 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* AA0DF4 80029C54 AFA60038 */ sw $a2, 0x38($sp) -/* AA0DF8 80029C58 00063400 */ sll $a2, $a2, 0x10 -/* AA0DFC 80029C5C 00063403 */ sra $a2, $a2, 0x10 -/* AA0E00 80029C60 AFBF0014 */ sw $ra, 0x14($sp) -/* AA0E04 80029C64 AFA40030 */ sw $a0, 0x30($sp) -/* AA0E08 80029C68 AFA50034 */ sw $a1, 0x34($sp) -/* AA0E0C 80029C6C AFA5001C */ sw $a1, 0x1c($sp) -/* AA0E10 80029C70 A7A60020 */ sh $a2, 0x20($sp) -/* AA0E14 80029C74 00E02825 */ move $a1, $a3 -/* AA0E18 80029C78 0C01DF90 */ jal Math_Vec3f_Copy -/* AA0E1C 80029C7C 27A40024 */ addiu $a0, $sp, 0x24 -/* AA0E20 80029C80 8FA40030 */ lw $a0, 0x30($sp) -/* AA0E24 80029C84 24050015 */ li $a1, 21 -/* AA0E28 80029C88 24060080 */ li $a2, 128 -/* AA0E2C 80029C8C 0C009DE6 */ jal EffectSs_Spawn -/* AA0E30 80029C90 27A7001C */ addiu $a3, $sp, 0x1c -/* AA0E34 80029C94 8FBF0014 */ lw $ra, 0x14($sp) -/* AA0E38 80029C98 27BD0030 */ addiu $sp, $sp, 0x30 -/* AA0E3C 80029C9C 03E00008 */ jr $ra -/* AA0E40 80029CA0 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029CA4.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029CA4.s deleted file mode 100644 index 5bbd10ba84..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029CA4.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80029CA4 -/* AA0E44 80029CA4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AA0E48 80029CA8 AFBF0014 */ sw $ra, 0x14($sp) -/* AA0E4C 80029CAC 00C03825 */ move $a3, $a2 -/* AA0E50 80029CB0 0C00A714 */ jal func_80029C50 -/* AA0E54 80029CB4 2406012C */ li $a2, 300 -/* AA0E58 80029CB8 8FBF0014 */ lw $ra, 0x14($sp) -/* AA0E5C 80029CBC 27BD0018 */ addiu $sp, $sp, 0x18 -/* AA0E60 80029CC0 03E00008 */ jr $ra -/* AA0E64 80029CC4 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029CC8.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029CC8.s deleted file mode 100644 index e44fa9cd92..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029CC8.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_80029CC8 -/* AA0E68 80029CC8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AA0E6C 80029CCC AFA60020 */ sw $a2, 0x20($sp) -/* AA0E70 80029CD0 00063400 */ sll $a2, $a2, 0x10 -/* AA0E74 80029CD4 AFBF0014 */ sw $ra, 0x14($sp) -/* AA0E78 80029CD8 0C00A714 */ jal func_80029C50 -/* AA0E7C 80029CDC 00063403 */ sra $a2, $a2, 0x10 -/* AA0E80 80029CE0 8FBF0014 */ lw $ra, 0x14($sp) -/* AA0E84 80029CE4 27BD0018 */ addiu $sp, $sp, 0x18 -/* AA0E88 80029CE8 03E00008 */ jr $ra -/* AA0E8C 80029CEC 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029DBC.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029DBC.s deleted file mode 100644 index b16edf2896..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029DBC.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_80029DBC -/* AA0F5C 80029DBC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* AA0F60 80029DC0 AFBF0014 */ sw $ra, 0x14($sp) -/* AA0F64 80029DC4 AFA40040 */ sw $a0, 0x40($sp) -/* AA0F68 80029DC8 AFA60048 */ sw $a2, 0x48($sp) -/* AA0F6C 80029DCC AFA7004C */ sw $a3, 0x4c($sp) -/* AA0F70 80029DD0 0C01DF90 */ jal Math_Vec3f_Copy -/* AA0F74 80029DD4 27A40018 */ addiu $a0, $sp, 0x18 -/* AA0F78 80029DD8 27A40024 */ addiu $a0, $sp, 0x24 -/* AA0F7C 80029DDC 0C01DF90 */ jal Math_Vec3f_Copy -/* AA0F80 80029DE0 8FA50048 */ lw $a1, 0x48($sp) -/* AA0F84 80029DE4 27A40030 */ addiu $a0, $sp, 0x30 -/* AA0F88 80029DE8 0C01DF90 */ jal Math_Vec3f_Copy -/* AA0F8C 80029DEC 8FA5004C */ lw $a1, 0x4c($sp) -/* AA0F90 80029DF0 87AE0052 */ lh $t6, 0x52($sp) -/* AA0F94 80029DF4 93AF0057 */ lbu $t7, 0x57($sp) -/* AA0F98 80029DF8 8FA40040 */ lw $a0, 0x40($sp) -/* AA0F9C 80029DFC 24050017 */ li $a1, 23 -/* AA0FA0 80029E00 24060080 */ li $a2, 128 -/* AA0FA4 80029E04 27A70018 */ addiu $a3, $sp, 0x18 -/* AA0FA8 80029E08 A7AE003C */ sh $t6, 0x3c($sp) -/* AA0FAC 80029E0C 0C009DE6 */ jal EffectSs_Spawn -/* AA0FB0 80029E10 A3AF003E */ sb $t7, 0x3e($sp) -/* AA0FB4 80029E14 8FBF0014 */ lw $ra, 0x14($sp) -/* AA0FB8 80029E18 27BD0040 */ addiu $sp, $sp, 0x40 -/* AA0FBC 80029E1C 03E00008 */ jr $ra -/* AA0FC0 80029E20 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029E8C.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029E8C.s deleted file mode 100644 index ea8e2231db..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029E8C.s +++ /dev/null @@ -1,48 +0,0 @@ -glabel func_80029E8C -/* AA102C 80029E8C 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* AA1030 80029E90 AFBF0014 */ sw $ra, 0x14($sp) -/* AA1034 80029E94 AFA40058 */ sw $a0, 0x58($sp) -/* AA1038 80029E98 AFA60060 */ sw $a2, 0x60($sp) -/* AA103C 80029E9C AFA70064 */ sw $a3, 0x64($sp) -/* AA1040 80029EA0 0C01DF90 */ jal Math_Vec3f_Copy -/* AA1044 80029EA4 27A40018 */ addiu $a0, $sp, 0x18 -/* AA1048 80029EA8 27A40024 */ addiu $a0, $sp, 0x24 -/* AA104C 80029EAC 0C01DF90 */ jal Math_Vec3f_Copy -/* AA1050 80029EB0 8FA50060 */ lw $a1, 0x60($sp) -/* AA1054 80029EB4 27A40030 */ addiu $a0, $sp, 0x30 -/* AA1058 80029EB8 0C01DF90 */ jal Math_Vec3f_Copy -/* AA105C 80029EBC 8FA50064 */ lw $a1, 0x64($sp) -/* AA1060 80029EC0 87AE006A */ lh $t6, 0x6a($sp) -/* AA1064 80029EC4 87AF006E */ lh $t7, 0x6e($sp) -/* AA1068 80029EC8 87B80072 */ lh $t8, 0x72($sp) -/* AA106C 80029ECC A7AE003C */ sh $t6, 0x3c($sp) -/* AA1070 80029ED0 A7AF003E */ sh $t7, 0x3e($sp) -/* AA1074 80029ED4 87B90076 */ lh $t9, 0x76($sp) -/* AA1078 80029ED8 87A8007A */ lh $t0, 0x7a($sp) -/* AA107C 80029EDC 87A9007E */ lh $t1, 0x7e($sp) -/* AA1080 80029EE0 87AA0082 */ lh $t2, 0x82($sp) -/* AA1084 80029EE4 87AB0086 */ lh $t3, 0x86($sp) -/* AA1088 80029EE8 8FAC0088 */ lw $t4, 0x88($sp) -/* AA108C 80029EEC 87AD008E */ lh $t5, 0x8e($sp) -/* AA1090 80029EF0 87AE0092 */ lh $t6, 0x92($sp) -/* AA1094 80029EF4 8FAF0094 */ lw $t7, 0x94($sp) -/* AA1098 80029EF8 8FA40058 */ lw $a0, 0x58($sp) -/* AA109C 80029EFC 24050019 */ li $a1, 25 -/* AA10A0 80029F00 24060065 */ li $a2, 101 -/* AA10A4 80029F04 27A70018 */ addiu $a3, $sp, 0x18 -/* AA10A8 80029F08 A7B80040 */ sh $t8, 0x40($sp) -/* AA10AC 80029F0C A7B90042 */ sh $t9, 0x42($sp) -/* AA10B0 80029F10 A7A80044 */ sh $t0, 0x44($sp) -/* AA10B4 80029F14 A7A90046 */ sh $t1, 0x46($sp) -/* AA10B8 80029F18 A7AA0048 */ sh $t2, 0x48($sp) -/* AA10BC 80029F1C A7AB004A */ sh $t3, 0x4a($sp) -/* AA10C0 80029F20 AFAC004C */ sw $t4, 0x4c($sp) -/* AA10C4 80029F24 A7AD0050 */ sh $t5, 0x50($sp) -/* AA10C8 80029F28 A7AE0052 */ sh $t6, 0x52($sp) -/* AA10CC 80029F2C 0C009DE6 */ jal EffectSs_Spawn -/* AA10D0 80029F30 AFAF0054 */ sw $t7, 0x54($sp) -/* AA10D4 80029F34 8FBF0014 */ lw $ra, 0x14($sp) -/* AA10D8 80029F38 27BD0058 */ addiu $sp, $sp, 0x58 -/* AA10DC 80029F3C 03E00008 */ jr $ra -/* AA10E0 80029F40 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029F44.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029F44.s deleted file mode 100644 index b0bd9b705e..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029F44.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_80029F44 -/* AA10E4 80029F44 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* AA10E8 80029F48 AFBF0014 */ sw $ra, 0x14($sp) -/* AA10EC 80029F4C AFA40048 */ sw $a0, 0x48($sp) -/* AA10F0 80029F50 AFA60050 */ sw $a2, 0x50($sp) -/* AA10F4 80029F54 AFA70054 */ sw $a3, 0x54($sp) -/* AA10F8 80029F58 0C01DF90 */ jal Math_Vec3f_Copy -/* AA10FC 80029F5C 27A4001C */ addiu $a0, $sp, 0x1c -/* AA1100 80029F60 27A4002C */ addiu $a0, $sp, 0x2c -/* AA1104 80029F64 0C01DF90 */ jal Math_Vec3f_Copy -/* AA1108 80029F68 8FA50054 */ lw $a1, 0x54($sp) -/* AA110C 80029F6C 27A40038 */ addiu $a0, $sp, 0x38 -/* AA1110 80029F70 0C01DF90 */ jal Math_Vec3f_Copy -/* AA1114 80029F74 8FA50058 */ lw $a1, 0x58($sp) -/* AA1118 80029F78 C7A40050 */ lwc1 $f4, 0x50($sp) -/* AA111C 80029F7C 8FAE005C */ lw $t6, 0x5c($sp) -/* AA1120 80029F80 8FA40048 */ lw $a0, 0x48($sp) -/* AA1124 80029F84 2405001A */ li $a1, 26 -/* AA1128 80029F88 24060080 */ li $a2, 128 -/* AA112C 80029F8C 27A7001C */ addiu $a3, $sp, 0x1c -/* AA1130 80029F90 E7A40028 */ swc1 $f4, 0x28($sp) -/* AA1134 80029F94 0C009DE6 */ jal EffectSs_Spawn -/* AA1138 80029F98 AFAE0044 */ sw $t6, 0x44($sp) -/* AA113C 80029F9C 8FBF0014 */ lw $ra, 0x14($sp) -/* AA1140 80029FA0 27BD0048 */ addiu $sp, $sp, 0x48 -/* AA1144 80029FA4 03E00008 */ jr $ra -/* AA1148 80029FA8 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029FAC.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029FAC.s deleted file mode 100644 index c903726167..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029FAC.s +++ /dev/null @@ -1,115 +0,0 @@ -.late_rodata -glabel D_80135C54 - .float -0.2 - -glabel D_80135C58 - .float 1.3 - -glabel D_80135C5C - .float 0.18 - -.text -glabel func_80029FAC -/* AA114C 80029FAC 3C018013 */ lui $at, %hi(D_80135C54) -/* AA1150 80029FB0 C4245C54 */ lwc1 $f4, %lo(D_80135C54)($at) -/* AA1154 80029FB4 27BDFF70 */ addiu $sp, $sp, -0x90 -/* AA1158 80029FB8 3C018011 */ lui $at, %hi(D_80115924) -/* AA115C 80029FBC E4245924 */ swc1 $f4, %lo(D_80115924)($at) -/* AA1160 80029FC0 3C018013 */ lui $at, %hi(D_80135C58) -/* AA1164 80029FC4 44866000 */ mtc1 $a2, $f12 -/* AA1168 80029FC8 C4265C58 */ lwc1 $f6, %lo(D_80135C58)($at) -/* AA116C 80029FCC 3C0142C8 */ li $at, 0x42C80000 # 0.000000 -/* AA1170 80029FD0 44815000 */ mtc1 $at, $f10 -/* AA1174 80029FD4 46066202 */ mul.s $f8, $f12, $f6 -/* AA1178 80029FD8 F7B80030 */ sdc1 $f24, 0x30($sp) -/* AA117C 80029FDC 3C013F00 */ li $at, 0x3F000000 # 0.000000 -/* AA1180 80029FE0 4481C000 */ mtc1 $at, $f24 -/* AA1184 80029FE4 F7B60028 */ sdc1 $f22, 0x28($sp) -/* AA1188 80029FE8 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* AA118C 80029FEC AFB60058 */ sw $s6, 0x58($sp) -/* AA1190 80029FF0 AFB50054 */ sw $s5, 0x54($sp) -/* AA1194 80029FF4 AFB00040 */ sw $s0, 0x40($sp) -/* AA1198 80029FF8 F7BA0038 */ sdc1 $f26, 0x38($sp) -/* AA119C 80029FFC 4481B000 */ mtc1 $at, $f22 -/* AA11A0 8002A000 AFB40050 */ sw $s4, 0x50($sp) -/* AA11A4 8002A004 AFB3004C */ sw $s3, 0x4c($sp) -/* AA11A8 8002A008 AFB20048 */ sw $s2, 0x48($sp) -/* AA11AC 8002A00C AFB10044 */ sw $s1, 0x44($sp) -/* AA11B0 8002A010 F7B40020 */ sdc1 $f20, 0x20($sp) -/* AA11B4 8002A014 3C018013 */ lui $at, %hi(D_80135C5C) -/* AA11B8 8002A018 3C108011 */ lui $s0, %hi(D_8011592C) # $s0, 0x8011 -/* AA11BC 8002A01C 3C158011 */ lui $s5, %hi(D_80115920) # $s5, 0x8011 -/* AA11C0 8002A020 3C168011 */ lui $s6, %hi(D_801159A4) # $s6, 0x8011 -/* AA11C4 8002A024 460A4682 */ mul.s $f26, $f8, $f10 -/* AA11C8 8002A028 00A09025 */ move $s2, $a1 -/* AA11CC 8002A02C 00809825 */ move $s3, $a0 -/* AA11D0 8002A030 AFBF005C */ sw $ra, 0x5c($sp) -/* AA11D4 8002A034 26D659A4 */ addiu $s6, %lo(D_801159A4) # addiu $s6, $s6, 0x59a4 -/* AA11D8 8002A038 26B55920 */ addiu $s5, %lo(D_80115920) # addiu $s5, $s5, 0x5920 -/* AA11DC 8002A03C 2610592C */ addiu $s0, %lo(D_8011592C) # addiu $s0, $s0, 0x592c -/* AA11E0 8002A040 C4345C5C */ lwc1 $f20, %lo(D_80135C5C)($at) -/* AA11E4 8002A044 27B10074 */ addiu $s1, $sp, 0x74 -/* AA11E8 8002A048 27B40080 */ addiu $s4, $sp, 0x80 -/* AA11EC 8002A04C 8E4F0000 */ lw $t7, ($s2) -.L8002A050: -/* AA11F0 8002A050 4600B306 */ mov.s $f12, $f22 -/* AA11F4 8002A054 AE2F0000 */ sw $t7, ($s1) -/* AA11F8 8002A058 8E4E0004 */ lw $t6, 4($s2) -/* AA11FC 8002A05C AE2E0004 */ sw $t6, 4($s1) -/* AA1200 8002A060 8E4F0008 */ lw $t7, 8($s2) -/* AA1204 8002A064 0C00CFBE */ jal Math_Rand_ZeroFloat -/* AA1208 8002A068 AE2F0008 */ sw $t7, 8($s1) -/* AA120C 8002A06C C60E0000 */ lwc1 $f14, ($s0) -/* AA1210 8002A070 46180080 */ add.s $f2, $f0, $f24 -/* AA1214 8002A074 C6100004 */ lwc1 $f16, 4($s0) -/* AA1218 8002A078 46147102 */ mul.s $f4, $f14, $f20 -/* AA121C 8002A07C C6120008 */ lwc1 $f18, 8($s0) -/* AA1220 8002A080 4600B306 */ mov.s $f12, $f22 -/* AA1224 8002A084 46022182 */ mul.s $f6, $f4, $f2 -/* AA1228 8002A088 00000000 */ nop -/* AA122C 8002A08C 46148202 */ mul.s $f8, $f16, $f20 -/* AA1230 8002A090 E7A60080 */ swc1 $f6, 0x80($sp) -/* AA1234 8002A094 46024282 */ mul.s $f10, $f8, $f2 -/* AA1238 8002A098 C7A80074 */ lwc1 $f8, 0x74($sp) -/* AA123C 8002A09C 46149102 */ mul.s $f4, $f18, $f20 -/* AA1240 8002A0A0 E7AA0084 */ swc1 $f10, 0x84($sp) -/* AA1244 8002A0A4 460E4280 */ add.s $f10, $f8, $f14 -/* AA1248 8002A0A8 C7A8007C */ lwc1 $f8, 0x7c($sp) -/* AA124C 8002A0AC 46022182 */ mul.s $f6, $f4, $f2 -/* AA1250 8002A0B0 C7A40078 */ lwc1 $f4, 0x78($sp) -/* AA1254 8002A0B4 E7AA0074 */ swc1 $f10, 0x74($sp) -/* AA1258 8002A0B8 46124280 */ add.s $f10, $f8, $f18 -/* AA125C 8002A0BC E7A60088 */ swc1 $f6, 0x88($sp) -/* AA1260 8002A0C0 46102180 */ add.s $f6, $f4, $f16 -/* AA1264 8002A0C4 E7AA007C */ swc1 $f10, 0x7c($sp) -/* AA1268 8002A0C8 0C00CFBE */ jal Math_Rand_ZeroFloat -/* AA126C 8002A0CC E7A60078 */ swc1 $f6, 0x78($sp) -/* AA1270 8002A0D0 46180100 */ add.s $f4, $f0, $f24 -/* AA1274 8002A0D4 24180019 */ li $t8, 25 -/* AA1278 8002A0D8 AFB80014 */ sw $t8, 0x14($sp) -/* AA127C 8002A0DC 02602025 */ move $a0, $s3 -/* AA1280 8002A0E0 461A2182 */ mul.s $f6, $f4, $f26 -/* AA1284 8002A0E4 02202825 */ move $a1, $s1 -/* AA1288 8002A0E8 02803825 */ move $a3, $s4 -/* AA128C 8002A0EC AFB50010 */ sw $s5, 0x10($sp) -/* AA1290 8002A0F0 44063000 */ mfc1 $a2, $f6 -/* AA1294 8002A0F4 0C00A7D1 */ jal func_80029F44 -/* AA1298 8002A0F8 00000000 */ nop -/* AA129C 8002A0FC 2610000C */ addiu $s0, $s0, 0xc -/* AA12A0 8002A100 5616FFD3 */ bnel $s0, $s6, .L8002A050 -/* AA12A4 8002A104 8E4F0000 */ lw $t7, ($s2) -/* AA12A8 8002A108 8FBF005C */ lw $ra, 0x5c($sp) -/* AA12AC 8002A10C D7B40020 */ ldc1 $f20, 0x20($sp) -/* AA12B0 8002A110 D7B60028 */ ldc1 $f22, 0x28($sp) -/* AA12B4 8002A114 D7B80030 */ ldc1 $f24, 0x30($sp) -/* AA12B8 8002A118 D7BA0038 */ ldc1 $f26, 0x38($sp) -/* AA12BC 8002A11C 8FB00040 */ lw $s0, 0x40($sp) -/* AA12C0 8002A120 8FB10044 */ lw $s1, 0x44($sp) -/* AA12C4 8002A124 8FB20048 */ lw $s2, 0x48($sp) -/* AA12C8 8002A128 8FB3004C */ lw $s3, 0x4c($sp) -/* AA12CC 8002A12C 8FB40050 */ lw $s4, 0x50($sp) -/* AA12D0 8002A130 8FB50054 */ lw $s5, 0x54($sp) -/* AA12D4 8002A134 8FB60058 */ lw $s6, 0x58($sp) -/* AA12D8 8002A138 03E00008 */ jr $ra -/* AA12DC 8002A13C 27BD0090 */ addiu $sp, $sp, 0x90 - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A140.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A140.s deleted file mode 100644 index 346a0f9f60..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A140.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_8002A140 -/* AA12E0 8002A140 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* AA12E4 8002A144 AFBF0014 */ sw $ra, 0x14($sp) -/* AA12E8 8002A148 AFA40058 */ sw $a0, 0x58($sp) -/* AA12EC 8002A14C AFA5005C */ sw $a1, 0x5c($sp) -/* AA12F0 8002A150 AFA5001C */ sw $a1, 0x1c($sp) -/* AA12F4 8002A154 AFA70064 */ sw $a3, 0x64($sp) -/* AA12F8 8002A158 00C02825 */ move $a1, $a2 -/* AA12FC 8002A15C 0C01DF90 */ jal Math_Vec3f_Copy -/* AA1300 8002A160 27A40020 */ addiu $a0, $sp, 0x20 -/* AA1304 8002A164 8FA4005C */ lw $a0, 0x5c($sp) -/* AA1308 8002A168 87AF0066 */ lh $t7, 0x66($sp) -/* AA130C 8002A16C 87B8006A */ lh $t8, 0x6a($sp) -/* AA1310 8002A170 87B9006E */ lh $t9, 0x6e($sp) -/* AA1314 8002A174 87A80072 */ lh $t0, 0x72($sp) -/* AA1318 8002A178 87A90076 */ lh $t1, 0x76($sp) -/* AA131C 8002A17C 87AA007A */ lh $t2, 0x7a($sp) -/* AA1320 8002A180 87AB007E */ lh $t3, 0x7e($sp) -/* AA1324 8002A184 C7A40080 */ lwc1 $f4, 0x80($sp) -/* AA1328 8002A188 A7A00054 */ sh $zero, 0x54($sp) -/* AA132C 8002A18C A3AF0048 */ sb $t7, 0x48($sp) -/* AA1330 8002A190 A3B80049 */ sb $t8, 0x49($sp) -/* AA1334 8002A194 A3B9004A */ sb $t9, 0x4a($sp) -/* AA1338 8002A198 A3A8004B */ sb $t0, 0x4b($sp) -/* AA133C 8002A19C A3A9004C */ sb $t1, 0x4c($sp) -/* AA1340 8002A1A0 A3AA004D */ sb $t2, 0x4d($sp) -/* AA1344 8002A1A4 A3AB004E */ sb $t3, 0x4e($sp) -/* AA1348 8002A1A8 10800003 */ beqz $a0, .L8002A1B8 -/* AA134C 8002A1AC E7A4002C */ swc1 $f4, 0x2c($sp) -/* AA1350 8002A1B0 0C00BE0A */ jal Audio_PlayActorSound2 -/* AA1354 8002A1B4 24050874 */ li $a1, 2164 -.L8002A1B8: -/* AA1358 8002A1B8 8FA40058 */ lw $a0, 0x58($sp) -/* AA135C 8002A1BC 2405001B */ li $a1, 27 -/* AA1360 8002A1C0 24060050 */ li $a2, 80 -/* AA1364 8002A1C4 0C009DE6 */ jal EffectSs_Spawn -/* AA1368 8002A1C8 27A7001C */ addiu $a3, $sp, 0x1c -/* AA136C 8002A1CC 8FBF0014 */ lw $ra, 0x14($sp) -/* AA1370 8002A1D0 27BD0058 */ addiu $sp, $sp, 0x58 -/* AA1374 8002A1D4 03E00008 */ jr $ra -/* AA1378 8002A1D8 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A1DC.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A1DC.s deleted file mode 100644 index a4f987040a..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A1DC.s +++ /dev/null @@ -1,53 +0,0 @@ -glabel func_8002A1DC -/* AA137C 8002A1DC 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* AA1380 8002A1E0 AFBF0014 */ sw $ra, 0x14($sp) -/* AA1384 8002A1E4 AFA40058 */ sw $a0, 0x58($sp) -/* AA1388 8002A1E8 AFA5005C */ sw $a1, 0x5c($sp) -/* AA138C 8002A1EC AFA70064 */ sw $a3, 0x64($sp) -/* AA1390 8002A1F0 AFA5001C */ sw $a1, 0x1c($sp) -/* AA1394 8002A1F4 84CF0000 */ lh $t7, ($a2) -/* AA1398 8002A1F8 87A8006A */ lh $t0, 0x6a($sp) -/* AA139C 8002A1FC 87A9006E */ lh $t1, 0x6e($sp) -/* AA13A0 8002A200 448F2000 */ mtc1 $t7, $f4 -/* AA13A4 8002A204 87AA0072 */ lh $t2, 0x72($sp) -/* AA13A8 8002A208 87AB0076 */ lh $t3, 0x76($sp) -/* AA13AC 8002A20C 468021A0 */ cvt.s.w $f6, $f4 -/* AA13B0 8002A210 87AC007A */ lh $t4, 0x7a($sp) -/* AA13B4 8002A214 87AD007E */ lh $t5, 0x7e($sp) -/* AA13B8 8002A218 C7A40080 */ lwc1 $f4, 0x80($sp) -/* AA13BC 8002A21C 00073C00 */ sll $a3, $a3, 0x10 -/* AA13C0 8002A220 00073C03 */ sra $a3, $a3, 0x10 -/* AA13C4 8002A224 E7A60020 */ swc1 $f6, 0x20($sp) -/* AA13C8 8002A228 84D80002 */ lh $t8, 2($a2) -/* AA13CC 8002A22C 00A02025 */ move $a0, $a1 -/* AA13D0 8002A230 44984000 */ mtc1 $t8, $f8 -/* AA13D4 8002A234 00000000 */ nop -/* AA13D8 8002A238 468042A0 */ cvt.s.w $f10, $f8 -/* AA13DC 8002A23C E7AA0024 */ swc1 $f10, 0x24($sp) -/* AA13E0 8002A240 84D90004 */ lh $t9, 4($a2) -/* AA13E4 8002A244 A3A70048 */ sb $a3, 0x48($sp) -/* AA13E8 8002A248 A7A00054 */ sh $zero, 0x54($sp) -/* AA13EC 8002A24C 44998000 */ mtc1 $t9, $f16 -/* AA13F0 8002A250 A3A80049 */ sb $t0, 0x49($sp) -/* AA13F4 8002A254 A3A9004A */ sb $t1, 0x4a($sp) -/* AA13F8 8002A258 468084A0 */ cvt.s.w $f18, $f16 -/* AA13FC 8002A25C A3AA004B */ sb $t2, 0x4b($sp) -/* AA1400 8002A260 A3AB004C */ sb $t3, 0x4c($sp) -/* AA1404 8002A264 A3AC004D */ sb $t4, 0x4d($sp) -/* AA1408 8002A268 A3AD004E */ sb $t5, 0x4e($sp) -/* AA140C 8002A26C E7A4002C */ swc1 $f4, 0x2c($sp) -/* AA1410 8002A270 10A00003 */ beqz $a1, .L8002A280 -/* AA1414 8002A274 E7B20028 */ swc1 $f18, 0x28($sp) -/* AA1418 8002A278 0C00BE0A */ jal Audio_PlayActorSound2 -/* AA141C 8002A27C 24050874 */ li $a1, 2164 -.L8002A280: -/* AA1420 8002A280 8FA40058 */ lw $a0, 0x58($sp) -/* AA1424 8002A284 2405001B */ li $a1, 27 -/* AA1428 8002A288 24060050 */ li $a2, 80 -/* AA142C 8002A28C 0C009DE6 */ jal EffectSs_Spawn -/* AA1430 8002A290 27A7001C */ addiu $a3, $sp, 0x1c -/* AA1434 8002A294 8FBF0014 */ lw $ra, 0x14($sp) -/* AA1438 8002A298 27BD0058 */ addiu $sp, $sp, 0x58 -/* AA143C 8002A29C 03E00008 */ jr $ra -/* AA1440 8002A2A0 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A2A4.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A2A4.s deleted file mode 100644 index 3042d55209..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A2A4.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_8002A2A4 -/* AA1444 8002A2A4 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* AA1448 8002A2A8 AFBF0014 */ sw $ra, 0x14($sp) -/* AA144C 8002A2AC AFA40058 */ sw $a0, 0x58($sp) -/* AA1450 8002A2B0 AFA60060 */ sw $a2, 0x60($sp) -/* AA1454 8002A2B4 AFA70064 */ sw $a3, 0x64($sp) -/* AA1458 8002A2B8 0C01DF90 */ jal Math_Vec3f_Copy -/* AA145C 8002A2BC 27A40020 */ addiu $a0, $sp, 0x20 -/* AA1460 8002A2C0 27A40030 */ addiu $a0, $sp, 0x30 -/* AA1464 8002A2C4 0C01DF90 */ jal Math_Vec3f_Copy -/* AA1468 8002A2C8 8FA50064 */ lw $a1, 0x64($sp) -/* AA146C 8002A2CC 27A4003C */ addiu $a0, $sp, 0x3c -/* AA1470 8002A2D0 0C01DF90 */ jal Math_Vec3f_Copy -/* AA1474 8002A2D4 8FA50068 */ lw $a1, 0x68($sp) -/* AA1478 8002A2D8 27A40048 */ addiu $a0, $sp, 0x48 -/* AA147C 8002A2DC 0C01E218 */ jal Color_RGBA8_Copy -/* AA1480 8002A2E0 8FA5006C */ lw $a1, 0x6c($sp) -/* AA1484 8002A2E4 27A4004C */ addiu $a0, $sp, 0x4c -/* AA1488 8002A2E8 0C01E218 */ jal Color_RGBA8_Copy -/* AA148C 8002A2EC 8FA50070 */ lw $a1, 0x70($sp) -/* AA1490 8002A2F0 C7A40060 */ lwc1 $f4, 0x60($sp) -/* AA1494 8002A2F4 8FAE0074 */ lw $t6, 0x74($sp) -/* AA1498 8002A2F8 240F0001 */ li $t7, 1 -/* AA149C 8002A2FC A7AF0054 */ sh $t7, 0x54($sp) -/* AA14A0 8002A300 8FA40058 */ lw $a0, 0x58($sp) -/* AA14A4 8002A304 2405001B */ li $a1, 27 -/* AA14A8 8002A308 24060080 */ li $a2, 128 -/* AA14AC 8002A30C 27A7001C */ addiu $a3, $sp, 0x1c -/* AA14B0 8002A310 E7A4002C */ swc1 $f4, 0x2c($sp) -/* AA14B4 8002A314 0C009DE6 */ jal EffectSs_Spawn -/* AA14B8 8002A318 AFAE0050 */ sw $t6, 0x50($sp) -/* AA14BC 8002A31C 8FBF0014 */ lw $ra, 0x14($sp) -/* AA14C0 8002A320 27BD0058 */ addiu $sp, $sp, 0x58 -/* AA14C4 8002A324 03E00008 */ jr $ra -/* AA14C8 8002A328 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A32C.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A32C.s deleted file mode 100644 index 38a1c1fa30..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A32C.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_8002A32C -/* AA14CC 8002A32C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* AA14D0 8002A330 AFBF0014 */ sw $ra, 0x14($sp) -/* AA14D4 8002A334 AFA40050 */ sw $a0, 0x50($sp) -/* AA14D8 8002A338 AFA50054 */ sw $a1, 0x54($sp) -/* AA14DC 8002A33C AFA7005C */ sw $a3, 0x5c($sp) -/* AA14E0 8002A340 00C02825 */ move $a1, $a2 -/* AA14E4 8002A344 0C01DF90 */ jal Math_Vec3f_Copy -/* AA14E8 8002A348 27A40020 */ addiu $a0, $sp, 0x20 -/* AA14EC 8002A34C 27A40030 */ addiu $a0, $sp, 0x30 -/* AA14F0 8002A350 0C01DF90 */ jal Math_Vec3f_Copy -/* AA14F4 8002A354 8FA50060 */ lw $a1, 0x60($sp) -/* AA14F8 8002A358 27A4003E */ addiu $a0, $sp, 0x3e -/* AA14FC 8002A35C 0C01E218 */ jal Color_RGBA8_Copy -/* AA1500 8002A360 8FA50068 */ lw $a1, 0x68($sp) -/* AA1504 8002A364 27A40042 */ addiu $a0, $sp, 0x42 -/* AA1508 8002A368 0C01E218 */ jal Color_RGBA8_Copy -/* AA150C 8002A36C 8FA5006C */ lw $a1, 0x6c($sp) -/* AA1510 8002A370 87AE0066 */ lh $t6, 0x66($sp) -/* AA1514 8002A374 8FAF0054 */ lw $t7, 0x54($sp) -/* AA1518 8002A378 C7A4005C */ lwc1 $f4, 0x5c($sp) -/* AA151C 8002A37C 87B80072 */ lh $t8, 0x72($sp) -/* AA1520 8002A380 87B90076 */ lh $t9, 0x76($sp) -/* AA1524 8002A384 8FA80078 */ lw $t0, 0x78($sp) -/* AA1528 8002A388 8FA40050 */ lw $a0, 0x50($sp) -/* AA152C 8002A38C 2405001C */ li $a1, 28 -/* AA1530 8002A390 24060080 */ li $a2, 128 -/* AA1534 8002A394 27A7001C */ addiu $a3, $sp, 0x1c -/* AA1538 8002A398 A7AE003C */ sh $t6, 0x3c($sp) -/* AA153C 8002A39C AFAF001C */ sw $t7, 0x1c($sp) -/* AA1540 8002A3A0 E7A4002C */ swc1 $f4, 0x2c($sp) -/* AA1544 8002A3A4 A7B80046 */ sh $t8, 0x46($sp) -/* AA1548 8002A3A8 A7B90048 */ sh $t9, 0x48($sp) -/* AA154C 8002A3AC 0C009DE6 */ jal EffectSs_Spawn -/* AA1550 8002A3B0 AFA8004C */ sw $t0, 0x4c($sp) -/* AA1554 8002A3B4 8FBF0014 */ lw $ra, 0x14($sp) -/* AA1558 8002A3B8 27BD0050 */ addiu $sp, $sp, 0x50 -/* AA155C 8002A3BC 03E00008 */ jr $ra -/* AA1560 8002A3C0 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A3C4.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A3C4.s deleted file mode 100644 index 0f2a5354ef..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A3C4.s +++ /dev/null @@ -1,51 +0,0 @@ -glabel func_8002A3C4 -/* AA1564 8002A3C4 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* AA1568 8002A3C8 3C01437F */ li $at, 0x437F0000 # 0.000000 -/* AA156C 8002A3CC C7AC004C */ lwc1 $f12, 0x4c($sp) -/* AA1570 8002A3D0 44812000 */ mtc1 $at, $f4 -/* AA1574 8002A3D4 3C018011 */ lui $at, %hi(D_801159A5) # 0.000000 -/* AA1578 8002A3D8 A02059A6 */ sb $zero, %lo(D_801159A6)($at) -/* AA157C 8002A3DC 460C2182 */ mul.s $f6, $f4, $f12 -/* AA1580 8002A3E0 44877000 */ mtc1 $a3, $f14 -/* AA1584 8002A3E4 3C198011 */ lui $t9, %hi(D_801159A4) # $t9, 0x8011 -/* AA1588 8002A3E8 3C088011 */ lui $t0, %hi(D_801159A8) # $t0, 0x8011 -/* AA158C 8002A3EC 44077000 */ mfc1 $a3, $f14 -/* AA1590 8002A3F0 AFBF0034 */ sw $ra, 0x34($sp) -/* AA1594 8002A3F4 250859A8 */ addiu $t0, %lo(D_801159A8) # addiu $t0, $t0, 0x59a8 -/* AA1598 8002A3F8 4600320D */ trunc.w.s $f8, $f6 -/* AA159C 8002A3FC 273959A4 */ addiu $t9, %lo(D_801159A4) # addiu $t9, $t9, 0x59a4 -/* AA15A0 8002A400 24AF005C */ addiu $t7, $a1, 0x5c -/* AA15A4 8002A404 2418000F */ li $t8, 15 -/* AA15A8 8002A408 44024000 */ mfc1 $v0, $f8 -/* AA15AC 8002A40C 240A0001 */ li $t2, 1 -/* AA15B0 8002A410 A02259A5 */ sb $v0, %lo(D_801159A5)($at) -/* AA15B4 8002A414 3C018011 */ lui $at, %hi(D_801159A8) # $at, 0x8011 -/* AA15B8 8002A418 A02059A9 */ sb $zero, %lo(D_801159A9)($at) -/* AA15BC 8002A41C A02059AA */ sb $zero, %lo(D_801159AA)($at) -/* AA15C0 8002A420 A02259A8 */ sb $v0, %lo(D_801159A8)($at) -/* AA15C4 8002A424 3C018011 */ lui $at, %hi(D_801159A4) # $at, 0x8011 -/* AA15C8 8002A428 A02259A4 */ sb $v0, %lo(D_801159A4)($at) -/* AA15CC 8002A42C 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* AA15D0 8002A430 44815000 */ mtc1 $at, $f10 -/* AA15D4 8002A434 24020001 */ li $v0, 1 -/* AA15D8 8002A438 460A6032 */ c.eq.s $f12, $f10 -/* AA15DC 8002A43C 00000000 */ nop -/* AA15E0 8002A440 45000003 */ bc1f .L8002A450 -/* AA15E4 8002A444 00000000 */ nop -/* AA15E8 8002A448 10000001 */ b .L8002A450 -/* AA15EC 8002A44C 00001025 */ move $v0, $zero -.L8002A450: -/* AA15F0 8002A450 87A9004A */ lh $t1, 0x4a($sp) -/* AA15F4 8002A454 AFAF0010 */ sw $t7, 0x10($sp) -/* AA15F8 8002A458 AFB80014 */ sw $t8, 0x14($sp) -/* AA15FC 8002A45C AFB90018 */ sw $t9, 0x18($sp) -/* AA1600 8002A460 AFA8001C */ sw $t0, 0x1c($sp) -/* AA1604 8002A464 AFA20020 */ sw $v0, 0x20($sp) -/* AA1608 8002A468 AFAA0028 */ sw $t2, 0x28($sp) -/* AA160C 8002A46C 0C00A8CB */ jal func_8002A32C -/* AA1610 8002A470 AFA90024 */ sw $t1, 0x24($sp) -/* AA1614 8002A474 8FBF0034 */ lw $ra, 0x34($sp) -/* AA1618 8002A478 27BD0038 */ addiu $sp, $sp, 0x38 -/* AA161C 8002A47C 03E00008 */ jr $ra -/* AA1620 8002A480 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A484.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A484.s deleted file mode 100644 index d3352dc143..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A484.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_8002A484 -/* AA1624 8002A484 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AA1628 8002A488 AFA60028 */ sw $a2, 0x28($sp) -/* AA162C 8002A48C 87AE002A */ lh $t6, 0x2a($sp) -/* AA1630 8002A490 44856000 */ mtc1 $a1, $f12 -/* AA1634 8002A494 AFBF001C */ sw $ra, 0x1c($sp) -/* AA1638 8002A498 8C851C44 */ lw $a1, 0x1c44($a0) -/* AA163C 8002A49C 000E7880 */ sll $t7, $t6, 2 -/* AA1640 8002A4A0 44877000 */ mtc1 $a3, $f14 -/* AA1644 8002A4A4 01EE7823 */ subu $t7, $t7, $t6 -/* AA1648 8002A4A8 000F7880 */ sll $t7, $t7, 2 -/* AA164C 8002A4AC 44076000 */ mfc1 $a3, $f12 -/* AA1650 8002A4B0 00AF3021 */ addu $a2, $a1, $t7 -/* AA1654 8002A4B4 24C60908 */ addiu $a2, $a2, 0x908 -/* AA1658 8002A4B8 AFAE0010 */ sw $t6, 0x10($sp) -/* AA165C 8002A4BC 0C00A8F1 */ jal func_8002A3C4 -/* AA1660 8002A4C0 E7AE0014 */ swc1 $f14, 0x14($sp) -/* AA1664 8002A4C4 8FBF001C */ lw $ra, 0x1c($sp) -/* AA1668 8002A4C8 27BD0020 */ addiu $sp, $sp, 0x20 -/* AA166C 8002A4CC 03E00008 */ jr $ra -/* AA1670 8002A4D0 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A4D4.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A4D4.s deleted file mode 100644 index c578472b06..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A4D4.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_8002A4D4 -/* AA1674 8002A4D4 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* AA1678 8002A4D8 AFBF0014 */ sw $ra, 0x14($sp) -/* AA167C 8002A4DC AFA40030 */ sw $a0, 0x30($sp) -/* AA1680 8002A4E0 AFA50034 */ sw $a1, 0x34($sp) -/* AA1684 8002A4E4 AFA7003C */ sw $a3, 0x3c($sp) -/* AA1688 8002A4E8 00C02825 */ move $a1, $a2 -/* AA168C 8002A4EC 0C01DF90 */ jal Math_Vec3f_Copy -/* AA1690 8002A4F0 27A4001C */ addiu $a0, $sp, 0x1c -/* AA1694 8002A4F4 8FA40034 */ lw $a0, 0x34($sp) -/* AA1698 8002A4F8 87AE003E */ lh $t6, 0x3e($sp) -/* AA169C 8002A4FC 87AF0042 */ lh $t7, 0x42($sp) -/* AA16A0 8002A500 87B80046 */ lh $t8, 0x46($sp) -/* AA16A4 8002A504 87B9004A */ lh $t9, 0x4a($sp) -/* AA16A8 8002A508 AFA40018 */ sw $a0, 0x18($sp) -/* AA16AC 8002A50C A7AE0028 */ sh $t6, 0x28($sp) -/* AA16B0 8002A510 A7AF002A */ sh $t7, 0x2a($sp) -/* AA16B4 8002A514 A7B8002C */ sh $t8, 0x2c($sp) -/* AA16B8 8002A518 10800003 */ beqz $a0, .L8002A528 -/* AA16BC 8002A51C A7B9002E */ sh $t9, 0x2e($sp) -/* AA16C0 8002A520 0C00BE0A */ jal Audio_PlayActorSound2 -/* AA16C4 8002A524 24052822 */ li $a1, 10274 -.L8002A528: -/* AA16C8 8002A528 8FA40030 */ lw $a0, 0x30($sp) -/* AA16CC 8002A52C 2405001D */ li $a1, 29 -/* AA16D0 8002A530 24060080 */ li $a2, 128 -/* AA16D4 8002A534 0C009DE6 */ jal EffectSs_Spawn -/* AA16D8 8002A538 27A70018 */ addiu $a3, $sp, 0x18 -/* AA16DC 8002A53C 8FBF0014 */ lw $ra, 0x14($sp) -/* AA16E0 8002A540 27BD0030 */ addiu $sp, $sp, 0x30 -/* AA16E4 8002A544 03E00008 */ jr $ra -/* AA16E8 8002A548 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A54C.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A54C.s deleted file mode 100644 index ae04eef4d3..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A54C.s +++ /dev/null @@ -1,45 +0,0 @@ -glabel func_8002A54C -/* AA16EC 8002A54C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* AA16F0 8002A550 AFBF0014 */ sw $ra, 0x14($sp) -/* AA16F4 8002A554 AFA40030 */ sw $a0, 0x30($sp) -/* AA16F8 8002A558 AFA50034 */ sw $a1, 0x34($sp) -/* AA16FC 8002A55C AFA7003C */ sw $a3, 0x3c($sp) -/* AA1700 8002A560 84CE0000 */ lh $t6, ($a2) -/* AA1704 8002A564 87A90046 */ lh $t1, 0x46($sp) -/* AA1708 8002A568 87A80042 */ lh $t0, 0x42($sp) -/* AA170C 8002A56C 448E2000 */ mtc1 $t6, $f4 -/* AA1710 8002A570 87AB004A */ lh $t3, 0x4a($sp) -/* AA1714 8002A574 00073C00 */ sll $a3, $a3, 0x10 -/* AA1718 8002A578 468021A0 */ cvt.s.w $f6, $f4 -/* AA171C 8002A57C 00073C03 */ sra $a3, $a3, 0x10 -/* AA1720 8002A580 352A8000 */ ori $t2, $t1, 0x8000 -/* AA1724 8002A584 00A02025 */ move $a0, $a1 -/* AA1728 8002A588 E7A6001C */ swc1 $f6, 0x1c($sp) -/* AA172C 8002A58C 84CF0002 */ lh $t7, 2($a2) -/* AA1730 8002A590 448F4000 */ mtc1 $t7, $f8 -/* AA1734 8002A594 00000000 */ nop -/* AA1738 8002A598 468042A0 */ cvt.s.w $f10, $f8 -/* AA173C 8002A59C E7AA0020 */ swc1 $f10, 0x20($sp) -/* AA1740 8002A5A0 84D80004 */ lh $t8, 4($a2) -/* AA1744 8002A5A4 AFA50018 */ sw $a1, 0x18($sp) -/* AA1748 8002A5A8 A7A70028 */ sh $a3, 0x28($sp) -/* AA174C 8002A5AC 44988000 */ mtc1 $t8, $f16 -/* AA1750 8002A5B0 A7AA002C */ sh $t2, 0x2c($sp) -/* AA1754 8002A5B4 A7A8002A */ sh $t0, 0x2a($sp) -/* AA1758 8002A5B8 468084A0 */ cvt.s.w $f18, $f16 -/* AA175C 8002A5BC A7AB002E */ sh $t3, 0x2e($sp) -/* AA1760 8002A5C0 10A00003 */ beqz $a1, .L8002A5D0 -/* AA1764 8002A5C4 E7B20024 */ swc1 $f18, 0x24($sp) -/* AA1768 8002A5C8 0C00BE0A */ jal Audio_PlayActorSound2 -/* AA176C 8002A5CC 24052822 */ li $a1, 10274 -.L8002A5D0: -/* AA1770 8002A5D0 8FA40030 */ lw $a0, 0x30($sp) -/* AA1774 8002A5D4 2405001D */ li $a1, 29 -/* AA1778 8002A5D8 24060080 */ li $a2, 128 -/* AA177C 8002A5DC 0C009DE6 */ jal EffectSs_Spawn -/* AA1780 8002A5E0 27A70018 */ addiu $a3, $sp, 0x18 -/* AA1784 8002A5E4 8FBF0014 */ lw $ra, 0x14($sp) -/* AA1788 8002A5E8 27BD0030 */ addiu $sp, $sp, 0x30 -/* AA178C 8002A5EC 03E00008 */ jr $ra -/* AA1790 8002A5F0 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A65C.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A65C.s deleted file mode 100644 index 24c57be3f1..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A65C.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_8002A65C -/* AA17FC 8002A65C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* AA1800 8002A660 AFBF0014 */ sw $ra, 0x14($sp) -/* AA1804 8002A664 AFA40030 */ sw $a0, 0x30($sp) -/* AA1808 8002A668 AFA50034 */ sw $a1, 0x34($sp) -/* AA180C 8002A66C AFA7003C */ sw $a3, 0x3c($sp) -/* AA1810 8002A670 00C02825 */ move $a1, $a2 -/* AA1814 8002A674 0C01DF90 */ jal Math_Vec3f_Copy -/* AA1818 8002A678 27A40020 */ addiu $a0, $sp, 0x20 -/* AA181C 8002A67C 8FAE0034 */ lw $t6, 0x34($sp) -/* AA1820 8002A680 87AF003E */ lh $t7, 0x3e($sp) -/* AA1824 8002A684 87B80042 */ lh $t8, 0x42($sp) -/* AA1828 8002A688 8FA40030 */ lw $a0, 0x30($sp) -/* AA182C 8002A68C 2405001F */ li $a1, 31 -/* AA1830 8002A690 24060080 */ li $a2, 128 -/* AA1834 8002A694 27A7001C */ addiu $a3, $sp, 0x1c -/* AA1838 8002A698 AFAE001C */ sw $t6, 0x1c($sp) -/* AA183C 8002A69C A7AF002C */ sh $t7, 0x2c($sp) -/* AA1840 8002A6A0 0C009DE6 */ jal EffectSs_Spawn -/* AA1844 8002A6A4 A7B8002E */ sh $t8, 0x2e($sp) -/* AA1848 8002A6A8 8FBF0014 */ lw $ra, 0x14($sp) -/* AA184C 8002A6AC 27BD0030 */ addiu $sp, $sp, 0x30 -/* AA1850 8002A6B0 03E00008 */ jr $ra -/* AA1854 8002A6B4 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A6B8.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A6B8.s deleted file mode 100644 index d35c85501b..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A6B8.s +++ /dev/null @@ -1,48 +0,0 @@ -glabel func_8002A6B8 -/* AA1858 8002A6B8 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* AA185C 8002A6BC AFBF0014 */ sw $ra, 0x14($sp) -/* AA1860 8002A6C0 AFA40058 */ sw $a0, 0x58($sp) -/* AA1864 8002A6C4 AFA60060 */ sw $a2, 0x60($sp) -/* AA1868 8002A6C8 AFA70064 */ sw $a3, 0x64($sp) -/* AA186C 8002A6CC 0C01DF90 */ jal Math_Vec3f_Copy -/* AA1870 8002A6D0 27A4001C */ addiu $a0, $sp, 0x1c -/* AA1874 8002A6D4 27A40028 */ addiu $a0, $sp, 0x28 -/* AA1878 8002A6D8 0C01DF90 */ jal Math_Vec3f_Copy -/* AA187C 8002A6DC 8FA50060 */ lw $a1, 0x60($sp) -/* AA1880 8002A6E0 27A40034 */ addiu $a0, $sp, 0x34 -/* AA1884 8002A6E4 0C01DF90 */ jal Math_Vec3f_Copy -/* AA1888 8002A6E8 8FA50064 */ lw $a1, 0x64($sp) -/* AA188C 8002A6EC 87AE006A */ lh $t6, 0x6a($sp) -/* AA1890 8002A6F0 87AF006E */ lh $t7, 0x6e($sp) -/* AA1894 8002A6F4 87B80072 */ lh $t8, 0x72($sp) -/* AA1898 8002A6F8 A7AE0040 */ sh $t6, 0x40($sp) -/* AA189C 8002A6FC A7AF0042 */ sh $t7, 0x42($sp) -/* AA18A0 8002A700 87B90076 */ lh $t9, 0x76($sp) -/* AA18A4 8002A704 87A8007A */ lh $t0, 0x7a($sp) -/* AA18A8 8002A708 87A9007E */ lh $t1, 0x7e($sp) -/* AA18AC 8002A70C 87AA0082 */ lh $t2, 0x82($sp) -/* AA18B0 8002A710 87AB0086 */ lh $t3, 0x86($sp) -/* AA18B4 8002A714 87AC008A */ lh $t4, 0x8a($sp) -/* AA18B8 8002A718 87AD008E */ lh $t5, 0x8e($sp) -/* AA18BC 8002A71C 8FAE0090 */ lw $t6, 0x90($sp) -/* AA18C0 8002A720 87AF0096 */ lh $t7, 0x96($sp) -/* AA18C4 8002A724 8FA40058 */ lw $a0, 0x58($sp) -/* AA18C8 8002A728 24050020 */ li $a1, 32 -/* AA18CC 8002A72C 24060078 */ li $a2, 120 -/* AA18D0 8002A730 27A7001C */ addiu $a3, $sp, 0x1c -/* AA18D4 8002A734 A3B80044 */ sb $t8, 0x44($sp) -/* AA18D8 8002A738 A3B90045 */ sb $t9, 0x45($sp) -/* AA18DC 8002A73C A3A80046 */ sb $t0, 0x46($sp) -/* AA18E0 8002A740 A3A90047 */ sb $t1, 0x47($sp) -/* AA18E4 8002A744 A3AA0048 */ sb $t2, 0x48($sp) -/* AA18E8 8002A748 A3AB0049 */ sb $t3, 0x49($sp) -/* AA18EC 8002A74C A3AC004A */ sb $t4, 0x4a($sp) -/* AA18F0 8002A750 A7AD004C */ sh $t5, 0x4c($sp) -/* AA18F4 8002A754 AFAE0050 */ sw $t6, 0x50($sp) -/* AA18F8 8002A758 0C009DE6 */ jal EffectSs_Spawn -/* AA18FC 8002A75C A7AF0054 */ sh $t7, 0x54($sp) -/* AA1900 8002A760 8FBF0014 */ lw $ra, 0x14($sp) -/* AA1904 8002A764 27BD0058 */ addiu $sp, $sp, 0x58 -/* AA1908 8002A768 03E00008 */ jr $ra -/* AA190C 8002A76C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A770.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A770.s deleted file mode 100644 index 18e445dd79..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A770.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_8002A770 -/* AA1910 8002A770 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* AA1914 8002A774 AFBF0014 */ sw $ra, 0x14($sp) -/* AA1918 8002A778 AFA40060 */ sw $a0, 0x60($sp) -/* AA191C 8002A77C AFA60068 */ sw $a2, 0x68($sp) -/* AA1920 8002A780 AFA7006C */ sw $a3, 0x6c($sp) -/* AA1924 8002A784 0C01DF90 */ jal Math_Vec3f_Copy -/* AA1928 8002A788 27A4001C */ addiu $a0, $sp, 0x1c -/* AA192C 8002A78C 27A40028 */ addiu $a0, $sp, 0x28 -/* AA1930 8002A790 0C01DF90 */ jal Math_Vec3f_Copy -/* AA1934 8002A794 8FA50068 */ lw $a1, 0x68($sp) -/* AA1938 8002A798 27A40034 */ addiu $a0, $sp, 0x34 -/* AA193C 8002A79C 0C01DF90 */ jal Math_Vec3f_Copy -/* AA1940 8002A7A0 8FA5006C */ lw $a1, 0x6c($sp) -/* AA1944 8002A7A4 87AE0072 */ lh $t6, 0x72($sp) -/* AA1948 8002A7A8 87AF0076 */ lh $t7, 0x76($sp) -/* AA194C 8002A7AC 87B8007A */ lh $t8, 0x7a($sp) -/* AA1950 8002A7B0 A7AE0040 */ sh $t6, 0x40($sp) -/* AA1954 8002A7B4 87B9007E */ lh $t9, 0x7e($sp) -/* AA1958 8002A7B8 87A80082 */ lh $t0, 0x82($sp) -/* AA195C 8002A7BC 87A90086 */ lh $t1, 0x86($sp) -/* AA1960 8002A7C0 87AA008A */ lh $t2, 0x8a($sp) -/* AA1964 8002A7C4 87AB008E */ lh $t3, 0x8e($sp) -/* AA1968 8002A7C8 87AC0092 */ lh $t4, 0x92($sp) -/* AA196C 8002A7CC 87AD0096 */ lh $t5, 0x96($sp) -/* AA1970 8002A7D0 8FAE0098 */ lw $t6, 0x98($sp) -/* AA1974 8002A7D4 A3A0005C */ sb $zero, 0x5c($sp) -/* AA1978 8002A7D8 8FA40060 */ lw $a0, 0x60($sp) -/* AA197C 8002A7DC 24050021 */ li $a1, 33 -/* AA1980 8002A7E0 24060078 */ li $a2, 120 -/* AA1984 8002A7E4 27A7001C */ addiu $a3, $sp, 0x1c -/* AA1988 8002A7E8 A7AF0042 */ sh $t7, 0x42($sp) -/* AA198C 8002A7EC A3B80044 */ sb $t8, 0x44($sp) -/* AA1990 8002A7F0 A3B90045 */ sb $t9, 0x45($sp) -/* AA1994 8002A7F4 A3A80046 */ sb $t0, 0x46($sp) -/* AA1998 8002A7F8 A3A90047 */ sb $t1, 0x47($sp) -/* AA199C 8002A7FC A3AA0048 */ sb $t2, 0x48($sp) -/* AA19A0 8002A800 A3AB0049 */ sb $t3, 0x49($sp) -/* AA19A4 8002A804 A3AC004A */ sb $t4, 0x4a($sp) -/* AA19A8 8002A808 A7AD004C */ sh $t5, 0x4c($sp) -/* AA19AC 8002A80C 0C009DE6 */ jal EffectSs_Spawn -/* AA19B0 8002A810 AFAE0050 */ sw $t6, 0x50($sp) -/* AA19B4 8002A814 8FBF0014 */ lw $ra, 0x14($sp) -/* AA19B8 8002A818 27BD0060 */ addiu $sp, $sp, 0x60 -/* AA19BC 8002A81C 03E00008 */ jr $ra -/* AA19C0 8002A820 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A824.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A824.s deleted file mode 100644 index 3c1d969153..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A824.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_8002A824 -/* AA19C4 8002A824 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* AA19C8 8002A828 AFBF0014 */ sw $ra, 0x14($sp) -/* AA19CC 8002A82C AFA40060 */ sw $a0, 0x60($sp) -/* AA19D0 8002A830 AFA60068 */ sw $a2, 0x68($sp) -/* AA19D4 8002A834 AFA7006C */ sw $a3, 0x6c($sp) -/* AA19D8 8002A838 0C01DF90 */ jal Math_Vec3f_Copy -/* AA19DC 8002A83C 27A4001C */ addiu $a0, $sp, 0x1c -/* AA19E0 8002A840 87AE006A */ lh $t6, 0x6a($sp) -/* AA19E4 8002A844 87AF006E */ lh $t7, 0x6e($sp) -/* AA19E8 8002A848 C7A40070 */ lwc1 $f4, 0x70($sp) -/* AA19EC 8002A84C 8FB80074 */ lw $t8, 0x74($sp) -/* AA19F0 8002A850 8FB90078 */ lw $t9, 0x78($sp) -/* AA19F4 8002A854 24080001 */ li $t0, 1 -/* AA19F8 8002A858 A3A8005C */ sb $t0, 0x5c($sp) -/* AA19FC 8002A85C 8FA40060 */ lw $a0, 0x60($sp) -/* AA1A00 8002A860 24050021 */ li $a1, 33 -/* AA1A04 8002A864 24060078 */ li $a2, 120 -/* AA1A08 8002A868 27A7001C */ addiu $a3, $sp, 0x1c -/* AA1A0C 8002A86C A7AE0040 */ sh $t6, 0x40($sp) -/* AA1A10 8002A870 A7AF0042 */ sh $t7, 0x42($sp) -/* AA1A14 8002A874 E7A40054 */ swc1 $f4, 0x54($sp) -/* AA1A18 8002A878 AFB80058 */ sw $t8, 0x58($sp) -/* AA1A1C 8002A87C 0C009DE6 */ jal EffectSs_Spawn -/* AA1A20 8002A880 AFB90050 */ sw $t9, 0x50($sp) -/* AA1A24 8002A884 8FBF0014 */ lw $ra, 0x14($sp) -/* AA1A28 8002A888 27BD0060 */ addiu $sp, $sp, 0x60 -/* AA1A2C 8002A88C 03E00008 */ jr $ra -/* AA1A30 8002A890 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A894.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A894.s deleted file mode 100644 index 19581f87c6..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A894.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_8002A894 -/* AA1A34 8002A894 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* AA1A38 8002A898 AFBF0014 */ sw $ra, 0x14($sp) -/* AA1A3C 8002A89C AFA40048 */ sw $a0, 0x48($sp) -/* AA1A40 8002A8A0 AFA60050 */ sw $a2, 0x50($sp) -/* AA1A44 8002A8A4 AFA70054 */ sw $a3, 0x54($sp) -/* AA1A48 8002A8A8 0C01DF90 */ jal Math_Vec3f_Copy -/* AA1A4C 8002A8AC 27A40018 */ addiu $a0, $sp, 0x18 -/* AA1A50 8002A8B0 27A40024 */ addiu $a0, $sp, 0x24 -/* AA1A54 8002A8B4 0C01DF90 */ jal Math_Vec3f_Copy -/* AA1A58 8002A8B8 8FA50050 */ lw $a1, 0x50($sp) -/* AA1A5C 8002A8BC 27A40030 */ addiu $a0, $sp, 0x30 -/* AA1A60 8002A8C0 0C01DF90 */ jal Math_Vec3f_Copy -/* AA1A64 8002A8C4 8FA50054 */ lw $a1, 0x54($sp) -/* AA1A68 8002A8C8 87AE005A */ lh $t6, 0x5a($sp) -/* AA1A6C 8002A8CC 87AF005E */ lh $t7, 0x5e($sp) -/* AA1A70 8002A8D0 87B80062 */ lh $t8, 0x62($sp) -/* AA1A74 8002A8D4 8FB90064 */ lw $t9, 0x64($sp) -/* AA1A78 8002A8D8 8FA40048 */ lw $a0, 0x48($sp) -/* AA1A7C 8002A8DC 24050022 */ li $a1, 34 -/* AA1A80 8002A8E0 24060064 */ li $a2, 100 -/* AA1A84 8002A8E4 27A70018 */ addiu $a3, $sp, 0x18 -/* AA1A88 8002A8E8 A7AE003C */ sh $t6, 0x3c($sp) -/* AA1A8C 8002A8EC A7AF003E */ sh $t7, 0x3e($sp) -/* AA1A90 8002A8F0 A7B80040 */ sh $t8, 0x40($sp) -/* AA1A94 8002A8F4 0C009DE6 */ jal EffectSs_Spawn -/* AA1A98 8002A8F8 AFB90044 */ sw $t9, 0x44($sp) -/* AA1A9C 8002A8FC 8FBF0014 */ lw $ra, 0x14($sp) -/* AA1AA0 8002A900 27BD0048 */ addiu $sp, $sp, 0x48 -/* AA1AA4 8002A904 03E00008 */ jr $ra -/* AA1AA8 8002A908 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A90C.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A90C.s deleted file mode 100644 index 8f83aa15fe..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A90C.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_8002A90C -/* AA1AAC 8002A90C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* AA1AB0 8002A910 AFA60030 */ sw $a2, 0x30($sp) -/* AA1AB4 8002A914 AFA70034 */ sw $a3, 0x34($sp) -/* AA1AB8 8002A918 87AF0036 */ lh $t7, 0x36($sp) -/* AA1ABC 8002A91C 87AE0032 */ lh $t6, 0x32($sp) -/* AA1AC0 8002A920 87B8003A */ lh $t8, 0x3a($sp) -/* AA1AC4 8002A924 8FB9003C */ lw $t9, 0x3c($sp) -/* AA1AC8 8002A928 3C068011 */ lui $a2, %hi(D_801158C0) # $a2, 0x8011 -/* AA1ACC 8002A92C 24C658C0 */ addiu $a2, %lo(D_801158C0) # addiu $a2, $a2, 0x58c0 -/* AA1AD0 8002A930 AFBF0024 */ sw $ra, 0x24($sp) -/* AA1AD4 8002A934 00C03825 */ move $a3, $a2 -/* AA1AD8 8002A938 AFAF0014 */ sw $t7, 0x14($sp) -/* AA1ADC 8002A93C AFAE0010 */ sw $t6, 0x10($sp) -/* AA1AE0 8002A940 AFB80018 */ sw $t8, 0x18($sp) -/* AA1AE4 8002A944 0C00AA25 */ jal func_8002A894 -/* AA1AE8 8002A948 AFB9001C */ sw $t9, 0x1c($sp) -/* AA1AEC 8002A94C 8FBF0024 */ lw $ra, 0x24($sp) -/* AA1AF0 8002A950 27BD0028 */ addiu $sp, $sp, 0x28 -/* AA1AF4 8002A954 03E00008 */ jr $ra -/* AA1AF8 8002A958 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002AA44.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002AA44.s deleted file mode 100644 index f5ab92186e..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002AA44.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_8002AA44 -/* AA1BE4 8002AA44 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* AA1BE8 8002AA48 AFBF0014 */ sw $ra, 0x14($sp) -/* AA1BEC 8002AA4C AFA40040 */ sw $a0, 0x40($sp) -/* AA1BF0 8002AA50 AFA60048 */ sw $a2, 0x48($sp) -/* AA1BF4 8002AA54 AFA7004C */ sw $a3, 0x4c($sp) -/* AA1BF8 8002AA58 0C01DF90 */ jal Math_Vec3f_Copy -/* AA1BFC 8002AA5C 27A40018 */ addiu $a0, $sp, 0x18 -/* AA1C00 8002AA60 27A40024 */ addiu $a0, $sp, 0x24 -/* AA1C04 8002AA64 0C01DF90 */ jal Math_Vec3f_Copy -/* AA1C08 8002AA68 8FA50048 */ lw $a1, 0x48($sp) -/* AA1C0C 8002AA6C 27A40030 */ addiu $a0, $sp, 0x30 -/* AA1C10 8002AA70 0C01DF90 */ jal Math_Vec3f_Copy -/* AA1C14 8002AA74 8FA5004C */ lw $a1, 0x4c($sp) -/* AA1C18 8002AA78 87AE0052 */ lh $t6, 0x52($sp) -/* AA1C1C 8002AA7C 8FA40040 */ lw $a0, 0x40($sp) -/* AA1C20 8002AA80 24050024 */ li $a1, 36 -/* AA1C24 8002AA84 24060080 */ li $a2, 128 -/* AA1C28 8002AA88 27A70018 */ addiu $a3, $sp, 0x18 -/* AA1C2C 8002AA8C 0C009DE6 */ jal EffectSs_Spawn -/* AA1C30 8002AA90 A7AE003C */ sh $t6, 0x3c($sp) -/* AA1C34 8002AA94 8FBF0014 */ lw $ra, 0x14($sp) -/* AA1C38 8002AA98 27BD0040 */ addiu $sp, $sp, 0x40 -/* AA1C3C 8002AA9C 03E00008 */ jr $ra -/* AA1C40 8002AAA0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/func_8086F464.s b/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/func_8086F464.s index 57bd20c9dd..68da4bf057 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/func_8086F464.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/func_8086F464.s @@ -129,7 +129,7 @@ glabel func_8086F464 /* 004E0 8086F640 02202825 */ or $a1, $s1, $zero ## $a1 = FFFFFFD8 /* 004E4 8086F644 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 004E8 8086F648 AFB40014 */ sw $s4, 0x0014($sp) -/* 004EC 8086F64C 0C00A5E9 */ jal func_800297A4 +/* 004EC 8086F64C 0C00A5E9 */ jal EffectSsHahen_SpawnBurst /* 004F0 8086F650 AFA00024 */ sw $zero, 0x0024($sp) /* 004F4 8086F654 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 004F8 8086F658 0C00BE0A */ jal Audio_PlayActorSound2 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/BgDdanJd_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/BgDdanJd_Destroy.s deleted file mode 100644 index 5b15588a33..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/BgDdanJd_Destroy.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel BgDdanJd_Destroy -/* 000A8 80870B58 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 000AC 80870B5C AFA40018 */ sw $a0, 0x0018($sp) -/* 000B0 80870B60 8FAE0018 */ lw $t6, 0x0018($sp) -/* 000B4 80870B64 AFBF0014 */ sw $ra, 0x0014($sp) -/* 000B8 80870B68 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 000BC 80870B6C 24A50810 */ addiu $a1, $a1, 0x0810 ## $a1 = 00000810 -/* 000C0 80870B70 0C00FB56 */ jal DynaPolyInfo_Free - ## DynaPolyInfo_delReserve -/* 000C4 80870B74 8DC6014C */ lw $a2, 0x014C($t6) ## 0000014C -/* 000C8 80870B78 8FBF0014 */ lw $ra, 0x0014($sp) -/* 000CC 80870B7C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 000D0 80870B80 03E00008 */ jr $ra -/* 000D4 80870B84 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/BgDdanJd_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/BgDdanJd_Draw.s deleted file mode 100644 index 983cc4395d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/BgDdanJd_Draw.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel BgDdanJd_Draw -/* 00578 80871028 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0057C 8087102C AFA40018 */ sw $a0, 0x0018($sp) -/* 00580 80871030 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00584 80871034 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00588 80871038 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0058C 8087103C 0C00D498 */ jal Gfx_DrawDListOpa - -/* 00590 80871040 24A537B8 */ addiu $a1, $a1, 0x37B8 ## $a1 = 060037B8 -/* 00594 80871044 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00598 80871048 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0059C 8087104C 03E00008 */ jr $ra -/* 005A0 80871050 00000000 */ nop -/* 005A4 80871054 00000000 */ nop -/* 005A8 80871058 00000000 */ nop -/* 005AC 8087105C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/BgDdanJd_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/BgDdanJd_Init.s deleted file mode 100644 index 3f74a3ceb0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/BgDdanJd_Init.s +++ /dev/null @@ -1,50 +0,0 @@ -glabel BgDdanJd_Init -/* 00000 80870AB0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00004 80870AB4 AFA50034 */ sw $a1, 0x0034($sp) -/* 00008 80870AB8 AFBF001C */ sw $ra, 0x001C($sp) -/* 0000C 80870ABC AFB00018 */ sw $s0, 0x0018($sp) -/* 00010 80870AC0 3C058087 */ lui $a1, %hi(D_80871080) ## $a1 = 80870000 -/* 00014 80870AC4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00018 80870AC8 AFA00024 */ sw $zero, 0x0024($sp) -/* 0001C 80870ACC 0C01E037 */ jal Actor_ProcessInitChain - -/* 00020 80870AD0 24A51080 */ addiu $a1, $a1, %lo(D_80871080) ## $a1 = 80871080 -/* 00024 80870AD4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00028 80870AD8 0C010D20 */ jal DynaPolyInfo_SetActorMove - -/* 0002C 80870ADC 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00030 80870AE0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00034 80870AE4 24843CE0 */ addiu $a0, $a0, 0x3CE0 ## $a0 = 06003CE0 -/* 00038 80870AE8 0C010620 */ jal DynaPolyInfo_Alloc - -/* 0003C 80870AEC 27A50024 */ addiu $a1, $sp, 0x0024 ## $a1 = FFFFFFF4 -/* 00040 80870AF0 8FA40034 */ lw $a0, 0x0034($sp) -/* 00044 80870AF4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00048 80870AF8 8FA70024 */ lw $a3, 0x0024($sp) -/* 0004C 80870AFC 0C00FA9D */ jal DynaPolyInfo_RegisterActor - ## DynaPolyInfo_setActor -/* 00050 80870B00 24850810 */ addiu $a1, $a0, 0x0810 ## $a1 = 00000810 -/* 00054 80870B04 240E0064 */ addiu $t6, $zero, 0x0064 ## $t6 = 00000064 -/* 00058 80870B08 AE02014C */ sw $v0, 0x014C($s0) ## 0000014C -/* 0005C 80870B0C A60E016A */ sh $t6, 0x016A($s0) ## 0000016A -/* 00060 80870B10 A2000168 */ sb $zero, 0x0168($s0) ## 00000168 -/* 00064 80870B14 8FA40034 */ lw $a0, 0x0034($sp) -/* 00068 80870B18 0C00B2D0 */ jal Flags_GetSwitch - -/* 0006C 80870B1C 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 00070 80870B20 10400004 */ beq $v0, $zero, .L80870B34 -/* 00074 80870B24 3C198087 */ lui $t9, %hi(func_80870B88) ## $t9 = 80870000 -/* 00078 80870B28 240F0005 */ addiu $t7, $zero, 0x0005 ## $t7 = 00000005 -/* 0007C 80870B2C 10000003 */ beq $zero, $zero, .L80870B3C -/* 00080 80870B30 A20F0169 */ sb $t7, 0x0169($s0) ## 00000169 -.L80870B34: -/* 00084 80870B34 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 00088 80870B38 A2180169 */ sb $t8, 0x0169($s0) ## 00000169 -.L80870B3C: -/* 0008C 80870B3C 27390B88 */ addiu $t9, $t9, %lo(func_80870B88) ## $t9 = 80870B88 -/* 00090 80870B40 AE190164 */ sw $t9, 0x0164($s0) ## 00000164 -/* 00094 80870B44 8FBF001C */ lw $ra, 0x001C($sp) -/* 00098 80870B48 8FB00018 */ lw $s0, 0x0018($sp) -/* 0009C 80870B4C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 000A0 80870B50 03E00008 */ jr $ra -/* 000A4 80870B54 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/BgDdanJd_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/BgDdanJd_Update.s deleted file mode 100644 index a546d766c1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/BgDdanJd_Update.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel BgDdanJd_Update -/* 00554 80871004 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00558 80871008 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0055C 8087100C 8C990164 */ lw $t9, 0x0164($a0) ## 00000164 -/* 00560 80871010 0320F809 */ jalr $ra, $t9 -/* 00564 80871014 00000000 */ nop -/* 00568 80871018 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0056C 8087101C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00570 80871020 03E00008 */ jr $ra -/* 00574 80871024 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/func_80870B88.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/func_80870B88.s deleted file mode 100644 index a0a0d0f21d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/func_80870B88.s +++ /dev/null @@ -1,117 +0,0 @@ -glabel func_80870B88 -/* 000D8 80870B88 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 000DC 80870B8C AFBF001C */ sw $ra, 0x001C($sp) -/* 000E0 80870B90 AFA50024 */ sw $a1, 0x0024($sp) -/* 000E4 80870B94 8482016A */ lh $v0, 0x016A($a0) ## 0000016A -/* 000E8 80870B98 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 000EC 80870B9C 10400002 */ beq $v0, $zero, .L80870BA8 -/* 000F0 80870BA0 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 000F4 80870BA4 A48E016A */ sh $t6, 0x016A($a0) ## 0000016A -.L80870BA8: -/* 000F8 80870BA8 90EF0169 */ lbu $t7, 0x0169($a3) ## 00000169 -/* 000FC 80870BAC 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 00100 80870BB0 546F001E */ bnel $v1, $t7, .L80870C2C -/* 00104 80870BB4 84E8016A */ lh $t0, 0x016A($a3) ## 0000016A -/* 00108 80870BB8 84E5001C */ lh $a1, 0x001C($a3) ## 0000001C -/* 0010C 80870BBC 8FA40024 */ lw $a0, 0x0024($sp) -/* 00110 80870BC0 28A10040 */ slti $at, $a1, 0x0040 -/* 00114 80870BC4 50200019 */ beql $at, $zero, .L80870C2C -/* 00118 80870BC8 84E8016A */ lh $t0, 0x016A($a3) ## 0000016A -/* 0011C 80870BCC 0C00B2D0 */ jal Flags_GetSwitch - -/* 00120 80870BD0 AFA70020 */ sw $a3, 0x0020($sp) -/* 00124 80870BD4 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 00128 80870BD8 10400013 */ beq $v0, $zero, .L80870C28 -/* 0012C 80870BDC 8FA70020 */ lw $a3, 0x0020($sp) -/* 00130 80870BE0 3C01430C */ lui $at, 0x430C ## $at = 430C0000 -/* 00134 80870BE4 44813000 */ mtc1 $at, $f6 ## $f6 = 140.00 -/* 00138 80870BE8 C4E4000C */ lwc1 $f4, 0x000C($a3) ## 0000000C -/* 0013C 80870BEC 24180005 */ addiu $t8, $zero, 0x0005 ## $t8 = 00000005 -/* 00140 80870BF0 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 00144 80870BF4 46062200 */ add.s $f8, $f4, $f6 -/* 00148 80870BF8 A0F80169 */ sb $t8, 0x0169($a3) ## 00000169 -/* 0014C 80870BFC A0F90168 */ sb $t9, 0x0168($a3) ## 00000168 -/* 00150 80870C00 A4E0016A */ sh $zero, 0x016A($a3) ## 0000016A -/* 00154 80870C04 E4E80028 */ swc1 $f8, 0x0028($a3) ## 00000028 -/* 00158 80870C08 AFA70020 */ sw $a3, 0x0020($sp) -/* 0015C 80870C0C AFA00010 */ sw $zero, 0x0010($sp) -/* 00160 80870C10 8FA40024 */ lw $a0, 0x0024($sp) -/* 00164 80870C14 24050BF4 */ addiu $a1, $zero, 0x0BF4 ## $a1 = 00000BF4 -/* 00168 80870C18 0C02003E */ jal func_800800F8 -/* 0016C 80870C1C 2406FF9D */ addiu $a2, $zero, 0xFF9D ## $a2 = FFFFFF9D -/* 00170 80870C20 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 00174 80870C24 8FA70020 */ lw $a3, 0x0020($sp) -.L80870C28: -/* 00178 80870C28 84E8016A */ lh $t0, 0x016A($a3) ## 0000016A -.L80870C2C: -/* 0017C 80870C2C 3C188087 */ lui $t8, %hi(func_80870F00) ## $t8 = 80870000 -/* 00180 80870C30 27180F00 */ addiu $t8, $t8, %lo(func_80870F00) ## $t8 = 80870F00 -/* 00184 80870C34 5500003A */ bnel $t0, $zero, .L80870D20 -/* 00188 80870C38 8FBF001C */ lw $ra, 0x001C($sp) -/* 0018C 80870C3C 90E20168 */ lbu $v0, 0x0168($a3) ## 00000168 -/* 00190 80870C40 24090064 */ addiu $t1, $zero, 0x0064 ## $t1 = 00000064 -/* 00194 80870C44 A4E9016A */ sh $t1, 0x016A($a3) ## 0000016A -/* 00198 80870C48 14400008 */ bne $v0, $zero, .L80870C6C -/* 0019C 80870C4C 3C01430C */ lui $at, 0x430C ## $at = 430C0000 -/* 001A0 80870C50 C4EA000C */ lwc1 $f10, 0x000C($a3) ## 0000000C -/* 001A4 80870C54 44818000 */ mtc1 $at, $f16 ## $f16 = 140.00 -/* 001A8 80870C58 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 001AC 80870C5C A0EA0168 */ sb $t2, 0x0168($a3) ## 00000168 -/* 001B0 80870C60 46105480 */ add.s $f18, $f10, $f16 -/* 001B4 80870C64 1000002C */ beq $zero, $zero, .L80870D18 -/* 001B8 80870C68 E4F2016C */ swc1 $f18, 0x016C($a3) ## 0000016C -.L80870C6C: -/* 001BC 80870C6C 14620010 */ bne $v1, $v0, .L80870CB0 -/* 001C0 80870C70 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 001C4 80870C74 90EB0169 */ lbu $t3, 0x0169($a3) ## 00000169 -/* 001C8 80870C78 3C01442F */ lui $at, 0x442F ## $at = 442F0000 -/* 001CC 80870C7C 506B0009 */ beql $v1, $t3, .L80870CA4 -/* 001D0 80870C80 C4EA000C */ lwc1 $f10, 0x000C($a3) ## 0000000C -/* 001D4 80870C84 C4E4000C */ lwc1 $f4, 0x000C($a3) ## 0000000C -/* 001D8 80870C88 44813000 */ mtc1 $at, $f6 ## $f6 = 700.00 -/* 001DC 80870C8C 240C0003 */ addiu $t4, $zero, 0x0003 ## $t4 = 00000003 -/* 001E0 80870C90 A0EC0168 */ sb $t4, 0x0168($a3) ## 00000168 -/* 001E4 80870C94 46062200 */ add.s $f8, $f4, $f6 -/* 001E8 80870C98 1000001F */ beq $zero, $zero, .L80870D18 -/* 001EC 80870C9C E4E8016C */ swc1 $f8, 0x016C($a3) ## 0000016C -/* 001F0 80870CA0 C4EA000C */ lwc1 $f10, 0x000C($a3) ## 0000000C -.L80870CA4: -/* 001F4 80870CA4 A0E00168 */ sb $zero, 0x0168($a3) ## 00000168 -/* 001F8 80870CA8 1000001B */ beq $zero, $zero, .L80870D18 -/* 001FC 80870CAC E4EA016C */ swc1 $f10, 0x016C($a3) ## 0000016C -.L80870CB0: -/* 00200 80870CB0 54410011 */ bnel $v0, $at, .L80870CF8 -/* 00204 80870CB4 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00208 80870CB8 90ED0169 */ lbu $t5, 0x0169($a3) ## 00000169 -/* 0020C 80870CBC 3C01442F */ lui $at, 0x442F ## $at = 442F0000 -/* 00210 80870CC0 506D0009 */ beql $v1, $t5, .L80870CE8 -/* 00214 80870CC4 C4E6000C */ lwc1 $f6, 0x000C($a3) ## 0000000C -/* 00218 80870CC8 C4F0000C */ lwc1 $f16, 0x000C($a3) ## 0000000C -/* 0021C 80870CCC 44819000 */ mtc1 $at, $f18 ## $f18 = 700.00 -/* 00220 80870CD0 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 -/* 00224 80870CD4 A0EE0168 */ sb $t6, 0x0168($a3) ## 00000168 -/* 00228 80870CD8 46128100 */ add.s $f4, $f16, $f18 -/* 0022C 80870CDC 1000000E */ beq $zero, $zero, .L80870D18 -/* 00230 80870CE0 E4E4016C */ swc1 $f4, 0x016C($a3) ## 0000016C -/* 00234 80870CE4 C4E6000C */ lwc1 $f6, 0x000C($a3) ## 0000000C -.L80870CE8: -/* 00238 80870CE8 A0E00168 */ sb $zero, 0x0168($a3) ## 00000168 -/* 0023C 80870CEC 1000000A */ beq $zero, $zero, .L80870D18 -/* 00240 80870CF0 E4E6016C */ swc1 $f6, 0x016C($a3) ## 0000016C -/* 00244 80870CF4 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -.L80870CF8: -/* 00248 80870CF8 14410007 */ bne $v0, $at, .L80870D18 -/* 0024C 80870CFC 3C01430C */ lui $at, 0x430C ## $at = 430C0000 -/* 00250 80870D00 44815000 */ mtc1 $at, $f10 ## $f10 = 140.00 -/* 00254 80870D04 C4E8000C */ lwc1 $f8, 0x000C($a3) ## 0000000C -/* 00258 80870D08 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 0025C 80870D0C A0EF0168 */ sb $t7, 0x0168($a3) ## 00000168 -/* 00260 80870D10 460A4400 */ add.s $f16, $f8, $f10 -/* 00264 80870D14 E4F0016C */ swc1 $f16, 0x016C($a3) ## 0000016C -.L80870D18: -/* 00268 80870D18 ACF80164 */ sw $t8, 0x0164($a3) ## 00000164 -/* 0026C 80870D1C 8FBF001C */ lw $ra, 0x001C($sp) -.L80870D20: -/* 00270 80870D20 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00274 80870D24 03E00008 */ jr $ra -/* 00278 80870D28 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/func_80870D2C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/func_80870D2C.s deleted file mode 100644 index be2925fdea..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/func_80870D2C.s +++ /dev/null @@ -1,125 +0,0 @@ -glabel func_80870D2C -/* 0027C 80870D2C 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00280 80870D30 AFBF002C */ sw $ra, 0x002C($sp) -/* 00284 80870D34 AFB10028 */ sw $s1, 0x0028($sp) -/* 00288 80870D38 AFB00024 */ sw $s0, 0x0024($sp) -/* 0028C 80870D3C C484000C */ lwc1 $f4, 0x000C($a0) ## 0000000C -/* 00290 80870D40 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 -/* 00294 80870D44 01C57021 */ addu $t6, $t6, $a1 -/* 00298 80870D48 E7A40038 */ swc1 $f4, 0x0038($sp) -/* 0029C 80870D4C 8DCE1DE4 */ lw $t6, 0x1DE4($t6) ## 00011DE4 -/* 002A0 80870D50 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 002A4 80870D54 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 002A8 80870D58 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 002AC 80870D5C 11E0002F */ beq $t7, $zero, .L80870E1C -/* 002B0 80870D60 3C0142DC */ lui $at, 0x42DC ## $at = 42DC0000 -/* 002B4 80870D64 3C014282 */ lui $at, 0x4282 ## $at = 42820000 -/* 002B8 80870D68 44814000 */ mtc1 $at, $f8 ## $f8 = 65.00 -/* 002BC 80870D6C C4860024 */ lwc1 $f6, 0x0024($a0) ## 00000024 -/* 002C0 80870D70 3C0142DC */ lui $at, 0x42DC ## $at = 42DC0000 -/* 002C4 80870D74 44816000 */ mtc1 $at, $f12 ## $f12 = 110.00 -/* 002C8 80870D78 46083280 */ add.s $f10, $f6, $f8 -/* 002CC 80870D7C 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 002D0 80870D80 E7AA0034 */ swc1 $f10, 0x0034($sp) -/* 002D4 80870D84 C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C -/* 002D8 80870D88 24180014 */ addiu $t8, $zero, 0x0014 ## $t8 = 00000014 -/* 002DC 80870D8C 2419003C */ addiu $t9, $zero, 0x003C ## $t9 = 0000003C -/* 002E0 80870D90 46100480 */ add.s $f18, $f0, $f16 -/* 002E4 80870D94 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 002E8 80870D98 AFA80018 */ sw $t0, 0x0018($sp) -/* 002EC 80870D9C AFB90014 */ sw $t9, 0x0014($sp) -/* 002F0 80870DA0 E7B2003C */ swc1 $f18, 0x003C($sp) -/* 002F4 80870DA4 AFB80010 */ sw $t8, 0x0010($sp) -/* 002F8 80870DA8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 002FC 80870DAC 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFF4 -/* 00300 80870DB0 3C0640A0 */ lui $a2, 0x40A0 ## $a2 = 40A00000 -/* 00304 80870DB4 0C00CD20 */ jal func_80033480 -/* 00308 80870DB8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0030C 80870DBC 3C014282 */ lui $at, 0x4282 ## $at = 42820000 -/* 00310 80870DC0 44813000 */ mtc1 $at, $f6 ## $f6 = 65.00 -/* 00314 80870DC4 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 00318 80870DC8 3C0142DC */ lui $at, 0x42DC ## $at = 42DC0000 -/* 0031C 80870DCC 44816000 */ mtc1 $at, $f12 ## $f12 = 110.00 -/* 00320 80870DD0 46062201 */ sub.s $f8, $f4, $f6 -/* 00324 80870DD4 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 00328 80870DD8 E7A80034 */ swc1 $f8, 0x0034($sp) -/* 0032C 80870DDC C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 00330 80870DE0 24090014 */ addiu $t1, $zero, 0x0014 ## $t1 = 00000014 -/* 00334 80870DE4 240A003C */ addiu $t2, $zero, 0x003C ## $t2 = 0000003C -/* 00338 80870DE8 460A0400 */ add.s $f16, $f0, $f10 -/* 0033C 80870DEC 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 00340 80870DF0 AFAB0018 */ sw $t3, 0x0018($sp) -/* 00344 80870DF4 AFAA0014 */ sw $t2, 0x0014($sp) -/* 00348 80870DF8 E7B0003C */ swc1 $f16, 0x003C($sp) -/* 0034C 80870DFC AFA90010 */ sw $t1, 0x0010($sp) -/* 00350 80870E00 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00354 80870E04 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFF4 -/* 00358 80870E08 3C0640A0 */ lui $a2, 0x40A0 ## $a2 = 40A00000 -/* 0035C 80870E0C 0C00CD20 */ jal func_80033480 -/* 00360 80870E10 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00364 80870E14 1000002F */ beq $zero, $zero, .L80870ED4 -/* 00368 80870E18 92080169 */ lbu $t0, 0x0169($s0) ## 00000169 -.L80870E1C: -/* 0036C 80870E1C 44816000 */ mtc1 $at, $f12 ## $f12 = 0.00 -/* 00370 80870E20 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 00374 80870E24 00000000 */ nop -/* 00378 80870E28 C6120024 */ lwc1 $f18, 0x0024($s0) ## 00000024 -/* 0037C 80870E2C 3C014282 */ lui $at, 0x4282 ## $at = 42820000 -/* 00380 80870E30 44814000 */ mtc1 $at, $f8 ## $f8 = 65.00 -/* 00384 80870E34 46120100 */ add.s $f4, $f0, $f18 -/* 00388 80870E38 240C0014 */ addiu $t4, $zero, 0x0014 ## $t4 = 00000014 -/* 0038C 80870E3C 240D003C */ addiu $t5, $zero, 0x003C ## $t5 = 0000003C -/* 00390 80870E40 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 00394 80870E44 E7A40034 */ swc1 $f4, 0x0034($sp) -/* 00398 80870E48 C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C -/* 0039C 80870E4C AFAE0018 */ sw $t6, 0x0018($sp) -/* 003A0 80870E50 AFAD0014 */ sw $t5, 0x0014($sp) -/* 003A4 80870E54 46083280 */ add.s $f10, $f6, $f8 -/* 003A8 80870E58 AFAC0010 */ sw $t4, 0x0010($sp) -/* 003AC 80870E5C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 003B0 80870E60 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFF4 -/* 003B4 80870E64 E7AA003C */ swc1 $f10, 0x003C($sp) -/* 003B8 80870E68 3C0640A0 */ lui $a2, 0x40A0 ## $a2 = 40A00000 -/* 003BC 80870E6C 0C00CD20 */ jal func_80033480 -/* 003C0 80870E70 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 003C4 80870E74 3C0142DC */ lui $at, 0x42DC ## $at = 42DC0000 -/* 003C8 80870E78 44816000 */ mtc1 $at, $f12 ## $f12 = 110.00 -/* 003CC 80870E7C 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 003D0 80870E80 00000000 */ nop -/* 003D4 80870E84 C6100024 */ lwc1 $f16, 0x0024($s0) ## 00000024 -/* 003D8 80870E88 3C014282 */ lui $at, 0x4282 ## $at = 42820000 -/* 003DC 80870E8C 44813000 */ mtc1 $at, $f6 ## $f6 = 65.00 -/* 003E0 80870E90 46100480 */ add.s $f18, $f0, $f16 -/* 003E4 80870E94 240F0014 */ addiu $t7, $zero, 0x0014 ## $t7 = 00000014 -/* 003E8 80870E98 2418003C */ addiu $t8, $zero, 0x003C ## $t8 = 0000003C -/* 003EC 80870E9C 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 003F0 80870EA0 E7B20034 */ swc1 $f18, 0x0034($sp) -/* 003F4 80870EA4 C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C -/* 003F8 80870EA8 AFB90018 */ sw $t9, 0x0018($sp) -/* 003FC 80870EAC AFB80014 */ sw $t8, 0x0014($sp) -/* 00400 80870EB0 46062201 */ sub.s $f8, $f4, $f6 -/* 00404 80870EB4 AFAF0010 */ sw $t7, 0x0010($sp) -/* 00408 80870EB8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0040C 80870EBC 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFF4 -/* 00410 80870EC0 E7A8003C */ swc1 $f8, 0x003C($sp) -/* 00414 80870EC4 3C0640A0 */ lui $a2, 0x40A0 ## $a2 = 40A00000 -/* 00418 80870EC8 0C00CD20 */ jal func_80033480 -/* 0041C 80870ECC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00420 80870ED0 92080169 */ lbu $t0, 0x0169($s0) ## 00000169 -.L80870ED4: -/* 00424 80870ED4 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00428 80870ED8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0042C 80870EDC 55010004 */ bnel $t0, $at, .L80870EF0 -/* 00430 80870EE0 8FBF002C */ lw $ra, 0x002C($sp) -/* 00434 80870EE4 0C00BE5D */ jal func_8002F974 -/* 00438 80870EE8 24052024 */ addiu $a1, $zero, 0x2024 ## $a1 = 00002024 -/* 0043C 80870EEC 8FBF002C */ lw $ra, 0x002C($sp) -.L80870EF0: -/* 00440 80870EF0 8FB00024 */ lw $s0, 0x0024($sp) -/* 00444 80870EF4 8FB10028 */ lw $s1, 0x0028($sp) -/* 00448 80870EF8 03E00008 */ jr $ra -/* 0044C 80870EFC 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/func_80870F00.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/func_80870F00.s deleted file mode 100644 index a6301bfd9c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/func_80870F00.s +++ /dev/null @@ -1,74 +0,0 @@ -glabel func_80870F00 -/* 00450 80870F00 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00454 80870F04 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00458 80870F08 AFB00020 */ sw $s0, 0x0020($sp) -/* 0045C 80870F0C AFA5002C */ sw $a1, 0x002C($sp) -/* 00460 80870F10 908E0169 */ lbu $t6, 0x0169($a0) ## 00000169 -/* 00464 80870F14 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00468 80870F18 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0046C 80870F1C 55C1001E */ bnel $t6, $at, .L80870F98 -/* 00470 80870F20 92080169 */ lbu $t0, 0x0169($s0) ## 00000169 -/* 00474 80870F24 8485001C */ lh $a1, 0x001C($a0) ## 0000001C -/* 00478 80870F28 28A10040 */ slti $at, $a1, 0x0040 -/* 0047C 80870F2C 5020001A */ beql $at, $zero, .L80870F98 -/* 00480 80870F30 92080169 */ lbu $t0, 0x0169($s0) ## 00000169 -/* 00484 80870F34 0C00B2D0 */ jal Flags_GetSwitch - -/* 00488 80870F38 8FA4002C */ lw $a0, 0x002C($sp) -/* 0048C 80870F3C 10400015 */ beq $v0, $zero, .L80870F94 -/* 00490 80870F40 240F0005 */ addiu $t7, $zero, 0x0005 ## $t7 = 00000005 -/* 00494 80870F44 3C01430C */ lui $at, 0x430C ## $at = 430C0000 -/* 00498 80870F48 44813000 */ mtc1 $at, $f6 ## $f6 = 140.00 -/* 0049C 80870F4C C604000C */ lwc1 $f4, 0x000C($s0) ## 0000000C -/* 004A0 80870F50 3C198087 */ lui $t9, %hi(func_80870B88) ## $t9 = 80870000 -/* 004A4 80870F54 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 004A8 80870F58 46062200 */ add.s $f8, $f4, $f6 -/* 004AC 80870F5C 27390B88 */ addiu $t9, $t9, %lo(func_80870B88) ## $t9 = 80870B88 -/* 004B0 80870F60 A20F0169 */ sb $t7, 0x0169($s0) ## 00000169 -/* 004B4 80870F64 A2180168 */ sb $t8, 0x0168($s0) ## 00000168 -/* 004B8 80870F68 E6080028 */ swc1 $f8, 0x0028($s0) ## 00000028 -/* 004BC 80870F6C A600016A */ sh $zero, 0x016A($s0) ## 0000016A -/* 004C0 80870F70 AE190164 */ sw $t9, 0x0164($s0) ## 00000164 -/* 004C4 80870F74 AFA00010 */ sw $zero, 0x0010($sp) -/* 004C8 80870F78 8FA4002C */ lw $a0, 0x002C($sp) -/* 004CC 80870F7C 24050BF4 */ addiu $a1, $zero, 0x0BF4 ## $a1 = 00000BF4 -/* 004D0 80870F80 2406FF9D */ addiu $a2, $zero, 0xFF9D ## $a2 = FFFFFF9D -/* 004D4 80870F84 0C02003E */ jal func_800800F8 -/* 004D8 80870F88 02003825 */ or $a3, $s0, $zero ## $a3 = 00000000 -/* 004DC 80870F8C 10000016 */ beq $zero, $zero, .L80870FE8 -/* 004E0 80870F90 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80870F94: -/* 004E4 80870F94 92080169 */ lbu $t0, 0x0169($s0) ## 00000169 -.L80870F98: -/* 004E8 80870F98 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 004EC 80870F9C 8E05016C */ lw $a1, 0x016C($s0) ## 0000016C -/* 004F0 80870FA0 44885000 */ mtc1 $t0, $f10 ## $f10 = 0.00 -/* 004F4 80870FA4 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 004F8 80870FA8 05010004 */ bgez $t0, .L80870FBC -/* 004FC 80870FAC 468052A0 */ cvt.s.w $f10, $f10 -/* 00500 80870FB0 44818000 */ mtc1 $at, $f16 ## $f16 = 4294967296.00 -/* 00504 80870FB4 00000000 */ nop -/* 00508 80870FB8 46105280 */ add.s $f10, $f10, $f16 -.L80870FBC: -/* 0050C 80870FBC 44065000 */ mfc1 $a2, $f10 -/* 00510 80870FC0 0C01DE80 */ jal Math_ApproxF - -/* 00514 80870FC4 00000000 */ nop -/* 00518 80870FC8 10400006 */ beq $v0, $zero, .L80870FE4 -/* 0051C 80870FCC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00520 80870FD0 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00524 80870FD4 240528F1 */ addiu $a1, $zero, 0x28F1 ## $a1 = 000028F1 -/* 00528 80870FD8 3C098087 */ lui $t1, %hi(func_80870B88) ## $t1 = 80870000 -/* 0052C 80870FDC 25290B88 */ addiu $t1, $t1, %lo(func_80870B88) ## $t1 = 80870B88 -/* 00530 80870FE0 AE090164 */ sw $t1, 0x0164($s0) ## 00000164 -.L80870FE4: -/* 00534 80870FE4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80870FE8: -/* 00538 80870FE8 0C21C34B */ jal func_80870D2C -/* 0053C 80870FEC 8FA5002C */ lw $a1, 0x002C($sp) -/* 00540 80870FF0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00544 80870FF4 8FB00020 */ lw $s0, 0x0020($sp) -/* 00548 80870FF8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0054C 80870FFC 03E00008 */ jr $ra -/* 00550 80871000 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/func_8087AF38.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/func_8087AF38.s index 42c6fc8e5c..a6a2d64780 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/func_8087AF38.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/func_8087AF38.s @@ -201,7 +201,7 @@ glabel func_8087AF38 /* 00450 8087B210 02A02825 */ or $a1, $s5, $zero ## $a1 = 00000008 /* 00454 8087B214 03C03025 */ or $a2, $s8, $zero ## $a2 = FFFFFFF4 /* 00458 8087B218 AFA0002C */ sw $zero, 0x002C($sp) -/* 0045C 8087B21C 0C00A9AE */ jal func_8002A6B8 +/* 0045C 8087B21C 0C00A9AE */ jal EffectSsDeadDb_Spawn /* 00460 8087B220 AFA00030 */ sw $zero, 0x0030($sp) /* 00464 8087B224 26732AAA */ addiu $s3, $s3, 0x2AAA ## $s3 = 00002AAA /* 00468 8087B228 26940001 */ addiu $s4, $s4, 0x0001 ## $s4 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80882E54.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80882E54.s index 84df61e274..5f4287e764 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80882E54.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80882E54.s @@ -44,7 +44,7 @@ glabel func_80882E54 /* 0093C 80882EFC AFA90018 */ sw $t1, 0x0018($sp) /* 00940 80882F00 AFA80014 */ sw $t0, 0x0014($sp) /* 00944 80882F04 AFB90010 */ sw $t9, 0x0010($sp) -/* 00948 80882F08 0C00A5E9 */ jal func_800297A4 +/* 00948 80882F08 0C00A5E9 */ jal EffectSsHahen_SpawnBurst /* 0094C 80882F0C E7B2007C */ swc1 $f18, 0x007C($sp) /* 00950 80882F10 3C148088 */ lui $s4, %hi(D_8088361C) ## $s4 = 80880000 /* 00954 80882F14 2694361C */ addiu $s4, $s4, %lo(D_8088361C) ## $s4 = 8088361C @@ -78,7 +78,7 @@ glabel func_80882E54 /* 009BC 80882F7C 468042A0 */ cvt.s.w $f10, $f8 /* 009C0 80882F80 AFB90014 */ sw $t9, 0x0014($sp) /* 009C4 80882F84 AFB80010 */ sw $t8, 0x0010($sp) -/* 009C8 80882F88 0C00A5E9 */ jal func_800297A4 +/* 009C8 80882F88 0C00A5E9 */ jal EffectSsHahen_SpawnBurst /* 009CC 80882F8C E7AA007C */ swc1 $f10, 0x007C($sp) /* 009D0 80882F90 240B03E8 */ addiu $t3, $zero, 0x03E8 ## $t3 = 000003E8 /* 009D4 80882F94 240C0032 */ addiu $t4, $zero, 0x0032 ## $t4 = 00000032 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A3B0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A3B0.s index 76f2d75dd2..73ddbd91e0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A3B0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A3B0.s @@ -166,7 +166,7 @@ glabel func_8088A3B0 /* 005E0 8088A600 AFAD0030 */ sw $t5, 0x0030($sp) /* 005E4 8088A604 AFAE0034 */ sw $t6, 0x0034($sp) /* 005E8 8088A608 AFAF0038 */ sw $t7, 0x0038($sp) -/* 005EC 8088A60C 0C00A7A3 */ jal func_80029E8C +/* 005EC 8088A60C 0C00A7A3 */ jal EffectSsKakera_Spawn /* 005F0 8088A610 AFBE003C */ sw $s8, 0x003C($sp) /* 005F4 8088A614 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A67C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A67C.s index 48eb571b84..b15d28b9d7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A67C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A67C.s @@ -152,7 +152,7 @@ glabel func_8088A67C /* 00874 8088A894 AFA90018 */ sw $t1, 0x0018($sp) /* 00878 8088A898 AFA00020 */ sw $zero, 0x0020($sp) /* 0087C 8088A89C AFB30024 */ sw $s3, 0x0024($sp) -/* 00880 8088A8A0 0C00A7A3 */ jal func_80029E8C +/* 00880 8088A8A0 0C00A7A3 */ jal EffectSsKakera_Spawn /* 00884 8088A8A4 AFBE003C */ sw $s8, 0x003C($sp) /* 00888 8088A8A8 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A914.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A914.s index ada0770a42..43aabae367 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A914.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/func_8088A914.s @@ -149,7 +149,7 @@ glabel func_8088A914 /* 00B00 8088AB20 AFA90018 */ sw $t1, 0x0018($sp) /* 00B04 8088AB24 AFA00020 */ sw $zero, 0x0020($sp) /* 00B08 8088AB28 AFB30024 */ sw $s3, 0x0024($sp) -/* 00B0C 8088AB2C 0C00A7A3 */ jal func_80029E8C +/* 00B0C 8088AB2C 0C00A7A3 */ jal EffectSsKakera_Spawn /* 00B10 8088AB30 AFBE003C */ sw $s8, 0x003C($sp) /* 00B14 8088AB34 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/func_80892040.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/func_80892040.s index b1c126b1e6..7a2a43c69e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/func_80892040.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/func_80892040.s @@ -108,7 +108,7 @@ glabel func_80892040 /* 00284 808921A4 AFB50014 */ sw $s5, 0x0014($sp) /* 00288 808921A8 AFB60018 */ sw $s6, 0x0018($sp) /* 0028C 808921AC 44065000 */ mfc1 $a2, $f10 -/* 00290 808921B0 0C00A8A9 */ jal func_8002A2A4 +/* 00290 808921B0 0C00A8A9 */ jal EffectSsEnIce_Spawn /* 00294 808921B4 00000000 */ nop /* 00298 808921B8 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 /* 0029C 808921BC 1617FFD5 */ bne $s0, $s7, .L80892114 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_808945B4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_808945B4.s index 11e0f50cba..de3c956a9b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_808945B4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_808945B4.s @@ -148,7 +148,7 @@ glabel func_808945B4 /* 0030C 808947AC AFA00020 */ sw $zero, 0x0020($sp) /* 00310 808947B0 AFB10024 */ sw $s1, 0x0024($sp) /* 00314 808947B4 AFA80028 */ sw $t0, 0x0028($sp) -/* 00318 808947B8 0C00A7A3 */ jal func_80029E8C +/* 00318 808947B8 0C00A7A3 */ jal EffectSsKakera_Spawn /* 0031C 808947BC AFBE003C */ sw $s8, 0x003C($sp) /* 00320 808947C0 26940001 */ addiu $s4, $s4, 0x0001 ## $s4 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/func_80898114.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/func_80898114.s index 05b9da219b..b91b7e2b81 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/func_80898114.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/func_80898114.s @@ -104,7 +104,7 @@ glabel func_80898114 /* 001B0 80898270 AFA00020 */ sw $zero, 0x0020($sp) /* 001B4 80898274 AFA00028 */ sw $zero, 0x0028($sp) /* 001B8 80898278 AFB6003C */ sw $s6, 0x003C($sp) -/* 001BC 8089827C 0C00A7A3 */ jal func_80029E8C +/* 001BC 8089827C 0C00A7A3 */ jal EffectSsKakera_Spawn /* 001C0 80898280 AFB90024 */ sw $t9, 0x0024($sp) /* 001C4 80898284 26310002 */ addiu $s1, $s1, 0x0002 ## $s1 = 80898776 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_80898920.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_80898920.s index ebe394bf44..b520cb948a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_80898920.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_80898920.s @@ -300,7 +300,7 @@ glabel func_80898920 /* 00460 80898D00 AFA00028 */ sw $zero, 0x0028($sp) /* 00464 80898D04 AFA90024 */ sw $t1, 0x0024($sp) /* 00468 80898D08 AFB80018 */ sw $t8, 0x0018($sp) -/* 0046C 80898D0C 0C00A7A3 */ jal func_80029E8C +/* 0046C 80898D0C 0C00A7A3 */ jal EffectSsKakera_Spawn /* 00470 80898D10 AFAB0030 */ sw $t3, 0x0030($sp) /* 00474 80898D14 0C03F66B */ jal Math_Rand_ZeroOne diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_80898DB4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_80898DB4.s index 9578e09a0d..7e5931605f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_80898DB4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/func_80898DB4.s @@ -282,7 +282,7 @@ glabel func_80898DB4 /* 008AC 8089914C AFA00028 */ sw $zero, 0x0028($sp) /* 008B0 80899150 AFB90024 */ sw $t9, 0x0024($sp) /* 008B4 80899154 AFAE0018 */ sw $t6, 0x0018($sp) -/* 008B8 80899158 0C00A7A3 */ jal func_80029E8C +/* 008B8 80899158 0C00A7A3 */ jal EffectSsKakera_Spawn /* 008BC 8089915C AFA90030 */ sw $t1, 0x0030($sp) /* 008C0 80899160 0C03F66B */ jal Math_Rand_ZeroOne diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/BgMoriHashigo_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/BgMoriHashigo_Destroy.s deleted file mode 100644 index 88530e5e4c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/BgMoriHashigo_Destroy.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel BgMoriHashigo_Destroy -/* 003C0 808A2920 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 003C4 808A2924 AFBF0014 */ sw $ra, 0x0014($sp) -/* 003C8 808A2928 AFA5001C */ sw $a1, 0x001C($sp) -/* 003CC 808A292C 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 003D0 808A2930 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 003D4 808A2934 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 003D8 808A2938 14400006 */ bne $v0, $zero, .L808A2954 -/* 003DC 808A293C 24A50810 */ addiu $a1, $a1, 0x0810 ## $a1 = 00000810 -/* 003E0 808A2940 8CE6014C */ lw $a2, 0x014C($a3) ## 0000014C -/* 003E4 808A2944 0C00FB56 */ jal DynaPolyInfo_Free - ## DynaPolyInfo_delReserve -/* 003E8 808A2948 AFA70018 */ sw $a3, 0x0018($sp) -/* 003EC 808A294C 8FA70018 */ lw $a3, 0x0018($sp) -/* 003F0 808A2950 84E2001C */ lh $v0, 0x001C($a3) ## 0000001C -.L808A2954: -/* 003F4 808A2954 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 003F8 808A2958 14410003 */ bne $v0, $at, .L808A2968 -/* 003FC 808A295C 8FA4001C */ lw $a0, 0x001C($sp) -/* 00400 808A2960 0C016F32 */ jal Collider_DestroyJntSph -/* 00404 808A2964 24E50164 */ addiu $a1, $a3, 0x0164 ## $a1 = 00000164 -.L808A2968: -/* 00408 808A2968 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0040C 808A296C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00410 808A2970 03E00008 */ jr $ra -/* 00414 808A2974 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/BgMoriHashigo_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/BgMoriHashigo_Init.s deleted file mode 100644 index 1fa37c8e5d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/BgMoriHashigo_Init.s +++ /dev/null @@ -1,84 +0,0 @@ -.rdata -glabel D_808A2EB0 - .asciz "Error : バンク危険！(arg_data 0x%04x)(%s %d)\n" - .balign 4 - -glabel D_808A2EE0 - .asciz "../z_bg_mori_hashigo.c" - .balign 4 - -glabel D_808A2EF8 - .asciz "(森の神殿 梯子とその留め金)(arg_data 0x%04x)\n" - .balign 4 - -.text -glabel BgMoriHashigo_Init -/* 002D8 808A2838 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 002DC 808A283C AFBF001C */ sw $ra, 0x001C($sp) -/* 002E0 808A2840 AFB00018 */ sw $s0, 0x0018($sp) -/* 002E4 808A2844 AFA50024 */ sw $a1, 0x0024($sp) -/* 002E8 808A2848 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 002EC 808A284C 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 002F0 808A2850 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 002F4 808A2854 14410009 */ bne $v0, $at, .L808A287C -/* 002F8 808A2858 00000000 */ nop -/* 002FC 808A285C 0C2289DC */ jal func_808A2770 -/* 00300 808A2860 00000000 */ nop -/* 00304 808A2864 54400010 */ bnel $v0, $zero, .L808A28A8 -/* 00308 808A2868 8FA40024 */ lw $a0, 0x0024($sp) -/* 0030C 808A286C 0C00B55C */ jal Actor_Kill - -/* 00310 808A2870 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00314 808A2874 10000026 */ beq $zero, $zero, .L808A2910 -/* 00318 808A2878 8FBF001C */ lw $ra, 0x001C($sp) -.L808A287C: -/* 0031C 808A287C 14400009 */ bne $v0, $zero, .L808A28A4 -/* 00320 808A2880 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00324 808A2884 0C2289FE */ jal func_808A27F8 -/* 00328 808A2888 8FA50024 */ lw $a1, 0x0024($sp) -/* 0032C 808A288C 54400006 */ bnel $v0, $zero, .L808A28A8 -/* 00330 808A2890 8FA40024 */ lw $a0, 0x0024($sp) -/* 00334 808A2894 0C00B55C */ jal Actor_Kill - -/* 00338 808A2898 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0033C 808A289C 1000001C */ beq $zero, $zero, .L808A2910 -/* 00340 808A28A0 8FBF001C */ lw $ra, 0x001C($sp) -.L808A28A4: -/* 00344 808A28A4 8FA40024 */ lw $a0, 0x0024($sp) -.L808A28A8: -/* 00348 808A28A8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0034C 808A28AC 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 00350 808A28B0 24050073 */ addiu $a1, $zero, 0x0073 ## $a1 = 00000073 -/* 00354 808A28B4 0C02604B */ jal Object_GetIndex - ## ObjectIndex -/* 00358 808A28B8 00812021 */ addu $a0, $a0, $at -/* 0035C 808A28BC A20201CC */ sb $v0, 0x01CC($s0) ## 000001CC -/* 00360 808A28C0 820E01CC */ lb $t6, 0x01CC($s0) ## 000001CC -/* 00364 808A28C4 3C04808A */ lui $a0, %hi(D_808A2EB0) ## $a0 = 808A0000 -/* 00368 808A28C8 24842EB0 */ addiu $a0, $a0, %lo(D_808A2EB0) ## $a0 = 808A2EB0 -/* 0036C 808A28CC 05C10009 */ bgez $t6, .L808A28F4 -/* 00370 808A28D0 3C06808A */ lui $a2, %hi(D_808A2EE0) ## $a2 = 808A0000 -/* 00374 808A28D4 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 00378 808A28D8 24C62EE0 */ addiu $a2, $a2, %lo(D_808A2EE0) ## $a2 = 808A2EE0 -/* 0037C 808A28DC 0C00084C */ jal osSyncPrintf - -/* 00380 808A28E0 24070138 */ addiu $a3, $zero, 0x0138 ## $a3 = 00000138 -/* 00384 808A28E4 0C00B55C */ jal Actor_Kill - -/* 00388 808A28E8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0038C 808A28EC 10000008 */ beq $zero, $zero, .L808A2910 -/* 00390 808A28F0 8FBF001C */ lw $ra, 0x001C($sp) -.L808A28F4: -/* 00394 808A28F4 0C228A5E */ jal func_808A2978 -/* 00398 808A28F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0039C 808A28FC 3C04808A */ lui $a0, %hi(D_808A2EF8) ## $a0 = 808A0000 -/* 003A0 808A2900 24842EF8 */ addiu $a0, $a0, %lo(D_808A2EF8) ## $a0 = 808A2EF8 -/* 003A4 808A2904 0C00084C */ jal osSyncPrintf - -/* 003A8 808A2908 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 003AC 808A290C 8FBF001C */ lw $ra, 0x001C($sp) -.L808A2910: -/* 003B0 808A2910 8FB00018 */ lw $s0, 0x0018($sp) -/* 003B4 808A2914 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 003B8 808A2918 03E00008 */ jr $ra -/* 003BC 808A291C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/BgMoriHashigo_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/BgMoriHashigo_Update.s deleted file mode 100644 index 2ba6a871f6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/BgMoriHashigo_Update.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel BgMoriHashigo_Update -/* 0068C 808A2BEC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00690 808A2BF0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00694 808A2BF4 848201C8 */ lh $v0, 0x01C8($a0) ## 000001C8 -/* 00698 808A2BF8 18400002 */ blez $v0, .L808A2C04 -/* 0069C 808A2BFC 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 006A0 808A2C00 A48E01C8 */ sh $t6, 0x01C8($a0) ## 000001C8 -.L808A2C04: -/* 006A4 808A2C04 8C8201C4 */ lw $v0, 0x01C4($a0) ## 000001C4 -/* 006A8 808A2C08 50400004 */ beql $v0, $zero, .L808A2C1C -/* 006AC 808A2C0C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 006B0 808A2C10 0040F809 */ jalr $ra, $v0 -/* 006B4 808A2C14 00000000 */ nop -/* 006B8 808A2C18 8FBF0014 */ lw $ra, 0x0014($sp) -.L808A2C1C: -/* 006BC 808A2C1C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 006C0 808A2C20 03E00008 */ jr $ra -/* 006C4 808A2C24 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2560.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2560.s deleted file mode 100644 index 1326f0b242..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2560.s +++ /dev/null @@ -1,50 +0,0 @@ -.rdata -glabel D_808A2E10 - .asciz "Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_808A2E50 - .asciz "../z_bg_mori_hashigo.c" - .balign 4 - -.text -glabel func_808A2560 -/* 00000 808A2560 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00004 808A2564 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00008 808A2568 AFB00020 */ sw $s0, 0x0020($sp) -/* 0000C 808A256C AFA5003C */ sw $a1, 0x003C($sp) -/* 00010 808A2570 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00014 808A2574 AFA60040 */ sw $a2, 0x0040($sp) -/* 00018 808A2578 AFA00030 */ sw $zero, 0x0030($sp) -/* 0001C 808A257C 0C010D20 */ jal DynaPolyInfo_SetActorMove - -/* 00020 808A2580 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 00024 808A2584 8FA40040 */ lw $a0, 0x0040($sp) -/* 00028 808A2588 0C010620 */ jal DynaPolyInfo_Alloc - -/* 0002C 808A258C 27A50030 */ addiu $a1, $sp, 0x0030 ## $a1 = FFFFFFF8 -/* 00030 808A2590 8FA4003C */ lw $a0, 0x003C($sp) -/* 00034 808A2594 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00038 808A2598 8FA70030 */ lw $a3, 0x0030($sp) -/* 0003C 808A259C 0C00FA9D */ jal DynaPolyInfo_RegisterActor - ## DynaPolyInfo_setActor -/* 00040 808A25A0 24850810 */ addiu $a1, $a0, 0x0810 ## $a1 = 00000810 -/* 00044 808A25A4 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 00048 808A25A8 1441000A */ bne $v0, $at, .L808A25D4 -/* 0004C 808A25AC AE02014C */ sw $v0, 0x014C($s0) ## 0000014C -/* 00050 808A25B0 860E001C */ lh $t6, 0x001C($s0) ## 0000001C -/* 00054 808A25B4 3C04808A */ lui $a0, %hi(D_808A2E10) ## $a0 = 808A0000 -/* 00058 808A25B8 3C05808A */ lui $a1, %hi(D_808A2E50) ## $a1 = 808A0000 -/* 0005C 808A25BC 86070000 */ lh $a3, 0x0000($s0) ## 00000000 -/* 00060 808A25C0 24A52E50 */ addiu $a1, $a1, %lo(D_808A2E50) ## $a1 = 808A2E50 -/* 00064 808A25C4 24842E10 */ addiu $a0, $a0, %lo(D_808A2E10) ## $a0 = 808A2E10 -/* 00068 808A25C8 240600A4 */ addiu $a2, $zero, 0x00A4 ## $a2 = 000000A4 -/* 0006C 808A25CC 0C00084C */ jal osSyncPrintf - -/* 00070 808A25D0 AFAE0010 */ sw $t6, 0x0010($sp) -.L808A25D4: -/* 00074 808A25D4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00078 808A25D8 8FB00020 */ lw $s0, 0x0020($sp) -/* 0007C 808A25DC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00080 808A25E0 03E00008 */ jr $ra -/* 00084 808A25E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A25E8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A25E8.s deleted file mode 100644 index 327c4eea9a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A25E8.s +++ /dev/null @@ -1,45 +0,0 @@ -glabel func_808A25E8 -/* 00088 808A25E8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0008C 808A25EC 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00090 808A25F0 AFA5002C */ sw $a1, 0x002C($sp) -/* 00094 808A25F4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00098 808A25F8 AFBF001C */ sw $ra, 0x001C($sp) -/* 0009C 808A25FC 24C50164 */ addiu $a1, $a2, 0x0164 ## $a1 = 00000164 -/* 000A0 808A2600 AFA50020 */ sw $a1, 0x0020($sp) -/* 000A4 808A2604 0C016EFE */ jal Collider_InitJntSph -/* 000A8 808A2608 AFA60028 */ sw $a2, 0x0028($sp) -/* 000AC 808A260C 8FA60028 */ lw $a2, 0x0028($sp) -/* 000B0 808A2610 3C07808A */ lui $a3, %hi(D_808A2DC4) ## $a3 = 808A0000 -/* 000B4 808A2614 8FA50020 */ lw $a1, 0x0020($sp) -/* 000B8 808A2618 24CE0184 */ addiu $t6, $a2, 0x0184 ## $t6 = 00000184 -/* 000BC 808A261C AFAE0010 */ sw $t6, 0x0010($sp) -/* 000C0 808A2620 24E72DC4 */ addiu $a3, $a3, %lo(D_808A2DC4) ## $a3 = 808A2DC4 -/* 000C4 808A2624 0C017014 */ jal Collider_SetJntSph -/* 000C8 808A2628 8FA4002C */ lw $a0, 0x002C($sp) -/* 000CC 808A262C 8FA60028 */ lw $a2, 0x0028($sp) -/* 000D0 808A2630 C4C40024 */ lwc1 $f4, 0x0024($a2) ## 00000024 -/* 000D4 808A2634 8CD90180 */ lw $t9, 0x0180($a2) ## 00000180 -/* 000D8 808A2638 4600218D */ trunc.w.s $f6, $f4 -/* 000DC 808A263C 44183000 */ mfc1 $t8, $f6 -/* 000E0 808A2640 00000000 */ nop -/* 000E4 808A2644 A7380030 */ sh $t8, 0x0030($t9) ## 00000030 -/* 000E8 808A2648 C4C80028 */ lwc1 $f8, 0x0028($a2) ## 00000028 -/* 000EC 808A264C 8CCD0180 */ lw $t5, 0x0180($a2) ## 00000180 -/* 000F0 808A2650 24190013 */ addiu $t9, $zero, 0x0013 ## $t9 = 00000013 -/* 000F4 808A2654 4600428D */ trunc.w.s $f10, $f8 -/* 000F8 808A2658 440B5000 */ mfc1 $t3, $f10 -/* 000FC 808A265C 00000000 */ nop -/* 00100 808A2660 256C0015 */ addiu $t4, $t3, 0x0015 ## $t4 = 00000015 -/* 00104 808A2664 A5AC0032 */ sh $t4, 0x0032($t5) ## 00000032 -/* 00108 808A2668 C4D0002C */ lwc1 $f16, 0x002C($a2) ## 0000002C -/* 0010C 808A266C 8CD80180 */ lw $t8, 0x0180($a2) ## 00000180 -/* 00110 808A2670 4600848D */ trunc.w.s $f18, $f16 -/* 00114 808A2674 440F9000 */ mfc1 $t7, $f18 -/* 00118 808A2678 00000000 */ nop -/* 0011C 808A267C A70F0034 */ sh $t7, 0x0034($t8) ## 00000034 -/* 00120 808A2680 8CC80180 */ lw $t0, 0x0180($a2) ## 00000180 -/* 00124 808A2684 A5190036 */ sh $t9, 0x0036($t0) ## 00000036 -/* 00128 808A2688 8FBF001C */ lw $ra, 0x001C($sp) -/* 0012C 808A268C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00130 808A2690 03E00008 */ jr $ra -/* 00134 808A2694 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2698.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2698.s deleted file mode 100644 index 8ddb9a600f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2698.s +++ /dev/null @@ -1,71 +0,0 @@ -.rdata -glabel D_808A2E68 - .asciz "Error : 梯子の発生失敗(%s %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_808A2E98 - .asciz "../z_bg_mori_hashigo.c" - .balign 4 - -.text -glabel func_808A2698 -/* 00138 808A2698 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 0013C 808A269C AFB00038 */ sw $s0, 0x0038($sp) -/* 00140 808A26A0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00144 808A26A4 AFBF003C */ sw $ra, 0x003C($sp) -/* 00148 808A26A8 AFA5004C */ sw $a1, 0x004C($sp) -/* 0014C 808A26AC 0C01DE0D */ jal Math_Coss - ## coss? -/* 00150 808A26B0 848400B6 */ lh $a0, 0x00B6($a0) ## 000000B6 -/* 00154 808A26B4 E7A00040 */ swc1 $f0, 0x0040($sp) -/* 00158 808A26B8 0C01DE1C */ jal Math_Sins - ## sins? -/* 0015C 808A26BC 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 00160 808A26C0 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 00164 808A26C4 44818000 */ mtc1 $at, $f16 ## $f16 = 6.00 -/* 00168 808A26C8 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 -/* 0016C 808A26CC C7B20040 */ lwc1 $f18, 0x0040($sp) -/* 00170 808A26D0 46008102 */ mul.s $f4, $f16, $f0 -/* 00174 808A26D4 3C01C352 */ lui $at, 0xC352 ## $at = C3520000 -/* 00178 808A26D8 44815000 */ mtc1 $at, $f10 ## $f10 = -210.00 -/* 0017C 808A26DC C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 00180 808A26E0 8FA6004C */ lw $a2, 0x004C($sp) -/* 00184 808A26E4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00188 808A26E8 460A4300 */ add.s $f12, $f8, $f10 -/* 0018C 808A26EC 240700E2 */ addiu $a3, $zero, 0x00E2 ## $a3 = 000000E2 -/* 00190 808A26F0 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 00194 808A26F4 46062080 */ add.s $f2, $f4, $f6 -/* 00198 808A26F8 46128102 */ mul.s $f4, $f16, $f18 -/* 0019C 808A26FC C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C -/* 001A0 808A2700 E7AC0014 */ swc1 $f12, 0x0014($sp) -/* 001A4 808A2704 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 001A8 808A2708 46062380 */ add.s $f14, $f4, $f6 -/* 001AC 808A270C E7AE0018 */ swc1 $f14, 0x0018($sp) -/* 001B0 808A2710 860E0030 */ lh $t6, 0x0030($s0) ## 00000030 -/* 001B4 808A2714 AFAE001C */ sw $t6, 0x001C($sp) -/* 001B8 808A2718 860F0032 */ lh $t7, 0x0032($s0) ## 00000032 -/* 001BC 808A271C AFAF0020 */ sw $t7, 0x0020($sp) -/* 001C0 808A2720 86180034 */ lh $t8, 0x0034($s0) ## 00000034 -/* 001C4 808A2724 AFA00028 */ sw $zero, 0x0028($sp) -/* 001C8 808A2728 0C00C916 */ jal Actor_SpawnAsChild - -/* 001CC 808A272C AFB80024 */ sw $t8, 0x0024($sp) -/* 001D0 808A2730 10400003 */ beq $v0, $zero, .L808A2740 -/* 001D4 808A2734 3C04808A */ lui $a0, %hi(D_808A2E68) ## $a0 = 808A0000 -/* 001D8 808A2738 10000008 */ beq $zero, $zero, .L808A275C -/* 001DC 808A273C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L808A2740: -/* 001E0 808A2740 3C05808A */ lui $a1, %hi(D_808A2E98) ## $a1 = 808A0000 -/* 001E4 808A2744 24A52E98 */ addiu $a1, $a1, %lo(D_808A2E98) ## $a1 = 808A2E98 -/* 001E8 808A2748 24842E68 */ addiu $a0, $a0, %lo(D_808A2E68) ## $a0 = 808A2E68 -/* 001EC 808A274C 240600DC */ addiu $a2, $zero, 0x00DC ## $a2 = 000000DC -/* 001F0 808A2750 0C00084C */ jal osSyncPrintf - -/* 001F4 808A2754 8607001C */ lh $a3, 0x001C($s0) ## 0000001C -/* 001F8 808A2758 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L808A275C: -/* 001FC 808A275C 8FBF003C */ lw $ra, 0x003C($sp) -/* 00200 808A2760 8FB00038 */ lw $s0, 0x0038($sp) -/* 00204 808A2764 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 00208 808A2768 03E00008 */ jr $ra -/* 0020C 808A276C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2770.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2770.s deleted file mode 100644 index d8c51aea3e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2770.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_808A2770 -/* 00210 808A2770 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00214 808A2774 AFA50024 */ sw $a1, 0x0024($sp) -/* 00218 808A2778 AFBF001C */ sw $ra, 0x001C($sp) -/* 0021C 808A277C AFB00018 */ sw $s0, 0x0018($sp) -/* 00220 808A2780 3C05808A */ lui $a1, %hi(D_808A2DD4) ## $a1 = 808A0000 -/* 00224 808A2784 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00228 808A2788 0C01E037 */ jal Actor_ProcessInitChain - -/* 0022C 808A278C 24A52DD4 */ addiu $a1, $a1, %lo(D_808A2DD4) ## $a1 = 808A2DD4 -/* 00230 808A2790 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 -/* 00234 808A2794 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00238 808A2798 3C05425C */ lui $a1, 0x425C ## $a1 = 425C0000 -/* 0023C 808A279C 35CF0001 */ ori $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 00240 808A27A0 0C00B56E */ jal Actor_SetHeight - -/* 00244 808A27A4 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 -/* 00248 808A27A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0024C 808A27AC 0C22897A */ jal func_808A25E8 -/* 00250 808A27B0 8FA50024 */ lw $a1, 0x0024($sp) -/* 00254 808A27B4 8618001C */ lh $t8, 0x001C($s0) ## 0000001C -/* 00258 808A27B8 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 0025C 808A27BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00260 808A27C0 57010008 */ bnel $t8, $at, .L808A27E4 -/* 00264 808A27C4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00268 808A27C8 0C2289A6 */ jal func_808A2698 -/* 0026C 808A27CC 8FA50024 */ lw $a1, 0x0024($sp) -/* 00270 808A27D0 54400004 */ bnel $v0, $zero, .L808A27E4 -/* 00274 808A27D4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00278 808A27D8 10000002 */ beq $zero, $zero, .L808A27E4 -/* 0027C 808A27DC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00280 808A27E0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L808A27E4: -/* 00284 808A27E4 8FBF001C */ lw $ra, 0x001C($sp) -/* 00288 808A27E8 8FB00018 */ lw $s0, 0x0018($sp) -/* 0028C 808A27EC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00290 808A27F0 03E00008 */ jr $ra -/* 00294 808A27F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A27F8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A27F8.s deleted file mode 100644 index 422685ead7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A27F8.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_808A27F8 -/* 00298 808A27F8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0029C 808A27FC AFBF0014 */ sw $ra, 0x0014($sp) -/* 002A0 808A2800 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 002A4 808A2804 AFA40018 */ sw $a0, 0x0018($sp) -/* 002A8 808A2808 24C637D8 */ addiu $a2, $a2, 0x37D8 ## $a2 = 060037D8 -/* 002AC 808A280C 0C228958 */ jal func_808A2560 -/* 002B0 808A2810 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 002B4 808A2814 3C05808A */ lui $a1, %hi(D_808A2DEC) ## $a1 = 808A0000 -/* 002B8 808A2818 24A52DEC */ addiu $a1, $a1, %lo(D_808A2DEC) ## $a1 = 808A2DEC -/* 002BC 808A281C 0C01E037 */ jal Actor_ProcessInitChain - -/* 002C0 808A2820 8FA40018 */ lw $a0, 0x0018($sp) -/* 002C4 808A2824 8FBF0014 */ lw $ra, 0x0014($sp) -/* 002C8 808A2828 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 002CC 808A282C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 002D0 808A2830 03E00008 */ jr $ra -/* 002D4 808A2834 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2978.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2978.s deleted file mode 100644 index 5bc0660368..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2978.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_808A2978 -/* 00418 808A2978 3C0E808A */ lui $t6, %hi(func_808A2988) ## $t6 = 808A0000 -/* 0041C 808A297C 25CE2988 */ addiu $t6, $t6, %lo(func_808A2988) ## $t6 = 808A2988 -/* 00420 808A2980 03E00008 */ jr $ra -/* 00424 808A2984 AC8E01C4 */ sw $t6, 0x01C4($a0) ## 000001C4 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2988.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2988.s deleted file mode 100644 index 0ce57a3460..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2988.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_808A2988 -/* 00428 808A2988 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0042C 808A298C AFB00018 */ sw $s0, 0x0018($sp) -/* 00430 808A2990 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00434 808A2994 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00438 808A2998 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 0043C 808A299C AFBF001C */ sw $ra, 0x001C($sp) -/* 00440 808A29A0 00A12021 */ addu $a0, $a1, $at -/* 00444 808A29A4 0C026062 */ jal Object_IsLoaded - -/* 00448 808A29A8 820501CC */ lb $a1, 0x01CC($s0) ## 000001CC -/* 0044C 808A29AC 50400011 */ beql $v0, $zero, .L808A29F4 -/* 00450 808A29B0 8FBF001C */ lw $ra, 0x001C($sp) -/* 00454 808A29B4 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 00458 808A29B8 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 0045C 808A29BC 14410005 */ bne $v0, $at, .L808A29D4 -/* 00460 808A29C0 00000000 */ nop -/* 00464 808A29C4 0C228A81 */ jal func_808A2A04 -/* 00468 808A29C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0046C 808A29CC 10000005 */ beq $zero, $zero, .L808A29E4 -/* 00470 808A29D0 00000000 */ nop -.L808A29D4: -/* 00474 808A29D4 14400003 */ bne $v0, $zero, .L808A29E4 -/* 00478 808A29D8 00000000 */ nop -/* 0047C 808A29DC 0C228A9E */ jal func_808A2A78 -/* 00480 808A29E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L808A29E4: -/* 00484 808A29E4 3C0E808A */ lui $t6, %hi(func_808A2C28) ## $t6 = 808A0000 -/* 00488 808A29E8 25CE2C28 */ addiu $t6, $t6, %lo(func_808A2C28) ## $t6 = 808A2C28 -/* 0048C 808A29EC AE0E0134 */ sw $t6, 0x0134($s0) ## 00000134 -/* 00490 808A29F0 8FBF001C */ lw $ra, 0x001C($sp) -.L808A29F4: -/* 00494 808A29F4 8FB00018 */ lw $s0, 0x0018($sp) -/* 00498 808A29F8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0049C 808A29FC 03E00008 */ jr $ra -/* 004A0 808A2A00 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2A04.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2A04.s deleted file mode 100644 index 6bc31f76c1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2A04.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_808A2A04 -/* 004A4 808A2A04 3C0E808A */ lui $t6, %hi(func_808A2A14) ## $t6 = 808A0000 -/* 004A8 808A2A08 25CE2A14 */ addiu $t6, $t6, %lo(func_808A2A14) ## $t6 = 808A2A14 -/* 004AC 808A2A0C 03E00008 */ jr $ra -/* 004B0 808A2A10 AC8E01C4 */ sw $t6, 0x01C4($a0) ## 000001C4 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2A14.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2A14.s deleted file mode 100644 index 4bc7987228..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2A14.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_808A2A14 -/* 004B4 808A2A14 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 004B8 808A2A18 AFBF0014 */ sw $ra, 0x0014($sp) -/* 004BC 808A2A1C AFA5001C */ sw $a1, 0x001C($sp) -/* 004C0 808A2A20 848E01C8 */ lh $t6, 0x01C8($a0) ## 000001C8 -/* 004C4 808A2A24 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 004C8 808A2A28 5DC00010 */ bgtzl $t6, .L808A2A6C -/* 004CC 808A2A2C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 004D0 808A2A30 90820175 */ lbu $v0, 0x0175($a0) ## 00000175 -/* 004D4 808A2A34 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 004D8 808A2A38 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 004DC 808A2A3C 304F0002 */ andi $t7, $v0, 0x0002 ## $t7 = 00000000 -/* 004E0 808A2A40 11E00005 */ beq $t7, $zero, .L808A2A58 -/* 004E4 808A2A44 3058FFFD */ andi $t8, $v0, 0xFFFD ## $t8 = 00000000 -/* 004E8 808A2A48 2419000A */ addiu $t9, $zero, 0x000A ## $t9 = 0000000A -/* 004EC 808A2A4C A0980175 */ sb $t8, 0x0175($a0) ## 00000175 -/* 004F0 808A2A50 10000005 */ beq $zero, $zero, .L808A2A68 -/* 004F4 808A2A54 A49901C8 */ sh $t9, 0x01C8($a0) ## 000001C8 -.L808A2A58: -/* 004F8 808A2A58 8FA4001C */ lw $a0, 0x001C($sp) -/* 004FC 808A2A5C 24E60164 */ addiu $a2, $a3, 0x0164 ## $a2 = 00000164 -/* 00500 808A2A60 0C01767D */ jal CollisionCheck_SetAC - ## CollisionCheck_setAC -/* 00504 808A2A64 00812821 */ addu $a1, $a0, $at -.L808A2A68: -/* 00508 808A2A68 8FBF0014 */ lw $ra, 0x0014($sp) -.L808A2A6C: -/* 0050C 808A2A6C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00510 808A2A70 03E00008 */ jr $ra -/* 00514 808A2A74 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2A78.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2A78.s deleted file mode 100644 index 98afdcc273..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2A78.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_808A2A78 -/* 00518 808A2A78 3C0E808A */ lui $t6, %hi(func_808A2A88) ## $t6 = 808A0000 -/* 0051C 808A2A7C 25CE2A88 */ addiu $t6, $t6, %lo(func_808A2A88) ## $t6 = 808A2A88 -/* 00520 808A2A80 03E00008 */ jr $ra -/* 00524 808A2A84 AC8E01C4 */ sw $t6, 0x01C4($a0) ## 000001C4 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2A88.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2A88.s deleted file mode 100644 index 025a69230b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2A88.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_808A2A88 -/* 00528 808A2A88 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0052C 808A2A8C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00530 808A2A90 AFA5001C */ sw $a1, 0x001C($sp) -/* 00534 808A2A94 8C820118 */ lw $v0, 0x0118($a0) ## 00000118 -/* 00538 808A2A98 844E01C8 */ lh $t6, 0x01C8($v0) ## 000001C8 -/* 0053C 808A2A9C 59C00004 */ blezl $t6, .L808A2AB0 -/* 00540 808A2AA0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00544 808A2AA4 0C228AAF */ jal func_808A2ABC -/* 00548 808A2AA8 00000000 */ nop -/* 0054C 808A2AAC 8FBF0014 */ lw $ra, 0x0014($sp) -.L808A2AB0: -/* 00550 808A2AB0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00554 808A2AB4 03E00008 */ jr $ra -/* 00558 808A2AB8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2ABC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2ABC.s deleted file mode 100644 index d634810819..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2ABC.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_808A2ABC -/* 0055C 808A2ABC 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 00560 808A2AC0 44812000 */ mtc1 $at, $f4 ## $f4 = -1.00 -/* 00564 808A2AC4 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00568 808A2AC8 44813000 */ mtc1 $at, $f6 ## $f6 = -10.00 -/* 0056C 808A2ACC 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 00570 808A2AD0 44814000 */ mtc1 $at, $f8 ## $f8 = 2.00 -/* 00574 808A2AD4 3C0E808A */ lui $t6, %hi(func_808A2AF4) ## $t6 = 808A0000 -/* 00578 808A2AD8 25CE2AF4 */ addiu $t6, $t6, %lo(func_808A2AF4) ## $t6 = 808A2AF4 -/* 0057C 808A2ADC A48001CA */ sh $zero, 0x01CA($a0) ## 000001CA -/* 00580 808A2AE0 AC8E01C4 */ sw $t6, 0x01C4($a0) ## 000001C4 -/* 00584 808A2AE4 E484006C */ swc1 $f4, 0x006C($a0) ## 0000006C -/* 00588 808A2AE8 E4860070 */ swc1 $f6, 0x0070($a0) ## 00000070 -/* 0058C 808A2AEC 03E00008 */ jr $ra -/* 00590 808A2AF0 E4880060 */ swc1 $f8, 0x0060($a0) ## 00000060 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2AF4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2AF4.s deleted file mode 100644 index 5fcd56909d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2AF4.s +++ /dev/null @@ -1,61 +0,0 @@ -glabel func_808A2AF4 -/* 00594 808A2AF4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00598 808A2AF8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0059C 808A2AFC AFB00020 */ sw $s0, 0x0020($sp) -/* 005A0 808A2B00 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 005A4 808A2B04 0C00B638 */ jal Actor_MoveForward - -/* 005A8 808A2B08 AFA5002C */ sw $a1, 0x002C($sp) -/* 005AC 808A2B0C 960E0088 */ lhu $t6, 0x0088($s0) ## 00000088 -/* 005B0 808A2B10 8FA4002C */ lw $a0, 0x002C($sp) -/* 005B4 808A2B14 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 005B8 808A2B18 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 005BC 808A2B1C 51E00021 */ beql $t7, $zero, .L808A2BA4 -/* 005C0 808A2B20 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 005C4 808A2B24 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 005C8 808A2B28 C6040060 */ lwc1 $f4, 0x0060($s0) ## 00000060 -/* 005CC 808A2B2C 4600203C */ c.lt.s $f4, $f0 -/* 005D0 808A2B30 00000000 */ nop -/* 005D4 808A2B34 4502001B */ bc1fl .L808A2BA4 -/* 005D8 808A2B38 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 005DC 808A2B3C 861801CA */ lh $t8, 0x01CA($s0) ## 000001CA -/* 005E0 808A2B40 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 005E4 808A2B44 2419001C */ addiu $t9, $zero, 0x001C ## $t9 = 0000001C -/* 005E8 808A2B48 2B010003 */ slti $at, $t8, 0x0003 -/* 005EC 808A2B4C 54200006 */ bnel $at, $zero, .L808A2B68 -/* 005F0 808A2B50 44060000 */ mfc1 $a2, $f0 -/* 005F4 808A2B54 0C228AF4 */ jal func_808A2BD0 -/* 005F8 808A2B58 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 005FC 808A2B5C 10000018 */ beq $zero, $zero, .L808A2BC0 -/* 00600 808A2B60 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00604 808A2B64 44060000 */ mfc1 $a2, $f0 -.L808A2B68: -/* 00608 808A2B68 44070000 */ mfc1 $a3, $f0 -/* 0060C 808A2B6C E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00610 808A2B70 0C00B92D */ jal func_8002E4B4 -/* 00614 808A2B74 AFB90014 */ sw $t9, 0x0014($sp) -/* 00618 808A2B78 860801CA */ lh $t0, 0x01CA($s0) ## 000001CA -/* 0061C 808A2B7C 860A01CA */ lh $t2, 0x01CA($s0) ## 000001CA -/* 00620 808A2B80 3C01808A */ lui $at, %hi(D_808A2DFC) ## $at = 808A0000 -/* 00624 808A2B84 00084880 */ sll $t1, $t0, 2 -/* 00628 808A2B88 00290821 */ addu $at, $at, $t1 -/* 0062C 808A2B8C C4262DFC */ lwc1 $f6, %lo(D_808A2DFC)($at) -/* 00630 808A2B90 254B0001 */ addiu $t3, $t2, 0x0001 ## $t3 = 00000001 -/* 00634 808A2B94 A60B01CA */ sh $t3, 0x01CA($s0) ## 000001CA -/* 00638 808A2B98 10000008 */ beq $zero, $zero, .L808A2BBC -/* 0063C 808A2B9C E6060060 */ swc1 $f6, 0x0060($s0) ## 00000060 -/* 00640 808A2BA0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -.L808A2BA4: -/* 00644 808A2BA4 240C001C */ addiu $t4, $zero, 0x001C ## $t4 = 0000001C -/* 00648 808A2BA8 AFAC0014 */ sw $t4, 0x0014($sp) -/* 0064C 808A2BAC 44060000 */ mfc1 $a2, $f0 -/* 00650 808A2BB0 44070000 */ mfc1 $a3, $f0 -/* 00654 808A2BB4 0C00B92D */ jal func_8002E4B4 -/* 00658 808A2BB8 E7A00010 */ swc1 $f0, 0x0010($sp) -.L808A2BBC: -/* 0065C 808A2BBC 8FBF0024 */ lw $ra, 0x0024($sp) -.L808A2BC0: -/* 00660 808A2BC0 8FB00020 */ lw $s0, 0x0020($sp) -/* 00664 808A2BC4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00668 808A2BC8 03E00008 */ jr $ra -/* 0066C 808A2BCC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2BD0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2BD0.s deleted file mode 100644 index 822cc6f436..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2BD0.s +++ /dev/null @@ -1,8 +0,0 @@ -glabel func_808A2BD0 -/* 00670 808A2BD0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00674 808A2BD4 C4840080 */ lwc1 $f4, 0x0080($a0) ## 00000080 -/* 00678 808A2BD8 AC8001C4 */ sw $zero, 0x01C4($a0) ## 000001C4 -/* 0067C 808A2BDC E480006C */ swc1 $f0, 0x006C($a0) ## 0000006C -/* 00680 808A2BE0 E4800060 */ swc1 $f0, 0x0060($a0) ## 00000060 -/* 00684 808A2BE4 03E00008 */ jr $ra -/* 00688 808A2BE8 E4840028 */ swc1 $f4, 0x0028($a0) ## 00000028 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2C28.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2C28.s deleted file mode 100644 index 984526e8f3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2C28.s +++ /dev/null @@ -1,105 +0,0 @@ -.rdata -glabel D_808A2F28 - .asciz "../z_bg_mori_hashigo.c" - .balign 4 - -glabel D_808A2F40 - .asciz "../z_bg_mori_hashigo.c" - .balign 4 - -glabel D_808A2F58 - .asciz "../z_bg_mori_hashigo.c" - .balign 4 - -.text -glabel func_808A2C28 -/* 006C8 808A2C28 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 006CC 808A2C2C AFBF0014 */ sw $ra, 0x0014($sp) -/* 006D0 808A2C30 AFA40050 */ sw $a0, 0x0050($sp) -/* 006D4 808A2C34 AFA50054 */ sw $a1, 0x0054($sp) -/* 006D8 808A2C38 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 006DC 808A2C3C 3C06808A */ lui $a2, %hi(D_808A2F28) ## $a2 = 808A0000 -/* 006E0 808A2C40 24C62F28 */ addiu $a2, $a2, %lo(D_808A2F28) ## $a2 = 808A2F28 -/* 006E4 808A2C44 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 -/* 006E8 808A2C48 24070204 */ addiu $a3, $zero, 0x0204 ## $a3 = 00000204 -/* 006EC 808A2C4C 0C031AB1 */ jal Graph_OpenDisps -/* 006F0 808A2C50 AFA50044 */ sw $a1, 0x0044($sp) -/* 006F4 808A2C54 8FAF0054 */ lw $t7, 0x0054($sp) -/* 006F8 808A2C58 0C024F46 */ jal func_80093D18 -/* 006FC 808A2C5C 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 00700 808A2C60 8FA80044 */ lw $t0, 0x0044($sp) -/* 00704 808A2C64 8FA70054 */ lw $a3, 0x0054($sp) -/* 00708 808A2C68 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 -/* 0070C 808A2C6C 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 00710 808A2C70 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 -/* 00714 808A2C74 3C0D0001 */ lui $t5, 0x0001 ## $t5 = 00010000 -/* 00718 808A2C78 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 0071C 808A2C7C AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 -/* 00720 808A2C80 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 00724 808A2C84 8FA90050 */ lw $t1, 0x0050($sp) -/* 00728 808A2C88 3C0FDA38 */ lui $t7, 0xDA38 ## $t7 = DA380000 -/* 0072C 808A2C8C 35EF0003 */ ori $t7, $t7, 0x0003 ## $t7 = DA380003 -/* 00730 808A2C90 812A01CC */ lb $t2, 0x01CC($t1) ## 000001CC -/* 00734 808A2C94 3C05808A */ lui $a1, %hi(D_808A2F40) ## $a1 = 808A0000 -/* 00738 808A2C98 24A52F40 */ addiu $a1, $a1, %lo(D_808A2F40) ## $a1 = 808A2F40 -/* 0073C 808A2C9C 000A5900 */ sll $t3, $t2, 4 -/* 00740 808A2CA0 016A5821 */ addu $t3, $t3, $t2 -/* 00744 808A2CA4 000B5880 */ sll $t3, $t3, 2 -/* 00748 808A2CA8 00EB6021 */ addu $t4, $a3, $t3 -/* 0074C 808A2CAC 01AC6821 */ addu $t5, $t5, $t4 -/* 00750 808A2CB0 8DAD17B4 */ lw $t5, 0x17B4($t5) ## 000117B4 -/* 00754 808A2CB4 24060209 */ addiu $a2, $zero, 0x0209 ## $a2 = 00000209 -/* 00758 808A2CB8 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 0075C 808A2CBC 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 00760 808A2CC0 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 00764 808A2CC4 AD0E02C0 */ sw $t6, 0x02C0($t0) ## 000002C0 -/* 00768 808A2CC8 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 0076C 808A2CCC 8CE40000 */ lw $a0, 0x0000($a3) ## 00000000 -/* 00770 808A2CD0 AFA80044 */ sw $t0, 0x0044($sp) -/* 00774 808A2CD4 0C0346A2 */ jal Matrix_NewMtx -/* 00778 808A2CD8 AFA2002C */ sw $v0, 0x002C($sp) -/* 0077C 808A2CDC 8FA3002C */ lw $v1, 0x002C($sp) -/* 00780 808A2CE0 8FA80044 */ lw $t0, 0x0044($sp) -/* 00784 808A2CE4 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 00788 808A2CE8 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 0078C 808A2CEC 8FB80050 */ lw $t8, 0x0050($sp) -/* 00790 808A2CF0 3C06808A */ lui $a2, %hi(D_808A2F58) ## $a2 = 808A0000 -/* 00794 808A2CF4 3C09DE00 */ lui $t1, 0xDE00 ## $t1 = DE000000 -/* 00798 808A2CF8 8702001C */ lh $v0, 0x001C($t8) ## 0000001C -/* 0079C 808A2CFC 24C62F58 */ addiu $a2, $a2, %lo(D_808A2F58) ## $a2 = 808A2F58 -/* 007A0 808A2D00 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 -/* 007A4 808A2D04 50410006 */ beql $v0, $at, .L808A2D20 -/* 007A8 808A2D08 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 007AC 808A2D0C 1040000B */ beq $v0, $zero, .L808A2D3C -/* 007B0 808A2D10 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 -/* 007B4 808A2D14 10000011 */ beq $zero, $zero, .L808A2D5C -/* 007B8 808A2D18 8FAE0054 */ lw $t6, 0x0054($sp) -/* 007BC 808A2D1C 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -.L808A2D20: -/* 007C0 808A2D20 3C0A0600 */ lui $t2, 0x0600 ## $t2 = 06000000 -/* 007C4 808A2D24 254A4770 */ addiu $t2, $t2, 0x4770 ## $t2 = 06004770 -/* 007C8 808A2D28 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 007CC 808A2D2C AD1902C0 */ sw $t9, 0x02C0($t0) ## 000002C0 -/* 007D0 808A2D30 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 -/* 007D4 808A2D34 10000008 */ beq $zero, $zero, .L808A2D58 -/* 007D8 808A2D38 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -.L808A2D3C: -/* 007DC 808A2D3C 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 007E0 808A2D40 3C0D0600 */ lui $t5, 0x0600 ## $t5 = 06000000 -/* 007E4 808A2D44 25AD36B0 */ addiu $t5, $t5, 0x36B0 ## $t5 = 060036B0 -/* 007E8 808A2D48 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 007EC 808A2D4C AD0B02C0 */ sw $t3, 0x02C0($t0) ## 000002C0 -/* 007F0 808A2D50 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 007F4 808A2D54 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -.L808A2D58: -/* 007F8 808A2D58 8FAE0054 */ lw $t6, 0x0054($sp) -.L808A2D5C: -/* 007FC 808A2D5C 24070213 */ addiu $a3, $zero, 0x0213 ## $a3 = 00000213 -/* 00800 808A2D60 0C031AD5 */ jal Graph_CloseDisps -/* 00804 808A2D64 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 00808 808A2D68 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0080C 808A2D6C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 00810 808A2D70 03E00008 */ jr $ra -/* 00814 808A2D74 00000000 */ nop -/* 00818 808A2D78 00000000 */ nop -/* 0081C 808A2D7C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/BgMoriIdomizu_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/BgMoriIdomizu_Destroy.s deleted file mode 100644 index 013dbf4b76..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/BgMoriIdomizu_Destroy.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel BgMoriIdomizu_Destroy -/* 00178 808A47B8 AFA50004 */ sw $a1, 0x0004($sp) -/* 0017C 808A47BC 848E0158 */ lh $t6, 0x0158($a0) ## 00000158 -/* 00180 808A47C0 3C01808A */ lui $at, %hi(D_808A4C10) ## $at = 808A0000 -/* 00184 808A47C4 11C00002 */ beq $t6, $zero, .L808A47D0 -/* 00188 808A47C8 00000000 */ nop -/* 0018C 808A47CC A4204C10 */ sh $zero, %lo(D_808A4C10)($at) -.L808A47D0: -/* 00190 808A47D0 03E00008 */ jr $ra -/* 00194 808A47D4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/BgMoriIdomizu_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/BgMoriIdomizu_Init.s deleted file mode 100644 index 2ff66b745a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/BgMoriIdomizu_Init.s +++ /dev/null @@ -1,116 +0,0 @@ -.rdata -glabel D_808A4C40 - .asciz "Error : バンク危険！(arg_data 0x%04x)(%s %d)\n" - .balign 4 - -glabel D_808A4C70 - .asciz "../z_bg_mori_idomizu.c" - .balign 4 - -glabel D_808A4C88 - .asciz "(森の神殿 井戸水)(arg_data 0x%04x)\n" - .balign 4 - -.late_rodata -glabel D_808A4CF4 - .float 1.1 - -glabel D_808A4CF8 - .word 0xC4E38000, 0x00000000 - -.text -glabel BgMoriIdomizu_Init -/* 0002C 808A466C 3C0E808A */ lui $t6, %hi(D_808A4C10) ## $t6 = 808A0000 -/* 00030 808A4670 85CE4C10 */ lh $t6, %lo(D_808A4C10)($t6) -/* 00034 808A4674 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00038 808A4678 AFB00018 */ sw $s0, 0x0018($sp) -/* 0003C 808A467C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00040 808A4680 AFBF001C */ sw $ra, 0x001C($sp) -/* 00044 808A4684 11C00005 */ beq $t6, $zero, .L808A469C -/* 00048 808A4688 AFA50024 */ sw $a1, 0x0024($sp) -/* 0004C 808A468C 0C00B55C */ jal Actor_Kill - -/* 00050 808A4690 00000000 */ nop -/* 00054 808A4694 10000044 */ beq $zero, $zero, .L808A47A8 -/* 00058 808A4698 8FBF001C */ lw $ra, 0x001C($sp) -.L808A469C: -/* 0005C 808A469C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00060 808A46A0 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 00064 808A46A4 3C01808A */ lui $at, %hi(D_808A4CF4) ## $at = 808A0000 -/* 00068 808A46A8 C4244CF4 */ lwc1 $f4, %lo(D_808A4CF4)($at) -/* 0006C 808A46AC 3C0142EE */ lui $at, 0x42EE ## $at = 42EE0000 -/* 00070 808A46B0 44813000 */ mtc1 $at, $f6 ## $f6 = 119.00 -/* 00074 808A46B4 3C01808A */ lui $at, %hi(D_808A4CF8) ## $at = 808A0000 -/* 00078 808A46B8 E6000054 */ swc1 $f0, 0x0054($s0) ## 00000054 -/* 0007C 808A46BC E6000058 */ swc1 $f0, 0x0058($s0) ## 00000058 -/* 00080 808A46C0 E6040050 */ swc1 $f4, 0x0050($s0) ## 00000050 -/* 00084 808A46C4 E6060024 */ swc1 $f6, 0x0024($s0) ## 00000024 -/* 00088 808A46C8 C4284CF8 */ lwc1 $f8, %lo(D_808A4CF8)($at) -/* 0008C 808A46CC 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 00090 808A46D0 E608002C */ swc1 $f8, 0x002C($s0) ## 0000002C -/* 00094 808A46D4 8FA40024 */ lw $a0, 0x0024($sp) -/* 00098 808A46D8 0C00B2D0 */ jal Flags_GetSwitch - -/* 0009C 808A46DC 30A5003F */ andi $a1, $a1, 0x003F ## $a1 = 00000000 -/* 000A0 808A46E0 10400009 */ beq $v0, $zero, .L808A4708 -/* 000A4 808A46E4 AE020154 */ sw $v0, 0x0154($s0) ## 00000154 -/* 000A8 808A46E8 3C01C38D */ lui $at, 0xC38D ## $at = C38D0000 -/* 000AC 808A46EC 44815000 */ mtc1 $at, $f10 ## $f10 = -282.00 -/* 000B0 808A46F0 2405FEE6 */ addiu $a1, $zero, 0xFEE6 ## $a1 = FFFFFEE6 -/* 000B4 808A46F4 E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 -/* 000B8 808A46F8 0C229192 */ jal func_808A4648 -/* 000BC 808A46FC 8FA40024 */ lw $a0, 0x0024($sp) -/* 000C0 808A4700 10000008 */ beq $zero, $zero, .L808A4724 -/* 000C4 808A4704 8FA40024 */ lw $a0, 0x0024($sp) -.L808A4708: -/* 000C8 808A4708 3C014338 */ lui $at, 0x4338 ## $at = 43380000 -/* 000CC 808A470C 44818000 */ mtc1 $at, $f16 ## $f16 = 184.00 -/* 000D0 808A4710 240500B8 */ addiu $a1, $zero, 0x00B8 ## $a1 = 000000B8 -/* 000D4 808A4714 E6100028 */ swc1 $f16, 0x0028($s0) ## 00000028 -/* 000D8 808A4718 0C229192 */ jal func_808A4648 -/* 000DC 808A471C 8FA40024 */ lw $a0, 0x0024($sp) -/* 000E0 808A4720 8FA40024 */ lw $a0, 0x0024($sp) -.L808A4724: -/* 000E4 808A4724 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 000E8 808A4728 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 000EC 808A472C 24050073 */ addiu $a1, $zero, 0x0073 ## $a1 = 00000073 -/* 000F0 808A4730 0C02604B */ jal Object_GetIndex - ## ObjectIndex -/* 000F4 808A4734 00812021 */ addu $a0, $a0, $at -/* 000F8 808A4738 A202015C */ sb $v0, 0x015C($s0) ## 0000015C -/* 000FC 808A473C 820F015C */ lb $t7, 0x015C($s0) ## 0000015C -/* 00100 808A4740 05E1000C */ bgez $t7, .L808A4774 -/* 00104 808A4744 00000000 */ nop -/* 00108 808A4748 0C00B55C */ jal Actor_Kill - -/* 0010C 808A474C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00110 808A4750 3C04808A */ lui $a0, %hi(D_808A4C40) ## $a0 = 808A0000 -/* 00114 808A4754 3C06808A */ lui $a2, %hi(D_808A4C70) ## $a2 = 808A0000 -/* 00118 808A4758 24C64C70 */ addiu $a2, $a2, %lo(D_808A4C70) ## $a2 = 808A4C70 -/* 0011C 808A475C 24844C40 */ addiu $a0, $a0, %lo(D_808A4C40) ## $a0 = 808A4C40 -/* 00120 808A4760 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 00124 808A4764 0C00084C */ jal osSyncPrintf - -/* 00128 808A4768 240700CA */ addiu $a3, $zero, 0x00CA ## $a3 = 000000CA -/* 0012C 808A476C 1000000E */ beq $zero, $zero, .L808A47A8 -/* 00130 808A4770 8FBF001C */ lw $ra, 0x001C($sp) -.L808A4774: -/* 00134 808A4774 0C2291F6 */ jal func_808A47D8 -/* 00138 808A4778 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0013C 808A477C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00140 808A4780 3C01808A */ lui $at, %hi(D_808A4C10) ## $at = 808A0000 -/* 00144 808A4784 A4224C10 */ sh $v0, %lo(D_808A4C10)($at) -/* 00148 808A4788 2418FFFF */ addiu $t8, $zero, 0xFFFF ## $t8 = FFFFFFFF -/* 0014C 808A478C 3C04808A */ lui $a0, %hi(D_808A4C88) ## $a0 = 808A0000 -/* 00150 808A4790 A6020158 */ sh $v0, 0x0158($s0) ## 00000158 -/* 00154 808A4794 A2180003 */ sb $t8, 0x0003($s0) ## 00000003 -/* 00158 808A4798 24844C88 */ addiu $a0, $a0, %lo(D_808A4C88) ## $a0 = 808A4C88 -/* 0015C 808A479C 0C00084C */ jal osSyncPrintf - -/* 00160 808A47A0 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 00164 808A47A4 8FBF001C */ lw $ra, 0x001C($sp) -.L808A47A8: -/* 00168 808A47A8 8FB00018 */ lw $s0, 0x0018($sp) -/* 0016C 808A47AC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00170 808A47B0 03E00008 */ jr $ra -/* 00174 808A47B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/BgMoriIdomizu_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/BgMoriIdomizu_Update.s deleted file mode 100644 index 705c59cc01..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/BgMoriIdomizu_Update.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel BgMoriIdomizu_Update -/* 003F8 808A4A38 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 003FC 808A4A3C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00400 808A4A40 8C82014C */ lw $v0, 0x014C($a0) ## 0000014C -/* 00404 808A4A44 50400004 */ beql $v0, $zero, .L808A4A58 -/* 00408 808A4A48 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0040C 808A4A4C 0040F809 */ jalr $ra, $v0 -/* 00410 808A4A50 00000000 */ nop -/* 00414 808A4A54 8FBF0014 */ lw $ra, 0x0014($sp) -.L808A4A58: -/* 00418 808A4A58 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0041C 808A4A5C 03E00008 */ jr $ra -/* 00420 808A4A60 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A4640.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A4640.s deleted file mode 100644 index 768dc25cbf..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A4640.s +++ /dev/null @@ -1,3 +0,0 @@ -glabel func_808A4640 -/* 00000 808A4640 03E00008 */ jr $ra -/* 00004 808A4644 AC85014C */ sw $a1, 0x014C($a0) ## 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A4648.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A4648.s deleted file mode 100644 index 3499e321ef..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A4648.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_808A4648 -/* 00008 808A4648 AFA50004 */ sw $a1, 0x0004($sp) -/* 0000C 808A464C 8C8E07C0 */ lw $t6, 0x07C0($a0) ## 000007C0 -/* 00010 808A4650 00052C00 */ sll $a1, $a1, 16 -/* 00014 808A4654 00052C03 */ sra $a1, $a1, 16 -/* 00018 808A4658 8DC20028 */ lw $v0, 0x0028($t6) ## 00000028 -/* 0001C 808A465C A4450022 */ sh $a1, 0x0022($v0) ## 00000022 -/* 00020 808A4660 A4450032 */ sh $a1, 0x0032($v0) ## 00000032 -/* 00024 808A4664 03E00008 */ jr $ra -/* 00028 808A4668 A4450042 */ sh $a1, 0x0042($v0) ## 00000042 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A47D8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A47D8.s deleted file mode 100644 index f94ce1257d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A47D8.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_808A47D8 -/* 00198 808A47D8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0019C 808A47DC AFBF0014 */ sw $ra, 0x0014($sp) -/* 001A0 808A47E0 3C05808A */ lui $a1, %hi(func_808A47FC) ## $a1 = 808A0000 -/* 001A4 808A47E4 0C229190 */ jal func_808A4640 -/* 001A8 808A47E8 24A547FC */ addiu $a1, $a1, %lo(func_808A47FC) ## $a1 = 808A47FC -/* 001AC 808A47EC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 001B0 808A47F0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 001B4 808A47F4 03E00008 */ jr $ra -/* 001B8 808A47F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A47FC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A47FC.s deleted file mode 100644 index b133728b28..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A47FC.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_808A47FC -/* 001BC 808A47FC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 001C0 808A4800 AFA40018 */ sw $a0, 0x0018($sp) -/* 001C4 808A4804 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 001C8 808A4808 8FAE0018 */ lw $t6, 0x0018($sp) -/* 001CC 808A480C 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 001D0 808A4810 AFBF0014 */ sw $ra, 0x0014($sp) -/* 001D4 808A4814 00A12021 */ addu $a0, $a1, $at -/* 001D8 808A4818 0C026062 */ jal Object_IsLoaded - -/* 001DC 808A481C 81C5015C */ lb $a1, 0x015C($t6) ## 0000015C -/* 001E0 808A4820 50400008 */ beql $v0, $zero, .L808A4844 -/* 001E4 808A4824 8FBF0014 */ lw $ra, 0x0014($sp) -/* 001E8 808A4828 0C229214 */ jal func_808A4850 -/* 001EC 808A482C 8FA40018 */ lw $a0, 0x0018($sp) -/* 001F0 808A4830 8FB80018 */ lw $t8, 0x0018($sp) -/* 001F4 808A4834 3C0F808A */ lui $t7, %hi(func_808A4A64) ## $t7 = 808A0000 -/* 001F8 808A4838 25EF4A64 */ addiu $t7, $t7, %lo(func_808A4A64) ## $t7 = 808A4A64 -/* 001FC 808A483C AF0F0134 */ sw $t7, 0x0134($t8) ## 00000134 -/* 00200 808A4840 8FBF0014 */ lw $ra, 0x0014($sp) -.L808A4844: -/* 00204 808A4844 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00208 808A4848 03E00008 */ jr $ra -/* 0020C 808A484C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A4850.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A4850.s deleted file mode 100644 index f722db539f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A4850.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_808A4850 -/* 00210 808A4850 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00214 808A4854 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00218 808A4858 3C05808A */ lui $a1, %hi(func_808A4874) ## $a1 = 808A0000 -/* 0021C 808A485C 0C229190 */ jal func_808A4640 -/* 00220 808A4860 24A54874 */ addiu $a1, $a1, %lo(func_808A4874) ## $a1 = 808A4874 -/* 00224 808A4864 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00228 808A4868 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0022C 808A486C 03E00008 */ jr $ra -/* 00230 808A4870 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A4874.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A4874.s deleted file mode 100644 index baf731952b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A4874.s +++ /dev/null @@ -1,127 +0,0 @@ -glabel func_808A4874 -/* 00234 808A4874 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00238 808A4878 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 -/* 0023C 808A487C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00240 808A4880 AFB00020 */ sw $s0, 0x0020($sp) -/* 00244 808A4884 01C57021 */ addu $t6, $t6, $a1 -/* 00248 808A4888 81CE1CBC */ lb $t6, 0x1CBC($t6) ## 00011CBC -/* 0024C 808A488C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00250 808A4890 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 00254 808A4894 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00258 808A4898 A3AE0037 */ sb $t6, 0x0037($sp) -/* 0025C 808A489C 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 00260 808A48A0 AFA6003C */ sw $a2, 0x003C($sp) -/* 00264 808A48A4 0C00B2D0 */ jal Flags_GetSwitch - -/* 00268 808A48A8 30A5003F */ andi $a1, $a1, 0x003F ## $a1 = 00000000 -/* 0026C 808A48AC 10400005 */ beq $v0, $zero, .L808A48C4 -/* 00270 808A48B0 AFA2002C */ sw $v0, 0x002C($sp) -/* 00274 808A48B4 3C01C38D */ lui $at, 0xC38D ## $at = C38D0000 -/* 00278 808A48B8 44812000 */ mtc1 $at, $f4 ## $f4 = -282.00 -/* 0027C 808A48BC 10000005 */ beq $zero, $zero, .L808A48D4 -/* 00280 808A48C0 E6040150 */ swc1 $f4, 0x0150($s0) ## 00000150 -.L808A48C4: -/* 00284 808A48C4 3C014338 */ lui $at, 0x4338 ## $at = 43380000 -/* 00288 808A48C8 44813000 */ mtc1 $at, $f6 ## $f6 = 184.00 -/* 0028C 808A48CC 00000000 */ nop -/* 00290 808A48D0 E6060150 */ swc1 $f6, 0x0150($s0) ## 00000150 -.L808A48D4: -/* 00294 808A48D4 1040000C */ beq $v0, $zero, .L808A4908 -/* 00298 808A48D8 00000000 */ nop -/* 0029C 808A48DC 8E0F0154 */ lw $t7, 0x0154($s0) ## 00000154 -/* 002A0 808A48E0 8FA4003C */ lw $a0, 0x003C($sp) -/* 002A4 808A48E4 24050CA8 */ addiu $a1, $zero, 0x0CA8 ## $a1 = 00000CA8 -/* 002A8 808A48E8 15E00007 */ bne $t7, $zero, .L808A4908 -/* 002AC 808A48EC 24060046 */ addiu $a2, $zero, 0x0046 ## $a2 = 00000046 -/* 002B0 808A48F0 02003825 */ or $a3, $s0, $zero ## $a3 = 00000000 -/* 002B4 808A48F4 0C02003E */ jal func_800800F8 -/* 002B8 808A48F8 AFA00010 */ sw $zero, 0x0010($sp) -/* 002BC 808A48FC 2418005A */ addiu $t8, $zero, 0x005A ## $t8 = 0000005A -/* 002C0 808A4900 1000000F */ beq $zero, $zero, .L808A4940 -/* 002C4 808A4904 A618015A */ sh $t8, 0x015A($s0) ## 0000015A -.L808A4908: -/* 002C8 808A4908 5440000E */ bnel $v0, $zero, .L808A4944 -/* 002CC 808A490C 8609015A */ lh $t1, 0x015A($s0) ## 0000015A -/* 002D0 808A4910 8E190154 */ lw $t9, 0x0154($s0) ## 00000154 -/* 002D4 808A4914 8FA4003C */ lw $a0, 0x003C($sp) -/* 002D8 808A4918 24050CA8 */ addiu $a1, $zero, 0x0CA8 ## $a1 = 00000CA8 -/* 002DC 808A491C 13200008 */ beq $t9, $zero, .L808A4940 -/* 002E0 808A4920 24060046 */ addiu $a2, $zero, 0x0046 ## $a2 = 00000046 -/* 002E4 808A4924 02003825 */ or $a3, $s0, $zero ## $a3 = 00000000 -/* 002E8 808A4928 0C02003E */ jal func_800800F8 -/* 002EC 808A492C AFA00010 */ sw $zero, 0x0010($sp) -/* 002F0 808A4930 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 002F4 808A4934 2408005A */ addiu $t0, $zero, 0x005A ## $t0 = 0000005A -/* 002F8 808A4938 A608015A */ sh $t0, 0x015A($s0) ## 0000015A -/* 002FC 808A493C E6080028 */ swc1 $f8, 0x0028($s0) ## 00000028 -.L808A4940: -/* 00300 808A4940 8609015A */ lh $t1, 0x015A($s0) ## 0000015A -.L808A4944: -/* 00304 808A4944 83A20037 */ lb $v0, 0x0037($sp) -/* 00308 808A4948 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 0030C 808A494C 252AFFFF */ addiu $t2, $t1, 0xFFFF ## $t2 = FFFFFFFF -/* 00310 808A4950 10410006 */ beq $v0, $at, .L808A496C -/* 00314 808A4954 A60A015A */ sh $t2, 0x015A($s0) ## 0000015A -/* 00318 808A4958 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 0031C 808A495C 10410003 */ beq $v0, $at, .L808A496C -/* 00320 808A4960 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 00324 808A4964 54410020 */ bnel $v0, $at, .L808A49E8 -/* 00328 808A4968 C6120150 */ lwc1 $f18, 0x0150($s0) ## 00000150 -.L808A496C: -/* 0032C 808A496C 860B015A */ lh $t3, 0x015A($s0) ## 0000015A -/* 00330 808A4970 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 00334 808A4974 3C064060 */ lui $a2, 0x4060 ## $a2 = 40600000 -/* 00338 808A4978 29610046 */ slti $at, $t3, 0x0046 -/* 0033C 808A497C 50200028 */ beql $at, $zero, .L808A4A20 -/* 00340 808A4980 8FB8002C */ lw $t8, 0x002C($sp) -/* 00344 808A4984 0C01DE80 */ jal Math_ApproxF - -/* 00348 808A4988 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 0034C 808A498C C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 -/* 00350 808A4990 8FA4003C */ lw $a0, 0x003C($sp) -/* 00354 808A4994 4600540D */ trunc.w.s $f16, $f10 -/* 00358 808A4998 44058000 */ mfc1 $a1, $f16 -/* 0035C 808A499C 00000000 */ nop -/* 00360 808A49A0 00052C00 */ sll $a1, $a1, 16 -/* 00364 808A49A4 0C229192 */ jal func_808A4648 -/* 00368 808A49A8 00052C03 */ sra $a1, $a1, 16 -/* 0036C 808A49AC 860D015A */ lh $t5, 0x015A($s0) ## 0000015A -/* 00370 808A49B0 8FAE002C */ lw $t6, 0x002C($sp) -/* 00374 808A49B4 59A0001A */ blezl $t5, .L808A4A20 -/* 00378 808A49B8 8FB8002C */ lw $t8, 0x002C($sp) -/* 0037C 808A49BC 11C00005 */ beq $t6, $zero, .L808A49D4 -/* 00380 808A49C0 00000000 */ nop -/* 00384 808A49C4 0C01E233 */ jal func_800788CC -/* 00388 808A49C8 2404205E */ addiu $a0, $zero, 0x205E ## $a0 = 0000205E -/* 0038C 808A49CC 10000014 */ beq $zero, $zero, .L808A4A20 -/* 00390 808A49D0 8FB8002C */ lw $t8, 0x002C($sp) -.L808A49D4: -/* 00394 808A49D4 0C01E233 */ jal func_800788CC -/* 00398 808A49D8 2404205E */ addiu $a0, $zero, 0x205E ## $a0 = 0000205E -/* 0039C 808A49DC 10000010 */ beq $zero, $zero, .L808A4A20 -/* 003A0 808A49E0 8FB8002C */ lw $t8, 0x002C($sp) -/* 003A4 808A49E4 C6120150 */ lwc1 $f18, 0x0150($s0) ## 00000150 -.L808A49E8: -/* 003A8 808A49E8 E6120028 */ swc1 $f18, 0x0028($s0) ## 00000028 -/* 003AC 808A49EC C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 003B0 808A49F0 8FA4003C */ lw $a0, 0x003C($sp) -/* 003B4 808A49F4 4600218D */ trunc.w.s $f6, $f4 -/* 003B8 808A49F8 44053000 */ mfc1 $a1, $f6 -/* 003BC 808A49FC 00000000 */ nop -/* 003C0 808A4A00 00052C00 */ sll $a1, $a1, 16 -/* 003C4 808A4A04 0C229192 */ jal func_808A4648 -/* 003C8 808A4A08 00052C03 */ sra $a1, $a1, 16 -/* 003CC 808A4A0C 0C00B55C */ jal Actor_Kill - -/* 003D0 808A4A10 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 003D4 808A4A14 10000004 */ beq $zero, $zero, .L808A4A28 -/* 003D8 808A4A18 8FBF0024 */ lw $ra, 0x0024($sp) -/* 003DC 808A4A1C 8FB8002C */ lw $t8, 0x002C($sp) -.L808A4A20: -/* 003E0 808A4A20 AE180154 */ sw $t8, 0x0154($s0) ## 00000154 -/* 003E4 808A4A24 8FBF0024 */ lw $ra, 0x0024($sp) -.L808A4A28: -/* 003E8 808A4A28 8FB00020 */ lw $s0, 0x0020($sp) -/* 003EC 808A4A2C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 003F0 808A4A30 03E00008 */ jr $ra -/* 003F4 808A4A34 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A4A64.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A4A64.s deleted file mode 100644 index 2819c8b21b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A4A64.s +++ /dev/null @@ -1,122 +0,0 @@ -.rdata -glabel D_808A4CAC - .asciz "../z_bg_mori_idomizu.c" - .balign 4 - -glabel D_808A4CC4 - .asciz "../z_bg_mori_idomizu.c" - .balign 4 - -glabel D_808A4CDC - .asciz "../z_bg_mori_idomizu.c" - .balign 4 - -.text -glabel func_808A4A64 -/* 00424 808A4A64 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 -/* 00428 808A4A68 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 -/* 0042C 808A4A6C AFBF003C */ sw $ra, 0x003C($sp) -/* 00430 808A4A70 AFB10038 */ sw $s1, 0x0038($sp) -/* 00434 808A4A74 AFB00034 */ sw $s0, 0x0034($sp) -/* 00438 808A4A78 AFA40080 */ sw $a0, 0x0080($sp) -/* 0043C 808A4A7C 01C57021 */ addu $t6, $t6, $a1 -/* 00440 808A4A80 8DCE1DE4 */ lw $t6, 0x1DE4($t6) ## 00011DE4 -/* 00444 808A4A84 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00448 808A4A88 3C06808A */ lui $a2, %hi(D_808A4CAC) ## $a2 = 808A0000 -/* 0044C 808A4A8C AFAE0074 */ sw $t6, 0x0074($sp) -/* 00450 808A4A90 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 00454 808A4A94 24C64CAC */ addiu $a2, $a2, %lo(D_808A4CAC) ## $a2 = 808A4CAC -/* 00458 808A4A98 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFE0 -/* 0045C 808A4A9C 24070164 */ addiu $a3, $zero, 0x0164 ## $a3 = 00000164 -/* 00460 808A4AA0 0C031AB1 */ jal Graph_OpenDisps -/* 00464 808A4AA4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00468 808A4AA8 0C024F61 */ jal func_80093D84 -/* 0046C 808A4AAC 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 00470 808A4AB0 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00474 808A4AB4 3C18DA38 */ lui $t8, 0xDA38 ## $t8 = DA380000 -/* 00478 808A4AB8 37180003 */ ori $t8, $t8, 0x0003 ## $t8 = DA380003 -/* 0047C 808A4ABC 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 00480 808A4AC0 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 -/* 00484 808A4AC4 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 00488 808A4AC8 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 0048C 808A4ACC 3C05808A */ lui $a1, %hi(D_808A4CC4) ## $a1 = 808A0000 -/* 00490 808A4AD0 24A54CC4 */ addiu $a1, $a1, %lo(D_808A4CC4) ## $a1 = 808A4CC4 -/* 00494 808A4AD4 24060168 */ addiu $a2, $zero, 0x0168 ## $a2 = 00000168 -/* 00498 808A4AD8 0C0346A2 */ jal Matrix_NewMtx -/* 0049C 808A4ADC AFA2005C */ sw $v0, 0x005C($sp) -/* 004A0 808A4AE0 8FA3005C */ lw $v1, 0x005C($sp) -/* 004A4 808A4AE4 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 -/* 004A8 808A4AE8 354A0020 */ ori $t2, $t2, 0x0020 ## $t2 = DB060020 -/* 004AC 808A4AEC AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 004B0 808A4AF0 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 004B4 808A4AF4 3C0F0001 */ lui $t7, 0x0001 ## $t7 = 00010000 -/* 004B8 808A4AF8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 004BC 808A4AFC 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 004C0 808A4B00 AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0 -/* 004C4 808A4B04 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 004C8 808A4B08 8FAB0080 */ lw $t3, 0x0080($sp) -/* 004CC 808A4B0C 240A0080 */ addiu $t2, $zero, 0x0080 ## $t2 = 00000080 -/* 004D0 808A4B10 3C19FB00 */ lui $t9, 0xFB00 ## $t9 = FB000000 -/* 004D4 808A4B14 816C015C */ lb $t4, 0x015C($t3) ## 0000015C -/* 004D8 808A4B18 000C6900 */ sll $t5, $t4, 4 -/* 004DC 808A4B1C 01AC6821 */ addu $t5, $t5, $t4 -/* 004E0 808A4B20 000D6880 */ sll $t5, $t5, 2 -/* 004E4 808A4B24 022D7021 */ addu $t6, $s1, $t5 -/* 004E8 808A4B28 01EE7821 */ addu $t7, $t7, $t6 -/* 004EC 808A4B2C 8DEF17B4 */ lw $t7, 0x17B4($t7) ## 000117B4 -/* 004F0 808A4B30 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 -/* 004F4 808A4B34 358C0024 */ ori $t4, $t4, 0x0024 ## $t4 = DB060024 -/* 004F8 808A4B38 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 004FC 808A4B3C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00500 808A4B40 240F0020 */ addiu $t7, $zero, 0x0020 ## $t7 = 00000020 -/* 00504 808A4B44 240E0020 */ addiu $t6, $zero, 0x0020 ## $t6 = 00000020 -/* 00508 808A4B48 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 0050C 808A4B4C AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 00510 808A4B50 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 00514 808A4B54 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 -/* 00518 808A4B58 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 0051C 808A4B5C 8FA90074 */ lw $t1, 0x0074($sp) -/* 00520 808A4B60 240A0020 */ addiu $t2, $zero, 0x0020 ## $t2 = 00000020 -/* 00524 808A4B64 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 00528 808A4B68 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 -/* 0052C 808A4B6C AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 00530 808A4B70 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 00534 808A4B74 24190020 */ addiu $t9, $zero, 0x0020 ## $t9 = 00000020 -/* 00538 808A4B78 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 0053C 808A4B7C 240D007F */ addiu $t5, $zero, 0x007F ## $t5 = 0000007F -/* 00540 808A4B80 3123007F */ andi $v1, $t1, 0x007F ## $v1 = 00000000 -/* 00544 808A4B84 3127007F */ andi $a3, $t1, 0x007F ## $a3 = 00000000 -/* 00548 808A4B88 AFA70020 */ sw $a3, 0x0020($sp) -/* 0054C 808A4B8C 01A33023 */ subu $a2, $t5, $v1 -/* 00550 808A4B90 AFA3001C */ sw $v1, 0x001C($sp) -/* 00554 808A4B94 AFB80018 */ sw $t8, 0x0018($sp) -/* 00558 808A4B98 AFB90024 */ sw $t9, 0x0024($sp) -/* 0055C 808A4B9C AFAA0028 */ sw $t2, 0x0028($sp) -/* 00560 808A4BA0 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00564 808A4BA4 AFAE0010 */ sw $t6, 0x0010($sp) -/* 00568 808A4BA8 0C0253D0 */ jal Gfx_TwoTexScroll -/* 0056C 808A4BAC AFA20050 */ sw $v0, 0x0050($sp) -/* 00570 808A4BB0 8FA80050 */ lw $t0, 0x0050($sp) -/* 00574 808A4BB4 3C0D0600 */ lui $t5, 0x0600 ## $t5 = 06000000 -/* 00578 808A4BB8 25AD49D0 */ addiu $t5, $t5, 0x49D0 ## $t5 = 060049D0 -/* 0057C 808A4BBC AD020004 */ sw $v0, 0x0004($t0) ## 00000004 -/* 00580 808A4BC0 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00584 808A4BC4 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 -/* 00588 808A4BC8 3C06808A */ lui $a2, %hi(D_808A4CDC) ## $a2 = 808A0000 -/* 0058C 808A4BCC 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 00590 808A4BD0 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 -/* 00594 808A4BD4 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 00598 808A4BD8 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 0059C 808A4BDC 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 005A0 808A4BE0 24C64CDC */ addiu $a2, $a2, %lo(D_808A4CDC) ## $a2 = 808A4CDC -/* 005A4 808A4BE4 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFE0 -/* 005A8 808A4BE8 0C031AD5 */ jal Graph_CloseDisps -/* 005AC 808A4BEC 2407017E */ addiu $a3, $zero, 0x017E ## $a3 = 0000017E -/* 005B0 808A4BF0 8FBF003C */ lw $ra, 0x003C($sp) -/* 005B4 808A4BF4 8FB00034 */ lw $s0, 0x0034($sp) -/* 005B8 808A4BF8 8FB10038 */ lw $s1, 0x0038($sp) -/* 005BC 808A4BFC 03E00008 */ jr $ra -/* 005C0 808A4C00 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 -/* 005C4 808A4C04 00000000 */ nop -/* 005C8 808A4C08 00000000 */ nop -/* 005CC 808A4C0C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7328.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7328.s index eb4dcf39b6..21f6d32c24 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7328.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A7328.s @@ -52,7 +52,7 @@ glabel func_808A7328 /* 011D8 808A73E8 AFA00028 */ sw $zero, 0x0028($sp) /* 011DC 808A73EC AFA00014 */ sw $zero, 0x0014($sp) /* 011E0 808A73F0 8FA40064 */ lw $a0, 0x0064($sp) -/* 011E4 808A73F4 0C00A9AE */ jal func_8002A6B8 +/* 011E4 808A73F4 0C00A9AE */ jal EffectSsDeadDb_Spawn /* 011E8 808A73F8 27A50054 */ addiu $a1, $sp, 0x0054 ## $a1 = FFFFFFF4 /* 011EC 808A73FC 1000000D */ beq $zero, $zero, .L808A7434 /* 011F0 808A7400 8FBF004C */ lw $ra, 0x004C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A780C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A780C.s index 2ab70659d7..54b106bae8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A780C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/func_808A780C.s @@ -63,7 +63,7 @@ glabel func_808A780C /* 016E4 808A78F4 27A50054 */ addiu $a1, $sp, 0x0054 ## $a1 = FFFFFFF4 /* 016E8 808A78F8 AFA00014 */ sw $zero, 0x0014($sp) /* 016EC 808A78FC AFA0002C */ sw $zero, 0x002C($sp) -/* 016F0 808A7900 0C00A9AE */ jal func_8002A6B8 +/* 016F0 808A7900 0C00A9AE */ jal EffectSsDeadDb_Spawn /* 016F4 808A7904 AFA00030 */ sw $zero, 0x0030($sp) /* 016F8 808A7908 1000001D */ beq $zero, $zero, .L808A7980 /* 016FC 808A790C 8602016C */ lh $v0, 0x016C($s0) ## 0000016C @@ -93,7 +93,7 @@ glabel func_808A780C /* 01758 808A7968 8FA40064 */ lw $a0, 0x0064($sp) /* 0175C 808A796C 27A50054 */ addiu $a1, $sp, 0x0054 ## $a1 = FFFFFFF4 /* 01760 808A7970 00C03825 */ or $a3, $a2, $zero ## $a3 = 00000000 -/* 01764 808A7974 0C00A9AE */ jal func_8002A6B8 +/* 01764 808A7974 0C00A9AE */ jal EffectSsDeadDb_Spawn /* 01768 808A7978 AFA00014 */ sw $zero, 0x0014($sp) /* 0176C 808A797C 8602016C */ lh $v0, 0x016C($s0) ## 0000016C .L808A7980: diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808ACA08.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808ACA08.s index dcdc58d169..be90eb4a73 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808ACA08.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808ACA08.s @@ -31,7 +31,7 @@ glabel func_808ACA08 /* 00418 808ACA78 AFA80014 */ sw $t0, 0x0014($sp) /* 0041C 808ACA7C AFB90010 */ sw $t9, 0x0010($sp) /* 00420 808ACA80 AFAC0024 */ sw $t4, 0x0024($sp) -/* 00424 808ACA84 0C00A5E9 */ jal func_800297A4 +/* 00424 808ACA84 0C00A5E9 */ jal EffectSsHahen_SpawnBurst /* 00428 808ACA88 8FA40044 */ lw $a0, 0x0044($sp) /* 0042C 808ACA8C 10000006 */ beq $zero, $zero, .L808ACAA8 /* 00430 808ACA90 8FAD0044 */ lw $t5, 0x0044($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEBC0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEBC0.s index 2a13a8790d..f0fb7fd201 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEBC0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEBC0.s @@ -65,7 +65,7 @@ glabel func_808AEBC0 /* 0050C 808AEC8C 3C07428C */ lui $a3, 0x428C ## $a3 = 428C0000 /* 00510 808AEC90 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 00514 808AEC94 46049180 */ add.s $f6, $f18, $f4 -/* 00518 808AEC98 0C00A4F9 */ jal func_800293E4 +/* 00518 808AEC98 0C00A4F9 */ jal EffectSsBubble_Spawn /* 0051C 808AEC9C E7A60014 */ swc1 $f6, 0x0014($sp) /* 00520 808AECA0 8FBF0024 */ lw $ra, 0x0024($sp) .L808AECA4: diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEE0C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEE0C.s index ac211081dc..9f8c7f003e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEE0C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEE0C.s @@ -18,7 +18,7 @@ glabel func_808AEE0C /* 006C8 808AEE48 2406012C */ addiu $a2, $zero, 0x012C ## $a2 = 0000012C /* 006CC 808AEE4C 240702BC */ addiu $a3, $zero, 0x02BC ## $a3 = 000002BC /* 006D0 808AEE50 AFA00010 */ sw $zero, 0x0010($sp) -/* 006D4 808AEE54 0C00A511 */ jal func_80029444 +/* 006D4 808AEE54 0C00A511 */ jal EffectSsGRipple_Spawn /* 006D8 808AEE58 24A50008 */ addiu $a1, $a1, 0x0008 ## $a1 = 00000008 /* 006DC 808AEE5C 8FBF001C */ lw $ra, 0x001C($sp) .L808AEE60: diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEE6C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEE6C.s index 6497899ae5..e26761c321 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEE6C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEE6C.s @@ -39,7 +39,7 @@ glabel func_808AEE6C /* 00758 808AEED8 E7A40010 */ swc1 $f4, 0x0010($sp) /* 0075C 808AEEDC 24A50024 */ addiu $a1, $a1, 0x0024 ## $a1 = 00000024 /* 00760 808AEEE0 460A4400 */ add.s $f16, $f8, $f10 -/* 00764 808AEEE4 0C00A4F9 */ jal func_800293E4 +/* 00764 808AEEE4 0C00A4F9 */ jal EffectSsBubble_Spawn /* 00768 808AEEE8 E7B00014 */ swc1 $f16, 0x0014($sp) /* 0076C 808AEEEC 8FBF001C */ lw $ra, 0x001C($sp) .L808AEEF0: diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEEFC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEEFC.s index bfa7351d13..33b335ed2d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEEFC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AEEFC.s @@ -90,7 +90,7 @@ glabel func_808AEEFC /* 008A8 808AF028 02602825 */ or $a1, $s3, $zero ## $a1 = FFFFFFE8 /* 008AC 808AF02C E7B40010 */ swc1 $f20, 0x0010($sp) /* 008B0 808AF030 461A3200 */ add.s $f8, $f6, $f26 -/* 008B4 808AF034 0C00A4F9 */ jal func_800293E4 +/* 008B4 808AF034 0C00A4F9 */ jal EffectSsBubble_Spawn /* 008B8 808AF038 E7A80014 */ swc1 $f8, 0x0014($sp) /* 008BC 808AF03C 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 /* 008C0 808AF040 1614FFF3 */ bne $s0, $s4, .L808AF010 @@ -102,7 +102,7 @@ glabel func_808AEEFC /* 008D8 808AF058 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 008DC 808AF05C 26250024 */ addiu $a1, $s1, 0x0024 ## $a1 = 00000024 /* 008E0 808AF060 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 008E4 808AF064 0C00A527 */ jal func_8002949C +/* 008E4 808AF064 0C00A527 */ jal EffectSsGSplash_Spawn /* 008E8 808AF068 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 008EC 808AF06C 8E2C018C */ lw $t4, 0x018C($s1) ## 0000018C /* 008F0 808AF070 240B002D */ addiu $t3, $zero, 0x002D ## $t3 = 0000002D diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF1D8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF1D8.s index 3698b59405..79ea817051 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF1D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF1D8.s @@ -122,7 +122,7 @@ glabel func_808AF1D8 /* 00BD8 808AF358 8FA40034 */ lw $a0, 0x0034($sp) /* 00BDC 808AF35C 26050008 */ addiu $a1, $s0, 0x0008 ## $a1 = 00000008 /* 00BE0 808AF360 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00BE4 808AF364 0C00A527 */ jal func_8002949C +/* 00BE4 808AF364 0C00A527 */ jal EffectSsGSplash_Spawn /* 00BE8 808AF368 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00BEC 808AF36C 10000034 */ beq $zero, $zero, .L808AF440 /* 00BF0 808AF370 8FBF0024 */ lw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/BgSpot11Oasis_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/BgSpot11Oasis_Update.s index b1a4aeb7fa..06af19f0cd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/BgSpot11Oasis_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/BgSpot11Oasis_Update.s @@ -80,7 +80,7 @@ glabel BgSpot11Oasis_Update /* 003C8 808B2BB8 3C074170 */ lui $a3, 0x4170 ## $a3 = 41700000 /* 003CC 808B2BBC E7A80010 */ swc1 $f8, 0x0010($sp) /* 003D0 808B2BC0 46128100 */ add.s $f4, $f16, $f18 -/* 003D4 808B2BC4 0C00A4F9 */ jal func_800293E4 +/* 003D4 808B2BC4 0C00A4F9 */ jal EffectSsBubble_Spawn /* 003D8 808B2BC8 E7A40014 */ swc1 $f4, 0x0014($sp) /* 003DC 808B2BCC 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BF97C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BF97C.s index 383f4a10de..1f2cc612ec 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BF97C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808BF97C.s @@ -176,7 +176,7 @@ glabel func_808BF97C /* 007CC 808BFBDC 02802825 */ or $a1, $s4, $zero ## $a1 = 00000008 /* 007D0 808BFBE0 03C03025 */ or $a2, $s8, $zero ## $a2 = FFFFFFF4 /* 007D4 808BFBE4 AFA0002C */ sw $zero, 0x002C($sp) -/* 007D8 808BFBE8 0C00A9AE */ jal func_8002A6B8 +/* 007D8 808BFBE8 0C00A9AE */ jal EffectSsDeadDb_Spawn /* 007DC 808BFBEC AFA00030 */ sw $zero, 0x0030($sp) /* 007E0 808BFBF0 26522AAA */ addiu $s2, $s2, 0x2AAA ## $s2 = 00002AAA /* 007E4 808BFBF4 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808C012C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808C012C.s index 83d8bc94d8..fe60ab4251 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808C012C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/func_808C012C.s @@ -205,7 +205,7 @@ glabel func_808C012C /* 00FE0 808C03F0 03C03025 */ or $a2, $s8, $zero ## $a2 = FFFFFFF4 /* 00FE4 808C03F4 AFA0002C */ sw $zero, 0x002C($sp) /* 00FE8 808C03F8 E7AA00DC */ swc1 $f10, 0x00DC($sp) -/* 00FEC 808C03FC 0C00A9AE */ jal func_8002A6B8 +/* 00FEC 808C03FC 0C00A9AE */ jal EffectSsDeadDb_Spawn /* 00FF0 808C0400 AFA00030 */ sw $zero, 0x0030($sp) /* 00FF4 808C0404 26732AAA */ addiu $s3, $s3, 0x2AAA ## $s3 = 00002AAA /* 00FF8 808C0408 26940001 */ addiu $s4, $s4, 0x0001 ## $s4 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Update.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Update.s index 85693ef3de..0c942c100f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Update.s @@ -712,7 +712,7 @@ glabel BossDodongo_Update /* 032A4 808C4434 AFAB0010 */ sw $t3, 0x0010($sp) /* 032A8 808C4438 8FA400B4 */ lw $a0, 0x00B4($sp) /* 032AC 808C443C 27A50080 */ addiu $a1, $sp, 0x0080 ## $a1 = FFFFFFD0 -/* 032B0 808C4440 0C00A6E4 */ jal func_80029B90 +/* 032B0 808C4440 0C00A6E4 */ jal EffectSsGMagma2_Spawn /* 032B4 808C4444 AFA30014 */ sw $v1, 0x0014($sp) /* 032B8 808C4448 8626019E */ lh $a2, 0x019E($s1) ## 0000019E /* 032BC 808C444C 87AE0090 */ lh $t6, 0x0090($sp) @@ -771,7 +771,7 @@ glabel BossDodongo_Update /* 0337C 808C450C 8FA400B4 */ lw $a0, 0x00B4($sp) /* 03380 808C4510 27A50054 */ addiu $a1, $sp, 0x0054 ## $a1 = FFFFFFA4 /* 03384 808C4514 460A4400 */ add.s $f16, $f8, $f10 -/* 03388 808C4518 0C00A54C */ jal func_80029530 +/* 03388 808C4518 0C00A54C */ jal EffectSsGMagma_Spawn /* 0338C 808C451C E7B0005C */ swc1 $f16, 0x005C($sp) /* 03390 808C4520 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 .L808C4524: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C5578.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C5578.s index e69fdbe1f8..9a4b75b119 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C5578.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C5578.s @@ -1113,7 +1113,7 @@ glabel L808C5FE4 /* 05294 808C6424 00197403 */ sra $t6, $t9, 16 /* 05298 808C6428 25CA0064 */ addiu $t2, $t6, 0x0064 ## $t2 = 00000064 /* 0529C 808C642C AFAA0018 */ sw $t2, 0x0018($sp) -/* 052A0 808C6430 0C00A6E4 */ jal func_80029B90 +/* 052A0 808C6430 0C00A6E4 */ jal EffectSsGMagma2_Spawn /* 052A4 808C6434 AFA30014 */ sw $v1, 0x0014($sp) /* 052A8 808C6438 10000016 */ beq $zero, $zero, .L808C6494 /* 052AC 808C643C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 @@ -1699,7 +1699,7 @@ glabel L808C5FE4 /* 05AE0 808C6C70 000DCC00 */ sll $t9, $t5, 16 /* 05AE4 808C6C74 00195403 */ sra $t2, $t9, 16 /* 05AE8 808C6C78 254E0032 */ addiu $t6, $t2, 0x0032 ## $t6 = 00000032 -/* 05AEC 808C6C7C 0C00A6E4 */ jal func_80029B90 +/* 05AEC 808C6C7C 0C00A6E4 */ jal EffectSsGMagma2_Spawn /* 05AF0 808C6C80 AFAE0018 */ sw $t6, 0x0018($sp) glabel L808C6C84 .L808C6C84: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CB718.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CB718.s index f468fec994..28e069eef3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CB718.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CB718.s @@ -1884,7 +1884,7 @@ glabel L808CCDF0 /* 02250 808CD010 000D7403 */ sra $t6, $t5, 16 /* 02254 808CD014 25CF0028 */ addiu $t7, $t6, 0x0028 ## $t7 = 00000028 /* 02258 808CD018 AFAF0010 */ sw $t7, 0x0010($sp) -/* 0225C 808CD01C 0C00A76F */ jal func_80029DBC +/* 0225C 808CD01C 0C00A76F */ jal EffectSsKFire_Spawn /* 02260 808CD020 27A70164 */ addiu $a3, $sp, 0x0164 ## $a3 = FFFFFF94 /* 02264 808CD024 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 .L808CD028: @@ -2228,7 +2228,7 @@ glabel L808CD3A8 /* 02730 808CD4F0 000C6C00 */ sll $t5, $t4, 16 /* 02734 808CD4F4 000D7403 */ sra $t6, $t5, 16 /* 02738 808CD4F8 25CF001E */ addiu $t7, $t6, 0x001E ## $t7 = 0000001E -/* 0273C 808CD4FC 0C00A76F */ jal func_80029DBC +/* 0273C 808CD4FC 0C00A76F */ jal EffectSsKFire_Spawn /* 02740 808CD500 AFAF0010 */ sw $t7, 0x0010($sp) /* 02744 808CD504 86C30248 */ lh $v1, 0x0248($s6) ## 00000248 .L808CD508: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Update.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Update.s index f6b9afe740..6a1ab9a153 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Update.s @@ -290,7 +290,7 @@ glabel BossGanondrof_Update /* 03BE0 80914220 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 03BE4 80914224 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 03BE8 80914228 8FA60048 */ lw $a2, 0x0048($sp) -/* 03BEC 8091422C 0C00A757 */ jal EffectSsFhgFlash_Spawn2 +/* 03BEC 8091422C 0C00A757 */ jal EffectSsFhgFlash_SpawnShock /* 03BF0 80914230 2407002D */ addiu $a3, $zero, 0x002D ## $a3 = 0000002D /* 03BF4 80914234 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 /* 03BF8 80914238 00108400 */ sll $s0, $s0, 16 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910DCC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910DCC.s index 25f6cd4925..1193ff2a1e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910DCC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910DCC.s @@ -102,7 +102,7 @@ glabel func_80910DCC /* 008DC 80910F1C 000E7C00 */ sll $t7, $t6, 16 /* 008E0 80910F20 000FC403 */ sra $t8, $t7, 16 /* 008E4 80910F24 27190005 */ addiu $t9, $t8, 0x0005 ## $t9 = 00000005 -/* 008E8 80910F28 0C00A76F */ jal func_80029DBC +/* 008E8 80910F28 0C00A76F */ jal EffectSsKFire_Spawn /* 008EC 80910F2C AFB90010 */ sw $t9, 0x0010($sp) /* 008F0 80910F30 866201BE */ lh $v0, 0x01BE($s3) ## 000001BE .L80910F34: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_8091156C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_8091156C.s index 3eaeea8045..2f7b3894eb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_8091156C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_8091156C.s @@ -508,7 +508,7 @@ glabel func_8091156C /* 01604 80911C44 00095400 */ sll $t2, $t1, 16 /* 01608 80911C48 000A5C03 */ sra $t3, $t2, 16 /* 0160C 80911C4C 256C0096 */ addiu $t4, $t3, 0x0096 ## $t4 = 00000096 -/* 01610 80911C50 0C00A73C */ jal EffectSsFhgFlash_Spawn +/* 01610 80911C50 0C00A73C */ jal EffectSsFhgFlash_SpawnLightBall /* 01614 80911C54 AFAC0010 */ sw $t4, 0x0010($sp) /* 01618 80911C58 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 /* 0161C 80911C5C 00108400 */ sll $s0, $s0, 16 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912594.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912594.s index 59b907d139..dbd45eb3d1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912594.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912594.s @@ -461,7 +461,7 @@ glabel func_80912594 /* 0259C 80912BDC 461C5102 */ mul.s $f4, $f10, $f28 /* 025A0 80912BE0 46142483 */ div.s $f18, $f4, $f20 /* 025A4 80912BE4 E7A8009C */ swc1 $f8, 0x009C($sp) -/* 025A8 80912BE8 0C00A73C */ jal EffectSsFhgFlash_Spawn +/* 025A8 80912BE8 0C00A73C */ jal EffectSsFhgFlash_SpawnLightBall /* 025AC 80912BEC E7B200A0 */ swc1 $f18, 0x00A0($sp) /* 025B0 80912BF0 863801AC */ lh $t8, 0x01AC($s1) ## 000001AC /* 025B4 80912BF4 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912D2C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912D2C.s index 5ebb8bd15c..479df7ba06 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912D2C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912D2C.s @@ -951,7 +951,7 @@ glabel L8091352C /* 03370 809139B0 0018CC03 */ sra $t9, $t8, 16 /* 03374 809139B4 2728000F */ addiu $t0, $t9, 0x000F ## $t0 = 0000000F /* 03378 809139B8 AFA80010 */ sw $t0, 0x0010($sp) -/* 0337C 809139BC 0C00A76F */ jal func_80029DBC +/* 0337C 809139BC 0C00A76F */ jal EffectSsKFire_Spawn /* 03380 809139C0 AFA90014 */ sw $t1, 0x0014($sp) /* 03384 809139C4 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float @@ -985,7 +985,7 @@ glabel L8091352C /* 033EC 80913A2C 27A60088 */ addiu $a2, $sp, 0x0088 ## $a2 = FFFFFFC8 /* 033F0 80913A30 27A70070 */ addiu $a3, $sp, 0x0070 ## $a3 = FFFFFFB0 /* 033F4 80913A34 AFA00010 */ sw $zero, 0x0010($sp) -/* 033F8 80913A38 0C00A5C9 */ jal func_80029724 +/* 033F8 80913A38 0C00A5C9 */ jal EffectSsHahen_Spawn /* 033FC 80913A3C AFA00020 */ sw $zero, 0x0020($sp) .L80913A40: /* 03400 80913A40 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809168B0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809168B0.s index 2d856a9d26..fec49fb5f7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809168B0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809168B0.s @@ -128,7 +128,7 @@ glabel func_809168B0 /* 01068 80916A78 000A5C00 */ sll $t3, $t2, 16 /* 0106C 80916A7C 000B6403 */ sra $t4, $t3, 16 /* 01070 80916A80 258D000A */ addiu $t5, $t4, 0x000A ## $t5 = 0000000A -/* 01074 80916A84 0C00A5C9 */ jal func_80029724 +/* 01074 80916A84 0C00A5C9 */ jal EffectSsHahen_Spawn /* 01078 80916A88 AFAD0014 */ sw $t5, 0x0014($sp) /* 0107C 80916A8C 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 /* 01080 80916A90 00108400 */ sll $s0, $s0, 16 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80917D98.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80917D98.s index b752add482..955be6b278 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80917D98.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80917D98.s @@ -159,7 +159,7 @@ glabel func_80917D98 /* 02520 80917F30 30480007 */ andi $t0, $v0, 0x0007 ## $t0 = 00000004 /* 02524 80917F34 15000004 */ bne $t0, $zero, .L80917F48 /* 02528 80917F38 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 0252C 80917F3C 0C00A66B */ jal func_800299AC +/* 0252C 80917F3C 0C00A66B */ jal EffectSsSibuki_SpawnBurst /* 02530 80917F40 26450038 */ addiu $a1, $s2, 0x0038 ## $a1 = 00000038 /* 02534 80917F44 864201D2 */ lh $v0, 0x01D2($s2) ## 000001D2 .L80917F48: @@ -325,7 +325,7 @@ glabel func_80917D98 /* 0277C 8091818C 00084C00 */ sll $t1, $t0, 16 /* 02780 80918190 00095403 */ sra $t2, $t1, 16 /* 02784 80918194 254B000A */ addiu $t3, $t2, 0x000A ## $t3 = 0000000A -/* 02788 80918198 0C00A5C9 */ jal func_80029724 +/* 02788 80918198 0C00A5C9 */ jal EffectSsHahen_Spawn /* 0278C 8091819C AFAB0014 */ sw $t3, 0x0014($sp) /* 02790 809181A0 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000002 .L809181A4: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919F8C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919F8C.s index f27e93b744..3fb9c3493e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919F8C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80919F8C.s @@ -69,7 +69,7 @@ glabel func_80919F8C /* 04674 8091A084 0C245A0F */ jal func_8091683C /* 04678 8091A088 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0467C 8091A08C 8FA40034 */ lw $a0, 0x0034($sp) -/* 04680 8091A090 0C00A66B */ jal func_800299AC +/* 04680 8091A090 0C00A66B */ jal EffectSsSibuki_SpawnBurst /* 04684 8091A094 26050038 */ addiu $a1, $s0, 0x0038 ## $a1 = 00000038 /* 04688 8091A098 10000007 */ beq $zero, $zero, .L8091A0B8 /* 0468C 8091A09C 2408000A */ addiu $t0, $zero, 0x000A ## $t0 = 0000000A diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091F5A8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091F5A8.s index b1efe0a24c..75f4c594c4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091F5A8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091F5A8.s @@ -276,7 +276,7 @@ glabel L8091F7D0 /* 03DC0 8091F8C0 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 03DC4 8091F8C4 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 03DC8 8091F8C8 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 03DCC 8091F8CC 0C00A4F9 */ jal func_800293E4 +/* 03DCC 8091F8CC 0C00A4F9 */ jal EffectSsBubble_Spawn /* 03DD0 8091F8D0 E7AA0014 */ swc1 $f10, 0x0014($sp) /* 03DD4 8091F8D4 86020182 */ lh $v0, 0x0182($s0) ## 00000182 .L8091F8D8: @@ -519,7 +519,7 @@ glabel L8091F8F8 /* 04148 8091FC48 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 0414C 8091FC4C 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 04150 8091FC50 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 04154 8091FC54 0C00A4F9 */ jal func_800293E4 +/* 04154 8091FC54 0C00A4F9 */ jal EffectSsBubble_Spawn /* 04158 8091FC58 E7AA0014 */ swc1 $f10, 0x0014($sp) /* 0415C 8091FC5C 8603015A */ lh $v1, 0x015A($s0) ## 0000015A .L8091FC60: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F8F0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F8F0.s index a431fdd881..d06cbc5c5a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F8F0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F8F0.s @@ -187,7 +187,7 @@ glabel func_8092F8F0 /* 035C0 8092FB90 02603025 */ or $a2, $s3, $zero ## $a2 = 80937898 /* 035C4 8092FB94 E7B00084 */ swc1 $f16, 0x0084($sp) /* 035C8 8092FB98 02803825 */ or $a3, $s4, $zero ## $a3 = 8093789C -/* 035CC 8092FB9C 0C00A527 */ jal func_8002949C +/* 035CC 8092FB9C 0C00A527 */ jal EffectSsGSplash_Spawn /* 035D0 8092FBA0 AFA00010 */ sw $zero, 0x0010($sp) /* 035D4 8092FBA4 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 /* 035D8 8092FBA8 1635FFE6 */ bne $s1, $s5, .L8092FB44 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094FC70.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094FC70.s index 68db68d008..502c07dd0a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094FC70.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094FC70.s @@ -99,7 +99,7 @@ glabel func_8094FC70 /* 00B04 8094FDC4 02C02825 */ or $a1, $s6, $zero ## $a1 = FFFFFFEC /* 00B08 8094FDC8 02803025 */ or $a2, $s4, $zero ## $a2 = FFFFFFE0 /* 00B0C 8094FDCC 02A03825 */ or $a3, $s5, $zero ## $a3 = FFFFFFD4 -/* 00B10 8094FDD0 0C00A586 */ jal func_80029618 +/* 00B10 8094FDD0 0C00A586 */ jal EffectSsDtBubble_SpawnColorProfile /* 00B14 8094FDD4 AFB00010 */ sw $s0, 0x0010($sp) /* 00B18 8094FDD8 10000009 */ beq $zero, $zero, .L8094FE00 /* 00B1C 8094FDDC 2652FFFF */ addiu $s2, $s2, 0xFFFF ## $s2 = 00000006 @@ -109,7 +109,7 @@ glabel func_8094FC70 /* 00B28 8094FDE8 AFAE001C */ sw $t6, 0x001C($sp) /* 00B2C 8094FDEC AFAD0014 */ sw $t5, 0x0014($sp) /* 00B30 8094FDF0 AFB00010 */ sw $s0, 0x0010($sp) -/* 00B34 8094FDF4 0C00A586 */ jal func_80029618 +/* 00B34 8094FDF4 0C00A586 */ jal EffectSsDtBubble_SpawnColorProfile /* 00B38 8094FDF8 AFA00018 */ sw $zero, 0x0018($sp) /* 00B3C 8094FDFC 2652FFFF */ addiu $s2, $s2, 0xFFFF ## $s2 = 00000005 .L8094FE00: diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967244.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967244.s index 64055b752a..a769948451 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967244.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967244.s @@ -124,7 +124,7 @@ glabel func_80967244 /* 00A98 809673E8 AFAB0010 */ sw $t3, 0x0010($sp) /* 00A9C 809673EC AFAC0014 */ sw $t4, 0x0014($sp) /* 00AA0 809673F0 AFA20018 */ sw $v0, 0x0018($sp) -/* 00AA4 809673F4 0C00A33B */ jal func_80028CEC +/* 00AA4 809673F4 0C00A33B */ jal EffectSsKiraKira_SpawnFocused /* 00AA8 809673F8 AFAD001C */ sw $t5, 0x001C($sp) /* 00AAC 809673FC 8FBF002C */ lw $ra, 0x002C($sp) /* 00AB0 80967400 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_809676A4.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_809676A4.s index e2f30de005..2f3f9c2dc4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_809676A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_809676A4.s @@ -94,7 +94,7 @@ glabel func_809676A4 /* 00E94 809677E4 02803025 */ or $a2, $s4, $zero ## $a2 = 80969358 /* 00E98 809677E8 02A03825 */ or $a3, $s5, $zero ## $a3 = 80969364 /* 00E9C 809677EC AFB60010 */ sw $s6, 0x0010($sp) -/* 00EA0 809677F0 0C00A33B */ jal func_80028CEC +/* 00EA0 809677F0 0C00A33B */ jal EffectSsKiraKira_SpawnFocused /* 00EA4 809677F4 AFB70014 */ sw $s7, 0x0014($sp) /* 00EA8 809677F8 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 /* 00EAC 809677FC 163EFFD4 */ bne $s1, $s8, .L80967750 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967BF8.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967BF8.s index 3c527d1818..add1c85ad3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967BF8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967BF8.s @@ -97,7 +97,7 @@ glabel func_80967BF8 /* 01404 80967D54 AFB9001C */ sw $t9, 0x001C($sp) /* 01408 80967D58 02803825 */ or $a3, $s4, $zero ## $a3 = 80969384 /* 0140C 80967D5C AFB50010 */ sw $s5, 0x0010($sp) -/* 01410 80967D60 0C00A33B */ jal func_80028CEC +/* 01410 80967D60 0C00A33B */ jal EffectSsKiraKira_SpawnFocused /* 01414 80967D64 AFB60014 */ sw $s6, 0x0014($sp) /* 01418 80967D68 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 /* 0141C 80967D6C 1617FFCC */ bne $s0, $s7, .L80967CA0 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 index 65462efd42..d7861fd4ee 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971A28.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80971A28.s @@ -109,7 +109,7 @@ glabel func_80971A28 /* 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 func_80028BB0 +/* 00C54 80971BA4 0C00A2EC */ jal EffectSsKiraKira_SpawnDispersed /* 00C58 80971BA8 27A70040 */ addiu $a3, $sp, 0x0040 ## $a3 = FFFFFFE8 /* 00C5C 80971BAC 8FBF0024 */ lw $ra, 0x0024($sp) .L80971BB0: 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 index 5f838418ef..e2ad784362 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097414C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097414C.s @@ -78,7 +78,7 @@ glabel func_8097414C /* 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 func_80028BB0 +/* 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 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978C20.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978C20.s index efc75c65c1..f4804a9e37 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978C20.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80978C20.s @@ -158,7 +158,7 @@ glabel func_80978C20 /* 0050C 80978E3C AFB00014 */ sw $s0, 0x0014($sp) /* 00510 80978E40 AFA00020 */ sw $zero, 0x0020($sp) /* 00514 80978E44 AFBE003C */ sw $s8, 0x003C($sp) -/* 00518 80978E48 0C00A7A3 */ jal func_80029E8C +/* 00518 80978E48 0C00A7A3 */ jal EffectSsKakera_Spawn /* 0051C 80978E4C AFA80024 */ sw $t0, 0x0024($sp) /* 00520 80978E50 26312AAA */ addiu $s1, $s1, 0x2AAA ## $s1 = 00002AAA diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097DAC8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097DAC8.s index b63f00f4f9..c99c97c860 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097DAC8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097DAC8.s @@ -143,7 +143,7 @@ glabel func_8097DAC8 /* 00644 8097DCB4 AFA00020 */ sw $zero, 0x0020($sp) /* 00648 8097DCB8 AFB40030 */ sw $s4, 0x0030($sp) /* 0064C 8097DCBC AFBE003C */ sw $s8, 0x003C($sp) -/* 00650 8097DCC0 0C00A7A3 */ jal func_80029E8C +/* 00650 8097DCC0 0C00A7A3 */ jal EffectSsKakera_Spawn /* 00654 8097DCC4 AFA80024 */ sw $t0, 0x0024($sp) /* 00658 8097DCC8 26311555 */ addiu $s1, $s1, 0x1555 ## $s1 = 00001555 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097DD28.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097DD28.s index d1aceac9f0..874416f30a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097DD28.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097DD28.s @@ -137,7 +137,7 @@ glabel func_8097DD28 /* 0088C 8097DEFC AFA00020 */ sw $zero, 0x0020($sp) /* 00890 8097DF00 AFB40030 */ sw $s4, 0x0030($sp) /* 00894 8097DF04 AFBE003C */ sw $s8, 0x003C($sp) -/* 00898 8097DF08 0C00A7A3 */ jal func_80029E8C +/* 00898 8097DF08 0C00A7A3 */ jal EffectSsKakera_Spawn /* 0089C 8097DF0C AFA80024 */ sw $t0, 0x0024($sp) /* 008A0 8097DF10 26312000 */ addiu $s1, $s1, 0x2000 ## $s1 = 00002000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097DF70.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097DF70.s index ff7622b0fb..a89e7208c4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097DF70.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097DF70.s @@ -148,7 +148,7 @@ glabel func_8097DF70 /* 00AF4 8097E164 AFB00014 */ sw $s0, 0x0014($sp) /* 00AF8 8097E168 AFA00020 */ sw $zero, 0x0020($sp) /* 00AFC 8097E16C AFB7003C */ sw $s7, 0x003C($sp) -/* 00B00 8097E170 0C00A7A3 */ jal func_80029E8C +/* 00B00 8097E170 0C00A7A3 */ jal EffectSsKakera_Spawn /* 00B04 8097E174 AFA80024 */ sw $t0, 0x0024($sp) /* 00B08 8097E178 26311555 */ addiu $s1, $s1, 0x1555 ## $s1 = 00001555 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E1D4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E1D4.s index 3f06cfec58..7a536fc378 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E1D4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097E1D4.s @@ -152,7 +152,7 @@ glabel func_8097E1D4 /* 00D6C 8097E3DC AFA0001C */ sw $zero, 0x001C($sp) /* 00D70 8097E3E0 AFA00020 */ sw $zero, 0x0020($sp) /* 00D74 8097E3E4 AFB50030 */ sw $s5, 0x0030($sp) -/* 00D78 8097E3E8 0C00A7A3 */ jal func_80029E8C +/* 00D78 8097E3E8 0C00A7A3 */ jal EffectSsKakera_Spawn /* 00D7C 8097E3EC AFA80024 */ sw $t0, 0x0024($sp) /* 00D80 8097E3F0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809835FC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809835FC.s index 3b1c865a60..a43884b257 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809835FC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809835FC.s @@ -93,7 +93,7 @@ glabel func_809835FC /* 00458 80983758 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 /* 0045C 8098375C 02A02825 */ or $a1, $s5, $zero ## $a1 = FFFFFFEC /* 00460 80983760 02403025 */ or $a2, $s2, $zero ## $a2 = FFFFFFE0 -/* 00464 80983764 0C00A9AE */ jal func_8002A6B8 +/* 00464 80983764 0C00A9AE */ jal EffectSsDeadDb_Spawn /* 00468 80983768 02403825 */ or $a3, $s2, $zero ## $a3 = FFFFFFE0 /* 0046C 8098376C 2610000C */ addiu $s0, $s0, 0x000C ## $s0 = 0000000C /* 00470 80983770 5613FFD8 */ bnel $s0, $s3, .L809836D4 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098D280.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098D280.s index d324a014d3..2ee2906a3f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098D280.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098D280.s @@ -141,7 +141,7 @@ glabel func_8098D280 /* 00498 8098D468 AFA9001C */ sw $t1, 0x001C($sp) /* 0049C 8098D46C 02C03825 */ or $a3, $s6, $zero ## $a3 = 8098E128 /* 004A0 8098D470 AFB70010 */ sw $s7, 0x0010($sp) -/* 004A4 8098D474 0C00A33B */ jal func_80028CEC +/* 004A4 8098D474 0C00A33B */ jal EffectSsKiraKira_SpawnFocused /* 004A8 8098D478 AFBE0014 */ sw $s8, 0x0014($sp) /* 004AC 8098D47C 26520001 */ addiu $s2, $s2, 0x0001 ## $s2 = 00000001 /* 004B0 8098D480 24010055 */ addiu $at, $zero, 0x0055 ## $at = 00000055 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/EnAm_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Am/EnAm_Draw.s index c4d2ebc57b..8954251836 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/EnAm_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/EnAm_Draw.s @@ -95,7 +95,7 @@ glabel EnAm_Draw /* 01FFC 809AFF1C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 02000 809AFF20 27A60068 */ addiu $a2, $sp, 0x0068 ## $a2 = FFFFFFF0 /* 02004 809AFF24 24070096 */ addiu $a3, $zero, 0x0096 ## $a3 = 00000096 -/* 02008 809AFF28 0C00A850 */ jal func_8002A140 +/* 02008 809AFF28 0C00A850 */ jal EffectSsEnIce_SpawnFlyingVec3f /* 0200C 809AFF2C E7AA0028 */ swc1 $f10, 0x0028($sp) .L809AFF30: /* 02010 809AFF30 3C06809B */ lui $a2, %hi(D_809B0170) ## $a2 = 809B0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE270.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE270.s index bab98e744e..835345bfe2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE270.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE270.s @@ -68,7 +68,7 @@ glabel func_809AE270 /* 00448 809AE368 02603025 */ or $a2, $s3, $zero ## $a2 = 809B005C /* 0044C 809AE36C 02803825 */ or $a3, $s4, $zero ## $a3 = 809B0068 /* 00450 809AE370 46048480 */ add.s $f18, $f16, $f4 -/* 00454 809AE374 0C00A2DD */ jal func_80028B74 +/* 00454 809AE374 0C00A2DD */ jal EffectSsKiraKira_SpawnSmall /* 00458 809AE378 E7B20088 */ swc1 $f18, 0x0088($sp) /* 0045C 809AE37C 2631FFFF */ addiu $s1, $s1, 0xFFFF ## $s1 = 00000003 /* 00460 809AE380 1620FFE3 */ bne $s1, $zero, .L809AE310 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B1A54.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B1A54.s index f100c20670..12c81ab569 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B1A54.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B1A54.s @@ -157,7 +157,7 @@ glabel func_809B1A54 /* 00B50 809B1C70 27A60040 */ addiu $a2, $sp, 0x0040 ## $a2 = FFFFFFE0 /* 00B54 809B1C74 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 /* 00B58 809B1C78 AFA00010 */ sw $zero, 0x0010($sp) -/* 00B5C 809B1C7C 0C00A935 */ jal func_8002A4D4 +/* 00B5C 809B1C7C 0C00A935 */ jal EffectSsEnFire_SpawnVec3f /* 00B60 809B1C80 AFA00014 */ sw $zero, 0x0014($sp) /* 00B64 809B1C84 C7A8005C */ lwc1 $f8, 0x005C($sp) /* 00B68 809B1C88 C606026C */ lwc1 $f6, 0x026C($s0) ## 0000026C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/func_809B27D8.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/func_809B27D8.s index 79b001af40..3b0b492bbc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/func_809B27D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/func_809B27D8.s @@ -215,7 +215,7 @@ glabel func_809B27D8 /* 00544 809B2AE4 AFB20018 */ sw $s2, 0x0018($sp) /* 00548 809B2AE8 AFA90014 */ sw $t1, 0x0014($sp) /* 0054C 809B2AEC AFBE0010 */ sw $s8, 0x0010($sp) -/* 00550 809B2AF0 0C00A2EC */ jal func_80028BB0 +/* 00550 809B2AF0 0C00A2EC */ jal EffectSsKiraKira_SpawnDispersed /* 00554 809B2AF4 E7AA00A0 */ swc1 $f10, 0x00A0($sp) /* 00558 809B2AF8 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 /* 0055C 809B2AFC 1615FFE0 */ bne $s0, $s5, .L809B2A80 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/func_809B2B48.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/func_809B2B48.s index 13cb39dbec..fa40d338c0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/func_809B2B48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/func_809B2B48.s @@ -80,7 +80,7 @@ glabel func_809B2B48 /* 006D0 809B2C70 02A03025 */ or $a2, $s5, $zero ## $a2 = FFFFFFF4 /* 006D4 809B2C74 02C03825 */ or $a3, $s6, $zero ## $a3 = FFFFFFE8 /* 006D8 809B2C78 AFB70010 */ sw $s7, 0x0010($sp) -/* 006DC 809B2C7C 0C00A2EC */ jal func_80028BB0 +/* 006DC 809B2C7C 0C00A2EC */ jal EffectSsKiraKira_SpawnDispersed /* 006E0 809B2C80 AFBE0014 */ sw $s8, 0x0014($sp) /* 006E4 809B2C84 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 /* 006E8 809B2C88 5613FFE5 */ bnel $s0, $s3, .L809B2C20 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3FDC.s b/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3FDC.s index dc3e4c025a..7773bd278e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3FDC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3FDC.s @@ -116,7 +116,7 @@ glabel func_809B3FDC /* 0083C 809B415C AFA50044 */ sw $a1, 0x0044($sp) /* 00840 809B4160 8FA4009C */ lw $a0, 0x009C($sp) /* 00844 809B4164 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00848 809B4168 0C00A700 */ jal func_80029C00 +/* 00848 809B4168 0C00A700 */ jal EffectSsStone1_Spawn /* 0084C 809B416C A7A70072 */ sh $a3, 0x0072($sp) /* 00850 809B4170 97A70072 */ lhu $a3, 0x0072($sp) /* 00854 809B4174 8FA4009C */ lw $a0, 0x009C($sp) @@ -134,7 +134,7 @@ glabel func_809B3FDC /* 00878 809B4198 AFA70044 */ sw $a3, 0x0044($sp) /* 0087C 809B419C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00880 809B41A0 24060096 */ addiu $a2, $zero, 0x0096 ## $a2 = 00000096 -/* 00884 809B41A4 0C00A732 */ jal func_80029CC8 +/* 00884 809B41A4 0C00A732 */ jal EffectSsHitMark_SpawnCustomScale /* 00888 809B41A8 AFA30050 */ sw $v1, 0x0050($sp) /* 0088C 809B41AC 8FA30050 */ lw $v1, 0x0050($sp) /* 00890 809B41B0 5060004D */ beql $v1, $zero, .L809B42E8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/EnBb_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/EnBb_Draw.s index 9cb936579b..a308a4bb80 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/EnBb_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/EnBb_Draw.s @@ -141,7 +141,7 @@ glabel EnBb_Draw /* 03434 809BB714 27A60070 */ addiu $a2, $sp, 0x0070 ## $a2 = FFFFFFA8 /* 03438 809BB718 24070096 */ addiu $a3, $zero, 0x0096 ## $a3 = 00000096 /* 0343C 809BB71C AFAF0014 */ sw $t7, 0x0014($sp) -/* 03440 809BB720 0C00A850 */ jal func_8002A140 +/* 03440 809BB720 0C00A850 */ jal EffectSsEnIce_SpawnFlyingVec3f /* 03444 809BB724 E7A60028 */ swc1 $f6, 0x0028($sp) /* 03448 809BB728 1000000B */ beq $zero, $zero, .L809BB758 /* 0344C 809BB72C 3C01C220 */ lui $at, 0xC220 ## $at = C2200000 @@ -153,7 +153,7 @@ glabel EnBb_Draw /* 03460 809BB740 460A4401 */ sub.s $f16, $f8, $f10 /* 03464 809BB744 AFA00014 */ sw $zero, 0x0014($sp) /* 03468 809BB748 AFAE0018 */ sw $t6, 0x0018($sp) -/* 0346C 809BB74C 0C00A935 */ jal func_8002A4D4 +/* 0346C 809BB74C 0C00A935 */ jal EffectSsEnFire_SpawnVec3f /* 03470 809BB750 E7B00074 */ swc1 $f16, 0x0074($sp) .L809BB754: /* 03474 809BB754 3C01C220 */ lui $at, 0xC220 ## $at = C2200000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BCEBC.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BCEBC.s index 6e946ce971..a206896bc3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BCEBC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BCEBC.s @@ -36,7 +36,7 @@ glabel func_809BCEBC /* 002E4 809BCF44 24070514 */ addiu $a3, $zero, 0x0514 ## $a3 = 00000514 /* 002E8 809BCF48 45020004 */ bc1fl .L809BCF5C /* 002EC 809BCF4C 8FBF001C */ lw $ra, 0x001C($sp) -/* 002F0 809BCF50 0C00A511 */ jal func_80029444 +/* 002F0 809BCF50 0C00A511 */ jal EffectSsGRipple_Spawn /* 002F4 809BCF54 AFA00010 */ sw $zero, 0x0010($sp) /* 002F8 809BCF58 8FBF001C */ lw $ra, 0x001C($sp) .L809BCF5C: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BCF68.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BCF68.s index 654eee9b2a..fa30f8c7bc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BCF68.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BCF68.s @@ -84,7 +84,7 @@ glabel func_809BCF68 /* 00434 809BD094 C608000C */ lwc1 $f8, 0x000C($s0) ## 0000000C /* 00438 809BD098 AFA00010 */ sw $zero, 0x0010($sp) /* 0043C 809BD09C 460A4480 */ add.s $f18, $f8, $f10 -/* 00440 809BD0A0 0C00A511 */ jal func_80029444 +/* 00440 809BD0A0 0C00A511 */ jal EffectSsGRipple_Spawn /* 00444 809BD0A4 E7B20040 */ swc1 $f18, 0x0040($sp) /* 00448 809BD0A8 10000033 */ beq $zero, $zero, .L809BD178 /* 0044C 809BD0AC 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 @@ -141,7 +141,7 @@ glabel func_809BCF68 /* 00500 809BD160 C610000C */ lwc1 $f16, 0x000C($s0) ## 0000000C /* 00504 809BD164 AFA00010 */ sw $zero, 0x0010($sp) /* 00508 809BD168 46048480 */ add.s $f18, $f16, $f4 -/* 0050C 809BD16C 0C00A511 */ jal func_80029444 +/* 0050C 809BD16C 0C00A511 */ jal EffectSsGRipple_Spawn /* 00510 809BD170 E7B20040 */ swc1 $f18, 0x0040($sp) .L809BD174: /* 00514 809BD174 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 @@ -152,7 +152,7 @@ glabel func_809BCF68 /* 00524 809BD184 8FA4004C */ lw $a0, 0x004C($sp) /* 00528 809BD188 27A5003C */ addiu $a1, $sp, 0x003C ## $a1 = FFFFFFF4 /* 0052C 809BD18C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00530 809BD190 0C00A527 */ jal func_8002949C +/* 00530 809BD190 0C00A527 */ jal EffectSsGSplash_Spawn /* 00534 809BD194 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00538 809BD198 8FAB0030 */ lw $t3, 0x0030($sp) /* 0053C 809BD19C 8E0A0190 */ lw $t2, 0x0190($s0) ## 00000190 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD1C8.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD1C8.s index 23073ec62c..576b051238 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD1C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD1C8.s @@ -48,7 +48,7 @@ glabel func_809BD1C8 /* 00614 809BD274 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 00618 809BD278 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0061C 809BD27C 460A4400 */ add.s $f16, $f8, $f10 -/* 00620 809BD280 0C00A527 */ jal func_8002949C +/* 00620 809BD280 0C00A527 */ jal EffectSsGSplash_Spawn /* 00624 809BD284 E7B00050 */ swc1 $f16, 0x0050($sp) /* 00628 809BD288 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 /* 0062C 809BD28C 5613FFE0 */ bnel $s0, $s3, .L809BD210 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD8DC.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD8DC.s index 72d779360f..1eea72ed76 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD8DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD8DC.s @@ -92,7 +92,7 @@ glabel func_809BD8DC /* 00DA4 809BDA04 AFA80010 */ sw $t0, 0x0010($sp) /* 00DA8 809BDA08 46045181 */ sub.s $f6, $f10, $f4 /* 00DAC 809BDA0C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00DB0 809BDA10 0C00A527 */ jal func_8002949C +/* 00DB0 809BDA10 0C00A527 */ jal EffectSsGSplash_Spawn /* 00DB4 809BDA14 E7A60034 */ swc1 $f6, 0x0034($sp) /* 00DB8 809BDA18 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 00DBC 809BDA1C 44818000 */ mtc1 $at, $f16 ## $f16 = 40.00 @@ -106,7 +106,7 @@ glabel func_809BD8DC /* 00DDC 809BDA3C E7B2002C */ swc1 $f18, 0x002C($sp) /* 00DE0 809BDA40 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFF4 /* 00DE4 809BDA44 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00DE8 809BDA48 0C00A527 */ jal func_8002949C +/* 00DE8 809BDA48 0C00A527 */ jal EffectSsGSplash_Spawn /* 00DEC 809BDA4C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00DF0 809BDA50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00DF4 809BDA54 0C00BE0A */ jal Audio_PlayActorSound2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFD94.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFD94.s index b17ee0719f..1df626919b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFD94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFD94.s @@ -93,7 +93,7 @@ glabel func_809BFD94 /* 00628 809BFEC8 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 0062C 809BFECC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 00630 809BFED0 02403025 */ or $a2, $s2, $zero ## $a2 = FFFFFFF0 -/* 00634 809BFED4 0C00A850 */ jal func_8002A140 +/* 00634 809BFED4 0C00A850 */ jal EffectSsEnIce_SpawnFlyingVec3f /* 00638 809BFED8 24070096 */ addiu $a3, $zero, 0x0096 ## $a3 = 00000096 /* 0063C 809BFEDC 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 /* 00640 809BFEE0 5613FFD6 */ bnel $s0, $s3, .L809BFE3C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C02B8.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C02B8.s index 50673108bf..6f7c80eb11 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C02B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C02B8.s @@ -80,7 +80,7 @@ glabel func_809C02B8 /* 00B38 809C03D8 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 00B3C 809C03DC 02A02825 */ or $a1, $s5, $zero ## $a1 = FFFFFFF0 /* 00B40 809C03E0 02C03025 */ or $a2, $s6, $zero ## $a2 = 809C16A0 -/* 00B44 809C03E4 0C00A568 */ jal func_800295A0 +/* 00B44 809C03E4 0C00A568 */ jal EffectSsLightning_Spawn /* 00B48 809C03E8 02E03825 */ or $a3, $s7, $zero ## $a3 = 809C16A4 /* 00B4C 809C03EC 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000002 .L809C03F0: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C0754.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C0754.s index 506e5e0f3a..a9913226d3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C0754.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809C0754.s @@ -111,7 +111,7 @@ glabel func_809C0754 /* 0102C 809C08CC 02803025 */ or $a2, $s4, $zero ## $a2 = 809C16A8 /* 01030 809C08D0 02A03825 */ or $a3, $s5, $zero ## $a3 = 809C16B4 /* 01034 809C08D4 AFB00010 */ sw $s0, 0x0010($sp) -/* 01038 809C08D8 0C00A586 */ jal func_80029618 +/* 01038 809C08D8 0C00A586 */ jal EffectSsDtBubble_SpawnColorProfile /* 0103C 809C08DC AFB70018 */ sw $s7, 0x0018($sp) /* 01040 809C08E0 10000009 */ beq $zero, $zero, .L809C0908 /* 01044 809C08E4 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 @@ -121,7 +121,7 @@ glabel func_809C0754 /* 01050 809C08F0 AFAB001C */ sw $t3, 0x001C($sp) /* 01054 809C08F4 AFAA0014 */ sw $t2, 0x0014($sp) /* 01058 809C08F8 AFB00010 */ sw $s0, 0x0010($sp) -/* 0105C 809C08FC 0C00A586 */ jal func_80029618 +/* 0105C 809C08FC 0C00A586 */ jal EffectSsDtBubble_SpawnColorProfile /* 01060 809C0900 AFA00018 */ sw $zero, 0x0018($sp) /* 01064 809C0904 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000002 .L809C0908: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/EnBomChu_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/EnBomChu_Update.s index 649d9ebcaf..d52f2242b6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/EnBomChu_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/EnBomChu_Update.s @@ -237,7 +237,7 @@ glabel EnBomChu_Update /* 01114 809C6944 44812000 */ mtc1 $at, $f4 ## $f4 = 0.25 /* 01118 809C6948 44060000 */ mfc1 $a2, $f0 /* 0111C 809C694C E7A80010 */ swc1 $f8, 0x0010($sp) -/* 01120 809C6950 0C00A4F9 */ jal func_800293E4 +/* 01120 809C6950 0C00A4F9 */ jal EffectSsBubble_Spawn /* 01124 809C6954 E7A40014 */ swc1 $f4, 0x0014($sp) /* 01128 809C6958 960A0088 */ lhu $t2, 0x0088($s0) ## 00000088 .L809C695C: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C5A1C.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C5A1C.s index b278980f65..ae4cbd8daa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C5A1C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C5A1C.s @@ -53,7 +53,7 @@ glabel func_809C5A1C /* 002AC 809C5ADC 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 002B0 809C5AE0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000024 /* 002B4 809C5AE4 E7B80010 */ swc1 $f24, 0x0010($sp) -/* 002B8 809C5AE8 0C00A4F9 */ jal func_800293E4 +/* 002B8 809C5AE8 0C00A4F9 */ jal EffectSsBubble_Spawn /* 002BC 809C5AEC E7BA0014 */ swc1 $f26, 0x0014($sp) /* 002C0 809C5AF0 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 /* 002C4 809C5AF4 5612FFF8 */ bnel $s0, $s2, .L809C5AD8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C6548.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C6548.s index 6a1b454a6d..19a3129fb8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C6548.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C6548.s @@ -13,21 +13,21 @@ glabel func_809C6548 /* 00D44 809C6574 27A50024 */ addiu $a1, $sp, 0x0024 ## $a1 = FFFFFFF4 /* 00D48 809C6578 AFA00010 */ sw $zero, 0x0010($sp) /* 00D4C 809C657C 240701F4 */ addiu $a3, $zero, 0x01F4 ## $a3 = 000001F4 -/* 00D50 809C6580 0C00A511 */ jal func_80029444 +/* 00D50 809C6580 0C00A511 */ jal EffectSsGRipple_Spawn /* 00D54 809C6584 E7A6002C */ swc1 $f6, 0x002C($sp) /* 00D58 809C6588 240F0004 */ addiu $t7, $zero, 0x0004 ## $t7 = 00000004 /* 00D5C 809C658C AFAF0010 */ sw $t7, 0x0010($sp) /* 00D60 809C6590 8FA40034 */ lw $a0, 0x0034($sp) /* 00D64 809C6594 27A50024 */ addiu $a1, $sp, 0x0024 ## $a1 = FFFFFFF4 /* 00D68 809C6598 24060046 */ addiu $a2, $zero, 0x0046 ## $a2 = 00000046 -/* 00D6C 809C659C 0C00A511 */ jal func_80029444 +/* 00D6C 809C659C 0C00A511 */ jal EffectSsGRipple_Spawn /* 00D70 809C65A0 240701F4 */ addiu $a3, $zero, 0x01F4 ## $a3 = 000001F4 /* 00D74 809C65A4 24180008 */ addiu $t8, $zero, 0x0008 ## $t8 = 00000008 /* 00D78 809C65A8 AFB80010 */ sw $t8, 0x0010($sp) /* 00D7C 809C65AC 8FA40034 */ lw $a0, 0x0034($sp) /* 00D80 809C65B0 27A50024 */ addiu $a1, $sp, 0x0024 ## $a1 = FFFFFFF4 /* 00D84 809C65B4 24060046 */ addiu $a2, $zero, 0x0046 ## $a2 = 00000046 -/* 00D88 809C65B8 0C00A511 */ jal func_80029444 +/* 00D88 809C65B8 0C00A511 */ jal EffectSsGRipple_Spawn /* 00D8C 809C65BC 240701F4 */ addiu $a3, $zero, 0x01F4 ## $a3 = 000001F4 /* 00D90 809C65C0 8FBF001C */ lw $ra, 0x001C($sp) /* 00D94 809C65C4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9EF8.s b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9EF8.s index fdbd73035a..92c85b6e1c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9EF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9EF8.s @@ -193,7 +193,7 @@ glabel func_809C9EF8 /* 013B8 809CA178 8FA4005C */ lw $a0, 0x005C($sp) /* 013BC 809CA17C 27A5004C */ addiu $a1, $sp, 0x004C ## $a1 = FFFFFFF4 /* 013C0 809CA180 27A60040 */ addiu $a2, $sp, 0x0040 ## $a2 = FFFFFFE8 -/* 013C4 809CA184 0C00AA91 */ jal func_8002AA44 +/* 013C4 809CA184 0C00AA91 */ jal EffectSsIceSmoke_Spawn /* 013C8 809CA188 27A70034 */ addiu $a3, $sp, 0x0034 ## $a3 = FFFFFFDC /* 013CC 809CA18C 8FBF0024 */ lw $ra, 0x0024($sp) .L809CA190: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB458.s b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB458.s index a3f26b6988..5f27845b57 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB458.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB458.s @@ -126,7 +126,7 @@ glabel func_809CB458 /* 00AEC 809CB5FC 44094000 */ mfc1 $t1, $f8 /* 00AF0 809CB600 440B8000 */ mfc1 $t3, $f16 /* 00AF4 809CB604 AFA90010 */ sw $t1, 0x0010($sp) -/* 00AF8 809CB608 0C00A568 */ jal func_800295A0 +/* 00AF8 809CB608 0C00A568 */ jal EffectSsLightning_Spawn /* 00AFC 809CB60C AFAB0014 */ sw $t3, 0x0014($sp) /* 00B00 809CB610 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 /* 00B04 809CB614 1615FFCD */ bne $s0, $s5, .L809CB54C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CBD78.s b/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CBD78.s index dc09112b5a..a525d521a4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CBD78.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bubble/func_809CBD78.s @@ -136,7 +136,7 @@ glabel func_809CBD78 /* 0034C 809CBF4C AFB30010 */ sw $s3, 0x0010($sp) /* 00350 809CBF50 AFB40014 */ sw $s4, 0x0014($sp) /* 00354 809CBF54 AFA20018 */ sw $v0, 0x0018($sp) -/* 00358 809CBF58 0C00A5A5 */ jal func_80029694 +/* 00358 809CBF58 0C00A5A5 */ jal EffectSsDtBubble_SpawnCustomColor /* 0035C 809CBF5C AFA00020 */ sw $zero, 0x0020($sp) /* 00360 809CBF60 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 /* 00364 809CBF64 1615FFE4 */ bne $s0, $s5, .L809CBEF8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Draw.s index e4d5c31439..e9745e52c2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Draw.s @@ -335,7 +335,7 @@ glabel EnBw_Draw /* 02D0C 809D13EC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 02D10 809D13F0 27A60098 */ addiu $a2, $sp, 0x0098 ## $a2 = FFFFFFE0 /* 02D14 809D13F4 24070096 */ addiu $a3, $zero, 0x0096 ## $a3 = 00000096 -/* 02D18 809D13F8 0C00A850 */ jal func_8002A140 +/* 02D18 809D13F8 0C00A850 */ jal EffectSsEnIce_SpawnFlyingVec3f /* 02D1C 809D13FC E7AA0028 */ swc1 $f10, 0x0028($sp) .L809D1400: /* 02D20 809D1400 3C06809D */ lui $a2, %hi(D_809D1590) ## $a2 = 809D0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E03B4.s b/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E03B4.s index 3bb11fc00f..860f4d7a86 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E03B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E03B4.s @@ -140,7 +140,7 @@ glabel func_809E03B4 /* 00354 809E0594 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 00358 809E0598 02403025 */ or $a2, $s2, $zero ## $a2 = FFFFFFEC /* 0035C 809E059C E7A80028 */ swc1 $f8, 0x0028($sp) -/* 00360 809E05A0 0C00A850 */ jal func_8002A140 +/* 00360 809E05A0 0C00A850 */ jal EffectSsEnIce_SpawnFlyingVec3f /* 00364 809E05A4 24070096 */ addiu $a3, $zero, 0x0096 ## $a3 = 00000096 /* 00368 809E05A8 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 /* 0036C 809E05AC 5613FFCD */ bnel $s0, $s3, .L809E04E4 @@ -177,7 +177,7 @@ glabel func_809E03B4 /* 003E0 809E0620 02403025 */ or $a2, $s2, $zero ## $a2 = 00000024 /* 003E4 809E0624 AFA00010 */ sw $zero, 0x0010($sp) /* 003E8 809E0628 AFA00014 */ sw $zero, 0x0014($sp) -/* 003EC 809E062C 0C00A935 */ jal func_8002A4D4 +/* 003EC 809E062C 0C00A935 */ jal EffectSsEnFire_SpawnVec3f /* 003F0 809E0630 AFB00018 */ sw $s0, 0x0018($sp) /* 003F4 809E0634 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 /* 003F8 809E0638 5614FFF6 */ bnel $s0, $s4, .L809E0614 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E0E2C.s b/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E0E2C.s index 90f19c54b0..fb178ea696 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E0E2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E0E2C.s @@ -73,7 +73,7 @@ glabel func_809E0E2C /* 00CE4 809E0F24 8FA40054 */ lw $a0, 0x0054($sp) /* 00CE8 809E0F28 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 /* 00CEC 809E0F2C 00C03825 */ or $a3, $a2, $zero ## $a3 = 809E1640 -/* 00CF0 809E0F30 0C00A9AE */ jal func_8002A6B8 +/* 00CF0 809E0F30 0C00A9AE */ jal EffectSsDeadDb_Spawn /* 00CF4 809E0F34 AFAE0010 */ sw $t6, 0x0010($sp) /* 00CF8 809E0F38 0C2781B5 */ jal func_809E06D4 /* 00CFC 809E0F3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E65A0.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E65A0.s index cbe640d03b..9910800b9b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E65A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E65A0.s @@ -301,7 +301,7 @@ glabel func_809E65A0 /* 011BC 809E698C 44193000 */ mfc1 $t9, $f6 /* 011C0 809E6990 AFB80010 */ sw $t8, 0x0010($sp) /* 011C4 809E6994 AFA00024 */ sw $zero, 0x0024($sp) -/* 011C8 809E6998 0C00A5E9 */ jal func_800297A4 +/* 011C8 809E6998 0C00A5E9 */ jal EffectSsHahen_SpawnBurst /* 011CC 809E699C AFB90014 */ sw $t9, 0x0014($sp) /* 011D0 809E69A0 860C01C6 */ lh $t4, 0x01C6($s0) ## 000001C6 /* 011D4 809E69A4 8FA50064 */ lw $a1, 0x0064($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6A04.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6A04.s index 8b35fce91b..cc1c13a90d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6A04.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6A04.s @@ -276,7 +276,7 @@ glabel func_809E6A04 /* 015C0 809E6D90 440A3000 */ mfc1 $t2, $f6 /* 015C4 809E6D94 AFA80010 */ sw $t0, 0x0010($sp) /* 015C8 809E6D98 AFA00024 */ sw $zero, 0x0024($sp) -/* 015CC 809E6D9C 0C00A5E9 */ jal func_800297A4 +/* 015CC 809E6D9C 0C00A5E9 */ jal EffectSsHahen_SpawnBurst /* 015D0 809E6DA0 AFAA0014 */ sw $t2, 0x0014($sp) /* 015D4 809E6DA4 860E01C6 */ lh $t6, 0x01C6($s0) ## 000001C6 /* 015D8 809E6DA8 55C00004 */ bnel $t6, $zero, .L809E6DBC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7BB0.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7BB0.s index fc71cdf76c..10641c0113 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7BB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7BB0.s @@ -76,7 +76,7 @@ glabel func_809E7BB0 /* 024D8 809E7CA8 44194000 */ mfc1 $t9, $f8 /* 024DC 809E7CAC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 024E0 809E7CB0 AFAF0010 */ sw $t7, 0x0010($sp) -/* 024E4 809E7CB4 0C00A5E9 */ jal func_800297A4 +/* 024E4 809E7CB4 0C00A5E9 */ jal EffectSsHahen_SpawnBurst /* 024E8 809E7CB8 AFB90014 */ sw $t9, 0x0014($sp) /* 024EC 809E7CBC 3C01809F */ lui $at, %hi(D_809E91BC) ## $at = 809F0000 /* 024F0 809E7CC0 C42A91BC */ lwc1 $f10, %lo(D_809E91BC)($at) @@ -122,7 +122,7 @@ glabel func_809E7BB0 /* 0258C 809E7D5C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000024 /* 02590 809E7D60 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 02594 809E7D64 AFB80010 */ sw $t8, 0x0010($sp) -/* 02598 809E7D68 0C00A5E9 */ jal func_800297A4 +/* 02598 809E7D68 0C00A5E9 */ jal EffectSsHahen_SpawnBurst /* 0259C 809E7D6C AFA80014 */ sw $t0, 0x0014($sp) /* 025A0 809E7D70 966C0088 */ lhu $t4, 0x0088($s3) ## 00000088 .L809E7D74: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7F14.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7F14.s index d769d4b8ea..c42b54b546 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7F14.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7F14.s @@ -123,7 +123,7 @@ glabel func_809E7F14 /* 028E0 809E80B0 26050008 */ addiu $a1, $s0, 0x0008 ## $a1 = 00000008 /* 028E4 809E80B4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 028E8 809E80B8 AFAD0010 */ sw $t5, 0x0010($sp) -/* 028EC 809E80BC 0C00A5E9 */ jal func_800297A4 +/* 028EC 809E80BC 0C00A5E9 */ jal EffectSsHahen_SpawnBurst /* 028F0 809E80C0 AFAF0014 */ sw $t7, 0x0014($sp) /* 028F4 809E80C4 8FBF0034 */ lw $ra, 0x0034($sp) /* 028F8 809E80C8 8FB0002C */ lw $s0, 0x002C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E8140.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E8140.s index 4316aa08a4..4e88d71bf9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E8140.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E8140.s @@ -118,7 +118,7 @@ glabel func_809E8140 /* 02B0C 809E82DC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 02B10 809E82E0 AFA00010 */ sw $zero, 0x0010($sp) /* 02B14 809E82E4 AFA00014 */ sw $zero, 0x0014($sp) -/* 02B18 809E82E8 0C00A935 */ jal func_8002A4D4 +/* 02B18 809E82E8 0C00A935 */ jal EffectSsEnFire_SpawnVec3f /* 02B1C 809E82EC AFB00018 */ sw $s0, 0x0018($sp) /* 02B20 809E82F0 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 /* 02B24 809E82F4 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA5B0.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA5B0.s index 5de6855dbb..d47733556e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA5B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA5B0.s @@ -45,7 +45,7 @@ glabel func_809EA5B0 /* 010F8 809EA658 00C03825 */ or $a3, $a2, $zero ## $a3 = 809EABB0 /* 010FC 809EA65C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01100 809EA660 27A50058 */ addiu $a1, $sp, 0x0058 ## $a1 = FFFFFFF0 -/* 01104 809EA664 0C00A9AE */ jal func_8002A6B8 +/* 01104 809EA664 0C00A9AE */ jal EffectSsDeadDb_Spawn /* 01108 809EA668 E7B00060 */ swc1 $f16, 0x0060($sp) /* 0110C 809EA66C C6120028 */ lwc1 $f18, 0x0028($s0) ## 00000028 /* 01110 809EA670 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -66,7 +66,7 @@ glabel func_809EA5B0 /* 0114C 809EA6AC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01150 809EA6B0 27A50058 */ addiu $a1, $sp, 0x0058 ## $a1 = FFFFFFF0 /* 01154 809EA6B4 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 -/* 01158 809EA6B8 0C00A5E9 */ jal func_800297A4 +/* 01158 809EA6B8 0C00A5E9 */ jal EffectSsHahen_SpawnBurst /* 0115C 809EA6BC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 01160 809EA6C0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01164 809EA6C4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA70C.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA70C.s index 641dc47c88..8e6473d06f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA70C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809EA70C.s @@ -32,7 +32,7 @@ glabel func_809EA70C /* 01220 809EA780 AFA80010 */ sw $t0, 0x0010($sp) /* 01224 809EA784 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 01228 809EA788 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024 -/* 0122C 809EA78C 0C00A997 */ jal func_8002A65C +/* 0122C 809EA78C 0C00A997 */ jal EffectSsFCircle_Spawn /* 01230 809EA790 24070028 */ addiu $a3, $zero, 0x0028 ## $a3 = 00000028 .L809EA794: /* 01234 809EA794 0C27A676 */ jal func_809E99D8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EAEC4.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EAEC4.s index 2ce9d55334..d9eed93973 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EAEC4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EAEC4.s @@ -105,7 +105,7 @@ glabel func_809EAEC4 /* 002F8 809EB038 AFAF0010 */ sw $t7, 0x0010($sp) /* 002FC 809EB03C 4600320D */ trunc.w.s $f8, $f6 /* 00300 809EB040 44194000 */ mfc1 $t9, $f8 -/* 00304 809EB044 0C00A5C9 */ jal func_80029724 +/* 00304 809EB044 0C00A5C9 */ jal EffectSsHahen_Spawn /* 00308 809EB048 AFB90014 */ sw $t9, 0x0014($sp) /* 0030C 809EB04C 8FBF002C */ lw $ra, 0x002C($sp) /* 00310 809EB050 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Update.s index c1eac7b48b..6c95fc6922 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Update.s @@ -115,7 +115,7 @@ glabel EnDivingGame_Update /* 014C0 809EED30 C7A80034 */ lwc1 $f8, 0x0034($sp) /* 014C4 809EED34 AFAD0010 */ sw $t5, 0x0010($sp) /* 014C8 809EED38 460A4400 */ add.s $f16, $f8, $f10 -/* 014CC 809EED3C 0C00A511 */ jal func_80029444 +/* 014CC 809EED3C 0C00A511 */ jal EffectSsGRipple_Spawn /* 014D0 809EED40 E7B00034 */ swc1 $f16, 0x0034($sp) /* 014D4 809EED44 8FA4004C */ lw $a0, 0x004C($sp) /* 014D8 809EED48 860E0290 */ lh $t6, 0x0290($s0) ## 00000290 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1DA8.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1DA8.s index 95b4d13537..823562068a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1DA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1DA8.s @@ -45,7 +45,7 @@ glabel func_809F1DA8 /* 0036C 809F1E4C 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 /* 00370 809F1E50 3C0640C0 */ lui $a2, 0x40C0 ## $a2 = 40C00000 /* 00374 809F1E54 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00378 809F1E58 0C00A5E9 */ jal func_800297A4 +/* 00378 809F1E58 0C00A5E9 */ jal EffectSsHahen_SpawnBurst /* 0037C 809F1E5C AFA00024 */ sw $zero, 0x0024($sp) /* 00380 809F1E60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00384 809F1E64 0C00BE0A */ jal Audio_PlayActorSound2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1EFC.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1EFC.s index fd24f1795a..722c9e22ed 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1EFC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1EFC.s @@ -45,7 +45,7 @@ glabel func_809F1EFC /* 004C0 809F1FA0 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 /* 004C4 809F1FA4 3C0640C0 */ lui $a2, 0x40C0 ## $a2 = 40C00000 /* 004C8 809F1FA8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 004CC 809F1FAC 0C00A5E9 */ jal func_800297A4 +/* 004CC 809F1FAC 0C00A5E9 */ jal EffectSsHahen_SpawnBurst /* 004D0 809F1FB0 AFA00024 */ sw $zero, 0x0024($sp) /* 004D4 809F1FB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 004D8 809F1FB8 0C00BE0A */ jal Audio_PlayActorSound2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2254.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2254.s index d92b866f82..fa5fdfbf19 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2254.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2254.s @@ -45,7 +45,7 @@ glabel func_809F2254 /* 00818 809F22F8 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 /* 0081C 809F22FC 3C0640C0 */ lui $a2, 0x40C0 ## $a2 = 40C00000 /* 00820 809F2300 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00824 809F2304 0C00A5E9 */ jal func_800297A4 +/* 00824 809F2304 0C00A5E9 */ jal EffectSsHahen_SpawnBurst /* 00828 809F2308 AFA00024 */ sw $zero, 0x0024($sp) /* 0082C 809F230C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00830 809F2310 0C00BE0A */ jal Audio_PlayActorSound2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F236C.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F236C.s index eaa90b8f8c..ad2439cecc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F236C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F236C.s @@ -45,7 +45,7 @@ glabel func_809F236C /* 00930 809F2410 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 /* 00934 809F2414 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 /* 00938 809F2418 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0093C 809F241C 0C00A5E9 */ jal func_800297A4 +/* 0093C 809F241C 0C00A5E9 */ jal EffectSsHahen_SpawnBurst /* 00940 809F2420 AFA00024 */ sw $zero, 0x0024($sp) /* 00944 809F2424 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00948 809F2428 0C00BE0A */ jal Audio_PlayActorSound2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F39B8.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F39B8.s index 6da6d29993..7eef6d7f99 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F39B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F39B8.s @@ -59,7 +59,7 @@ glabel func_809F39B8 /* 007D4 809F3A94 AFAB0010 */ sw $t3, 0x0010($sp) /* 007D8 809F3A98 8FA4004C */ lw $a0, 0x004C($sp) /* 007DC 809F3A9C 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 -/* 007E0 809F3AA0 0C00A5E9 */ jal func_800297A4 +/* 007E0 809F3AA0 0C00A5E9 */ jal EffectSsHahen_SpawnBurst /* 007E4 809F3AA4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 007E8 809F3AA8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 007EC 809F3AAC 0C00BE0A */ jal Audio_PlayActorSound2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F43F0.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F43F0.s index e102834c88..f92e2655f8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F43F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F43F0.s @@ -54,7 +54,7 @@ glabel func_809F43F0 /* 011F4 809F44B4 AFAB0010 */ sw $t3, 0x0010($sp) /* 011F8 809F44B8 8FA4003C */ lw $a0, 0x003C($sp) /* 011FC 809F44BC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01200 809F44C0 0C00A5E9 */ jal func_800297A4 +/* 01200 809F44C0 0C00A5E9 */ jal EffectSsHahen_SpawnBurst /* 01204 809F44C4 AFA00024 */ sw $zero, 0x0024($sp) /* 01208 809F44C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0120C 809F44CC 0C00BE0A */ jal Audio_PlayActorSound2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4730.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4730.s index cd93efe564..68d09d8186 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4730.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4730.s @@ -49,7 +49,7 @@ glabel func_809F4730 /* 01524 809F47E4 8FA4003C */ lw $a0, 0x003C($sp) /* 01528 809F47E8 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 /* 0152C 809F47EC 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 -/* 01530 809F47F0 0C00A5E9 */ jal func_800297A4 +/* 01530 809F47F0 0C00A5E9 */ jal EffectSsHahen_SpawnBurst /* 01534 809F47F4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 01538 809F47F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0153C 809F47FC 0C00BE0A */ jal Audio_PlayActorSound2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4EF4.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4EF4.s index fe5d901d5b..3872aafc96 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4EF4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4EF4.s @@ -35,7 +35,7 @@ glabel func_809F4EF4 /* 01CA0 809F4F60 AFB90018 */ sw $t9, 0x0018($sp) /* 01CA4 809F4F64 AFA8001C */ sw $t0, 0x001C($sp) /* 01CA8 809F4F68 AFA90020 */ sw $t1, 0x0020($sp) -/* 01CAC 809F4F6C 0C00A5E9 */ jal func_800297A4 +/* 01CAC 809F4F6C 0C00A5E9 */ jal EffectSsHahen_SpawnBurst /* 01CB0 809F4F70 AFA00024 */ sw $zero, 0x0024($sp) /* 01CB4 809F4F74 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01CB8 809F4F78 0C00BE0A */ jal Audio_PlayActorSound2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/EnDodongo_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/EnDodongo_Draw.s index 6892bdac72..0b0ce52dbf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/EnDodongo_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/EnDodongo_Draw.s @@ -57,7 +57,7 @@ glabel EnDodongo_Draw /* 023FC 809FA64C 24C60358 */ addiu $a2, $a2, 0x0358 ## $a2 = 00000358 /* 02400 809FA650 8FA40044 */ lw $a0, 0x0044($sp) /* 02404 809FA654 24070096 */ addiu $a3, $zero, 0x0096 ## $a3 = 00000096 -/* 02408 809FA658 0C00A850 */ jal func_8002A140 +/* 02408 809FA658 0C00A850 */ jal EffectSsEnIce_SpawnFlyingVec3f /* 0240C 809FA65C E7A40028 */ swc1 $f4, 0x0028($sp) .L809FA660: /* 02410 809FA660 8FBF003C */ lw $ra, 0x003C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8D58.s b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8D58.s index decda74532..62351f3e7b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8D58.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8D58.s @@ -89,7 +89,7 @@ glabel func_809F8D58 /* 00C58 809F8EA8 AFAA0010 */ sw $t2, 0x0010($sp) /* 00C5C 809F8EAC 27A50030 */ addiu $a1, $sp, 0x0030 ## $a1 = FFFFFFD8 /* 00C60 809F8EB0 27A60048 */ addiu $a2, $sp, 0x0048 ## $a2 = FFFFFFF0 -/* 00C64 809F8EB4 0C00A4E8 */ jal func_800293A0 +/* 00C64 809F8EB4 0C00A4E8 */ jal EffectSsDFire_SpawnFixedScale /* 00C68 809F8EB8 27A7003C */ addiu $a3, $sp, 0x003C ## $a3 = FFFFFFE4 /* 00C6C 809F8EBC 10000010 */ beq $zero, $zero, .L809F8F00 /* 00C70 809F8EC0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC9DC.s b/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC9DC.s index fda03cac05..a8103f0b61 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC9DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC9DC.s @@ -107,7 +107,7 @@ glabel func_809FC9DC /* 00974 809FCB44 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 00978 809FCB48 02402825 */ or $a1, $s2, $zero ## $a1 = 00000024 /* 0097C 809FCB4C E7B80010 */ swc1 $f24, 0x0010($sp) -/* 00980 809FCB50 0C00A4F9 */ jal func_800293E4 +/* 00980 809FCB50 0C00A4F9 */ jal EffectSsBubble_Spawn /* 00984 809FCB54 E7BA0014 */ swc1 $f26, 0x0014($sp) /* 00988 809FCB58 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 /* 0098C 809FCB5C 0211082A */ slt $at, $s0, $s1 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A003DC.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A003DC.s index d41da200f8..eee91e3810 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A003DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A003DC.s @@ -46,7 +46,7 @@ glabel func_80A003DC /* 004E8 80A00488 8FA40034 */ lw $a0, 0x0034($sp) /* 004EC 80A0048C 8FA5002C */ lw $a1, 0x002C($sp) /* 004F0 80A00490 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 004F4 80A00494 0C00A527 */ jal func_8002949C +/* 004F4 80A00494 0C00A527 */ jal EffectSsGSplash_Spawn /* 004F8 80A00498 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 004FC 80A0049C 3C0E80A0 */ lui $t6, %hi(func_80A00B18) ## $t6 = 80A00000 /* 00500 80A004A0 25CE0B18 */ addiu $t6, $t6, %lo(func_80A00B18) ## $t6 = 80A00B18 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A01010.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A01010.s index 87b2ba6cec..e2a354992d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A01010.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A01010.s @@ -47,7 +47,7 @@ glabel func_80A01010 /* 01110 80A010B0 240A02BC */ addiu $t2, $zero, 0x02BC ## $t2 = 000002BC /* 01114 80A010B4 AFAA0014 */ sw $t2, 0x0014($sp) /* 01118 80A010B8 AFA90010 */ sw $t1, 0x0010($sp) -/* 0111C 80A010BC 0C00A527 */ jal func_8002949C +/* 0111C 80A010BC 0C00A527 */ jal EffectSsGSplash_Spawn /* 01120 80A010C0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 01124 80A010C4 1000000B */ beq $zero, $zero, .L80A010F4 /* 01128 80A010C8 8FBF0024 */ lw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A049B4.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A049B4.s index 5eeb813436..8137af68e2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A049B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A049B4.s @@ -260,7 +260,7 @@ glabel func_80A049B4 /* 03138 80A04D68 AFB80010 */ sw $t8, 0x0010($sp) /* 0313C 80A04D6C AFB90014 */ sw $t9, 0x0014($sp) /* 03140 80A04D70 AFA80018 */ sw $t0, 0x0018($sp) -/* 03144 80A04D74 0C00A2EC */ jal func_80028BB0 +/* 03144 80A04D74 0C00A2EC */ jal EffectSsKiraKira_SpawnDispersed /* 03148 80A04D78 AFA9001C */ sw $t1, 0x001C($sp) /* 0314C 80A04D7C 8FBF002C */ lw $ra, 0x002C($sp) /* 03150 80A04D80 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A10220.s b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A10220.s index a1da5a4306..b633b0722b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A10220.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A10220.s @@ -192,7 +192,7 @@ glabel func_80A10220 /* 011D4 80A10434 000FC400 */ sll $t8, $t7, 16 /* 011D8 80A10438 0018CC03 */ sra $t9, $t8, 16 /* 011DC 80A1043C 27290096 */ addiu $t1, $t9, 0x0096 ## $t1 = 00000096 -/* 011E0 80A10440 0C00A73C */ jal EffectSsFhgFlash_Spawn +/* 011E0 80A10440 0C00A73C */ jal EffectSsFhgFlash_SpawnLightBall /* 011E4 80A10444 AFA90010 */ sw $t1, 0x0010($sp) /* 011E8 80A10448 87A200E0 */ lh $v0, 0x00E0($sp) /* 011EC 80A1044C 24420001 */ addiu $v0, $v0, 0x0001 ## $v0 = 00000001 @@ -309,7 +309,7 @@ glabel func_80A10220 /* 0137C 80A105DC 00086400 */ sll $t4, $t0, 16 /* 01380 80A105E0 000C5C03 */ sra $t3, $t4, 16 /* 01384 80A105E4 256E0032 */ addiu $t6, $t3, 0x0032 ## $t6 = 00000032 -/* 01388 80A105E8 0C00A73C */ jal EffectSsFhgFlash_Spawn +/* 01388 80A105E8 0C00A73C */ jal EffectSsFhgFlash_SpawnLightBall /* 0138C 80A105EC AFAE0010 */ sw $t6, 0x0010($sp) /* 01390 80A105F0 87A200B6 */ lh $v0, 0x00B6($sp) /* 01394 80A105F4 24420001 */ addiu $v0, $v0, 0x0001 ## $v0 = 00000001 @@ -702,7 +702,7 @@ glabel func_80A10220 /* 01928 80A10B88 00086400 */ sll $t4, $t0, 16 /* 0192C 80A10B8C 000C5C03 */ sra $t3, $t4, 16 /* 01930 80A10B90 256E0050 */ addiu $t6, $t3, 0x0050 ## $t6 = 00000050 -/* 01934 80A10B94 0C00A73C */ jal EffectSsFhgFlash_Spawn +/* 01934 80A10B94 0C00A73C */ jal EffectSsFhgFlash_SpawnLightBall /* 01938 80A10B98 AFAE0010 */ sw $t6, 0x0010($sp) /* 0193C 80A10B9C 87A20096 */ lh $v0, 0x0096($sp) /* 01940 80A10BA0 24420001 */ addiu $v0, $v0, 0x0001 ## $v0 = 00000001 @@ -832,7 +832,7 @@ glabel func_80A10220 /* 01B04 80A10D64 000C5C00 */ sll $t3, $t4, 16 /* 01B08 80A10D68 000B7403 */ sra $t6, $t3, 16 /* 01B0C 80A10D6C 25CF0064 */ addiu $t7, $t6, 0x0064 ## $t7 = 00000064 -/* 01B10 80A10D70 0C00A73C */ jal EffectSsFhgFlash_Spawn +/* 01B10 80A10D70 0C00A73C */ jal EffectSsFhgFlash_SpawnLightBall /* 01B14 80A10D74 AFAF0010 */ sw $t7, 0x0010($sp) /* 01B18 80A10D78 87A20078 */ lh $v0, 0x0078($sp) /* 01B1C 80A10D7C 24420001 */ addiu $v0, $v0, 0x0001 ## $v0 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/func_80A120CC.s b/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/func_80A120CC.s index d0411c2290..8ea700e3bf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/func_80A120CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/func_80A120CC.s @@ -124,7 +124,7 @@ glabel func_80A120CC /* 00640 80A12260 E7A60060 */ swc1 $f6, 0x0060($sp) /* 00644 80A12264 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 00648 80A12268 27A60058 */ addiu $a2, $sp, 0x0058 ## $a2 = FFFFFFF0 -/* 0064C 80A1226C 0C00A935 */ jal func_8002A4D4 +/* 0064C 80A1226C 0C00A935 */ jal EffectSsEnFire_SpawnVec3f /* 00650 80A12270 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 /* 00654 80A12274 1000000D */ beq $zero, $zero, .L80A122AC /* 00658 80A12278 96390088 */ lhu $t9, 0x0088($s1) ## 00000088 @@ -203,7 +203,7 @@ glabel func_80A120CC /* 00758 80A12378 E7A60060 */ swc1 $f6, 0x0060($sp) /* 0075C 80A1237C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 00760 80A12380 27A60058 */ addiu $a2, $sp, 0x0058 ## $a2 = FFFFFFF0 -/* 00764 80A12384 0C00A935 */ jal func_8002A4D4 +/* 00764 80A12384 0C00A935 */ jal EffectSsEnFire_SpawnVec3f /* 00768 80A12388 2407012C */ addiu $a3, $zero, 0x012C ## $a3 = 0000012C /* 0076C 80A1238C 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 /* 00770 80A12390 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/func_80A12730.s b/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/func_80A12730.s index e9589bafb1..77c69a01a7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/func_80A12730.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/func_80A12730.s @@ -54,7 +54,7 @@ glabel func_80A12730 /* 00BCC 80A127EC AFA00014 */ sw $zero, 0x0014($sp) /* 00BD0 80A127F0 AFA00010 */ sw $zero, 0x0010($sp) /* 00BD4 80A127F4 87A70032 */ lh $a3, 0x0032($sp) -/* 00BD8 80A127F8 0C00A935 */ jal func_8002A4D4 +/* 00BD8 80A127F8 0C00A935 */ jal EffectSsEnFire_SpawnVec3f /* 00BDC 80A127FC 8FA40044 */ lw $a0, 0x0044($sp) /* 00BE0 80A12800 8FBF002C */ lw $ra, 0x002C($sp) .L80A12804: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A135A8.s b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A135A8.s index 965ff0fe0b..0b1eb354f2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A135A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A135A8.s @@ -98,7 +98,7 @@ glabel func_80A135A8 /* 00678 80A136E8 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 0067C 80A136EC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 00680 80A136F0 02403025 */ or $a2, $s2, $zero ## $a2 = FFFFFFF0 -/* 00684 80A136F4 0C00A850 */ jal func_8002A140 +/* 00684 80A136F4 0C00A850 */ jal EffectSsEnIce_SpawnFlyingVec3f /* 00688 80A136F8 24070096 */ addiu $a3, $zero, 0x0096 ## $a3 = 00000096 /* 0068C 80A136FC 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 /* 00690 80A13700 5613FFD1 */ bnel $s0, $s3, .L80A13648 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A1448C.s b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A1448C.s index a99f7d0e77..11f411228b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A1448C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A1448C.s @@ -18,7 +18,7 @@ glabel func_80A1448C /* 01458 80A144C8 24070028 */ addiu $a3, $zero, 0x0028 ## $a3 = 00000028 /* 0145C 80A144CC AFA00010 */ sw $zero, 0x0010($sp) /* 01460 80A144D0 AFA00014 */ sw $zero, 0x0014($sp) -/* 01464 80A144D4 0C00A935 */ jal func_8002A4D4 +/* 01464 80A144D4 0C00A935 */ jal EffectSsEnFire_SpawnVec3f /* 01468 80A144D8 AFB00018 */ sw $s0, 0x0018($sp) /* 0146C 80A144DC 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 /* 01470 80A144E0 5614FFF7 */ bnel $s0, $s4, .L80A144C0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1AFF0.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1AFF0.s index 0bb601aeba..f889ff1aa4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1AFF0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1AFF0.s @@ -24,7 +24,7 @@ glabel func_80A1AFF0 /* 006A8 80A1B048 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFF4 /* 006AC 80A1B04C AFB90014 */ sw $t9, 0x0014($sp) /* 006B0 80A1B050 AFB80010 */ sw $t8, 0x0010($sp) -/* 006B4 80A1B054 0C00A527 */ jal func_8002949C +/* 006B4 80A1B054 0C00A527 */ jal EffectSsGSplash_Spawn /* 006B8 80A1B058 E7B00034 */ swc1 $f16, 0x0034($sp) /* 006BC 80A1B05C 9208037A */ lbu $t0, 0x037A($s0) ## 0000037A /* 006C0 80A1B060 240528C5 */ addiu $a1, $zero, 0x28C5 ## $a1 = 000028C5 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20100.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20100.s index 82ba6d313b..89f328f1cc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20100.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A20100.s @@ -115,7 +115,7 @@ glabel func_80A20100 /* 004C0 80A20280 AFB60010 */ sw $s6, 0x0010($sp) /* 004C4 80A20284 AFB70014 */ sw $s7, 0x0014($sp) /* 004C8 80A20288 AFBE0018 */ sw $s8, 0x0018($sp) -/* 004CC 80A2028C 0C00A8A9 */ jal func_8002A2A4 +/* 004CC 80A2028C 0C00A8A9 */ jal EffectSsEnIce_Spawn /* 004D0 80A20290 AFB1001C */ sw $s1, 0x001C($sp) /* 004D4 80A20294 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 /* 004D8 80A20298 1613FFD2 */ bne $s0, $s3, .L80A201E4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22250.s b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22250.s index a2c178065a..32930666a3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22250.s +++ b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22250.s @@ -67,7 +67,7 @@ glabel func_80A22250 /* 00488 80A22348 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 /* 0048C 80A2234C 00000000 */ nop /* 00490 80A22350 468021A0 */ cvt.s.w $f6, $f4 -/* 00494 80A22354 0C00A732 */ jal func_80029CC8 +/* 00494 80A22354 0C00A732 */ jal EffectSsHitMark_SpawnCustomScale /* 00498 80A22358 E7A60058 */ swc1 $f6, 0x0058($sp) /* 0049C 80A2235C 86220150 */ lh $v0, 0x0150($s1) ## 00000150 /* 004A0 80A22360 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 diff --git a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22B1C.s b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22B1C.s index 3b98a7a523..ac3d9d4649 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22B1C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22B1C.s @@ -148,7 +148,7 @@ glabel func_80A22B1C /* 00E60 80A22D20 AFA00020 */ sw $zero, 0x0020($sp) /* 00E64 80A22D24 AFA00028 */ sw $zero, 0x0028($sp) /* 00E68 80A22D28 AFB6003C */ sw $s6, 0x003C($sp) -/* 00E6C 80A22D2C 0C00A7A3 */ jal func_80029E8C +/* 00E6C 80A22D2C 0C00A7A3 */ jal EffectSsKakera_Spawn /* 00E70 80A22D30 AFAC0024 */ sw $t4, 0x0024($sp) /* 00E74 80A22D34 26524E20 */ addiu $s2, $s2, 0x4E20 ## $s2 = 00004E20 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A3334C.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A3334C.s index 53fa618889..c00db7e506 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A3334C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A3334C.s @@ -56,7 +56,7 @@ glabel func_80A3334C /* 0084C 80A3341C AFA90010 */ sw $t1, 0x0010($sp) /* 00850 80A33420 AFAA0014 */ sw $t2, 0x0014($sp) /* 00854 80A33424 8FA4004C */ lw $a0, 0x004C($sp) -/* 00858 80A33428 0C00A2EC */ jal func_80028BB0 +/* 00858 80A33428 0C00A2EC */ jal EffectSsKiraKira_SpawnDispersed /* 0085C 80A3342C 27A50038 */ addiu $a1, $sp, 0x0038 ## $a1 = FFFFFFF0 .L80A33430: /* 00860 80A33430 8FBF002C */ lw $ra, 0x002C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Draw.s index b07bd283e3..80bd6e1b98 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Draw.s @@ -233,7 +233,7 @@ glabel EnGeldB_Draw /* 04ACC 80A39DDC 24C6014C */ addiu $a2, $a2, 0x014C ## $a2 = 0000014C /* 04AD0 80A39DE0 8FA400DC */ lw $a0, 0x00DC($sp) /* 04AD4 80A39DE4 24070096 */ addiu $a3, $zero, 0x0096 ## $a3 = 00000096 -/* 04AD8 80A39DE8 0C00A877 */ jal func_8002A1DC +/* 04AD8 80A39DE8 0C00A877 */ jal EffectSsEnIce_SpawnFlyingVec3s /* 04ADC 80A39DEC E7A80028 */ swc1 $f8, 0x0028($sp) .L80A39DF0: /* 04AE0 80A39DF0 8FAE00DC */ lw $t6, 0x00DC($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49668.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49668.s index 30f403e452..9688a75525 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49668.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49668.s @@ -133,7 +133,7 @@ glabel func_80A49668 /* 00990 80A49850 000FC400 */ sll $t8, $t7, 16 /* 00994 80A49854 0018CC03 */ sra $t9, $t8, 16 /* 00998 80A49858 2728000A */ addiu $t0, $t9, 0x000A ## $t0 = 0000000A -/* 0099C 80A4985C 0C00A5C9 */ jal func_80029724 +/* 0099C 80A4985C 0C00A5C9 */ jal EffectSsHahen_Spawn /* 009A0 80A49860 AFA80014 */ sw $t0, 0x0014($sp) /* 009A4 80A49864 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 /* 009A8 80A49868 5617FFD1 */ bnel $s0, $s7, .L80A497B0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49D0C.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49D0C.s index 955326c4d2..9bdc4178be 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49D0C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49D0C.s @@ -55,7 +55,7 @@ glabel func_80A49D0C /* 00EEC 80A49DAC AFA00014 */ sw $zero, 0x0014($sp) /* 00EF0 80A49DB0 AFB80010 */ sw $t8, 0x0010($sp) /* 00EF4 80A49DB4 8FA4004C */ lw $a0, 0x004C($sp) -/* 00EF8 80A49DB8 0C00A76F */ jal func_80029DBC +/* 00EF8 80A49DB8 0C00A76F */ jal EffectSsKFire_Spawn /* 00EFC 80A49DBC E7A60040 */ swc1 $f6, 0x0040($sp) /* 00F00 80A49DC0 860202CC */ lh $v0, 0x02CC($s0) ## 000002CC .L80A49DC4: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A6AC.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A6AC.s index 64e2656c9c..aa98e7d094 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A6AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A6AC.s @@ -107,7 +107,7 @@ glabel func_80A4A6AC /* 01964 80A4A824 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 /* 01968 80A4A828 26050038 */ addiu $a1, $s0, 0x0038 ## $a1 = 00000038 /* 0196C 80A4A82C A3A3002F */ sb $v1, 0x002F($sp) -/* 01970 80A4A830 0C00A66B */ jal func_800299AC +/* 01970 80A4A830 0C00A66B */ jal EffectSsSibuki_SpawnBurst /* 01974 80A4A834 AFA6003C */ sw $a2, 0x003C($sp) /* 01978 80A4A838 93A3002F */ lbu $v1, 0x002F($sp) /* 0197C 80A4A83C 10000002 */ beq $zero, $zero, .L80A4A848 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/EnGoroiwa_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/EnGoroiwa_Destroy.s deleted file mode 100644 index d10bc89f8b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/EnGoroiwa_Destroy.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel EnGoroiwa_Destroy -/* 01918 80A4D5B8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0191C 80A4D5BC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 01920 80A4D5C0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01924 80A4D5C4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01928 80A4D5C8 0C016F32 */ jal Collider_DestroyJntSph -/* 0192C 80A4D5CC 24E50150 */ addiu $a1, $a3, 0x0150 ## $a1 = 00000150 -/* 01930 80A4D5D0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01934 80A4D5D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01938 80A4D5D8 03E00008 */ jr $ra -/* 0193C 80A4D5DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/EnGoroiwa_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/EnGoroiwa_Draw.s deleted file mode 100644 index 13f96b01a0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/EnGoroiwa_Draw.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel EnGoroiwa_Draw -/* 02188 80A4DE28 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0218C 80A4DE2C AFA40018 */ sw $a0, 0x0018($sp) -/* 02190 80A4DE30 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 02194 80A4DE34 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02198 80A4DE38 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0219C 80A4DE3C 0C00D498 */ jal Gfx_DrawDListOpa - -/* 021A0 80A4DE40 24A506B0 */ addiu $a1, $a1, 0x06B0 ## $a1 = 060006B0 -/* 021A4 80A4DE44 8FBF0014 */ lw $ra, 0x0014($sp) -/* 021A8 80A4DE48 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 021AC 80A4DE4C 03E00008 */ jr $ra -/* 021B0 80A4DE50 00000000 */ nop -/* 021B4 80A4DE54 00000000 */ nop -/* 021B8 80A4DE58 00000000 */ nop -/* 021BC 80A4DE5C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/EnGoroiwa_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/EnGoroiwa_Init.s deleted file mode 100644 index bcad15ad19..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/EnGoroiwa_Init.s +++ /dev/null @@ -1,137 +0,0 @@ -.rdata -glabel D_80A4DF88 - .asciz "Ｅｒｒｏｒ : arg_data が不正(%s %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_80A4DFC0 - .asciz "../z_en_gr.c" - .balign 4 - -glabel D_80A4DFD0 - .asciz "Ｅｒｒｏｒ : レールデータ が不正(%s %d)\n" - .balign 4 - -glabel D_80A4DFFC - .asciz "../z_en_gr.c" - .balign 4 - -glabel D_80A4E00C - .asciz "(ごろ岩)(arg 0x%04x)(rail %d)(end %d)(bgc %d)(hit %d)\n" - .balign 4 - -.text -glabel EnGoroiwa_Init -/* 01778 80A4D418 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0177C 80A4D41C AFB20028 */ sw $s2, 0x0028($sp) -/* 01780 80A4D420 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 01784 80A4D424 AFBF002C */ sw $ra, 0x002C($sp) -/* 01788 80A4D428 AFB10024 */ sw $s1, 0x0024($sp) -/* 0178C 80A4D42C 3C0580A5 */ lui $a1, %hi(D_80A4DEF8) ## $a1 = 80A50000 -/* 01790 80A4D430 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 01794 80A4D434 AFB00020 */ sw $s0, 0x0020($sp) -/* 01798 80A4D438 0C01E037 */ jal Actor_ProcessInitChain - -/* 0179C 80A4D43C 24A5DEF8 */ addiu $a1, $a1, %lo(D_80A4DEF8) ## $a1 = 80A4DEF8 -/* 017A0 80A4D440 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 017A4 80A4D444 0C292F41 */ jal func_80A4BD04 -/* 017A8 80A4D448 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 017AC 80A4D44C 8630001C */ lh $s0, 0x001C($s1) ## 0000001C -/* 017B0 80A4D450 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 017B4 80A4D454 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 -/* 017B8 80A4D458 320200FF */ andi $v0, $s0, 0x00FF ## $v0 = 00000000 -/* 017BC 80A4D45C 1441000C */ bne $v0, $at, .L80A4D490 -/* 017C0 80A4D460 01D27021 */ addu $t6, $t6, $s2 -/* 017C4 80A4D464 3C0480A5 */ lui $a0, %hi(D_80A4DF88) ## $a0 = 80A50000 -/* 017C8 80A4D468 3C0580A5 */ lui $a1, %hi(D_80A4DFC0) ## $a1 = 80A50000 -/* 017CC 80A4D46C 24A5DFC0 */ addiu $a1, $a1, %lo(D_80A4DFC0) ## $a1 = 80A4DFC0 -/* 017D0 80A4D470 2484DF88 */ addiu $a0, $a0, %lo(D_80A4DF88) ## $a0 = 80A4DF88 -/* 017D4 80A4D474 24060409 */ addiu $a2, $zero, 0x0409 ## $a2 = 00000409 -/* 017D8 80A4D478 0C00084C */ jal osSyncPrintf - -/* 017DC 80A4D47C 02003825 */ or $a3, $s0, $zero ## $a3 = 00000000 -/* 017E0 80A4D480 0C00B55C */ jal Actor_Kill - -/* 017E4 80A4D484 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 017E8 80A4D488 10000046 */ beq $zero, $zero, .L80A4D5A4 -/* 017EC 80A4D48C 8FBF002C */ lw $ra, 0x002C($sp) -.L80A4D490: -/* 017F0 80A4D490 8DCE1E08 */ lw $t6, 0x1E08($t6) ## 00001E08 -/* 017F4 80A4D494 000278C0 */ sll $t7, $v0, 3 -/* 017F8 80A4D498 26240098 */ addiu $a0, $s1, 0x0098 ## $a0 = 00000098 -/* 017FC 80A4D49C 01CFC021 */ addu $t8, $t6, $t7 -/* 01800 80A4D4A0 93190000 */ lbu $t9, 0x0000($t8) ## 00000000 -/* 01804 80A4D4A4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01808 80A4D4A8 3C0680A5 */ lui $a2, %hi(D_80A4DEB4) ## $a2 = 80A50000 -/* 0180C 80A4D4AC 2B210002 */ slti $at, $t9, 0x0002 -/* 01810 80A4D4B0 1020000B */ beq $at, $zero, .L80A4D4E0 -/* 01814 80A4D4B4 00000000 */ nop -/* 01818 80A4D4B8 3C0480A5 */ lui $a0, %hi(D_80A4DFD0) ## $a0 = 80A50000 -/* 0181C 80A4D4BC 3C0580A5 */ lui $a1, %hi(D_80A4DFFC) ## $a1 = 80A50000 -/* 01820 80A4D4C0 24A5DFFC */ addiu $a1, $a1, %lo(D_80A4DFFC) ## $a1 = 80A4DFFC -/* 01824 80A4D4C4 2484DFD0 */ addiu $a0, $a0, %lo(D_80A4DFD0) ## $a0 = 80A4DFD0 -/* 01828 80A4D4C8 0C00084C */ jal osSyncPrintf - -/* 0182C 80A4D4CC 24060413 */ addiu $a2, $zero, 0x0413 ## $a2 = 00000413 -/* 01830 80A4D4D0 0C00B55C */ jal Actor_Kill - -/* 01834 80A4D4D4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01838 80A4D4D8 10000032 */ beq $zero, $zero, .L80A4D5A4 -/* 0183C 80A4D4DC 8FBF002C */ lw $ra, 0x002C($sp) -.L80A4D4E0: -/* 01840 80A4D4E0 0C0187B5 */ jal func_80061ED4 -/* 01844 80A4D4E4 24C6DEB4 */ addiu $a2, $a2, %lo(D_80A4DEB4) ## $a2 = FFFFDEB4 -/* 01848 80A4D4E8 8628001C */ lh $t0, 0x001C($s1) ## 0000001C -/* 0184C 80A4D4EC 3C0580A5 */ lui $a1, %hi(D_80A4DF10) ## $a1 = 80A50000 -/* 01850 80A4D4F0 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) -/* 01854 80A4D4F4 00084A83 */ sra $t1, $t0, 10 -/* 01858 80A4D4F8 312A0001 */ andi $t2, $t1, 0x0001 ## $t2 = 00000000 -/* 0185C 80A4D4FC 000A5880 */ sll $t3, $t2, 2 -/* 01860 80A4D500 00AB2821 */ addu $a1, $a1, $t3 -/* 01864 80A4D504 3C074116 */ lui $a3, 0x4116 ## $a3 = 41160000 -/* 01868 80A4D508 34E76666 */ ori $a3, $a3, 0x6666 ## $a3 = 41166666 -/* 0186C 80A4D50C 8CA5DF10 */ lw $a1, %lo(D_80A4DF10)($a1) -/* 01870 80A4D510 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) -/* 01874 80A4D514 0C00AC78 */ jal ActorShape_Init - -/* 01878 80A4D518 262400B4 */ addiu $a0, $s1, 0x00B4 ## $a0 = 000000B4 -/* 0187C 80A4D51C 240C00C8 */ addiu $t4, $zero, 0x00C8 ## $t4 = 000000C8 -/* 01880 80A4D520 A22C00C8 */ sb $t4, 0x00C8($s1) ## 000000C8 -/* 01884 80A4D524 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01888 80A4D528 0C292F84 */ jal func_80A4BE10 -/* 0188C 80A4D52C 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 01890 80A4D530 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01894 80A4D534 0C293062 */ jal func_80A4C188 -/* 01898 80A4D538 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 0189C 80A4D53C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 018A0 80A4D540 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 018A4 80A4D544 0C293071 */ jal func_80A4C1C4 -/* 018A8 80A4D548 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 018AC 80A4D54C 0C293099 */ jal func_80A4C264 -/* 018B0 80A4D550 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 018B4 80A4D554 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 018B8 80A4D558 0C292F95 */ jal func_80A4BE54 -/* 018BC 80A4D55C 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 018C0 80A4D560 0C293578 */ jal func_80A4D5E0 -/* 018C4 80A4D564 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 018C8 80A4D568 8630001C */ lh $s0, 0x001C($s1) ## 0000001C -/* 018CC 80A4D56C 3C0480A5 */ lui $a0, %hi(D_80A4E00C) ## $a0 = 80A50000 -/* 018D0 80A4D570 2484E00C */ addiu $a0, $a0, %lo(D_80A4E00C) ## $a0 = 80A4E00C -/* 018D4 80A4D574 00106A83 */ sra $t5, $s0, 10 -/* 018D8 80A4D578 31AE0001 */ andi $t6, $t5, 0x0001 ## $t6 = 00000000 -/* 018DC 80A4D57C AFAE0010 */ sw $t6, 0x0010($sp) -/* 018E0 80A4D580 862F0018 */ lh $t7, 0x0018($s1) ## 00000018 -/* 018E4 80A4D584 00103A03 */ sra $a3, $s0, 8 -/* 018E8 80A4D588 30E70003 */ andi $a3, $a3, 0x0003 ## $a3 = 00000000 -/* 018EC 80A4D58C 31F80001 */ andi $t8, $t7, 0x0001 ## $t8 = 00000000 -/* 018F0 80A4D590 AFB80014 */ sw $t8, 0x0014($sp) -/* 018F4 80A4D594 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 018F8 80A4D598 0C00084C */ jal osSyncPrintf - -/* 018FC 80A4D59C 320600FF */ andi $a2, $s0, 0x00FF ## $a2 = 00000000 -/* 01900 80A4D5A0 8FBF002C */ lw $ra, 0x002C($sp) -.L80A4D5A4: -/* 01904 80A4D5A4 8FB00020 */ lw $s0, 0x0020($sp) -/* 01908 80A4D5A8 8FB10024 */ lw $s1, 0x0024($sp) -/* 0190C 80A4D5AC 8FB20028 */ lw $s2, 0x0028($sp) -/* 01910 80A4D5B0 03E00008 */ jr $ra -/* 01914 80A4D5B4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/EnGoroiwa_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/EnGoroiwa_Update.s deleted file mode 100644 index 3ad149204c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/EnGoroiwa_Update.s +++ /dev/null @@ -1,99 +0,0 @@ -glabel EnGoroiwa_Update -/* 02028 80A4DCC8 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 0202C 80A4DCCC AFBF0024 */ sw $ra, 0x0024($sp) -/* 02030 80A4DCD0 AFB10020 */ sw $s1, 0x0020($sp) -/* 02034 80A4DCD4 AFB0001C */ sw $s0, 0x001C($sp) -/* 02038 80A4DCD8 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 0203C 80A4DCDC 3C013000 */ lui $at, 0x3000 ## $at = 30000000 -/* 02040 80A4DCE0 342100C0 */ ori $at, $at, 0x00C0 ## $at = 300000C0 -/* 02044 80A4DCE4 8C4E067C */ lw $t6, 0x067C($v0) ## 0000067C -/* 02048 80A4DCE8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0204C 80A4DCEC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 02050 80A4DCF0 01C17824 */ and $t7, $t6, $at -/* 02054 80A4DCF4 55E00048 */ bnel $t7, $zero, .L80A4DE18 -/* 02058 80A4DCF8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0205C 80A4DCFC 848201C8 */ lh $v0, 0x01C8($a0) ## 000001C8 -/* 02060 80A4DD00 18400002 */ blez $v0, .L80A4DD0C -/* 02064 80A4DD04 2458FFFF */ addiu $t8, $v0, 0xFFFF ## $t8 = FFFFFFFF -/* 02068 80A4DD08 A49801C8 */ sh $t8, 0x01C8($a0) ## 000001C8 -.L80A4DD0C: -/* 0206C 80A4DD0C 8E19014C */ lw $t9, 0x014C($s0) ## 0000014C -/* 02070 80A4DD10 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02074 80A4DD14 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 02078 80A4DD18 0320F809 */ jalr $ra, $t9 -/* 0207C 80A4DD1C 00000000 */ nop -/* 02080 80A4DD20 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 02084 80A4DD24 262407C0 */ addiu $a0, $s1, 0x07C0 ## $a0 = 000007C0 -/* 02088 80A4DD28 26050078 */ addiu $a1, $s0, 0x0078 ## $a1 = 00000078 -/* 0208C 80A4DD2C 00021283 */ sra $v0, $v0, 10 -/* 02090 80A4DD30 30420001 */ andi $v0, $v0, 0x0001 ## $v0 = 00000000 -/* 02094 80A4DD34 1040000E */ beq $v0, $zero, .L80A4DD70 -/* 02098 80A4DD38 27A60030 */ addiu $a2, $sp, 0x0030 ## $a2 = FFFFFFF0 -/* 0209C 80A4DD3C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 020A0 80A4DD40 14410010 */ bne $v0, $at, .L80A4DD84 -/* 020A4 80A4DD44 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 020A8 80A4DD48 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 020AC 80A4DD4C 2408001C */ addiu $t0, $zero, 0x001C ## $t0 = 0000001C -/* 020B0 80A4DD50 AFA80014 */ sw $t0, 0x0014($sp) -/* 020B4 80A4DD54 44060000 */ mfc1 $a2, $f0 -/* 020B8 80A4DD58 44070000 */ mfc1 $a3, $f0 -/* 020BC 80A4DD5C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 020C0 80A4DD60 0C00B92D */ jal func_8002E4B4 -/* 020C4 80A4DD64 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 020C8 80A4DD68 10000007 */ beq $zero, $zero, .L80A4DD88 -/* 020CC 80A4DD6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A4DD70: -/* 020D0 80A4DD70 26090024 */ addiu $t1, $s0, 0x0024 ## $t1 = 00000024 -/* 020D4 80A4DD74 AFA90010 */ sw $t1, 0x0010($sp) -/* 020D8 80A4DD78 0C00F269 */ jal func_8003C9A4 -/* 020DC 80A4DD7C 02003825 */ or $a3, $s0, $zero ## $a3 = 00000000 -/* 020E0 80A4DD80 E6000080 */ swc1 $f0, 0x0080($s0) ## 00000080 -.L80A4DD84: -/* 020E4 80A4DD84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A4DD88: -/* 020E8 80A4DD88 0C2933B6 */ jal func_80A4CED8 -/* 020EC 80A4DD8C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 020F0 80A4DD90 3C014396 */ lui $at, 0x4396 ## $at = 43960000 -/* 020F4 80A4DD94 44813000 */ mtc1 $at, $f6 ## $f6 = 300.00 -/* 020F8 80A4DD98 C6040090 */ lwc1 $f4, 0x0090($s0) ## 00000090 -/* 020FC 80A4DD9C 4606203C */ c.lt.s $f4, $f6 -/* 02100 80A4DDA0 00000000 */ nop -/* 02104 80A4DDA4 4502001C */ bc1fl .L80A4DE18 -/* 02108 80A4DDA8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0210C 80A4DDAC 0C292F28 */ jal func_80A4BCA0 -/* 02110 80A4DDB0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02114 80A4DDB4 920201D3 */ lbu $v0, 0x01D3($s0) ## 000001D3 -/* 02118 80A4DDB8 304A0001 */ andi $t2, $v0, 0x0001 ## $t2 = 00000000 -/* 0211C 80A4DDBC 5140000B */ beql $t2, $zero, .L80A4DDEC -/* 02120 80A4DDC0 304C0002 */ andi $t4, $v0, 0x0002 ## $t4 = 00000000 -/* 02124 80A4DDC4 860B01C8 */ lh $t3, 0x01C8($s0) ## 000001C8 -/* 02128 80A4DDC8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0212C 80A4DDCC 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 02130 80A4DDD0 1D600005 */ bgtz $t3, .L80A4DDE8 -/* 02134 80A4DDD4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02138 80A4DDD8 02212821 */ addu $a1, $s1, $at -/* 0213C 80A4DDDC 0C0175E7 */ jal CollisionCheck_SetAT - ## CollisionCheck_setAT -/* 02140 80A4DDE0 26060150 */ addiu $a2, $s0, 0x0150 ## $a2 = 00000150 -/* 02144 80A4DDE4 920201D3 */ lbu $v0, 0x01D3($s0) ## 000001D3 -.L80A4DDE8: -/* 02148 80A4DDE8 304C0002 */ andi $t4, $v0, 0x0002 ## $t4 = 00000000 -.L80A4DDEC: -/* 0214C 80A4DDEC 5180000A */ beql $t4, $zero, .L80A4DE18 -/* 02150 80A4DDF0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 02154 80A4DDF4 860D01C8 */ lh $t5, 0x01C8($s0) ## 000001C8 -/* 02158 80A4DDF8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0215C 80A4DDFC 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 02160 80A4DE00 1DA00004 */ bgtz $t5, .L80A4DE14 -/* 02164 80A4DE04 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02168 80A4DE08 02212821 */ addu $a1, $s1, $at -/* 0216C 80A4DE0C 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOT -/* 02170 80A4DE10 26060150 */ addiu $a2, $s0, 0x0150 ## $a2 = 00000150 -.L80A4DE14: -/* 02174 80A4DE14 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A4DE18: -/* 02178 80A4DE18 8FB0001C */ lw $s0, 0x001C($sp) -/* 0217C 80A4DE1C 8FB10020 */ lw $s1, 0x0020($sp) -/* 02180 80A4DE20 03E00008 */ jr $ra -/* 02184 80A4DE24 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BCA0.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BCA0.s deleted file mode 100644 index 6ffbf21ebc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BCA0.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80A4BCA0 -/* 00000 80A4BCA0 C4840024 */ lwc1 $f4, 0x0024($a0) ## 00000024 -/* 00004 80A4BCA4 8C82016C */ lw $v0, 0x016C($a0) ## 0000016C -/* 00008 80A4BCA8 3C0180A5 */ lui $at, %hi(D_80A4DEC4) ## $at = 80A50000 -/* 0000C 80A4BCAC 4600218D */ trunc.w.s $f6, $f4 -/* 00010 80A4BCB0 24420030 */ addiu $v0, $v0, 0x0030 ## $v0 = 00000030 -/* 00014 80A4BCB4 440F3000 */ mfc1 $t7, $f6 -/* 00018 80A4BCB8 00000000 */ nop -/* 0001C 80A4BCBC A44F0000 */ sh $t7, 0x0000($v0) ## 00000030 -/* 00020 80A4BCC0 8498001C */ lh $t8, 0x001C($a0) ## 0000001C -/* 00024 80A4BCC4 C48A0028 */ lwc1 $f10, 0x0028($a0) ## 00000028 -/* 00028 80A4BCC8 0018CA83 */ sra $t9, $t8, 10 -/* 0002C 80A4BCCC 33280001 */ andi $t0, $t9, 0x0001 ## $t0 = 00000000 -/* 00030 80A4BCD0 00084880 */ sll $t1, $t0, 2 -/* 00034 80A4BCD4 00290821 */ addu $at, $at, $t1 -/* 00038 80A4BCD8 C428DEC4 */ lwc1 $f8, %lo(D_80A4DEC4)($at) -/* 0003C 80A4BCDC 460A4400 */ add.s $f16, $f8, $f10 -/* 00040 80A4BCE0 4600848D */ trunc.w.s $f18, $f16 -/* 00044 80A4BCE4 440B9000 */ mfc1 $t3, $f18 -/* 00048 80A4BCE8 00000000 */ nop -/* 0004C 80A4BCEC A44B0002 */ sh $t3, 0x0002($v0) ## 00000032 -/* 00050 80A4BCF0 C484002C */ lwc1 $f4, 0x002C($a0) ## 0000002C -/* 00054 80A4BCF4 4600218D */ trunc.w.s $f6, $f4 -/* 00058 80A4BCF8 440D3000 */ mfc1 $t5, $f6 -/* 0005C 80A4BCFC 03E00008 */ jr $ra -/* 00060 80A4BD00 A44D0004 */ sh $t5, 0x0004($v0) ## 00000034 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BD04.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BD04.s deleted file mode 100644 index d94e86364e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BD04.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_80A4BD04 -/* 00064 80A4BD04 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00068 80A4BD08 AFB00020 */ sw $s0, 0x0020($sp) -/* 0006C 80A4BD0C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00070 80A4BD10 AFA50034 */ sw $a1, 0x0034($sp) -/* 00074 80A4BD14 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00078 80A4BD18 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0007C 80A4BD1C 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 -/* 00080 80A4BD20 0C016EFE */ jal Collider_InitJntSph -/* 00084 80A4BD24 AFA50028 */ sw $a1, 0x0028($sp) -/* 00088 80A4BD28 3C0780A5 */ lui $a3, %hi(D_80A4DEA4) ## $a3 = 80A50000 -/* 0008C 80A4BD2C 260E0170 */ addiu $t6, $s0, 0x0170 ## $t6 = 00000170 -/* 00090 80A4BD30 8FA50028 */ lw $a1, 0x0028($sp) -/* 00094 80A4BD34 AFAE0010 */ sw $t6, 0x0010($sp) -/* 00098 80A4BD38 24E7DEA4 */ addiu $a3, $a3, %lo(D_80A4DEA4) ## $a3 = 80A4DEA4 -/* 0009C 80A4BD3C 8FA40034 */ lw $a0, 0x0034($sp) -/* 000A0 80A4BD40 0C017014 */ jal Collider_SetJntSph -/* 000A4 80A4BD44 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 000A8 80A4BD48 0C292F28 */ jal func_80A4BCA0 -/* 000AC 80A4BD4C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000B0 80A4BD50 8E18016C */ lw $t8, 0x016C($s0) ## 0000016C -/* 000B4 80A4BD54 240F003A */ addiu $t7, $zero, 0x003A ## $t7 = 0000003A -/* 000B8 80A4BD58 A70F0036 */ sh $t7, 0x0036($t8) ## 00000036 -/* 000BC 80A4BD5C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 000C0 80A4BD60 8FB00020 */ lw $s0, 0x0020($sp) -/* 000C4 80A4BD64 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 000C8 80A4BD68 03E00008 */ jr $ra -/* 000CC 80A4BD6C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BD70.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BD70.s deleted file mode 100644 index d5b2192a7c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BD70.s +++ /dev/null @@ -1,8 +0,0 @@ -glabel func_80A4BD70 -/* 000D0 80A4BD70 AFA50004 */ sw $a1, 0x0004($sp) -/* 000D4 80A4BD74 908E01D3 */ lbu $t6, 0x01D3($a0) ## 000001D3 -/* 000D8 80A4BD78 31D8FFFC */ andi $t8, $t6, 0xFFFC ## $t8 = 00000000 -/* 000DC 80A4BD7C A09801D3 */ sb $t8, 0x01D3($a0) ## 000001D3 -/* 000E0 80A4BD80 0305C825 */ or $t9, $t8, $a1 ## $t9 = 00000000 -/* 000E4 80A4BD84 03E00008 */ jr $ra -/* 000E8 80A4BD88 A09901D3 */ sb $t9, 0x01D3($a0) ## 000001D3 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BD8C.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BD8C.s deleted file mode 100644 index 7c8a71d218..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BD8C.s +++ /dev/null @@ -1,41 +0,0 @@ -.late_rodata -glabel D_80A4E064 - .float 0.001 - -.text -glabel func_80A4BD8C -/* 000EC 80A4BD8C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 000F0 80A4BD90 AFBF0014 */ sw $ra, 0x0014($sp) -/* 000F4 80A4BD94 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 000F8 80A4BD98 AFA60018 */ sw $a2, 0x0018($sp) -/* 000FC 80A4BD9C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00100 80A4BDA0 0C032D8A */ jal Math3D_Vec3fMagnitude -/* 00104 80A4BDA4 AFA5001C */ sw $a1, 0x001C($sp) -/* 00108 80A4BDA8 3C0180A5 */ lui $at, %hi(D_80A4E064) ## $at = 80A50000 -/* 0010C 80A4BDAC C424E064 */ lwc1 $f4, %lo(D_80A4E064)($at) -/* 00110 80A4BDB0 8FA5001C */ lw $a1, 0x001C($sp) -/* 00114 80A4BDB4 8FA60018 */ lw $a2, 0x0018($sp) -/* 00118 80A4BDB8 4604003C */ c.lt.s $f0, $f4 -/* 0011C 80A4BDBC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00120 80A4BDC0 45020004 */ bc1fl .L80A4BDD4 -/* 00124 80A4BDC4 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 00128 80A4BDC8 1000000D */ beq $zero, $zero, .L80A4BE00 -/* 0012C 80A4BDCC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00130 80A4BDD0 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -.L80A4BDD4: -/* 00134 80A4BDD4 C4A80000 */ lwc1 $f8, 0x0000($a1) ## 00000000 -/* 00138 80A4BDD8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 0013C 80A4BDDC 46003083 */ div.s $f2, $f6, $f0 -/* 00140 80A4BDE0 46024282 */ mul.s $f10, $f8, $f2 -/* 00144 80A4BDE4 E4CA0000 */ swc1 $f10, 0x0000($a2) ## 00000000 -/* 00148 80A4BDE8 C4B00004 */ lwc1 $f16, 0x0004($a1) ## 00000004 -/* 0014C 80A4BDEC 46028482 */ mul.s $f18, $f16, $f2 -/* 00150 80A4BDF0 E4D20004 */ swc1 $f18, 0x0004($a2) ## 00000004 -/* 00154 80A4BDF4 C4A40008 */ lwc1 $f4, 0x0008($a1) ## 00000008 -/* 00158 80A4BDF8 46022182 */ mul.s $f6, $f4, $f2 -/* 0015C 80A4BDFC E4C60008 */ swc1 $f6, 0x0008($a2) ## 00000008 -.L80A4BE00: -/* 00160 80A4BE00 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00164 80A4BE04 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00168 80A4BE08 03E00008 */ jr $ra -/* 0016C 80A4BE0C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BE10.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BE10.s deleted file mode 100644 index 6124399396..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BE10.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80A4BE10 -/* 00170 80A4BE10 84AE00A4 */ lh $t6, 0x00A4($a1) ## 000000A4 -/* 00174 80A4BE14 24010055 */ addiu $at, $zero, 0x0055 ## $at = 00000055 -/* 00178 80A4BE18 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 0017C 80A4BE1C 15C10007 */ bne $t6, $at, .L80A4BE3C -/* 00180 80A4BE20 3C098016 */ lui $t1, %hi(gGameInfo) -/* 00184 80A4BE24 A08F01D2 */ sb $t7, 0x01D2($a0) ## 000001D2 -/* 00188 80A4BE28 3C198016 */ lui $t9, %hi(gGameInfo) -/* 0018C 80A4BE2C 8F39FA90 */ lw $t9, %lo(gGameInfo)($t9) -/* 00190 80A4BE30 24180398 */ addiu $t8, $zero, 0x0398 ## $t8 = 00000398 -/* 00194 80A4BE34 03E00008 */ jr $ra -/* 00198 80A4BE38 A738116C */ sh $t8, 0x116C($t9) ## 8016116C -.L80A4BE3C: -/* 0019C 80A4BE3C A08001D2 */ sb $zero, 0x01D2($a0) ## 000001D2 -/* 001A0 80A4BE40 8D29FA90 */ lw $t1, %lo(gGameInfo)($t1) -/* 001A4 80A4BE44 240803E8 */ addiu $t0, $zero, 0x03E8 ## $t0 = 000003E8 -/* 001A8 80A4BE48 A528116C */ sh $t0, 0x116C($t1) ## 8016116C -/* 001AC 80A4BE4C 03E00008 */ jr $ra -/* 001B0 80A4BE50 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BE54.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BE54.s deleted file mode 100644 index e9c53a699e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BE54.s +++ /dev/null @@ -1,55 +0,0 @@ -glabel func_80A4BE54 -/* 001B4 80A4BE54 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 001B8 80A4BE58 AFBF0014 */ sw $ra, 0x0014($sp) -/* 001BC 80A4BE5C AFA50034 */ sw $a1, 0x0034($sp) -/* 001C0 80A4BE60 8498001C */ lh $t8, 0x001C($a0) ## 0000001C -/* 001C4 80A4BE64 3C0F0001 */ lui $t7, 0x0001 ## $t7 = 00010000 -/* 001C8 80A4BE68 01E57821 */ addu $t7, $t7, $a1 -/* 001CC 80A4BE6C 8DEF1E08 */ lw $t7, 0x1E08($t7) ## 00011E08 -/* 001D0 80A4BE70 331900FF */ andi $t9, $t8, 0x00FF ## $t9 = 00000000 -/* 001D4 80A4BE74 001940C0 */ sll $t0, $t9, 3 -/* 001D8 80A4BE78 01E83021 */ addu $a2, $t7, $t0 -/* 001DC 80A4BE7C 8CC30004 */ lw $v1, 0x0004($a2) ## 00000004 -/* 001E0 80A4BE80 849801CE */ lh $t8, 0x01CE($a0) ## 000001CE -/* 001E4 80A4BE84 3C0C8016 */ lui $t4, %hi(gSegments) -/* 001E8 80A4BE88 00034900 */ sll $t1, $v1, 4 -/* 001EC 80A4BE8C 00095702 */ srl $t2, $t1, 28 -/* 001F0 80A4BE90 000A5880 */ sll $t3, $t2, 2 -/* 001F4 80A4BE94 018B6021 */ addu $t4, $t4, $t3 -/* 001F8 80A4BE98 8D8C6FA8 */ lw $t4, %lo(gSegments)($t4) -/* 001FC 80A4BE9C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00200 80A4BEA0 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00204 80A4BEA4 0018C880 */ sll $t9, $t8, 2 -/* 00208 80A4BEA8 00616824 */ and $t5, $v1, $at -/* 0020C 80A4BEAC 0338C823 */ subu $t9, $t9, $t8 -/* 00210 80A4BEB0 0019C840 */ sll $t9, $t9, 1 -/* 00214 80A4BEB4 018D7021 */ addu $t6, $t4, $t5 -/* 00218 80A4BEB8 01D91021 */ addu $v0, $t6, $t9 -/* 0021C 80A4BEBC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00220 80A4BEC0 00411021 */ addu $v0, $v0, $at -/* 00224 80A4BEC4 844F0000 */ lh $t7, 0x0000($v0) ## 00000000 -/* 00228 80A4BEC8 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 0022C 80A4BECC 24840024 */ addiu $a0, $a0, 0x0024 ## $a0 = 00000024 -/* 00230 80A4BED0 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 00234 80A4BED4 27A5001C */ addiu $a1, $sp, 0x001C ## $a1 = FFFFFFEC -/* 00238 80A4BED8 468021A0 */ cvt.s.w $f6, $f4 -/* 0023C 80A4BEDC E7A6001C */ swc1 $f6, 0x001C($sp) -/* 00240 80A4BEE0 84480002 */ lh $t0, 0x0002($v0) ## 00000002 -/* 00244 80A4BEE4 44884000 */ mtc1 $t0, $f8 ## $f8 = 0.00 -/* 00248 80A4BEE8 00000000 */ nop -/* 0024C 80A4BEEC 468042A0 */ cvt.s.w $f10, $f8 -/* 00250 80A4BEF0 E7AA0020 */ swc1 $f10, 0x0020($sp) -/* 00254 80A4BEF4 84490004 */ lh $t1, 0x0004($v0) ## 00000004 -/* 00258 80A4BEF8 AFA70030 */ sw $a3, 0x0030($sp) -/* 0025C 80A4BEFC 44898000 */ mtc1 $t1, $f16 ## $f16 = 0.00 -/* 00260 80A4BF00 00000000 */ nop -/* 00264 80A4BF04 468084A0 */ cvt.s.w $f18, $f16 -/* 00268 80A4BF08 0C01E01A */ jal Math_Vec3f_Yaw - -/* 0026C 80A4BF0C E7B20024 */ swc1 $f18, 0x0024($sp) -/* 00270 80A4BF10 8FA70030 */ lw $a3, 0x0030($sp) -/* 00274 80A4BF14 A4E20032 */ sh $v0, 0x0032($a3) ## 00000032 -/* 00278 80A4BF18 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0027C 80A4BF1C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00280 80A4BF20 03E00008 */ jr $ra -/* 00284 80A4BF24 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BF28.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BF28.s deleted file mode 100644 index afc5397f06..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BF28.s +++ /dev/null @@ -1,94 +0,0 @@ -glabel func_80A4BF28 -/* 00288 80A4BF28 8483001C */ lh $v1, 0x001C($a0) ## 0000001C -/* 0028C 80A4BF2C 848901CC */ lh $t1, 0x01CC($a0) ## 000001CC -/* 00290 80A4BF30 849901D0 */ lh $t9, 0x01D0($a0) ## 000001D0 -/* 00294 80A4BF34 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 -/* 00298 80A4BF38 01C57021 */ addu $t6, $t6, $a1 -/* 0029C 80A4BF3C 00031203 */ sra $v0, $v1, 8 -/* 002A0 80A4BF40 01394023 */ subu $t0, $t1, $t9 -/* 002A4 80A4BF44 8DCE1E08 */ lw $t6, 0x1E08($t6) ## 00011E08 -/* 002A8 80A4BF48 30420003 */ andi $v0, $v0, 0x0003 ## $v0 = 00000000 -/* 002AC 80A4BF4C 00084400 */ sll $t0, $t0, 16 -/* 002B0 80A4BF50 306F00FF */ andi $t7, $v1, 0x00FF ## $t7 = 00000000 -/* 002B4 80A4BF54 00021400 */ sll $v0, $v0, 16 -/* 002B8 80A4BF58 000FC0C0 */ sll $t8, $t7, 3 -/* 002BC 80A4BF5C 00084403 */ sra $t0, $t0, 16 -/* 002C0 80A4BF60 00021403 */ sra $v0, $v0, 16 -/* 002C4 80A4BF64 0501000C */ bgez $t0, .L80A4BF98 -/* 002C8 80A4BF68 01D83821 */ addu $a3, $t6, $t8 -/* 002CC 80A4BF6C 10400003 */ beq $v0, $zero, .L80A4BF7C -/* 002D0 80A4BF70 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 002D4 80A4BF74 54410004 */ bnel $v0, $at, .L80A4BF88 -/* 002D8 80A4BF78 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -.L80A4BF7C: -/* 002DC 80A4BF7C 10000016 */ beq $zero, $zero, .L80A4BFD8 -/* 002E0 80A4BF80 848801CA */ lh $t0, 0x01CA($a0) ## 000001CA -/* 002E4 80A4BF84 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -.L80A4BF88: -/* 002E8 80A4BF88 54410014 */ bnel $v0, $at, .L80A4BFDC -/* 002EC 80A4BF8C 240A0006 */ addiu $t2, $zero, 0x0006 ## $t2 = 00000006 -/* 002F0 80A4BF90 10000011 */ beq $zero, $zero, .L80A4BFD8 -/* 002F4 80A4BF94 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -.L80A4BF98: -/* 002F8 80A4BF98 848301CA */ lh $v1, 0x01CA($a0) ## 000001CA -/* 002FC 80A4BF9C 0068082A */ slt $at, $v1, $t0 -/* 00300 80A4BFA0 5020000E */ beql $at, $zero, .L80A4BFDC -/* 00304 80A4BFA4 240A0006 */ addiu $t2, $zero, 0x0006 ## $t2 = 00000006 -/* 00308 80A4BFA8 10400003 */ beq $v0, $zero, .L80A4BFB8 -/* 0030C 80A4BFAC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00310 80A4BFB0 54410004 */ bnel $v0, $at, .L80A4BFC4 -/* 00314 80A4BFB4 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -.L80A4BFB8: -/* 00318 80A4BFB8 10000007 */ beq $zero, $zero, .L80A4BFD8 -/* 0031C 80A4BFBC 00004025 */ or $t0, $zero, $zero ## $t0 = 00000000 -/* 00320 80A4BFC0 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -.L80A4BFC4: -/* 00324 80A4BFC4 54410005 */ bnel $v0, $at, .L80A4BFDC -/* 00328 80A4BFC8 240A0006 */ addiu $t2, $zero, 0x0006 ## $t2 = 00000006 -/* 0032C 80A4BFCC 2468FFFF */ addiu $t0, $v1, 0xFFFF ## $t0 = FFFFFFFF -/* 00330 80A4BFD0 00084400 */ sll $t0, $t0, 16 -/* 00334 80A4BFD4 00084403 */ sra $t0, $t0, 16 -.L80A4BFD8: -/* 00338 80A4BFD8 240A0006 */ addiu $t2, $zero, 0x0006 ## $t2 = 00000006 -.L80A4BFDC: -/* 0033C 80A4BFDC 012A0019 */ multu $t1, $t2 -/* 00340 80A4BFE0 8CE30004 */ lw $v1, 0x0004($a3) ## 00000004 -/* 00344 80A4BFE4 3C0F8016 */ lui $t7, %hi(gSegments) -/* 00348 80A4BFE8 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 0034C 80A4BFEC 00035900 */ sll $t3, $v1, 4 -/* 00350 80A4BFF0 000B6702 */ srl $t4, $t3, 28 -/* 00354 80A4BFF4 000C6880 */ sll $t5, $t4, 2 -/* 00358 80A4BFF8 01ED7821 */ addu $t7, $t7, $t5 -/* 0035C 80A4BFFC 8DEF6FA8 */ lw $t7, %lo(gSegments)($t7) -/* 00360 80A4C000 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00364 80A4C004 0000C012 */ mflo $t8 -/* 00368 80A4C008 00617024 */ and $t6, $v1, $at -/* 0036C 80A4C00C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00370 80A4C010 010A0019 */ multu $t0, $t2 -/* 00374 80A4C014 01EE2021 */ addu $a0, $t7, $t6 -/* 00378 80A4C018 00812021 */ addu $a0, $a0, $at -/* 0037C 80A4C01C 00981021 */ addu $v0, $a0, $t8 -/* 00380 80A4C020 844B0000 */ lh $t3, 0x0000($v0) ## 00000000 -/* 00384 80A4C024 0000C812 */ mflo $t9 -/* 00388 80A4C028 00992821 */ addu $a1, $a0, $t9 -/* 0038C 80A4C02C 84AC0000 */ lh $t4, 0x0000($a1) ## 00000000 -/* 00390 80A4C030 016C6823 */ subu $t5, $t3, $t4 -/* 00394 80A4C034 448D2000 */ mtc1 $t5, $f4 ## $f4 = 0.00 -/* 00398 80A4C038 00000000 */ nop -/* 0039C 80A4C03C 468021A0 */ cvt.s.w $f6, $f4 -/* 003A0 80A4C040 E4C60000 */ swc1 $f6, 0x0000($a2) ## 00000000 -/* 003A4 80A4C044 844F0000 */ lh $t7, 0x0000($v0) ## 00000000 -/* 003A8 80A4C048 84AE0002 */ lh $t6, 0x0002($a1) ## 00000002 -/* 003AC 80A4C04C 01EEC023 */ subu $t8, $t7, $t6 -/* 003B0 80A4C050 44984000 */ mtc1 $t8, $f8 ## $f8 = 0.00 -/* 003B4 80A4C054 00000000 */ nop -/* 003B8 80A4C058 468042A0 */ cvt.s.w $f10, $f8 -/* 003BC 80A4C05C E4CA0004 */ swc1 $f10, 0x0004($a2) ## 00000004 -/* 003C0 80A4C060 84AB0004 */ lh $t3, 0x0004($a1) ## 00000004 -/* 003C4 80A4C064 84590000 */ lh $t9, 0x0000($v0) ## 00000000 -/* 003C8 80A4C068 032B6023 */ subu $t4, $t9, $t3 -/* 003CC 80A4C06C 448C8000 */ mtc1 $t4, $f16 ## $f16 = 0.00 -/* 003D0 80A4C070 00000000 */ nop -/* 003D4 80A4C074 468084A0 */ cvt.s.w $f18, $f16 -/* 003D8 80A4C078 03E00008 */ jr $ra -/* 003DC 80A4C07C E4D20008 */ swc1 $f18, 0x0008($a2) ## 00000008 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C080.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C080.s deleted file mode 100644 index 5c913e3a78..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C080.s +++ /dev/null @@ -1,52 +0,0 @@ -glabel func_80A4C080 -/* 003E0 80A4C080 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 003E4 80A4C084 848301CE */ lh $v1, 0x01CE($a0) ## 000001CE -/* 003E8 80A4C088 00021203 */ sra $v0, $v0, 8 -/* 003EC 80A4C08C 30420003 */ andi $v0, $v0, 0x0003 ## $v0 = 00000000 -/* 003F0 80A4C090 00021400 */ sll $v0, $v0, 16 -/* 003F4 80A4C094 04610012 */ bgez $v1, .L80A4C0E0 -/* 003F8 80A4C098 00021403 */ sra $v0, $v0, 16 -/* 003FC 80A4C09C 10400003 */ beq $v0, $zero, .L80A4C0AC -/* 00400 80A4C0A0 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 00404 80A4C0A4 14430008 */ bne $v0, $v1, .L80A4C0C8 -/* 00408 80A4C0A8 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -.L80A4C0AC: -/* 0040C 80A4C0AC 848501CA */ lh $a1, 0x01CA($a0) ## 000001CA -/* 00410 80A4C0B0 240FFFFF */ addiu $t7, $zero, 0xFFFF ## $t7 = FFFFFFFF -/* 00414 80A4C0B4 A48F01D0 */ sh $t7, 0x01D0($a0) ## 000001D0 -/* 00418 80A4C0B8 24AEFFFF */ addiu $t6, $a1, 0xFFFF ## $t6 = FFFFFFFF -/* 0041C 80A4C0BC A48E01CE */ sh $t6, 0x01CE($a0) ## 000001CE -/* 00420 80A4C0C0 03E00008 */ jr $ra -/* 00424 80A4C0C4 A48501CC */ sh $a1, 0x01CC($a0) ## 000001CC -.L80A4C0C8: -/* 00428 80A4C0C8 14410018 */ bne $v0, $at, .L80A4C12C -/* 0042C 80A4C0CC 00000000 */ nop -/* 00430 80A4C0D0 A48001CC */ sh $zero, 0x01CC($a0) ## 000001CC -/* 00434 80A4C0D4 A48301CE */ sh $v1, 0x01CE($a0) ## 000001CE -/* 00438 80A4C0D8 03E00008 */ jr $ra -/* 0043C 80A4C0DC A48301D0 */ sh $v1, 0x01D0($a0) ## 000001D0 -.L80A4C0E0: -/* 00440 80A4C0E0 848501CA */ lh $a1, 0x01CA($a0) ## 000001CA -/* 00444 80A4C0E4 00A3082A */ slt $at, $a1, $v1 -/* 00448 80A4C0E8 10200010 */ beq $at, $zero, .L80A4C12C -/* 0044C 80A4C0EC 00000000 */ nop -/* 00450 80A4C0F0 10400003 */ beq $v0, $zero, .L80A4C100 -/* 00454 80A4C0F4 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 00458 80A4C0F8 14430006 */ bne $v0, $v1, .L80A4C114 -/* 0045C 80A4C0FC 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -.L80A4C100: -/* 00460 80A4C100 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 00464 80A4C104 A48001CC */ sh $zero, 0x01CC($a0) ## 000001CC -/* 00468 80A4C108 A48301CE */ sh $v1, 0x01CE($a0) ## 000001CE -/* 0046C 80A4C10C 03E00008 */ jr $ra -/* 00470 80A4C110 A48301D0 */ sh $v1, 0x01D0($a0) ## 000001D0 -.L80A4C114: -/* 00474 80A4C114 14410005 */ bne $v0, $at, .L80A4C12C -/* 00478 80A4C118 24B8FFFF */ addiu $t8, $a1, 0xFFFF ## $t8 = FFFFFFFF -/* 0047C 80A4C11C 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF -/* 00480 80A4C120 A48501CC */ sh $a1, 0x01CC($a0) ## 000001CC -/* 00484 80A4C124 A49801CE */ sh $t8, 0x01CE($a0) ## 000001CE -/* 00488 80A4C128 A49901D0 */ sh $t9, 0x01D0($a0) ## 000001D0 -.L80A4C12C: -/* 0048C 80A4C12C 03E00008 */ jr $ra -/* 00490 80A4C130 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C134.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C134.s deleted file mode 100644 index 2325a0a98f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C134.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_80A4C134 -/* 00494 80A4C134 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00498 80A4C138 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0049C 80A4C13C 848201CE */ lh $v0, 0x01CE($a0) ## 000001CE -/* 004A0 80A4C140 848E01D0 */ lh $t6, 0x01D0($a0) ## 000001D0 -/* 004A4 80A4C144 A48201CC */ sh $v0, 0x01CC($a0) ## 000001CC -/* 004A8 80A4C148 004E7821 */ addu $t7, $v0, $t6 -/* 004AC 80A4C14C 0C293020 */ jal func_80A4C080 -/* 004B0 80A4C150 A48F01CE */ sh $t7, 0x01CE($a0) ## 000001CE -/* 004B4 80A4C154 8FBF0014 */ lw $ra, 0x0014($sp) -/* 004B8 80A4C158 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 004BC 80A4C15C 03E00008 */ jr $ra -/* 004C0 80A4C160 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C164.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C164.s deleted file mode 100644 index b9c0abccf9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C164.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80A4C164 -/* 004C4 80A4C164 848E01D0 */ lh $t6, 0x01D0($a0) ## 000001D0 -/* 004C8 80A4C168 848201CE */ lh $v0, 0x01CE($a0) ## 000001CE -/* 004CC 80A4C16C 000E7823 */ subu $t7, $zero, $t6 -/* 004D0 80A4C170 A48F01D0 */ sh $t7, 0x01D0($a0) ## 000001D0 -/* 004D4 80A4C174 849801D0 */ lh $t8, 0x01D0($a0) ## 000001D0 -/* 004D8 80A4C178 A48201CC */ sh $v0, 0x01CC($a0) ## 000001CC -/* 004DC 80A4C17C 0058C821 */ addu $t9, $v0, $t8 -/* 004E0 80A4C180 03E00008 */ jr $ra -/* 004E4 80A4C184 A49901CE */ sh $t9, 0x01CE($a0) ## 000001CE diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C188.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C188.s deleted file mode 100644 index 86756dd4c9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C188.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80A4C188 -/* 004E8 80A4C188 848F001C */ lh $t7, 0x001C($a0) ## 0000001C -/* 004EC 80A4C18C 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 -/* 004F0 80A4C190 01C57021 */ addu $t6, $t6, $a1 -/* 004F4 80A4C194 8DCE1E08 */ lw $t6, 0x1E08($t6) ## 00011E08 -/* 004F8 80A4C198 31F800FF */ andi $t8, $t7, 0x00FF ## $t8 = 00000000 -/* 004FC 80A4C19C 0018C8C0 */ sll $t9, $t8, 3 -/* 00500 80A4C1A0 01D94021 */ addu $t0, $t6, $t9 -/* 00504 80A4C1A4 91090000 */ lbu $t1, 0x0000($t0) ## 00000000 -/* 00508 80A4C1A8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 0050C 80A4C1AC A48001CC */ sh $zero, 0x01CC($a0) ## 000001CC -/* 00510 80A4C1B0 252AFFFF */ addiu $t2, $t1, 0xFFFF ## $t2 = FFFFFFFF -/* 00514 80A4C1B4 A48A01CA */ sh $t2, 0x01CA($a0) ## 000001CA -/* 00518 80A4C1B8 A48201CE */ sh $v0, 0x01CE($a0) ## 000001CE -/* 0051C 80A4C1BC 03E00008 */ jr $ra -/* 00520 80A4C1C0 A48201D0 */ sh $v0, 0x01D0($a0) ## 000001D0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C1C4.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C1C4.s deleted file mode 100644 index b8503682fc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C1C4.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_80A4C1C4 -/* 00524 80A4C1C4 848F001C */ lh $t7, 0x001C($a0) ## 0000001C -/* 00528 80A4C1C8 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 -/* 0052C 80A4C1CC 01C57021 */ addu $t6, $t6, $a1 -/* 00530 80A4C1D0 8DCE1E08 */ lw $t6, 0x1E08($t6) ## 00011E08 -/* 00534 80A4C1D4 31F800FF */ andi $t8, $t7, 0x00FF ## $t8 = 00000000 -/* 00538 80A4C1D8 0018C8C0 */ sll $t9, $t8, 3 -/* 0053C 80A4C1DC 01D91021 */ addu $v0, $t6, $t9 -/* 00540 80A4C1E0 8C470004 */ lw $a3, 0x0004($v0) ## 00000004 -/* 00544 80A4C1E4 3C0B8016 */ lui $t3, %hi(gSegments) -/* 00548 80A4C1E8 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 0054C 80A4C1EC 00074100 */ sll $t0, $a3, 4 -/* 00550 80A4C1F0 00084F02 */ srl $t1, $t0, 28 -/* 00554 80A4C1F4 00095080 */ sll $t2, $t1, 2 -/* 00558 80A4C1F8 016A5821 */ addu $t3, $t3, $t2 -/* 0055C 80A4C1FC 8D6B6FA8 */ lw $t3, %lo(gSegments)($t3) -/* 00560 80A4C200 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00564 80A4C204 00067880 */ sll $t7, $a2, 2 -/* 00568 80A4C208 01E67823 */ subu $t7, $t7, $a2 -/* 0056C 80A4C20C 00E16024 */ and $t4, $a3, $at -/* 00570 80A4C210 000F7840 */ sll $t7, $t7, 1 -/* 00574 80A4C214 016C6821 */ addu $t5, $t3, $t4 -/* 00578 80A4C218 01AF1821 */ addu $v1, $t5, $t7 -/* 0057C 80A4C21C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00580 80A4C220 00611821 */ addu $v1, $v1, $at -/* 00584 80A4C224 84780000 */ lh $t8, 0x0000($v1) ## 00000000 -/* 00588 80A4C228 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 0058C 80A4C22C 00000000 */ nop -/* 00590 80A4C230 468021A0 */ cvt.s.w $f6, $f4 -/* 00594 80A4C234 E4860024 */ swc1 $f6, 0x0024($a0) ## 00000024 -/* 00598 80A4C238 846E0002 */ lh $t6, 0x0002($v1) ## 00000002 -/* 0059C 80A4C23C 448E4000 */ mtc1 $t6, $f8 ## $f8 = 0.00 -/* 005A0 80A4C240 00000000 */ nop -/* 005A4 80A4C244 468042A0 */ cvt.s.w $f10, $f8 -/* 005A8 80A4C248 E48A0028 */ swc1 $f10, 0x0028($a0) ## 00000028 -/* 005AC 80A4C24C 84790004 */ lh $t9, 0x0004($v1) ## 00000004 -/* 005B0 80A4C250 44998000 */ mtc1 $t9, $f16 ## $f16 = 0.00 -/* 005B4 80A4C254 00000000 */ nop -/* 005B8 80A4C258 468084A0 */ cvt.s.w $f18, $f16 -/* 005BC 80A4C25C 03E00008 */ jr $ra -/* 005C0 80A4C260 E492002C */ swc1 $f18, 0x002C($a0) ## 0000002C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C264.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C264.s deleted file mode 100644 index a57d375c43..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C264.s +++ /dev/null @@ -1,7 +0,0 @@ -glabel func_80A4C264 -/* 005C4 80A4C264 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 005C8 80A4C268 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 005CC 80A4C26C 00000000 */ nop -/* 005D0 80A4C270 E48001B0 */ swc1 $f0, 0x01B0($a0) ## 000001B0 -/* 005D4 80A4C274 03E00008 */ jr $ra -/* 005D8 80A4C278 E48001C0 */ swc1 $f0, 0x01C0($a0) ## 000001C0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C27C.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C27C.s deleted file mode 100644 index 4867322334..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C27C.s +++ /dev/null @@ -1,94 +0,0 @@ -.rdata -glabel D_80A4DF30 - .asciz "Error : レールデータ不正(点が重なっている)" - .balign 4 - -glabel D_80A4DF5C - .asciz "(%s %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_80A4DF78 - .asciz "../z_en_gr.c" - .balign 4 - -.text -glabel func_80A4C27C -/* 005DC 80A4C27C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 005E0 80A4C280 AFBF0014 */ sw $ra, 0x0014($sp) -/* 005E4 80A4C284 848F001C */ lh $t7, 0x001C($a0) ## 0000001C -/* 005E8 80A4C288 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 -/* 005EC 80A4C28C 01C57021 */ addu $t6, $t6, $a1 -/* 005F0 80A4C290 8DCE1E08 */ lw $t6, 0x1E08($t6) ## 00011E08 -/* 005F4 80A4C294 31F800FF */ andi $t8, $t7, 0x00FF ## $t8 = 00000000 -/* 005F8 80A4C298 0018C8C0 */ sll $t9, $t8, 3 -/* 005FC 80A4C29C 01D93021 */ addu $a2, $t6, $t9 -/* 00600 80A4C2A0 848E01CE */ lh $t6, 0x01CE($a0) ## 000001CE -/* 00604 80A4C2A4 240A0006 */ addiu $t2, $zero, 0x0006 ## $t2 = 00000006 -/* 00608 80A4C2A8 8CC20004 */ lw $v0, 0x0004($a2) ## 00000004 -/* 0060C 80A4C2AC 01CA0019 */ multu $t6, $t2 -/* 00610 80A4C2B0 3C0F8016 */ lui $t7, %hi(gSegments) -/* 00614 80A4C2B4 00025900 */ sll $t3, $v0, 4 -/* 00618 80A4C2B8 000B6702 */ srl $t4, $t3, 28 -/* 0061C 80A4C2BC 848B01CC */ lh $t3, 0x01CC($a0) ## 000001CC -/* 00620 80A4C2C0 000C6880 */ sll $t5, $t4, 2 -/* 00624 80A4C2C4 01ED7821 */ addu $t7, $t7, $t5 -/* 00628 80A4C2C8 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 0062C 80A4C2CC 8DEF6FA8 */ lw $t7, %lo(gSegments)($t7) -/* 00630 80A4C2D0 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00634 80A4C2D4 0000C812 */ mflo $t9 -/* 00638 80A4C2D8 0041C024 */ and $t8, $v0, $at -/* 0063C 80A4C2DC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00640 80A4C2E0 016A0019 */ multu $t3, $t2 -/* 00644 80A4C2E4 01F81821 */ addu $v1, $t7, $t8 -/* 00648 80A4C2E8 00611821 */ addu $v1, $v1, $at -/* 0064C 80A4C2EC 00794021 */ addu $t0, $v1, $t9 -/* 00650 80A4C2F0 850F0000 */ lh $t7, 0x0000($t0) ## 00000000 -/* 00654 80A4C2F4 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00658 80A4C2F8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0065C 80A4C2FC 00006012 */ mflo $t4 -/* 00660 80A4C300 006C4821 */ addu $t1, $v1, $t4 -/* 00664 80A4C304 852D0000 */ lh $t5, 0x0000($t1) ## 00000000 -/* 00668 80A4C308 15AF0022 */ bne $t5, $t7, .L80A4C394 -/* 0066C 80A4C30C 00000000 */ nop -/* 00670 80A4C310 85380004 */ lh $t8, 0x0004($t1) ## 00000004 -/* 00674 80A4C314 850E0004 */ lh $t6, 0x0004($t0) ## 00000004 -/* 00678 80A4C318 170E001E */ bne $t8, $t6, .L80A4C394 -/* 0067C 80A4C31C 00000000 */ nop -/* 00680 80A4C320 85220002 */ lh $v0, 0x0002($t1) ## 00000002 -/* 00684 80A4C324 85030002 */ lh $v1, 0x0002($t0) ## 00000002 -/* 00688 80A4C328 3C0480A5 */ lui $a0, %hi(D_80A4DF30) ## $a0 = 80A50000 -/* 0068C 80A4C32C 2484DF30 */ addiu $a0, $a0, %lo(D_80A4DF30) ## $a0 = 80A4DF30 -/* 00690 80A4C330 54430012 */ bnel $v0, $v1, .L80A4C37C -/* 00694 80A4C334 0043082A */ slt $at, $v0, $v1 -/* 00698 80A4C338 AFA70028 */ sw $a3, 0x0028($sp) -/* 0069C 80A4C33C AFA8001C */ sw $t0, 0x001C($sp) -/* 006A0 80A4C340 0C00084C */ jal osSyncPrintf - -/* 006A4 80A4C344 AFA90018 */ sw $t1, 0x0018($sp) -/* 006A8 80A4C348 8FB90028 */ lw $t9, 0x0028($sp) -/* 006AC 80A4C34C 3C0480A5 */ lui $a0, %hi(D_80A4DF5C) ## $a0 = 80A50000 -/* 006B0 80A4C350 3C0580A5 */ lui $a1, %hi(D_80A4DF78) ## $a1 = 80A50000 -/* 006B4 80A4C354 24A5DF78 */ addiu $a1, $a1, %lo(D_80A4DF78) ## $a1 = 80A4DF78 -/* 006B8 80A4C358 2484DF5C */ addiu $a0, $a0, %lo(D_80A4DF5C) ## $a0 = 80A4DF5C -/* 006BC 80A4C35C 2406022F */ addiu $a2, $zero, 0x022F ## $a2 = 0000022F -/* 006C0 80A4C360 0C00084C */ jal osSyncPrintf - -/* 006C4 80A4C364 8727001C */ lh $a3, 0x001C($t9) ## 0000001C -/* 006C8 80A4C368 8FA8001C */ lw $t0, 0x001C($sp) -/* 006CC 80A4C36C 8FA90018 */ lw $t1, 0x0018($sp) -/* 006D0 80A4C370 85030002 */ lh $v1, 0x0002($t0) ## 00000002 -/* 006D4 80A4C374 85220002 */ lh $v0, 0x0002($t1) ## 00000002 -/* 006D8 80A4C378 0043082A */ slt $at, $v0, $v1 -.L80A4C37C: -/* 006DC 80A4C37C 10200003 */ beq $at, $zero, .L80A4C38C -/* 006E0 80A4C380 00000000 */ nop -/* 006E4 80A4C384 10000003 */ beq $zero, $zero, .L80A4C394 -/* 006E8 80A4C388 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A4C38C: -/* 006EC 80A4C38C 10000001 */ beq $zero, $zero, .L80A4C394 -/* 006F0 80A4C390 2402FFFF */ addiu $v0, $zero, 0xFFFF ## $v0 = FFFFFFFF -.L80A4C394: -/* 006F4 80A4C394 8FBF0014 */ lw $ra, 0x0014($sp) -/* 006F8 80A4C398 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 006FC 80A4C39C 03E00008 */ jr $ra -/* 00700 80A4C3A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C3A4.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C3A4.s deleted file mode 100644 index ec613d52a4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C3A4.s +++ /dev/null @@ -1,133 +0,0 @@ -glabel func_80A4C3A4 -/* 00704 80A4C3A4 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 -/* 00708 80A4C3A8 F7BE0040 */ sdc1 $f30, 0x0040($sp) -/* 0070C 80A4C3AC 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00710 80A4C3B0 4481F000 */ mtc1 $at, $f30 ## $f30 = 20.00 -/* 00714 80A4C3B4 F7BC0038 */ sdc1 $f28, 0x0038($sp) -/* 00718 80A4C3B8 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 0071C 80A4C3BC 4481E000 */ mtc1 $at, $f28 ## $f28 = 30.00 -/* 00720 80A4C3C0 F7BA0030 */ sdc1 $f26, 0x0030($sp) -/* 00724 80A4C3C4 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 00728 80A4C3C8 4481D000 */ mtc1 $at, $f26 ## $f26 = 40.00 -/* 0072C 80A4C3CC F7B80028 */ sdc1 $f24, 0x0028($sp) -/* 00730 80A4C3D0 3C01423C */ lui $at, 0x423C ## $at = 423C0000 -/* 00734 80A4C3D4 4481C000 */ mtc1 $at, $f24 ## $f24 = 47.00 -/* 00738 80A4C3D8 AFB60064 */ sw $s6, 0x0064($sp) -/* 0073C 80A4C3DC AFB50060 */ sw $s5, 0x0060($sp) -/* 00740 80A4C3E0 F7B60020 */ sdc1 $f22, 0x0020($sp) -/* 00744 80A4C3E4 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00748 80A4C3E8 AFB70068 */ sw $s7, 0x0068($sp) -/* 0074C 80A4C3EC AFB4005C */ sw $s4, 0x005C($sp) -/* 00750 80A4C3F0 AFB30058 */ sw $s3, 0x0058($sp) -/* 00754 80A4C3F4 AFB20054 */ sw $s2, 0x0054($sp) -/* 00758 80A4C3F8 AFB10050 */ sw $s1, 0x0050($sp) -/* 0075C 80A4C3FC AFB0004C */ sw $s0, 0x004C($sp) -/* 00760 80A4C400 3C1580A5 */ lui $s5, %hi(D_80A4DECC) ## $s5 = 80A50000 -/* 00764 80A4C404 3C1680A5 */ lui $s6, %hi(D_80A4DED8) ## $s6 = 80A50000 -/* 00768 80A4C408 4481B000 */ mtc1 $at, $f22 ## $f22 = 0.50 -/* 0076C 80A4C40C 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 00770 80A4C410 00809825 */ or $s3, $a0, $zero ## $s3 = 00000000 -/* 00774 80A4C414 AFBF006C */ sw $ra, 0x006C($sp) -/* 00778 80A4C418 F7B40018 */ sdc1 $f20, 0x0018($sp) -/* 0077C 80A4C41C 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 -/* 00780 80A4C420 26D6DED8 */ addiu $s6, $s6, %lo(D_80A4DED8) ## $s6 = 80A4DED8 -/* 00784 80A4C424 26B5DECC */ addiu $s5, $s5, %lo(D_80A4DECC) ## $s5 = 80A4DECC -/* 00788 80A4C428 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 -/* 0078C 80A4C42C 27B4007C */ addiu $s4, $sp, 0x007C ## $s4 = FFFFFFF4 -/* 00790 80A4C430 24170008 */ addiu $s7, $zero, 0x0008 ## $s7 = 00000008 -/* 00794 80A4C434 26104E20 */ addiu $s0, $s0, 0x4E20 ## $s0 = 00004E20 -.L80A4C438: -/* 00798 80A4C438 00108400 */ sll $s0, $s0, 16 -/* 0079C 80A4C43C 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 007A0 80A4C440 00108403 */ sra $s0, $s0, 16 -/* 007A4 80A4C444 00102400 */ sll $a0, $s0, 16 -/* 007A8 80A4C448 00042403 */ sra $a0, $a0, 16 -/* 007AC 80A4C44C 0C01DE1C */ jal Math_Sins - ## sins? -/* 007B0 80A4C450 46000506 */ mov.s $f20, $f0 -/* 007B4 80A4C454 4616A102 */ mul.s $f4, $f20, $f22 -/* 007B8 80A4C458 C6500000 */ lwc1 $f16, 0x0000($s2) ## 00000000 -/* 007BC 80A4C45C 46162180 */ add.s $f6, $f4, $f22 -/* 007C0 80A4C460 4606C202 */ mul.s $f8, $f24, $f6 -/* 007C4 80A4C464 00000000 */ nop -/* 007C8 80A4C468 46080282 */ mul.s $f10, $f0, $f8 -/* 007CC 80A4C46C 46105480 */ add.s $f18, $f10, $f16 -/* 007D0 80A4C470 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 007D4 80A4C474 E7B2007C */ swc1 $f18, 0x007C($sp) -/* 007D8 80A4C478 46160101 */ sub.s $f4, $f0, $f22 -/* 007DC 80A4C47C C6480004 */ lwc1 $f8, 0x0004($s2) ## 00000004 -/* 007E0 80A4C480 461A2182 */ mul.s $f6, $f4, $f26 -/* 007E4 80A4C484 46083280 */ add.s $f10, $f6, $f8 -/* 007E8 80A4C488 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 007EC 80A4C48C E7AA0080 */ swc1 $f10, 0x0080($sp) -/* 007F0 80A4C490 00102400 */ sll $a0, $s0, 16 -/* 007F4 80A4C494 00042403 */ sra $a0, $a0, 16 -/* 007F8 80A4C498 0C01DE0D */ jal Math_Coss - ## coss? -/* 007FC 80A4C49C 46000506 */ mov.s $f20, $f0 -/* 00800 80A4C4A0 4616A402 */ mul.s $f16, $f20, $f22 -/* 00804 80A4C4A4 C6480008 */ lwc1 $f8, 0x0008($s2) ## 00000008 -/* 00808 80A4C4A8 46168480 */ add.s $f18, $f16, $f22 -/* 0080C 80A4C4AC 4612C102 */ mul.s $f4, $f24, $f18 -/* 00810 80A4C4B0 00000000 */ nop -/* 00814 80A4C4B4 46040182 */ mul.s $f6, $f0, $f4 -/* 00818 80A4C4B8 46083280 */ add.s $f10, $f6, $f8 -/* 0081C 80A4C4BC 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00820 80A4C4C0 E7AA0084 */ swc1 $f10, 0x0084($sp) -/* 00824 80A4C4C4 461C0402 */ mul.s $f16, $f0, $f28 -/* 00828 80A4C4C8 24090050 */ addiu $t1, $zero, 0x0050 ## $t1 = 00000050 -/* 0082C 80A4C4CC AFA90014 */ sw $t1, 0x0014($sp) -/* 00830 80A4C4D0 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 00834 80A4C4D4 02802825 */ or $a1, $s4, $zero ## $a1 = FFFFFFF4 -/* 00838 80A4C4D8 02A03025 */ or $a2, $s5, $zero ## $a2 = 80A4DECC -/* 0083C 80A4C4DC 02C03825 */ or $a3, $s6, $zero ## $a3 = 80A4DED8 -/* 00840 80A4C4E0 4600848D */ trunc.w.s $f18, $f16 -/* 00844 80A4C4E4 440F9000 */ mfc1 $t7, $f18 -/* 00848 80A4C4E8 00000000 */ nop -/* 0084C 80A4C4EC 000FC400 */ sll $t8, $t7, 16 -/* 00850 80A4C4F0 0018CC03 */ sra $t9, $t8, 16 -/* 00854 80A4C4F4 27280064 */ addiu $t0, $t9, 0x0064 ## $t0 = 00000064 -/* 00858 80A4C4F8 0C00A1B3 */ jal func_800286CC -/* 0085C 80A4C4FC AFA80010 */ sw $t0, 0x0010($sp) -/* 00860 80A4C500 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00864 80A4C504 00000000 */ nop -/* 00868 80A4C508 461E0102 */ mul.s $f4, $f0, $f30 -/* 0086C 80A4C50C 240F0050 */ addiu $t7, $zero, 0x0050 ## $t7 = 00000050 -/* 00870 80A4C510 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00874 80A4C514 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 00878 80A4C518 02802825 */ or $a1, $s4, $zero ## $a1 = FFFFFFF4 -/* 0087C 80A4C51C 02A03025 */ or $a2, $s5, $zero ## $a2 = 80A4DECC -/* 00880 80A4C520 02C03825 */ or $a3, $s6, $zero ## $a3 = 80A4DED8 -/* 00884 80A4C524 4600218D */ trunc.w.s $f6, $f4 -/* 00888 80A4C528 440B3000 */ mfc1 $t3, $f6 -/* 0088C 80A4C52C 00000000 */ nop -/* 00890 80A4C530 000B6400 */ sll $t4, $t3, 16 -/* 00894 80A4C534 000C6C03 */ sra $t5, $t4, 16 -/* 00898 80A4C538 25AE0050 */ addiu $t6, $t5, 0x0050 ## $t6 = 00000050 -/* 0089C 80A4C53C 0C00A1B3 */ jal func_800286CC -/* 008A0 80A4C540 AFAE0010 */ sw $t6, 0x0010($sp) -/* 008A4 80A4C544 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 -/* 008A8 80A4C548 5637FFBB */ bnel $s1, $s7, .L80A4C438 -/* 008AC 80A4C54C 26104E20 */ addiu $s0, $s0, 0x4E20 ## $s0 = 00009C40 -/* 008B0 80A4C550 8FBF006C */ lw $ra, 0x006C($sp) -/* 008B4 80A4C554 D7B40018 */ ldc1 $f20, 0x0018($sp) -/* 008B8 80A4C558 D7B60020 */ ldc1 $f22, 0x0020($sp) -/* 008BC 80A4C55C D7B80028 */ ldc1 $f24, 0x0028($sp) -/* 008C0 80A4C560 D7BA0030 */ ldc1 $f26, 0x0030($sp) -/* 008C4 80A4C564 D7BC0038 */ ldc1 $f28, 0x0038($sp) -/* 008C8 80A4C568 D7BE0040 */ ldc1 $f30, 0x0040($sp) -/* 008CC 80A4C56C 8FB0004C */ lw $s0, 0x004C($sp) -/* 008D0 80A4C570 8FB10050 */ lw $s1, 0x0050($sp) -/* 008D4 80A4C574 8FB20054 */ lw $s2, 0x0054($sp) -/* 008D8 80A4C578 8FB30058 */ lw $s3, 0x0058($sp) -/* 008DC 80A4C57C 8FB4005C */ lw $s4, 0x005C($sp) -/* 008E0 80A4C580 8FB50060 */ lw $s5, 0x0060($sp) -/* 008E4 80A4C584 8FB60064 */ lw $s6, 0x0064($sp) -/* 008E8 80A4C588 8FB70068 */ lw $s7, 0x0068($sp) -/* 008EC 80A4C58C 03E00008 */ jr $ra -/* 008F0 80A4C590 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C594.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C594.s deleted file mode 100644 index 347db49c65..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C594.s +++ /dev/null @@ -1,81 +0,0 @@ -glabel func_80A4C594 -/* 008F4 80A4C594 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 008F8 80A4C598 F7B40018 */ sdc1 $f20, 0x0018($sp) -/* 008FC 80A4C59C 3C01425C */ lui $at, 0x425C ## $at = 425C0000 -/* 00900 80A4C5A0 AFB50038 */ sw $s5, 0x0038($sp) -/* 00904 80A4C5A4 AFB40034 */ sw $s4, 0x0034($sp) -/* 00908 80A4C5A8 AFB30030 */ sw $s3, 0x0030($sp) -/* 0090C 80A4C5AC AFB2002C */ sw $s2, 0x002C($sp) -/* 00910 80A4C5B0 AFB10028 */ sw $s1, 0x0028($sp) -/* 00914 80A4C5B4 AFB00024 */ sw $s0, 0x0024($sp) -/* 00918 80A4C5B8 4481A000 */ mtc1 $at, $f20 ## $f20 = 55.00 -/* 0091C 80A4C5BC 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 00920 80A4C5C0 0080A825 */ or $s5, $a0, $zero ## $s5 = 00000000 -/* 00924 80A4C5C4 AFBF003C */ sw $ra, 0x003C($sp) -/* 00928 80A4C5C8 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 -/* 0092C 80A4C5CC 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 -/* 00930 80A4C5D0 27B3004C */ addiu $s3, $sp, 0x004C ## $s3 = FFFFFFF4 -/* 00934 80A4C5D4 2414000B */ addiu $s4, $zero, 0x000B ## $s4 = 0000000B -/* 00938 80A4C5D8 26101746 */ addiu $s0, $s0, 0x1746 ## $s0 = 00001746 -.L80A4C5DC: -/* 0093C 80A4C5DC 00108400 */ sll $s0, $s0, 16 -/* 00940 80A4C5E0 00108403 */ sra $s0, $s0, 16 -/* 00944 80A4C5E4 00102400 */ sll $a0, $s0, 16 -/* 00948 80A4C5E8 0C01DE1C */ jal Math_Sins - ## sins? -/* 0094C 80A4C5EC 00042403 */ sra $a0, $a0, 16 -/* 00950 80A4C5F0 46140102 */ mul.s $f4, $f0, $f20 -/* 00954 80A4C5F4 C6460000 */ lwc1 $f6, 0x0000($s2) ## 00000000 -/* 00958 80A4C5F8 00102400 */ sll $a0, $s0, 16 -/* 0095C 80A4C5FC 00042403 */ sra $a0, $a0, 16 -/* 00960 80A4C600 46062200 */ add.s $f8, $f4, $f6 -/* 00964 80A4C604 E7A8004C */ swc1 $f8, 0x004C($sp) -/* 00968 80A4C608 C64A0004 */ lwc1 $f10, 0x0004($s2) ## 00000004 -/* 0096C 80A4C60C 0C01DE0D */ jal Math_Coss - ## coss? -/* 00970 80A4C610 E7AA0050 */ swc1 $f10, 0x0050($sp) -/* 00974 80A4C614 46140402 */ mul.s $f16, $f0, $f20 -/* 00978 80A4C618 C6520008 */ lwc1 $f18, 0x0008($s2) ## 00000008 -/* 0097C 80A4C61C 240E015E */ addiu $t6, $zero, 0x015E ## $t6 = 0000015E -/* 00980 80A4C620 AFAE0014 */ sw $t6, 0x0014($sp) -/* 00984 80A4C624 AFA00010 */ sw $zero, 0x0010($sp) -/* 00988 80A4C628 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 -/* 0098C 80A4C62C 02602825 */ or $a1, $s3, $zero ## $a1 = FFFFFFF4 -/* 00990 80A4C630 46128100 */ add.s $f4, $f16, $f18 -/* 00994 80A4C634 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00998 80A4C638 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0099C 80A4C63C 0C00A527 */ jal func_8002949C -/* 009A0 80A4C640 E7A40054 */ swc1 $f4, 0x0054($sp) -/* 009A4 80A4C644 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 -/* 009A8 80A4C648 5634FFE4 */ bnel $s1, $s4, .L80A4C5DC -/* 009AC 80A4C64C 26101746 */ addiu $s0, $s0, 0x1746 ## $s0 = 00002E8C -/* 009B0 80A4C650 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 -/* 009B4 80A4C654 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 009B8 80A4C658 2406012C */ addiu $a2, $zero, 0x012C ## $a2 = 0000012C -/* 009BC 80A4C65C 240702BC */ addiu $a3, $zero, 0x02BC ## $a3 = 000002BC -/* 009C0 80A4C660 0C00A511 */ jal func_80029444 -/* 009C4 80A4C664 AFA00010 */ sw $zero, 0x0010($sp) -/* 009C8 80A4C668 240F0004 */ addiu $t7, $zero, 0x0004 ## $t7 = 00000004 -/* 009CC 80A4C66C AFAF0010 */ sw $t7, 0x0010($sp) -/* 009D0 80A4C670 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 -/* 009D4 80A4C674 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 009D8 80A4C678 240601F4 */ addiu $a2, $zero, 0x01F4 ## $a2 = 000001F4 -/* 009DC 80A4C67C 0C00A511 */ jal func_80029444 -/* 009E0 80A4C680 24070384 */ addiu $a3, $zero, 0x0384 ## $a3 = 00000384 -/* 009E4 80A4C684 24180008 */ addiu $t8, $zero, 0x0008 ## $t8 = 00000008 -/* 009E8 80A4C688 AFB80010 */ sw $t8, 0x0010($sp) -/* 009EC 80A4C68C 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 -/* 009F0 80A4C690 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 009F4 80A4C694 240601F4 */ addiu $a2, $zero, 0x01F4 ## $a2 = 000001F4 -/* 009F8 80A4C698 0C00A511 */ jal func_80029444 -/* 009FC 80A4C69C 24070514 */ addiu $a3, $zero, 0x0514 ## $a3 = 00000514 -/* 00A00 80A4C6A0 8FBF003C */ lw $ra, 0x003C($sp) -/* 00A04 80A4C6A4 D7B40018 */ ldc1 $f20, 0x0018($sp) -/* 00A08 80A4C6A8 8FB00024 */ lw $s0, 0x0024($sp) -/* 00A0C 80A4C6AC 8FB10028 */ lw $s1, 0x0028($sp) -/* 00A10 80A4C6B0 8FB2002C */ lw $s2, 0x002C($sp) -/* 00A14 80A4C6B4 8FB30030 */ lw $s3, 0x0030($sp) -/* 00A18 80A4C6B8 8FB40034 */ lw $s4, 0x0034($sp) -/* 00A1C 80A4C6BC 8FB50038 */ lw $s5, 0x0038($sp) -/* 00A20 80A4C6C0 03E00008 */ jr $ra -/* 00A24 80A4C6C4 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C6C8.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C6C8.s deleted file mode 100644 index 55ebbb6a74..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C6C8.s +++ /dev/null @@ -1,92 +0,0 @@ -.late_rodata -glabel D_80A4E068 - .float 0.01 - -.text -glabel func_80A4C6C8 -/* 00A28 80A4C6C8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00A2C 80A4C6CC 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* 00A30 80A4C6D0 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* 00A34 80A4C6D4 AFBF001C */ sw $ra, 0x001C($sp) -/* 00A38 80A4C6D8 AFB00018 */ sw $s0, 0x0018($sp) -/* 00A3C 80A4C6DC AFA50034 */ sw $a1, 0x0034($sp) -/* 00A40 80A4C6E0 85CF116C */ lh $t7, 0x116C($t6) ## 8016116C -/* 00A44 80A4C6E4 3C0180A5 */ lui $at, %hi(D_80A4E068) ## $at = 80A50000 -/* 00A48 80A4C6E8 C428E068 */ lwc1 $f8, %lo(D_80A4E068)($at) -/* 00A4C 80A4C6EC 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 00A50 80A4C6F0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00A54 80A4C6F4 3C063E99 */ lui $a2, 0x3E99 ## $a2 = 3E990000 -/* 00A58 80A4C6F8 468021A0 */ cvt.s.w $f6, $f4 -/* 00A5C 80A4C6FC 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A -/* 00A60 80A4C700 24840068 */ addiu $a0, $a0, 0x0068 ## $a0 = 00000068 -/* 00A64 80A4C704 46083282 */ mul.s $f10, $f6, $f8 -/* 00A68 80A4C708 44055000 */ mfc1 $a1, $f10 -/* 00A6C 80A4C70C 0C01DE80 */ jal Math_ApproxF - -/* 00A70 80A4C710 00000000 */ nop -/* 00A74 80A4C714 0C00B61A */ jal func_8002D868 -/* 00A78 80A4C718 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A7C 80A4C71C 8FB80034 */ lw $t8, 0x0034($sp) -/* 00A80 80A4C720 8608001C */ lh $t0, 0x001C($s0) ## 0000001C -/* 00A84 80A4C724 3C190001 */ lui $t9, 0x0001 ## $t9 = 00010000 -/* 00A88 80A4C728 0338C821 */ addu $t9, $t9, $t8 -/* 00A8C 80A4C72C 8F391E08 */ lw $t9, 0x1E08($t9) ## 00011E08 -/* 00A90 80A4C730 310900FF */ andi $t1, $t0, 0x00FF ## $t1 = 00000000 -/* 00A94 80A4C734 000950C0 */ sll $t2, $t1, 3 -/* 00A98 80A4C738 032A1821 */ addu $v1, $t9, $t2 -/* 00A9C 80A4C73C 8C620004 */ lw $v0, 0x0004($v1) ## 00000004 -/* 00AA0 80A4C740 860801CE */ lh $t0, 0x01CE($s0) ## 000001CE -/* 00AA4 80A4C744 3C0E8016 */ lui $t6, %hi(gSegments) -/* 00AA8 80A4C748 00025900 */ sll $t3, $v0, 4 -/* 00AAC 80A4C74C 000B6702 */ srl $t4, $t3, 28 -/* 00AB0 80A4C750 000C6880 */ sll $t5, $t4, 2 -/* 00AB4 80A4C754 01CD7021 */ addu $t6, $t6, $t5 -/* 00AB8 80A4C758 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) -/* 00ABC 80A4C75C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00AC0 80A4C760 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00AC4 80A4C764 00084880 */ sll $t1, $t0, 2 -/* 00AC8 80A4C768 00417824 */ and $t7, $v0, $at -/* 00ACC 80A4C76C 01284823 */ subu $t1, $t1, $t0 -/* 00AD0 80A4C770 00094840 */ sll $t1, $t1, 1 -/* 00AD4 80A4C774 01CFC021 */ addu $t8, $t6, $t7 -/* 00AD8 80A4C778 03093821 */ addu $a3, $t8, $t1 -/* 00ADC 80A4C77C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00AE0 80A4C780 00E13821 */ addu $a3, $a3, $at -/* 00AE4 80A4C784 84F90000 */ lh $t9, 0x0000($a3) ## 00000000 -/* 00AE8 80A4C788 C600005C */ lwc1 $f0, 0x005C($s0) ## 0000005C -/* 00AEC 80A4C78C AFA70020 */ sw $a3, 0x0020($sp) -/* 00AF0 80A4C790 44998000 */ mtc1 $t9, $f16 ## $f16 = 0.00 -/* 00AF4 80A4C794 46000005 */ abs.s $f0, $f0 -/* 00AF8 80A4C798 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 00AFC 80A4C79C 46808420 */ cvt.s.w $f16, $f16 -/* 00B00 80A4C7A0 44060000 */ mfc1 $a2, $f0 -/* 00B04 80A4C7A4 44058000 */ mfc1 $a1, $f16 -/* 00B08 80A4C7A8 0C01DE80 */ jal Math_ApproxF - -/* 00B0C 80A4C7AC 00000000 */ nop -/* 00B10 80A4C7B0 8FA70020 */ lw $a3, 0x0020($sp) -/* 00B14 80A4C7B4 C6000064 */ lwc1 $f0, 0x0064($s0) ## 00000064 -/* 00B18 80A4C7B8 30430001 */ andi $v1, $v0, 0x0001 ## $v1 = 00000000 -/* 00B1C 80A4C7BC 84EA0004 */ lh $t2, 0x0004($a3) ## 00000004 -/* 00B20 80A4C7C0 46000005 */ abs.s $f0, $f0 -/* 00B24 80A4C7C4 AFA30028 */ sw $v1, 0x0028($sp) -/* 00B28 80A4C7C8 448A9000 */ mtc1 $t2, $f18 ## $f18 = 0.00 -/* 00B2C 80A4C7CC 44060000 */ mfc1 $a2, $f0 -/* 00B30 80A4C7D0 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C -/* 00B34 80A4C7D4 468094A0 */ cvt.s.w $f18, $f18 -/* 00B38 80A4C7D8 44059000 */ mfc1 $a1, $f18 -/* 00B3C 80A4C7DC 0C01DE80 */ jal Math_ApproxF - -/* 00B40 80A4C7E0 00000000 */ nop -/* 00B44 80A4C7E4 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 00B48 80A4C7E8 C6060060 */ lwc1 $f6, 0x0060($s0) ## 00000060 -/* 00B4C 80A4C7EC 8FA30028 */ lw $v1, 0x0028($sp) -/* 00B50 80A4C7F0 46062200 */ add.s $f8, $f4, $f6 -/* 00B54 80A4C7F4 00621824 */ and $v1, $v1, $v0 -/* 00B58 80A4C7F8 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -/* 00B5C 80A4C7FC E6080028 */ swc1 $f8, 0x0028($s0) ## 00000028 -/* 00B60 80A4C800 8FBF001C */ lw $ra, 0x001C($sp) -/* 00B64 80A4C804 8FB00018 */ lw $s0, 0x0018($sp) -/* 00B68 80A4C808 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00B6C 80A4C80C 03E00008 */ jr $ra -/* 00B70 80A4C810 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C814.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C814.s deleted file mode 100644 index 927383981f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C814.s +++ /dev/null @@ -1,156 +0,0 @@ -.late_rodata -glabel D_80A4E06C - .float 0.01 - -.text -glabel func_80A4C814 -/* 00B74 80A4C814 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 00B78 80A4C818 AFBF001C */ sw $ra, 0x001C($sp) -/* 00B7C 80A4C81C AFB00018 */ sw $s0, 0x0018($sp) -/* 00B80 80A4C820 AFA5005C */ sw $a1, 0x005C($sp) -/* 00B84 80A4C824 8498001C */ lh $t8, 0x001C($a0) ## 0000001C -/* 00B88 80A4C828 3C0F0001 */ lui $t7, 0x0001 ## $t7 = 00010000 -/* 00B8C 80A4C82C 01E57821 */ addu $t7, $t7, $a1 -/* 00B90 80A4C830 8DEF1E08 */ lw $t7, 0x1E08($t7) ## 00011E08 -/* 00B94 80A4C834 331900FF */ andi $t9, $t8, 0x00FF ## $t9 = 00000000 -/* 00B98 80A4C838 001958C0 */ sll $t3, $t9, 3 -/* 00B9C 80A4C83C 01EB4021 */ addu $t0, $t7, $t3 -/* 00BA0 80A4C840 848F01CE */ lh $t7, 0x01CE($a0) ## 000001CE -/* 00BA4 80A4C844 8D030004 */ lw $v1, 0x0004($t0) ## 00000004 -/* 00BA8 80A4C848 240A0006 */ addiu $t2, $zero, 0x0006 ## $t2 = 00000006 -/* 00BAC 80A4C84C 01EA0019 */ multu $t7, $t2 -/* 00BB0 80A4C850 00036100 */ sll $t4, $v1, 4 -/* 00BB4 80A4C854 000C6F02 */ srl $t5, $t4, 28 -/* 00BB8 80A4C858 000D7080 */ sll $t6, $t5, 2 -/* 00BBC 80A4C85C 3C188016 */ lui $t8, %hi(gSegments) -/* 00BC0 80A4C860 030EC021 */ addu $t8, $t8, $t6 -/* 00BC4 80A4C864 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00BC8 80A4C868 8F186FA8 */ lw $t8, %lo(gSegments)($t8) -/* 00BCC 80A4C86C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00BD0 80A4C870 0061C824 */ and $t9, $v1, $at -/* 00BD4 80A4C874 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00BD8 80A4C878 03193821 */ addu $a3, $t8, $t9 -/* 00BDC 80A4C87C 00005812 */ mflo $t3 -/* 00BE0 80A4C880 00E13821 */ addu $a3, $a3, $at -/* 00BE4 80A4C884 00EB1021 */ addu $v0, $a3, $t3 -/* 00BE8 80A4C888 844E0000 */ lh $t6, 0x0000($v0) ## 00000000 -/* 00BEC 80A4C88C 848C01CC */ lh $t4, 0x01CC($a0) ## 000001CC -/* 00BF0 80A4C890 3C0F8016 */ lui $t7, %hi(gGameInfo) -/* 00BF4 80A4C894 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 00BF8 80A4C898 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) -/* 00BFC 80A4C89C 018A0019 */ multu $t4, $t2 -/* 00C00 80A4C8A0 468021A0 */ cvt.s.w $f6, $f4 -/* 00C04 80A4C8A4 3C0180A5 */ lui $at, %hi(D_80A4E06C) ## $at = 80A50000 -/* 00C08 80A4C8A8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00C0C 80A4C8AC 3C063E99 */ lui $a2, 0x3E99 ## $a2 = 3E990000 -/* 00C10 80A4C8B0 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A -/* 00C14 80A4C8B4 24840068 */ addiu $a0, $a0, 0x0068 ## $a0 = 00000068 -/* 00C18 80A4C8B8 E7A6002C */ swc1 $f6, 0x002C($sp) -/* 00C1C 80A4C8BC 84580002 */ lh $t8, 0x0002($v0) ## 00000002 -/* 00C20 80A4C8C0 00006812 */ mflo $t5 -/* 00C24 80A4C8C4 44984000 */ mtc1 $t8, $f8 ## $f8 = -0.00 -/* 00C28 80A4C8C8 00ED4821 */ addu $t1, $a3, $t5 -/* 00C2C 80A4C8CC 468042A0 */ cvt.s.w $f10, $f8 -/* 00C30 80A4C8D0 C428E06C */ lwc1 $f8, %lo(D_80A4E06C)($at) -/* 00C34 80A4C8D4 E7AA0030 */ swc1 $f10, 0x0030($sp) -/* 00C38 80A4C8D8 84590004 */ lh $t9, 0x0004($v0) ## 00000004 -/* 00C3C 80A4C8DC 44998000 */ mtc1 $t9, $f16 ## $f16 = 0.00 -/* 00C40 80A4C8E0 00000000 */ nop -/* 00C44 80A4C8E4 468084A0 */ cvt.s.w $f18, $f16 -/* 00C48 80A4C8E8 E7B20034 */ swc1 $f18, 0x0034($sp) -/* 00C4C 80A4C8EC 85EB116C */ lh $t3, 0x116C($t7) ## 8016116C -/* 00C50 80A4C8F0 AFA90048 */ sw $t1, 0x0048($sp) -/* 00C54 80A4C8F4 448B2000 */ mtc1 $t3, $f4 ## $f4 = 0.00 -/* 00C58 80A4C8F8 00000000 */ nop -/* 00C5C 80A4C8FC 468021A0 */ cvt.s.w $f6, $f4 -/* 00C60 80A4C900 46083282 */ mul.s $f10, $f6, $f8 -/* 00C64 80A4C904 44055000 */ mfc1 $a1, $f10 -/* 00C68 80A4C908 0C01DE80 */ jal Math_ApproxF - -/* 00C6C 80A4C90C 00000000 */ nop -/* 00C70 80A4C910 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 00C74 80A4C914 AFA50020 */ sw $a1, 0x0020($sp) -/* 00C78 80A4C918 0C032D94 */ jal Math3D_Vec3fDistSq -/* 00C7C 80A4C91C 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFD4 -/* 00C80 80A4C920 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 -/* 00C84 80A4C924 44818000 */ mtc1 $at, $f16 ## $f16 = 25.00 -/* 00C88 80A4C928 8FA90048 */ lw $t1, 0x0048($sp) -/* 00C8C 80A4C92C 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFD4 -/* 00C90 80A4C930 4610003C */ c.lt.s $f0, $f16 -/* 00C94 80A4C934 8FA50020 */ lw $a1, 0x0020($sp) -/* 00C98 80A4C938 45020006 */ bc1fl .L80A4C954 -/* 00C9C 80A4C93C 852C0000 */ lh $t4, 0x0000($t1) ## 00000000 -/* 00CA0 80A4C940 0C01DFB4 */ jal Math_Vec3f_Diff - ## Vec3f_Sub -/* 00CA4 80A4C944 27A60038 */ addiu $a2, $sp, 0x0038 ## $a2 = FFFFFFE0 -/* 00CA8 80A4C948 10000017 */ beq $zero, $zero, .L80A4C9A8 -/* 00CAC 80A4C94C 2604005C */ addiu $a0, $s0, 0x005C ## $a0 = 0000005C -/* 00CB0 80A4C950 852C0000 */ lh $t4, 0x0000($t1) ## 00000000 -.L80A4C954: -/* 00CB4 80A4C954 C7B2002C */ lwc1 $f18, 0x002C($sp) -/* 00CB8 80A4C958 C7AA0030 */ lwc1 $f10, 0x0030($sp) -/* 00CBC 80A4C95C 448C2000 */ mtc1 $t4, $f4 ## $f4 = 0.00 -/* 00CC0 80A4C960 00000000 */ nop -/* 00CC4 80A4C964 468021A0 */ cvt.s.w $f6, $f4 -/* 00CC8 80A4C968 46069201 */ sub.s $f8, $f18, $f6 -/* 00CCC 80A4C96C C7A60034 */ lwc1 $f6, 0x0034($sp) -/* 00CD0 80A4C970 E7A80038 */ swc1 $f8, 0x0038($sp) -/* 00CD4 80A4C974 852D0002 */ lh $t5, 0x0002($t1) ## 00000002 -/* 00CD8 80A4C978 448D8000 */ mtc1 $t5, $f16 ## $f16 = 0.00 -/* 00CDC 80A4C97C 00000000 */ nop -/* 00CE0 80A4C980 46808120 */ cvt.s.w $f4, $f16 -/* 00CE4 80A4C984 46045481 */ sub.s $f18, $f10, $f4 -/* 00CE8 80A4C988 E7B2003C */ swc1 $f18, 0x003C($sp) -/* 00CEC 80A4C98C 852E0004 */ lh $t6, 0x0004($t1) ## 00000004 -/* 00CF0 80A4C990 448E4000 */ mtc1 $t6, $f8 ## $f8 = 0.00 -/* 00CF4 80A4C994 00000000 */ nop -/* 00CF8 80A4C998 46804420 */ cvt.s.w $f16, $f8 -/* 00CFC 80A4C99C 46103281 */ sub.s $f10, $f6, $f16 -/* 00D00 80A4C9A0 E7AA0040 */ swc1 $f10, 0x0040($sp) -/* 00D04 80A4C9A4 2604005C */ addiu $a0, $s0, 0x005C ## $a0 = 0000005C -.L80A4C9A8: -/* 00D08 80A4C9A8 0C292F63 */ jal func_80A4BD8C -/* 00D0C 80A4C9AC 27A50038 */ addiu $a1, $sp, 0x0038 ## $a1 = FFFFFFE0 -/* 00D10 80A4C9B0 C6020068 */ lwc1 $f2, 0x0068($s0) ## 00000068 -/* 00D14 80A4C9B4 C604005C */ lwc1 $f4, 0x005C($s0) ## 0000005C -/* 00D18 80A4C9B8 C6080060 */ lwc1 $f8, 0x0060($s0) ## 00000060 -/* 00D1C 80A4C9BC C6100064 */ lwc1 $f16, 0x0064($s0) ## 00000064 -/* 00D20 80A4C9C0 46022482 */ mul.s $f18, $f4, $f2 -/* 00D24 80A4C9C4 E612005C */ swc1 $f18, 0x005C($s0) ## 0000005C -/* 00D28 80A4C9C8 46024182 */ mul.s $f6, $f8, $f2 -/* 00D2C 80A4C9CC C600005C */ lwc1 $f0, 0x005C($s0) ## 0000005C -/* 00D30 80A4C9D0 46028282 */ mul.s $f10, $f16, $f2 -/* 00D34 80A4C9D4 46000005 */ abs.s $f0, $f0 -/* 00D38 80A4C9D8 44060000 */ mfc1 $a2, $f0 -/* 00D3C 80A4C9DC E6060060 */ swc1 $f6, 0x0060($s0) ## 00000060 -/* 00D40 80A4C9E0 E60A0064 */ swc1 $f10, 0x0064($s0) ## 00000064 -/* 00D44 80A4C9E4 8FA5002C */ lw $a1, 0x002C($sp) -/* 00D48 80A4C9E8 0C01DE80 */ jal Math_ApproxF - -/* 00D4C 80A4C9EC 8FA40020 */ lw $a0, 0x0020($sp) -/* 00D50 80A4C9F0 C6000060 */ lwc1 $f0, 0x0060($s0) ## 00000060 -/* 00D54 80A4C9F4 30430001 */ andi $v1, $v0, 0x0001 ## $v1 = 00000000 -/* 00D58 80A4C9F8 AFA30044 */ sw $v1, 0x0044($sp) -/* 00D5C 80A4C9FC 46000005 */ abs.s $f0, $f0 -/* 00D60 80A4CA00 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 00D64 80A4CA04 44060000 */ mfc1 $a2, $f0 -/* 00D68 80A4CA08 0C01DE80 */ jal Math_ApproxF - -/* 00D6C 80A4CA0C 8FA50030 */ lw $a1, 0x0030($sp) -/* 00D70 80A4CA10 C6000064 */ lwc1 $f0, 0x0064($s0) ## 00000064 -/* 00D74 80A4CA14 8FA30044 */ lw $v1, 0x0044($sp) -/* 00D78 80A4CA18 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C -/* 00D7C 80A4CA1C 46000005 */ abs.s $f0, $f0 -/* 00D80 80A4CA20 00621824 */ and $v1, $v1, $v0 -/* 00D84 80A4CA24 44060000 */ mfc1 $a2, $f0 -/* 00D88 80A4CA28 AFA30044 */ sw $v1, 0x0044($sp) -/* 00D8C 80A4CA2C 0C01DE80 */ jal Math_ApproxF - -/* 00D90 80A4CA30 8FA50034 */ lw $a1, 0x0034($sp) -/* 00D94 80A4CA34 8FA30044 */ lw $v1, 0x0044($sp) -/* 00D98 80A4CA38 8FBF001C */ lw $ra, 0x001C($sp) -/* 00D9C 80A4CA3C 8FB00018 */ lw $s0, 0x0018($sp) -/* 00DA0 80A4CA40 00621824 */ and $v1, $v1, $v0 -/* 00DA4 80A4CA44 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -/* 00DA8 80A4CA48 03E00008 */ jr $ra -/* 00DAC 80A4CA4C 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4CA50.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4CA50.s deleted file mode 100644 index 82b9ef6fd1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4CA50.s +++ /dev/null @@ -1,82 +0,0 @@ -.late_rodata -glabel D_80A4E070 - .float 0.01 - -.text -glabel func_80A4CA50 -/* 00DB0 80A4CA50 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00DB4 80A4CA54 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00DB8 80A4CA58 AFA5002C */ sw $a1, 0x002C($sp) -/* 00DBC 80A4CA5C 8498001C */ lh $t8, 0x001C($a0) ## 0000001C -/* 00DC0 80A4CA60 3C0F0001 */ lui $t7, 0x0001 ## $t7 = 00010000 -/* 00DC4 80A4CA64 01E57821 */ addu $t7, $t7, $a1 -/* 00DC8 80A4CA68 8DEF1E08 */ lw $t7, 0x1E08($t7) ## 00011E08 -/* 00DCC 80A4CA6C 331900FF */ andi $t9, $t8, 0x00FF ## $t9 = 00000000 -/* 00DD0 80A4CA70 001948C0 */ sll $t1, $t9, 3 -/* 00DD4 80A4CA74 01E91821 */ addu $v1, $t7, $t1 -/* 00DD8 80A4CA78 8C620004 */ lw $v0, 0x0004($v1) ## 00000004 -/* 00DDC 80A4CA7C 3C098016 */ lui $t1, %hi(gGameInfo) -/* 00DE0 80A4CA80 8D29FA90 */ lw $t1, %lo(gGameInfo)($t1) -/* 00DE4 80A4CA84 00025100 */ sll $t2, $v0, 4 -/* 00DE8 80A4CA88 000A5F02 */ srl $t3, $t2, 28 -/* 00DEC 80A4CA8C 849901CE */ lh $t9, 0x01CE($a0) ## 000001CE -/* 00DF0 80A4CA90 852A116C */ lh $t2, 0x116C($t1) ## 8016116C -/* 00DF4 80A4CA94 000B6080 */ sll $t4, $t3, 2 -/* 00DF8 80A4CA98 3C0D8016 */ lui $t5, %hi(gSegments) -/* 00DFC 80A4CA9C 01AC6821 */ addu $t5, $t5, $t4 -/* 00E00 80A4CAA0 8DAD6FA8 */ lw $t5, %lo(gSegments)($t5) -/* 00E04 80A4CAA4 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00E08 80A4CAA8 448A2000 */ mtc1 $t2, $f4 ## $f4 = 0.00 -/* 00E0C 80A4CAAC 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00E10 80A4CAB0 00197880 */ sll $t7, $t9, 2 -/* 00E14 80A4CAB4 00417024 */ and $t6, $v0, $at -/* 00E18 80A4CAB8 01F97823 */ subu $t7, $t7, $t9 -/* 00E1C 80A4CABC 000F7840 */ sll $t7, $t7, 1 -/* 00E20 80A4CAC0 01AEC021 */ addu $t8, $t5, $t6 -/* 00E24 80A4CAC4 468021A0 */ cvt.s.w $f6, $f4 -/* 00E28 80A4CAC8 030F4021 */ addu $t0, $t8, $t7 -/* 00E2C 80A4CACC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00E30 80A4CAD0 01014021 */ addu $t0, $t0, $at -/* 00E34 80A4CAD4 3C0180A5 */ lui $at, %hi(D_80A4E070) ## $at = 80A50000 -/* 00E38 80A4CAD8 C428E070 */ lwc1 $f8, %lo(D_80A4E070)($at) -/* 00E3C 80A4CADC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00E40 80A4CAE0 44818000 */ mtc1 $at, $f16 ## $f16 = 0.50 -/* 00E44 80A4CAE4 46083282 */ mul.s $f10, $f6, $f8 -/* 00E48 80A4CAE8 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00E4C 80A4CAEC 3C063E38 */ lui $a2, 0x3E38 ## $a2 = 3E380000 -/* 00E50 80A4CAF0 34C651EC */ ori $a2, $a2, 0x51EC ## $a2 = 3E3851EC -/* 00E54 80A4CAF4 AFA70028 */ sw $a3, 0x0028($sp) -/* 00E58 80A4CAF8 24840060 */ addiu $a0, $a0, 0x0060 ## $a0 = 00000060 -/* 00E5C 80A4CAFC AFA8001C */ sw $t0, 0x001C($sp) -/* 00E60 80A4CB00 46105482 */ mul.s $f18, $f10, $f16 -/* 00E64 80A4CB04 44059000 */ mfc1 $a1, $f18 -/* 00E68 80A4CB08 0C01DE80 */ jal Math_ApproxF - -/* 00E6C 80A4CB0C 00000000 */ nop -/* 00E70 80A4CB10 8FA8001C */ lw $t0, 0x001C($sp) -/* 00E74 80A4CB14 8FA70028 */ lw $a3, 0x0028($sp) -/* 00E78 80A4CB18 850B0000 */ lh $t3, 0x0000($t0) ## 00000000 -/* 00E7C 80A4CB1C C4E00060 */ lwc1 $f0, 0x0060($a3) ## 00000060 -/* 00E80 80A4CB20 24E40028 */ addiu $a0, $a3, 0x0028 ## $a0 = 00000028 -/* 00E84 80A4CB24 448B2000 */ mtc1 $t3, $f4 ## $f4 = 0.00 -/* 00E88 80A4CB28 46000005 */ abs.s $f0, $f0 -/* 00E8C 80A4CB2C 468021A0 */ cvt.s.w $f6, $f4 -/* 00E90 80A4CB30 44060000 */ mfc1 $a2, $f0 -/* 00E94 80A4CB34 E4E60024 */ swc1 $f6, 0x0024($a3) ## 00000024 -/* 00E98 80A4CB38 850C0004 */ lh $t4, 0x0004($t0) ## 00000004 -/* 00E9C 80A4CB3C 448C4000 */ mtc1 $t4, $f8 ## $f8 = 0.00 -/* 00EA0 80A4CB40 00000000 */ nop -/* 00EA4 80A4CB44 468042A0 */ cvt.s.w $f10, $f8 -/* 00EA8 80A4CB48 E4EA002C */ swc1 $f10, 0x002C($a3) ## 0000002C -/* 00EAC 80A4CB4C 850D0002 */ lh $t5, 0x0002($t0) ## 00000002 -/* 00EB0 80A4CB50 448D8000 */ mtc1 $t5, $f16 ## $f16 = 0.00 -/* 00EB4 80A4CB54 00000000 */ nop -/* 00EB8 80A4CB58 46808420 */ cvt.s.w $f16, $f16 -/* 00EBC 80A4CB5C 44058000 */ mfc1 $a1, $f16 -/* 00EC0 80A4CB60 0C01DE80 */ jal Math_ApproxF - -/* 00EC4 80A4CB64 00000000 */ nop -/* 00EC8 80A4CB68 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00ECC 80A4CB6C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00ED0 80A4CB70 03E00008 */ jr $ra -/* 00ED4 80A4CB74 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4CB78.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4CB78.s deleted file mode 100644 index aabbcab2e7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4CB78.s +++ /dev/null @@ -1,237 +0,0 @@ -.late_rodata -glabel D_80A4E074 - .word 0xBE99999A -glabel D_80A4E078 - .float 0.3 - -glabel D_80A4E07C - .float 0.2 - -.text -glabel func_80A4CB78 -/* 00ED8 80A4CB78 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 -/* 00EDC 80A4CB7C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00EE0 80A4CB80 AFB10020 */ sw $s1, 0x0020($sp) -/* 00EE4 80A4CB84 AFB0001C */ sw $s0, 0x001C($sp) -/* 00EE8 80A4CB88 848F001C */ lh $t7, 0x001C($a0) ## 0000001C -/* 00EEC 80A4CB8C 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 -/* 00EF0 80A4CB90 01C57021 */ addu $t6, $t6, $a1 -/* 00EF4 80A4CB94 8DCE1E08 */ lw $t6, 0x1E08($t6) ## 00011E08 -/* 00EF8 80A4CB98 31F800FF */ andi $t8, $t7, 0x00FF ## $t8 = 00000000 -/* 00EFC 80A4CB9C 0018C8C0 */ sll $t9, $t8, 3 -/* 00F00 80A4CBA0 01D91821 */ addu $v1, $t6, $t9 -/* 00F04 80A4CBA4 8C620004 */ lw $v0, 0x0004($v1) ## 00000004 -/* 00F08 80A4CBA8 848F01CE */ lh $t7, 0x01CE($a0) ## 000001CE -/* 00F0C 80A4CBAC 3C0B8016 */ lui $t3, %hi(gSegments) -/* 00F10 80A4CBB0 00024100 */ sll $t0, $v0, 4 -/* 00F14 80A4CBB4 00084F02 */ srl $t1, $t0, 28 -/* 00F18 80A4CBB8 00095080 */ sll $t2, $t1, 2 -/* 00F1C 80A4CBBC 016A5821 */ addu $t3, $t3, $t2 -/* 00F20 80A4CBC0 8D6B6FA8 */ lw $t3, %lo(gSegments)($t3) -/* 00F24 80A4CBC4 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00F28 80A4CBC8 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00F2C 80A4CBCC 000FC080 */ sll $t8, $t7, 2 -/* 00F30 80A4CBD0 00416024 */ and $t4, $v0, $at -/* 00F34 80A4CBD4 030FC023 */ subu $t8, $t8, $t7 -/* 00F38 80A4CBD8 0018C040 */ sll $t8, $t8, 1 -/* 00F3C 80A4CBDC 016C6821 */ addu $t5, $t3, $t4 -/* 00F40 80A4CBE0 01B83821 */ addu $a3, $t5, $t8 -/* 00F44 80A4CBE4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00F48 80A4CBE8 00E13821 */ addu $a3, $a3, $at -/* 00F4C 80A4CBEC 84EE0002 */ lh $t6, 0x0002($a3) ## 00000002 -/* 00F50 80A4CBF0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00F54 80A4CBF4 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00F58 80A4CBF8 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 00F5C 80A4CBFC 3C05C160 */ lui $a1, 0xC160 ## $a1 = C1600000 -/* 00F60 80A4CC00 24840060 */ addiu $a0, $a0, 0x0060 ## $a0 = 00000060 -/* 00F64 80A4CC04 468021A0 */ cvt.s.w $f6, $f4 -/* 00F68 80A4CC08 AFA7007C */ sw $a3, 0x007C($sp) -/* 00F6C 80A4CC0C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00F70 80A4CC10 0C01DE80 */ jal Math_ApproxF - -/* 00F74 80A4CC14 E7A60078 */ swc1 $f6, 0x0078($sp) -/* 00F78 80A4CC18 8FA7007C */ lw $a3, 0x007C($sp) -/* 00F7C 80A4CC1C C6020028 */ lwc1 $f2, 0x0028($s0) ## 00000028 -/* 00F80 80A4CC20 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 00F84 80A4CC24 84F90000 */ lh $t9, 0x0000($a3) ## 00000000 -/* 00F88 80A4CC28 44994000 */ mtc1 $t9, $f8 ## $f8 = 0.00 -/* 00F8C 80A4CC2C 00000000 */ nop -/* 00F90 80A4CC30 468042A0 */ cvt.s.w $f10, $f8 -/* 00F94 80A4CC34 E60A0024 */ swc1 $f10, 0x0024($s0) ## 00000024 -/* 00F98 80A4CC38 84E80004 */ lh $t0, 0x0004($a3) ## 00000004 -/* 00F9C 80A4CC3C 44888000 */ mtc1 $t0, $f16 ## $f16 = 0.00 -/* 00FA0 80A4CC40 00000000 */ nop -/* 00FA4 80A4CC44 468084A0 */ cvt.s.w $f18, $f16 -/* 00FA8 80A4CC48 E612002C */ swc1 $f18, 0x002C($s0) ## 0000002C -/* 00FAC 80A4CC4C E7A20074 */ swc1 $f2, 0x0074($sp) -/* 00FB0 80A4CC50 C6000060 */ lwc1 $f0, 0x0060($s0) ## 00000060 -/* 00FB4 80A4CC54 4606003C */ c.lt.s $f0, $f6 -/* 00FB8 80A4CC58 46001100 */ add.s $f4, $f2, $f0 -/* 00FBC 80A4CC5C 45000068 */ bc1f .L80A4CE00 -/* 00FC0 80A4CC60 E6040028 */ swc1 $f4, 0x0028($s0) ## 00000028 -/* 00FC4 80A4CC64 C7A80078 */ lwc1 $f8, 0x0078($sp) -/* 00FC8 80A4CC68 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 -/* 00FCC 80A4CC6C 4608503E */ c.le.s $f10, $f8 -/* 00FD0 80A4CC70 00000000 */ nop -/* 00FD4 80A4CC74 45020063 */ bc1fl .L80A4CE04 -/* 00FD8 80A4CC78 861901C6 */ lh $t9, 0x01C6($s0) ## 000001C6 -/* 00FDC 80A4CC7C 860901C6 */ lh $t1, 0x01C6($s0) ## 000001C6 -/* 00FE0 80A4CC80 3C014416 */ lui $at, 0x4416 ## $at = 44160000 -/* 00FE4 80A4CC84 5520004C */ bnel $t1, $zero, .L80A4CDB8 -/* 00FE8 80A4CC88 860201C6 */ lh $v0, 0x01C6($s0) ## 000001C6 -/* 00FEC 80A4CC8C C6100090 */ lwc1 $f16, 0x0090($s0) ## 00000090 -/* 00FF0 80A4CC90 44819000 */ mtc1 $at, $f18 ## $f18 = 600.00 -/* 00FF4 80A4CC94 00000000 */ nop -/* 00FF8 80A4CC98 4612803C */ c.lt.s $f16, $f18 -/* 00FFC 80A4CC9C 00000000 */ nop -/* 01000 80A4CCA0 45020017 */ bc1fl .L80A4CD00 -/* 01004 80A4CCA4 920F01D3 */ lbu $t7, 0x01D3($s0) ## 000001D3 -/* 01008 80A4CCA8 862A07A0 */ lh $t2, 0x07A0($s1) ## 000007A0 -/* 0100C 80A4CCAC 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 01010 80A4CCB0 000A5880 */ sll $t3, $t2, 2 -/* 01014 80A4CCB4 022B6021 */ addu $t4, $s1, $t3 -/* 01018 80A4CCB8 0C024BE2 */ jal Quake_Add -/* 0101C 80A4CCBC 8D840790 */ lw $a0, 0x0790($t4) ## 00000790 -/* 01020 80A4CCC0 00022400 */ sll $a0, $v0, 16 -/* 01024 80A4CCC4 AFA2006C */ sw $v0, 0x006C($sp) -/* 01028 80A4CCC8 00042403 */ sra $a0, $a0, 16 -/* 0102C 80A4CCCC 0C024B6B */ jal Quake_SetSpeed -/* 01030 80A4CCD0 2405C350 */ addiu $a1, $zero, 0xC350 ## $a1 = FFFFC350 -/* 01034 80A4CCD4 87A4006E */ lh $a0, 0x006E($sp) -/* 01038 80A4CCD8 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 0103C 80A4CCDC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01040 80A4CCE0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01044 80A4CCE4 AFA00010 */ sw $zero, 0x0010($sp) -/* 01048 80A4CCE8 0C024B9C */ jal Quake_SetQuakeValues -/* 0104C 80A4CCEC AFA4002C */ sw $a0, 0x002C($sp) -/* 01050 80A4CCF0 8FA4002C */ lw $a0, 0x002C($sp) -/* 01054 80A4CCF4 0C024B7C */ jal Quake_SetCountdown -/* 01058 80A4CCF8 24050007 */ addiu $a1, $zero, 0x0007 ## $a1 = 00000007 -/* 0105C 80A4CCFC 920F01D3 */ lbu $t7, 0x01D3($s0) ## 000001D3 -.L80A4CD00: -/* 01060 80A4CD00 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01064 80A4CD04 31ED0010 */ andi $t5, $t7, 0x0010 ## $t5 = 00000000 -/* 01068 80A4CD08 15A0002A */ bne $t5, $zero, .L80A4CDB4 -/* 0106C 80A4CD0C E60401C0 */ swc1 $f4, 0x01C0($s0) ## 000001C0 -/* 01070 80A4CD10 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 -/* 01074 80A4CD14 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 01078 80A4CD18 44815000 */ mtc1 $at, $f10 ## $f10 = 50.00 -/* 0107C 80A4CD1C E7A6005C */ swc1 $f6, 0x005C($sp) -/* 01080 80A4CD20 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 01084 80A4CD24 27B8005C */ addiu $t8, $sp, 0x005C ## $t8 = FFFFFFD4 -/* 01088 80A4CD28 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0108C 80A4CD2C 460A4400 */ add.s $f16, $f8, $f10 -/* 01090 80A4CD30 262507C0 */ addiu $a1, $s1, 0x07C0 ## $a1 = 000007C0 -/* 01094 80A4CD34 27A60068 */ addiu $a2, $sp, 0x0068 ## $a2 = FFFFFFE0 -/* 01098 80A4CD38 27A70050 */ addiu $a3, $sp, 0x0050 ## $a3 = FFFFFFC8 -/* 0109C 80A4CD3C E7B00060 */ swc1 $f16, 0x0060($sp) -/* 010A0 80A4CD40 C612002C */ lwc1 $f18, 0x002C($s0) ## 0000002C -/* 010A4 80A4CD44 AFB80014 */ sw $t8, 0x0014($sp) -/* 010A8 80A4CD48 AFB00010 */ sw $s0, 0x0010($sp) -/* 010AC 80A4CD4C 0C00F283 */ jal func_8003CA0C -/* 010B0 80A4CD50 E7B20064 */ swc1 $f18, 0x0064($sp) -/* 010B4 80A4CD54 3C01426E */ lui $at, 0x426E ## $at = 426E0000 -/* 010B8 80A4CD58 44813000 */ mtc1 $at, $f6 ## $f6 = 59.50 -/* 010BC 80A4CD5C C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 010C0 80A4CD60 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -/* 010C4 80A4CD64 44815000 */ mtc1 $at, $f10 ## $f10 = 15.00 -/* 010C8 80A4CD68 46062201 */ sub.s $f8, $f4, $f6 -/* 010CC 80A4CD6C 46000306 */ mov.s $f12, $f0 -/* 010D0 80A4CD70 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 010D4 80A4CD74 46080081 */ sub.s $f2, $f0, $f8 -/* 010D8 80A4CD78 46001005 */ abs.s $f0, $f2 -/* 010DC 80A4CD7C 460A003C */ c.lt.s $f0, $f10 -/* 010E0 80A4CD80 00000000 */ nop -/* 010E4 80A4CD84 4502000C */ bc1fl .L80A4CDB8 -/* 010E8 80A4CD88 860201C6 */ lh $v0, 0x01C6($s0) ## 000001C6 -/* 010EC 80A4CD8C 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 -/* 010F0 80A4CD90 C6100024 */ lwc1 $f16, 0x0024($s0) ## 00000024 -/* 010F4 80A4CD94 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 010F8 80A4CD98 46126100 */ add.s $f4, $f12, $f18 -/* 010FC 80A4CD9C E7B00044 */ swc1 $f16, 0x0044($sp) -/* 01100 80A4CDA0 27A50044 */ addiu $a1, $sp, 0x0044 ## $a1 = FFFFFFBC -/* 01104 80A4CDA4 E7A40048 */ swc1 $f4, 0x0048($sp) -/* 01108 80A4CDA8 C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C -/* 0110C 80A4CDAC 0C2930E9 */ jal func_80A4C3A4 -/* 01110 80A4CDB0 E7A6004C */ swc1 $f6, 0x004C($sp) -.L80A4CDB4: -/* 01114 80A4CDB4 860201C6 */ lh $v0, 0x01C6($s0) ## 000001C6 -.L80A4CDB8: -/* 01118 80A4CDB8 3C0180A5 */ lui $at, %hi(D_80A4E074) ## $at = 80A50000 -/* 0111C 80A4CDBC 18400003 */ blez $v0, .L80A4CDCC -/* 01120 80A4CDC0 244E0001 */ addiu $t6, $v0, 0x0001 ## $t6 = 00000001 -/* 01124 80A4CDC4 1000003F */ beq $zero, $zero, .L80A4CEC4 -/* 01128 80A4CDC8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80A4CDCC: -/* 0112C 80A4CDCC A60E01C6 */ sh $t6, 0x01C6($s0) ## 000001C6 -/* 01130 80A4CDD0 C42AE074 */ lwc1 $f10, %lo(D_80A4E074)($at) -/* 01134 80A4CDD4 C6080060 */ lwc1 $f8, 0x0060($s0) ## 00000060 -/* 01138 80A4CDD8 C6120028 */ lwc1 $f18, 0x0028($s0) ## 00000028 -/* 0113C 80A4CDDC 3C0180A5 */ lui $at, %hi(D_80A4E078) ## $at = 80A50000 -/* 01140 80A4CDE0 460A4402 */ mul.s $f16, $f8, $f10 -/* 01144 80A4CDE4 E6100060 */ swc1 $f16, 0x0060($s0) ## 00000060 -/* 01148 80A4CDE8 C7A40078 */ lwc1 $f4, 0x0078($sp) -/* 0114C 80A4CDEC C428E078 */ lwc1 $f8, %lo(D_80A4E078)($at) -/* 01150 80A4CDF0 46049181 */ sub.s $f6, $f18, $f4 -/* 01154 80A4CDF4 46083282 */ mul.s $f10, $f6, $f8 -/* 01158 80A4CDF8 460A2401 */ sub.s $f16, $f4, $f10 -/* 0115C 80A4CDFC E6100028 */ swc1 $f16, 0x0028($s0) ## 00000028 -.L80A4CE00: -/* 01160 80A4CE00 861901C6 */ lh $t9, 0x01C6($s0) ## 000001C6 -.L80A4CE04: -/* 01164 80A4CE04 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01168 80A4CE08 262507C0 */ addiu $a1, $s1, 0x07C0 ## $a1 = 000007C0 -/* 0116C 80A4CE0C 1720002C */ bne $t9, $zero, .L80A4CEC0 -/* 01170 80A4CE10 27A8003C */ addiu $t0, $sp, 0x003C ## $t0 = FFFFFFB4 -/* 01174 80A4CE14 8E060024 */ lw $a2, 0x0024($s0) ## 00000024 -/* 01178 80A4CE18 8E07002C */ lw $a3, 0x002C($s0) ## 0000002C -/* 0117C 80A4CE1C 27A90040 */ addiu $t1, $sp, 0x0040 ## $t1 = FFFFFFB8 -/* 01180 80A4CE20 AFA90014 */ sw $t1, 0x0014($sp) -/* 01184 80A4CE24 0C010891 */ jal func_80042244 -/* 01188 80A4CE28 AFA80010 */ sw $t0, 0x0010($sp) -/* 0118C 80A4CE2C 10400024 */ beq $v0, $zero, .L80A4CEC0 -/* 01190 80A4CE30 C7B2003C */ lwc1 $f18, 0x003C($sp) -/* 01194 80A4CE34 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 01198 80A4CE38 4612303E */ c.le.s $f6, $f18 -/* 0119C 80A4CE3C 00000000 */ nop -/* 011A0 80A4CE40 45020020 */ bc1fl .L80A4CEC4 -/* 011A4 80A4CE44 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 011A8 80A4CE48 920A01D3 */ lbu $t2, 0x01D3($s0) ## 000001D3 -/* 011AC 80A4CE4C 354B0010 */ ori $t3, $t2, 0x0010 ## $t3 = 00000010 -/* 011B0 80A4CE50 A20B01D3 */ sb $t3, 0x01D3($s0) ## 000001D3 -/* 011B4 80A4CE54 C7A40074 */ lwc1 $f4, 0x0074($sp) -/* 011B8 80A4CE58 C7A8003C */ lwc1 $f8, 0x003C($sp) -/* 011BC 80A4CE5C 4604403C */ c.lt.s $f8, $f4 -/* 011C0 80A4CE60 00000000 */ nop -/* 011C4 80A4CE64 4502000F */ bc1fl .L80A4CEA4 -/* 011C8 80A4CE68 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 -/* 011CC 80A4CE6C C60A0024 */ lwc1 $f10, 0x0024($s0) ## 00000024 -/* 011D0 80A4CE70 E7A80034 */ swc1 $f8, 0x0034($sp) -/* 011D4 80A4CE74 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 011D8 80A4CE78 E7AA0030 */ swc1 $f10, 0x0030($sp) -/* 011DC 80A4CE7C C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C -/* 011E0 80A4CE80 27A50030 */ addiu $a1, $sp, 0x0030 ## $a1 = FFFFFFA8 -/* 011E4 80A4CE84 0C293165 */ jal func_80A4C594 -/* 011E8 80A4CE88 E7B00038 */ swc1 $f16, 0x0038($sp) -/* 011EC 80A4CE8C 3C0180A5 */ lui $at, %hi(D_80A4E07C) ## $at = 80A50000 -/* 011F0 80A4CE90 C426E07C */ lwc1 $f6, %lo(D_80A4E07C)($at) -/* 011F4 80A4CE94 C6120060 */ lwc1 $f18, 0x0060($s0) ## 00000060 -/* 011F8 80A4CE98 46069102 */ mul.s $f4, $f18, $f6 -/* 011FC 80A4CE9C E6040060 */ swc1 $f4, 0x0060($s0) ## 00000060 -/* 01200 80A4CEA0 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 -.L80A4CEA4: -/* 01204 80A4CEA4 44810000 */ mtc1 $at, $f0 ## $f0 = -8.00 -/* 01208 80A4CEA8 C60A0060 */ lwc1 $f10, 0x0060($s0) ## 00000060 -/* 0120C 80A4CEAC 4600503C */ c.lt.s $f10, $f0 -/* 01210 80A4CEB0 00000000 */ nop -/* 01214 80A4CEB4 45020003 */ bc1fl .L80A4CEC4 -/* 01218 80A4CEB8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0121C 80A4CEBC E6000060 */ swc1 $f0, 0x0060($s0) ## 00000060 -.L80A4CEC0: -/* 01220 80A4CEC0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80A4CEC4: -/* 01224 80A4CEC4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01228 80A4CEC8 8FB0001C */ lw $s0, 0x001C($sp) -/* 0122C 80A4CECC 8FB10020 */ lw $s1, 0x0020($sp) -/* 01230 80A4CED0 03E00008 */ jr $ra -/* 01234 80A4CED4 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4CED8.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4CED8.s deleted file mode 100644 index 220471e2bf..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4CED8.s +++ /dev/null @@ -1,123 +0,0 @@ -.late_rodata -glabel D_80A4E080 - .word 0x3C89AE41 -glabel D_80A4E084 - .float 9.58738019108e-05 - -glabel D_80A4E088 - .float 9.58738019108e-05 - -glabel D_80A4E08C - .float 9.58738019108e-05 - -.text -glabel func_80A4CED8 -/* 01238 80A4CED8 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 -/* 0123C 80A4CEDC AFBF001C */ sw $ra, 0x001C($sp) -/* 01240 80A4CEE0 AFB00018 */ sw $s0, 0x0018($sp) -/* 01244 80A4CEE4 AFA5009C */ sw $a1, 0x009C($sp) -/* 01248 80A4CEE8 908201D3 */ lbu $v0, 0x01D3($a0) ## 000001D3 -/* 0124C 80A4CEEC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01250 80A4CEF0 26050100 */ addiu $a1, $s0, 0x0100 ## $a1 = 00000100 -/* 01254 80A4CEF4 30420008 */ andi $v0, $v0, 0x0008 ## $v0 = 00000000 -/* 01258 80A4CEF8 10400003 */ beq $v0, $zero, .L80A4CF08 -/* 0125C 80A4CEFC 00000000 */ nop -/* 01260 80A4CF00 10000009 */ beq $zero, $zero, .L80A4CF28 -/* 01264 80A4CF04 C48C01BC */ lwc1 $f12, 0x01BC($a0) ## 000001BC -.L80A4CF08: -/* 01268 80A4CF08 0C032D9E */ jal Math3D_Vec3f_DistXYZ -/* 0126C 80A4CF0C 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 01270 80A4CF10 3C0180A5 */ lui $at, %hi(D_80A4E080) ## $at = 80A50000 -/* 01274 80A4CF14 C424E080 */ lwc1 $f4, %lo(D_80A4E080)($at) -/* 01278 80A4CF18 920201D3 */ lbu $v0, 0x01D3($s0) ## 000001D3 -/* 0127C 80A4CF1C 46040302 */ mul.s $f12, $f0, $f4 -/* 01280 80A4CF20 30420008 */ andi $v0, $v0, 0x0008 ## $v0 = 00000000 -/* 01284 80A4CF24 E60C01BC */ swc1 $f12, 0x01BC($s0) ## 000001BC -.L80A4CF28: -/* 01288 80A4CF28 C60601C0 */ lwc1 $f6, 0x01C0($s0) ## 000001C0 -/* 0128C 80A4CF2C 3C0480A5 */ lui $a0, %hi(D_80A4DEE4) ## $a0 = 80A50000 -/* 01290 80A4CF30 2484DEE4 */ addiu $a0, $a0, %lo(D_80A4DEE4) ## $a0 = 80A4DEE4 -/* 01294 80A4CF34 46066302 */ mul.s $f12, $f12, $f6 -/* 01298 80A4CF38 1040000D */ beq $v0, $zero, .L80A4CF70 -/* 0129C 80A4CF3C 2605005C */ addiu $a1, $s0, 0x005C ## $a1 = 0000005C -/* 012A0 80A4CF40 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 012A4 80A4CF44 8FA5009C */ lw $a1, 0x009C($sp) -/* 012A8 80A4CF48 27A60028 */ addiu $a2, $sp, 0x0028 ## $a2 = FFFFFF90 -/* 012AC 80A4CF4C 0C292FCA */ jal func_80A4BF28 -/* 012B0 80A4CF50 E7AC008C */ swc1 $f12, 0x008C($sp) -/* 012B4 80A4CF54 3C0480A5 */ lui $a0, %hi(D_80A4DEE4) ## $a0 = 80A50000 -/* 012B8 80A4CF58 2484DEE4 */ addiu $a0, $a0, %lo(D_80A4DEE4) ## $a0 = 80A4DEE4 -/* 012BC 80A4CF5C 2605005C */ addiu $a1, $s0, 0x005C ## $a1 = 0000005C -/* 012C0 80A4CF60 0C032DED */ jal Math3D_Vec3f_Cross -/* 012C4 80A4CF64 27A60080 */ addiu $a2, $sp, 0x0080 ## $a2 = FFFFFFE8 -/* 012C8 80A4CF68 10000005 */ beq $zero, $zero, .L80A4CF80 -/* 012CC 80A4CF6C C7AC008C */ lwc1 $f12, 0x008C($sp) -.L80A4CF70: -/* 012D0 80A4CF70 27A60080 */ addiu $a2, $sp, 0x0080 ## $a2 = FFFFFFE8 -/* 012D4 80A4CF74 0C032DED */ jal Math3D_Vec3f_Cross -/* 012D8 80A4CF78 E7AC008C */ swc1 $f12, 0x008C($sp) -/* 012DC 80A4CF7C C7AC008C */ lwc1 $f12, 0x008C($sp) -.L80A4CF80: -/* 012E0 80A4CF80 27A40074 */ addiu $a0, $sp, 0x0074 ## $a0 = FFFFFFDC -/* 012E4 80A4CF84 27A50080 */ addiu $a1, $sp, 0x0080 ## $a1 = FFFFFFE8 -/* 012E8 80A4CF88 0C292F63 */ jal func_80A4BD8C -/* 012EC 80A4CF8C E7AC008C */ swc1 $f12, 0x008C($sp) -/* 012F0 80A4CF90 27A40074 */ addiu $a0, $sp, 0x0074 ## $a0 = FFFFFFDC -/* 012F4 80A4CF94 10400008 */ beq $v0, $zero, .L80A4CFB8 -/* 012F8 80A4CF98 C7AC008C */ lwc1 $f12, 0x008C($sp) -/* 012FC 80A4CF9C 8C8F0000 */ lw $t7, 0x0000($a0) ## FFFFFFDC -/* 01300 80A4CFA0 AE0F01B0 */ sw $t7, 0x01B0($s0) ## 000001B0 -/* 01304 80A4CFA4 8C8E0004 */ lw $t6, 0x0004($a0) ## FFFFFFE0 -/* 01308 80A4CFA8 AE0E01B4 */ sw $t6, 0x01B4($s0) ## 000001B4 -/* 0130C 80A4CFAC 8C8F0008 */ lw $t7, 0x0008($a0) ## FFFFFFE4 -/* 01310 80A4CFB0 10000007 */ beq $zero, $zero, .L80A4CFD0 -/* 01314 80A4CFB4 AE0F01B8 */ sw $t7, 0x01B8($s0) ## 000001B8 -.L80A4CFB8: -/* 01318 80A4CFB8 8E1901B0 */ lw $t9, 0x01B0($s0) ## 000001B0 -/* 0131C 80A4CFBC AC990000 */ sw $t9, 0x0000($a0) ## FFFFFFDC -/* 01320 80A4CFC0 8E1801B4 */ lw $t8, 0x01B4($s0) ## 000001B4 -/* 01324 80A4CFC4 AC980004 */ sw $t8, 0x0004($a0) ## FFFFFFE0 -/* 01328 80A4CFC8 8E1901B8 */ lw $t9, 0x01B8($s0) ## 000001B8 -/* 0132C 80A4CFCC AC990008 */ sw $t9, 0x0008($a0) ## FFFFFFE4 -.L80A4CFD0: -/* 01330 80A4CFD0 00802825 */ or $a1, $a0, $zero ## $a1 = FFFFFFDC -/* 01334 80A4CFD4 0C0348FF */ jal func_800D23FC -/* 01338 80A4CFD8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0133C 80A4CFDC 860800B6 */ lh $t0, 0x00B6($s0) ## 000000B6 -/* 01340 80A4CFE0 3C0180A5 */ lui $at, %hi(D_80A4E084) ## $at = 80A50000 -/* 01344 80A4CFE4 C430E084 */ lwc1 $f16, %lo(D_80A4E084)($at) -/* 01348 80A4CFE8 44884000 */ mtc1 $t0, $f8 ## $f8 = 0.00 -/* 0134C 80A4CFEC 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 01350 80A4CFF0 468042A0 */ cvt.s.w $f10, $f8 -/* 01354 80A4CFF4 46105302 */ mul.s $f12, $f10, $f16 -/* 01358 80A4CFF8 0C034348 */ jal Matrix_RotateY -/* 0135C 80A4CFFC 00000000 */ nop -/* 01360 80A4D000 860900B4 */ lh $t1, 0x00B4($s0) ## 000000B4 -/* 01364 80A4D004 3C0180A5 */ lui $at, %hi(D_80A4E088) ## $at = 80A50000 -/* 01368 80A4D008 C426E088 */ lwc1 $f6, %lo(D_80A4E088)($at) -/* 0136C 80A4D00C 44899000 */ mtc1 $t1, $f18 ## $f18 = 0.00 -/* 01370 80A4D010 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 01374 80A4D014 46809120 */ cvt.s.w $f4, $f18 -/* 01378 80A4D018 46062302 */ mul.s $f12, $f4, $f6 -/* 0137C 80A4D01C 0C0342DC */ jal Matrix_RotateX -/* 01380 80A4D020 00000000 */ nop -/* 01384 80A4D024 860A00B8 */ lh $t2, 0x00B8($s0) ## 000000B8 -/* 01388 80A4D028 3C0180A5 */ lui $at, %hi(D_80A4E08C) ## $at = 80A50000 -/* 0138C 80A4D02C C430E08C */ lwc1 $f16, %lo(D_80A4E08C)($at) -/* 01390 80A4D030 448A4000 */ mtc1 $t2, $f8 ## $f8 = 0.00 -/* 01394 80A4D034 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 01398 80A4D038 468042A0 */ cvt.s.w $f10, $f8 -/* 0139C 80A4D03C 46105302 */ mul.s $f12, $f10, $f16 -/* 013A0 80A4D040 0C0343B5 */ jal Matrix_RotateZ -/* 013A4 80A4D044 00000000 */ nop -/* 013A8 80A4D048 0C034236 */ jal Matrix_Get -/* 013AC 80A4D04C 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFF9C -/* 013B0 80A4D050 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFF9C -/* 013B4 80A4D054 260500B4 */ addiu $a1, $s0, 0x00B4 ## $a1 = 000000B4 -/* 013B8 80A4D058 0C034833 */ jal func_800D20CC -/* 013BC 80A4D05C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 013C0 80A4D060 8FBF001C */ lw $ra, 0x001C($sp) -/* 013C4 80A4D064 8FB00018 */ lw $s0, 0x0018($sp) -/* 013C8 80A4D068 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 -/* 013CC 80A4D06C 03E00008 */ jr $ra -/* 013D0 80A4D070 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D074.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D074.s deleted file mode 100644 index 9f1b548648..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D074.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_80A4D074 -/* 013D4 80A4D074 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 013D8 80A4D078 AFBF0014 */ sw $ra, 0x0014($sp) -/* 013DC 80A4D07C AFA50024 */ sw $a1, 0x0024($sp) -/* 013E0 80A4D080 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 013E4 80A4D084 AFA40020 */ sw $a0, 0x0020($sp) -/* 013E8 80A4D088 00021203 */ sra $v0, $v0, 8 -/* 013EC 80A4D08C 30420003 */ andi $v0, $v0, 0x0003 ## $v0 = 00000000 -/* 013F0 80A4D090 00021400 */ sll $v0, $v0, 16 -/* 013F4 80A4D094 00021403 */ sra $v0, $v0, 16 -/* 013F8 80A4D098 0C29304D */ jal func_80A4C134 -/* 013FC 80A4D09C A7A2001E */ sh $v0, 0x001E($sp) -/* 01400 80A4D0A0 87A2001E */ lh $v0, 0x001E($sp) -/* 01404 80A4D0A4 8FA40020 */ lw $a0, 0x0020($sp) -/* 01408 80A4D0A8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0140C 80A4D0AC 50400004 */ beql $v0, $zero, .L80A4D0C0 -/* 01410 80A4D0B0 848601CC */ lh $a2, 0x01CC($a0) ## 000001CC -/* 01414 80A4D0B4 1441000B */ bne $v0, $at, .L80A4D0E4 -/* 01418 80A4D0B8 00000000 */ nop -/* 0141C 80A4D0BC 848601CC */ lh $a2, 0x01CC($a0) ## 000001CC -.L80A4D0C0: -/* 01420 80A4D0C0 8FA50024 */ lw $a1, 0x0024($sp) -/* 01424 80A4D0C4 10C00004 */ beq $a2, $zero, .L80A4D0D8 -/* 01428 80A4D0C8 00000000 */ nop -/* 0142C 80A4D0CC 848E01CA */ lh $t6, 0x01CA($a0) ## 000001CA -/* 01430 80A4D0D0 15C60004 */ bne $t6, $a2, .L80A4D0E4 -/* 01434 80A4D0D4 00000000 */ nop -.L80A4D0D8: -/* 01438 80A4D0D8 0C293071 */ jal func_80A4C1C4 -/* 0143C 80A4D0DC AFA40020 */ sw $a0, 0x0020($sp) -/* 01440 80A4D0E0 8FA40020 */ lw $a0, 0x0020($sp) -.L80A4D0E4: -/* 01444 80A4D0E4 0C292F95 */ jal func_80A4BE54 -/* 01448 80A4D0E8 8FA50024 */ lw $a1, 0x0024($sp) -/* 0144C 80A4D0EC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01450 80A4D0F0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01454 80A4D0F4 03E00008 */ jr $ra -/* 01458 80A4D0F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D0FC.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D0FC.s deleted file mode 100644 index 421ce7f41e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D0FC.s +++ /dev/null @@ -1,221 +0,0 @@ -.late_rodata -glabel D_80A4E090 - .word 0x477FFF00 -glabel D_80A4E094 - .float 0.2 - -.text -glabel func_80A4D0FC -/* 0145C 80A4D0FC 27BDFF18 */ addiu $sp, $sp, 0xFF18 ## $sp = FFFFFF18 -/* 01460 80A4D100 AFBF009C */ sw $ra, 0x009C($sp) -/* 01464 80A4D104 AFBE0098 */ sw $s8, 0x0098($sp) -/* 01468 80A4D108 AFB70094 */ sw $s7, 0x0094($sp) -/* 0146C 80A4D10C AFB60090 */ sw $s6, 0x0090($sp) -/* 01470 80A4D110 AFB5008C */ sw $s5, 0x008C($sp) -/* 01474 80A4D114 AFB40088 */ sw $s4, 0x0088($sp) -/* 01478 80A4D118 AFB30084 */ sw $s3, 0x0084($sp) -/* 0147C 80A4D11C AFB20080 */ sw $s2, 0x0080($sp) -/* 01480 80A4D120 AFB1007C */ sw $s1, 0x007C($sp) -/* 01484 80A4D124 AFB00078 */ sw $s0, 0x0078($sp) -/* 01488 80A4D128 F7BE0070 */ sdc1 $f30, 0x0070($sp) -/* 0148C 80A4D12C F7BC0068 */ sdc1 $f28, 0x0068($sp) -/* 01490 80A4D130 F7BA0060 */ sdc1 $f26, 0x0060($sp) -/* 01494 80A4D134 F7B80058 */ sdc1 $f24, 0x0058($sp) -/* 01498 80A4D138 F7B60050 */ sdc1 $f22, 0x0050($sp) -/* 0149C 80A4D13C F7B40048 */ sdc1 $f20, 0x0048($sp) -/* 014A0 80A4D140 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 014A4 80A4D144 3C0180A5 */ lui $at, %hi(D_80A4E090) ## $at = 80A50000 -/* 014A8 80A4D148 C43EE090 */ lwc1 $f30, %lo(D_80A4E090)($at) -/* 014AC 80A4D14C 00021283 */ sra $v0, $v0, 10 -/* 014B0 80A4D150 30420001 */ andi $v0, $v0, 0x0001 ## $v0 = 00000000 -/* 014B4 80A4D154 3C0180A5 */ lui $at, %hi(D_80A4E094) ## $at = 80A50000 -/* 014B8 80A4D158 00021400 */ sll $v0, $v0, 16 -/* 014BC 80A4D15C C43CE094 */ lwc1 $f28, %lo(D_80A4E094)($at) -/* 014C0 80A4D160 00021403 */ sra $v0, $v0, 16 -/* 014C4 80A4D164 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 014C8 80A4D168 3C0F80A5 */ lui $t7, %hi(D_80A4DEF0) ## $t7 = 80A50000 -/* 014CC 80A4D16C 25EFDEF0 */ addiu $t7, $t7, %lo(D_80A4DEF0) ## $t7 = 80A4DEF0 -/* 014D0 80A4D170 00027080 */ sll $t6, $v0, 2 -/* 014D4 80A4D174 3C1E0401 */ lui $s8, 0x0401 ## $s8 = 04010000 -/* 014D8 80A4D178 4481D000 */ mtc1 $at, $f26 ## $f26 = 50.00 -/* 014DC 80A4D17C 00A0B025 */ or $s6, $a1, $zero ## $s6 = 00000000 -/* 014E0 80A4D180 27DED340 */ addiu $s8, $s8, 0xD340 ## $s8 = 0400D340 -/* 014E4 80A4D184 01CFA821 */ addu $s5, $t6, $t7 -/* 014E8 80A4D188 27B100D0 */ addiu $s1, $sp, 0x00D0 ## $s1 = FFFFFFE8 -/* 014EC 80A4D18C 00009025 */ or $s2, $zero, $zero ## $s2 = 00000000 -/* 014F0 80A4D190 00009825 */ or $s3, $zero, $zero ## $s3 = 00000000 -/* 014F4 80A4D194 24940024 */ addiu $s4, $a0, 0x0024 ## $s4 = 00000024 -/* 014F8 80A4D198 27B700C4 */ addiu $s7, $sp, 0x00C4 ## $s7 = FFFFFFDC -.L80A4D19C: -/* 014FC 80A4D19C 00122400 */ sll $a0, $s2, 16 -/* 01500 80A4D1A0 0C01DE1C */ jal Math_Sins - ## sins? -/* 01504 80A4D1A4 00042403 */ sra $a0, $a0, 16 -/* 01508 80A4D1A8 00122400 */ sll $a0, $s2, 16 -/* 0150C 80A4D1AC 46000586 */ mov.s $f22, $f0 -/* 01510 80A4D1B0 0C01DE0D */ jal Math_Coss - ## coss? -/* 01514 80A4D1B4 00042403 */ sra $a0, $a0, 16 -/* 01518 80A4D1B8 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 0151C 80A4D1BC 46000606 */ mov.s $f24, $f0 -/* 01520 80A4D1C0 461E0102 */ mul.s $f4, $f0, $f30 -/* 01524 80A4D1C4 4600218D */ trunc.w.s $f6, $f4 -/* 01528 80A4D1C8 44103000 */ mfc1 $s0, $f6 -/* 0152C 80A4D1CC 00000000 */ nop -/* 01530 80A4D1D0 00108400 */ sll $s0, $s0, 16 -/* 01534 80A4D1D4 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 01538 80A4D1D8 00108403 */ sra $s0, $s0, 16 -/* 0153C 80A4D1DC 00102400 */ sll $a0, $s0, 16 -/* 01540 80A4D1E0 00042403 */ sra $a0, $a0, 16 -/* 01544 80A4D1E4 0C01DE1C */ jal Math_Sins - ## sins? -/* 01548 80A4D1E8 46000506 */ mov.s $f20, $f0 -/* 0154C 80A4D1EC 461AA202 */ mul.s $f8, $f20, $f26 -/* 01550 80A4D1F0 00102400 */ sll $a0, $s0, 16 -/* 01554 80A4D1F4 00042403 */ sra $a0, $a0, 16 -/* 01558 80A4D1F8 46164282 */ mul.s $f10, $f8, $f22 -/* 0155C 80A4D1FC 00000000 */ nop -/* 01560 80A4D200 460A0402 */ mul.s $f16, $f0, $f10 -/* 01564 80A4D204 0C01DE1C */ jal Math_Sins - ## sins? -/* 01568 80A4D208 E7B000D0 */ swc1 $f16, 0x00D0($sp) -/* 0156C 80A4D20C 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 01570 80A4D210 46000506 */ mov.s $f20, $f0 -/* 01574 80A4D214 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 01578 80A4D218 44819000 */ mtc1 $at, $f18 ## $f18 = 0.50 -/* 0157C 80A4D21C 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 01580 80A4D220 44813000 */ mtc1 $at, $f6 ## $f6 = 100.00 -/* 01584 80A4D224 46120101 */ sub.s $f4, $f0, $f18 -/* 01588 80A4D228 C6B00000 */ lwc1 $f16, 0x0000($s5) ## 00000000 -/* 0158C 80A4D22C 46062202 */ mul.s $f8, $f4, $f6 -/* 01590 80A4D230 00000000 */ nop -/* 01594 80A4D234 46144282 */ mul.s $f10, $f8, $f20 -/* 01598 80A4D238 460A8480 */ add.s $f18, $f16, $f10 -/* 0159C 80A4D23C 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 015A0 80A4D240 E7B200D4 */ swc1 $f18, 0x00D4($sp) -/* 015A4 80A4D244 00102400 */ sll $a0, $s0, 16 -/* 015A8 80A4D248 00042403 */ sra $a0, $a0, 16 -/* 015AC 80A4D24C 0C01DE1C */ jal Math_Sins - ## sins? -/* 015B0 80A4D250 46000506 */ mov.s $f20, $f0 -/* 015B4 80A4D254 461AA102 */ mul.s $f4, $f20, $f26 -/* 015B8 80A4D258 C7B000D0 */ lwc1 $f16, 0x00D0($sp) -/* 015BC 80A4D25C 46182182 */ mul.s $f6, $f4, $f24 -/* 015C0 80A4D260 00000000 */ nop -/* 015C4 80A4D264 46060202 */ mul.s $f8, $f0, $f6 -/* 015C8 80A4D268 00000000 */ nop -/* 015CC 80A4D26C 461C8282 */ mul.s $f10, $f16, $f28 -/* 015D0 80A4D270 E7A800D8 */ swc1 $f8, 0x00D8($sp) -/* 015D4 80A4D274 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 015D8 80A4D278 E7AA00C4 */ swc1 $f10, 0x00C4($sp) -/* 015DC 80A4D27C 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -/* 015E0 80A4D280 44819000 */ mtc1 $at, $f18 ## $f18 = 15.00 -/* 015E4 80A4D284 C7B000D8 */ lwc1 $f16, 0x00D8($sp) -/* 015E8 80A4D288 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 015EC 80A4D28C 46120102 */ mul.s $f4, $f0, $f18 -/* 015F0 80A4D290 44813000 */ mtc1 $at, $f6 ## $f6 = 2.00 -/* 015F4 80A4D294 02202025 */ or $a0, $s1, $zero ## $a0 = FFFFFFE8 -/* 015F8 80A4D298 461C8282 */ mul.s $f10, $f16, $f28 -/* 015FC 80A4D29C 02802825 */ or $a1, $s4, $zero ## $a1 = 00000024 -/* 01600 80A4D2A0 02203025 */ or $a2, $s1, $zero ## $a2 = FFFFFFE8 -/* 01604 80A4D2A4 46062200 */ add.s $f8, $f4, $f6 -/* 01608 80A4D2A8 E7AA00CC */ swc1 $f10, 0x00CC($sp) -/* 0160C 80A4D2AC 0C01DFA7 */ jal Math_Vec3f_Sum - ## Vec3f_Add -/* 01610 80A4D2B0 E7A800C8 */ swc1 $f8, 0x00C8($sp) -/* 01614 80A4D2B4 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 01618 80A4D2B8 00000000 */ nop -/* 0161C 80A4D2BC 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 -/* 01620 80A4D2C0 44819000 */ mtc1 $at, $f18 ## $f18 = 7.00 -/* 01624 80A4D2C4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01628 80A4D2C8 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 0162C 80A4D2CC 46120102 */ mul.s $f4, $f0, $f18 -/* 01630 80A4D2D0 2419FEAC */ addiu $t9, $zero, 0xFEAC ## $t9 = FFFFFEAC -/* 01634 80A4D2D4 24080021 */ addiu $t0, $zero, 0x0021 ## $t0 = 00000021 -/* 01638 80A4D2D8 2409001C */ addiu $t1, $zero, 0x001C ## $t1 = 0000001C -/* 0163C 80A4D2DC 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 -/* 01640 80A4D2E0 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 01644 80A4D2E4 240E0046 */ addiu $t6, $zero, 0x0046 ## $t6 = 00000046 -/* 01648 80A4D2E8 46062200 */ add.s $f8, $f4, $f6 -/* 0164C 80A4D2EC 240FFFFF */ addiu $t7, $zero, 0xFFFF ## $t7 = FFFFFFFF -/* 01650 80A4D2F0 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 01654 80A4D2F4 AFB80038 */ sw $t8, 0x0038($sp) -/* 01658 80A4D2F8 4600440D */ trunc.w.s $f16, $f8 -/* 0165C 80A4D2FC AFAF0034 */ sw $t7, 0x0034($sp) -/* 01660 80A4D300 AFAE0030 */ sw $t6, 0x0030($sp) -/* 01664 80A4D304 AFAD0028 */ sw $t5, 0x0028($sp) -/* 01668 80A4D308 440C8000 */ mfc1 $t4, $f16 -/* 0166C 80A4D30C AFAA001C */ sw $t2, 0x001C($sp) -/* 01670 80A4D310 AFA90018 */ sw $t1, 0x0018($sp) -/* 01674 80A4D314 AFA80014 */ sw $t0, 0x0014($sp) -/* 01678 80A4D318 AFB90010 */ sw $t9, 0x0010($sp) -/* 0167C 80A4D31C 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 -/* 01680 80A4D320 02202825 */ or $a1, $s1, $zero ## $a1 = FFFFFFE8 -/* 01684 80A4D324 02E03025 */ or $a2, $s7, $zero ## $a2 = FFFFFFDC -/* 01688 80A4D328 02203825 */ or $a3, $s1, $zero ## $a3 = FFFFFFE8 -/* 0168C 80A4D32C AFA00020 */ sw $zero, 0x0020($sp) -/* 01690 80A4D330 AFA0002C */ sw $zero, 0x002C($sp) -/* 01694 80A4D334 AFBE003C */ sw $s8, 0x003C($sp) -/* 01698 80A4D338 0C00A7A3 */ jal func_80029E8C - -/* 0169C 80A4D33C AFAC0024 */ sw $t4, 0x0024($sp) -/* 016A0 80A4D340 26524E20 */ addiu $s2, $s2, 0x4E20 ## $s2 = 00004E20 -/* 016A4 80A4D344 00129400 */ sll $s2, $s2, 16 -/* 016A8 80A4D348 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000001 -/* 016AC 80A4D34C 24010010 */ addiu $at, $zero, 0x0010 ## $at = 00000010 -/* 016B0 80A4D350 1661FF92 */ bne $s3, $at, .L80A4D19C -/* 016B4 80A4D354 00129403 */ sra $s2, $s2, 16 -/* 016B8 80A4D358 C68A0000 */ lwc1 $f10, 0x0000($s4) ## 00000024 -/* 016BC 80A4D35C C6B20000 */ lwc1 $f18, 0x0000($s5) ## 00000000 -/* 016C0 80A4D360 24190046 */ addiu $t9, $zero, 0x0046 ## $t9 = 00000046 -/* 016C4 80A4D364 E7AA00D0 */ swc1 $f10, 0x00D0($sp) -/* 016C8 80A4D368 C6840004 */ lwc1 $f4, 0x0004($s4) ## 00000028 -/* 016CC 80A4D36C 2408006E */ addiu $t0, $zero, 0x006E ## $t0 = 0000006E -/* 016D0 80A4D370 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 016D4 80A4D374 46049180 */ add.s $f6, $f18, $f4 -/* 016D8 80A4D378 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 -/* 016DC 80A4D37C 02202825 */ or $a1, $s1, $zero ## $a1 = FFFFFFE8 -/* 016E0 80A4D380 3C0642A0 */ lui $a2, 0x42A0 ## $a2 = 42A00000 -/* 016E4 80A4D384 E7A600D4 */ swc1 $f6, 0x00D4($sp) -/* 016E8 80A4D388 C6880008 */ lwc1 $f8, 0x0008($s4) ## 0000002C -/* 016EC 80A4D38C AFA90018 */ sw $t1, 0x0018($sp) -/* 016F0 80A4D390 AFA80014 */ sw $t0, 0x0014($sp) -/* 016F4 80A4D394 AFB90010 */ sw $t9, 0x0010($sp) -/* 016F8 80A4D398 24070005 */ addiu $a3, $zero, 0x0005 ## $a3 = 00000005 -/* 016FC 80A4D39C 0C00CD20 */ jal func_80033480 -/* 01700 80A4D3A0 E7A800D8 */ swc1 $f8, 0x00D8($sp) -/* 01704 80A4D3A4 240A006E */ addiu $t2, $zero, 0x006E ## $t2 = 0000006E -/* 01708 80A4D3A8 240B00A0 */ addiu $t3, $zero, 0x00A0 ## $t3 = 000000A0 -/* 0170C 80A4D3AC 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 01710 80A4D3B0 AFAC0018 */ sw $t4, 0x0018($sp) -/* 01714 80A4D3B4 AFAB0014 */ sw $t3, 0x0014($sp) -/* 01718 80A4D3B8 AFAA0010 */ sw $t2, 0x0010($sp) -/* 0171C 80A4D3BC 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 -/* 01720 80A4D3C0 02202825 */ or $a1, $s1, $zero ## $a1 = FFFFFFE8 -/* 01724 80A4D3C4 3C0642B4 */ lui $a2, 0x42B4 ## $a2 = 42B40000 -/* 01728 80A4D3C8 0C00CD20 */ jal func_80033480 -/* 0172C 80A4D3CC 24070005 */ addiu $a3, $zero, 0x0005 ## $a3 = 00000005 -/* 01730 80A4D3D0 8FBF009C */ lw $ra, 0x009C($sp) -/* 01734 80A4D3D4 D7B40048 */ ldc1 $f20, 0x0048($sp) -/* 01738 80A4D3D8 D7B60050 */ ldc1 $f22, 0x0050($sp) -/* 0173C 80A4D3DC D7B80058 */ ldc1 $f24, 0x0058($sp) -/* 01740 80A4D3E0 D7BA0060 */ ldc1 $f26, 0x0060($sp) -/* 01744 80A4D3E4 D7BC0068 */ ldc1 $f28, 0x0068($sp) -/* 01748 80A4D3E8 D7BE0070 */ ldc1 $f30, 0x0070($sp) -/* 0174C 80A4D3EC 8FB00078 */ lw $s0, 0x0078($sp) -/* 01750 80A4D3F0 8FB1007C */ lw $s1, 0x007C($sp) -/* 01754 80A4D3F4 8FB20080 */ lw $s2, 0x0080($sp) -/* 01758 80A4D3F8 8FB30084 */ lw $s3, 0x0084($sp) -/* 0175C 80A4D3FC 8FB40088 */ lw $s4, 0x0088($sp) -/* 01760 80A4D400 8FB5008C */ lw $s5, 0x008C($sp) -/* 01764 80A4D404 8FB60090 */ lw $s6, 0x0090($sp) -/* 01768 80A4D408 8FB70094 */ lw $s7, 0x0094($sp) -/* 0176C 80A4D40C 8FBE0098 */ lw $s8, 0x0098($sp) -/* 01770 80A4D410 03E00008 */ jr $ra -/* 01774 80A4D414 27BD00E8 */ addiu $sp, $sp, 0x00E8 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D5E0.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D5E0.s deleted file mode 100644 index 5b3ef3fe1b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D5E0.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80A4D5E0 -/* 01940 80A4D5E0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01944 80A4D5E4 3C0E80A5 */ lui $t6, %hi(func_80A4D624) ## $t6 = 80A50000 -/* 01948 80A4D5E8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0194C 80A4D5EC 25CED624 */ addiu $t6, $t6, %lo(func_80A4D624) ## $t6 = 80A4D624 -/* 01950 80A4D5F0 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 01954 80A4D5F4 AFA40018 */ sw $a0, 0x0018($sp) -/* 01958 80A4D5F8 0C292F5C */ jal func_80A4BD70 -/* 0195C 80A4D5FC 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 01960 80A4D600 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01964 80A4D604 8FA40018 */ lw $a0, 0x0018($sp) -/* 01968 80A4D608 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 0196C 80A4D60C 00000000 */ nop -/* 01970 80A4D610 E48401C0 */ swc1 $f4, 0x01C0($a0) ## 000001C0 -/* 01974 80A4D614 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01978 80A4D618 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0197C 80A4D61C 03E00008 */ jr $ra -/* 01980 80A4D620 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D624.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D624.s deleted file mode 100644 index b7cedd866b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D624.s +++ /dev/null @@ -1,202 +0,0 @@ -.rdata -glabel D_80A4E044 - .asciz "\x1b[36m" - .balign 4 - -glabel D_80A4E04C - .asciz "Player ぶっ飛ばし\n" - .balign 4 - -glabel D_80A4E060 - .asciz "\x1b[m" - .balign 4 - -.text -glabel func_80A4D624 -/* 01984 80A4D624 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01988 80A4D628 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0198C 80A4D62C AFB00020 */ sw $s0, 0x0020($sp) -/* 01990 80A4D630 AFA50034 */ sw $a1, 0x0034($sp) -/* 01994 80A4D634 90820160 */ lbu $v0, 0x0160($a0) ## 00000160 -/* 01998 80A4D638 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0199C 80A4D63C 2401FFFB */ addiu $at, $zero, 0xFFFB ## $at = FFFFFFFB -/* 019A0 80A4D640 304E0002 */ andi $t6, $v0, 0x0002 ## $t6 = 00000000 -/* 019A4 80A4D644 11C00047 */ beq $t6, $zero, .L80A4D764 -/* 019A8 80A4D648 304FFFFD */ andi $t7, $v0, 0xFFFD ## $t7 = 00000000 -/* 019AC 80A4D64C 8488008A */ lh $t0, 0x008A($a0) ## 0000008A -/* 019B0 80A4D650 84890032 */ lh $t1, 0x0032($a0) ## 00000032 -/* 019B4 80A4D654 909801D3 */ lbu $t8, 0x01D3($a0) ## 000001D3 -/* 019B8 80A4D658 A08F0160 */ sb $t7, 0x0160($a0) ## 00000160 -/* 019BC 80A4D65C 01091823 */ subu $v1, $t0, $t1 -/* 019C0 80A4D660 00031C00 */ sll $v1, $v1, 16 -/* 019C4 80A4D664 00031C03 */ sra $v1, $v1, 16 -/* 019C8 80A4D668 0301C824 */ and $t9, $t8, $at -/* 019CC 80A4D66C 2861C001 */ slti $at, $v1, 0xC001 -/* 019D0 80A4D670 14200015 */ bne $at, $zero, .L80A4D6C8 -/* 019D4 80A4D674 A09901D3 */ sb $t9, 0x01D3($a0) ## 000001D3 -/* 019D8 80A4D678 28614000 */ slti $at, $v1, 0x4000 -/* 019DC 80A4D67C 50200013 */ beql $at, $zero, .L80A4D6CC -/* 019E0 80A4D680 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 019E4 80A4D684 848C001C */ lh $t4, 0x001C($a0) ## 0000001C -/* 019E8 80A4D688 372B0004 */ ori $t3, $t9, 0x0004 ## $t3 = 00000004 -/* 019EC 80A4D68C A08B01D3 */ sb $t3, 0x01D3($a0) ## 000001D3 -/* 019F0 80A4D690 000C6A83 */ sra $t5, $t4, 10 -/* 019F4 80A4D694 31AE0001 */ andi $t6, $t5, 0x0001 ## $t6 = 00000000 -/* 019F8 80A4D698 15C00006 */ bne $t6, $zero, .L80A4D6B4 -/* 019FC 80A4D69C 00000000 */ nop -/* 01A00 80A4D6A0 848F0018 */ lh $t7, 0x0018($a0) ## 00000018 -/* 01A04 80A4D6A4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01A08 80A4D6A8 31F80001 */ andi $t8, $t7, 0x0001 ## $t8 = 00000000 -/* 01A0C 80A4D6AC 53010007 */ beql $t8, $at, .L80A4D6CC -/* 01A10 80A4D6B0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -.L80A4D6B4: -/* 01A14 80A4D6B4 0C293059 */ jal func_80A4C164 -/* 01A18 80A4D6B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01A1C 80A4D6BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01A20 80A4D6C0 0C292F95 */ jal func_80A4BE54 -/* 01A24 80A4D6C4 8FA50034 */ lw $a1, 0x0034($sp) -.L80A4D6C8: -/* 01A28 80A4D6C8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -.L80A4D6CC: -/* 01A2C 80A4D6CC 8607008A */ lh $a3, 0x008A($s0) ## 0000008A -/* 01A30 80A4D6D0 AFA00014 */ sw $zero, 0x0014($sp) -/* 01A34 80A4D6D4 8FA40034 */ lw $a0, 0x0034($sp) -/* 01A38 80A4D6D8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01A3C 80A4D6DC 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 -/* 01A40 80A4D6E0 0C00BDB5 */ jal func_8002F6D4 -/* 01A44 80A4D6E4 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 01A48 80A4D6E8 3C0480A5 */ lui $a0, %hi(D_80A4E044) ## $a0 = 80A50000 -/* 01A4C 80A4D6EC 0C00084C */ jal osSyncPrintf - -/* 01A50 80A4D6F0 2484E044 */ addiu $a0, $a0, %lo(D_80A4E044) ## $a0 = 80A4E044 -/* 01A54 80A4D6F4 3C0480A5 */ lui $a0, %hi(D_80A4E04C) ## $a0 = 80A50000 -/* 01A58 80A4D6F8 0C00084C */ jal osSyncPrintf - -/* 01A5C 80A4D6FC 2484E04C */ addiu $a0, $a0, %lo(D_80A4E04C) ## $a0 = 80A4E04C -/* 01A60 80A4D700 3C0480A5 */ lui $a0, %hi(D_80A4E060) ## $a0 = 80A50000 -/* 01A64 80A4D704 0C00084C */ jal osSyncPrintf - -/* 01A68 80A4D708 2484E060 */ addiu $a0, $a0, %lo(D_80A4E060) ## $a0 = 80A4E060 -/* 01A6C 80A4D70C 8619001C */ lh $t9, 0x001C($s0) ## 0000001C -/* 01A70 80A4D710 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01A74 80A4D714 00194283 */ sra $t0, $t9, 10 -/* 01A78 80A4D718 31090001 */ andi $t1, $t0, 0x0001 ## $t1 = 00000000 -/* 01A7C 80A4D71C 00095080 */ sll $t2, $t1, 2 -/* 01A80 80A4D720 3C1980A5 */ lui $t9, %hi(D_80A4DF20) ## $t9 = 80A50000 -/* 01A84 80A4D724 032AC821 */ addu $t9, $t9, $t2 -/* 01A88 80A4D728 8F39DF20 */ lw $t9, %lo(D_80A4DF20)($t9) -/* 01A8C 80A4D72C 0320F809 */ jalr $ra, $t9 -/* 01A90 80A4D730 00000000 */ nop -/* 01A94 80A4D734 8FAB0034 */ lw $t3, 0x0034($sp) -/* 01A98 80A4D738 2405083E */ addiu $a1, $zero, 0x083E ## $a1 = 0000083E -/* 01A9C 80A4D73C 0C00BDF7 */ jal func_8002F7DC -/* 01AA0 80A4D740 8D641C44 */ lw $a0, 0x1C44($t3) ## 00001C44 -/* 01AA4 80A4D744 860C0018 */ lh $t4, 0x0018($s0) ## 00000018 -/* 01AA8 80A4D748 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01AAC 80A4D74C 240E0032 */ addiu $t6, $zero, 0x0032 ## $t6 = 00000032 -/* 01AB0 80A4D750 318D0001 */ andi $t5, $t4, 0x0001 ## $t5 = 00000000 -/* 01AB4 80A4D754 55A10056 */ bnel $t5, $at, .L80A4D8B0 -/* 01AB8 80A4D758 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01ABC 80A4D75C 10000053 */ beq $zero, $zero, .L80A4D8AC -/* 01AC0 80A4D760 A60E01C8 */ sh $t6, 0x01C8($s0) ## 000001C8 -.L80A4D764: -/* 01AC4 80A4D764 860F001C */ lh $t7, 0x001C($s0) ## 0000001C -/* 01AC8 80A4D768 3C1980A5 */ lui $t9, %hi(D_80A4DF18) ## $t9 = 80A50000 -/* 01ACC 80A4D76C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01AD0 80A4D770 000FC283 */ sra $t8, $t7, 10 -/* 01AD4 80A4D774 33080001 */ andi $t0, $t8, 0x0001 ## $t0 = 00000000 -/* 01AD8 80A4D778 00084880 */ sll $t1, $t0, 2 -/* 01ADC 80A4D77C 0329C821 */ addu $t9, $t9, $t1 -/* 01AE0 80A4D780 8F39DF18 */ lw $t9, %lo(D_80A4DF18)($t9) -/* 01AE4 80A4D784 8FA50034 */ lw $a1, 0x0034($sp) -/* 01AE8 80A4D788 0320F809 */ jalr $ra, $t9 -/* 01AEC 80A4D78C 00000000 */ nop -/* 01AF0 80A4D790 50400047 */ beql $v0, $zero, .L80A4D8B0 -/* 01AF4 80A4D794 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01AF8 80A4D798 8603001C */ lh $v1, 0x001C($s0) ## 0000001C -/* 01AFC 80A4D79C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01B00 80A4D7A0 00031A03 */ sra $v1, $v1, 8 -/* 01B04 80A4D7A4 30630003 */ andi $v1, $v1, 0x0003 ## $v1 = 00000000 -/* 01B08 80A4D7A8 00031C00 */ sll $v1, $v1, 16 -/* 01B0C 80A4D7AC 00031C03 */ sra $v1, $v1, 16 -/* 01B10 80A4D7B0 5461000D */ bnel $v1, $at, .L80A4D7E8 -/* 01B14 80A4D7B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01B18 80A4D7B8 860201CE */ lh $v0, 0x01CE($s0) ## 000001CE -/* 01B1C 80A4D7BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01B20 80A4D7C0 8FA50034 */ lw $a1, 0x0034($sp) -/* 01B24 80A4D7C4 10400004 */ beq $v0, $zero, .L80A4D7D8 -/* 01B28 80A4D7C8 00000000 */ nop -/* 01B2C 80A4D7CC 860A01CA */ lh $t2, 0x01CA($s0) ## 000001CA -/* 01B30 80A4D7D0 55420005 */ bnel $t2, $v0, .L80A4D7E8 -/* 01B34 80A4D7D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A4D7D8: -/* 01B38 80A4D7D8 0C29343F */ jal func_80A4D0FC -/* 01B3C 80A4D7DC A7A30028 */ sh $v1, 0x0028($sp) -/* 01B40 80A4D7E0 87A30028 */ lh $v1, 0x0028($sp) -/* 01B44 80A4D7E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A4D7E8: -/* 01B48 80A4D7E8 8FA50034 */ lw $a1, 0x0034($sp) -/* 01B4C 80A4D7EC 0C29341D */ jal func_80A4D074 -/* 01B50 80A4D7F0 A7A30028 */ sh $v1, 0x0028($sp) -/* 01B54 80A4D7F4 87A30028 */ lh $v1, 0x0028($sp) -/* 01B58 80A4D7F8 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 01B5C 80A4D7FC 5461000C */ bnel $v1, $at, .L80A4D830 -/* 01B60 80A4D800 860C001C */ lh $t4, 0x001C($s0) ## 0000001C -/* 01B64 80A4D804 860201CC */ lh $v0, 0x01CC($s0) ## 000001CC -/* 01B68 80A4D808 10400004 */ beq $v0, $zero, .L80A4D81C -/* 01B6C 80A4D80C 00000000 */ nop -/* 01B70 80A4D810 860B01CA */ lh $t3, 0x01CA($s0) ## 000001CA -/* 01B74 80A4D814 55620006 */ bnel $t3, $v0, .L80A4D830 -/* 01B78 80A4D818 860C001C */ lh $t4, 0x001C($s0) ## 0000001C -.L80A4D81C: -/* 01B7C 80A4D81C 0C293677 */ jal func_80A4D9DC -/* 01B80 80A4D820 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01B84 80A4D824 10000022 */ beq $zero, $zero, .L80A4D8B0 -/* 01B88 80A4D828 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01B8C 80A4D82C 860C001C */ lh $t4, 0x001C($s0) ## 0000001C -.L80A4D830: -/* 01B90 80A4D830 000C6A83 */ sra $t5, $t4, 10 -/* 01B94 80A4D834 31AE0001 */ andi $t6, $t5, 0x0001 ## $t6 = 00000000 -/* 01B98 80A4D838 15C0001A */ bne $t6, $zero, .L80A4D8A4 -/* 01B9C 80A4D83C 00000000 */ nop -/* 01BA0 80A4D840 860201CC */ lh $v0, 0x01CC($s0) ## 000001CC -/* 01BA4 80A4D844 10400017 */ beq $v0, $zero, .L80A4D8A4 -/* 01BA8 80A4D848 00000000 */ nop -/* 01BAC 80A4D84C 860F01CA */ lh $t7, 0x01CA($s0) ## 000001CA -/* 01BB0 80A4D850 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01BB4 80A4D854 11E20013 */ beq $t7, $v0, .L80A4D8A4 -/* 01BB8 80A4D858 00000000 */ nop -/* 01BBC 80A4D85C 0C29309F */ jal func_80A4C27C -/* 01BC0 80A4D860 8FA50034 */ lw $a1, 0x0034($sp) -/* 01BC4 80A4D864 18400005 */ blez $v0, .L80A4D87C -/* 01BC8 80A4D868 00000000 */ nop -/* 01BCC 80A4D86C 0C29369F */ jal func_80A4DA7C -/* 01BD0 80A4D870 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01BD4 80A4D874 1000000E */ beq $zero, $zero, .L80A4D8B0 -/* 01BD8 80A4D878 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A4D87C: -/* 01BDC 80A4D87C 04410005 */ bgez $v0, .L80A4D894 -/* 01BE0 80A4D880 00000000 */ nop -/* 01BE4 80A4D884 0C2936E4 */ jal func_80A4DB90 -/* 01BE8 80A4D888 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01BEC 80A4D88C 10000008 */ beq $zero, $zero, .L80A4D8B0 -/* 01BF0 80A4D890 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A4D894: -/* 01BF4 80A4D894 0C293578 */ jal func_80A4D5E0 -/* 01BF8 80A4D898 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01BFC 80A4D89C 10000004 */ beq $zero, $zero, .L80A4D8B0 -/* 01C00 80A4D8A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A4D8A4: -/* 01C04 80A4D8A4 0C293578 */ jal func_80A4D5E0 -/* 01C08 80A4D8A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A4D8AC: -/* 01C0C 80A4D8AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A4D8B0: -/* 01C10 80A4D8B0 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01C14 80A4D8B4 240520B8 */ addiu $a1, $zero, 0x20B8 ## $a1 = 000020B8 -/* 01C18 80A4D8B8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01C1C 80A4D8BC 8FB00020 */ lw $s0, 0x0020($sp) -/* 01C20 80A4D8C0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01C24 80A4D8C4 03E00008 */ jr $ra -/* 01C28 80A4D8C8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D8CC.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D8CC.s deleted file mode 100644 index 89082bfc3a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D8CC.s +++ /dev/null @@ -1,38 +0,0 @@ -.late_rodata -glabel D_80A4E098 - .word 0xBF5C28F6 -glabel D_80A4E09C - .float 0.15 - -.text -glabel func_80A4D8CC -/* 01C2C 80A4D8CC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01C30 80A4D8D0 3C0E80A5 */ lui $t6, %hi(func_80A4D944) ## $t6 = 80A50000 -/* 01C34 80A4D8D4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01C38 80A4D8D8 25CED944 */ addiu $t6, $t6, %lo(func_80A4D944) ## $t6 = 80A4D944 -/* 01C3C 80A4D8DC AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 01C40 80A4D8E0 AFA40018 */ sw $a0, 0x0018($sp) -/* 01C44 80A4D8E4 0C292F5C */ jal func_80A4BD70 -/* 01C48 80A4D8E8 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 01C4C 80A4D8EC 3C0180A5 */ lui $at, %hi(D_80A4E098) ## $at = 80A50000 -/* 01C50 80A4D8F0 C424E098 */ lwc1 $f4, %lo(D_80A4E098)($at) -/* 01C54 80A4D8F4 8FA40018 */ lw $a0, 0x0018($sp) -/* 01C58 80A4D8F8 3C01C170 */ lui $at, 0xC170 ## $at = C1700000 -/* 01C5C 80A4D8FC 44813000 */ mtc1 $at, $f6 ## $f6 = -15.00 -/* 01C60 80A4D900 3C0180A5 */ lui $at, %hi(D_80A4E09C) ## $at = 80A50000 -/* 01C64 80A4D904 E484006C */ swc1 $f4, 0x006C($a0) ## 0000006C -/* 01C68 80A4D908 E4860070 */ swc1 $f6, 0x0070($a0) ## 00000070 -/* 01C6C 80A4D90C C42AE09C */ lwc1 $f10, %lo(D_80A4E09C)($at) -/* 01C70 80A4D910 C4880068 */ lwc1 $f8, 0x0068($a0) ## 00000068 -/* 01C74 80A4D914 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 01C78 80A4D918 44819000 */ mtc1 $at, $f18 ## $f18 = 5.00 -/* 01C7C 80A4D91C 460A4402 */ mul.s $f16, $f8, $f10 -/* 01C80 80A4D920 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01C84 80A4D924 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 01C88 80A4D928 E4920060 */ swc1 $f18, 0x0060($a0) ## 00000060 -/* 01C8C 80A4D92C E48401C0 */ swc1 $f4, 0x01C0($a0) ## 000001C0 -/* 01C90 80A4D930 E4900068 */ swc1 $f16, 0x0068($a0) ## 00000068 -/* 01C94 80A4D934 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01C98 80A4D938 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01C9C 80A4D93C 03E00008 */ jr $ra -/* 01CA0 80A4D940 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D944.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D944.s deleted file mode 100644 index 58876ac760..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D944.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_80A4D944 -/* 01CA4 80A4D944 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01CA8 80A4D948 AFBF001C */ sw $ra, 0x001C($sp) -/* 01CAC 80A4D94C AFB00018 */ sw $s0, 0x0018($sp) -/* 01CB0 80A4D950 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01CB4 80A4D954 0C2931B2 */ jal func_80A4C6C8 -/* 01CB8 80A4D958 AFA50024 */ sw $a1, 0x0024($sp) -/* 01CBC 80A4D95C 960E0088 */ lhu $t6, 0x0088($s0) ## 00000088 -/* 01CC0 80A4D960 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 01CC4 80A4D964 51E00019 */ beql $t7, $zero, .L80A4D9CC -/* 01CC8 80A4D968 8FBF001C */ lw $ra, 0x001C($sp) -/* 01CCC 80A4D96C C6040060 */ lwc1 $f4, 0x0060($s0) ## 00000060 -/* 01CD0 80A4D970 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 01CD4 80A4D974 00000000 */ nop -/* 01CD8 80A4D978 4606203C */ c.lt.s $f4, $f6 -/* 01CDC 80A4D97C 00000000 */ nop -/* 01CE0 80A4D980 45020012 */ bc1fl .L80A4D9CC -/* 01CE4 80A4D984 8FBF001C */ lw $ra, 0x001C($sp) -/* 01CE8 80A4D988 921801D3 */ lbu $t8, 0x01D3($s0) ## 000001D3 -/* 01CEC 80A4D98C 33190004 */ andi $t9, $t8, 0x0004 ## $t9 = 00000000 -/* 01CF0 80A4D990 1320000B */ beq $t9, $zero, .L80A4D9C0 -/* 01CF4 80A4D994 00000000 */ nop -/* 01CF8 80A4D998 86080018 */ lh $t0, 0x0018($s0) ## 00000018 -/* 01CFC 80A4D99C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01D00 80A4D9A0 31090001 */ andi $t1, $t0, 0x0001 ## $t1 = 00000000 -/* 01D04 80A4D9A4 15210006 */ bne $t1, $at, .L80A4D9C0 -/* 01D08 80A4D9A8 00000000 */ nop -/* 01D0C 80A4D9AC 0C293059 */ jal func_80A4C164 -/* 01D10 80A4D9B0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01D14 80A4D9B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01D18 80A4D9B8 0C292F95 */ jal func_80A4BE54 -/* 01D1C 80A4D9BC 8FA50024 */ lw $a1, 0x0024($sp) -.L80A4D9C0: -/* 01D20 80A4D9C0 0C293677 */ jal func_80A4D9DC -/* 01D24 80A4D9C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01D28 80A4D9C8 8FBF001C */ lw $ra, 0x001C($sp) -.L80A4D9CC: -/* 01D2C 80A4D9CC 8FB00018 */ lw $s0, 0x0018($sp) -/* 01D30 80A4D9D0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01D34 80A4D9D4 03E00008 */ jr $ra -/* 01D38 80A4D9D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D9DC.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D9DC.s deleted file mode 100644 index 5cbcd609d3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D9DC.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80A4D9DC -/* 01D3C 80A4D9DC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01D40 80A4D9E0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01D44 80A4D9E4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01D48 80A4D9E8 3C0E80A5 */ lui $t6, %hi(func_80A4DA3C) ## $t6 = 80A50000 -/* 01D4C 80A4D9EC 25CEDA3C */ addiu $t6, $t6, %lo(func_80A4DA3C) ## $t6 = 80A4DA3C -/* 01D50 80A4D9F0 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 01D54 80A4D9F4 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 01D58 80A4D9F8 AFA40018 */ sw $a0, 0x0018($sp) -/* 01D5C 80A4D9FC 0C292F5C */ jal func_80A4BD70 -/* 01D60 80A4DA00 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 01D64 80A4DA04 8FA40018 */ lw $a0, 0x0018($sp) -/* 01D68 80A4DA08 3C0880A5 */ lui $t0, %hi(D_80A4DF28) ## $t0 = 80A50000 -/* 01D6C 80A4DA0C 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 01D70 80A4DA10 848F0018 */ lh $t7, 0x0018($a0) ## 00000018 -/* 01D74 80A4DA14 31F80001 */ andi $t8, $t7, 0x0001 ## $t8 = 00000000 -/* 01D78 80A4DA18 0018C840 */ sll $t9, $t8, 1 -/* 01D7C 80A4DA1C 01194021 */ addu $t0, $t0, $t9 -/* 01D80 80A4DA20 8508DF28 */ lh $t0, %lo(D_80A4DF28)($t0) -/* 01D84 80A4DA24 E48601C0 */ swc1 $f6, 0x01C0($a0) ## 000001C0 -/* 01D88 80A4DA28 A48801C4 */ sh $t0, 0x01C4($a0) ## 000001C4 -/* 01D8C 80A4DA2C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01D90 80A4DA30 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01D94 80A4DA34 03E00008 */ jr $ra -/* 01D98 80A4DA38 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4DA3C.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4DA3C.s deleted file mode 100644 index 79db985627..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4DA3C.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80A4DA3C -/* 01D9C 80A4DA3C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01DA0 80A4DA40 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01DA4 80A4DA44 AFA5001C */ sw $a1, 0x001C($sp) -/* 01DA8 80A4DA48 848201C4 */ lh $v0, 0x01C4($a0) ## 000001C4 -/* 01DAC 80A4DA4C 18400003 */ blez $v0, .L80A4DA5C -/* 01DB0 80A4DA50 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 01DB4 80A4DA54 10000005 */ beq $zero, $zero, .L80A4DA6C -/* 01DB8 80A4DA58 A48E01C4 */ sh $t6, 0x01C4($a0) ## 000001C4 -.L80A4DA5C: -/* 01DBC 80A4DA5C 908F0160 */ lbu $t7, 0x0160($a0) ## 00000160 -/* 01DC0 80A4DA60 31F8FFFD */ andi $t8, $t7, 0xFFFD ## $t8 = 00000000 -/* 01DC4 80A4DA64 0C293578 */ jal func_80A4D5E0 -/* 01DC8 80A4DA68 A0980160 */ sb $t8, 0x0160($a0) ## 00000160 -.L80A4DA6C: -/* 01DCC 80A4DA6C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01DD0 80A4DA70 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01DD4 80A4DA74 03E00008 */ jr $ra -/* 01DD8 80A4DA78 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4DA7C.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4DA7C.s deleted file mode 100644 index 96358c8e94..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4DA7C.s +++ /dev/null @@ -1,27 +0,0 @@ -.late_rodata -glabel D_80A4E0A0 - .float 0.1 - -.text -glabel func_80A4DA7C -/* 01DDC 80A4DA7C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01DE0 80A4DA80 3C0E80A5 */ lui $t6, %hi(func_80A4DAD0) ## $t6 = 80A50000 -/* 01DE4 80A4DA84 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01DE8 80A4DA88 25CEDAD0 */ addiu $t6, $t6, %lo(func_80A4DAD0) ## $t6 = 80A4DAD0 -/* 01DEC 80A4DA8C AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 01DF0 80A4DA90 AFA40018 */ sw $a0, 0x0018($sp) -/* 01DF4 80A4DA94 0C292F5C */ jal func_80A4BD70 -/* 01DF8 80A4DA98 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 01DFC 80A4DA9C 8FA40018 */ lw $a0, 0x0018($sp) -/* 01E00 80A4DAA0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01E04 80A4DAA4 3C0180A5 */ lui $at, %hi(D_80A4E0A0) ## $at = 80A50000 -/* 01E08 80A4DAA8 C4800068 */ lwc1 $f0, 0x0068($a0) ## 00000068 -/* 01E0C 80A4DAAC E48401C0 */ swc1 $f4, 0x01C0($a0) ## 000001C0 -/* 01E10 80A4DAB0 C426E0A0 */ lwc1 $f6, %lo(D_80A4E0A0)($at) -/* 01E14 80A4DAB4 46000005 */ abs.s $f0, $f0 -/* 01E18 80A4DAB8 46060202 */ mul.s $f8, $f0, $f6 -/* 01E1C 80A4DABC E4880060 */ swc1 $f8, 0x0060($a0) ## 00000060 -/* 01E20 80A4DAC0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01E24 80A4DAC4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01E28 80A4DAC8 03E00008 */ jr $ra -/* 01E2C 80A4DACC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4DAD0.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4DAD0.s deleted file mode 100644 index aa4a20c10d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4DAD0.s +++ /dev/null @@ -1,52 +0,0 @@ -glabel func_80A4DAD0 -/* 01E30 80A4DAD0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01E34 80A4DAD4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01E38 80A4DAD8 AFB00020 */ sw $s0, 0x0020($sp) -/* 01E3C 80A4DADC AFA5002C */ sw $a1, 0x002C($sp) -/* 01E40 80A4DAE0 90820160 */ lbu $v0, 0x0160($a0) ## 00000160 -/* 01E44 80A4DAE4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01E48 80A4DAE8 8FA5002C */ lw $a1, 0x002C($sp) -/* 01E4C 80A4DAEC 304E0002 */ andi $t6, $v0, 0x0002 ## $t6 = 00000000 -/* 01E50 80A4DAF0 11C00017 */ beq $t6, $zero, .L80A4DB50 -/* 01E54 80A4DAF4 304FFFFD */ andi $t7, $v0, 0xFFFD ## $t7 = 00000000 -/* 01E58 80A4DAF8 A08F0160 */ sb $t7, 0x0160($a0) ## 00000160 -/* 01E5C 80A4DAFC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01E60 80A4DB00 8607008A */ lh $a3, 0x008A($s0) ## 0000008A -/* 01E64 80A4DB04 24180004 */ addiu $t8, $zero, 0x0004 ## $t8 = 00000004 -/* 01E68 80A4DB08 AFB80014 */ sw $t8, 0x0014($sp) -/* 01E6C 80A4DB0C 8FA4002C */ lw $a0, 0x002C($sp) -/* 01E70 80A4DB10 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01E74 80A4DB14 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 -/* 01E78 80A4DB18 0C00BDB5 */ jal func_8002F6D4 -/* 01E7C 80A4DB1C E7A40010 */ swc1 $f4, 0x0010($sp) -/* 01E80 80A4DB20 8FB9002C */ lw $t9, 0x002C($sp) -/* 01E84 80A4DB24 2405083E */ addiu $a1, $zero, 0x083E ## $a1 = 0000083E -/* 01E88 80A4DB28 0C00BDF7 */ jal func_8002F7DC -/* 01E8C 80A4DB2C 8F241C44 */ lw $a0, 0x1C44($t9) ## 00001C44 -/* 01E90 80A4DB30 86080018 */ lh $t0, 0x0018($s0) ## 00000018 -/* 01E94 80A4DB34 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01E98 80A4DB38 240A0032 */ addiu $t2, $zero, 0x0032 ## $t2 = 00000032 -/* 01E9C 80A4DB3C 31090001 */ andi $t1, $t0, 0x0001 ## $t1 = 00000000 -/* 01EA0 80A4DB40 5521000F */ bnel $t1, $at, .L80A4DB80 -/* 01EA4 80A4DB44 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01EA8 80A4DB48 1000000C */ beq $zero, $zero, .L80A4DB7C -/* 01EAC 80A4DB4C A60A01C8 */ sh $t2, 0x01C8($s0) ## 000001C8 -.L80A4DB50: -/* 01EB0 80A4DB50 0C293294 */ jal func_80A4CA50 -/* 01EB4 80A4DB54 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01EB8 80A4DB58 10400008 */ beq $v0, $zero, .L80A4DB7C -/* 01EBC 80A4DB5C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01EC0 80A4DB60 0C29341D */ jal func_80A4D074 -/* 01EC4 80A4DB64 8FA5002C */ lw $a1, 0x002C($sp) -/* 01EC8 80A4DB68 0C293578 */ jal func_80A4D5E0 -/* 01ECC 80A4DB6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01ED0 80A4DB70 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 01ED4 80A4DB74 00000000 */ nop -/* 01ED8 80A4DB78 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 -.L80A4DB7C: -/* 01EDC 80A4DB7C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A4DB80: -/* 01EE0 80A4DB80 8FB00020 */ lw $s0, 0x0020($sp) -/* 01EE4 80A4DB84 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01EE8 80A4DB88 03E00008 */ jr $ra -/* 01EEC 80A4DB8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4DB90.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4DB90.s deleted file mode 100644 index a999815505..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4DB90.s +++ /dev/null @@ -1,37 +0,0 @@ -.late_rodata -glabel D_80A4E0A4 - .float 0.3 - -glabel D_80A4E0A8 - .word 0xBE99999A, 0x00000000 - -.text -glabel func_80A4DB90 -/* 01EF0 80A4DB90 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01EF4 80A4DB94 3C0E80A5 */ lui $t6, %hi(func_80A4DC00) ## $t6 = 80A50000 -/* 01EF8 80A4DB98 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01EFC 80A4DB9C 25CEDC00 */ addiu $t6, $t6, %lo(func_80A4DC00) ## $t6 = 80A4DC00 -/* 01F00 80A4DBA0 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 01F04 80A4DBA4 AFA40018 */ sw $a0, 0x0018($sp) -/* 01F08 80A4DBA8 0C292F5C */ jal func_80A4BD70 -/* 01F0C 80A4DBAC 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 01F10 80A4DBB0 8FA40018 */ lw $a0, 0x0018($sp) -/* 01F14 80A4DBB4 3C0180A5 */ lui $at, %hi(D_80A4E0A4) ## $at = 80A50000 -/* 01F18 80A4DBB8 C424E0A4 */ lwc1 $f4, %lo(D_80A4E0A4)($at) -/* 01F1C 80A4DBBC C4800068 */ lwc1 $f0, 0x0068($a0) ## 00000068 -/* 01F20 80A4DBC0 3C0180A5 */ lui $at, %hi(D_80A4E0A8) ## $at = 80A50000 -/* 01F24 80A4DBC4 A48001C6 */ sh $zero, 0x01C6($a0) ## 000001C6 -/* 01F28 80A4DBC8 E48401C0 */ swc1 $f4, 0x01C0($a0) ## 000001C0 -/* 01F2C 80A4DBCC C426E0A8 */ lwc1 $f6, %lo(D_80A4E0A8)($at) -/* 01F30 80A4DBD0 46000005 */ abs.s $f0, $f0 -/* 01F34 80A4DBD4 908F01D3 */ lbu $t7, 0x01D3($a0) ## 000001D3 -/* 01F38 80A4DBD8 46060202 */ mul.s $f8, $f0, $f6 -/* 01F3C 80A4DBDC 35F90008 */ ori $t9, $t7, 0x0008 ## $t9 = 00000008 -/* 01F40 80A4DBE0 3328FFEF */ andi $t0, $t9, 0xFFEF ## $t0 = 00000008 -/* 01F44 80A4DBE4 A09901D3 */ sb $t9, 0x01D3($a0) ## 000001D3 -/* 01F48 80A4DBE8 A08801D3 */ sb $t0, 0x01D3($a0) ## 000001D3 -/* 01F4C 80A4DBEC E4880060 */ swc1 $f8, 0x0060($a0) ## 00000060 -/* 01F50 80A4DBF0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01F54 80A4DBF4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01F58 80A4DBF8 03E00008 */ jr $ra -/* 01F5C 80A4DBFC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4DC00.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4DC00.s deleted file mode 100644 index 28d2f74c9b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4DC00.s +++ /dev/null @@ -1,54 +0,0 @@ -glabel func_80A4DC00 -/* 01F60 80A4DC00 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01F64 80A4DC04 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01F68 80A4DC08 AFB00020 */ sw $s0, 0x0020($sp) -/* 01F6C 80A4DC0C AFA5002C */ sw $a1, 0x002C($sp) -/* 01F70 80A4DC10 90820160 */ lbu $v0, 0x0160($a0) ## 00000160 -/* 01F74 80A4DC14 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01F78 80A4DC18 8FA5002C */ lw $a1, 0x002C($sp) -/* 01F7C 80A4DC1C 304E0002 */ andi $t6, $v0, 0x0002 ## $t6 = 00000000 -/* 01F80 80A4DC20 11C00017 */ beq $t6, $zero, .L80A4DC80 -/* 01F84 80A4DC24 304FFFFD */ andi $t7, $v0, 0xFFFD ## $t7 = 00000000 -/* 01F88 80A4DC28 A08F0160 */ sb $t7, 0x0160($a0) ## 00000160 -/* 01F8C 80A4DC2C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01F90 80A4DC30 8607008A */ lh $a3, 0x008A($s0) ## 0000008A -/* 01F94 80A4DC34 24180004 */ addiu $t8, $zero, 0x0004 ## $t8 = 00000004 -/* 01F98 80A4DC38 AFB80014 */ sw $t8, 0x0014($sp) -/* 01F9C 80A4DC3C 8FA4002C */ lw $a0, 0x002C($sp) -/* 01FA0 80A4DC40 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01FA4 80A4DC44 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 -/* 01FA8 80A4DC48 0C00BDB5 */ jal func_8002F6D4 -/* 01FAC 80A4DC4C E7A40010 */ swc1 $f4, 0x0010($sp) -/* 01FB0 80A4DC50 8FB9002C */ lw $t9, 0x002C($sp) -/* 01FB4 80A4DC54 2405083E */ addiu $a1, $zero, 0x083E ## $a1 = 0000083E -/* 01FB8 80A4DC58 0C00BDF7 */ jal func_8002F7DC -/* 01FBC 80A4DC5C 8F241C44 */ lw $a0, 0x1C44($t9) ## 00001C44 -/* 01FC0 80A4DC60 86080018 */ lh $t0, 0x0018($s0) ## 00000018 -/* 01FC4 80A4DC64 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01FC8 80A4DC68 240A0032 */ addiu $t2, $zero, 0x0032 ## $t2 = 00000032 -/* 01FCC 80A4DC6C 31090001 */ andi $t1, $t0, 0x0001 ## $t1 = 00000000 -/* 01FD0 80A4DC70 55210011 */ bnel $t1, $at, .L80A4DCB8 -/* 01FD4 80A4DC74 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01FD8 80A4DC78 1000000E */ beq $zero, $zero, .L80A4DCB4 -/* 01FDC 80A4DC7C A60A01C8 */ sh $t2, 0x01C8($s0) ## 000001C8 -.L80A4DC80: -/* 01FE0 80A4DC80 0C2932DE */ jal func_80A4CB78 -/* 01FE4 80A4DC84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01FE8 80A4DC88 1040000A */ beq $v0, $zero, .L80A4DCB4 -/* 01FEC 80A4DC8C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01FF0 80A4DC90 0C29341D */ jal func_80A4D074 -/* 01FF4 80A4DC94 8FA5002C */ lw $a1, 0x002C($sp) -/* 01FF8 80A4DC98 0C293578 */ jal func_80A4D5E0 -/* 01FFC 80A4DC9C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02000 80A4DCA0 920B01D3 */ lbu $t3, 0x01D3($s0) ## 000001D3 -/* 02004 80A4DCA4 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 02008 80A4DCA8 316CFFF7 */ andi $t4, $t3, 0xFFF7 ## $t4 = 00000000 -/* 0200C 80A4DCAC A20C01D3 */ sb $t4, 0x01D3($s0) ## 000001D3 -/* 02010 80A4DCB0 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 -.L80A4DCB4: -/* 02014 80A4DCB4 8FBF0024 */ lw $ra, 0x0024($sp) -.L80A4DCB8: -/* 02018 80A4DCB8 8FB00020 */ lw $s0, 0x0020($sp) -/* 0201C 80A4DCBC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 02020 80A4DCC0 03E00008 */ jr $ra -/* 02024 80A4DCC4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A75A38.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A75A38.s index a5d3535418..db4097aff9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A75A38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A75A38.s @@ -90,7 +90,7 @@ glabel func_80A75A38 /* 01874 80A75B84 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 01878 80A75B88 02602825 */ or $a1, $s3, $zero ## $a1 = FFFFFFF0 /* 0187C 80A75B8C 02403025 */ or $a2, $s2, $zero ## $a2 = FFFFFFE4 -/* 01880 80A75B90 0C00A9AE */ jal func_8002A6B8 +/* 01880 80A75B90 0C00A9AE */ jal EffectSsDeadDb_Spawn /* 01884 80A75B94 02403825 */ or $a3, $s2, $zero ## $a3 = FFFFFFE4 /* 01888 80A75B98 2610FFFF */ addiu $s0, $s0, 0xFFFF ## $s0 = FFFFFFFF /* 0188C 80A75B9C 0601FFD4 */ bgez $s0, .L80A75AF0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7E5A8.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7E5A8.s index 4c7dc461ce..bb9a55f2c6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7E5A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7E5A8.s @@ -157,7 +157,7 @@ glabel func_80A7E5A8 /* 00360 80A7E7C0 AFA20014 */ sw $v0, 0x0014($sp) /* 00364 80A7E7C4 AFA00020 */ sw $zero, 0x0020($sp) /* 00368 80A7E7C8 AFB4003C */ sw $s4, 0x003C($sp) -/* 0036C 80A7E7CC 0C00A7A3 */ jal func_80029E8C +/* 0036C 80A7E7CC 0C00A7A3 */ jal EffectSsKakera_Spawn /* 00370 80A7E7D0 AFA90024 */ sw $t1, 0x0024($sp) /* 00374 80A7E7D4 26310002 */ addiu $s1, $s1, 0x0002 ## $s1 = 80A8739A diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7E824.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7E824.s index 948c116eae..0bc2f7fbe5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7E824.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7E824.s @@ -196,7 +196,7 @@ glabel func_80A7E824 /* 00648 80A7EAA8 AFAA0028 */ sw $t2, 0x0028($sp) /* 0064C 80A7EAAC AFA00034 */ sw $zero, 0x0034($sp) /* 00650 80A7EAB0 AFB6003C */ sw $s6, 0x003C($sp) -/* 00654 80A7EAB4 0C00A7A3 */ jal func_80029E8C +/* 00654 80A7EAB4 0C00A7A3 */ jal EffectSsKakera_Spawn /* 00658 80A7EAB8 AFA90024 */ sw $t1, 0x0024($sp) /* 0065C 80A7EABC 26520001 */ addiu $s2, $s2, 0x0001 ## $s2 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F514.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F514.s index 523d6e939b..9207591352 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F514.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F514.s @@ -105,7 +105,7 @@ glabel func_80A7F514 /* 0123C 80A7F69C C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C /* 01240 80A7F6A0 AFA90014 */ sw $t1, 0x0014($sp) /* 01244 80A7F6A4 AFA00010 */ sw $zero, 0x0010($sp) -/* 01248 80A7F6A8 0C00A527 */ jal func_8002949C +/* 01248 80A7F6A8 0C00A527 */ jal EffectSsGSplash_Spawn /* 0124C 80A7F6AC E7B0003C */ swc1 $f16, 0x003C($sp) /* 01250 80A7F6B0 87AA004A */ lh $t2, 0x004A($sp) /* 01254 80A7F6B4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 @@ -116,41 +116,41 @@ glabel func_80A7F514 /* 01268 80A7F6C8 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFE4 /* 0126C 80A7F6CC 24060096 */ addiu $a2, $zero, 0x0096 ## $a2 = 00000096 /* 01270 80A7F6D0 2407028A */ addiu $a3, $zero, 0x028A ## $a3 = 0000028A -/* 01274 80A7F6D4 0C00A511 */ jal func_80029444 +/* 01274 80A7F6D4 0C00A511 */ jal EffectSsGRipple_Spawn /* 01278 80A7F6D8 AFA00010 */ sw $zero, 0x0010($sp) /* 0127C 80A7F6DC 240B0004 */ addiu $t3, $zero, 0x0004 ## $t3 = 00000004 /* 01280 80A7F6E0 AFAB0010 */ sw $t3, 0x0010($sp) /* 01284 80A7F6E4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01288 80A7F6E8 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFE4 /* 0128C 80A7F6EC 24060190 */ addiu $a2, $zero, 0x0190 ## $a2 = 00000190 -/* 01290 80A7F6F0 0C00A511 */ jal func_80029444 +/* 01290 80A7F6F0 0C00A511 */ jal EffectSsGRipple_Spawn /* 01294 80A7F6F4 24070320 */ addiu $a3, $zero, 0x0320 ## $a3 = 00000320 /* 01298 80A7F6F8 24190008 */ addiu $t9, $zero, 0x0008 ## $t9 = 00000008 /* 0129C 80A7F6FC AFB90010 */ sw $t9, 0x0010($sp) /* 012A0 80A7F700 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 012A4 80A7F704 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFE4 /* 012A8 80A7F708 240601F4 */ addiu $a2, $zero, 0x01F4 ## $a2 = 000001F4 -/* 012AC 80A7F70C 0C00A511 */ jal func_80029444 +/* 012AC 80A7F70C 0C00A511 */ jal EffectSsGRipple_Spawn /* 012B0 80A7F710 2407044C */ addiu $a3, $zero, 0x044C ## $a3 = 0000044C /* 012B4 80A7F714 10000013 */ beq $zero, $zero, .L80A7F764 /* 012B8 80A7F718 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 .L80A7F71C: /* 012BC 80A7F71C 240702BC */ addiu $a3, $zero, 0x02BC ## $a3 = 000002BC -/* 012C0 80A7F720 0C00A511 */ jal func_80029444 +/* 012C0 80A7F720 0C00A511 */ jal EffectSsGRipple_Spawn /* 012C4 80A7F724 AFA00010 */ sw $zero, 0x0010($sp) /* 012C8 80A7F728 240C0004 */ addiu $t4, $zero, 0x0004 ## $t4 = 00000004 /* 012CC 80A7F72C AFAC0010 */ sw $t4, 0x0010($sp) /* 012D0 80A7F730 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 012D4 80A7F734 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFE4 /* 012D8 80A7F738 240601F4 */ addiu $a2, $zero, 0x01F4 ## $a2 = 000001F4 -/* 012DC 80A7F73C 0C00A511 */ jal func_80029444 +/* 012DC 80A7F73C 0C00A511 */ jal EffectSsGRipple_Spawn /* 012E0 80A7F740 24070384 */ addiu $a3, $zero, 0x0384 ## $a3 = 00000384 /* 012E4 80A7F744 240D0008 */ addiu $t5, $zero, 0x0008 ## $t5 = 00000008 /* 012E8 80A7F748 AFAD0010 */ sw $t5, 0x0010($sp) /* 012EC 80A7F74C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 012F0 80A7F750 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFE4 /* 012F4 80A7F754 240601F4 */ addiu $a2, $zero, 0x01F4 ## $a2 = 000001F4 -/* 012F8 80A7F758 0C00A511 */ jal func_80029444 +/* 012F8 80A7F758 0C00A511 */ jal EffectSsGRipple_Spawn /* 012FC 80A7F75C 24070514 */ addiu $a3, $zero, 0x0514 ## $a3 = 00000514 /* 01300 80A7F760 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 .L80A7F764: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Update.s index 07c058d569..a9f6db4387 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Update.s @@ -800,20 +800,20 @@ glabel L80A92A24 /* 00D1C 80A92CBC 0019C880 */ sll $t9, $t9, 2 /* 00D20 80A92CC0 2729012C */ addiu $t1, $t9, 0x012C ## $t1 = 0000012C /* 00D24 80A92CC4 AFA90014 */ sw $t1, 0x0014($sp) -/* 00D28 80A92CC8 0C00A527 */ jal func_8002949C +/* 00D28 80A92CC8 0C00A527 */ jal EffectSsGSplash_Spawn /* 00D2C 80A92CCC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00D30 80A92CD0 8FA40104 */ lw $a0, 0x0104($sp) /* 00D34 80A92CD4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000024 /* 00D38 80A92CD8 24060096 */ addiu $a2, $zero, 0x0096 ## $a2 = 00000096 /* 00D3C 80A92CDC 2407028A */ addiu $a3, $zero, 0x028A ## $a3 = 0000028A -/* 00D40 80A92CE0 0C00A511 */ jal func_80029444 +/* 00D40 80A92CE0 0C00A511 */ jal EffectSsGRipple_Spawn /* 00D44 80A92CE4 AFA00010 */ sw $zero, 0x0010($sp) /* 00D48 80A92CE8 240A0005 */ addiu $t2, $zero, 0x0005 ## $t2 = 00000005 /* 00D4C 80A92CEC AFAA0010 */ sw $t2, 0x0010($sp) /* 00D50 80A92CF0 8FA40104 */ lw $a0, 0x0104($sp) /* 00D54 80A92CF4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000024 /* 00D58 80A92CF8 2406012C */ addiu $a2, $zero, 0x012C ## $a2 = 0000012C -/* 00D5C 80A92CFC 0C00A511 */ jal func_80029444 +/* 00D5C 80A92CFC 0C00A511 */ jal EffectSsGRipple_Spawn /* 00D60 80A92D00 24070320 */ addiu $a3, $zero, 0x0320 ## $a3 = 00000320 /* 00D64 80A92D04 C62A0084 */ lwc1 $f10, 0x0084($s1) ## 00000084 /* 00D68 80A92D08 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 @@ -1359,7 +1359,7 @@ glabel L80A930DC /* 014F0 80A93490 00023400 */ sll $a2, $v0, 16 /* 014F4 80A93494 00063403 */ sra $a2, $a2, 16 /* 014F8 80A93498 00073C03 */ sra $a3, $a3, 16 -/* 014FC 80A9349C 0C00A511 */ jal func_80029444 +/* 014FC 80A9349C 0C00A511 */ jal EffectSsGRipple_Spawn /* 01500 80A934A0 AFA00010 */ sw $zero, 0x0010($sp) /* 01504 80A934A4 10000069 */ beq $zero, $zero, .L80A9364C /* 01508 80A934A8 86380176 */ lh $t8, 0x0176($s1) ## 00000176 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A95A38.s b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A95A38.s index 54b26bd028..aa2ef32b2d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A95A38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A95A38.s @@ -49,7 +49,7 @@ glabel func_80A95A38 /* 00794 80A95AE4 8FA4003C */ lw $a0, 0x003C($sp) /* 00798 80A95AE8 26050008 */ addiu $a1, $s0, 0x0008 ## $a1 = 00000008 /* 0079C 80A95AEC 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 -/* 007A0 80A95AF0 0C00A5E9 */ jal func_800297A4 +/* 007A0 80A95AF0 0C00A5E9 */ jal EffectSsHahen_SpawnBurst /* 007A4 80A95AF4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 007A8 80A95AF8 8FBF0034 */ lw $ra, 0x0034($sp) /* 007AC 80A95AFC 8FB00030 */ lw $s0, 0x0030($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A95D90.s b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A95D90.s index 9fcfd23d8b..22c9f70eca 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A95D90.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A95D90.s @@ -49,7 +49,7 @@ glabel func_80A95D90 /* 00AE0 80A95E30 02002825 */ or $a1, $s0, $zero ## $a1 = 00000024 /* 00AE4 80A95E34 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 /* 00AE8 80A95E38 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00AEC 80A95E3C 0C00A5E9 */ jal func_800297A4 +/* 00AEC 80A95E3C 0C00A5E9 */ jal EffectSsHahen_SpawnBurst /* 00AF0 80A95E40 AFA00024 */ sw $zero, 0x0024($sp) /* 00AF4 80A95E44 3C0180A9 */ lui $at, %hi(D_80A96B50) ## $at = 80A90000 /* 00AF8 80A95E48 C4246B50 */ lwc1 $f4, %lo(D_80A96B50)($at) @@ -87,7 +87,7 @@ glabel func_80A95D90 /* 00B74 80A95EC4 AFAD0010 */ sw $t5, 0x0010($sp) /* 00B78 80A95EC8 AFA00024 */ sw $zero, 0x0024($sp) /* 00B7C 80A95ECC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000024 -/* 00B80 80A95ED0 0C00A5E9 */ jal func_800297A4 +/* 00B80 80A95ED0 0C00A5E9 */ jal EffectSsHahen_SpawnBurst /* 00B84 80A95ED4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00B88 80A95ED8 96880088 */ lhu $t0, 0x0088($s4) ## 00000088 .L80A95EDC: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A960B0.s b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A960B0.s index e1780675cc..a9bfaa5c6c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A960B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A960B0.s @@ -49,7 +49,7 @@ glabel func_80A960B0 /* 00E0C 80A9615C 8FA4003C */ lw $a0, 0x003C($sp) /* 00E10 80A96160 26050008 */ addiu $a1, $s0, 0x0008 ## $a1 = 00000008 /* 00E14 80A96164 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 -/* 00E18 80A96168 0C00A5E9 */ jal func_800297A4 +/* 00E18 80A96168 0C00A5E9 */ jal EffectSsHahen_SpawnBurst /* 00E1C 80A9616C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00E20 80A96170 8FBF0034 */ lw $ra, 0x0034($sp) /* 00E24 80A96174 8FB00030 */ lw $s0, 0x0030($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B21C.s b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B21C.s index 6ed4281210..3fc6e47d46 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B21C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B21C.s @@ -115,7 +115,7 @@ glabel func_80A9B21C /* 00418 80A9B3B8 02803025 */ or $a2, $s4, $zero ## $a2 = FFFFFFF4 /* 0041C 80A9B3BC 02403825 */ or $a3, $s2, $zero ## $a3 = FFFFFFE8 /* 00420 80A9B3C0 AFA00020 */ sw $zero, 0x0020($sp) -/* 00424 80A9B3C4 0C00A7A3 */ jal func_80029E8C +/* 00424 80A9B3C4 0C00A7A3 */ jal EffectSsKakera_Spawn /* 00428 80A9B3C8 AFAD0024 */ sw $t5, 0x0024($sp) /* 0042C 80A9B3CC C6280000 */ lwc1 $f8, 0x0000($s1) ## 80A9C23C @@ -205,7 +205,7 @@ glabel func_80A9B21C /* 00568 80A9B508 0006000D */ break 6 .L80A9B50C: /* 0056C 80A9B50C AFB80024 */ sw $t8, 0x0024($sp) -/* 00570 80A9B510 0C00A7A3 */ jal func_80029E8C +/* 00570 80A9B510 0C00A7A3 */ jal EffectSsKakera_Spawn /* 00574 80A9B514 00000000 */ nop /* 00578 80A9B518 3C0A80AA */ lui $t2, %hi(D_80A9C26C) ## $t2 = 80AA0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9BC1C.s b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9BC1C.s index 2a196261de..f92ef1a279 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9BC1C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9BC1C.s @@ -61,27 +61,27 @@ glabel func_80A9BC1C /* 00D50 80A9BCF0 C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C /* 00D54 80A9BCF4 AFB90014 */ sw $t9, 0x0014($sp) /* 00D58 80A9BCF8 AFA00010 */ sw $zero, 0x0010($sp) -/* 00D5C 80A9BCFC 0C00A527 */ jal func_8002949C +/* 00D5C 80A9BCFC 0C00A527 */ jal EffectSsGSplash_Spawn /* 00D60 80A9BD00 E7B00038 */ swc1 $f16, 0x0038($sp) /* 00D64 80A9BD04 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00D68 80A9BD08 27A50030 */ addiu $a1, $sp, 0x0030 ## $a1 = FFFFFFF0 /* 00D6C 80A9BD0C 24060096 */ addiu $a2, $zero, 0x0096 ## $a2 = 00000096 /* 00D70 80A9BD10 2407028A */ addiu $a3, $zero, 0x028A ## $a3 = 0000028A -/* 00D74 80A9BD14 0C00A511 */ jal func_80029444 +/* 00D74 80A9BD14 0C00A511 */ jal EffectSsGRipple_Spawn /* 00D78 80A9BD18 AFA00010 */ sw $zero, 0x0010($sp) /* 00D7C 80A9BD1C 240A0004 */ addiu $t2, $zero, 0x0004 ## $t2 = 00000004 /* 00D80 80A9BD20 AFAA0010 */ sw $t2, 0x0010($sp) /* 00D84 80A9BD24 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00D88 80A9BD28 27A50030 */ addiu $a1, $sp, 0x0030 ## $a1 = FFFFFFF0 /* 00D8C 80A9BD2C 24060190 */ addiu $a2, $zero, 0x0190 ## $a2 = 00000190 -/* 00D90 80A9BD30 0C00A511 */ jal func_80029444 +/* 00D90 80A9BD30 0C00A511 */ jal EffectSsGRipple_Spawn /* 00D94 80A9BD34 24070320 */ addiu $a3, $zero, 0x0320 ## $a3 = 00000320 /* 00D98 80A9BD38 240B0008 */ addiu $t3, $zero, 0x0008 ## $t3 = 00000008 /* 00D9C 80A9BD3C AFAB0010 */ sw $t3, 0x0010($sp) /* 00DA0 80A9BD40 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00DA4 80A9BD44 27A50030 */ addiu $a1, $sp, 0x0030 ## $a1 = FFFFFFF0 /* 00DA8 80A9BD48 240601F4 */ addiu $a2, $zero, 0x01F4 ## $a2 = 000001F4 -/* 00DAC 80A9BD4C 0C00A511 */ jal func_80029444 +/* 00DAC 80A9BD4C 0C00A511 */ jal EffectSsGRipple_Spawn /* 00DB0 80A9BD50 2407044C */ addiu $a3, $zero, 0x044C ## $a3 = 0000044C /* 00DB4 80A9BD54 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 /* 00DB8 80A9BD58 44819000 */ mtc1 $at, $f18 ## $f18 = -3.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/EnMb_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/EnMb_Draw.s index 2f76a0e06a..1c6f6c512e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/EnMb_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/EnMb_Draw.s @@ -109,7 +109,7 @@ glabel EnMb_Draw /* 03B50 80AA9BA0 AFB90010 */ sw $t9, 0x0010($sp) /* 03B54 80AA9BA4 24C6014C */ addiu $a2, $a2, 0x014C ## $a2 = 0000014C /* 03B58 80AA9BA8 24070096 */ addiu $a3, $zero, 0x0096 ## $a3 = 00000096 -/* 03B5C 80AA9BAC 0C00A877 */ jal func_8002A1DC +/* 03B5C 80AA9BAC 0C00A877 */ jal EffectSsEnIce_SpawnFlyingVec3s /* 03B60 80AA9BB0 E7A00028 */ swc1 $f0, 0x0028($sp) .L80AA9BB4: /* 03B64 80AA9BB4 8FBF004C */ lw $ra, 0x004C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA7938.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA7938.s index bc1409c0b7..371e129203 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA7938.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA7938.s @@ -168,7 +168,7 @@ glabel func_80AA7938 /* 01B40 80AA7B90 27A60068 */ addiu $a2, $sp, 0x0068 ## $a2 = FFFFFFE0 /* 01B44 80AA7B94 00C03825 */ or $a3, $a2, $zero ## $a3 = FFFFFFE0 /* 01B48 80AA7B98 8FA4008C */ lw $a0, 0x008C($sp) -/* 01B4C 80AA7B9C 0C00A409 */ jal func_80029024 +/* 01B4C 80AA7B9C 0C00A409 */ jal EffectSsBlast_SpawnWhiteShockwave /* 01B50 80AA7BA0 27A50074 */ addiu $a1, $sp, 0x0074 ## $a1 = FFFFFFEC /* 01B54 80AA7BA4 2418012C */ addiu $t8, $zero, 0x012C ## $t8 = 0000012C /* 01B58 80AA7BA8 240800B4 */ addiu $t0, $zero, 0x00B4 ## $t0 = 000000B4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8514.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8514.s index 58c2894673..7d5ed9a163 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8514.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8514.s @@ -123,7 +123,7 @@ glabel func_80AA8514 /* 02688 80AA86D8 02203025 */ or $a2, $s1, $zero ## $a2 = FFFFFFDC /* 0268C 80AA86DC 02203825 */ or $a3, $s1, $zero ## $a3 = FFFFFFDC /* 02690 80AA86E0 AFA00028 */ sw $zero, 0x0028($sp) -/* 02694 80AA86E4 0C00A9AE */ jal func_8002A6B8 +/* 02694 80AA86E4 0C00A9AE */ jal EffectSsDeadDb_Spawn /* 02698 80AA86E8 AFA00030 */ sw $zero, 0x0030($sp) /* 0269C 80AA86EC 2610FFFF */ addiu $s0, $s0, 0xFFFF ## $s0 = 00000003 /* 026A0 80AA86F0 0601FFD3 */ bgez $s0, .L80AA8640 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA90A0.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA90A0.s index 9f14513057..3798b459d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA90A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA90A0.s @@ -118,7 +118,7 @@ glabel func_80AA90A0 /* 03204 80AA9254 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 03208 80AA9258 02602825 */ or $a1, $s3, $zero ## $a1 = FFFFFFE0 /* 0320C 80AA925C 02403025 */ or $a2, $s2, $zero ## $a2 = FFFFFFF0 -/* 03210 80AA9260 0C00A9AE */ jal func_8002A6B8 +/* 03210 80AA9260 0C00A9AE */ jal EffectSsDeadDb_Spawn /* 03214 80AA9264 02403825 */ or $a3, $s2, $zero ## $a3 = FFFFFFF0 /* 03218 80AA9268 2610FFFF */ addiu $s0, $s0, 0xFFFF ## $s0 = 00000003 /* 0321C 80AA926C 0601FFD3 */ bgez $s0, .L80AA91BC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Update.s index ae5467c8a6..8d6dbf2e76 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Update.s @@ -590,7 +590,7 @@ glabel EnNiw_Update /* 02528 80AB7CA8 A62A025A */ sh $t2, 0x025A($s1) ## 0000025A /* 0252C 80AB7CAC AFAC0014 */ sw $t4, 0x0014($sp) /* 02530 80AB7CB0 AFA00010 */ sw $zero, 0x0010($sp) -/* 02534 80AB7CB4 0C00A527 */ jal func_8002949C +/* 02534 80AB7CB4 0C00A527 */ jal EffectSsGSplash_Spawn /* 02538 80AB7CB8 8FA400E4 */ lw $a0, 0x00E4($sp) /* 0253C 80AB7CBC 3C0480AC */ lui $a0, %hi(D_80AB89EC) ## $a0 = 80AC0000 /* 02540 80AB7CC0 A620025C */ sh $zero, 0x025C($s1) ## 0000025C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6F04.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6F04.s index 3c892a1ce0..3dd7cc0154 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6F04.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6F04.s @@ -46,7 +46,7 @@ glabel func_80AB6F04 /* 01828 80AB6FA8 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFF4 /* 0182C 80AB6FAC 24060064 */ addiu $a2, $zero, 0x0064 ## $a2 = 00000064 /* 01830 80AB6FB0 E7A60030 */ swc1 $f6, 0x0030($sp) -/* 01834 80AB6FB4 0C00A511 */ jal func_80029444 +/* 01834 80AB6FB4 0C00A511 */ jal EffectSsGRipple_Spawn /* 01838 80AB6FB8 240701F4 */ addiu $a3, $zero, 0x01F4 ## $a3 = 000001F4 /* 0183C 80AB6FBC 96090088 */ lhu $t1, 0x0088($s0) ## 00000088 .L80AB6FC0: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Draw.s index 09b23bfd0f..2753a3a0d1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Draw.s @@ -213,7 +213,7 @@ glabel EnNy_Draw /* 01468 80ABE018 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 0146C 80ABE01C 27A6003C */ addiu $a2, $sp, 0x003C ## $a2 = FFFFFFAC /* 01470 80ABE020 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 -/* 01474 80ABE024 0C00A935 */ jal func_8002A4D4 +/* 01474 80ABE024 0C00A935 */ jal EffectSsEnFire_SpawnVec3f /* 01478 80ABE028 E7A40044 */ swc1 $f4, 0x0044($sp) .L80ABE02C: /* 0147C 80ABE02C 8FBF002C */ lw $ra, 0x002C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD190.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD190.s index 3a97b22fa0..16617a9984 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD190.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD190.s @@ -138,7 +138,7 @@ glabel func_80ABD190 /* 007D8 80ABD388 10000006 */ beq $zero, $zero, .L80ABD3A4 /* 007DC 80ABD38C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L80ABD390: -/* 007E0 80ABD390 0C00A729 */ jal func_80029CA4 +/* 007E0 80ABD390 0C00A729 */ jal EffectSsHitMark_SpawnFixedScale /* 007E4 80ABD394 27A60030 */ addiu $a2, $sp, 0x0030 ## $a2 = FFFFFFF0 /* 007E8 80ABD398 10000002 */ beq $zero, $zero, .L80ABD3A4 /* 007EC 80ABD39C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD728.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD728.s index 9fe70e6944..2323f25d73 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD728.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABD728.s @@ -76,7 +76,7 @@ glabel func_80ABD728 /* 00C8C 80ABD83C 02603025 */ or $a2, $s3, $zero ## $a2 = FFFFFFE0 /* 00C90 80ABD840 02803825 */ or $a3, $s4, $zero ## $a3 = FFFFFFD4 /* 00C94 80ABD844 AFA20010 */ sw $v0, 0x0010($sp) -/* 00C98 80ABD848 0C00A586 */ jal func_80029618 +/* 00C98 80ABD848 0C00A586 */ jal EffectSsDtBubble_SpawnColorProfile /* 00C9C 80ABD84C AFA00018 */ sw $zero, 0x0018($sp) /* 00CA0 80ABD850 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 /* 00CA4 80ABD854 2A21000A */ slti $at, $s1, 0x000A @@ -112,7 +112,7 @@ glabel func_80ABD728 /* 00D0C 80ABD8BC E7B40010 */ swc1 $f20, 0x0010($sp) /* 00D10 80ABD8C0 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 /* 00D14 80ABD8C4 E7A6007C */ swc1 $f6, 0x007C($sp) -/* 00D18 80ABD8C8 0C00A4F9 */ jal func_800293E4 +/* 00D18 80ABD8C8 0C00A4F9 */ jal EffectSsBubble_Spawn /* 00D1C 80ABD8CC 02002825 */ or $a1, $s0, $zero ## $a1 = FFFFFFEC /* 00D20 80ABD8D0 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 /* 00D24 80ABD8D4 1633FFE8 */ bne $s1, $s3, .L80ABD878 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABE040.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABE040.s index d0a43b819b..0684e49c4d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABE040.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABE040.s @@ -186,7 +186,7 @@ glabel func_80ABE040 /* 01708 80ABE2B8 02802825 */ or $a1, $s4, $zero ## $a1 = 00000000 /* 0170C 80ABE2BC 27A6007C */ addiu $a2, $sp, 0x007C ## $a2 = FFFFFFBC /* 01710 80ABE2C0 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 -/* 01714 80ABE2C4 0C00A935 */ jal func_8002A4D4 +/* 01714 80ABE2C4 0C00A935 */ jal EffectSsEnFire_SpawnVec3f /* 01718 80ABE2C8 E7B20084 */ swc1 $f18, 0x0084($sp) .L80ABE2CC: /* 0171C 80ABE2CC 8FBF0064 */ lw $ra, 0x0064($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0890.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0890.s index 6345dd1519..126ab36c18 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0890.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0890.s @@ -27,7 +27,7 @@ glabel func_80AC0890 /* 00290 80AC08F0 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 00294 80AC08F4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000024 /* 00298 80AC08F8 E7B80010 */ swc1 $f24, 0x0010($sp) -/* 0029C 80AC08FC 0C00A4F9 */ jal func_800293E4 +/* 0029C 80AC08FC 0C00A4F9 */ jal EffectSsBubble_Spawn /* 002A0 80AC0900 E7BA0014 */ swc1 $f26, 0x0014($sp) /* 002A4 80AC0904 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 /* 002A8 80AC0908 5613FFF8 */ bnel $s0, $s3, .L80AC08EC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC09A4.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC09A4.s index afec8d63aa..18555ab942 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC09A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC09A4.s @@ -10,7 +10,7 @@ glabel func_80AC09A4 /* 00364 80AC09C4 AFA00010 */ sw $zero, 0x0010($sp) /* 00368 80AC09C8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 0036C 80AC09CC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00370 80AC09D0 0C00A527 */ jal func_8002949C +/* 00370 80AC09D0 0C00A527 */ jal EffectSsGSplash_Spawn /* 00374 80AC09D4 24A50008 */ addiu $a1, $a1, 0x0008 ## $a1 = 00000008 /* 00378 80AC09D8 8FBF001C */ lw $ra, 0x001C($sp) /* 0037C 80AC09DC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC09E8.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC09E8.s index 440562afca..15afab05c9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC09E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC09E8.s @@ -34,7 +34,7 @@ glabel func_80AC09E8 /* 00404 80AC0A64 8FA40034 */ lw $a0, 0x0034($sp) /* 00408 80AC0A68 240600FA */ addiu $a2, $zero, 0x00FA ## $a2 = 000000FA /* 0040C 80AC0A6C 2407028A */ addiu $a3, $zero, 0x028A ## $a3 = 0000028A -/* 00410 80AC0A70 0C00A511 */ jal func_80029444 +/* 00410 80AC0A70 0C00A511 */ jal EffectSsGRipple_Spawn /* 00414 80AC0A74 AFA00010 */ sw $zero, 0x0010($sp) /* 00418 80AC0A78 8FBF001C */ lw $ra, 0x001C($sp) .L80AC0A7C: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC14A8.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC14A8.s index 55f2443007..33fc4f94b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC14A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC14A8.s @@ -214,7 +214,7 @@ glabel func_80AC14A8 /* 010F8 80AC1758 AFB20010 */ sw $s2, 0x0010($sp) /* 010FC 80AC175C AFB30014 */ sw $s3, 0x0014($sp) /* 01100 80AC1760 AFA20018 */ sw $v0, 0x0018($sp) -/* 01104 80AC1764 0C00A5A5 */ jal func_80029694 +/* 01104 80AC1764 0C00A5A5 */ jal EffectSsDtBubble_SpawnCustomColor /* 01108 80AC1768 AFA00020 */ sw $zero, 0x0020($sp) /* 0110C 80AC176C 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 /* 01110 80AC1770 1614FFE3 */ bne $s0, $s4, .L80AC1700 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC17BC.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC17BC.s index c1d153c6bd..950e3c17e5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC17BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC17BC.s @@ -97,7 +97,7 @@ glabel func_80AC17BC /* 0129C 80AC18FC 8FA4005C */ lw $a0, 0x005C($sp) /* 012A0 80AC1900 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 012A4 80AC1904 27A6004C */ addiu $a2, $sp, 0x004C ## $a2 = FFFFFFF4 -/* 012A8 80AC1908 0C00A850 */ jal func_8002A140 +/* 012A8 80AC1908 0C00A850 */ jal EffectSsEnIce_SpawnFlyingVec3f /* 012AC 80AC190C 24070096 */ addiu $a3, $zero, 0x0096 ## $a3 = 00000096 .L80AC1910: /* 012B0 80AC1910 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC1938.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC1938.s index cdbb9d473b..11dfe9e41f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC1938.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC1938.s @@ -136,7 +136,7 @@ glabel func_80AC1938 /* 014BC 80AC1B1C 27A5004C */ addiu $a1, $sp, 0x004C ## $a1 = FFFFFFF4 /* 014C0 80AC1B20 3C0640C0 */ lui $a2, 0x40C0 ## $a2 = 40C00000 /* 014C4 80AC1B24 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 014C8 80AC1B28 0C00A5E9 */ jal func_800297A4 +/* 014C8 80AC1B28 0C00A5E9 */ jal EffectSsHahen_SpawnBurst /* 014CC 80AC1B2C E7B20054 */ swc1 $f18, 0x0054($sp) /* 014D0 80AC1B30 8FA4005C */ lw $a0, 0x005C($sp) /* 014D4 80AC1B34 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACDDE8.s b/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACDDE8.s index e775c9536b..d678ae0e8c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACDDE8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACDDE8.s @@ -152,7 +152,7 @@ glabel L80ACDF44 /* 00184 80ACDF54 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00188 80ACDF58 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024 /* 0018C 80ACDF5C 24070028 */ addiu $a3, $zero, 0x0028 ## $a3 = 00000028 -/* 00190 80ACDF60 0C00A935 */ jal func_8002A4D4 +/* 00190 80ACDF60 0C00A935 */ jal EffectSsEnFire_SpawnVec3f /* 00194 80ACDF64 AFA00014 */ sw $zero, 0x0014($sp) glabel L80ACDF68 /* 00198 80ACDF68 0C03F66B */ jal Math_Rand_ZeroOne @@ -200,7 +200,7 @@ glabel L80ACDFEC /* 0022C 80ACDFFC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00230 80ACE000 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024 /* 00234 80ACE004 24070028 */ addiu $a3, $zero, 0x0028 ## $a3 = 00000028 -/* 00238 80ACE008 0C00A935 */ jal func_8002A4D4 +/* 00238 80ACE008 0C00A935 */ jal EffectSsEnFire_SpawnVec3f /* 0023C 80ACE00C AFA00014 */ sw $zero, 0x0014($sp) glabel L80ACE010 /* 00240 80ACE010 0C03F66B */ jal Math_Rand_ZeroOne diff --git a/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACE13C.s b/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACE13C.s index 443ca9adc0..b385c4efa7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACE13C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACE13C.s @@ -150,7 +150,7 @@ glabel L80ACE2AC /* 0055C 80ACE32C 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 00560 80ACE330 26250024 */ addiu $a1, $s1, 0x0024 ## $a1 = 00000024 /* 00564 80ACE334 02603025 */ or $a2, $s3, $zero ## $a2 = FFFFFFCC -/* 00568 80ACE338 0C00A9AE */ jal func_8002A6B8 +/* 00568 80ACE338 0C00A9AE */ jal EffectSsDeadDb_Spawn /* 0056C 80ACE33C 02603825 */ or $a3, $s3, $zero ## $a3 = FFFFFFCC /* 00570 80ACE340 1000008A */ beq $zero, $zero, .L80ACE56C /* 00574 80ACE344 00000000 */ nop @@ -190,7 +190,7 @@ glabel L80ACE348 /* 005F8 80ACE3C8 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 005FC 80ACE3CC 26250024 */ addiu $a1, $s1, 0x0024 ## $a1 = 00000024 /* 00600 80ACE3D0 02603025 */ or $a2, $s3, $zero ## $a2 = FFFFFFCC -/* 00604 80ACE3D4 0C00A9AE */ jal func_8002A6B8 +/* 00604 80ACE3D4 0C00A9AE */ jal EffectSsDeadDb_Spawn /* 00608 80ACE3D8 02603825 */ or $a3, $s3, $zero ## $a3 = FFFFFFCC /* 0060C 80ACE3DC 10000063 */ beq $zero, $zero, .L80ACE56C /* 00610 80ACE3E0 00000000 */ nop @@ -242,7 +242,7 @@ glabel L80ACE3E4 /* 006AC 80ACE47C 27A6008C */ addiu $a2, $sp, 0x008C ## $a2 = FFFFFFE4 /* 006B0 80ACE480 27A70080 */ addiu $a3, $sp, 0x0080 ## $a3 = FFFFFFD8 /* 006B4 80ACE484 AFA20010 */ sw $v0, 0x0010($sp) -/* 006B8 80ACE488 0C00A586 */ jal func_80029618 +/* 006B8 80ACE488 0C00A586 */ jal EffectSsDtBubble_SpawnColorProfile /* 006BC 80ACE48C AFA00018 */ sw $zero, 0x0018($sp) /* 006C0 80ACE490 2610FFFF */ addiu $s0, $s0, 0xFFFF ## $s0 = 00000006 /* 006C4 80ACE494 0601FFD7 */ bgez $s0, .L80ACE3F4 @@ -299,7 +299,7 @@ glabel L80ACE4A4 /* 0077C 80ACE54C 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 00780 80ACE550 02402825 */ or $a1, $s2, $zero ## $a1 = FFFFFFF0 /* 00784 80ACE554 02603025 */ or $a2, $s3, $zero ## $a2 = FFFFFFCC -/* 00788 80ACE558 0C00A9AE */ jal func_8002A6B8 +/* 00788 80ACE558 0C00A9AE */ jal EffectSsDeadDb_Spawn /* 0078C 80ACE55C 02603825 */ or $a3, $s3, $zero ## $a3 = FFFFFFCC /* 00790 80ACE560 2610FFFF */ addiu $s0, $s0, 0xFFFF ## $s0 = 00000003 /* 00794 80ACE564 0601FFD3 */ bgez $s0, .L80ACE4B4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACE5C8.s b/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACE5C8.s index aecf85d347..fe338a1270 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACE5C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACE5C8.s @@ -139,7 +139,7 @@ glabel func_80ACE5C8 /* 009E4 80ACE7B4 AFA00020 */ sw $zero, 0x0020($sp) /* 009E8 80ACE7B8 4600540D */ trunc.w.s $f16, $f10 /* 009EC 80ACE7BC 440D8000 */ mfc1 $t5, $f16 -/* 009F0 80ACE7C0 0C00A5C9 */ jal func_80029724 +/* 009F0 80ACE7C0 0C00A5C9 */ jal EffectSsHahen_Spawn /* 009F4 80ACE7C4 AFAD0014 */ sw $t5, 0x0014($sp) /* 009F8 80ACE7C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 009FC 80ACE7CC 0C00BE0A */ jal Audio_PlayActorSound2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACE7E8.s b/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACE7E8.s index bbad769e1b..37d891f2e9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACE7E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Part/func_80ACE7E8.s @@ -55,7 +55,7 @@ glabel func_80ACE7E8 /* 00AE8 80ACE8B8 AFA90034 */ sw $t1, 0x0034($sp) /* 00AEC 80ACE8BC AFAA0038 */ sw $t2, 0x0038($sp) /* 00AF0 80ACE8C0 AFAB003C */ sw $t3, 0x003C($sp) -/* 00AF4 80ACE8C4 0C00A9AE */ jal func_8002A6B8 +/* 00AF4 80ACE8C4 0C00A9AE */ jal EffectSsDeadDb_Spawn /* 00AF8 80ACE8C8 AFAC0010 */ sw $t4, 0x0010($sp) /* 00AFC 80ACE8CC 0C00B55C */ jal Actor_Kill diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACF788.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACF788.s index 86e525ebfa..0b9b88b237 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACF788.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACF788.s @@ -105,7 +105,7 @@ glabel func_80ACF788 /* 0045C 80ACF8FC AFAF0010 */ sw $t7, 0x0010($sp) /* 00460 80ACF900 4600320D */ trunc.w.s $f8, $f6 /* 00464 80ACF904 44194000 */ mfc1 $t9, $f8 -/* 00468 80ACF908 0C00A5C9 */ jal func_80029724 +/* 00468 80ACF908 0C00A5C9 */ jal EffectSsHahen_Spawn /* 0046C 80ACF90C AFB90014 */ sw $t9, 0x0014($sp) /* 00470 80ACF910 8FBF002C */ lw $ra, 0x002C($sp) /* 00474 80ACF914 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD076C.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD076C.s index dbf6e7d2bc..d3febc81e4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD076C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD076C.s @@ -237,7 +237,7 @@ glabel func_80AD076C /* 015F4 80AD0A94 8FA40094 */ lw $a0, 0x0094($sp) /* 015F8 80AD0A98 27A5006C */ addiu $a1, $sp, 0x006C ## $a1 = FFFFFFDC /* 015FC 80AD0A9C 02203025 */ or $a2, $s1, $zero ## $a2 = FFFFFFEC -/* 01600 80AD0AA0 0C00A9AE */ jal func_8002A6B8 +/* 01600 80AD0AA0 0C00A9AE */ jal EffectSsDeadDb_Spawn /* 01604 80AD0AA4 02203825 */ or $a3, $s1, $zero ## $a3 = FFFFFFEC /* 01608 80AD0AA8 2610FFFF */ addiu $s0, $s0, 0xFFFF ## $s0 = 00000003 /* 0160C 80AD0AAC 0601FFD3 */ bgez $s0, .L80AD09FC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD14A0.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD14A0.s index a40faec71b..df9053dcea 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD14A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD14A0.s @@ -89,7 +89,7 @@ glabel func_80AD14A0 /* 02148 80AD15E8 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 0214C 80AD15EC 02602825 */ or $a1, $s3, $zero ## $a1 = FFFFFFE4 /* 02150 80AD15F0 02403025 */ or $a2, $s2, $zero ## $a2 = FFFFFFF4 -/* 02154 80AD15F4 0C00A9AE */ jal func_8002A6B8 +/* 02154 80AD15F4 0C00A9AE */ jal EffectSsDeadDb_Spawn /* 02158 80AD15F8 02403825 */ or $a3, $s2, $zero ## $a3 = FFFFFFF4 /* 0215C 80AD15FC 2610FFFF */ addiu $s0, $s0, 0xFFFF ## $s0 = 00000003 /* 02160 80AD1600 0601FFD4 */ bgez $s0, .L80AD1554 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1BD8.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1BD8.s index 603374c31c..821302be62 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1BD8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1BD8.s @@ -107,7 +107,7 @@ glabel func_80AD1BD8 /* 028B0 80AD1D50 E7A4005C */ swc1 $f4, 0x005C($sp) /* 028B4 80AD1D54 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 028B8 80AD1D58 02403025 */ or $a2, $s2, $zero ## $a2 = FFFFFFF4 -/* 028BC 80AD1D5C 0C00A935 */ jal func_8002A4D4 +/* 028BC 80AD1D5C 0C00A935 */ jal EffectSsEnFire_SpawnVec3f /* 028C0 80AD1D60 24070046 */ addiu $a3, $zero, 0x0046 ## $a3 = 00000046 /* 028C4 80AD1D64 2610FFFF */ addiu $s0, $s0, 0xFFFF ## $s0 = 00000003 /* 028C8 80AD1D68 0601FFE6 */ bgez $s0, .L80AD1D04 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4ED8.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4ED8.s index ec91bf7409..751a661959 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4ED8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4ED8.s @@ -153,7 +153,7 @@ glabel func_80AD4ED8 /* 01600 80AD5100 AFA00028 */ sw $zero, 0x0028($sp) /* 01604 80AD5104 AFA00014 */ sw $zero, 0x0014($sp) /* 01608 80AD5108 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0160C 80AD510C 0C00A9AE */ jal func_8002A6B8 +/* 0160C 80AD510C 0C00A9AE */ jal EffectSsDeadDb_Spawn /* 01610 80AD5110 27A5006C */ addiu $a1, $sp, 0x006C ## $a1 = FFFFFFF4 /* 01614 80AD5114 C6000024 */ lwc1 $f0, 0x0024($s0) ## 00000024 /* 01618 80AD5118 C7A4006C */ lwc1 $f4, 0x006C($sp) @@ -195,7 +195,7 @@ glabel func_80AD4ED8 /* 016A8 80AD51A8 AFAF0020 */ sw $t7, 0x0020($sp) /* 016AC 80AD51AC AFAE001C */ sw $t6, 0x001C($sp) /* 016B0 80AD51B0 AFAD0018 */ sw $t5, 0x0018($sp) -/* 016B4 80AD51B4 0C00A9AE */ jal func_8002A6B8 +/* 016B4 80AD51B4 0C00A9AE */ jal EffectSsDeadDb_Spawn /* 016B8 80AD51B8 AFA00014 */ sw $zero, 0x0014($sp) /* 016BC 80AD51BC C6100024 */ lwc1 $f16, 0x0024($s0) ## 00000024 /* 016C0 80AD51C0 3C0680AD */ lui $a2, %hi(D_80AD7114) ## $a2 = 80AD0000 @@ -231,7 +231,7 @@ glabel func_80AD4ED8 /* 01738 80AD5238 24E77120 */ addiu $a3, $a3, %lo(D_80AD7120) ## $a3 = 80AD7120 /* 0173C 80AD523C 24C67114 */ addiu $a2, $a2, %lo(D_80AD7114) ## $a2 = 80AD7114 /* 01740 80AD5240 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01744 80AD5244 0C00A9AE */ jal func_8002A6B8 +/* 01744 80AD5244 0C00A9AE */ jal EffectSsDeadDb_Spawn /* 01748 80AD5248 27A5006C */ addiu $a1, $sp, 0x006C ## $a1 = FFFFFFF4 /* 0174C 80AD524C 86020196 */ lh $v0, 0x0196($s0) ## 00000196 /* 01750 80AD5250 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD53F0.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD53F0.s index e5e0612d75..bf8cdc087b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD53F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD53F0.s @@ -28,7 +28,7 @@ glabel func_80AD53F0 /* 01954 80AD5454 AFA90018 */ sw $t1, 0x0018($sp) /* 01958 80AD5458 AFA80014 */ sw $t0, 0x0014($sp) /* 0195C 80AD545C AFB90010 */ sw $t9, 0x0010($sp) -/* 01960 80AD5460 0C00A5E9 */ jal func_800297A4 +/* 01960 80AD5460 0C00A5E9 */ jal EffectSsHahen_SpawnBurst /* 01964 80AD5464 AFAC0024 */ sw $t4, 0x0024($sp) /* 01968 80AD5468 0C2B50AC */ jal func_80AD42B0 /* 0196C 80AD546C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD830C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD830C.s index 0f44ce24c1..c0112e79ce 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD830C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD830C.s @@ -147,7 +147,7 @@ glabel func_80AD830C /* 00DF0 80AD8530 AFA00028 */ sw $zero, 0x0028($sp) /* 00DF4 80AD8534 AFA00014 */ sw $zero, 0x0014($sp) /* 00DF8 80AD8538 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00DFC 80AD853C 0C00A9AE */ jal func_8002A6B8 +/* 00DFC 80AD853C 0C00A9AE */ jal EffectSsDeadDb_Spawn /* 00E00 80AD8540 27A50074 */ addiu $a1, $sp, 0x0074 ## $a1 = FFFFFFF4 /* 00E04 80AD8544 C6000024 */ lwc1 $f0, 0x0024($s0) ## 00000024 /* 00E08 80AD8548 C7A40074 */ lwc1 $f4, 0x0074($sp) @@ -189,7 +189,7 @@ glabel func_80AD830C /* 00E98 80AD85D8 AFAF0020 */ sw $t7, 0x0020($sp) /* 00E9C 80AD85DC AFAE001C */ sw $t6, 0x001C($sp) /* 00EA0 80AD85E0 AFAD0018 */ sw $t5, 0x0018($sp) -/* 00EA4 80AD85E4 0C00A9AE */ jal func_8002A6B8 +/* 00EA4 80AD85E4 0C00A9AE */ jal EffectSsDeadDb_Spawn /* 00EA8 80AD85E8 AFA00014 */ sw $zero, 0x0014($sp) /* 00EAC 80AD85EC C6100024 */ lwc1 $f16, 0x0024($s0) ## 00000024 /* 00EB0 80AD85F0 3C0680AE */ lui $a2, %hi(D_80AD8D30) ## $a2 = 80AE0000 @@ -225,7 +225,7 @@ glabel func_80AD830C /* 00F28 80AD8668 24E78D3C */ addiu $a3, $a3, %lo(D_80AD8D3C) ## $a3 = 80AD8D3C /* 00F2C 80AD866C 24C68D30 */ addiu $a2, $a2, %lo(D_80AD8D30) ## $a2 = 80AD8D30 /* 00F30 80AD8670 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00F34 80AD8674 0C00A9AE */ jal func_8002A6B8 +/* 00F34 80AD8674 0C00A9AE */ jal EffectSsDeadDb_Spawn /* 00F38 80AD8678 27A50074 */ addiu $a1, $sp, 0x0074 ## $a1 = FFFFFFF4 /* 00F3C 80AD867C 860C0196 */ lh $t4, 0x0196($s0) ## 00000196 /* 00F40 80AD8680 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9C24.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9C24.s index c2e7ae85ac..9a16bc02df 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9C24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9C24.s @@ -55,7 +55,7 @@ glabel func_80AD9C24 /* 00D68 80AD9CF8 AFAC0010 */ sw $t4, 0x0010($sp) /* 00D6C 80AD9CFC 27A50054 */ addiu $a1, $sp, 0x0054 ## $a1 = FFFFFFF4 /* 00D70 80AD9D00 00C03825 */ or $a3, $a2, $zero ## $a3 = 80ADD790 -/* 00D74 80AD9D04 0C00A9AE */ jal func_8002A6B8 +/* 00D74 80AD9D04 0C00A9AE */ jal EffectSsDeadDb_Spawn /* 00D78 80AD9D08 E7B0005C */ swc1 $f16, 0x005C($sp) .L80AD9D0C: /* 00D7C 80AD9D0C 2604029C */ addiu $a0, $s0, 0x029C ## $a0 = 0000029C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF15C.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF15C.s index 81750020cd..0d35bfe3c0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF15C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF15C.s @@ -153,7 +153,7 @@ glabel func_80ADF15C /* 01634 80ADF384 AFA00028 */ sw $zero, 0x0028($sp) /* 01638 80ADF388 AFA00014 */ sw $zero, 0x0014($sp) /* 0163C 80ADF38C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01640 80ADF390 0C00A9AE */ jal func_8002A6B8 +/* 01640 80ADF390 0C00A9AE */ jal EffectSsDeadDb_Spawn /* 01644 80ADF394 27A5006C */ addiu $a1, $sp, 0x006C ## $a1 = FFFFFFF4 /* 01648 80ADF398 C6000024 */ lwc1 $f0, 0x0024($s0) ## 00000024 /* 0164C 80ADF39C C7A4006C */ lwc1 $f4, 0x006C($sp) @@ -195,7 +195,7 @@ glabel func_80ADF15C /* 016DC 80ADF42C AFAF0020 */ sw $t7, 0x0020($sp) /* 016E0 80ADF430 AFAE001C */ sw $t6, 0x001C($sp) /* 016E4 80ADF434 AFAD0018 */ sw $t5, 0x0018($sp) -/* 016E8 80ADF438 0C00A9AE */ jal func_8002A6B8 +/* 016E8 80ADF438 0C00A9AE */ jal EffectSsDeadDb_Spawn /* 016EC 80ADF43C AFA00014 */ sw $zero, 0x0014($sp) /* 016F0 80ADF440 C6100024 */ lwc1 $f16, 0x0024($s0) ## 00000024 /* 016F4 80ADF444 3C0680AE */ lui $a2, %hi(D_80AE1B60) ## $a2 = 80AE0000 @@ -231,7 +231,7 @@ glabel func_80ADF15C /* 0176C 80ADF4BC 24E71B6C */ addiu $a3, $a3, %lo(D_80AE1B6C) ## $a3 = 80AE1B6C /* 01770 80ADF4C0 24C61B60 */ addiu $a2, $a2, %lo(D_80AE1B60) ## $a2 = 80AE1B60 /* 01774 80ADF4C4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01778 80ADF4C8 0C00A9AE */ jal func_8002A6B8 +/* 01778 80ADF4C8 0C00A9AE */ jal EffectSsDeadDb_Spawn /* 0177C 80ADF4CC 27A5006C */ addiu $a1, $sp, 0x006C ## $a1 = FFFFFFF4 /* 01780 80ADF4D0 86020198 */ lh $v0, 0x0198($s0) ## 00000198 /* 01784 80ADF4D4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF994.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF994.s index 1306cd8bc8..a903b4d5d7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF994.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF994.s @@ -34,7 +34,7 @@ glabel func_80ADF994 /* 01CBC 80ADFA0C 3C0640C0 */ lui $a2, 0x40C0 ## $a2 = 40C00000 /* 01CC0 80ADFA10 8D8D001C */ lw $t5, 0x001C($t4) ## 0000001C /* 01CC4 80ADFA14 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01CC8 80ADFA18 0C00A5E9 */ jal func_800297A4 +/* 01CC8 80ADFA18 0C00A5E9 */ jal EffectSsHahen_SpawnBurst /* 01CCC 80ADFA1C AFAD0024 */ sw $t5, 0x0024($sp) /* 01CD0 80ADFA20 0C2B79B5 */ jal func_80ADE6D4 /* 01CD4 80ADFA24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5938.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5938.s index a104a42f2a..b26891597d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5938.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5938.s @@ -78,7 +78,7 @@ glabel func_80AE5938 /* 00D80 80AE5A50 AFA90018 */ sw $t1, 0x0018($sp) /* 00D84 80AE5A54 AFB90010 */ sw $t9, 0x0010($sp) /* 00D88 80AE5A58 AFA80014 */ sw $t0, 0x0014($sp) -/* 00D8C 80AE5A5C 0C00A850 */ jal func_8002A140 +/* 00D8C 80AE5A5C 0C00A850 */ jal EffectSsEnIce_SpawnFlyingVec3f /* 00D90 80AE5A60 E7A20028 */ swc1 $f2, 0x0028($sp) .L80AE5A64: /* 00D94 80AE5A64 3C0E80AE */ lui $t6, %hi(func_80AE5E48) ## $t6 = 80AE0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5A9C.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5A9C.s index bf3d816d42..7a4ff49b63 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5A9C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5A9C.s @@ -60,7 +60,7 @@ glabel func_80AE5A9C /* 00EA4 80AE5B74 AFA90018 */ sw $t1, 0x0018($sp) /* 00EA8 80AE5B78 AFB90010 */ sw $t9, 0x0010($sp) /* 00EAC 80AE5B7C AFA80014 */ sw $t0, 0x0014($sp) -/* 00EB0 80AE5B80 0C00A850 */ jal func_8002A140 +/* 00EB0 80AE5B80 0C00A850 */ jal EffectSsEnIce_SpawnFlyingVec3f /* 00EB4 80AE5B84 E7A20028 */ swc1 $f2, 0x0028($sp) /* 00EB8 80AE5B88 1000000A */ beq $zero, $zero, .L80AE5BB4 /* 00EBC 80AE5B8C 8FBF003C */ lw $ra, 0x003C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5C38.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5C38.s index 09a7c9cbb3..2dc9154ebc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5C38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE5C38.s @@ -102,7 +102,7 @@ glabel func_80AE5C38 /* 010A8 80AE5D78 AFAD0010 */ sw $t5, 0x0010($sp) /* 010AC 80AE5D7C 8FA40084 */ lw $a0, 0x0084($sp) /* 010B0 80AE5D80 E7AA0060 */ swc1 $f10, 0x0060($sp) -/* 010B4 80AE5D84 0C00A9AE */ jal func_8002A6B8 +/* 010B4 80AE5D84 0C00A9AE */ jal EffectSsDeadDb_Spawn /* 010B8 80AE5D88 E7A8007C */ swc1 $f8, 0x007C($sp) /* 010BC 80AE5D8C 860C027A */ lh $t4, 0x027A($s0) ## 0000027A /* 010C0 80AE5D90 27A60074 */ addiu $a2, $sp, 0x0074 ## $a2 = FFFFFFF4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rr/EnRr_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Rr/EnRr_Draw.s index 85f6f8e346..08ffd0af6d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rr/EnRr_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rr/EnRr_Draw.s @@ -271,7 +271,7 @@ glabel EnRr_Draw /* 0216C 80AEA5AC 27A6007C */ addiu $a2, $sp, 0x007C ## $a2 = FFFFFFB4 /* 02170 80AEA5B0 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 /* 02174 80AEA5B4 AFA00010 */ sw $zero, 0x0010($sp) -/* 02178 80AEA5B8 0C00A935 */ jal func_8002A4D4 +/* 02178 80AEA5B8 0C00A935 */ jal EffectSsEnFire_SpawnVec3f /* 0217C 80AEA5BC AFA00014 */ sw $zero, 0x0014($sp) /* 02180 80AEA5C0 1000000B */ beq $zero, $zero, .L80AEA5F0 /* 02184 80AEA5C4 8FBF005C */ lw $ra, 0x005C($sp) @@ -283,7 +283,7 @@ glabel EnRr_Draw /* 02198 80AEA5D8 AFB8001C */ sw $t8, 0x001C($sp) /* 0219C 80AEA5DC AFB90020 */ sw $t9, 0x0020($sp) /* 021A0 80AEA5E0 AFAA0024 */ sw $t2, 0x0024($sp) -/* 021A4 80AEA5E4 0C00A850 */ jal func_8002A140 +/* 021A4 80AEA5E4 0C00A850 */ jal EffectSsEnIce_SpawnFlyingVec3f /* 021A8 80AEA5E8 E7B00028 */ swc1 $f16, 0x0028($sp) .L80AEA5EC: /* 021AC 80AEA5EC 8FBF005C */ lw $ra, 0x005C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE98F8.s b/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE98F8.s index 62920530e8..92027d0788 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE98F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rr/func_80AE98F8.s @@ -247,7 +247,7 @@ glabel L80AE9B4C /* 017CC 80AE9C0C E7A00078 */ swc1 $f0, 0x0078($sp) /* 017D0 80AE9C10 E7A0007C */ swc1 $f0, 0x007C($sp) /* 017D4 80AE9C14 E7A00080 */ swc1 $f0, 0x0080($sp) -/* 017D8 80AE9C18 0C00A9AE */ jal func_8002A6B8 +/* 017D8 80AE9C18 0C00A9AE */ jal EffectSsDeadDb_Spawn /* 017DC 80AE9C1C E7A80098 */ swc1 $f8, 0x0098($sp) /* 017E0 80AE9C20 10000013 */ beq $zero, $zero, .L80AE9C70 /* 017E4 80AE9C24 8FBF005C */ lw $ra, 0x005C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Siofuki/func_80AFBE8C.s b/asm/non_matchings/overlays/actors/ovl_En_Siofuki/func_80AFBE8C.s index 538a3a5c6d..8516e7823d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Siofuki/func_80AFBE8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Siofuki/func_80AFBE8C.s @@ -76,7 +76,7 @@ glabel func_80AFBE8C /* 00418 80AFBF98 AFB80014 */ sw $t8, 0x0014($sp) /* 0041C 80AFBF9C AFAF0010 */ sw $t7, 0x0010($sp) /* 00420 80AFBFA0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00424 80AFBFA4 0C00A527 */ jal func_8002949C +/* 00424 80AFBFA4 0C00A527 */ jal EffectSsGSplash_Spawn /* 00428 80AFBFA8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0042C 80AFBFAC 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 00430 80AFBFB0 2419000A */ addiu $t9, $zero, 0x000A ## $t9 = 0000000A diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFC9A8.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFC9A8.s index 35be7c61f9..fff0081b4d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFC9A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFC9A8.s @@ -104,7 +104,7 @@ glabel func_80AFC9A8 /* 0016C 80AFCB0C AFA00020 */ sw $zero, 0x0020($sp) /* 00170 80AFCB10 4600910D */ trunc.w.s $f4, $f18 /* 00174 80AFCB14 44192000 */ mfc1 $t9, $f4 -/* 00178 80AFCB18 0C00A5C9 */ jal func_80029724 +/* 00178 80AFCB18 0C00A5C9 */ jal EffectSsHahen_Spawn /* 0017C 80AFCB1C AFB90014 */ sw $t9, 0x0014($sp) /* 00180 80AFCB20 240A0096 */ addiu $t2, $zero, 0x0096 ## $t2 = 00000096 /* 00184 80AFCB24 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD968.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD968.s index 14fb9b678d..b117e98b0a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD968.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD968.s @@ -126,7 +126,7 @@ glabel func_80AFD968 /* 01184 80AFDB24 AFA00010 */ sw $zero, 0x0010($sp) /* 01188 80AFDB28 46048180 */ add.s $f6, $f16, $f4 /* 0118C 80AFDB2C AFA00014 */ sw $zero, 0x0014($sp) -/* 01190 80AFDB30 0C00A935 */ jal func_8002A4D4 +/* 01190 80AFDB30 0C00A935 */ jal EffectSsEnFire_SpawnVec3f /* 01194 80AFDB34 E7A60058 */ swc1 $f6, 0x0058($sp) /* 01198 80AFDB38 2610FFFF */ addiu $s0, $s0, 0xFFFF ## $s0 = 00000003 /* 0119C 80AFDB3C 0603FFDE */ bgezl $s0, .L80AFDAB8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFEC3C.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFEC3C.s index 51d92025e5..2a7fbde9de 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFEC3C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFEC3C.s @@ -43,7 +43,7 @@ glabel func_80AFEC3C /* 00A30 80AFECE0 E7B20038 */ swc1 $f18, 0x0038($sp) /* 00A34 80AFECE4 8FA40044 */ lw $a0, 0x0044($sp) /* 00A38 80AFECE8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00A3C 80AFECEC 0C00A729 */ jal func_80029CA4 +/* 00A3C 80AFECEC 0C00A729 */ jal EffectSsHitMark_SpawnFixedScale /* 00A40 80AFECF0 27A60030 */ addiu $a2, $sp, 0x0030 ## $a2 = FFFFFFF0 /* 00A44 80AFECF4 860B008A */ lh $t3, 0x008A($s0) ## 0000008A /* 00A48 80AFECF8 860C0032 */ lh $t4, 0x0032($s0) ## 00000032 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF688.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF688.s index eee31cdf44..afe03c7c1d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF688.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF688.s @@ -66,7 +66,7 @@ glabel func_80AFF688 /* 014C8 80AFF778 E7A20054 */ swc1 $f2, 0x0054($sp) /* 014CC 80AFF77C E7A20068 */ swc1 $f2, 0x0068($sp) /* 014D0 80AFF780 E7A20064 */ swc1 $f2, 0x0064($sp) -/* 014D4 80AFF784 0C00A9AE */ jal func_8002A6B8 +/* 014D4 80AFF784 0C00A9AE */ jal EffectSsDeadDb_Spawn /* 014D8 80AFF788 E7A20060 */ swc1 $f2, 0x0060($sp) /* 014DC 80AFF78C 8FBF004C */ lw $ra, 0x004C($sp) /* 014E0 80AFF790 8FB00048 */ lw $s0, 0x0048($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02278.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02278.s index 10a3a95e63..980192a149 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02278.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02278.s @@ -27,7 +27,7 @@ glabel func_80B02278 /* 0006C 80B022DC AFAA0018 */ sw $t2, 0x0018($sp) /* 00070 80B022E0 AFA90014 */ sw $t1, 0x0014($sp) /* 00074 80B022E4 AFA80010 */ sw $t0, 0x0010($sp) -/* 00078 80B022E8 0C00A3E1 */ jal func_80028F84 +/* 00078 80B022E8 0C00A3E1 */ jal EffectSsBlast_SpawnWhiteCustomScale /* 0007C 80B022EC E7A80030 */ swc1 $f8, 0x0030($sp) /* 00080 80B022F0 8FBF0024 */ lw $ra, 0x0024($sp) /* 00084 80B022F4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D878.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D878.s index 79a14cbf93..39d3464746 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D878.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0D878.s @@ -165,7 +165,7 @@ glabel func_80B0D878 /* 01D28 80B0DAD8 27A50078 */ addiu $a1, $sp, 0x0078 ## $a1 = FFFFFFF0 /* 01D2C 80B0DADC AFA00014 */ sw $zero, 0x0014($sp) /* 01D30 80B0DAE0 AFA0002C */ sw $zero, 0x002C($sp) -/* 01D34 80B0DAE4 0C00A9AE */ jal func_8002A6B8 +/* 01D34 80B0DAE4 0C00A9AE */ jal EffectSsDeadDb_Spawn /* 01D38 80B0DAE8 AFA00030 */ sw $zero, 0x0030($sp) /* 01D3C 80B0DAEC 8FBF004C */ lw $ra, 0x004C($sp) .L80B0DAF0: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DC7C.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DC7C.s index 60db370a99..46f34d4440 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DC7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DC7C.s @@ -96,7 +96,7 @@ glabel func_80B0DC7C /* 02030 80B0DDE0 AFA0002C */ sw $zero, 0x002C($sp) /* 02034 80B0DDE4 AFA00014 */ sw $zero, 0x0014($sp) /* 02038 80B0DDE8 8FA40074 */ lw $a0, 0x0074($sp) -/* 0203C 80B0DDEC 0C00A9AE */ jal func_8002A6B8 +/* 0203C 80B0DDEC 0C00A9AE */ jal EffectSsDeadDb_Spawn /* 02040 80B0DDF0 27A50058 */ addiu $a1, $sp, 0x0058 ## $a1 = FFFFFFE8 /* 02044 80B0DDF4 860C00B4 */ lh $t4, 0x00B4($s0) ## 000000B4 /* 02048 80B0DDF8 860E00B8 */ lh $t6, 0x00B8($s0) ## 000000B8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Draw.s index e079556418..3043c9a1b0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Draw.s @@ -63,7 +63,7 @@ glabel EnTest_Draw /* 04AE0 80864130 24C6014C */ addiu $a2, $a2, 0x014C ## $a2 = 0000014C /* 04AE4 80864134 8FA40044 */ lw $a0, 0x0044($sp) /* 04AE8 80864138 24070096 */ addiu $a3, $zero, 0x0096 ## $a3 = 00000096 -/* 04AEC 8086413C 0C00A877 */ jal func_8002A1DC +/* 04AEC 8086413C 0C00A877 */ jal EffectSsEnIce_SpawnFlyingVec3s /* 04AF0 80864140 E7A40028 */ swc1 $f4, 0x0028($sp) .L80864144: /* 04AF4 80864144 8FBF003C */ lw $ra, 0x003C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Draw.s index 0fb8be3c24..e5f9cf8b43 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Draw.s @@ -212,7 +212,7 @@ glabel EnTite_Draw /* 02AFC 80B1B57C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 02B00 80B1B580 27A6004C */ addiu $a2, $sp, 0x004C ## $a2 = FFFFFFC4 /* 02B04 80B1B584 24070096 */ addiu $a3, $zero, 0x0096 ## $a3 = 00000096 -/* 02B08 80B1B588 0C00A850 */ jal func_8002A140 +/* 02B08 80B1B588 0C00A850 */ jal EffectSsEnIce_SpawnFlyingVec3f /* 02B0C 80B1B58C E7AA0028 */ swc1 $f10, 0x0028($sp) .L80B1B590: /* 02B10 80B1B590 8FBF003C */ lw $ra, 0x003C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Update.s index b9fcb63289..8002b21c59 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Update.s @@ -72,7 +72,7 @@ glabel EnTite_Update /* 02424 80B1AEA4 45020005 */ bc1fl .L80B1AEBC /* 02428 80B1AEA8 8FB80030 */ lw $t8, 0x0030($sp) /* 0242C 80B1AEAC E60A0364 */ swc1 $f10, 0x0364($s0) ## 00000364 -/* 02430 80B1AEB0 0C00A511 */ jal func_80029444 +/* 02430 80B1AEB0 0C00A511 */ jal EffectSsGRipple_Spawn /* 02434 80B1AEB4 AFA00010 */ sw $zero, 0x0010($sp) .L80B1AEB8: /* 02438 80B1AEB8 8FB80030 */ lw $t8, 0x0030($sp) @@ -110,7 +110,7 @@ glabel EnTite_Update /* 024B0 80B1AF30 45020005 */ bc1fl .L80B1AF48 /* 024B4 80B1AF34 8FAD0030 */ lw $t5, 0x0030($sp) /* 024B8 80B1AF38 E6060370 */ swc1 $f6, 0x0370($s0) ## 00000370 -/* 024BC 80B1AF3C 0C00A511 */ jal func_80029444 +/* 024BC 80B1AF3C 0C00A511 */ jal EffectSsGRipple_Spawn /* 024C0 80B1AF40 AFA00010 */ sw $zero, 0x0010($sp) .L80B1AF44: /* 024C4 80B1AF44 8FAD0030 */ lw $t5, 0x0030($sp) @@ -148,7 +148,7 @@ glabel EnTite_Update /* 0253C 80B1AFBC 45020005 */ bc1fl .L80B1AFD4 /* 02540 80B1AFC0 8FA90030 */ lw $t1, 0x0030($sp) /* 02544 80B1AFC4 E612034C */ swc1 $f18, 0x034C($s0) ## 0000034C -/* 02548 80B1AFC8 0C00A511 */ jal func_80029444 +/* 02548 80B1AFC8 0C00A511 */ jal EffectSsGRipple_Spawn /* 0254C 80B1AFCC AFA00010 */ sw $zero, 0x0010($sp) .L80B1AFD0: /* 02550 80B1AFD0 8FA90030 */ lw $t1, 0x0030($sp) @@ -186,7 +186,7 @@ glabel EnTite_Update /* 025C8 80B1B048 45020005 */ bc1fl .L80B1B060 /* 025CC 80B1B04C 8FB9003C */ lw $t9, 0x003C($sp) /* 025D0 80B1B050 E6100358 */ swc1 $f16, 0x0358($s0) ## 00000358 -/* 025D4 80B1B054 0C00A511 */ jal func_80029444 +/* 025D4 80B1B054 0C00A511 */ jal EffectSsGRipple_Spawn /* 025D8 80B1B058 AFA00010 */ sw $zero, 0x0010($sp) .L80B1B05C: /* 025DC 80B1B05C 8FB9003C */ lw $t9, 0x003C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18E7C.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18E7C.s index 59d6a6071c..774498e231 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18E7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18E7C.s @@ -147,7 +147,7 @@ glabel func_80B18E7C /* 0060C 80B1908C E6080060 */ swc1 $f8, 0x0060($s0) ## 00000060 /* 00610 80B19090 AFA00010 */ sw $zero, 0x0010($sp) /* 00614 80B19094 8FA4005C */ lw $a0, 0x005C($sp) -/* 00618 80B19098 0C00A511 */ jal func_80029444 +/* 00618 80B19098 0C00A511 */ jal EffectSsGRipple_Spawn /* 0061C 80B1909C AFAB0050 */ sw $t3, 0x0050($sp) /* 00620 80B190A0 10000006 */ beq $zero, $zero, .L80B190BC /* 00624 80B190A4 860C00B6 */ lh $t4, 0x00B6($s0) ## 000000B6 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19918.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19918.s index b5eec7f4a2..528c293591 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19918.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19918.s @@ -171,7 +171,7 @@ glabel func_80B19918 /* 01104 80B19B84 46062202 */ mul.s $f8, $f4, $f6 /* 01108 80B19B88 E6080060 */ swc1 $f8, 0x0060($s0) ## 00000060 /* 0110C 80B19B8C AFA00010 */ sw $zero, 0x0010($sp) -/* 01110 80B19B90 0C00A511 */ jal func_80029444 +/* 01110 80B19B90 0C00A511 */ jal EffectSsGRipple_Spawn /* 01114 80B19B94 8FA4004C */ lw $a0, 0x004C($sp) /* 01118 80B19B98 1000009F */ beq $zero, $zero, .L80B19E18 /* 0111C 80B19B9C 8FBF002C */ lw $ra, 0x002C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Update.s index 6a68f9184b..f8f408013f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Update.s @@ -219,7 +219,7 @@ glabel EnTp_Update /* 01974 80B22754 27A6005C */ addiu $a2, $sp, 0x005C ## $a2 = FFFFFFEC /* 01978 80B22758 27A70050 */ addiu $a3, $sp, 0x0050 ## $a3 = FFFFFFE0 /* 0197C 80B2275C 46105480 */ add.s $f18, $f10, $f16 -/* 01980 80B22760 0C00A2DD */ jal func_80028B74 +/* 01980 80B22760 0C00A2DD */ jal EffectSsKiraKira_SpawnSmall /* 01984 80B22764 E7B2004C */ swc1 $f18, 0x004C($sp) /* 01988 80B22768 8E0F014C */ lw $t7, 0x014C($s0) ## 0000014C .L80B2276C: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B214CC.s b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B214CC.s index 2b00377443..453104e991 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B214CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B214CC.s @@ -92,7 +92,7 @@ glabel func_80B214CC /* 00848 80B21628 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 0084C 80B2162C 02202825 */ or $a1, $s1, $zero ## $a1 = FFFFFFDC /* 00850 80B21630 02003025 */ or $a2, $s0, $zero ## $a2 = FFFFFFE8 -/* 00854 80B21634 0C00A9AE */ jal func_8002A6B8 +/* 00854 80B21634 0C00A9AE */ jal EffectSsDeadDb_Spawn /* 00858 80B21638 02003825 */ or $a3, $s0, $zero ## $a3 = FFFFFFE8 /* 0085C 80B2163C 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float @@ -146,7 +146,7 @@ glabel func_80B214CC /* 00914 80B216F4 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 00918 80B216F8 02202825 */ or $a1, $s1, $zero ## $a1 = FFFFFFDC /* 0091C 80B216FC 02003025 */ or $a2, $s0, $zero ## $a2 = FFFFFFE8 -/* 00920 80B21700 0C00A9AE */ jal func_8002A6B8 +/* 00920 80B21700 0C00A9AE */ jal EffectSsDeadDb_Spawn /* 00924 80B21704 02003825 */ or $a3, $s0, $zero ## $a3 = FFFFFFE8 /* 00928 80B21708 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 0092C 80B2170C 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B21F18.s b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B21F18.s index cbbac502ac..4497bd025b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B21F18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tp/func_80B21F18.s @@ -190,7 +190,7 @@ glabel func_80B21F18 /* 013E0 80B221C0 27A50048 */ addiu $a1, $sp, 0x0048 ## $a1 = FFFFFFE8 /* 013E4 80B221C4 27A60054 */ addiu $a2, $sp, 0x0054 ## $a2 = FFFFFFF4 /* 013E8 80B221C8 AFA20018 */ sw $v0, 0x0018($sp) -/* 013EC 80B221CC 0C00A5A5 */ jal func_80029694 +/* 013EC 80B221CC 0C00A5A5 */ jal EffectSsDtBubble_SpawnCustomColor /* 013F0 80B221D0 AFA00020 */ sw $zero, 0x0020($sp) .L80B221D4: /* 013F4 80B221D4 8FBF0034 */ lw $ra, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Update.s index e38c5603d5..445a28de1e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Update.s @@ -103,7 +103,7 @@ glabel EnTrap_Update /* 00520 80B24B80 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00524 80B24B84 27A6007C */ addiu $a2, $sp, 0x007C ## $a2 = FFFFFFD4 /* 00528 80B24B88 24070096 */ addiu $a3, $zero, 0x0096 ## $a3 = 00000096 -/* 0052C 80B24B8C 0C00A850 */ jal func_8002A140 +/* 0052C 80B24B8C 0C00A850 */ jal EffectSsEnIce_SpawnFlyingVec3f /* 00530 80B24B90 E7B00028 */ swc1 $f16, 0x0028($sp) /* 00534 80B24B94 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 00538 80B24B98 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 @@ -133,7 +133,7 @@ glabel EnTrap_Update /* 00598 80B24BF8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 0059C 80B24BFC 27A6007C */ addiu $a2, $sp, 0x007C ## $a2 = FFFFFFD4 /* 005A0 80B24C00 24070096 */ addiu $a3, $zero, 0x0096 ## $a3 = 00000096 -/* 005A4 80B24C04 0C00A850 */ jal func_8002A140 +/* 005A4 80B24C04 0C00A850 */ jal EffectSsEnIce_SpawnFlyingVec3f /* 005A8 80B24C08 E7B20028 */ swc1 $f18, 0x0028($sp) /* 005AC 80B24C0C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 005B0 80B24C10 44813000 */ mtc1 $at, $f6 ## $f6 = 20.00 @@ -158,7 +158,7 @@ glabel EnTrap_Update /* 005FC 80B24C5C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00600 80B24C60 27A6007C */ addiu $a2, $sp, 0x007C ## $a2 = FFFFFFD4 /* 00604 80B24C64 24070096 */ addiu $a3, $zero, 0x0096 ## $a3 = 00000096 -/* 00608 80B24C68 0C00A850 */ jal func_8002A140 +/* 00608 80B24C68 0C00A850 */ jal EffectSsEnIce_SpawnFlyingVec3f /* 0060C 80B24C6C E7AA0028 */ swc1 $f10, 0x0028($sp) /* 00610 80B24C70 87A8008A */ lh $t0, 0x008A($sp) /* 00614 80B24C74 87A90094 */ lh $t1, 0x0094($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_HandleImpact.s b/asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_HandleImpact.s index a386f32825..1c186ca3a1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_HandleImpact.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_HandleImpact.s @@ -18,7 +18,7 @@ glabel EnTuboTrap_HandleImpact /* 00658 80B25F48 00000000 */ nop /* 0065C 80B25F4C 45020010 */ bc1fl .L80B25F90 /* 00660 80B25F50 92020170 */ lbu $v0, 0x0170($s0) ## 00000170 -/* 00664 80B25F54 0C2C9723 */ jal EnTuboTrap_SpawnWaterFragments +/* 00664 80B25F54 0C2C9723 */ jal EnTuboTrap_SpawnEffectsInWater /* 00668 80B25F58 00000000 */ nop /* 0066C 80B25F5C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00670 80B25F60 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 @@ -41,7 +41,7 @@ glabel EnTuboTrap_HandleImpact /* 006A8 80B25F98 30580004 */ andi $t8, $v0, 0x0004 ## $t8 = 00000000 /* 006AC 80B25F9C 13000015 */ beq $t8, $zero, .L80B25FF4 /* 006B0 80B25FA0 3059FFFB */ andi $t9, $v0, 0xFFFB ## $t9 = 00000000 -/* 006B4 80B25FA4 0C2C9686 */ jal EnTuboTrap_SpawnFragments +/* 006B4 80B25FA4 0C2C9686 */ jal EnTuboTrap_SpawnEffectsOnLand /* 006B8 80B25FA8 A2190170 */ sb $t9, 0x0170($s0) ## 00000170 /* 006BC 80B25FAC 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 /* 006C0 80B25FB0 AFA50024 */ sw $a1, 0x0024($sp) @@ -72,7 +72,7 @@ glabel EnTuboTrap_HandleImpact /* 00714 80B26004 11000016 */ beq $t0, $zero, .L80B26060 /* 00718 80B26008 3069FFFD */ andi $t1, $v1, 0xFFFD ## $t1 = 00000000 /* 0071C 80B2600C A2090171 */ sb $t1, 0x0171($s0) ## 00000171 -/* 00720 80B26010 0C2C9686 */ jal EnTuboTrap_SpawnFragments +/* 00720 80B26010 0C2C9686 */ jal EnTuboTrap_SpawnEffectsOnLand /* 00724 80B26014 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 00728 80B26018 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 /* 0072C 80B2601C AFA50024 */ sw $a1, 0x0024($sp) @@ -103,7 +103,7 @@ glabel EnTuboTrap_HandleImpact /* 00780 80B26070 A20B0170 */ sb $t3, 0x0170($s0) ## 00000170 /* 00784 80B26074 14CC0015 */ bne $a2, $t4, .L80B260CC /* 00788 80B26078 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0078C 80B2607C 0C2C9686 */ jal EnTuboTrap_SpawnFragments +/* 0078C 80B2607C 0C2C9686 */ jal EnTuboTrap_SpawnEffectsOnLand /* 00790 80B26080 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 00794 80B26084 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00798 80B26088 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 @@ -136,7 +136,7 @@ glabel EnTuboTrap_HandleImpact /* 007F0 80B260E0 51C0000E */ beql $t6, $zero, .L80B2611C /* 007F4 80B260E4 8FBF001C */ lw $ra, 0x001C($sp) .L80B260E8: -/* 007F8 80B260E8 0C2C9686 */ jal EnTuboTrap_SpawnFragments +/* 007F8 80B260E8 0C2C9686 */ jal EnTuboTrap_SpawnEffectsOnLand /* 007FC 80B260EC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 00800 80B260F0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00804 80B260F4 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26E9C.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26E9C.s index cdb4d4aca7..dc811236bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26E9C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26E9C.s @@ -109,7 +109,7 @@ glabel func_80B26E9C /* 00978 80B27028 02C03025 */ or $a2, $s6, $zero ## $a2 = 80B28950 /* 0097C 80B2702C 02E03825 */ or $a3, $s7, $zero ## $a3 = 80B28954 /* 00980 80B27030 46128100 */ add.s $f4, $f16, $f18 -/* 00984 80B27034 0C00A568 */ jal func_800295A0 +/* 00984 80B27034 0C00A568 */ jal EffectSsLightning_Spawn /* 00988 80B27038 E7A40094 */ swc1 $f4, 0x0094($sp) .L80B2703C: /* 0098C 80B2703C 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B274A0.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B274A0.s index c20479d8a2..a5577e3dcf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B274A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B274A0.s @@ -87,7 +87,7 @@ glabel func_80B274A0 /* 00F10 80B275C0 02803025 */ or $a2, $s4, $zero ## $a2 = 80B28958 /* 00F14 80B275C4 02A03825 */ or $a3, $s5, $zero ## $a3 = 80B28964 /* 00F18 80B275C8 AFB00010 */ sw $s0, 0x0010($sp) -/* 00F1C 80B275CC 0C00A586 */ jal func_80029618 +/* 00F1C 80B275CC 0C00A586 */ jal EffectSsDtBubble_SpawnColorProfile /* 00F20 80B275D0 AFB70018 */ sw $s7, 0x0018($sp) /* 00F24 80B275D4 10000009 */ beq $zero, $zero, .L80B275FC /* 00F28 80B275D8 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 @@ -97,7 +97,7 @@ glabel func_80B274A0 /* 00F34 80B275E4 AFA8001C */ sw $t0, 0x001C($sp) /* 00F38 80B275E8 AFB90014 */ sw $t9, 0x0014($sp) /* 00F3C 80B275EC AFB00010 */ sw $s0, 0x0010($sp) -/* 00F40 80B275F0 0C00A586 */ jal func_80029618 +/* 00F40 80B275F0 0C00A586 */ jal EffectSsDtBubble_SpawnColorProfile /* 00F44 80B275F4 AFA00018 */ sw $zero, 0x0018($sp) /* 00F48 80B275F8 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000002 .L80B275FC: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B27710.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B27710.s index 497e4be097..13f8b24cf2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B27710.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B27710.s @@ -89,7 +89,7 @@ glabel func_80B27710 /* 01184 80B27834 8FA40064 */ lw $a0, 0x0064($sp) /* 01188 80B27838 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 0118C 80B2783C 27A60054 */ addiu $a2, $sp, 0x0054 ## $a2 = FFFFFFF4 -/* 01190 80B27840 0C00A850 */ jal func_8002A140 +/* 01190 80B27840 0C00A850 */ jal EffectSsEnIce_SpawnFlyingVec3f /* 01194 80B27844 24070096 */ addiu $a3, $zero, 0x0096 ## $a3 = 00000096 /* 01198 80B27848 10000011 */ beq $zero, $zero, .L80B27890 /* 0119C 80B2784C 8FBF003C */ lw $ra, 0x003C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vm/EnVm_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Vm/EnVm_Update.s index 0be5d076cb..dbdb1cb1ca 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vm/EnVm_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vm/EnVm_Update.s @@ -27,7 +27,7 @@ glabel EnVm_Update /* 00D34 80B2E194 AFB80010 */ sw $t8, 0x0010($sp) /* 00D38 80B2E198 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 /* 00D3C 80B2E19C 2407FFFF */ addiu $a3, $zero, 0xFFFF ## $a3 = FFFFFFFF -/* 00D40 80B2E1A0 0C00AA43 */ jal func_8002A90C +/* 00D40 80B2E1A0 0C00AA43 */ jal EffectSsDeadDs_SpawnStationary /* 00D44 80B2E1A4 AFA50034 */ sw $a1, 0x0034($sp) /* 00D48 80B2E1A8 24080078 */ addiu $t0, $zero, 0x0078 ## $t0 = 00000078 /* 00D4C 80B2E1AC 24090014 */ addiu $t1, $zero, 0x0014 ## $t1 = 00000014 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2D68C.s b/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2D68C.s index 181273d523..e7d3704574 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2D68C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2D68C.s @@ -221,7 +221,7 @@ glabel func_80B2D68C /* 00548 80B2D9A8 AFAA0014 */ sw $t2, 0x0014($sp) /* 0054C 80B2D9AC AFA90010 */ sw $t1, 0x0010($sp) /* 00550 80B2D9B0 8FA40074 */ lw $a0, 0x0074($sp) -/* 00554 80B2D9B4 0C00A9DC */ jal func_8002A770 +/* 00554 80B2D9B4 0C00A9DC */ jal EffectSsDeadDd_Spawn /* 00558 80B2D9B8 00C03825 */ or $a3, $a2, $zero ## $a3 = 80B2EAEC /* 0055C 80B2D9BC 0C2CB676 */ jal func_80B2D9D8 /* 00560 80B2D9C0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wall_Tubo/func_80B2F0B8.s b/asm/non_matchings/overlays/actors/ovl_En_Wall_Tubo/func_80B2F0B8.s index 46c44e6725..44337c7c92 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wall_Tubo/func_80B2F0B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wall_Tubo/func_80B2F0B8.s @@ -91,7 +91,7 @@ glabel func_80B2F0B8 /* 003CC 80B2F1BC 27A50038 */ addiu $a1, $sp, 0x0038 ## $a1 = FFFFFFD8 /* 003D0 80B2F1C0 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 /* 003D4 80B2F1C4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 003D8 80B2F1C8 0C00A5E9 */ jal func_800297A4 +/* 003D8 80B2F1C8 0C00A5E9 */ jal EffectSsHahen_SpawnBurst /* 003DC 80B2F1CC AFA00024 */ sw $zero, 0x0024($sp) /* 003E0 80B2F1D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 003E4 80B2F1D4 0C00BE0A */ jal Audio_PlayActorSound2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32C2C.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32C2C.s index 309cf1a0b1..9675cb717f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32C2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32C2C.s @@ -49,7 +49,7 @@ glabel func_80B32C2C /* 00A44 80B32CD4 240C0190 */ addiu $t4, $zero, 0x0190 ## $t4 = 00000190 /* 00A48 80B32CD8 AFAC0014 */ sw $t4, 0x0014($sp) /* 00A4C 80B32CDC AFAB0010 */ sw $t3, 0x0010($sp) -/* 00A50 80B32CE0 0C00A527 */ jal func_8002949C +/* 00A50 80B32CE0 0C00A527 */ jal EffectSsGSplash_Spawn /* 00A54 80B32CE4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00A58 80B32CE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00A5C 80B32CEC 0C00BE0A */ jal Audio_PlayActorSound2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B3349C.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B3349C.s index 364e522192..57e069d988 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B3349C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B3349C.s @@ -51,7 +51,7 @@ glabel func_80B3349C /* 012C0 80B33550 A6090194 */ sh $t1, 0x0194($s0) ## 00000194 /* 012C4 80B33554 AFAB0014 */ sw $t3, 0x0014($sp) /* 012C8 80B33558 AFAA0010 */ sw $t2, 0x0010($sp) -/* 012CC 80B3355C 0C00A527 */ jal func_8002949C +/* 012CC 80B3355C 0C00A527 */ jal EffectSsGSplash_Spawn /* 012D0 80B33560 8FA40034 */ lw $a0, 0x0034($sp) /* 012D4 80B33564 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 012D8 80B33568 0C00BE0A */ jal Audio_PlayActorSound2 @@ -117,7 +117,7 @@ glabel func_80B3349C /* 013A0 80B33630 240A0190 */ addiu $t2, $zero, 0x0190 ## $t2 = 00000190 /* 013A4 80B33634 AFAA0014 */ sw $t2, 0x0014($sp) /* 013A8 80B33638 AFA90010 */ sw $t1, 0x0010($sp) -/* 013AC 80B3363C 0C00A527 */ jal func_8002949C +/* 013AC 80B3363C 0C00A527 */ jal EffectSsGSplash_Spawn /* 013B0 80B33640 8FA40034 */ lw $a0, 0x0034($sp) /* 013B4 80B33644 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 013B8 80B33648 0C00BE0A */ jal Audio_PlayActorSound2 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Draw.s index fc5667d5fa..15aaea9bd6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Draw.s @@ -123,7 +123,7 @@ glabel EnWf_Draw /* 03B3C 80B377EC 2407004B */ addiu $a3, $zero, 0x004B ## $a3 = 0000004B /* 03B40 80B377F0 AFA00010 */ sw $zero, 0x0010($sp) /* 03B44 80B377F4 AFA00014 */ sw $zero, 0x0014($sp) -/* 03B48 80B377F8 0C00A953 */ jal func_8002A54C +/* 03B48 80B377F8 0C00A953 */ jal EffectSsEnFire_SpawnVec3s /* 03B4C 80B377FC AFA20018 */ sw $v0, 0x0018($sp) .L80B37800: /* 03B50 80B37800 8FAF005C */ lw $t7, 0x005C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36D3C.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36D3C.s index f47c33eae2..9c7104f247 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36D3C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36D3C.s @@ -125,7 +125,7 @@ glabel func_80B36D3C /* 03244 80B36EF4 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 03248 80B36EF8 02602825 */ or $a1, $s3, $zero ## $a1 = FFFFFFF0 /* 0324C 80B36EFC 02403025 */ or $a2, $s2, $zero ## $a2 = FFFFFFE4 -/* 03250 80B36F00 0C00A9AE */ jal func_8002A6B8 +/* 03250 80B36F00 0C00A9AE */ jal EffectSsDeadDb_Spawn /* 03254 80B36F04 02403825 */ or $a3, $s2, $zero ## $a3 = FFFFFFE4 /* 03258 80B36F08 2610FFFF */ addiu $s0, $s0, 0xFFFF ## $s0 = FFFFFFFF /* 0325C 80B36F0C 0601FFD4 */ bgez $s0, .L80B36E60 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F44C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F44C.s index 7ad5d2c06b..753666cd00 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F44C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F44C.s @@ -25,21 +25,21 @@ glabel func_80B3F44C /* 032C8 80B3F4A8 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 /* 032CC 80B3F4AC 00000000 */ nop /* 032D0 80B3F4B0 468084A0 */ cvt.s.w $f18, $f16 -/* 032D4 80B3F4B4 0C00A511 */ jal func_80029444 +/* 032D4 80B3F4B4 0C00A511 */ jal EffectSsGRipple_Spawn /* 032D8 80B3F4B8 E7B20030 */ swc1 $f18, 0x0030($sp) /* 032DC 80B3F4BC 2419000A */ addiu $t9, $zero, 0x000A ## $t9 = 0000000A /* 032E0 80B3F4C0 AFB90010 */ sw $t9, 0x0010($sp) /* 032E4 80B3F4C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 032E8 80B3F4C8 27A50028 */ addiu $a1, $sp, 0x0028 ## $a1 = FFFFFFF0 /* 032EC 80B3F4CC 24060064 */ addiu $a2, $zero, 0x0064 ## $a2 = 00000064 -/* 032F0 80B3F4D0 0C00A511 */ jal func_80029444 +/* 032F0 80B3F4D0 0C00A511 */ jal EffectSsGRipple_Spawn /* 032F4 80B3F4D4 240701F4 */ addiu $a3, $zero, 0x01F4 ## $a3 = 000001F4 /* 032F8 80B3F4D8 24080014 */ addiu $t0, $zero, 0x0014 ## $t0 = 00000014 /* 032FC 80B3F4DC AFA80010 */ sw $t0, 0x0010($sp) /* 03300 80B3F4E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 03304 80B3F4E4 27A50028 */ addiu $a1, $sp, 0x0028 ## $a1 = FFFFFFF0 /* 03308 80B3F4E8 24060064 */ addiu $a2, $zero, 0x0064 ## $a2 = 00000064 -/* 0330C 80B3F4EC 0C00A511 */ jal func_80029444 +/* 0330C 80B3F4EC 0C00A511 */ jal EffectSsGRipple_Spawn /* 03310 80B3F4F0 240701F4 */ addiu $a3, $zero, 0x01F4 ## $a3 = 000001F4 /* 03314 80B3F4F4 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 /* 03318 80B3F4F8 AFA90010 */ sw $t1, 0x0010($sp) @@ -47,7 +47,7 @@ glabel func_80B3F44C /* 03320 80B3F500 27A50028 */ addiu $a1, $sp, 0x0028 ## $a1 = FFFFFFF0 /* 03324 80B3F504 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 03328 80B3F508 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0332C 80B3F50C 0C00A527 */ jal func_8002949C +/* 0332C 80B3F50C 0C00A527 */ jal EffectSsGSplash_Spawn /* 03330 80B3F510 AFA00014 */ sw $zero, 0x0014($sp) /* 03334 80B3F514 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFF0 /* 03338 80B3F518 0C2CFCFE */ jal func_80B3F3F8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Yabusame_Mark/func_80B42F74.s b/asm/non_matchings/overlays/actors/ovl_En_Yabusame_Mark/func_80B42F74.s index 7bb37ee862..ece830561f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Yabusame_Mark/func_80B42F74.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Yabusame_Mark/func_80B42F74.s @@ -94,7 +94,7 @@ glabel func_80B42F74 /* 0026C 80B4302C 44882000 */ mtc1 $t0, $f4 ## $f4 = NaN /* 00270 80B43030 00000000 */ nop /* 00274 80B43034 468021A0 */ cvt.s.w $f6, $f4 -/* 00278 80B43038 0C00A732 */ jal func_80029CC8 +/* 00278 80B43038 0C00A732 */ jal EffectSsHitMark_SpawnCustomScale /* 0027C 80B4303C E7A6004C */ swc1 $f6, 0x004C($sp) /* 00280 80B43040 8FA60068 */ lw $a2, 0x0068($sp) /* 00284 80B43044 3C1880B4 */ lui $t8, %hi(D_80B435F0) ## $t8 = 80B40000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Draw.s index 8f710ff636..099533d36b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Draw.s @@ -122,7 +122,7 @@ glabel EnZf_Draw /* 05A30 80B49A80 24C604FC */ addiu $a2, $a2, 0x04FC ## $a2 = 000004FC /* 05A34 80B49A84 8FA40084 */ lw $a0, 0x0084($sp) /* 05A38 80B49A88 24070096 */ addiu $a3, $zero, 0x0096 ## $a3 = 00000096 -/* 05A3C 80B49A8C 0C00A850 */ jal func_8002A140 +/* 05A3C 80B49A8C 0C00A850 */ jal EffectSsEnIce_SpawnFlyingVec3f /* 05A40 80B49A90 E7A40028 */ swc1 $f4, 0x0028($sp) /* 05A44 80B49A94 10000027 */ beq $zero, $zero, .L80B49B34 /* 05A48 80B49A98 8FAA0084 */ lw $t2, 0x0084($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Item_Shield/func_80B86CA8.s b/asm/non_matchings/overlays/actors/ovl_Item_Shield/func_80B86CA8.s index d63443ea84..95169f2820 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_Shield/func_80B86CA8.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_Shield/func_80B86CA8.s @@ -115,7 +115,7 @@ glabel func_80B86CA8 /* 004F8 80B86E18 E43271FC */ swc1 $f18, %lo(D_80B871FC)($at) /* 004FC 80B86E1C C50A0000 */ lwc1 $f10, 0x0000($t0) ## 00000000 /* 00500 80B86E20 44073000 */ mfc1 $a3, $f6 -/* 00504 80B86E24 0C00A8F1 */ jal func_8002A3C4 +/* 00504 80B86E24 0C00A8F1 */ jal EffectSsFireTail_SpawnFlame /* 00508 80B86E28 E7AA0014 */ swc1 $f10, 0x0014($sp) /* 0050C 80B86E2C 9222019E */ lbu $v0, 0x019E($s1) ## 0000019E /* 00510 80B86E30 10400003 */ beq $v0, $zero, .L80B86E40 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F324.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F324.s index cf7d4dafb4..c0be0091df 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F324.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B8F324.s @@ -149,7 +149,7 @@ glabel func_80B8F324 /* 00AB0 80B8F530 AFB20024 */ sw $s2, 0x0024($sp) /* 00AB4 80B8F534 AFA00028 */ sw $zero, 0x0028($sp) /* 00AB8 80B8F538 AFA0002C */ sw $zero, 0x002C($sp) -/* 00ABC 80B8F53C 0C00A7A3 */ jal func_80029E8C +/* 00ABC 80B8F53C 0C00A7A3 */ jal EffectSsKakera_Spawn /* 00AC0 80B8F540 AFB8003C */ sw $t8, 0x003C($sp) /* 00AC4 80B8F544 26940001 */ addiu $s4, $s4, 0x0001 ## $s4 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/func_80B93164.s b/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/func_80B93164.s index 6d7b812020..80080dcef6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/func_80B93164.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/func_80B93164.s @@ -135,7 +135,7 @@ glabel func_80B93164 /* 003B4 80B93344 AFA00020 */ sw $zero, 0x0020($sp) /* 003B8 80B93348 AFA0002C */ sw $zero, 0x002C($sp) /* 003BC 80B9334C AFBE003C */ sw $s8, 0x003C($sp) -/* 003C0 80B93350 0C00A7A3 */ jal func_80029E8C +/* 003C0 80B93350 0C00A7A3 */ jal EffectSsKakera_Spawn /* 003C4 80B93354 AFB80024 */ sw $t8, 0x0024($sp) /* 003C8 80B93358 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/func_80B94470.s b/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/func_80B94470.s index 081a2fe3fc..4b6f24bb9e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/func_80B94470.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/func_80B94470.s @@ -148,7 +148,7 @@ glabel func_80B94470 /* 00418 80B94678 AFA80010 */ sw $t0, 0x0010($sp) /* 0041C 80B9467C AFA90014 */ sw $t1, 0x0014($sp) /* 00420 80B94680 AFAA0018 */ sw $t2, 0x0018($sp) -/* 00424 80B94684 0C00A2EC */ jal func_80028BB0 +/* 00424 80B94684 0C00A2EC */ jal EffectSsKiraKira_SpawnDispersed /* 00428 80B94688 AFAB001C */ sw $t3, 0x001C($sp) /* 0042C 80B9468C 8FBF002C */ lw $ra, 0x002C($sp) .L80B94690: diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B94E38.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B94E38.s index 3a040ab732..4f02f1d7ee 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B94E38.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B94E38.s @@ -143,7 +143,7 @@ glabel func_80B94E38 /* 0037C 80B9501C AFA00020 */ sw $zero, 0x0020($sp) /* 00380 80B95020 AFA00028 */ sw $zero, 0x0028($sp) /* 00384 80B95024 AFB6003C */ sw $s6, 0x003C($sp) -/* 00388 80B95028 0C00A7A3 */ jal func_80029E8C +/* 00388 80B95028 0C00A7A3 */ jal EffectSsKakera_Spawn /* 0038C 80B9502C AFA80024 */ sw $t0, 0x0024($sp) /* 00390 80B95030 26524E20 */ addiu $s2, $s2, 0x4E20 ## $s2 = 00004E20 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B950B8.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B950B8.s index 7288abb3ef..cc84bd2ccc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B950B8.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B950B8.s @@ -42,7 +42,7 @@ glabel func_80B950B8 /* 0049C 80B9513C 46062200 */ add.s $f8, $f4, $f6 /* 004A0 80B95140 AFB80014 */ sw $t8, 0x0014($sp) /* 004A4 80B95144 AFA00010 */ sw $zero, 0x0010($sp) -/* 004A8 80B95148 0C00A527 */ jal func_8002949C +/* 004A8 80B95148 0C00A527 */ jal EffectSsGSplash_Spawn /* 004AC 80B9514C E7A800CC */ swc1 $f8, 0x00CC($sp) /* 004B0 80B95150 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 004B4 80B95154 4481F000 */ mtc1 $at, $f30 ## $f30 = 5.00 @@ -148,7 +148,7 @@ glabel func_80B950B8 /* 00624 80B952C4 AFA00020 */ sw $zero, 0x0020($sp) /* 00628 80B952C8 AFA00028 */ sw $zero, 0x0028($sp) /* 0062C 80B952CC AFB7003C */ sw $s7, 0x003C($sp) -/* 00630 80B952D0 0C00A7A3 */ jal func_80029E8C +/* 00630 80B952D0 0C00A7A3 */ jal EffectSsKakera_Spawn /* 00634 80B952D4 AFAB0024 */ sw $t3, 0x0024($sp) /* 00638 80B952D8 26524E20 */ addiu $s2, $s2, 0x4E20 ## $s2 = 00004E20 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/func_80B95A28.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/func_80B95A28.s index b08674e470..5f8834b20c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/func_80B95A28.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/func_80B95A28.s @@ -145,7 +145,7 @@ glabel func_80B95A28 /* 00238 80B95C08 AFA00028 */ sw $zero, 0x0028($sp) /* 0023C 80B95C0C AFA0002C */ sw $zero, 0x002C($sp) /* 00240 80B95C10 AFB7003C */ sw $s7, 0x003C($sp) -/* 00244 80B95C14 0C00A7A3 */ jal func_80029E8C +/* 00244 80B95C14 0C00A7A3 */ jal EffectSsKakera_Spawn /* 00248 80B95C18 AFA80024 */ sw $t0, 0x0024($sp) /* 0024C 80B95C1C 26314E20 */ addiu $s1, $s1, 0x4E20 ## $s1 = 00004E20 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B96160.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B96160.s index c3a324c181..866f9015f9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B96160.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B96160.s @@ -118,7 +118,7 @@ glabel func_80B96160 /* 00238 80B96308 02802825 */ or $a1, $s4, $zero ## $a1 = FFFFFFF4 /* 0023C 80B9630C 02A03025 */ or $a2, $s5, $zero ## $a2 = FFFFFFE8 /* 00240 80B96310 02603825 */ or $a3, $s3, $zero ## $a3 = 00000024 -/* 00244 80B96314 0C00A7A3 */ jal func_80029E8C +/* 00244 80B96314 0C00A7A3 */ jal EffectSsKakera_Spawn /* 00248 80B96318 AFAB0024 */ sw $t3, 0x0024($sp) /* 0024C 80B9631C 26100004 */ addiu $s0, $s0, 0x0004 ## $s0 = 80B969D4 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA100C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA100C.s index f26703eb7d..0f66e6fc03 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA100C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA100C.s @@ -144,7 +144,7 @@ glabel func_80BA100C /* 00494 80BA11F4 02E03025 */ or $a2, $s7, $zero ## $a2 = FFFFFFDC /* 00498 80BA11F8 02803825 */ or $a3, $s4, $zero ## $a3 = 00000024 /* 0049C 80BA11FC AFAE0038 */ sw $t6, 0x0038($sp) -/* 004A0 80BA1200 0C00A7A3 */ jal func_80029E8C +/* 004A0 80BA1200 0C00A7A3 */ jal EffectSsKakera_Spawn /* 004A4 80BA1204 AFB8003C */ sw $t8, 0x003C($sp) /* 004A8 80BA1208 26314E20 */ addiu $s1, $s1, 0x4E20 ## $s1 = 00004E20 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA1294.s b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA1294.s index 65e9d5d575..18c7a0c6cc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA1294.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA1294.s @@ -45,7 +45,7 @@ glabel func_80BA1294 /* 005C0 80BA1320 46062200 */ add.s $f8, $f4, $f6 /* 005C4 80BA1324 AFA00010 */ sw $zero, 0x0010($sp) /* 005C8 80BA1328 8FA400E4 */ lw $a0, 0x00E4($sp) -/* 005CC 80BA132C 0C00A527 */ jal func_8002949C +/* 005CC 80BA132C 0C00A527 */ jal EffectSsGSplash_Spawn /* 005D0 80BA1330 E7A800CC */ swc1 $f8, 0x00CC($sp) /* 005D4 80BA1334 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 005D8 80BA1338 4481F000 */ mtc1 $at, $f30 ## $f30 = 5.00 @@ -157,7 +157,7 @@ glabel func_80BA1294 /* 0075C 80BA14BC 02A03025 */ or $a2, $s5, $zero ## $a2 = FFFFFFDC /* 00760 80BA14C0 02803825 */ or $a3, $s4, $zero ## $a3 = 00000024 /* 00764 80BA14C4 AFA80038 */ sw $t0, 0x0038($sp) -/* 00768 80BA14C8 0C00A7A3 */ jal func_80029E8C +/* 00768 80BA14C8 0C00A7A3 */ jal EffectSsKakera_Spawn /* 0076C 80BA14CC AFAB003C */ sw $t3, 0x003C($sp) /* 00770 80BA14D0 26314E20 */ addiu $s1, $s1, 0x4E20 ## $s1 = 00004E20 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/EffectSsBubble_Init.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/EffectSsBubble_Init.s deleted file mode 100644 index d37b15fe6b..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/EffectSsBubble_Init.s +++ /dev/null @@ -1,110 +0,0 @@ -glabel EffectSsBubble_Init -/* 00000 809A0040 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00004 809A0044 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00008 809A0048 AFB10020 */ sw $s1, 0x0020($sp) -/* 0000C 809A004C AFB0001C */ sw $s0, 0x001C($sp) -/* 00010 809A0050 00C08025 */ or $s0, $a2, $zero ## $s0 = 00000000 -/* 00014 809A0054 00E08825 */ or $s1, $a3, $zero ## $s1 = 00000000 -/* 00018 809A0058 F7B40010 */ sdc1 $f20, 0x0010($sp) -/* 0001C 809A005C AFA40038 */ sw $a0, 0x0038($sp) -/* 00020 809A0060 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00024 809A0064 AFA5003C */ sw $a1, 0x003C($sp) -/* 00028 809A0068 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 0002C 809A006C 4481A000 */ mtc1 $at, $f20 ## $f20 = 0.50 -/* 00030 809A0070 3C030405 */ lui $v1, 0x0405 ## $v1 = 04050000 -/* 00034 809A0074 24635EB0 */ addiu $v1, $v1, 0x5EB0 ## $v1 = 04055EB0 -/* 00038 809A0078 4614003C */ c.lt.s $f0, $f20 -/* 0003C 809A007C 00000000 */ nop -/* 00040 809A0080 45000004 */ bc1f .L809A0094 -/* 00044 809A0084 00000000 */ nop -/* 00048 809A0088 3C030405 */ lui $v1, 0x0405 ## $v1 = 04050000 -/* 0004C 809A008C 10000001 */ beq $zero, $zero, .L809A0094 -/* 00050 809A0090 24635DB0 */ addiu $v1, $v1, 0x5DB0 ## $v1 = 04055DB0 -.L809A0094: -/* 00054 809A0094 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00058 809A0098 AFA3002C */ sw $v1, 0x002C($sp) -/* 0005C 809A009C 4614003C */ c.lt.s $f0, $f20 -/* 00060 809A00A0 8FA3002C */ lw $v1, 0x002C($sp) -/* 00064 809A00A4 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00068 809A00A8 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 0006C 809A00AC 45000004 */ bc1f .L809A00C0 -/* 00070 809A00B0 00037900 */ sll $t7, $v1, 4 -/* 00074 809A00B4 3C020405 */ lui $v0, 0x0405 ## $v0 = 04050000 -/* 00078 809A00B8 10000003 */ beq $zero, $zero, .L809A00C8 -/* 0007C 809A00BC 24425DB0 */ addiu $v0, $v0, 0x5DB0 ## $v0 = 04055DB0 -.L809A00C0: -/* 00080 809A00C0 3C020405 */ lui $v0, 0x0405 ## $v0 = 04050000 -/* 00084 809A00C4 24425EB0 */ addiu $v0, $v0, 0x5EB0 ## $v0 = 04055EB0 -.L809A00C8: -/* 00088 809A00C8 000FC702 */ srl $t8, $t7, 28 -/* 0008C 809A00CC 0018C880 */ sll $t9, $t8, 2 -/* 00090 809A00D0 3C088016 */ lui $t0, %hi(gSegments) -/* 00094 809A00D4 01194021 */ addu $t0, $t0, $t9 -/* 00098 809A00D8 8D086FA8 */ lw $t0, %lo(gSegments)($t0) -/* 0009C 809A00DC 00417024 */ and $t6, $v0, $at -/* 000A0 809A00E0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 000A4 809A00E4 01C84821 */ addu $t1, $t6, $t0 -/* 000A8 809A00E8 01215021 */ addu $t2, $t1, $at -/* 000AC 809A00EC 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 000B0 809A00F0 AE0A0038 */ sw $t2, 0x0038($s0) ## 00000038 -/* 000B4 809A00F4 46140101 */ sub.s $f4, $f0, $f20 -/* 000B8 809A00F8 C6260014 */ lwc1 $f6, 0x0014($s1) ## 00000014 -/* 000BC 809A00FC C62A0000 */ lwc1 $f10, 0x0000($s1) ## 00000000 -/* 000C0 809A0100 46062202 */ mul.s $f8, $f4, $f6 -/* 000C4 809A0104 460A4400 */ add.s $f16, $f8, $f10 -/* 000C8 809A0108 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 000CC 809A010C E6100000 */ swc1 $f16, 0x0000($s0) ## 00000000 -/* 000D0 809A0110 46140481 */ sub.s $f18, $f0, $f20 -/* 000D4 809A0114 C6240010 */ lwc1 $f4, 0x0010($s1) ## 00000010 -/* 000D8 809A0118 C628000C */ lwc1 $f8, 0x000C($s1) ## 0000000C -/* 000DC 809A011C C6300004 */ lwc1 $f16, 0x0004($s1) ## 00000004 -/* 000E0 809A0120 46049182 */ mul.s $f6, $f18, $f4 -/* 000E4 809A0124 46083280 */ add.s $f10, $f6, $f8 -/* 000E8 809A0128 46105480 */ add.s $f18, $f10, $f16 -/* 000EC 809A012C 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 000F0 809A0130 E6120004 */ swc1 $f18, 0x0004($s0) ## 00000004 -/* 000F4 809A0134 46140101 */ sub.s $f4, $f0, $f20 -/* 000F8 809A0138 C6260014 */ lwc1 $f6, 0x0014($s1) ## 00000014 -/* 000FC 809A013C C62A0008 */ lwc1 $f10, 0x0008($s1) ## 00000008 -/* 00100 809A0140 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C -/* 00104 809A0144 46062202 */ mul.s $f8, $f4, $f6 -/* 00108 809A0148 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0010C 809A014C 460A4400 */ add.s $f16, $f8, $f10 -/* 00110 809A0150 0C01DF90 */ jal Math_Vec3f_Copy - ## Vec3f_Copy -/* 00114 809A0154 E6100008 */ swc1 $f16, 0x0008($s0) ## 00000008 -/* 00118 809A0158 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 0011C 809A015C 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00120 809A0160 A60B005C */ sh $t3, 0x005C($s0) ## 0000005C -/* 00124 809A0164 46140482 */ mul.s $f18, $f0, $f20 -/* 00128 809A0168 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0012C 809A016C 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 00130 809A0170 C6280018 */ lwc1 $f8, 0x0018($s1) ## 00000018 -/* 00134 809A0174 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 00138 809A0178 44818000 */ mtc1 $at, $f16 ## $f16 = 100.00 -/* 0013C 809A017C 3C0F809A */ lui $t7, %hi(func_809A01CC) ## $t7 = 809A0000 -/* 00140 809A0180 46049180 */ add.s $f6, $f18, $f4 -/* 00144 809A0184 3C18809A */ lui $t8, %hi(func_809A0360) ## $t8 = 809A0000 -/* 00148 809A0188 25EF01CC */ addiu $t7, $t7, %lo(func_809A01CC) ## $t7 = 809A01CC -/* 0014C 809A018C 27180360 */ addiu $t8, $t8, %lo(func_809A0360) ## $t8 = 809A0360 -/* 00150 809A0190 46083282 */ mul.s $f10, $f6, $f8 -/* 00154 809A0194 AE0F0028 */ sw $t7, 0x0028($s0) ## 00000028 -/* 00158 809A0198 AE180024 */ sw $t8, 0x0024($s0) ## 00000024 -/* 0015C 809A019C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00160 809A01A0 46105482 */ mul.s $f18, $f10, $f16 -/* 00164 809A01A4 4600910D */ trunc.w.s $f4, $f18 -/* 00168 809A01A8 440D2000 */ mfc1 $t5, $f4 -/* 0016C 809A01AC 00000000 */ nop -/* 00170 809A01B0 A60D0040 */ sh $t5, 0x0040($s0) ## 00000040 -/* 00174 809A01B4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00178 809A01B8 8FB10020 */ lw $s1, 0x0020($sp) -/* 0017C 809A01BC 8FB0001C */ lw $s0, 0x001C($sp) -/* 00180 809A01C0 D7B40010 */ ldc1 $f20, 0x0010($sp) -/* 00184 809A01C4 03E00008 */ jr $ra -/* 00188 809A01C8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/func_809A01CC.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/func_809A01CC.s deleted file mode 100644 index c0a6c8311e..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/func_809A01CC.s +++ /dev/null @@ -1,116 +0,0 @@ -.rdata -glabel D_809A04A0 - .asciz "../z_eff_ss_bubble.c" - .balign 4 - -glabel D_809A04B8 - .asciz "../z_eff_ss_bubble.c" - .balign 4 - -glabel D_809A04D0 - .asciz "../z_eff_ss_bubble.c" - .balign 4 - -.text -glabel func_809A01CC -/* 0018C 809A01CC 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 00190 809A01D0 AFBF001C */ sw $ra, 0x001C($sp) -/* 00194 809A01D4 AFB10018 */ sw $s1, 0x0018($sp) -/* 00198 809A01D8 AFB00014 */ sw $s0, 0x0014($sp) -/* 0019C 809A01DC AFA40058 */ sw $a0, 0x0058($sp) -/* 001A0 809A01E0 AFA5005C */ sw $a1, 0x005C($sp) -/* 001A4 809A01E4 84CF0040 */ lh $t7, 0x0040($a2) ## 00000040 -/* 001A8 809A01E8 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 001AC 809A01EC 44814000 */ mtc1 $at, $f8 ## $f8 = 100.00 -/* 001B0 809A01F0 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 001B4 809A01F4 8C900000 */ lw $s0, 0x0000($a0) ## 00000000 -/* 001B8 809A01F8 00C08825 */ or $s1, $a2, $zero ## $s1 = 00000000 -/* 001BC 809A01FC 468021A0 */ cvt.s.w $f6, $f4 -/* 001C0 809A0200 3C06809A */ lui $a2, %hi(D_809A04A0) ## $a2 = 809A0000 -/* 001C4 809A0204 24C604A0 */ addiu $a2, $a2, %lo(D_809A04A0) ## $a2 = 809A04A0 -/* 001C8 809A0208 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 -/* 001CC 809A020C 2407009A */ addiu $a3, $zero, 0x009A ## $a3 = 0000009A -/* 001D0 809A0210 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 001D4 809A0214 46083283 */ div.s $f10, $f6, $f8 -/* 001D8 809A0218 0C031AB1 */ jal Graph_OpenDisps -/* 001DC 809A021C E7AA0050 */ swc1 $f10, 0x0050($sp) -/* 001E0 809A0220 C62C0000 */ lwc1 $f12, 0x0000($s1) ## 00000000 -/* 001E4 809A0224 C62E0004 */ lwc1 $f14, 0x0004($s1) ## 00000004 -/* 001E8 809A0228 8E260008 */ lw $a2, 0x0008($s1) ## 00000008 -/* 001EC 809A022C 0C034261 */ jal Matrix_Translate -/* 001F0 809A0230 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 001F4 809A0234 C7AC0050 */ lwc1 $f12, 0x0050($sp) -/* 001F8 809A0238 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 001FC 809A023C 44066000 */ mfc1 $a2, $f12 -/* 00200 809A0240 0C0342A3 */ jal Matrix_Scale -/* 00204 809A0244 46006386 */ mov.s $f14, $f12 -/* 00208 809A0248 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 0020C 809A024C 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 -/* 00210 809A0250 37390003 */ ori $t9, $t9, 0x0003 ## $t9 = DA380003 -/* 00214 809A0254 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 00218 809A0258 AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 -/* 0021C 809A025C 3C05809A */ lui $a1, %hi(D_809A04B8) ## $a1 = 809A0000 -/* 00220 809A0260 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 00224 809A0264 24A504B8 */ addiu $a1, $a1, %lo(D_809A04B8) ## $a1 = 809A04B8 -/* 00228 809A0268 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0022C 809A026C 240600A7 */ addiu $a2, $zero, 0x00A7 ## $a2 = 000000A7 -/* 00230 809A0270 0C0346A2 */ jal Matrix_NewMtx -/* 00234 809A0274 AFA20038 */ sw $v0, 0x0038($sp) -/* 00238 809A0278 8FA30038 */ lw $v1, 0x0038($sp) -/* 0023C 809A027C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00240 809A0280 0C024F46 */ jal func_80093D18 -/* 00244 809A0284 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00248 809A0288 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 0024C 809A028C 3C09FA00 */ lui $t1, 0xFA00 ## $t1 = FA000000 -/* 00250 809A0290 240AFFFF */ addiu $t2, $zero, 0xFFFF ## $t2 = FFFFFFFF -/* 00254 809A0294 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 -/* 00258 809A0298 AE0802C0 */ sw $t0, 0x02C0($s0) ## 000002C0 -/* 0025C 809A029C AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 -/* 00260 809A02A0 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 00264 809A02A4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 00268 809A02A8 3C0D9696 */ lui $t5, 0x9696 ## $t5 = 96960000 -/* 0026C 809A02AC 35AD9600 */ ori $t5, $t5, 0x9600 ## $t5 = 96969600 -/* 00270 809A02B0 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 00274 809A02B4 AE0B02C0 */ sw $t3, 0x02C0($s0) ## 000002C0 -/* 00278 809A02B8 3C0CFB00 */ lui $t4, 0xFB00 ## $t4 = FB000000 -/* 0027C 809A02BC AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 00280 809A02C0 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 00284 809A02C4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 00288 809A02C8 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 0028C 809A02CC 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 -/* 00290 809A02D0 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 00294 809A02D4 AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 -/* 00298 809A02D8 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 0029C 809A02DC 8E380038 */ lw $t8, 0x0038($s1) ## 00000038 -/* 002A0 809A02E0 3C040402 */ lui $a0, 0x0402 ## $a0 = 04020000 -/* 002A4 809A02E4 2484A160 */ addiu $a0, $a0, 0xA160 ## $a0 = 0401A160 -/* 002A8 809A02E8 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 002AC 809A02EC 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 002B0 809A02F0 00044900 */ sll $t1, $a0, 4 -/* 002B4 809A02F4 00095702 */ srl $t2, $t1, 28 -/* 002B8 809A02F8 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 002BC 809A02FC AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 -/* 002C0 809A0300 000A5880 */ sll $t3, $t2, 2 -/* 002C4 809A0304 3C0C8016 */ lui $t4, %hi(gSegments) -/* 002C8 809A0308 3C08DE00 */ lui $t0, 0xDE00 ## $t0 = DE000000 -/* 002CC 809A030C 018B6021 */ addu $t4, $t4, $t3 -/* 002D0 809A0310 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 002D4 809A0314 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 -/* 002D8 809A0318 8D8C6FA8 */ lw $t4, %lo(gSegments)($t4) -/* 002DC 809A031C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 002E0 809A0320 00816824 */ and $t5, $a0, $at -/* 002E4 809A0324 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 002E8 809A0328 018D7021 */ addu $t6, $t4, $t5 -/* 002EC 809A032C 01C17821 */ addu $t7, $t6, $at -/* 002F0 809A0330 3C06809A */ lui $a2, %hi(D_809A04D0) ## $a2 = 809A0000 -/* 002F4 809A0334 24C604D0 */ addiu $a2, $a2, %lo(D_809A04D0) ## $a2 = 809A04D0 -/* 002F8 809A0338 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 -/* 002FC 809A033C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00300 809A0340 240700B3 */ addiu $a3, $zero, 0x00B3 ## $a3 = 000000B3 -/* 00304 809A0344 0C031AD5 */ jal Graph_CloseDisps -/* 00308 809A0348 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 0030C 809A034C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00310 809A0350 8FB00014 */ lw $s0, 0x0014($sp) -/* 00314 809A0354 8FB10018 */ lw $s1, 0x0018($sp) -/* 00318 809A0358 03E00008 */ jr $ra -/* 0031C 809A035C 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/func_809A0360.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/func_809A0360.s deleted file mode 100644 index 7a92919d5f..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/func_809A0360.s +++ /dev/null @@ -1,91 +0,0 @@ -.late_rodata -glabel D_809A04E8 - .float 0.3 - -glabel D_809A04EC - .float 0.2 - -.text -glabel func_809A0360 -/* 00320 809A0360 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00324 809A0364 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00328 809A0368 AFB00020 */ sw $s0, 0x0020($sp) -/* 0032C 809A036C AFA50044 */ sw $a1, 0x0044($sp) -/* 00330 809A0370 C4C40004 */ lwc1 $f4, 0x0004($a2) ## 00000004 -/* 00334 809A0374 00C08025 */ or $s0, $a2, $zero ## $s0 = 00000000 -/* 00338 809A0378 27AE0038 */ addiu $t6, $sp, 0x0038 ## $t6 = FFFFFFF8 -/* 0033C 809A037C E7A40038 */ swc1 $f4, 0x0038($sp) -/* 00340 809A0380 8E070008 */ lw $a3, 0x0008($s0) ## 00000008 -/* 00344 809A0384 8CC60000 */ lw $a2, 0x0000($a2) ## 00000000 -/* 00348 809A0388 27AF003C */ addiu $t7, $sp, 0x003C ## $t7 = FFFFFFFC -/* 0034C 809A038C AFAF0014 */ sw $t7, 0x0014($sp) -/* 00350 809A0390 AFA40040 */ sw $a0, 0x0040($sp) -/* 00354 809A0394 AFAE0010 */ sw $t6, 0x0010($sp) -/* 00358 809A0398 0C01084F */ jal func_8004213C -/* 0035C 809A039C 248507C0 */ addiu $a1, $a0, 0x07C0 ## $a1 = 000007C0 -/* 00360 809A03A0 14400004 */ bne $v0, $zero, .L809A03B4 -/* 00364 809A03A4 8FA40040 */ lw $a0, 0x0040($sp) -/* 00368 809A03A8 2418FFFF */ addiu $t8, $zero, 0xFFFF ## $t8 = FFFFFFFF -/* 0036C 809A03AC 10000033 */ beq $zero, $zero, .L809A047C -/* 00370 809A03B0 A618005C */ sh $t8, 0x005C($s0) ## 0000005C -.L809A03B4: -/* 00374 809A03B4 C7A60038 */ lwc1 $f6, 0x0038($sp) -/* 00378 809A03B8 C6080004 */ lwc1 $f8, 0x0004($s0) ## 00000004 -/* 0037C 809A03BC 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFEC -/* 00380 809A03C0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00384 809A03C4 4608303C */ c.lt.s $f6, $f8 -/* 00388 809A03C8 00000000 */ nop -/* 0038C 809A03CC 4502000D */ bc1fl .L809A0404 -/* 00390 809A03D0 8608005C */ lh $t0, 0x005C($s0) ## 0000005C -/* 00394 809A03D4 C60A0000 */ lwc1 $f10, 0x0000($s0) ## 00000000 -/* 00398 809A03D8 E7A60030 */ swc1 $f6, 0x0030($sp) -/* 0039C 809A03DC 24070050 */ addiu $a3, $zero, 0x0050 ## $a3 = 00000050 -/* 003A0 809A03E0 E7AA002C */ swc1 $f10, 0x002C($sp) -/* 003A4 809A03E4 C6100008 */ lwc1 $f16, 0x0008($s0) ## 00000008 -/* 003A8 809A03E8 AFA00010 */ sw $zero, 0x0010($sp) -/* 003AC 809A03EC 0C00A511 */ jal func_80029444 -/* 003B0 809A03F0 E7B00034 */ swc1 $f16, 0x0034($sp) -/* 003B4 809A03F4 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF -/* 003B8 809A03F8 10000020 */ beq $zero, $zero, .L809A047C -/* 003BC 809A03FC A619005C */ sh $t9, 0x005C($s0) ## 0000005C -/* 003C0 809A0400 8608005C */ lh $t0, 0x005C($s0) ## 0000005C -.L809A0404: -/* 003C4 809A0404 25090001 */ addiu $t1, $t0, 0x0001 ## $t1 = 00000001 -/* 003C8 809A0408 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 003CC 809A040C A609005C */ sh $t1, 0x005C($s0) ## 0000005C -/* 003D0 809A0410 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 003D4 809A0414 44819000 */ mtc1 $at, $f18 ## $f18 = 0.50 -/* 003D8 809A0418 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 -/* 003DC 809A041C 44814000 */ mtc1 $at, $f8 ## $f8 = 0.25 -/* 003E0 809A0420 46120102 */ mul.s $f4, $f0, $f18 -/* 003E4 809A0424 C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C -/* 003E8 809A0428 46082281 */ sub.s $f10, $f4, $f8 -/* 003EC 809A042C 46065400 */ add.s $f16, $f10, $f6 -/* 003F0 809A0430 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 003F4 809A0434 E6100000 */ swc1 $f16, 0x0000($s0) ## 00000000 -/* 003F8 809A0438 3C01809A */ lui $at, %hi(D_809A04E8) ## $at = 809A0000 -/* 003FC 809A043C C43204E8 */ lwc1 $f18, %lo(D_809A04E8)($at) -/* 00400 809A0440 3C01809A */ lui $at, %hi(D_809A04EC) ## $at = 809A0000 -/* 00404 809A0444 C42804EC */ lwc1 $f8, %lo(D_809A04EC)($at) -/* 00408 809A0448 46120101 */ sub.s $f4, $f0, $f18 -/* 0040C 809A044C 46082282 */ mul.s $f10, $f4, $f8 -/* 00410 809A0450 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00414 809A0454 E60A001C */ swc1 $f10, 0x001C($s0) ## 0000001C -/* 00418 809A0458 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 0041C 809A045C 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 -/* 00420 809A0460 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 -/* 00424 809A0464 44819000 */ mtc1 $at, $f18 ## $f18 = 0.25 -/* 00428 809A0468 46060402 */ mul.s $f16, $f0, $f6 -/* 0042C 809A046C C6080034 */ lwc1 $f8, 0x0034($s0) ## 00000034 -/* 00430 809A0470 46128101 */ sub.s $f4, $f16, $f18 -/* 00434 809A0474 46082280 */ add.s $f10, $f4, $f8 -/* 00438 809A0478 E60A0008 */ swc1 $f10, 0x0008($s0) ## 00000008 -.L809A047C: -/* 0043C 809A047C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00440 809A0480 8FB00020 */ lw $s0, 0x0020($sp) -/* 00444 809A0484 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00448 809A0488 03E00008 */ jr $ra -/* 0044C 809A048C 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/EffectSsDFire_Init.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/EffectSsDFire_Init.s deleted file mode 100644 index 50a2ce6e5d..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/EffectSsDFire_Init.s +++ /dev/null @@ -1,86 +0,0 @@ -glabel EffectSsDFire_Init -/* 00000 809A0550 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00004 809A0554 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00008 809A0558 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0000C 809A055C AFA40018 */ sw $a0, 0x0018($sp) -/* 00010 809A0560 AFA5001C */ sw $a1, 0x001C($sp) -/* 00014 809A0564 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 00018 809A0568 00812021 */ addu $a0, $a0, $at -/* 0001C 809A056C 2405000C */ addiu $a1, $zero, 0x000C ## $a1 = 0000000C -/* 00020 809A0570 AFA60020 */ sw $a2, 0x0020($sp) -/* 00024 809A0574 0C02604B */ jal Object_GetIndex - ## ObjectIndex -/* 00028 809A0578 AFA70024 */ sw $a3, 0x0024($sp) -/* 0002C 809A057C 8FA60020 */ lw $a2, 0x0020($sp) -/* 00030 809A0580 04400040 */ bltz $v0, .L809A0684 -/* 00034 809A0584 8FA70024 */ lw $a3, 0x0024($sp) -/* 00038 809A0588 8CEF0000 */ lw $t7, 0x0000($a3) ## 00000000 -/* 0003C 809A058C 3C030601 */ lui $v1, 0x0601 ## $v1 = 06010000 -/* 00040 809A0590 246398A0 */ addiu $v1, $v1, 0x98A0 ## $v1 = 060098A0 -/* 00044 809A0594 ACCF0000 */ sw $t7, 0x0000($a2) ## 00000000 -/* 00048 809A0598 8CEE0004 */ lw $t6, 0x0004($a3) ## 00000004 -/* 0004C 809A059C 00035100 */ sll $t2, $v1, 4 -/* 00050 809A05A0 000A5F02 */ srl $t3, $t2, 28 -/* 00054 809A05A4 ACCE0004 */ sw $t6, 0x0004($a2) ## 00000004 -/* 00058 809A05A8 8CEF0008 */ lw $t7, 0x0008($a3) ## 00000008 -/* 0005C 809A05AC 000B6080 */ sll $t4, $t3, 2 -/* 00060 809A05B0 3C0D8016 */ lui $t5, %hi(gSegments) -/* 00064 809A05B4 ACCF0008 */ sw $t7, 0x0008($a2) ## 00000008 -/* 00068 809A05B8 8CF9000C */ lw $t9, 0x000C($a3) ## 0000000C -/* 0006C 809A05BC 01AC6821 */ addu $t5, $t5, $t4 -/* 00070 809A05C0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00074 809A05C4 ACD9000C */ sw $t9, 0x000C($a2) ## 0000000C -/* 00078 809A05C8 8CF80010 */ lw $t8, 0x0010($a3) ## 00000010 -/* 0007C 809A05CC 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00080 809A05D0 00617024 */ and $t6, $v1, $at -/* 00084 809A05D4 ACD80010 */ sw $t8, 0x0010($a2) ## 00000010 -/* 00088 809A05D8 8CF90014 */ lw $t9, 0x0014($a3) ## 00000014 -/* 0008C 809A05DC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00090 809A05E0 3C0A809A */ lui $t2, %hi(func_809A0698) ## $t2 = 809A0000 -/* 00094 809A05E4 ACD90014 */ sw $t9, 0x0014($a2) ## 00000014 -/* 00098 809A05E8 8CE90018 */ lw $t1, 0x0018($a3) ## 00000018 -/* 0009C 809A05EC 3C0B809A */ lui $t3, %hi(func_809A090C) ## $t3 = 809A0000 -/* 000A0 809A05F0 254A0698 */ addiu $t2, $t2, %lo(func_809A0698) ## $t2 = 809A0698 -/* 000A4 809A05F4 ACC90018 */ sw $t1, 0x0018($a2) ## 00000018 -/* 000A8 809A05F8 8CE8001C */ lw $t0, 0x001C($a3) ## 0000001C -/* 000AC 809A05FC 256B090C */ addiu $t3, $t3, %lo(func_809A090C) ## $t3 = 809A090C -/* 000B0 809A0600 240300FF */ addiu $v1, $zero, 0x00FF ## $v1 = 000000FF -/* 000B4 809A0604 ACC8001C */ sw $t0, 0x001C($a2) ## 0000001C -/* 000B8 809A0608 8CE90020 */ lw $t1, 0x0020($a3) ## 00000020 -/* 000BC 809A060C ACC90020 */ sw $t1, 0x0020($a2) ## 00000020 -/* 000C0 809A0610 8DAD6FA8 */ lw $t5, %lo(gSegments)($t5) -/* 000C4 809A0614 01AE7821 */ addu $t7, $t5, $t6 -/* 000C8 809A0618 01E1C021 */ addu $t8, $t7, $at -/* 000CC 809A061C ACD80038 */ sw $t8, 0x0038($a2) ## 00000038 -/* 000D0 809A0620 8CF9002C */ lw $t9, 0x002C($a3) ## 0000002C -/* 000D4 809A0624 A4D9005C */ sh $t9, 0x005C($a2) ## 0000005C -/* 000D8 809A0628 84E80024 */ lh $t0, 0x0024($a3) ## 00000024 -/* 000DC 809A062C A4C80040 */ sh $t0, 0x0040($a2) ## 00000040 -/* 000E0 809A0630 84E90026 */ lh $t1, 0x0026($a3) ## 00000026 -/* 000E4 809A0634 A4C00056 */ sh $zero, 0x0056($a2) ## 00000056 -/* 000E8 809A0638 A4C20054 */ sh $v0, 0x0054($a2) ## 00000054 -/* 000EC 809A063C ACCA0028 */ sw $t2, 0x0028($a2) ## 00000028 -/* 000F0 809A0640 ACCB0024 */ sw $t3, 0x0024($a2) ## 00000024 -/* 000F4 809A0644 A4C90052 */ sh $t1, 0x0052($a2) ## 00000052 -/* 000F8 809A0648 8FAC0018 */ lw $t4, 0x0018($sp) -/* 000FC 809A064C 24080032 */ addiu $t0, $zero, 0x0032 ## $t0 = 00000032 -/* 00100 809A0650 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00104 809A0654 8D8D009C */ lw $t5, 0x009C($t4) ## 0000009C -/* 00108 809A0658 A4C30044 */ sh $v1, 0x0044($a2) ## 00000044 -/* 0010C 809A065C A4C30046 */ sh $v1, 0x0046($a2) ## 00000046 -/* 00110 809A0660 31B80003 */ andi $t8, $t5, 0x0003 ## $t8 = 00000000 -/* 00114 809A0664 3B190003 */ xori $t9, $t8, 0x0003 ## $t9 = 00000003 -/* 00118 809A0668 A4D90042 */ sh $t9, 0x0042($a2) ## 00000042 -/* 0011C 809A066C A4C80048 */ sh $t0, 0x0048($a2) ## 00000048 -/* 00120 809A0670 84E90028 */ lh $t1, 0x0028($a3) ## 00000028 -/* 00124 809A0674 A4C9004A */ sh $t1, 0x004A($a2) ## 0000004A -/* 00128 809A0678 84EA002A */ lh $t2, 0x002A($a3) ## 0000002A -/* 0012C 809A067C 10000002 */ beq $zero, $zero, .L809A0688 -/* 00130 809A0680 A4CA004C */ sh $t2, 0x004C($a2) ## 0000004C -.L809A0684: -/* 00134 809A0684 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L809A0688: -/* 00138 809A0688 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0013C 809A068C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00140 809A0690 03E00008 */ jr $ra -/* 00144 809A0694 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/func_809A0698.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/func_809A0698.s deleted file mode 100644 index d5743349e9..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/func_809A0698.s +++ /dev/null @@ -1,170 +0,0 @@ -.rdata -glabel D_809A0A10 - .asciz "../z_eff_ss_d_fire.c" - .balign 4 - -glabel D_809A0A28 - .asciz "../z_eff_ss_d_fire.c" - .balign 4 - -.text -glabel func_809A0698 -/* 00148 809A0698 27BDFE98 */ addiu $sp, $sp, 0xFE98 ## $sp = FFFFFE98 -/* 0014C 809A069C AFBF001C */ sw $ra, 0x001C($sp) -/* 00150 809A06A0 AFB10018 */ sw $s1, 0x0018($sp) -/* 00154 809A06A4 AFB00014 */ sw $s0, 0x0014($sp) -/* 00158 809A06A8 AFA40168 */ sw $a0, 0x0168($sp) -/* 0015C 809A06AC AFA5016C */ sw $a1, 0x016C($sp) -/* 00160 809A06B0 84CF0054 */ lh $t7, 0x0054($a2) ## 00000054 -/* 00164 809A06B4 3C090001 */ lui $t1, 0x0001 ## $t1 = 00010000 -/* 00168 809A06B8 8C900000 */ lw $s0, 0x0000($a0) ## 00000000 -/* 0016C 809A06BC 000FC100 */ sll $t8, $t7, 4 -/* 00170 809A06C0 030FC021 */ addu $t8, $t8, $t7 -/* 00174 809A06C4 0018C080 */ sll $t8, $t8, 2 -/* 00178 809A06C8 0098C821 */ addu $t9, $a0, $t8 -/* 0017C 809A06CC 01394821 */ addu $t1, $t1, $t9 -/* 00180 809A06D0 8D2917B4 */ lw $t1, 0x17B4($t1) ## 000117B4 -/* 00184 809A06D4 00C08825 */ or $s1, $a2, $zero ## $s1 = 00000000 -/* 00188 809A06D8 3C06809A */ lui $a2, %hi(D_809A0A10) ## $a2 = 809A0000 -/* 0018C 809A06DC 24C60A10 */ addiu $a2, $a2, %lo(D_809A0A10) ## $a2 = 809A0A10 -/* 00190 809A06E0 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFED8 -/* 00194 809A06E4 24070114 */ addiu $a3, $zero, 0x0114 ## $a3 = 00000114 -/* 00198 809A06E8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0019C 809A06EC 0C031AB1 */ jal Graph_OpenDisps -/* 001A0 809A06F0 AFA9005C */ sw $t1, 0x005C($sp) -/* 001A4 809A06F4 8FA40168 */ lw $a0, 0x0168($sp) -/* 001A8 809A06F8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 001AC 809A06FC 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 001B0 809A0700 2405000C */ addiu $a1, $zero, 0x000C ## $a1 = 0000000C -/* 001B4 809A0704 0C02604B */ jal Object_GetIndex - ## ObjectIndex -/* 001B8 809A0708 00812021 */ addu $a0, $a0, $at -/* 001BC 809A070C 04400074 */ bltz $v0, .L809A08E0 -/* 001C0 809A0710 8FA4005C */ lw $a0, 0x005C($sp) -/* 001C4 809A0714 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 001C8 809A0718 00814021 */ addu $t0, $a0, $at -/* 001CC 809A071C 3C018016 */ lui $at, %hi(gSegments+0x18) -/* 001D0 809A0720 AC286FC0 */ sw $t0, %lo(gSegments+0x18)($at) -/* 001D4 809A0724 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 -/* 001D8 809A0728 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 001DC 809A072C 356B0018 */ ori $t3, $t3, 0x0018 ## $t3 = DB060018 -/* 001E0 809A0730 246A0008 */ addiu $t2, $v1, 0x0008 ## $t2 = 00000008 -/* 001E4 809A0734 AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 -/* 001E8 809A0738 AC640004 */ sw $a0, 0x0004($v1) ## 00000004 -/* 001EC 809A073C AC6B0000 */ sw $t3, 0x0000($v1) ## 00000000 -/* 001F0 809A0740 862C0040 */ lh $t4, 0x0040($s1) ## 00000040 -/* 001F4 809A0744 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 001F8 809A0748 44814000 */ mtc1 $at, $f8 ## $f8 = 100.00 -/* 001FC 809A074C 448C2000 */ mtc1 $t4, $f4 ## $f4 = 0.00 -/* 00200 809A0750 8E270008 */ lw $a3, 0x0008($s1) ## 00000008 -/* 00204 809A0754 8E260004 */ lw $a2, 0x0004($s1) ## 00000004 -/* 00208 809A0758 468021A0 */ cvt.s.w $f6, $f4 -/* 0020C 809A075C 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 00210 809A0760 AFA80024 */ sw $t0, 0x0024($sp) -/* 00214 809A0764 27A40124 */ addiu $a0, $sp, 0x0124 ## $a0 = FFFFFFBC -/* 00218 809A0768 46083003 */ div.s $f0, $f6, $f8 -/* 0021C 809A076C 0C029E89 */ jal SkinMatrix_SetTranslate -/* 00220 809A0770 E7A00054 */ swc1 $f0, 0x0054($sp) -/* 00224 809A0774 C7A00054 */ lwc1 $f0, 0x0054($sp) -/* 00228 809A0778 27A400E4 */ addiu $a0, $sp, 0x00E4 ## $a0 = FFFFFF7C -/* 0022C 809A077C 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 00230 809A0780 44050000 */ mfc1 $a1, $f0 -/* 00234 809A0784 44060000 */ mfc1 $a2, $f0 -/* 00238 809A0788 0C029DA9 */ jal SkinMatrix_SetScale -/* 0023C 809A078C 00000000 */ nop -/* 00240 809A0790 8FA50168 */ lw $a1, 0x0168($sp) -/* 00244 809A0794 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00248 809A0798 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 -/* 0024C 809A079C 27A40124 */ addiu $a0, $sp, 0x0124 ## $a0 = FFFFFFBC -/* 00250 809A07A0 27A60064 */ addiu $a2, $sp, 0x0064 ## $a2 = FFFFFEFC -/* 00254 809A07A4 0C029BE8 */ jal SkinMatrix_MtxFMtxFMult -/* 00258 809A07A8 00A12821 */ addu $a1, $a1, $at -/* 0025C 809A07AC 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFEFC -/* 00260 809A07B0 27A500E4 */ addiu $a1, $sp, 0x00E4 ## $a1 = FFFFFF7C -/* 00264 809A07B4 0C029BE8 */ jal SkinMatrix_MtxFMtxFMult -/* 00268 809A07B8 27A600A4 */ addiu $a2, $sp, 0x00A4 ## $a2 = FFFFFF3C -/* 0026C 809A07BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00270 809A07C0 0C029F9C */ jal SkinMatrix_MtxFToNewMtx -/* 00274 809A07C4 27A500A4 */ addiu $a1, $sp, 0x00A4 ## $a1 = FFFFFF3C -/* 00278 809A07C8 10400045 */ beq $v0, $zero, .L809A08E0 -/* 0027C 809A07CC 3C0FDA38 */ lui $t7, 0xDA38 ## $t7 = DA380000 -/* 00280 809A07D0 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 -/* 00284 809A07D4 35EF0003 */ ori $t7, $t7, 0x0003 ## $t7 = DA380003 -/* 00288 809A07D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0028C 809A07DC 246D0008 */ addiu $t5, $v1, 0x0008 ## $t5 = 00000008 -/* 00290 809A07E0 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 00294 809A07E4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00298 809A07E8 0C0252F1 */ jal func_80094BC4 -/* 0029C 809A07EC AC6F0000 */ sw $t7, 0x0000($v1) ## 00000000 -/* 002A0 809A07F0 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 -/* 002A4 809A07F4 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 -/* 002A8 809A07F8 3C19FF00 */ lui $t9, 0xFF00 ## $t9 = FF000000 -/* 002AC 809A07FC 246E0008 */ addiu $t6, $v1, 0x0008 ## $t6 = 00000008 -/* 002B0 809A0800 AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 -/* 002B4 809A0804 AC790004 */ sw $t9, 0x0004($v1) ## 00000004 -/* 002B8 809A0808 AC780000 */ sw $t8, 0x0000($v1) ## 00000000 -/* 002BC 809A080C 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 -/* 002C0 809A0810 3C0AFA00 */ lui $t2, 0xFA00 ## $t2 = FA000000 -/* 002C4 809A0814 3C058016 */ lui $a1, %hi(gSegments) -/* 002C8 809A0818 24690008 */ addiu $t1, $v1, 0x0008 ## $t1 = 00000008 -/* 002CC 809A081C AE0902D0 */ sw $t1, 0x02D0($s0) ## 000002D0 -/* 002D0 809A0820 AC6A0000 */ sw $t2, 0x0000($v1) ## 00000000 -/* 002D4 809A0824 862F0044 */ lh $t7, 0x0044($s1) ## 00000044 -/* 002D8 809A0828 862B004A */ lh $t3, 0x004A($s1) ## 0000004A -/* 002DC 809A082C 86390046 */ lh $t9, 0x0046($s1) ## 00000046 -/* 002E0 809A0830 862D0048 */ lh $t5, 0x0048($s1) ## 00000048 -/* 002E4 809A0834 000F7600 */ sll $t6, $t7, 24 -/* 002E8 809A0838 316C00FF */ andi $t4, $t3, 0x00FF ## $t4 = 00000000 -/* 002EC 809A083C 018EC025 */ or $t8, $t4, $t6 ## $t8 = 00000008 -/* 002F0 809A0840 332900FF */ andi $t1, $t9, 0x00FF ## $t1 = 00000000 -/* 002F4 809A0844 00095400 */ sll $t2, $t1, 16 -/* 002F8 809A0848 31AF00FF */ andi $t7, $t5, 0x00FF ## $t7 = 00000000 -/* 002FC 809A084C 000F6200 */ sll $t4, $t7, 8 -/* 00300 809A0850 030A5825 */ or $t3, $t8, $t2 ## $t3 = FA000008 -/* 00304 809A0854 016C7025 */ or $t6, $t3, $t4 ## $t6 = FA000008 -/* 00308 809A0858 AC6E0004 */ sw $t6, 0x0004($v1) ## 00000004 -/* 0030C 809A085C 8FB90024 */ lw $t9, 0x0024($sp) -/* 00310 809A0860 24A56FA8 */ addiu $a1, %lo(gSegments) -/* 00314 809A0864 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 -/* 00318 809A0868 ACB90018 */ sw $t9, 0x0018($a1) ## 80166FC0 -/* 0031C 809A086C 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 -/* 00320 809A0870 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 -/* 00324 809A0874 3C04809A */ lui $a0, %hi(D_809A09F8) ## $a0 = 809A0000 -/* 00328 809A0878 24690008 */ addiu $t1, $v1, 0x0008 ## $t1 = 00000008 -/* 0032C 809A087C AE0902D0 */ sw $t1, 0x02D0($s0) ## 000002D0 -/* 00330 809A0880 AC780000 */ sw $t8, 0x0000($v1) ## 00000000 -/* 00334 809A0884 862A0042 */ lh $t2, 0x0042($s1) ## 00000042 -/* 00338 809A0888 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 0033C 809A088C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00340 809A0890 000A6880 */ sll $t5, $t2, 2 -/* 00344 809A0894 008D2021 */ addu $a0, $a0, $t5 -/* 00348 809A0898 8C8409F8 */ lw $a0, %lo(D_809A09F8)($a0) -/* 0034C 809A089C 00045900 */ sll $t3, $a0, 4 -/* 00350 809A08A0 000B6702 */ srl $t4, $t3, 28 -/* 00354 809A08A4 000C7080 */ sll $t6, $t4, 2 -/* 00358 809A08A8 00AEC821 */ addu $t9, $a1, $t6 -/* 0035C 809A08AC 8F290000 */ lw $t1, 0x0000($t9) ## FF000000 -/* 00360 809A08B0 00817824 */ and $t7, $a0, $at -/* 00364 809A08B4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00368 809A08B8 01E9C021 */ addu $t8, $t7, $t1 -/* 0036C 809A08BC 03015021 */ addu $t2, $t8, $at -/* 00370 809A08C0 AC6A0004 */ sw $t2, 0x0004($v1) ## 00000004 -/* 00374 809A08C4 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 -/* 00378 809A08C8 3C0BDE00 */ lui $t3, 0xDE00 ## $t3 = DE000000 -/* 0037C 809A08CC 246D0008 */ addiu $t5, $v1, 0x0008 ## $t5 = 00000008 -/* 00380 809A08D0 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 00384 809A08D4 AC6B0000 */ sw $t3, 0x0000($v1) ## 00000000 -/* 00388 809A08D8 8E2C0038 */ lw $t4, 0x0038($s1) ## 00000038 -/* 0038C 809A08DC AC6C0004 */ sw $t4, 0x0004($v1) ## 00000004 -.L809A08E0: -/* 00390 809A08E0 3C06809A */ lui $a2, %hi(D_809A0A28) ## $a2 = 809A0000 -/* 00394 809A08E4 24C60A28 */ addiu $a2, $a2, %lo(D_809A0A28) ## $a2 = 809A0A28 -/* 00398 809A08E8 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFED8 -/* 0039C 809A08EC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 003A0 809A08F0 0C031AD5 */ jal Graph_CloseDisps -/* 003A4 809A08F4 2407014A */ addiu $a3, $zero, 0x014A ## $a3 = 0000014A -/* 003A8 809A08F8 8FBF001C */ lw $ra, 0x001C($sp) -/* 003AC 809A08FC 8FB00014 */ lw $s0, 0x0014($sp) -/* 003B0 809A0900 8FB10018 */ lw $s1, 0x0018($sp) -/* 003B4 809A0904 03E00008 */ jr $ra -/* 003B8 809A0908 27BD0168 */ addiu $sp, $sp, 0x0168 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/func_809A090C.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/func_809A090C.s deleted file mode 100644 index fafd1740f9..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/func_809A090C.s +++ /dev/null @@ -1,68 +0,0 @@ -.late_rodata -glabel D_809A0A40 - .float 0.01 - -.text -glabel func_809A090C -/* 003BC 809A090C AFA40000 */ sw $a0, 0x0000($sp) -/* 003C0 809A0910 AFA50004 */ sw $a1, 0x0004($sp) -/* 003C4 809A0914 84CE0042 */ lh $t6, 0x0042($a2) ## 00000042 -/* 003C8 809A0918 84C80040 */ lh $t0, 0x0040($a2) ## 00000040 -/* 003CC 809A091C 84C90052 */ lh $t1, 0x0052($a2) ## 00000052 -/* 003D0 809A0920 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 003D4 809A0924 A4CF0042 */ sh $t7, 0x0042($a2) ## 00000042 -/* 003D8 809A0928 84D80042 */ lh $t8, 0x0042($a2) ## 00000042 -/* 003DC 809A092C 84CC005C */ lh $t4, 0x005C($a2) ## 0000005C -/* 003E0 809A0930 84CB004C */ lh $t3, 0x004C($a2) ## 0000004C -/* 003E4 809A0934 01095021 */ addu $t2, $t0, $t1 -/* 003E8 809A0938 33190003 */ andi $t9, $t8, 0x0003 ## $t9 = 00000000 -/* 003EC 809A093C 016C082A */ slt $at, $t3, $t4 -/* 003F0 809A0940 A4D90042 */ sh $t9, 0x0042($a2) ## 00000042 -/* 003F4 809A0944 14200009 */ bne $at, $zero, .L809A096C -/* 003F8 809A0948 A4CA0040 */ sh $t2, 0x0040($a2) ## 00000040 -/* 003FC 809A094C 84CD004A */ lh $t5, 0x004A($a2) ## 0000004A -/* 00400 809A0950 25AEFFFB */ addiu $t6, $t5, 0xFFFB ## $t6 = FFFFFFFB -/* 00404 809A0954 A4CE004A */ sh $t6, 0x004A($a2) ## 0000004A -/* 00408 809A0958 84CF004A */ lh $t7, 0x004A($a2) ## 0000004A -/* 0040C 809A095C 05E3000D */ bgezl $t7, .L809A0994 -/* 00410 809A0960 C4C0001C */ lwc1 $f0, 0x001C($a2) ## 0000001C -/* 00414 809A0964 1000000A */ beq $zero, $zero, .L809A0990 -/* 00418 809A0968 A4C0004A */ sh $zero, 0x004A($a2) ## 0000004A -.L809A096C: -/* 0041C 809A096C 84D8004A */ lh $t8, 0x004A($a2) ## 0000004A -/* 00420 809A0970 240900FF */ addiu $t1, $zero, 0x00FF ## $t1 = 000000FF -/* 00424 809A0974 2719000F */ addiu $t9, $t8, 0x000F ## $t9 = 0000000F -/* 00428 809A0978 A4D9004A */ sh $t9, 0x004A($a2) ## 0000004A -/* 0042C 809A097C 84C8004A */ lh $t0, 0x004A($a2) ## 0000004A -/* 00430 809A0980 29010100 */ slti $at, $t0, 0x0100 -/* 00434 809A0984 54200003 */ bnel $at, $zero, .L809A0994 -/* 00438 809A0988 C4C0001C */ lwc1 $f0, 0x001C($a2) ## 0000001C -/* 0043C 809A098C A4C9004A */ sh $t1, 0x004A($a2) ## 0000004A -.L809A0990: -/* 00440 809A0990 C4C0001C */ lwc1 $f0, 0x001C($a2) ## 0000001C -.L809A0994: -/* 00444 809A0994 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00448 809A0998 00000000 */ nop -/* 0044C 809A099C 4604003C */ c.lt.s $f0, $f4 -/* 00450 809A09A0 00000000 */ nop -/* 00454 809A09A4 4502000B */ bc1fl .L809A09D4 -/* 00458 809A09A8 84CB005C */ lh $t3, 0x005C($a2) ## 0000005C -/* 0045C 809A09AC 84CA0056 */ lh $t2, 0x0056($a2) ## 00000056 -/* 00460 809A09B0 3C01809A */ lui $at, %hi(D_809A0A40) ## $at = 809A0000 -/* 00464 809A09B4 C42A0A40 */ lwc1 $f10, %lo(D_809A0A40)($at) -/* 00468 809A09B8 448A3000 */ mtc1 $t2, $f6 ## $f6 = 0.00 -/* 0046C 809A09BC 00000000 */ nop -/* 00470 809A09C0 46803220 */ cvt.s.w $f8, $f6 -/* 00474 809A09C4 460A4402 */ mul.s $f16, $f8, $f10 -/* 00478 809A09C8 46100480 */ add.s $f18, $f0, $f16 -/* 0047C 809A09CC E4D2001C */ swc1 $f18, 0x001C($a2) ## 0000001C -/* 00480 809A09D0 84CB005C */ lh $t3, 0x005C($a2) ## 0000005C -.L809A09D4: -/* 00484 809A09D4 1D600003 */ bgtz $t3, .L809A09E4 -/* 00488 809A09D8 00000000 */ nop -/* 0048C 809A09DC 84CC0056 */ lh $t4, 0x0056($a2) ## 00000056 -/* 00490 809A09E0 A4CC0056 */ sh $t4, 0x0056($a2) ## 00000056 -.L809A09E4: -/* 00494 809A09E4 03E00008 */ jr $ra -/* 00498 809A09E8 00000000 */ nop -/* 0049C 809A09EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/EffectSsDeadDb_Init.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/EffectSsDeadDb_Init.s deleted file mode 100644 index f68cce4d49..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/EffectSsDeadDb_Init.s +++ /dev/null @@ -1,71 +0,0 @@ -glabel EffectSsDeadDb_Init -/* 00000 809A0AA0 AFA40000 */ sw $a0, 0x0000($sp) -/* 00004 809A0AA4 AFA50004 */ sw $a1, 0x0004($sp) -/* 00008 809A0AA8 8CEF0000 */ lw $t7, 0x0000($a3) ## 00000000 -/* 0000C 809A0AAC 3C020403 */ lui $v0, 0x0403 ## $v0 = 04030000 -/* 00010 809A0AB0 24421FE0 */ addiu $v0, $v0, 0x1FE0 ## $v0 = 04031FE0 -/* 00014 809A0AB4 ACCF0000 */ sw $t7, 0x0000($a2) ## 00000000 -/* 00018 809A0AB8 8CEE0004 */ lw $t6, 0x0004($a3) ## 00000004 -/* 0001C 809A0ABC 00025100 */ sll $t2, $v0, 4 -/* 00020 809A0AC0 000A5F02 */ srl $t3, $t2, 28 -/* 00024 809A0AC4 ACCE0004 */ sw $t6, 0x0004($a2) ## 00000004 -/* 00028 809A0AC8 8CEF0008 */ lw $t7, 0x0008($a3) ## 00000008 -/* 0002C 809A0ACC 000B6080 */ sll $t4, $t3, 2 -/* 00030 809A0AD0 3C0D8016 */ lui $t5, %hi(gSegments) -/* 00034 809A0AD4 ACCF0008 */ sw $t7, 0x0008($a2) ## 00000008 -/* 00038 809A0AD8 8CF9000C */ lw $t9, 0x000C($a3) ## 0000000C -/* 0003C 809A0ADC 01AC6821 */ addu $t5, $t5, $t4 -/* 00040 809A0AE0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00044 809A0AE4 ACD9000C */ sw $t9, 0x000C($a2) ## 0000000C -/* 00048 809A0AE8 8CF80010 */ lw $t8, 0x0010($a3) ## 00000010 -/* 0004C 809A0AEC 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00050 809A0AF0 00417024 */ and $t6, $v0, $at -/* 00054 809A0AF4 ACD80010 */ sw $t8, 0x0010($a2) ## 00000010 -/* 00058 809A0AF8 8CF90014 */ lw $t9, 0x0014($a3) ## 00000014 -/* 0005C 809A0AFC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00060 809A0B00 3C0B809A */ lui $t3, %hi(func_809A0BB8) ## $t3 = 809A0000 -/* 00064 809A0B04 ACD90014 */ sw $t9, 0x0014($a2) ## 00000014 -/* 00068 809A0B08 8CE90018 */ lw $t1, 0x0018($a3) ## 00000018 -/* 0006C 809A0B0C 3C0C809A */ lui $t4, %hi(func_809A0DB4) ## $t4 = 809A0000 -/* 00070 809A0B10 256B0BB8 */ addiu $t3, $t3, %lo(func_809A0BB8) ## $t3 = 809A0BB8 -/* 00074 809A0B14 ACC90018 */ sw $t1, 0x0018($a2) ## 00000018 -/* 00078 809A0B18 8CE8001C */ lw $t0, 0x001C($a3) ## 0000001C -/* 0007C 809A0B1C 258C0DB4 */ addiu $t4, $t4, %lo(func_809A0DB4) ## $t4 = 809A0DB4 -/* 00080 809A0B20 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00084 809A0B24 ACC8001C */ sw $t0, 0x001C($a2) ## 0000001C -/* 00088 809A0B28 8CE90020 */ lw $t1, 0x0020($a3) ## 00000020 -/* 0008C 809A0B2C 24080004 */ addiu $t0, $zero, 0x0004 ## $t0 = 00000004 -/* 00090 809A0B30 ACC90020 */ sw $t1, 0x0020($a2) ## 00000020 -/* 00094 809A0B34 8DAD6FA8 */ lw $t5, %lo(gSegments)($t5) -/* 00098 809A0B38 01AE7821 */ addu $t7, $t5, $t6 -/* 0009C 809A0B3C 01E1C021 */ addu $t8, $t7, $at -/* 000A0 809A0B40 ACD80038 */ sw $t8, 0x0038($a2) ## 00000038 -/* 000A4 809A0B44 8CF90034 */ lw $t9, 0x0034($a3) ## 00000034 -/* 000A8 809A0B48 A4C8005A */ sh $t0, 0x005A($a2) ## 0000005A -/* 000AC 809A0B4C A4D9005C */ sh $t9, 0x005C($a2) ## 0000005C -/* 000B0 809A0B50 84E90026 */ lh $t1, 0x0026($a3) ## 00000026 -/* 000B4 809A0B54 A4C90052 */ sh $t1, 0x0052($a2) ## 00000052 -/* 000B8 809A0B58 8CEA0034 */ lw $t2, 0x0034($a3) ## 00000034 -/* 000BC 809A0B5C ACCB0028 */ sw $t3, 0x0028($a2) ## 00000028 -/* 000C0 809A0B60 ACCC0024 */ sw $t4, 0x0024($a2) ## 00000024 -/* 000C4 809A0B64 A4CA0056 */ sh $t2, 0x0056($a2) ## 00000056 -/* 000C8 809A0B68 84ED0024 */ lh $t5, 0x0024($a3) ## 00000024 -/* 000CC 809A0B6C A4C00042 */ sh $zero, 0x0042($a2) ## 00000042 -/* 000D0 809A0B70 A4CD0040 */ sh $t5, 0x0040($a2) ## 00000040 -/* 000D4 809A0B74 84EE0038 */ lh $t6, 0x0038($a3) ## 00000038 -/* 000D8 809A0B78 A4CE0054 */ sh $t6, 0x0054($a2) ## 00000054 -/* 000DC 809A0B7C 90EF0028 */ lbu $t7, 0x0028($a3) ## 00000028 -/* 000E0 809A0B80 A4CF0044 */ sh $t7, 0x0044($a2) ## 00000044 -/* 000E4 809A0B84 90F80029 */ lbu $t8, 0x0029($a3) ## 00000029 -/* 000E8 809A0B88 A4D80046 */ sh $t8, 0x0046($a2) ## 00000046 -/* 000EC 809A0B8C 90F9002A */ lbu $t9, 0x002A($a3) ## 0000002A -/* 000F0 809A0B90 A4D90048 */ sh $t9, 0x0048($a2) ## 00000048 -/* 000F4 809A0B94 90E8002B */ lbu $t0, 0x002B($a3) ## 0000002B -/* 000F8 809A0B98 A4C8004A */ sh $t0, 0x004A($a2) ## 0000004A -/* 000FC 809A0B9C 90E9002C */ lbu $t1, 0x002C($a3) ## 0000002C -/* 00100 809A0BA0 A4C9004C */ sh $t1, 0x004C($a2) ## 0000004C -/* 00104 809A0BA4 90EA002D */ lbu $t2, 0x002D($a3) ## 0000002D -/* 00108 809A0BA8 A4CA004E */ sh $t2, 0x004E($a2) ## 0000004E -/* 0010C 809A0BAC 90EB002E */ lbu $t3, 0x002E($a3) ## 0000002E -/* 00110 809A0BB0 03E00008 */ jr $ra -/* 00114 809A0BB4 A4CB0050 */ sh $t3, 0x0050($a2) ## 00000050 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/func_809A0BB8.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/func_809A0BB8.s deleted file mode 100644 index ace6998d91..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/func_809A0BB8.s +++ /dev/null @@ -1,143 +0,0 @@ -.rdata -glabel D_809A0F50 - .asciz "../z_eff_ss_dead_db.c" - .balign 4 - -glabel D_809A0F68 - .asciz "../z_eff_ss_dead_db.c" - .balign 4 - -.late_rodata -glabel D_809A0F80 - .float 0.01 - -.text -glabel func_809A0BB8 -/* 00118 809A0BB8 27BDFEE8 */ addiu $sp, $sp, 0xFEE8 ## $sp = FFFFFEE8 -/* 0011C 809A0BBC AFB00014 */ sw $s0, 0x0014($sp) -/* 00120 809A0BC0 AFBF001C */ sw $ra, 0x001C($sp) -/* 00124 809A0BC4 AFB10018 */ sw $s1, 0x0018($sp) -/* 00128 809A0BC8 AFA40118 */ sw $a0, 0x0118($sp) -/* 0012C 809A0BCC AFA5011C */ sw $a1, 0x011C($sp) -/* 00130 809A0BD0 8C910000 */ lw $s1, 0x0000($a0) ## 00000000 -/* 00134 809A0BD4 00C08025 */ or $s0, $a2, $zero ## $s0 = 00000000 -/* 00138 809A0BD8 3C06809A */ lui $a2, %hi(D_809A0F50) ## $a2 = 809A0000 -/* 0013C 809A0BDC 24C60F50 */ addiu $a2, $a2, %lo(D_809A0F50) ## $a2 = 809A0F50 -/* 00140 809A0BE0 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFF20 -/* 00144 809A0BE4 240700C9 */ addiu $a3, $zero, 0x00C9 ## $a3 = 000000C9 -/* 00148 809A0BE8 0C031AB1 */ jal Graph_OpenDisps -/* 0014C 809A0BEC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00150 809A0BF0 860F0040 */ lh $t7, 0x0040($s0) ## 00000040 -/* 00154 809A0BF4 3C01809A */ lui $at, %hi(D_809A0F80) ## $at = 809A0000 -/* 00158 809A0BF8 C4280F80 */ lwc1 $f8, %lo(D_809A0F80)($at) -/* 0015C 809A0BFC 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 00160 809A0C00 8E050000 */ lw $a1, 0x0000($s0) ## 00000000 -/* 00164 809A0C04 8E060004 */ lw $a2, 0x0004($s0) ## 00000004 -/* 00168 809A0C08 468021A0 */ cvt.s.w $f6, $f4 -/* 0016C 809A0C0C 8E070008 */ lw $a3, 0x0008($s0) ## 00000008 -/* 00170 809A0C10 27A400D4 */ addiu $a0, $sp, 0x00D4 ## $a0 = FFFFFFBC -/* 00174 809A0C14 46083002 */ mul.s $f0, $f6, $f8 -/* 00178 809A0C18 0C029E89 */ jal SkinMatrix_SetTranslate -/* 0017C 809A0C1C E7A0004C */ swc1 $f0, 0x004C($sp) -/* 00180 809A0C20 C7A0004C */ lwc1 $f0, 0x004C($sp) -/* 00184 809A0C24 27A40094 */ addiu $a0, $sp, 0x0094 ## $a0 = FFFFFF7C -/* 00188 809A0C28 44050000 */ mfc1 $a1, $f0 -/* 0018C 809A0C2C 44060000 */ mfc1 $a2, $f0 -/* 00190 809A0C30 44070000 */ mfc1 $a3, $f0 -/* 00194 809A0C34 0C029DA9 */ jal SkinMatrix_SetScale -/* 00198 809A0C38 00000000 */ nop -/* 0019C 809A0C3C 27A400D4 */ addiu $a0, $sp, 0x00D4 ## $a0 = FFFFFFBC -/* 001A0 809A0C40 27A50094 */ addiu $a1, $sp, 0x0094 ## $a1 = FFFFFF7C -/* 001A4 809A0C44 0C029BE8 */ jal SkinMatrix_MtxFMtxFMult -/* 001A8 809A0C48 27A60054 */ addiu $a2, $sp, 0x0054 ## $a2 = FFFFFF3C -/* 001AC 809A0C4C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 001B0 809A0C50 0C029F9C */ jal SkinMatrix_MtxFToNewMtx -/* 001B4 809A0C54 27A50054 */ addiu $a1, $sp, 0x0054 ## $a1 = FFFFFF3C -/* 001B8 809A0C58 1040004B */ beq $v0, $zero, .L809A0D88 -/* 001BC 809A0C5C 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 -/* 001C0 809A0C60 8E2302D0 */ lw $v1, 0x02D0($s1) ## 000002D0 -/* 001C4 809A0C64 37390003 */ ori $t9, $t9, 0x0003 ## $t9 = DA380003 -/* 001C8 809A0C68 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 001CC 809A0C6C 24780008 */ addiu $t8, $v1, 0x0008 ## $t8 = 00000008 -/* 001D0 809A0C70 AE3802D0 */ sw $t8, 0x02D0($s1) ## 000002D0 -/* 001D4 809A0C74 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 001D8 809A0C78 0C0252F1 */ jal func_80094BC4 -/* 001DC 809A0C7C AC790000 */ sw $t9, 0x0000($v1) ## 00000000 -/* 001E0 809A0C80 8E2302D0 */ lw $v1, 0x02D0($s1) ## 000002D0 -/* 001E4 809A0C84 3C09FB00 */ lui $t1, 0xFB00 ## $t1 = FB000000 -/* 001E8 809A0C88 3C0DFA00 */ lui $t5, 0xFA00 ## $t5 = FA000000 -/* 001EC 809A0C8C 24680008 */ addiu $t0, $v1, 0x0008 ## $t0 = 00000008 -/* 001F0 809A0C90 AE2802D0 */ sw $t0, 0x02D0($s1) ## 000002D0 -/* 001F4 809A0C94 AC690000 */ sw $t1, 0x0000($v1) ## 00000000 -/* 001F8 809A0C98 860A0050 */ lh $t2, 0x0050($s0) ## 00000050 -/* 001FC 809A0C9C 8619004E */ lh $t9, 0x004E($s0) ## 0000004E -/* 00200 809A0CA0 860E004C */ lh $t6, 0x004C($s0) ## 0000004C -/* 00204 809A0CA4 314B00FF */ andi $t3, $t2, 0x00FF ## $t3 = 00000000 -/* 00208 809A0CA8 000B6200 */ sll $t4, $t3, 8 -/* 0020C 809A0CAC 332800FF */ andi $t0, $t9, 0x00FF ## $t0 = 00000000 -/* 00210 809A0CB0 000E7E00 */ sll $t7, $t6, 24 -/* 00214 809A0CB4 018FC025 */ or $t8, $t4, $t7 ## $t8 = 00000000 -/* 00218 809A0CB8 00084C00 */ sll $t1, $t0, 16 -/* 0021C 809A0CBC 03095025 */ or $t2, $t8, $t1 ## $t2 = FB000000 -/* 00220 809A0CC0 AC6A0004 */ sw $t2, 0x0004($v1) ## 00000004 -/* 00224 809A0CC4 8E2302D0 */ lw $v1, 0x02D0($s1) ## 000002D0 -/* 00228 809A0CC8 3C04809A */ lui $a0, %hi(D_809A0F28) ## $a0 = 809A0000 -/* 0022C 809A0CCC 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00230 809A0CD0 246B0008 */ addiu $t3, $v1, 0x0008 ## $t3 = 00000008 -/* 00234 809A0CD4 AE2B02D0 */ sw $t3, 0x02D0($s1) ## 000002D0 -/* 00238 809A0CD8 AC6D0000 */ sw $t5, 0x0000($v1) ## 00000000 -/* 0023C 809A0CDC 860E004A */ lh $t6, 0x004A($s0) ## 0000004A -/* 00240 809A0CE0 86090046 */ lh $t1, 0x0046($s0) ## 00000046 -/* 00244 809A0CE4 86190044 */ lh $t9, 0x0044($s0) ## 00000044 -/* 00248 809A0CE8 31CC00FF */ andi $t4, $t6, 0x00FF ## $t4 = 00000000 -/* 0024C 809A0CEC 860E0048 */ lh $t6, 0x0048($s0) ## 00000048 -/* 00250 809A0CF0 312A00FF */ andi $t2, $t1, 0x00FF ## $t2 = 00000000 -/* 00254 809A0CF4 00194600 */ sll $t0, $t9, 24 -/* 00258 809A0CF8 0188C025 */ or $t8, $t4, $t0 ## $t8 = 00000000 -/* 0025C 809A0CFC 000A5C00 */ sll $t3, $t2, 16 -/* 00260 809A0D00 31CF00FF */ andi $t7, $t6, 0x00FF ## $t7 = 00000000 -/* 00264 809A0D04 000FCA00 */ sll $t9, $t7, 8 -/* 00268 809A0D08 030B6825 */ or $t5, $t8, $t3 ## $t5 = 00000008 -/* 0026C 809A0D0C 01B96025 */ or $t4, $t5, $t9 ## $t4 = 00000008 -/* 00270 809A0D10 AC6C0004 */ sw $t4, 0x0004($v1) ## 00000004 -/* 00274 809A0D14 8E2302D0 */ lw $v1, 0x02D0($s1) ## 000002D0 -/* 00278 809A0D18 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 -/* 0027C 809A0D1C 35290020 */ ori $t1, $t1, 0x0020 ## $t1 = DB060020 -/* 00280 809A0D20 24680008 */ addiu $t0, $v1, 0x0008 ## $t0 = 00000008 -/* 00284 809A0D24 AE2802D0 */ sw $t0, 0x02D0($s1) ## 000002D0 -/* 00288 809A0D28 AC690000 */ sw $t1, 0x0000($v1) ## 00000000 -/* 0028C 809A0D2C 860A0042 */ lh $t2, 0x0042($s0) ## 00000042 -/* 00290 809A0D30 3C198016 */ lui $t9, %hi(gSegments) -/* 00294 809A0D34 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00298 809A0D38 000AC080 */ sll $t8, $t2, 2 -/* 0029C 809A0D3C 00982021 */ addu $a0, $a0, $t8 -/* 002A0 809A0D40 8C840F28 */ lw $a0, %lo(D_809A0F28)($a0) -/* 002A4 809A0D44 3C0ADE00 */ lui $t2, 0xDE00 ## $t2 = DE000000 -/* 002A8 809A0D48 00047100 */ sll $t6, $a0, 4 -/* 002AC 809A0D4C 000E7F02 */ srl $t7, $t6, 28 -/* 002B0 809A0D50 000F6880 */ sll $t5, $t7, 2 -/* 002B4 809A0D54 032DC821 */ addu $t9, $t9, $t5 -/* 002B8 809A0D58 8F396FA8 */ lw $t9, %lo(gSegments)($t9) -/* 002BC 809A0D5C 00815824 */ and $t3, $a0, $at -/* 002C0 809A0D60 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 002C4 809A0D64 01796021 */ addu $t4, $t3, $t9 -/* 002C8 809A0D68 01814021 */ addu $t0, $t4, $at -/* 002CC 809A0D6C AC680004 */ sw $t0, 0x0004($v1) ## 00000004 -/* 002D0 809A0D70 8E2302D0 */ lw $v1, 0x02D0($s1) ## 000002D0 -/* 002D4 809A0D74 24690008 */ addiu $t1, $v1, 0x0008 ## $t1 = 00000008 -/* 002D8 809A0D78 AE2902D0 */ sw $t1, 0x02D0($s1) ## 000002D0 -/* 002DC 809A0D7C AC6A0000 */ sw $t2, 0x0000($v1) ## 00000000 -/* 002E0 809A0D80 8E180038 */ lw $t8, 0x0038($s0) ## 00000038 -/* 002E4 809A0D84 AC780004 */ sw $t8, 0x0004($v1) ## 00000004 -.L809A0D88: -/* 002E8 809A0D88 3C06809A */ lui $a2, %hi(D_809A0F68) ## $a2 = 809A0000 -/* 002EC 809A0D8C 24C60F68 */ addiu $a2, $a2, %lo(D_809A0F68) ## $a2 = 809A0F68 -/* 002F0 809A0D90 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFF20 -/* 002F4 809A0D94 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 002F8 809A0D98 0C031AD5 */ jal Graph_CloseDisps -/* 002FC 809A0D9C 240700F7 */ addiu $a3, $zero, 0x00F7 ## $a3 = 000000F7 -/* 00300 809A0DA0 8FBF001C */ lw $ra, 0x001C($sp) -/* 00304 809A0DA4 8FB00014 */ lw $s0, 0x0014($sp) -/* 00308 809A0DA8 8FB10018 */ lw $s1, 0x0018($sp) -/* 0030C 809A0DAC 03E00008 */ jr $ra -/* 00310 809A0DB0 27BD0118 */ addiu $sp, $sp, 0x0118 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/func_809A0DB4.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/func_809A0DB4.s deleted file mode 100644 index d7eaaa74d1..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/func_809A0DB4.s +++ /dev/null @@ -1,101 +0,0 @@ -glabel func_809A0DB4 -/* 00314 809A0DB4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00318 809A0DB8 AFBF001C */ sw $ra, 0x001C($sp) -/* 0031C 809A0DBC AFA40030 */ sw $a0, 0x0030($sp) -/* 00320 809A0DC0 AFA50034 */ sw $a1, 0x0034($sp) -/* 00324 809A0DC4 84CE005C */ lh $t6, 0x005C($a2) ## 0000005C -/* 00328 809A0DC8 84C20056 */ lh $v0, 0x0056($a2) ## 00000056 -/* 0032C 809A0DCC 84CC0044 */ lh $t4, 0x0044($a2) ## 00000044 -/* 00330 809A0DD0 84C90040 */ lh $t1, 0x0040($a2) ## 00000040 -/* 00334 809A0DD4 004E7823 */ subu $t7, $v0, $t6 -/* 00338 809A0DD8 000FC0C0 */ sll $t8, $t7, 3 -/* 0033C 809A0DDC 030FC021 */ addu $t8, $t8, $t7 -/* 00340 809A0DE0 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 00344 809A0DE4 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 -/* 00348 809A0DE8 258DFFF6 */ addiu $t5, $t4, 0xFFF6 ## $t5 = FFFFFFF6 -/* 0034C 809A0DEC 468021A0 */ cvt.s.w $f6, $f4 -/* 00350 809A0DF0 84CA0052 */ lh $t2, 0x0052($a2) ## 00000052 -/* 00354 809A0DF4 A4CD0044 */ sh $t5, 0x0044($a2) ## 00000044 -/* 00358 809A0DF8 84CE0044 */ lh $t6, 0x0044($a2) ## 00000044 -/* 0035C 809A0DFC 012A5821 */ addu $t3, $t1, $t2 -/* 00360 809A0E00 468042A0 */ cvt.s.w $f10, $f8 -/* 00364 809A0E04 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 00368 809A0E08 A4CB0040 */ sh $t3, 0x0040($a2) ## 00000040 -/* 0036C 809A0E0C 460A3403 */ div.s $f16, $f6, $f10 -/* 00370 809A0E10 4600848D */ trunc.w.s $f18, $f16 -/* 00374 809A0E14 44089000 */ mfc1 $t0, $f18 -/* 00378 809A0E18 05C10002 */ bgez $t6, .L809A0E24 -/* 0037C 809A0E1C A4C80042 */ sh $t0, 0x0042($a2) ## 00000042 -/* 00380 809A0E20 A4C00044 */ sh $zero, 0x0044($a2) ## 00000044 -.L809A0E24: -/* 00384 809A0E24 84AF0046 */ lh $t7, 0x0046($a1) ## 00000046 -/* 00388 809A0E28 25F8FFF6 */ addiu $t8, $t7, 0xFFF6 ## $t8 = FFFFFFF6 -/* 0038C 809A0E2C A4B80046 */ sh $t8, 0x0046($a1) ## 00000046 -/* 00390 809A0E30 84B90046 */ lh $t9, 0x0046($a1) ## 00000046 -/* 00394 809A0E34 07230003 */ bgezl $t9, .L809A0E44 -/* 00398 809A0E38 84A80048 */ lh $t0, 0x0048($a1) ## 00000048 -/* 0039C 809A0E3C A4A00046 */ sh $zero, 0x0046($a1) ## 00000046 -/* 003A0 809A0E40 84A80048 */ lh $t0, 0x0048($a1) ## 00000048 -.L809A0E44: -/* 003A4 809A0E44 2509FFF6 */ addiu $t1, $t0, 0xFFF6 ## $t1 = FFFFFFF6 -/* 003A8 809A0E48 A4A90048 */ sh $t1, 0x0048($a1) ## 00000048 -/* 003AC 809A0E4C 84AA0048 */ lh $t2, 0x0048($a1) ## 00000048 -/* 003B0 809A0E50 05430003 */ bgezl $t2, .L809A0E60 -/* 003B4 809A0E54 84AB004C */ lh $t3, 0x004C($a1) ## 0000004C -/* 003B8 809A0E58 A4A00048 */ sh $zero, 0x0048($a1) ## 00000048 -/* 003BC 809A0E5C 84AB004C */ lh $t3, 0x004C($a1) ## 0000004C -.L809A0E60: -/* 003C0 809A0E60 256CFFF6 */ addiu $t4, $t3, 0xFFF6 ## $t4 = FFFFFFF6 -/* 003C4 809A0E64 A4AC004C */ sh $t4, 0x004C($a1) ## 0000004C -/* 003C8 809A0E68 84AD004C */ lh $t5, 0x004C($a1) ## 0000004C -/* 003CC 809A0E6C 05A30003 */ bgezl $t5, .L809A0E7C -/* 003D0 809A0E70 84AE004E */ lh $t6, 0x004E($a1) ## 0000004E -/* 003D4 809A0E74 A4A0004C */ sh $zero, 0x004C($a1) ## 0000004C -/* 003D8 809A0E78 84AE004E */ lh $t6, 0x004E($a1) ## 0000004E -.L809A0E7C: -/* 003DC 809A0E7C 25CFFFF6 */ addiu $t7, $t6, 0xFFF6 ## $t7 = FFFFFFF6 -/* 003E0 809A0E80 A4AF004E */ sh $t7, 0x004E($a1) ## 0000004E -/* 003E4 809A0E84 84B8004E */ lh $t8, 0x004E($a1) ## 0000004E -/* 003E8 809A0E88 07030003 */ bgezl $t8, .L809A0E98 -/* 003EC 809A0E8C 84B90050 */ lh $t9, 0x0050($a1) ## 00000050 -/* 003F0 809A0E90 A4A0004E */ sh $zero, 0x004E($a1) ## 0000004E -/* 003F4 809A0E94 84B90050 */ lh $t9, 0x0050($a1) ## 00000050 -.L809A0E98: -/* 003F8 809A0E98 2728FFF6 */ addiu $t0, $t9, 0xFFF6 ## $t0 = FFFFFFF6 -/* 003FC 809A0E9C A4A80050 */ sh $t0, 0x0050($a1) ## 00000050 -/* 00400 809A0EA0 84A90050 */ lh $t1, 0x0050($a1) ## 00000050 -/* 00404 809A0EA4 05230003 */ bgezl $t1, .L809A0EB4 -/* 00408 809A0EA8 84AA0054 */ lh $t2, 0x0054($a1) ## 00000054 -/* 0040C 809A0EAC A4A00050 */ sh $zero, 0x0050($a1) ## 00000050 -/* 00410 809A0EB0 84AA0054 */ lh $t2, 0x0054($a1) ## 00000054 -.L809A0EB4: -/* 00414 809A0EB4 51400017 */ beql $t2, $zero, .L809A0F14 -/* 00418 809A0EB8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0041C 809A0EBC 84AB0042 */ lh $t3, 0x0042($a1) ## 00000042 -/* 00420 809A0EC0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00424 809A0EC4 8FA40030 */ lw $a0, 0x0030($sp) -/* 00428 809A0EC8 15610011 */ bne $t3, $at, .L809A0F10 -/* 0042C 809A0ECC 24A6002C */ addiu $a2, $a1, 0x002C ## $a2 = 0000002C -/* 00430 809A0ED0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00434 809A0ED4 34211D60 */ ori $at, $at, 0x1D60 ## $at = 00011D60 -/* 00438 809A0ED8 00812021 */ addu $a0, $a0, $at -/* 0043C 809A0EDC 27A7002C */ addiu $a3, $sp, 0x002C ## $a3 = FFFFFFFC -/* 00440 809A0EE0 0C029B84 */ jal SkinMatrix_Vec3fMtxFMultXYZW -/* 00444 809A0EE4 AFA60024 */ sw $a2, 0x0024($sp) -/* 00448 809A0EE8 3C078013 */ lui $a3, %hi(D_801333E0) -/* 0044C 809A0EEC 3C0C8013 */ lui $t4, %hi(D_801333E8) -/* 00450 809A0EF0 24E733E0 */ addiu $a3, %lo(D_801333E0) -/* 00454 809A0EF4 258C33E8 */ addiu $t4, %lo(D_801333E8) -/* 00458 809A0EF8 AFAC0014 */ sw $t4, 0x0014($sp) -/* 0045C 809A0EFC AFA70010 */ sw $a3, 0x0010($sp) -/* 00460 809A0F00 24043878 */ addiu $a0, $zero, 0x3878 ## $a0 = 00003878 -/* 00464 809A0F04 8FA50024 */ lw $a1, 0x0024($sp) -/* 00468 809A0F08 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 0046C 809A0F0C 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -.L809A0F10: -/* 00470 809A0F10 8FBF001C */ lw $ra, 0x001C($sp) -.L809A0F14: -/* 00474 809A0F14 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00478 809A0F18 03E00008 */ jr $ra -/* 0047C 809A0F1C 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Dd/EffectSsDeadDd_Init.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Dd/EffectSsDeadDd_Init.s deleted file mode 100644 index 53add7fb76..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Dd/EffectSsDeadDd_Init.s +++ /dev/null @@ -1,198 +0,0 @@ -.rdata -glabel D_809A1550 - .asciz "Effect_SS_Dd_disp_mode():mode_swが変です。\n" - .balign 4 - -.text -glabel EffectSsDeadDd_Init -/* 000000 809A0FE0 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 000004 809A0FE4 AFBF003C */ sw $ra, 0x3c($sp) -/* 000008 809A0FE8 AFB20038 */ sw $s2, 0x38($sp) -/* 00000C 809A0FEC AFB10034 */ sw $s1, 0x34($sp) -/* 000010 809A0FF0 AFB00030 */ sw $s0, 0x30($sp) -/* 000014 809A0FF4 F7B80028 */ sdc1 $f24, 0x28($sp) -/* 000018 809A0FF8 F7B60020 */ sdc1 $f22, 0x20($sp) -/* 00001C 809A0FFC F7B40018 */ sdc1 $f20, 0x18($sp) -/* 000020 809A1000 AFA40040 */ sw $a0, 0x40($sp) -/* 000024 809A1004 AFA50044 */ sw $a1, 0x44($sp) -/* 000028 809A1008 90E20040 */ lbu $v0, 0x40($a3) -/* 00002C 809A100C 00C08025 */ move $s0, $a2 -/* 000030 809A1010 00E08825 */ move $s1, $a3 -/* 000034 809A1014 54400044 */ bnezl $v0, .L809A1128 -/* 000038 809A1018 24010001 */ li $at, 1 -/* 00003C 809A101C 8E2F0000 */ lw $t7, ($s1) -/* 000040 809A1020 AE0F0000 */ sw $t7, ($s0) -/* 000044 809A1024 8E2E0004 */ lw $t6, 4($s1) -/* 000048 809A1028 AE0E0004 */ sw $t6, 4($s0) -/* 00004C 809A102C 8E2F0008 */ lw $t7, 8($s1) -/* 000050 809A1030 AE0F0008 */ sw $t7, 8($s0) -/* 000054 809A1034 8E39000C */ lw $t9, 0xc($s1) -/* 000058 809A1038 AE19000C */ sw $t9, 0xc($s0) -/* 00005C 809A103C 8E380010 */ lw $t8, 0x10($s1) -/* 000060 809A1040 AE180010 */ sw $t8, 0x10($s0) -/* 000064 809A1044 8E390014 */ lw $t9, 0x14($s1) -/* 000068 809A1048 3C18809A */ lui $t8, %hi(func_809A12B4) # $t8, 0x809a -/* 00006C 809A104C 271812B4 */ addiu $t8, %lo(func_809A12B4) # addiu $t8, $t8, 0x12b4 -/* 000070 809A1050 AE190014 */ sw $t9, 0x14($s0) -/* 000074 809A1054 8E290018 */ lw $t1, 0x18($s1) -/* 000078 809A1058 3C19809A */ lui $t9, %hi(func_809A14B0) # $t9, 0x809a -/* 00007C 809A105C 273914B0 */ addiu $t9, %lo(func_809A14B0) # addiu $t9, $t9, 0x14b0 -/* 000080 809A1060 AE090018 */ sw $t1, 0x18($s0) -/* 000084 809A1064 8E28001C */ lw $t0, 0x1c($s1) -/* 000088 809A1068 AE08001C */ sw $t0, 0x1c($s0) -/* 00008C 809A106C 8E290020 */ lw $t1, 0x20($s1) -/* 000090 809A1070 AE090020 */ sw $t1, 0x20($s0) -/* 000094 809A1074 8E2A0034 */ lw $t2, 0x34($s1) -/* 000098 809A1078 A60A005C */ sh $t2, 0x5c($s0) -/* 00009C 809A107C 862B0026 */ lh $t3, 0x26($s1) -/* 0000A0 809A1080 A60B0052 */ sh $t3, 0x52($s0) -/* 0000A4 809A1084 862C0030 */ lh $t4, 0x30($s1) -/* 0000A8 809A1088 A60C0056 */ sh $t4, 0x56($s0) -/* 0000AC 809A108C 86220030 */ lh $v0, 0x30($s1) -/* 0000B0 809A1090 50400004 */ beql $v0, $zero, .L809A10A4 -/* 0000B4 809A1094 922D002B */ lbu $t5, 0x2b($s1) -/* 0000B8 809A1098 1000000F */ b .L809A10D8 -/* 0000BC 809A109C A6020054 */ sh $v0, 0x54($s0) -/* 0000C0 809A10A0 922D002B */ lbu $t5, 0x2b($s1) -.L809A10A4: -/* 0000C4 809A10A4 8E2E0034 */ lw $t6, 0x34($s1) -/* 0000C8 809A10A8 01AE001A */ div $zero, $t5, $t6 -/* 0000CC 809A10AC 00007812 */ mflo $t7 -/* 0000D0 809A10B0 A60F0054 */ sh $t7, 0x54($s0) -/* 0000D4 809A10B4 15C00002 */ bnez $t6, .L809A10C0 -/* 0000D8 809A10B8 00000000 */ nop -/* 0000DC 809A10BC 0007000D */ break 7 -.L809A10C0: -/* 0000E0 809A10C0 2401FFFF */ li $at, -1 -/* 0000E4 809A10C4 15C10004 */ bne $t6, $at, .L809A10D8 -/* 0000E8 809A10C8 3C018000 */ lui $at, 0x8000 -/* 0000EC 809A10CC 15A10002 */ bne $t5, $at, .L809A10D8 -/* 0000F0 809A10D0 00000000 */ nop -/* 0000F4 809A10D4 0006000D */ break 6 -.L809A10D8: -/* 0000F8 809A10D8 AE180028 */ sw $t8, 0x28($s0) -/* 0000FC 809A10DC AE190024 */ sw $t9, 0x24($s0) -/* 000100 809A10E0 86280024 */ lh $t0, 0x24($s1) -/* 000104 809A10E4 A6080040 */ sh $t0, 0x40($s0) -/* 000108 809A10E8 92290028 */ lbu $t1, 0x28($s1) -/* 00010C 809A10EC A6090044 */ sh $t1, 0x44($s0) -/* 000110 809A10F0 922A0029 */ lbu $t2, 0x29($s1) -/* 000114 809A10F4 A60A0046 */ sh $t2, 0x46($s0) -/* 000118 809A10F8 922B002A */ lbu $t3, 0x2a($s1) -/* 00011C 809A10FC A60B0048 */ sh $t3, 0x48($s0) -/* 000120 809A1100 922C002B */ lbu $t4, 0x2b($s1) -/* 000124 809A1104 A60C004A */ sh $t4, 0x4a($s0) -/* 000128 809A1108 922D002C */ lbu $t5, 0x2c($s1) -/* 00012C 809A110C A60D004C */ sh $t5, 0x4c($s0) -/* 000130 809A1110 922E002D */ lbu $t6, 0x2d($s1) -/* 000134 809A1114 A60E004E */ sh $t6, 0x4e($s0) -/* 000138 809A1118 922F002E */ lbu $t7, 0x2e($s1) -/* 00013C 809A111C 1000005B */ b .L809A128C -/* 000140 809A1120 A60F0050 */ sh $t7, 0x50($s0) -/* 000144 809A1124 24010001 */ li $at, 1 -.L809A1128: -/* 000148 809A1128 14410053 */ bne $v0, $at, .L809A1278 -/* 00014C 809A112C 240300FF */ li $v1, 255 -/* 000150 809A1130 8E380034 */ lw $t8, 0x34($s1) -/* 000154 809A1134 2402009B */ li $v0, 155 -/* 000158 809A1138 3C0D809A */ lui $t5, %hi(func_809A12B4) # $t5, 0x809a -/* 00015C 809A113C A618005C */ sh $t8, 0x5c($s0) -/* 000160 809A1140 86390026 */ lh $t9, 0x26($s1) -/* 000164 809A1144 A6000056 */ sh $zero, 0x56($s0) -/* 000168 809A1148 3C0E809A */ lui $t6, %hi(func_809A14B0) # $t6, 0x809a -/* 00016C 809A114C A6190052 */ sh $t9, 0x52($s0) -/* 000170 809A1150 8E280034 */ lw $t0, 0x34($s1) -/* 000174 809A1154 240B00FA */ li $t3, 250 -/* 000178 809A1158 240C00B4 */ li $t4, 180 -/* 00017C 809A115C 0048001A */ div $zero, $v0, $t0 -/* 000180 809A1160 00004812 */ mflo $t1 -/* 000184 809A1164 A6090054 */ sh $t1, 0x54($s0) -/* 000188 809A1168 862A0024 */ lh $t2, 0x24($s1) -/* 00018C 809A116C 25AD12B4 */ addiu $t5, %lo(func_809A12B4) # addiu $t5, $t5, 0x12b4 -/* 000190 809A1170 25CE14B0 */ addiu $t6, %lo(func_809A14B0) # addiu $t6, $t6, 0x14b0 -/* 000194 809A1174 A6030044 */ sh $v1, 0x44($s0) -/* 000198 809A1178 A6030046 */ sh $v1, 0x46($s0) -/* 00019C 809A117C A6020048 */ sh $v0, 0x48($s0) -/* 0001A0 809A1180 A602004A */ sh $v0, 0x4a($s0) -/* 0001A4 809A1184 A60B004C */ sh $t3, 0x4c($s0) -/* 0001A8 809A1188 A60C004E */ sh $t4, 0x4e($s0) -/* 0001AC 809A118C A6000050 */ sh $zero, 0x50($s0) -/* 0001B0 809A1190 AE0D0028 */ sw $t5, 0x28($s0) -/* 0001B4 809A1194 AE0E0024 */ sw $t6, 0x24($s0) -/* 0001B8 809A1198 A60A0040 */ sh $t2, 0x40($s0) -/* 0001BC 809A119C 8E32003C */ lw $s2, 0x3c($s1) -/* 0001C0 809A11A0 15000002 */ bnez $t0, .L809A11AC -/* 0001C4 809A11A4 00000000 */ nop -/* 0001C8 809A11A8 0007000D */ break 7 -.L809A11AC: -/* 0001CC 809A11AC 2401FFFF */ li $at, -1 -/* 0001D0 809A11B0 15010004 */ bne $t0, $at, .L809A11C4 -/* 0001D4 809A11B4 3C018000 */ lui $at, 0x8000 -/* 0001D8 809A11B8 14410002 */ bne $v0, $at, .L809A11C4 -/* 0001DC 809A11BC 00000000 */ nop -/* 0001E0 809A11C0 0006000D */ break 6 -.L809A11C4: -/* 0001E4 809A11C4 1A400031 */ blez $s2, .L809A128C -/* 0001E8 809A11C8 3C013F00 */ li $at, 0x3F000000 # 0.500000 -/* 0001EC 809A11CC 4481C000 */ mtc1 $at, $f24 -/* 0001F0 809A11D0 00000000 */ nop -.L809A11D4: -/* 0001F4 809A11D4 0C03F66B */ jal Math_Rand_ZeroOne -/* 0001F8 809A11D8 00000000 */ nop -/* 0001FC 809A11DC 46180101 */ sub.s $f4, $f0, $f24 -/* 000200 809A11E0 C6260038 */ lwc1 $f6, 0x38($s1) -/* 000204 809A11E4 C62A0000 */ lwc1 $f10, ($s1) -/* 000208 809A11E8 46062202 */ mul.s $f8, $f4, $f6 -/* 00020C 809A11EC 460A4400 */ add.s $f16, $f8, $f10 -/* 000210 809A11F0 0C03F66B */ jal Math_Rand_ZeroOne -/* 000214 809A11F4 E6100000 */ swc1 $f16, ($s0) -/* 000218 809A11F8 46180481 */ sub.s $f18, $f0, $f24 -/* 00021C 809A11FC C6240038 */ lwc1 $f4, 0x38($s1) -/* 000220 809A1200 C6280004 */ lwc1 $f8, 4($s1) -/* 000224 809A1204 46049182 */ mul.s $f6, $f18, $f4 -/* 000228 809A1208 46083280 */ add.s $f10, $f6, $f8 -/* 00022C 809A120C 0C03F66B */ jal Math_Rand_ZeroOne -/* 000230 809A1210 E60A0004 */ swc1 $f10, 4($s0) -/* 000234 809A1214 46180401 */ sub.s $f16, $f0, $f24 -/* 000238 809A1218 C6320038 */ lwc1 $f18, 0x38($s1) -/* 00023C 809A121C C6260008 */ lwc1 $f6, 8($s1) -/* 000240 809A1220 46128102 */ mul.s $f4, $f16, $f18 -/* 000244 809A1224 46062200 */ add.s $f8, $f4, $f6 -/* 000248 809A1228 0C03F66B */ jal Math_Rand_ZeroOne -/* 00024C 809A122C E6080008 */ swc1 $f8, 8($s0) -/* 000250 809A1230 46180501 */ sub.s $f20, $f0, $f24 -/* 000254 809A1234 4614A580 */ add.s $f22, $f20, $f20 -/* 000258 809A1238 E616000C */ swc1 $f22, 0xc($s0) -/* 00025C 809A123C 0C03F66B */ jal Math_Rand_ZeroOne -/* 000260 809A1240 E6160018 */ swc1 $f22, 0x18($s0) -/* 000264 809A1244 46180501 */ sub.s $f20, $f0, $f24 -/* 000268 809A1248 4614A580 */ add.s $f22, $f20, $f20 -/* 00026C 809A124C E6160010 */ swc1 $f22, 0x10($s0) -/* 000270 809A1250 0C03F66B */ jal Math_Rand_ZeroOne -/* 000274 809A1254 E616001C */ swc1 $f22, 0x1c($s0) -/* 000278 809A1258 46180501 */ sub.s $f20, $f0, $f24 -/* 00027C 809A125C 2652FFFF */ addiu $s2, $s2, -1 -/* 000280 809A1260 4614A580 */ add.s $f22, $f20, $f20 -/* 000284 809A1264 E6160014 */ swc1 $f22, 0x14($s0) -/* 000288 809A1268 1E40FFDA */ bgtz $s2, .L809A11D4 -/* 00028C 809A126C E6160020 */ swc1 $f22, 0x20($s0) -/* 000290 809A1270 10000007 */ b .L809A1290 -/* 000294 809A1274 24020001 */ li $v0, 1 -.L809A1278: -/* 000298 809A1278 3C04809A */ lui $a0, %hi(D_809A1550) # $a0, 0x809a -/* 00029C 809A127C 0C00084C */ jal osSyncPrintf -/* 0002A0 809A1280 24841550 */ addiu $a0, %lo(D_809A1550) # addiu $a0, $a0, 0x1550 -/* 0002A4 809A1284 10000002 */ b .L809A1290 -/* 0002A8 809A1288 00001025 */ move $v0, $zero -.L809A128C: -/* 0002AC 809A128C 24020001 */ li $v0, 1 -.L809A1290: -/* 0002B0 809A1290 8FBF003C */ lw $ra, 0x3c($sp) -/* 0002B4 809A1294 D7B40018 */ ldc1 $f20, 0x18($sp) -/* 0002B8 809A1298 D7B60020 */ ldc1 $f22, 0x20($sp) -/* 0002BC 809A129C D7B80028 */ ldc1 $f24, 0x28($sp) -/* 0002C0 809A12A0 8FB00030 */ lw $s0, 0x30($sp) -/* 0002C4 809A12A4 8FB10034 */ lw $s1, 0x34($sp) -/* 0002C8 809A12A8 8FB20038 */ lw $s2, 0x38($sp) -/* 0002CC 809A12AC 03E00008 */ jr $ra -/* 0002D0 809A12B0 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Dd/func_809A12B4.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Dd/func_809A12B4.s deleted file mode 100644 index 1a6a2e5fcc..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Dd/func_809A12B4.s +++ /dev/null @@ -1,143 +0,0 @@ -.rdata -glabel D_809A157C - .asciz "../z_eff_ss_dead_dd.c" - .balign 4 - -glabel D_809A1594 - .asciz "../z_eff_ss_dead_dd.c" - .balign 4 - -.late_rodata -glabel D_809A15AC - .float 0.01 - -.text -glabel func_809A12B4 -/* 0002D4 809A12B4 27BDFEE0 */ addiu $sp, $sp, -0x120 -/* 0002D8 809A12B8 AFB00014 */ sw $s0, 0x14($sp) -/* 0002DC 809A12BC AFBF001C */ sw $ra, 0x1c($sp) -/* 0002E0 809A12C0 AFB10018 */ sw $s1, 0x18($sp) -/* 0002E4 809A12C4 AFA40120 */ sw $a0, 0x120($sp) -/* 0002E8 809A12C8 AFA50124 */ sw $a1, 0x124($sp) -/* 0002EC 809A12CC 8C910000 */ lw $s1, ($a0) -/* 0002F0 809A12D0 00C08025 */ move $s0, $a2 -/* 0002F4 809A12D4 3C06809A */ lui $a2, %hi(D_809A157C) # $a2, 0x809a -/* 0002F8 809A12D8 24C6157C */ addiu $a2, %lo(D_809A157C) # addiu $a2, $a2, 0x157c -/* 0002FC 809A12DC 27A40040 */ addiu $a0, $sp, 0x40 -/* 000300 809A12E0 240700D6 */ li $a3, 214 -/* 000304 809A12E4 0C031AB1 */ jal Graph_OpenDisps -/* 000308 809A12E8 02202825 */ move $a1, $s1 -/* 00030C 809A12EC 860F0040 */ lh $t7, 0x40($s0) -/* 000310 809A12F0 3C01809A */ lui $at, %hi(D_809A15AC) # $at, 0x809a -/* 000314 809A12F4 C42815AC */ lwc1 $f8, %lo(D_809A15AC)($at) -/* 000318 809A12F8 448F2000 */ mtc1 $t7, $f4 -/* 00031C 809A12FC 8E050000 */ lw $a1, ($s0) -/* 000320 809A1300 8E060004 */ lw $a2, 4($s0) -/* 000324 809A1304 468021A0 */ cvt.s.w $f6, $f4 -/* 000328 809A1308 8E070008 */ lw $a3, 8($s0) -/* 00032C 809A130C 27A400DC */ addiu $a0, $sp, 0xdc -/* 000330 809A1310 46083002 */ mul.s $f0, $f6, $f8 -/* 000334 809A1314 0C029E89 */ jal SkinMatrix_SetTranslate -/* 000338 809A1318 E7A00054 */ swc1 $f0, 0x54($sp) -/* 00033C 809A131C C7A00054 */ lwc1 $f0, 0x54($sp) -/* 000340 809A1320 27A4009C */ addiu $a0, $sp, 0x9c -/* 000344 809A1324 44050000 */ mfc1 $a1, $f0 -/* 000348 809A1328 44060000 */ mfc1 $a2, $f0 -/* 00034C 809A132C 44070000 */ mfc1 $a3, $f0 -/* 000350 809A1330 0C029DA9 */ jal SkinMatrix_SetScale -/* 000354 809A1334 00000000 */ nop -/* 000358 809A1338 27A400DC */ addiu $a0, $sp, 0xdc -/* 00035C 809A133C 27A5009C */ addiu $a1, $sp, 0x9c -/* 000360 809A1340 0C029BE8 */ jal SkinMatrix_MtxFMtxFMult -/* 000364 809A1344 27A6005C */ addiu $a2, $sp, 0x5c -/* 000368 809A1348 02202025 */ move $a0, $s1 -/* 00036C 809A134C 0C029F9C */ jal SkinMatrix_MtxFToNewMtx -/* 000370 809A1350 27A5005C */ addiu $a1, $sp, 0x5c -/* 000374 809A1354 1040004B */ beqz $v0, .L809A1484 -/* 000378 809A1358 02202025 */ move $a0, $s1 -/* 00037C 809A135C 0C0252F1 */ jal func_80094BC4 -/* 000380 809A1360 AFA20058 */ sw $v0, 0x58($sp) -/* 000384 809A1364 8E2202D0 */ lw $v0, 0x2d0($s1) -/* 000388 809A1368 8FA50058 */ lw $a1, 0x58($sp) -/* 00038C 809A136C 3C19FA00 */ lui $t9, 0xfa00 -/* 000390 809A1370 24580008 */ addiu $t8, $v0, 8 -/* 000394 809A1374 AE3802D0 */ sw $t8, 0x2d0($s1) -/* 000398 809A1378 AC590000 */ sw $t9, ($v0) -/* 00039C 809A137C 8608004A */ lh $t0, 0x4a($s0) -/* 0003A0 809A1380 860E0046 */ lh $t6, 0x46($s0) -/* 0003A4 809A1384 860B0044 */ lh $t3, 0x44($s0) -/* 0003A8 809A1388 310900FF */ andi $t1, $t0, 0xff -/* 0003AC 809A138C 86080048 */ lh $t0, 0x48($s0) -/* 0003B0 809A1390 31CF00FF */ andi $t7, $t6, 0xff -/* 0003B4 809A1394 000B6600 */ sll $t4, $t3, 0x18 -/* 0003B8 809A1398 012C6825 */ or $t5, $t1, $t4 -/* 0003BC 809A139C 000FC400 */ sll $t8, $t7, 0x10 -/* 0003C0 809A13A0 310A00FF */ andi $t2, $t0, 0xff -/* 0003C4 809A13A4 000A5A00 */ sll $t3, $t2, 8 -/* 0003C8 809A13A8 01B8C825 */ or $t9, $t5, $t8 -/* 0003CC 809A13AC 032B4825 */ or $t1, $t9, $t3 -/* 0003D0 809A13B0 AC490004 */ sw $t1, 4($v0) -/* 0003D4 809A13B4 8E2202D0 */ lw $v0, 0x2d0($s1) -/* 0003D8 809A13B8 3C0EFB00 */ lui $t6, 0xfb00 -/* 0003DC 809A13BC 244C0008 */ addiu $t4, $v0, 8 -/* 0003E0 809A13C0 AE2C02D0 */ sw $t4, 0x2d0($s1) -/* 0003E4 809A13C4 AC4E0000 */ sw $t6, ($v0) -/* 0003E8 809A13C8 860F004A */ lh $t7, 0x4a($s0) -/* 0003EC 809A13CC 860B004E */ lh $t3, 0x4e($s0) -/* 0003F0 809A13D0 8608004C */ lh $t0, 0x4c($s0) -/* 0003F4 809A13D4 31ED00FF */ andi $t5, $t7, 0xff -/* 0003F8 809A13D8 860F0050 */ lh $t7, 0x50($s0) -/* 0003FC 809A13DC 316900FF */ andi $t1, $t3, 0xff -/* 000400 809A13E0 00085600 */ sll $t2, $t0, 0x18 -/* 000404 809A13E4 01AAC825 */ or $t9, $t5, $t2 -/* 000408 809A13E8 00096400 */ sll $t4, $t1, 0x10 -/* 00040C 809A13EC 31F800FF */ andi $t8, $t7, 0xff -/* 000410 809A13F0 00184200 */ sll $t0, $t8, 8 -/* 000414 809A13F4 032C7025 */ or $t6, $t9, $t4 -/* 000418 809A13F8 01C86825 */ or $t5, $t6, $t0 -/* 00041C 809A13FC AC4D0004 */ sw $t5, 4($v0) -/* 000420 809A1400 8E2202D0 */ lw $v0, 0x2d0($s1) -/* 000424 809A1404 3C0BDA38 */ lui $t3, (0xDA380003 >> 16) # lui $t3, 0xda38 -/* 000428 809A1408 356B0003 */ ori $t3, (0xDA380003 & 0xFFFF) # ori $t3, $t3, 3 -/* 00042C 809A140C 244A0008 */ addiu $t2, $v0, 8 -/* 000430 809A1410 AE2A02D0 */ sw $t2, 0x2d0($s1) -/* 000434 809A1414 AC450004 */ sw $a1, 4($v0) -/* 000438 809A1418 AC4B0000 */ sw $t3, ($v0) -/* 00043C 809A141C 8E2202D0 */ lw $v0, 0x2d0($s1) -/* 000440 809A1420 3C0C0100 */ lui $t4, 0x100 -/* 000444 809A1424 3C19DA38 */ lui $t9, (0xDA380001 >> 16) # lui $t9, 0xda38 -/* 000448 809A1428 24490008 */ addiu $t1, $v0, 8 -/* 00044C 809A142C AE2902D0 */ sw $t1, 0x2d0($s1) -/* 000450 809A1430 37390001 */ ori $t9, (0xDA380001 & 0xFFFF) # ori $t9, $t9, 1 -/* 000454 809A1434 258C0000 */ addiu $t4, $t4, 0 -/* 000458 809A1438 AC4C0004 */ sw $t4, 4($v0) -/* 00045C 809A143C AC590000 */ sw $t9, ($v0) -/* 000460 809A1440 8E2202D0 */ lw $v0, 0x2d0($s1) -/* 000464 809A1444 3C0EFF2D */ lui $t6, (0xFF2DFEFF >> 16) # lui $t6, 0xff2d -/* 000468 809A1448 3C18FCFF */ lui $t8, (0xFCFF97FF >> 16) # lui $t8, 0xfcff -/* 00046C 809A144C 244F0008 */ addiu $t7, $v0, 8 -/* 000470 809A1450 AE2F02D0 */ sw $t7, 0x2d0($s1) -/* 000474 809A1454 371897FF */ ori $t8, (0xFCFF97FF & 0xFFFF) # ori $t8, $t8, 0x97ff -/* 000478 809A1458 35CEFEFF */ ori $t6, (0xFF2DFEFF & 0xFFFF) # ori $t6, $t6, 0xfeff -/* 00047C 809A145C AC4E0004 */ sw $t6, 4($v0) -/* 000480 809A1460 AC580000 */ sw $t8, ($v0) -/* 000484 809A1464 8E2202D0 */ lw $v0, 0x2d0($s1) -/* 000488 809A1468 3C0A0403 */ lui $t2, %hi(D_04037730) # $t2, 0x403 -/* 00048C 809A146C 254A7730 */ addiu $t2, %lo(D_04037730) # addiu $t2, $t2, 0x7730 -/* 000490 809A1470 24480008 */ addiu $t0, $v0, 8 -/* 000494 809A1474 AE2802D0 */ sw $t0, 0x2d0($s1) -/* 000498 809A1478 3C0DDE00 */ lui $t5, 0xde00 -/* 00049C 809A147C AC4D0000 */ sw $t5, ($v0) -/* 0004A0 809A1480 AC4A0004 */ sw $t2, 4($v0) -.L809A1484: -/* 0004A4 809A1484 3C06809A */ lui $a2, %hi(D_809A1594) # $a2, 0x809a -/* 0004A8 809A1488 24C61594 */ addiu $a2, %lo(D_809A1594) # addiu $a2, $a2, 0x1594 -/* 0004AC 809A148C 27A40040 */ addiu $a0, $sp, 0x40 -/* 0004B0 809A1490 02202825 */ move $a1, $s1 -/* 0004B4 809A1494 0C031AD5 */ jal Graph_CloseDisps -/* 0004B8 809A1498 24070103 */ li $a3, 259 -/* 0004BC 809A149C 8FBF001C */ lw $ra, 0x1c($sp) -/* 0004C0 809A14A0 8FB00014 */ lw $s0, 0x14($sp) -/* 0004C4 809A14A4 8FB10018 */ lw $s1, 0x18($sp) -/* 0004C8 809A14A8 03E00008 */ jr $ra -/* 0004CC 809A14AC 27BD0120 */ addiu $sp, $sp, 0x120 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Dd/func_809A14B0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Dd/func_809A14B0.s deleted file mode 100644 index ffd9f2202a..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Dd/func_809A14B0.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_809A14B0 -/* 0004D0 809A14B0 AFA40000 */ sw $a0, ($sp) -/* 0004D4 809A14B4 AFA50004 */ sw $a1, 4($sp) -/* 0004D8 809A14B8 84CE0040 */ lh $t6, 0x40($a2) -/* 0004DC 809A14BC 84CF0052 */ lh $t7, 0x52($a2) -/* 0004E0 809A14C0 01CFC021 */ addu $t8, $t6, $t7 -/* 0004E4 809A14C4 A4D80040 */ sh $t8, 0x40($a2) -/* 0004E8 809A14C8 84D90040 */ lh $t9, 0x40($a2) -/* 0004EC 809A14CC 07230003 */ bgezl $t9, .L809A14DC -/* 0004F0 809A14D0 84C80056 */ lh $t0, 0x56($a2) -/* 0004F4 809A14D4 A4C00040 */ sh $zero, 0x40($a2) -/* 0004F8 809A14D8 84C80056 */ lh $t0, 0x56($a2) -.L809A14DC: -/* 0004FC 809A14DC 5100000D */ beql $t0, $zero, .L809A1514 -/* 000500 809A14E0 84C2004A */ lh $v0, 0x4a($a2) -/* 000504 809A14E4 84C9004A */ lh $t1, 0x4a($a2) -/* 000508 809A14E8 84CA0054 */ lh $t2, 0x54($a2) -/* 00050C 809A14EC 240D00FF */ li $t5, 255 -/* 000510 809A14F0 012A5821 */ addu $t3, $t1, $t2 -/* 000514 809A14F4 A4CB004A */ sh $t3, 0x4a($a2) -/* 000518 809A14F8 84CC004A */ lh $t4, 0x4a($a2) -/* 00051C 809A14FC 29810100 */ slti $at, $t4, 0x100 -/* 000520 809A1500 1420000B */ bnez $at, .L809A1530 -/* 000524 809A1504 00000000 */ nop -/* 000528 809A1508 03E00008 */ jr $ra -/* 00052C 809A150C A4CD004A */ sh $t5, 0x4a($a2) -/* 000530 809A1510 84C2004A */ lh $v0, 0x4a($a2) -.L809A1514: -/* 000534 809A1514 84C30054 */ lh $v1, 0x54($a2) -/* 000538 809A1518 0043082A */ slt $at, $v0, $v1 -/* 00053C 809A151C 10200003 */ beqz $at, .L809A152C -/* 000540 809A1520 00437023 */ subu $t6, $v0, $v1 -/* 000544 809A1524 03E00008 */ jr $ra -/* 000548 809A1528 A4C0004A */ sh $zero, 0x4a($a2) -.L809A152C: -/* 00054C 809A152C A4CE004A */ sh $t6, 0x4a($a2) -.L809A1530: -/* 000550 809A1530 03E00008 */ jr $ra -/* 000554 809A1534 00000000 */ nop -/* 000558 809A1538 00000000 */ nop -/* 00055C 809A153C 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/EffectSsDeadDs_Init.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/EffectSsDeadDs_Init.s deleted file mode 100644 index 4edd2f7a95..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/EffectSsDeadDs_Init.s +++ /dev/null @@ -1,61 +0,0 @@ -glabel EffectSsDeadDs_Init -/* 00000 809A1610 AFA40000 */ sw $a0, 0x0000($sp) -/* 00004 809A1614 AFA50004 */ sw $a1, 0x0004($sp) -/* 00008 809A1618 8CEF0000 */ lw $t7, 0x0000($a3) ## 00000000 -/* 0000C 809A161C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00010 809A1620 ACCF0000 */ sw $t7, 0x0000($a2) ## 00000000 -/* 00014 809A1624 8CEE0004 */ lw $t6, 0x0004($a3) ## 00000004 -/* 00018 809A1628 ACCE0004 */ sw $t6, 0x0004($a2) ## 00000004 -/* 0001C 809A162C 8CEF0008 */ lw $t7, 0x0008($a3) ## 00000008 -/* 00020 809A1630 ACCF0008 */ sw $t7, 0x0008($a2) ## 00000008 -/* 00024 809A1634 8CF9000C */ lw $t9, 0x000C($a3) ## 0000000C -/* 00028 809A1638 ACD9000C */ sw $t9, 0x000C($a2) ## 0000000C -/* 0002C 809A163C 8CF80010 */ lw $t8, 0x0010($a3) ## 00000010 -/* 00030 809A1640 ACD80010 */ sw $t8, 0x0010($a2) ## 00000010 -/* 00034 809A1644 8CF90014 */ lw $t9, 0x0014($a3) ## 00000014 -/* 00038 809A1648 ACD90014 */ sw $t9, 0x0014($a2) ## 00000014 -/* 0003C 809A164C 8CE90018 */ lw $t1, 0x0018($a3) ## 00000018 -/* 00040 809A1650 3C19809A */ lui $t9, %hi(func_809A16F4) ## $t9 = 809A0000 -/* 00044 809A1654 273916F4 */ addiu $t9, $t9, %lo(func_809A16F4) ## $t9 = 809A16F4 -/* 00048 809A1658 ACC90018 */ sw $t1, 0x0018($a2) ## 00000018 -/* 0004C 809A165C 8CE8001C */ lw $t0, 0x001C($a3) ## 0000001C -/* 00050 809A1660 ACC8001C */ sw $t0, 0x001C($a2) ## 0000001C -/* 00054 809A1664 8CE90020 */ lw $t1, 0x0020($a3) ## 00000020 -/* 00058 809A1668 3C08809A */ lui $t0, %hi(func_809A1A08) ## $t0 = 809A0000 -/* 0005C 809A166C 25081A08 */ addiu $t0, $t0, %lo(func_809A1A08) ## $t0 = 809A1A08 -/* 00060 809A1670 ACC90020 */ sw $t1, 0x0020($a2) ## 00000020 -/* 00064 809A1674 8CEA002C */ lw $t2, 0x002C($a3) ## 0000002C -/* 00068 809A1678 A4CA005C */ sh $t2, 0x005C($a2) ## 0000005C -/* 0006C 809A167C 84EB0026 */ lh $t3, 0x0026($a3) ## 00000026 -/* 00070 809A1680 A4CB0052 */ sh $t3, 0x0052($a2) ## 00000052 -/* 00074 809A1684 8CEC002C */ lw $t4, 0x002C($a3) ## 0000002C -/* 00078 809A1688 05810003 */ bgez $t4, .L809A1698 -/* 0007C 809A168C 000C6843 */ sra $t5, $t4, 1 -/* 00080 809A1690 25810001 */ addiu $at, $t4, 0x0001 ## $at = 00000001 -/* 00084 809A1694 00016843 */ sra $t5, $at, 1 -.L809A1698: -/* 00088 809A1698 A4CD0056 */ sh $t5, 0x0056($a2) ## 00000056 -/* 0008C 809A169C 84EE0028 */ lh $t6, 0x0028($a3) ## 00000028 -/* 00090 809A16A0 84CF0056 */ lh $t7, 0x0056($a2) ## 00000056 -/* 00094 809A16A4 ACD90028 */ sw $t9, 0x0028($a2) ## 00000028 -/* 00098 809A16A8 ACC80024 */ sw $t0, 0x0024($a2) ## 00000024 -/* 0009C 809A16AC 01CF001A */ div $zero, $t6, $t7 -/* 000A0 809A16B0 0000C012 */ mflo $t8 -/* 000A4 809A16B4 A4D80054 */ sh $t8, 0x0054($a2) ## 00000054 -/* 000A8 809A16B8 84E90024 */ lh $t1, 0x0024($a3) ## 00000024 -/* 000AC 809A16BC 15E00002 */ bne $t7, $zero, .L809A16C8 -/* 000B0 809A16C0 00000000 */ nop -/* 000B4 809A16C4 0007000D */ break 7 ## 0x01C00 -.L809A16C8: -/* 000B8 809A16C8 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 000BC 809A16CC 15E10004 */ bne $t7, $at, .L809A16E0 -/* 000C0 809A16D0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 000C4 809A16D4 15C10002 */ bne $t6, $at, .L809A16E0 -/* 000C8 809A16D8 00000000 */ nop -/* 000CC 809A16DC 0006000D */ break 6 ## 0x01800 -.L809A16E0: -/* 000D0 809A16E0 A4C90040 */ sh $t1, 0x0040($a2) ## 00000040 -/* 000D4 809A16E4 84EA0028 */ lh $t2, 0x0028($a3) ## 00000028 -/* 000D8 809A16E8 A4C00042 */ sh $zero, 0x0042($a2) ## 00000042 -/* 000DC 809A16EC 03E00008 */ jr $ra -/* 000E0 809A16F0 A4CA004A */ sh $t2, 0x004A($a2) ## 0000004A diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/func_809A16F4.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/func_809A16F4.s deleted file mode 100644 index fefd377be7..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/func_809A16F4.s +++ /dev/null @@ -1,223 +0,0 @@ -.rdata -glabel D_809A1A80 - .asciz "../z_eff_ss_dead_ds.c" - .balign 4 - -glabel D_809A1A98 - .asciz "../z_eff_ss_dead_ds.c" - .balign 4 - -glabel D_809A1AB0 - .asciz "../z_eff_ss_dead_ds.c" - .balign 4 - -.late_rodata -glabel D_809A1AC8 - .float 0.01 - -glabel D_809A1ACC - .float 1.57 - -.text -glabel func_809A16F4 -/* 000E4 809A16F4 27BDFF28 */ addiu $sp, $sp, 0xFF28 ## $sp = FFFFFF28 -/* 000E8 809A16F8 AFB00024 */ sw $s0, 0x0024($sp) -/* 000EC 809A16FC AFBF002C */ sw $ra, 0x002C($sp) -/* 000F0 809A1700 AFB10028 */ sw $s1, 0x0028($sp) -/* 000F4 809A1704 AFA400D8 */ sw $a0, 0x00D8($sp) -/* 000F8 809A1708 AFA500DC */ sw $a1, 0x00DC($sp) -/* 000FC 809A170C 8C850000 */ lw $a1, 0x0000($a0) ## 00000000 -/* 00100 809A1710 00C08025 */ or $s0, $a2, $zero ## $s0 = 00000000 -/* 00104 809A1714 3C06809A */ lui $a2, %hi(D_809A1A80) ## $a2 = 809A0000 -/* 00108 809A1718 24C61A80 */ addiu $a2, $a2, %lo(D_809A1A80) ## $a2 = 809A1A80 -/* 0010C 809A171C 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFF88 -/* 00110 809A1720 2407009D */ addiu $a3, $zero, 0x009D ## $a3 = 0000009D -/* 00114 809A1724 0C031AB1 */ jal Graph_OpenDisps -/* 00118 809A1728 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 0011C 809A172C 860F0040 */ lh $t7, 0x0040($s0) ## 00000040 -/* 00120 809A1730 3C01809A */ lui $at, %hi(D_809A1AC8) ## $at = 809A0000 -/* 00124 809A1734 C4281AC8 */ lwc1 $f8, %lo(D_809A1AC8)($at) -/* 00128 809A1738 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 0012C 809A173C 8FB800D8 */ lw $t8, 0x00D8($sp) -/* 00130 809A1740 468021A0 */ cvt.s.w $f6, $f4 -/* 00134 809A1744 46083282 */ mul.s $f10, $f6, $f8 -/* 00138 809A1748 E7AA00D0 */ swc1 $f10, 0x00D0($sp) -/* 0013C 809A174C 0C0252F1 */ jal func_80094BC4 -/* 00140 809A1750 8F040000 */ lw $a0, 0x0000($t8) ## 00000000 -/* 00144 809A1754 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 00148 809A1758 3C08FA00 */ lui $t0, 0xFA00 ## $t0 = FA000000 -/* 0014C 809A175C 3C0CFB00 */ lui $t4, 0xFB00 ## $t4 = FB000000 -/* 00150 809A1760 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 00154 809A1764 AE3902D0 */ sw $t9, 0x02D0($s1) ## 000002D0 -/* 00158 809A1768 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 -/* 0015C 809A176C 8609004A */ lh $t1, 0x004A($s0) ## 0000004A -/* 00160 809A1770 27A60078 */ addiu $a2, $sp, 0x0078 ## $a2 = FFFFFFA0 -/* 00164 809A1774 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00168 809A1778 312A00FF */ andi $t2, $t1, 0x00FF ## $t2 = 00000000 -/* 0016C 809A177C AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 -/* 00170 809A1780 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 00174 809A1784 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 00178 809A1788 AE2B02D0 */ sw $t3, 0x02D0($s1) ## 000002D0 -/* 0017C 809A178C AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 00180 809A1790 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 00184 809A1794 8E0E0000 */ lw $t6, 0x0000($s0) ## 00000000 -/* 00188 809A1798 ACCE0000 */ sw $t6, 0x0000($a2) ## FFFFFFA0 -/* 0018C 809A179C 8E0D0004 */ lw $t5, 0x0004($s0) ## 00000004 -/* 00190 809A17A0 ACCD0004 */ sw $t5, 0x0004($a2) ## FFFFFFA4 -/* 00194 809A17A4 8E0E0008 */ lw $t6, 0x0008($s0) ## 00000008 -/* 00198 809A17A8 ACCE0008 */ sw $t6, 0x0008($a2) ## FFFFFFA8 -/* 0019C 809A17AC 860F0042 */ lh $t7, 0x0042($s0) ## 00000042 -/* 001A0 809A17B0 C7B00078 */ lwc1 $f16, 0x0078($sp) -/* 001A4 809A17B4 55E00057 */ bnel $t7, $zero, .L809A1914 -/* 001A8 809A17B8 C60C0000 */ lwc1 $f12, 0x0000($s0) ## 00000000 -/* 001AC 809A17BC C612000C */ lwc1 $f18, 0x000C($s0) ## 0000000C -/* 001B0 809A17C0 C7A6007C */ lwc1 $f6, 0x007C($sp) -/* 001B4 809A17C4 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 001B8 809A17C8 46128101 */ sub.s $f4, $f16, $f18 -/* 001BC 809A17CC C7B00080 */ lwc1 $f16, 0x0080($sp) -/* 001C0 809A17D0 8FA400D8 */ lw $a0, 0x00D8($sp) -/* 001C4 809A17D4 27B80074 */ addiu $t8, $sp, 0x0074 ## $t8 = FFFFFF9C -/* 001C8 809A17D8 E7A40044 */ swc1 $f4, 0x0044($sp) -/* 001CC 809A17DC C6080010 */ lwc1 $f8, 0x0010($s0) ## 00000010 -/* 001D0 809A17E0 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 -/* 001D4 809A17E4 27A70044 */ addiu $a3, $sp, 0x0044 ## $a3 = FFFFFF6C -/* 001D8 809A17E8 46083281 */ sub.s $f10, $f6, $f8 -/* 001DC 809A17EC 44813000 */ mtc1 $at, $f6 ## $f6 = 1.50 -/* 001E0 809A17F0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 001E4 809A17F4 44814000 */ mtc1 $at, $f8 ## $f8 = 1.00 -/* 001E8 809A17F8 E7AA0048 */ swc1 $f10, 0x0048($sp) -/* 001EC 809A17FC C6120014 */ lwc1 $f18, 0x0014($s0) ## 00000014 -/* 001F0 809A1800 AFA40034 */ sw $a0, 0x0034($sp) -/* 001F4 809A1804 AFB80014 */ sw $t8, 0x0014($sp) -/* 001F8 809A1808 46128101 */ sub.s $f4, $f16, $f18 -/* 001FC 809A180C E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00200 809A1810 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00204 809A1814 0C00F519 */ jal func_8003D464 -/* 00208 809A1818 E7A4004C */ swc1 $f4, 0x004C($sp) -/* 0020C 809A181C 1040000C */ beq $v0, $zero, .L809A1850 -/* 00210 809A1820 8FA40034 */ lw $a0, 0x0034($sp) -/* 00214 809A1824 8E050000 */ lw $a1, 0x0000($s0) ## 00000000 -/* 00218 809A1828 8E060004 */ lw $a2, 0x0004($s0) ## 00000004 -/* 0021C 809A182C 8E070008 */ lw $a3, 0x0008($s0) ## 00000008 -/* 00220 809A1830 27B90088 */ addiu $t9, $sp, 0x0088 ## $t9 = FFFFFFB0 -/* 00224 809A1834 AFB90010 */ sw $t9, 0x0010($sp) -/* 00228 809A1838 0C00E28A */ jal func_80038A28 -/* 0022C 809A183C 8FA40074 */ lw $a0, 0x0074($sp) -/* 00230 809A1840 0C03423F */ jal Matrix_Put -/* 00234 809A1844 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFB0 -/* 00238 809A1848 10000023 */ beq $zero, $zero, .L809A18D8 -/* 0023C 809A184C 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFB0 -.L809A1850: -/* 00240 809A1850 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00244 809A1854 44818000 */ mtc1 $at, $f16 ## $f16 = 1.00 -/* 00248 809A1858 C7AA007C */ lwc1 $f10, 0x007C($sp) -/* 0024C 809A185C 27A50074 */ addiu $a1, $sp, 0x0074 ## $a1 = FFFFFF9C -/* 00250 809A1860 27A60078 */ addiu $a2, $sp, 0x0078 ## $a2 = FFFFFFA0 -/* 00254 809A1864 46105480 */ add.s $f18, $f10, $f16 -/* 00258 809A1868 0C00F224 */ jal func_8003C890 -/* 0025C 809A186C E7B2007C */ swc1 $f18, 0x007C($sp) -/* 00260 809A1870 8FA80074 */ lw $t0, 0x0074($sp) -/* 00264 809A1874 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 00268 809A1878 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0026C 809A187C 51000010 */ beql $t0, $zero, .L809A18C0 -/* 00270 809A1880 C60C0000 */ lwc1 $f12, 0x0000($s0) ## 00000000 -/* 00274 809A1884 44812000 */ mtc1 $at, $f4 ## $f4 = 1.50 -/* 00278 809A1888 8E050000 */ lw $a1, 0x0000($s0) ## 00000000 -/* 0027C 809A188C 8E070008 */ lw $a3, 0x0008($s0) ## 00000008 -/* 00280 809A1890 46040180 */ add.s $f6, $f0, $f4 -/* 00284 809A1894 27A90088 */ addiu $t1, $sp, 0x0088 ## $t1 = FFFFFFB0 -/* 00288 809A1898 AFA90010 */ sw $t1, 0x0010($sp) -/* 0028C 809A189C 01002025 */ or $a0, $t0, $zero ## $a0 = 00000000 -/* 00290 809A18A0 44063000 */ mfc1 $a2, $f6 -/* 00294 809A18A4 0C00E28A */ jal func_80038A28 -/* 00298 809A18A8 00000000 */ nop -/* 0029C 809A18AC 0C03423F */ jal Matrix_Put -/* 002A0 809A18B0 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFB0 -/* 002A4 809A18B4 10000008 */ beq $zero, $zero, .L809A18D8 -/* 002A8 809A18B8 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFB0 -/* 002AC 809A18BC C60C0000 */ lwc1 $f12, 0x0000($s0) ## 00000000 -.L809A18C0: -/* 002B0 809A18C0 C60E0004 */ lwc1 $f14, 0x0004($s0) ## 00000004 -/* 002B4 809A18C4 0C034261 */ jal Matrix_Translate -/* 002B8 809A18C8 8E060008 */ lw $a2, 0x0008($s0) ## 00000008 -/* 002BC 809A18CC 0C034236 */ jal Matrix_Get -/* 002C0 809A18D0 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFB0 -/* 002C4 809A18D4 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFB0 -.L809A18D8: -/* 002C8 809A18D8 27A50050 */ addiu $a1, $sp, 0x0050 ## $a1 = FFFFFF78 -/* 002CC 809A18DC 0C034899 */ jal func_800D2264 -/* 002D0 809A18E0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 002D4 809A18E4 87AA0050 */ lh $t2, 0x0050($sp) -/* 002D8 809A18E8 860D0042 */ lh $t5, 0x0042($s0) ## 00000042 -/* 002DC 809A18EC A60A0044 */ sh $t2, 0x0044($s0) ## 00000044 -/* 002E0 809A18F0 87AB0052 */ lh $t3, 0x0052($sp) -/* 002E4 809A18F4 25AE0001 */ addiu $t6, $t5, 0x0001 ## $t6 = 00000001 -/* 002E8 809A18F8 A60B0046 */ sh $t3, 0x0046($s0) ## 00000046 -/* 002EC 809A18FC 87AC0054 */ lh $t4, 0x0054($sp) -/* 002F0 809A1900 A60C0048 */ sh $t4, 0x0048($s0) ## 00000048 -/* 002F4 809A1904 C7A800BC */ lwc1 $f8, 0x00BC($sp) -/* 002F8 809A1908 A60E0042 */ sh $t6, 0x0042($s0) ## 00000042 -/* 002FC 809A190C E6080004 */ swc1 $f8, 0x0004($s0) ## 00000004 -/* 00300 809A1910 C60C0000 */ lwc1 $f12, 0x0000($s0) ## 00000000 -.L809A1914: -/* 00304 809A1914 C60E0004 */ lwc1 $f14, 0x0004($s0) ## 00000004 -/* 00308 809A1918 8E060008 */ lw $a2, 0x0008($s0) ## 00000008 -/* 0030C 809A191C 0C034261 */ jal Matrix_Translate -/* 00310 809A1920 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00314 809A1924 86040044 */ lh $a0, 0x0044($s0) ## 00000044 -/* 00318 809A1928 86050046 */ lh $a1, 0x0046($s0) ## 00000046 -/* 0031C 809A192C 86060048 */ lh $a2, 0x0048($s0) ## 00000048 -/* 00320 809A1930 0C034421 */ jal Matrix_RotateRPY -/* 00324 809A1934 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00328 809A1938 3C01809A */ lui $at, %hi(D_809A1ACC) ## $at = 809A0000 -/* 0032C 809A193C C42C1ACC */ lwc1 $f12, %lo(D_809A1ACC)($at) -/* 00330 809A1940 0C0342DC */ jal Matrix_RotateX -/* 00334 809A1944 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00338 809A1948 C7AC00D0 */ lwc1 $f12, 0x00D0($sp) -/* 0033C 809A194C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00340 809A1950 44066000 */ mfc1 $a2, $f12 -/* 00344 809A1954 0C0342A3 */ jal Matrix_Scale -/* 00348 809A1958 46006386 */ mov.s $f14, $f12 -/* 0034C 809A195C 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 00350 809A1960 3C18DA38 */ lui $t8, 0xDA38 ## $t8 = DA380000 -/* 00354 809A1964 37180003 */ ori $t8, $t8, 0x0003 ## $t8 = DA380003 -/* 00358 809A1968 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 0035C 809A196C AE2F02D0 */ sw $t7, 0x02D0($s1) ## 000002D0 -/* 00360 809A1970 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 00364 809A1974 8FB900D8 */ lw $t9, 0x00D8($sp) -/* 00368 809A1978 3C05809A */ lui $a1, %hi(D_809A1A98) ## $a1 = 809A0000 -/* 0036C 809A197C 24A51A98 */ addiu $a1, $a1, %lo(D_809A1A98) ## $a1 = 809A1A98 -/* 00370 809A1980 240600F6 */ addiu $a2, $zero, 0x00F6 ## $a2 = 000000F6 -/* 00374 809A1984 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 00378 809A1988 0C0346A2 */ jal Matrix_NewMtx -/* 0037C 809A198C 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 -/* 00380 809A1990 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 -/* 00384 809A1994 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 00388 809A1998 3C09FCFF */ lui $t1, 0xFCFF ## $t1 = FCFF0000 -/* 0038C 809A199C 3C0AFF2D */ lui $t2, 0xFF2D ## $t2 = FF2D0000 -/* 00390 809A19A0 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 -/* 00394 809A19A4 AE2802D0 */ sw $t0, 0x02D0($s1) ## 000002D0 -/* 00398 809A19A8 354AFEFF */ ori $t2, $t2, 0xFEFF ## $t2 = FF2DFEFF -/* 0039C 809A19AC 352997FF */ ori $t1, $t1, 0x97FF ## $t1 = FCFF97FF -/* 003A0 809A19B0 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 003A4 809A19B4 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 -/* 003A8 809A19B8 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 003AC 809A19BC 3C0D0403 */ lui $t5, 0x0403 ## $t5 = 04030000 -/* 003B0 809A19C0 25AD7730 */ addiu $t5, $t5, 0x7730 ## $t5 = 04037730 -/* 003B4 809A19C4 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 003B8 809A19C8 AE2B02D0 */ sw $t3, 0x02D0($s1) ## 000002D0 -/* 003BC 809A19CC 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 -/* 003C0 809A19D0 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 003C4 809A19D4 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 003C8 809A19D8 8FAE00D8 */ lw $t6, 0x00D8($sp) -/* 003CC 809A19DC 3C06809A */ lui $a2, %hi(D_809A1AB0) ## $a2 = 809A0000 -/* 003D0 809A19E0 24C61AB0 */ addiu $a2, $a2, %lo(D_809A1AB0) ## $a2 = 809A1AB0 -/* 003D4 809A19E4 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFF88 -/* 003D8 809A19E8 240700FF */ addiu $a3, $zero, 0x00FF ## $a3 = 000000FF -/* 003DC 809A19EC 0C031AD5 */ jal Graph_CloseDisps -/* 003E0 809A19F0 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 003E4 809A19F4 8FBF002C */ lw $ra, 0x002C($sp) -/* 003E8 809A19F8 8FB00024 */ lw $s0, 0x0024($sp) -/* 003EC 809A19FC 8FB10028 */ lw $s1, 0x0028($sp) -/* 003F0 809A1A00 03E00008 */ jr $ra -/* 003F4 809A1A04 27BD00D8 */ addiu $sp, $sp, 0x00D8 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/func_809A1A08.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/func_809A1A08.s deleted file mode 100644 index bef0677e32..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/func_809A1A08.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_809A1A08 -/* 003F8 809A1A08 AFA40000 */ sw $a0, 0x0000($sp) -/* 003FC 809A1A0C AFA50004 */ sw $a1, 0x0004($sp) -/* 00400 809A1A10 84CF0056 */ lh $t7, 0x0056($a2) ## 00000056 -/* 00404 809A1A14 84CE005C */ lh $t6, 0x005C($a2) ## 0000005C -/* 00408 809A1A18 01CF082A */ slt $at, $t6, $t7 -/* 0040C 809A1A1C 10200011 */ beq $at, $zero, .L809A1A64 -/* 00410 809A1A20 00000000 */ nop -/* 00414 809A1A24 84D80040 */ lh $t8, 0x0040($a2) ## 00000040 -/* 00418 809A1A28 84D90052 */ lh $t9, 0x0052($a2) ## 00000052 -/* 0041C 809A1A2C 03194021 */ addu $t0, $t8, $t9 -/* 00420 809A1A30 A4C80040 */ sh $t0, 0x0040($a2) ## 00000040 -/* 00424 809A1A34 84C90040 */ lh $t1, 0x0040($a2) ## 00000040 -/* 00428 809A1A38 05230003 */ bgezl $t1, .L809A1A48 -/* 0042C 809A1A3C 84CA004A */ lh $t2, 0x004A($a2) ## 0000004A -/* 00430 809A1A40 A4C00040 */ sh $zero, 0x0040($a2) ## 00000040 -/* 00434 809A1A44 84CA004A */ lh $t2, 0x004A($a2) ## 0000004A -.L809A1A48: -/* 00438 809A1A48 84CB0054 */ lh $t3, 0x0054($a2) ## 00000054 -/* 0043C 809A1A4C 014B6023 */ subu $t4, $t2, $t3 -/* 00440 809A1A50 A4CC004A */ sh $t4, 0x004A($a2) ## 0000004A -/* 00444 809A1A54 84CD004A */ lh $t5, 0x004A($a2) ## 0000004A -/* 00448 809A1A58 05A10002 */ bgez $t5, .L809A1A64 -/* 0044C 809A1A5C 00000000 */ nop -/* 00450 809A1A60 A4C0004A */ sh $zero, 0x004A($a2) ## 0000004A -.L809A1A64: -/* 00454 809A1A64 03E00008 */ jr $ra -/* 00458 809A1A68 00000000 */ nop -/* 0045C 809A1A6C 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/EffectSsDtBubble_Init.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/EffectSsDtBubble_Init.s deleted file mode 100644 index b9d29d5486..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/EffectSsDtBubble_Init.s +++ /dev/null @@ -1,157 +0,0 @@ -glabel EffectSsDtBubble_Init -/* 00000 809A1CB0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00004 809A1CB4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00008 809A1CB8 AFA40028 */ sw $a0, 0x0028($sp) -/* 0000C 809A1CBC AFA5002C */ sw $a1, 0x002C($sp) -/* 00010 809A1CC0 AFA60030 */ sw $a2, 0x0030($sp) -/* 00014 809A1CC4 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00018 809A1CC8 AFA70034 */ sw $a3, 0x0034($sp) -/* 0001C 809A1CCC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00020 809A1CD0 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 00024 809A1CD4 3C030405 */ lui $v1, 0x0405 ## $v1 = 04050000 -/* 00028 809A1CD8 24635EB0 */ addiu $v1, $v1, 0x5EB0 ## $v1 = 04055EB0 -/* 0002C 809A1CDC 4604003C */ c.lt.s $f0, $f4 -/* 00030 809A1CE0 8FA60030 */ lw $a2, 0x0030($sp) -/* 00034 809A1CE4 8FA70034 */ lw $a3, 0x0034($sp) -/* 00038 809A1CE8 45000004 */ bc1f .L809A1CFC -/* 0003C 809A1CEC 00000000 */ nop -/* 00040 809A1CF0 3C030405 */ lui $v1, 0x0405 ## $v1 = 04050000 -/* 00044 809A1CF4 10000001 */ beq $zero, $zero, .L809A1CFC -/* 00048 809A1CF8 24635DB0 */ addiu $v1, $v1, 0x5DB0 ## $v1 = 04055DB0 -.L809A1CFC: -/* 0004C 809A1CFC AFA3001C */ sw $v1, 0x001C($sp) -/* 00050 809A1D00 AFA60030 */ sw $a2, 0x0030($sp) -/* 00054 809A1D04 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00058 809A1D08 AFA70034 */ sw $a3, 0x0034($sp) -/* 0005C 809A1D0C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00060 809A1D10 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 -/* 00064 809A1D14 8FA3001C */ lw $v1, 0x001C($sp) -/* 00068 809A1D18 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 0006C 809A1D1C 4606003C */ c.lt.s $f0, $f6 -/* 00070 809A1D20 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00074 809A1D24 8FA60030 */ lw $a2, 0x0030($sp) -/* 00078 809A1D28 8FA70034 */ lw $a3, 0x0034($sp) -/* 0007C 809A1D2C 45000004 */ bc1f .L809A1D40 -/* 00080 809A1D30 00037900 */ sll $t7, $v1, 4 -/* 00084 809A1D34 3C020405 */ lui $v0, 0x0405 ## $v0 = 04050000 -/* 00088 809A1D38 10000003 */ beq $zero, $zero, .L809A1D48 -/* 0008C 809A1D3C 24425DB0 */ addiu $v0, $v0, 0x5DB0 ## $v0 = 04055DB0 -.L809A1D40: -/* 00090 809A1D40 3C020405 */ lui $v0, 0x0405 ## $v0 = 04050000 -/* 00094 809A1D44 24425EB0 */ addiu $v0, $v0, 0x5EB0 ## $v0 = 04055EB0 -.L809A1D48: -/* 00098 809A1D48 000FC702 */ srl $t8, $t7, 28 -/* 0009C 809A1D4C 0018C880 */ sll $t9, $t8, 2 -/* 000A0 809A1D50 3C088016 */ lui $t0, %hi(gSegments) -/* 000A4 809A1D54 01194021 */ addu $t0, $t0, $t9 -/* 000A8 809A1D58 8D086FA8 */ lw $t0, %lo(gSegments)($t0) -/* 000AC 809A1D5C 00417024 */ and $t6, $v0, $at -/* 000B0 809A1D60 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 000B4 809A1D64 01C84821 */ addu $t1, $t6, $t0 -/* 000B8 809A1D68 01215021 */ addu $t2, $t1, $at -/* 000BC 809A1D6C ACCA0038 */ sw $t2, 0x0038($a2) ## 00000038 -/* 000C0 809A1D70 8CEC0000 */ lw $t4, 0x0000($a3) ## 00000000 -/* 000C4 809A1D74 ACCC0000 */ sw $t4, 0x0000($a2) ## 00000000 -/* 000C8 809A1D78 8CEB0004 */ lw $t3, 0x0004($a3) ## 00000004 -/* 000CC 809A1D7C ACCB0004 */ sw $t3, 0x0004($a2) ## 00000004 -/* 000D0 809A1D80 8CEC0008 */ lw $t4, 0x0008($a3) ## 00000008 -/* 000D4 809A1D84 ACCC0008 */ sw $t4, 0x0008($a2) ## 00000008 -/* 000D8 809A1D88 8CEF000C */ lw $t7, 0x000C($a3) ## 0000000C -/* 000DC 809A1D8C ACCF000C */ sw $t7, 0x000C($a2) ## 0000000C -/* 000E0 809A1D90 8CED0010 */ lw $t5, 0x0010($a3) ## 00000010 -/* 000E4 809A1D94 ACCD0010 */ sw $t5, 0x0010($a2) ## 00000010 -/* 000E8 809A1D98 8CEF0014 */ lw $t7, 0x0014($a3) ## 00000014 -/* 000EC 809A1D9C ACCF0014 */ sw $t7, 0x0014($a2) ## 00000014 -/* 000F0 809A1DA0 8CF90018 */ lw $t9, 0x0018($a3) ## 00000018 -/* 000F4 809A1DA4 ACD90018 */ sw $t9, 0x0018($a2) ## 00000018 -/* 000F8 809A1DA8 8CF8001C */ lw $t8, 0x001C($a3) ## 0000001C -/* 000FC 809A1DAC ACD8001C */ sw $t8, 0x001C($a2) ## 0000001C -/* 00100 809A1DB0 8CF90020 */ lw $t9, 0x0020($a3) ## 00000020 -/* 00104 809A1DB4 ACD90020 */ sw $t9, 0x0020($a2) ## 00000020 -/* 00108 809A1DB8 84EE002E */ lh $t6, 0x002E($a3) ## 0000002E -/* 0010C 809A1DBC A4CE005C */ sh $t6, 0x005C($a2) ## 0000005C -/* 00110 809A1DC0 90E80034 */ lbu $t0, 0x0034($a3) ## 00000034 -/* 00114 809A1DC4 5500002F */ bnel $t0, $zero, .L809A1E84 -/* 00118 809A1DC8 90EB0024 */ lbu $t3, 0x0024($a3) ## 00000024 -/* 0011C 809A1DCC 84E90030 */ lh $t1, 0x0030($a3) ## 00000030 -/* 00120 809A1DD0 3C02809A */ lui $v0, %hi(D_809A2200) ## $v0 = 809A0000 -/* 00124 809A1DD4 24422200 */ addiu $v0, $v0, %lo(D_809A2200) ## $v0 = 809A2200 -/* 00128 809A1DD8 00095080 */ sll $t2, $t1, 2 -/* 0012C 809A1DDC 004A5821 */ addu $t3, $v0, $t2 -/* 00130 809A1DE0 916C0000 */ lbu $t4, 0x0000($t3) ## 00000000 -/* 00134 809A1DE4 3C03809A */ lui $v1, %hi(D_809A220C) ## $v1 = 809A0000 -/* 00138 809A1DE8 2463220C */ addiu $v1, $v1, %lo(D_809A220C) ## $v1 = 809A220C -/* 0013C 809A1DEC A4CC0040 */ sh $t4, 0x0040($a2) ## 00000040 -/* 00140 809A1DF0 84ED0030 */ lh $t5, 0x0030($a3) ## 00000030 -/* 00144 809A1DF4 000D7880 */ sll $t7, $t5, 2 -/* 00148 809A1DF8 004FC021 */ addu $t8, $v0, $t7 -/* 0014C 809A1DFC 93190001 */ lbu $t9, 0x0001($t8) ## 00000001 -/* 00150 809A1E00 A4D90042 */ sh $t9, 0x0042($a2) ## 00000042 -/* 00154 809A1E04 84EE0030 */ lh $t6, 0x0030($a3) ## 00000030 -/* 00158 809A1E08 000E4080 */ sll $t0, $t6, 2 -/* 0015C 809A1E0C 00484821 */ addu $t1, $v0, $t0 -/* 00160 809A1E10 912A0002 */ lbu $t2, 0x0002($t1) ## 00000002 -/* 00164 809A1E14 A4CA0044 */ sh $t2, 0x0044($a2) ## 00000044 -/* 00168 809A1E18 84EB0030 */ lh $t3, 0x0030($a3) ## 00000030 -/* 0016C 809A1E1C 000B6080 */ sll $t4, $t3, 2 -/* 00170 809A1E20 004C6821 */ addu $t5, $v0, $t4 -/* 00174 809A1E24 91AF0003 */ lbu $t7, 0x0003($t5) ## 00000003 -/* 00178 809A1E28 A4CF0046 */ sh $t7, 0x0046($a2) ## 00000046 -/* 0017C 809A1E2C 84F80030 */ lh $t8, 0x0030($a3) ## 00000030 -/* 00180 809A1E30 0018C880 */ sll $t9, $t8, 2 -/* 00184 809A1E34 00797021 */ addu $t6, $v1, $t9 -/* 00188 809A1E38 91C80000 */ lbu $t0, 0x0000($t6) ## 00000000 -/* 0018C 809A1E3C A4C80048 */ sh $t0, 0x0048($a2) ## 00000048 -/* 00190 809A1E40 84E90030 */ lh $t1, 0x0030($a3) ## 00000030 -/* 00194 809A1E44 00095080 */ sll $t2, $t1, 2 -/* 00198 809A1E48 006A5821 */ addu $t3, $v1, $t2 -/* 0019C 809A1E4C 916C0001 */ lbu $t4, 0x0001($t3) ## 00000001 -/* 001A0 809A1E50 A4CC004A */ sh $t4, 0x004A($a2) ## 0000004A -/* 001A4 809A1E54 84ED0030 */ lh $t5, 0x0030($a3) ## 00000030 -/* 001A8 809A1E58 000D7880 */ sll $t7, $t5, 2 -/* 001AC 809A1E5C 006FC021 */ addu $t8, $v1, $t7 -/* 001B0 809A1E60 93190002 */ lbu $t9, 0x0002($t8) ## 00000002 -/* 001B4 809A1E64 A4D9004C */ sh $t9, 0x004C($a2) ## 0000004C -/* 001B8 809A1E68 84EE0030 */ lh $t6, 0x0030($a3) ## 00000030 -/* 001BC 809A1E6C 000E4080 */ sll $t0, $t6, 2 -/* 001C0 809A1E70 00684821 */ addu $t1, $v1, $t0 -/* 001C4 809A1E74 912A0003 */ lbu $t2, 0x0003($t1) ## 00000003 -/* 001C8 809A1E78 10000011 */ beq $zero, $zero, .L809A1EC0 -/* 001CC 809A1E7C A4CA004E */ sh $t2, 0x004E($a2) ## 0000004E -/* 001D0 809A1E80 90EB0024 */ lbu $t3, 0x0024($a3) ## 00000024 -.L809A1E84: -/* 001D4 809A1E84 A4CB0040 */ sh $t3, 0x0040($a2) ## 00000040 -/* 001D8 809A1E88 90EC0025 */ lbu $t4, 0x0025($a3) ## 00000025 -/* 001DC 809A1E8C A4CC0042 */ sh $t4, 0x0042($a2) ## 00000042 -/* 001E0 809A1E90 90ED0026 */ lbu $t5, 0x0026($a3) ## 00000026 -/* 001E4 809A1E94 A4CD0044 */ sh $t5, 0x0044($a2) ## 00000044 -/* 001E8 809A1E98 90EF0027 */ lbu $t7, 0x0027($a3) ## 00000027 -/* 001EC 809A1E9C A4CF0046 */ sh $t7, 0x0046($a2) ## 00000046 -/* 001F0 809A1EA0 90F80028 */ lbu $t8, 0x0028($a3) ## 00000028 -/* 001F4 809A1EA4 A4D80048 */ sh $t8, 0x0048($a2) ## 00000048 -/* 001F8 809A1EA8 90F90029 */ lbu $t9, 0x0029($a3) ## 00000029 -/* 001FC 809A1EAC A4D9004A */ sh $t9, 0x004A($a2) ## 0000004A -/* 00200 809A1EB0 90EE002A */ lbu $t6, 0x002A($a3) ## 0000002A -/* 00204 809A1EB4 A4CE004C */ sh $t6, 0x004C($a2) ## 0000004C -/* 00208 809A1EB8 90E8002B */ lbu $t0, 0x002B($a3) ## 0000002B -/* 0020C 809A1EBC A4C8004E */ sh $t0, 0x004E($a2) ## 0000004E -.L809A1EC0: -/* 00210 809A1EC0 84E90032 */ lh $t1, 0x0032($a3) ## 00000032 -/* 00214 809A1EC4 3C0C809A */ lui $t4, %hi(func_809A1F04) ## $t4 = 809A0000 -/* 00218 809A1EC8 3C0D809A */ lui $t5, %hi(func_809A2180) ## $t5 = 809A0000 -/* 0021C 809A1ECC A4C90050 */ sh $t1, 0x0050($a2) ## 00000050 -/* 00220 809A1ED0 84EA002C */ lh $t2, 0x002C($a3) ## 0000002C -/* 00224 809A1ED4 258C1F04 */ addiu $t4, $t4, %lo(func_809A1F04) ## $t4 = 809A1F04 -/* 00228 809A1ED8 25AD2180 */ addiu $t5, $t5, %lo(func_809A2180) ## $t5 = 809A2180 -/* 0022C 809A1EDC A4CA0052 */ sh $t2, 0x0052($a2) ## 00000052 -/* 00230 809A1EE0 84EB002E */ lh $t3, 0x002E($a3) ## 0000002E -/* 00234 809A1EE4 ACCC0028 */ sw $t4, 0x0028($a2) ## 00000028 -/* 00238 809A1EE8 ACCD0024 */ sw $t5, 0x0024($a2) ## 00000024 -/* 0023C 809A1EEC A4CB0054 */ sh $t3, 0x0054($a2) ## 00000054 -/* 00240 809A1EF0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00244 809A1EF4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00248 809A1EF8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 0024C 809A1EFC 03E00008 */ jr $ra -/* 00250 809A1F00 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/func_809A1F04.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/func_809A1F04.s deleted file mode 100644 index 51e2f65751..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/func_809A1F04.s +++ /dev/null @@ -1,182 +0,0 @@ -.rdata -glabel D_809A2220 - .asciz "../z_eff_ss_dt_bubble.c" - .balign 4 - -glabel D_809A2238 - .asciz "../z_eff_ss_dt_bubble.c" - .balign 4 - -glabel D_809A2250 - .asciz "../z_eff_ss_dt_bubble.c" - .balign 4 - -.late_rodata -glabel D_809A2268 - .float 0.004 - -.text -glabel func_809A1F04 -/* 00254 809A1F04 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 00258 809A1F08 AFB00014 */ sw $s0, 0x0014($sp) -/* 0025C 809A1F0C AFBF001C */ sw $ra, 0x001C($sp) -/* 00260 809A1F10 AFB10018 */ sw $s1, 0x0018($sp) -/* 00264 809A1F14 AFA40058 */ sw $a0, 0x0058($sp) -/* 00268 809A1F18 AFA5005C */ sw $a1, 0x005C($sp) -/* 0026C 809A1F1C 8C910000 */ lw $s1, 0x0000($a0) ## 00000000 -/* 00270 809A1F20 00C08025 */ or $s0, $a2, $zero ## $s0 = 00000000 -/* 00274 809A1F24 3C06809A */ lui $a2, %hi(D_809A2220) ## $a2 = 809A0000 -/* 00278 809A1F28 24C62220 */ addiu $a2, $a2, %lo(D_809A2220) ## $a2 = 809A2220 -/* 0027C 809A1F2C 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 -/* 00280 809A1F30 240700C9 */ addiu $a3, $zero, 0x00C9 ## $a3 = 000000C9 -/* 00284 809A1F34 0C031AB1 */ jal Graph_OpenDisps -/* 00288 809A1F38 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0028C 809A1F3C 860F0052 */ lh $t7, 0x0052($s0) ## 00000052 -/* 00290 809A1F40 3C01809A */ lui $at, %hi(D_809A2268) ## $at = 809A0000 -/* 00294 809A1F44 C4282268 */ lwc1 $f8, %lo(D_809A2268)($at) -/* 00298 809A1F48 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 0029C 809A1F4C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 002A0 809A1F50 468021A0 */ cvt.s.w $f6, $f4 -/* 002A4 809A1F54 46083282 */ mul.s $f10, $f6, $f8 -/* 002A8 809A1F58 E7AA0050 */ swc1 $f10, 0x0050($sp) -/* 002AC 809A1F5C 8E060008 */ lw $a2, 0x0008($s0) ## 00000008 -/* 002B0 809A1F60 C60E0004 */ lwc1 $f14, 0x0004($s0) ## 00000004 -/* 002B4 809A1F64 0C034261 */ jal Matrix_Translate -/* 002B8 809A1F68 C60C0000 */ lwc1 $f12, 0x0000($s0) ## 00000000 -/* 002BC 809A1F6C C7AC0050 */ lwc1 $f12, 0x0050($sp) -/* 002C0 809A1F70 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 002C4 809A1F74 44066000 */ mfc1 $a2, $f12 -/* 002C8 809A1F78 0C0342A3 */ jal Matrix_Scale -/* 002CC 809A1F7C 46006386 */ mov.s $f14, $f12 -/* 002D0 809A1F80 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 002D4 809A1F84 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 -/* 002D8 809A1F88 37390003 */ ori $t9, $t9, 0x0003 ## $t9 = DA380003 -/* 002DC 809A1F8C 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 002E0 809A1F90 AE3802D0 */ sw $t8, 0x02D0($s1) ## 000002D0 -/* 002E4 809A1F94 3C05809A */ lui $a1, %hi(D_809A2238) ## $a1 = 809A0000 -/* 002E8 809A1F98 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 002EC 809A1F9C 24A52238 */ addiu $a1, $a1, %lo(D_809A2238) ## $a1 = 809A2238 -/* 002F0 809A1FA0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 002F4 809A1FA4 240600D5 */ addiu $a2, $zero, 0x00D5 ## $a2 = 000000D5 -/* 002F8 809A1FA8 0C0346A2 */ jal Matrix_NewMtx -/* 002FC 809A1FAC AFA20038 */ sw $v0, 0x0038($sp) -/* 00300 809A1FB0 8FA30038 */ lw $v1, 0x0038($sp) -/* 00304 809A1FB4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00308 809A1FB8 0C024F05 */ jal func_80093C14 -/* 0030C 809A1FBC AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00310 809A1FC0 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 00314 809A1FC4 3C09FA00 */ lui $t1, 0xFA00 ## $t1 = FA000000 -/* 00318 809A1FC8 3C040402 */ lui $a0, 0x0402 ## $a0 = 04020000 -/* 0031C 809A1FCC 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 -/* 00320 809A1FD0 AE2802D0 */ sw $t0, 0x02D0($s1) ## 000002D0 -/* 00324 809A1FD4 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 00328 809A1FD8 860B005C */ lh $t3, 0x005C($s0) ## 0000005C -/* 0032C 809A1FDC 860A0046 */ lh $t2, 0x0046($s0) ## 00000046 -/* 00330 809A1FE0 860D0054 */ lh $t5, 0x0054($s0) ## 00000054 -/* 00334 809A1FE4 86190040 */ lh $t9, 0x0040($s0) ## 00000040 -/* 00338 809A1FE8 014B0019 */ multu $t2, $t3 -/* 0033C 809A1FEC 860A0042 */ lh $t2, 0x0042($s0) ## 00000042 -/* 00340 809A1FF0 00194600 */ sll $t0, $t9, 24 -/* 00344 809A1FF4 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -/* 00348 809A1FF8 314B00FF */ andi $t3, $t2, 0x00FF ## $t3 = 00000000 -/* 0034C 809A1FFC 3C0AFB00 */ lui $t2, 0xFB00 ## $t2 = FB000000 -/* 00350 809A2000 2484A160 */ addiu $a0, $a0, 0xA160 ## $a0 = 0401A160 -/* 00354 809A2004 3C06809A */ lui $a2, %hi(D_809A2250) ## $a2 = 809A0000 -/* 00358 809A2008 24C62250 */ addiu $a2, $a2, %lo(D_809A2250) ## $a2 = 809A2250 -/* 0035C 809A200C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00360 809A2010 00006012 */ mflo $t4 -/* 00364 809A2014 240700EC */ addiu $a3, $zero, 0x00EC ## $a3 = 000000EC -/* 00368 809A2018 00000000 */ nop -/* 0036C 809A201C 018D001A */ div $zero, $t4, $t5 -/* 00370 809A2020 00007012 */ mflo $t6 -/* 00374 809A2024 31CF00FF */ andi $t7, $t6, 0x00FF ## $t7 = 00000000 -/* 00378 809A2028 860E0044 */ lh $t6, 0x0044($s0) ## 00000044 -/* 0037C 809A202C 15A00002 */ bne $t5, $zero, .L809A2038 -/* 00380 809A2030 00000000 */ nop -/* 00384 809A2034 0007000D */ break 7 ## 0x01C00 -.L809A2038: -/* 00388 809A2038 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 0038C 809A203C 15A10004 */ bne $t5, $at, .L809A2050 -/* 00390 809A2040 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00394 809A2044 15810002 */ bne $t4, $at, .L809A2050 -/* 00398 809A2048 00000000 */ nop -/* 0039C 809A204C 0006000D */ break 6 ## 0x01800 -.L809A2050: -/* 003A0 809A2050 000B6400 */ sll $t4, $t3, 16 -/* 003A4 809A2054 01E84825 */ or $t1, $t7, $t0 ## $t1 = 00000008 -/* 003A8 809A2058 31D800FF */ andi $t8, $t6, 0x00FF ## $t8 = 00000000 -/* 003AC 809A205C 0018CA00 */ sll $t9, $t8, 8 -/* 003B0 809A2060 012C6825 */ or $t5, $t1, $t4 ## $t5 = 00000008 -/* 003B4 809A2064 01B97825 */ or $t7, $t5, $t9 ## $t7 = 00000008 -/* 003B8 809A2068 AC6F0004 */ sw $t7, 0x0004($v1) ## 00000004 -/* 003BC 809A206C 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 003C0 809A2070 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 -/* 003C4 809A2074 AE2802D0 */ sw $t0, 0x02D0($s1) ## 000002D0 -/* 003C8 809A2078 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 003CC 809A207C 8609005C */ lh $t1, 0x005C($s0) ## 0000005C -/* 003D0 809A2080 860B004E */ lh $t3, 0x004E($s0) ## 0000004E -/* 003D4 809A2084 860E0054 */ lh $t6, 0x0054($s0) ## 00000054 -/* 003D8 809A2088 860F0048 */ lh $t7, 0x0048($s0) ## 00000048 -/* 003DC 809A208C 01690019 */ multu $t3, $t1 -/* 003E0 809A2090 860B004A */ lh $t3, 0x004A($s0) ## 0000004A -/* 003E4 809A2094 000F4600 */ sll $t0, $t7, 24 -/* 003E8 809A2098 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -/* 003EC 809A209C 316900FF */ andi $t1, $t3, 0x00FF ## $t1 = 00000000 -/* 003F0 809A20A0 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 003F4 809A20A4 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020 -/* 003F8 809A20A8 00006012 */ mflo $t4 -/* 003FC 809A20AC 00000000 */ nop -/* 00400 809A20B0 00000000 */ nop -/* 00404 809A20B4 018E001A */ div $zero, $t4, $t6 -/* 00408 809A20B8 0000C012 */ mflo $t8 -/* 0040C 809A20BC 330D00FF */ andi $t5, $t8, 0x00FF ## $t5 = 00000000 -/* 00410 809A20C0 8618004C */ lh $t8, 0x004C($s0) ## 0000004C -/* 00414 809A20C4 15C00002 */ bne $t6, $zero, .L809A20D0 -/* 00418 809A20C8 00000000 */ nop -/* 0041C 809A20CC 0007000D */ break 7 ## 0x01C00 -.L809A20D0: -/* 00420 809A20D0 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 00424 809A20D4 15C10004 */ bne $t6, $at, .L809A20E8 -/* 00428 809A20D8 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0042C 809A20DC 15810002 */ bne $t4, $at, .L809A20E8 -/* 00430 809A20E0 00000000 */ nop -/* 00434 809A20E4 0006000D */ break 6 ## 0x01800 -.L809A20E8: -/* 00438 809A20E8 00096400 */ sll $t4, $t1, 16 -/* 0043C 809A20EC 01A85025 */ or $t2, $t5, $t0 ## $t2 = 00000008 -/* 00440 809A20F0 331900FF */ andi $t9, $t8, 0x00FF ## $t9 = 00000000 -/* 00444 809A20F4 00197A00 */ sll $t7, $t9, 8 -/* 00448 809A20F8 014C7025 */ or $t6, $t2, $t4 ## $t6 = 00000008 -/* 0044C 809A20FC 01CF6825 */ or $t5, $t6, $t7 ## $t5 = 00000008 -/* 00450 809A2100 AC6D0004 */ sw $t5, 0x0004($v1) ## 00000004 -/* 00454 809A2104 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 00458 809A2108 0004C100 */ sll $t8, $a0, 4 -/* 0045C 809A210C 0018CF02 */ srl $t9, $t8, 28 -/* 00460 809A2110 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 -/* 00464 809A2114 AE2802D0 */ sw $t0, 0x02D0($s1) ## 000002D0 -/* 00468 809A2118 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 0046C 809A211C 8E090038 */ lw $t1, 0x0038($s0) ## 00000038 -/* 00470 809A2120 00197080 */ sll $t6, $t9, 2 -/* 00474 809A2124 3C0F8016 */ lui $t7, %hi(gSegments) -/* 00478 809A2128 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 0047C 809A212C 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 00480 809A2130 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 -/* 00484 809A2134 01EE7821 */ addu $t7, $t7, $t6 -/* 00488 809A2138 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 0048C 809A213C AE2A02D0 */ sw $t2, 0x02D0($s1) ## 000002D0 -/* 00490 809A2140 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00494 809A2144 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 00498 809A2148 8DEF6FA8 */ lw $t7, %lo(gSegments)($t7) -/* 0049C 809A214C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 004A0 809A2150 00816824 */ and $t5, $a0, $at -/* 004A4 809A2154 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 004A8 809A2158 01ED4021 */ addu $t0, $t7, $t5 -/* 004AC 809A215C 01015821 */ addu $t3, $t0, $at -/* 004B0 809A2160 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 -/* 004B4 809A2164 0C031AD5 */ jal Graph_CloseDisps -/* 004B8 809A2168 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 004BC 809A216C 8FBF001C */ lw $ra, 0x001C($sp) -/* 004C0 809A2170 8FB00014 */ lw $s0, 0x0014($sp) -/* 004C4 809A2174 8FB10018 */ lw $s1, 0x0018($sp) -/* 004C8 809A2178 03E00008 */ jr $ra -/* 004CC 809A217C 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/func_809A2180.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/func_809A2180.s deleted file mode 100644 index b83fbdaff4..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/func_809A2180.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_809A2180 -/* 004D0 809A2180 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 004D4 809A2184 AFBF0014 */ sw $ra, 0x0014($sp) -/* 004D8 809A2188 AFA40018 */ sw $a0, 0x0018($sp) -/* 004DC 809A218C AFA5001C */ sw $a1, 0x001C($sp) -/* 004E0 809A2190 84CE0050 */ lh $t6, 0x0050($a2) ## 00000050 -/* 004E4 809A2194 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 004E8 809A2198 55C10015 */ bnel $t6, $at, .L809A21F0 -/* 004EC 809A219C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 004F0 809A21A0 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 004F4 809A21A4 AFA60020 */ sw $a2, 0x0020($sp) -/* 004F8 809A21A8 46000100 */ add.s $f4, $f0, $f0 -/* 004FC 809A21AC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00500 809A21B0 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 00504 809A21B4 8FA60020 */ lw $a2, 0x0020($sp) -/* 00508 809A21B8 46062201 */ sub.s $f8, $f4, $f6 -/* 0050C 809A21BC C4CA0000 */ lwc1 $f10, 0x0000($a2) ## 00000000 -/* 00510 809A21C0 46085400 */ add.s $f16, $f10, $f8 -/* 00514 809A21C4 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00518 809A21C8 E4D00000 */ swc1 $f16, 0x0000($a2) ## 00000000 -/* 0051C 809A21CC 46000480 */ add.s $f18, $f0, $f0 -/* 00520 809A21D0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00524 809A21D4 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 00528 809A21D8 8FA60020 */ lw $a2, 0x0020($sp) -/* 0052C 809A21DC 46049181 */ sub.s $f6, $f18, $f4 -/* 00530 809A21E0 C4CA0008 */ lwc1 $f10, 0x0008($a2) ## 00000008 -/* 00534 809A21E4 46065200 */ add.s $f8, $f10, $f6 -/* 00538 809A21E8 E4C80008 */ swc1 $f8, 0x0008($a2) ## 00000008 -/* 0053C 809A21EC 8FBF0014 */ lw $ra, 0x0014($sp) -.L809A21F0: -/* 00540 809A21F0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00544 809A21F4 03E00008 */ jr $ra -/* 00548 809A21F8 00000000 */ nop -/* 0054C 809A21FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/EffectSsEnFire_Init.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/EffectSsEnFire_Init.s deleted file mode 100644 index a36167af2b..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/EffectSsEnFire_Init.s +++ /dev/null @@ -1,121 +0,0 @@ -glabel EffectSsEnFire_Init -/* 00000 809A2B60 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 00004 809A2B64 3C0E809A */ lui $t6, %hi(D_809A3248) ## $t6 = 809A0000 -/* 00008 809A2B68 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0000C 809A2B6C AFB20020 */ sw $s2, 0x0020($sp) -/* 00010 809A2B70 AFB1001C */ sw $s1, 0x001C($sp) -/* 00014 809A2B74 AFB00018 */ sw $s0, 0x0018($sp) -/* 00018 809A2B78 AFA40048 */ sw $a0, 0x0048($sp) -/* 0001C 809A2B7C AFA5004C */ sw $a1, 0x004C($sp) -/* 00020 809A2B80 25CE3248 */ addiu $t6, $t6, %lo(D_809A3248) ## $t6 = 809A3248 -/* 00024 809A2B84 8DD80000 */ lw $t8, 0x0000($t6) ## 809A3248 -/* 00028 809A2B88 27A30038 */ addiu $v1, $sp, 0x0038 ## $v1 = FFFFFFF0 -/* 0002C 809A2B8C 24F20004 */ addiu $s2, $a3, 0x0004 ## $s2 = 00000004 -/* 00030 809A2B90 AC780000 */ sw $t8, 0x0000($v1) ## FFFFFFF0 -/* 00034 809A2B94 8DCF0004 */ lw $t7, 0x0004($t6) ## 809A324C -/* 00038 809A2B98 27A2002C */ addiu $v0, $sp, 0x002C ## $v0 = FFFFFFE4 -/* 0003C 809A2B9C 00C08025 */ or $s0, $a2, $zero ## $s0 = 00000000 -/* 00040 809A2BA0 AC6F0004 */ sw $t7, 0x0004($v1) ## FFFFFFF4 -/* 00044 809A2BA4 8DD80008 */ lw $t8, 0x0008($t6) ## 809A3250 -/* 00048 809A2BA8 240F0014 */ addiu $t7, $zero, 0x0014 ## $t7 = 00000014 -/* 0004C 809A2BAC 00E08825 */ or $s1, $a3, $zero ## $s1 = 00000000 -/* 00050 809A2BB0 AC780008 */ sw $t8, 0x0008($v1) ## FFFFFFF8 -/* 00054 809A2BB4 8E480000 */ lw $t0, 0x0000($s2) ## 00000004 -/* 00058 809A2BB8 ACC80000 */ sw $t0, 0x0000($a2) ## 00000000 -/* 0005C 809A2BBC 8E590004 */ lw $t9, 0x0004($s2) ## 00000008 -/* 00060 809A2BC0 ACD90004 */ sw $t9, 0x0004($a2) ## 00000004 -/* 00064 809A2BC4 8E480008 */ lw $t0, 0x0008($s2) ## 0000000C -/* 00068 809A2BC8 ACC80008 */ sw $t0, 0x0008($a2) ## 00000008 -/* 0006C 809A2BCC 8C6A0000 */ lw $t2, 0x0000($v1) ## FFFFFFF0 -/* 00070 809A2BD0 8C690004 */ lw $t1, 0x0004($v1) ## FFFFFFF4 -/* 00074 809A2BD4 AC4A0000 */ sw $t2, 0x0000($v0) ## FFFFFFE4 -/* 00078 809A2BD8 8C6A0008 */ lw $t2, 0x0008($v1) ## FFFFFFF8 -/* 0007C 809A2BDC 8C4C0000 */ lw $t4, 0x0000($v0) ## FFFFFFE4 -/* 00080 809A2BE0 AC490004 */ sw $t1, 0x0004($v0) ## FFFFFFE8 -/* 00084 809A2BE4 AC4A0008 */ sw $t2, 0x0008($v0) ## FFFFFFEC -/* 00088 809A2BE8 ACCC0018 */ sw $t4, 0x0018($a2) ## 00000018 -/* 0008C 809A2BEC 8C4B0004 */ lw $t3, 0x0004($v0) ## FFFFFFE8 -/* 00090 809A2BF0 ACCB001C */ sw $t3, 0x001C($a2) ## 0000001C -/* 00094 809A2BF4 8C4C0008 */ lw $t4, 0x0008($v0) ## FFFFFFEC -/* 00098 809A2BF8 ACCC0020 */ sw $t4, 0x0020($a2) ## 00000020 -/* 0009C 809A2BFC 8C4E0000 */ lw $t6, 0x0000($v0) ## FFFFFFE4 -/* 000A0 809A2C00 ACCE000C */ sw $t6, 0x000C($a2) ## 0000000C -/* 000A4 809A2C04 8C4D0004 */ lw $t5, 0x0004($v0) ## FFFFFFE8 -/* 000A8 809A2C08 ACCD0010 */ sw $t5, 0x0010($a2) ## 00000010 -/* 000AC 809A2C0C 8C4E0008 */ lw $t6, 0x0008($v0) ## FFFFFFEC -/* 000B0 809A2C10 A4CF005C */ sh $t7, 0x005C($a2) ## 0000005C -/* 000B4 809A2C14 84D8005C */ lh $t8, 0x005C($a2) ## 0000005C -/* 000B8 809A2C18 ACCE0014 */ sw $t6, 0x0014($a2) ## 00000014 -/* 000BC 809A2C1C A4D80044 */ sh $t8, 0x0044($a2) ## 00000044 -/* 000C0 809A2C20 8CF90000 */ lw $t9, 0x0000($a3) ## 00000000 -/* 000C4 809A2C24 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 000C8 809A2C28 ACD9003C */ sw $t9, 0x003C($a2) ## 0000003C -/* 000CC 809A2C2C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 000D0 809A2C30 44812000 */ mtc1 $at, $f4 ## $f4 = 20.00 -/* 000D4 809A2C34 3C0A809A */ lui $t2, %hi(func_809A2D28) ## $t2 = 809A0000 -/* 000D8 809A2C38 3C0B809A */ lui $t3, %hi(func_809A3060) ## $t3 = 809A0000 -/* 000DC 809A2C3C 46040182 */ mul.s $f6, $f0, $f4 -/* 000E0 809A2C40 254A2D28 */ addiu $t2, $t2, %lo(func_809A2D28) ## $t2 = 809A2D28 -/* 000E4 809A2C44 256B3060 */ addiu $t3, $t3, %lo(func_809A3060) ## $t3 = 809A3060 -/* 000E8 809A2C48 240CFFF1 */ addiu $t4, $zero, 0xFFF1 ## $t4 = FFFFFFF1 -/* 000EC 809A2C4C AE0A0028 */ sw $t2, 0x0028($s0) ## 00000028 -/* 000F0 809A2C50 AE0B0024 */ sw $t3, 0x0024($s0) ## 00000024 -/* 000F4 809A2C54 A60C0046 */ sh $t4, 0x0046($s0) ## 00000046 -/* 000F8 809A2C58 4600320D */ trunc.w.s $f8, $f6 -/* 000FC 809A2C5C 44094000 */ mfc1 $t1, $f8 -/* 00100 809A2C60 00000000 */ nop -/* 00104 809A2C64 A6090052 */ sh $t1, 0x0052($s0) ## 00000052 -/* 00108 809A2C68 862D0016 */ lh $t5, 0x0016($s1) ## 00000016 -/* 0010C 809A2C6C 05A30017 */ bgezl $t5, .L809A2CCC -/* 00110 809A2C70 862A0010 */ lh $t2, 0x0010($s1) ## 00000010 -/* 00114 809A2C74 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 00118 809A2C78 02402825 */ or $a1, $s2, $zero ## $a1 = 00000004 -/* 0011C 809A2C7C 0C01E01A */ jal Math_Vec3f_Yaw - -/* 00120 809A2C80 24840024 */ addiu $a0, $a0, 0x0024 ## $a0 = 00000024 -/* 00124 809A2C84 8E2E0000 */ lw $t6, 0x0000($s1) ## 00000000 -/* 00128 809A2C88 02402825 */ or $a1, $s2, $zero ## $a1 = 00000004 -/* 0012C 809A2C8C 85CF00B6 */ lh $t7, 0x00B6($t6) ## 000000B6 -/* 00130 809A2C90 004FC023 */ subu $t8, $v0, $t7 -/* 00134 809A2C94 A618004A */ sh $t8, 0x004A($s0) ## 0000004A -/* 00138 809A2C98 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 0013C 809A2C9C 0C01E027 */ jal Math_Vec3f_Pitch - -/* 00140 809A2CA0 24840024 */ addiu $a0, $a0, 0x0024 ## $a0 = 00000024 -/* 00144 809A2CA4 8E390000 */ lw $t9, 0x0000($s1) ## 00000000 -/* 00148 809A2CA8 02402025 */ or $a0, $s2, $zero ## $a0 = 00000004 -/* 0014C 809A2CAC 872800B4 */ lh $t0, 0x00B4($t9) ## 000000B4 -/* 00150 809A2CB0 00484823 */ subu $t1, $v0, $t0 -/* 00154 809A2CB4 A6090048 */ sh $t1, 0x0048($s0) ## 00000048 -/* 00158 809A2CB8 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 0015C 809A2CBC 0C01DFE4 */ jal Math_Vec3f_DistXYZ - -/* 00160 809A2CC0 24A50024 */ addiu $a1, $a1, 0x0024 ## $a1 = 00000024 -/* 00164 809A2CC4 E6000034 */ swc1 $f0, 0x0034($s0) ## 00000034 -/* 00168 809A2CC8 862A0010 */ lh $t2, 0x0010($s1) ## 00000010 -.L809A2CCC: -/* 0016C 809A2CCC A60A0040 */ sh $t2, 0x0040($s0) ## 00000040 -/* 00170 809A2CD0 862B0012 */ lh $t3, 0x0012($s1) ## 00000012 -/* 00174 809A2CD4 316C8000 */ andi $t4, $t3, 0x8000 ## $t4 = 00000000 -/* 00178 809A2CD8 51800005 */ beql $t4, $zero, .L809A2CF0 -/* 0017C 809A2CDC A6000042 */ sh $zero, 0x0042($s0) ## 00000042 -/* 00180 809A2CE0 862D0010 */ lh $t5, 0x0010($s1) ## 00000010 -/* 00184 809A2CE4 10000002 */ beq $zero, $zero, .L809A2CF0 -/* 00188 809A2CE8 A60D0042 */ sh $t5, 0x0042($s0) ## 00000042 -/* 0018C 809A2CEC A6000042 */ sh $zero, 0x0042($s0) ## 00000042 -.L809A2CF0: -/* 00190 809A2CF0 862E0012 */ lh $t6, 0x0012($s1) ## 00000012 -/* 00194 809A2CF4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00198 809A2CF8 31CF7FFF */ andi $t7, $t6, 0x7FFF ## $t7 = 00000000 -/* 0019C 809A2CFC A60F004C */ sh $t7, 0x004C($s0) ## 0000004C -/* 001A0 809A2D00 86380016 */ lh $t8, 0x0016($s1) ## 00000016 -/* 001A4 809A2D04 A618004E */ sh $t8, 0x004E($s0) ## 0000004E -/* 001A8 809A2D08 86390014 */ lh $t9, 0x0014($s1) ## 00000014 -/* 001AC 809A2D0C A6190050 */ sh $t9, 0x0050($s0) ## 00000050 -/* 001B0 809A2D10 8FBF0024 */ lw $ra, 0x0024($sp) -/* 001B4 809A2D14 8FB20020 */ lw $s2, 0x0020($sp) -/* 001B8 809A2D18 8FB1001C */ lw $s1, 0x001C($sp) -/* 001BC 809A2D1C 8FB00018 */ lw $s0, 0x0018($sp) -/* 001C0 809A2D20 03E00008 */ jr $ra -/* 001C4 809A2D24 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/func_809A2D28.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/func_809A2D28.s deleted file mode 100644 index 656737e7db..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/func_809A2D28.s +++ /dev/null @@ -1,239 +0,0 @@ -.rdata -glabel D_809A3260 - .asciz "../z_eff_en_fire.c" - .balign 4 - -glabel D_809A3274 - .asciz "../z_eff_en_fire.c" - .balign 4 - -glabel D_809A3288 - .asciz "../z_eff_en_fire.c" - .balign 4 - -.late_rodata -glabel D_809A329C - .float 9.58738019108e-05 - -glabel D_809A32A0 - .float 0.00005 - -glabel D_809A32A4 - .float 12.7 - -.text -glabel func_809A2D28 -/* 001C8 809A2D28 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 -/* 001CC 809A2D2C AFB10038 */ sw $s1, 0x0038($sp) -/* 001D0 809A2D30 AFBF003C */ sw $ra, 0x003C($sp) -/* 001D4 809A2D34 AFB00034 */ sw $s0, 0x0034($sp) -/* 001D8 809A2D38 AFA40098 */ sw $a0, 0x0098($sp) -/* 001DC 809A2D3C AFA5009C */ sw $a1, 0x009C($sp) -/* 001E0 809A2D40 8C900000 */ lw $s0, 0x0000($a0) ## 00000000 -/* 001E4 809A2D44 00C08825 */ or $s1, $a2, $zero ## $s1 = 00000000 -/* 001E8 809A2D48 3C06809A */ lui $a2, %hi(D_809A3260) ## $a2 = 809A0000 -/* 001EC 809A2D4C 24C63260 */ addiu $a2, $a2, %lo(D_809A3260) ## $a2 = 809A3260 -/* 001F0 809A2D50 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFD0 -/* 001F4 809A2D54 240700A9 */ addiu $a3, $zero, 0x00A9 ## $a3 = 000000A9 -/* 001F8 809A2D58 0C031AB1 */ jal Graph_OpenDisps -/* 001FC 809A2D5C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00200 809A2D60 C62C0000 */ lwc1 $f12, 0x0000($s1) ## 00000000 -/* 00204 809A2D64 C62E0004 */ lwc1 $f14, 0x0004($s1) ## 00000004 -/* 00208 809A2D68 8E260008 */ lw $a2, 0x0008($s1) ## 00000008 -/* 0020C 809A2D6C 0C034261 */ jal Matrix_Translate -/* 00210 809A2D70 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00214 809A2D74 8FA20098 */ lw $v0, 0x0098($sp) -/* 00218 809A2D78 844F07A0 */ lh $t7, 0x07A0($v0) ## 000007A0 -/* 0021C 809A2D7C 000FC080 */ sll $t8, $t7, 2 -/* 00220 809A2D80 0058C821 */ addu $t9, $v0, $t8 -/* 00224 809A2D84 0C016A7D */ jal func_8005A9F4 -/* 00228 809A2D88 8F240790 */ lw $a0, 0x0790($t9) ## 00000790 -/* 0022C 809A2D8C 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 00230 809A2D90 00414021 */ addu $t0, $v0, $at -/* 00234 809A2D94 00084C00 */ sll $t1, $t0, 16 -/* 00238 809A2D98 00095403 */ sra $t2, $t1, 16 -/* 0023C 809A2D9C 448A2000 */ mtc1 $t2, $f4 ## $f4 = 0.00 -/* 00240 809A2DA0 3C01809A */ lui $at, %hi(D_809A329C) ## $at = 809A0000 -/* 00244 809A2DA4 C428329C */ lwc1 $f8, %lo(D_809A329C)($at) -/* 00248 809A2DA8 468021A0 */ cvt.s.w $f6, $f4 -/* 0024C 809A2DAC 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00250 809A2DB0 46083302 */ mul.s $f12, $f6, $f8 -/* 00254 809A2DB4 0C034348 */ jal Matrix_RotateY -/* 00258 809A2DB8 00000000 */ nop -/* 0025C 809A2DBC 8624005C */ lh $a0, 0x005C($s1) ## 0000005C -/* 00260 809A2DC0 24010333 */ addiu $at, $zero, 0x0333 ## $at = 00000333 -/* 00264 809A2DC4 00810019 */ multu $a0, $at -/* 00268 809A2DC8 00002012 */ mflo $a0 -/* 0026C 809A2DCC 00042400 */ sll $a0, $a0, 16 -/* 00270 809A2DD0 0C01DE1C */ jal Math_Sins - ## sins? -/* 00274 809A2DD4 00042403 */ sra $a0, $a0, 16 -/* 00278 809A2DD8 862B0042 */ lh $t3, 0x0042($s1) ## 00000042 -/* 0027C 809A2DDC 3C01809A */ lui $at, %hi(D_809A32A0) ## $at = 809A0000 -/* 00280 809A2DE0 C43232A0 */ lwc1 $f18, %lo(D_809A32A0)($at) -/* 00284 809A2DE4 448B5000 */ mtc1 $t3, $f10 ## $f10 = 0.00 -/* 00288 809A2DE8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0028C 809A2DEC 46805420 */ cvt.s.w $f16, $f10 -/* 00290 809A2DF0 46128102 */ mul.s $f4, $f16, $f18 -/* 00294 809A2DF4 00000000 */ nop -/* 00298 809A2DF8 46002302 */ mul.s $f12, $f4, $f0 -/* 0029C 809A2DFC 44066000 */ mfc1 $a2, $f12 -/* 002A0 809A2E00 0C0342A3 */ jal Matrix_Scale -/* 002A4 809A2E04 46006386 */ mov.s $f14, $f12 -/* 002A8 809A2E08 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 002AC 809A2E0C 3C0DDA38 */ lui $t5, 0xDA38 ## $t5 = DA380000 -/* 002B0 809A2E10 35AD0003 */ ori $t5, $t5, 0x0003 ## $t5 = DA380003 -/* 002B4 809A2E14 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 002B8 809A2E18 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 -/* 002BC 809A2E1C AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 002C0 809A2E20 8FAE0098 */ lw $t6, 0x0098($sp) -/* 002C4 809A2E24 3C05809A */ lui $a1, %hi(D_809A3274) ## $a1 = 809A0000 -/* 002C8 809A2E28 24A53274 */ addiu $a1, $a1, %lo(D_809A3274) ## $a1 = 809A3274 -/* 002CC 809A2E2C 8DC40000 */ lw $a0, 0x0000($t6) ## 00000000 -/* 002D0 809A2E30 240600B4 */ addiu $a2, $zero, 0x00B4 ## $a2 = 000000B4 -/* 002D4 809A2E34 0C0346A2 */ jal Matrix_NewMtx -/* 002D8 809A2E38 AFA20064 */ sw $v0, 0x0064($sp) -/* 002DC 809A2E3C 8FA30064 */ lw $v1, 0x0064($sp) -/* 002E0 809A2E40 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 002E4 809A2E44 8625005C */ lh $a1, 0x005C($s1) ## 0000005C -/* 002E8 809A2E48 8FAF0098 */ lw $t7, 0x0098($sp) -/* 002EC 809A2E4C 24A5FFFB */ addiu $a1, $a1, 0xFFFB ## $a1 = FFFFFFFB -/* 002F0 809A2E50 00052C00 */ sll $a1, $a1, 16 -/* 002F4 809A2E54 00052C03 */ sra $a1, $a1, 16 -/* 002F8 809A2E58 04A30003 */ bgezl $a1, .L809A2E68 -/* 002FC 809A2E5C 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 00300 809A2E60 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00304 809A2E64 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -.L809A2E68: -/* 00308 809A2E68 0C024F61 */ jal func_80093D84 -/* 0030C 809A2E6C A7A5007E */ sh $a1, 0x007E($sp) -/* 00310 809A2E70 87A5007E */ lh $a1, 0x007E($sp) -/* 00314 809A2E74 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 -/* 00318 809A2E78 3C19FB00 */ lui $t9, 0xFB00 ## $t9 = FB000000 -/* 0031C 809A2E7C 44853000 */ mtc1 $a1, $f6 ## $f6 = 0.00 -/* 00320 809A2E80 24780008 */ addiu $t8, $v1, 0x0008 ## $t8 = 00000008 -/* 00324 809A2E84 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 00328 809A2E88 46803220 */ cvt.s.w $f8, $f6 -/* 0032C 809A2E8C 3C01809A */ lui $at, %hi(D_809A32A4) ## $at = 809A0000 -/* 00330 809A2E90 AC790000 */ sw $t9, 0x0000($v1) ## 00000000 -/* 00334 809A2E94 C42A32A4 */ lwc1 $f10, %lo(D_809A32A4)($at) -/* 00338 809A2E98 24040001 */ addiu $a0, $zero, 0x0001 ## $a0 = 00000001 -/* 0033C 809A2E9C 3C0AFA00 */ lui $t2, 0xFA00 ## $t2 = FA000000 -/* 00340 809A2EA0 460A4402 */ mul.s $f16, $f8, $f10 -/* 00344 809A2EA4 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 00348 809A2EA8 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 0034C 809A2EAC 354A0080 */ ori $t2, $t2, 0x0080 ## $t2 = FA000080 -/* 00350 809A2EB0 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 -/* 00354 809A2EB4 24190020 */ addiu $t9, $zero, 0x0020 ## $t9 = 00000020 -/* 00358 809A2EB8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0035C 809A2EBC 4448F800 */ cfc1 $t0, $31 -/* 00360 809A2EC0 44C4F800 */ ctc1 $a0, $31 -/* 00364 809A2EC4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00368 809A2EC8 460084A4 */ cvt.w.s $f18, $f16 -/* 0036C 809A2ECC 4444F800 */ cfc1 $a0, $31 -/* 00370 809A2ED0 00000000 */ nop -/* 00374 809A2ED4 30840078 */ andi $a0, $a0, 0x0078 ## $a0 = 00000000 -/* 00378 809A2ED8 50800013 */ beql $a0, $zero, .L809A2F28 -/* 0037C 809A2EDC 44049000 */ mfc1 $a0, $f18 -/* 00380 809A2EE0 44819000 */ mtc1 $at, $f18 ## $f18 = 2147483648.00 -/* 00384 809A2EE4 24040001 */ addiu $a0, $zero, 0x0001 ## $a0 = 00000001 -/* 00388 809A2EE8 46128481 */ sub.s $f18, $f16, $f18 -/* 0038C 809A2EEC 44C4F800 */ ctc1 $a0, $31 -/* 00390 809A2EF0 00000000 */ nop -/* 00394 809A2EF4 460094A4 */ cvt.w.s $f18, $f18 -/* 00398 809A2EF8 4444F800 */ cfc1 $a0, $31 -/* 0039C 809A2EFC 00000000 */ nop -/* 003A0 809A2F00 30840078 */ andi $a0, $a0, 0x0078 ## $a0 = 00000000 -/* 003A4 809A2F04 14800005 */ bne $a0, $zero, .L809A2F1C -/* 003A8 809A2F08 00000000 */ nop -/* 003AC 809A2F0C 44049000 */ mfc1 $a0, $f18 -/* 003B0 809A2F10 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 003B4 809A2F14 10000007 */ beq $zero, $zero, .L809A2F34 -/* 003B8 809A2F18 00812025 */ or $a0, $a0, $at ## $a0 = 80000000 -.L809A2F1C: -/* 003BC 809A2F1C 10000005 */ beq $zero, $zero, .L809A2F34 -/* 003C0 809A2F20 2404FFFF */ addiu $a0, $zero, 0xFFFF ## $a0 = FFFFFFFF -/* 003C4 809A2F24 44049000 */ mfc1 $a0, $f18 -.L809A2F28: -/* 003C8 809A2F28 00000000 */ nop -/* 003CC 809A2F2C 0480FFFB */ bltz $a0, .L809A2F1C -/* 003D0 809A2F30 00000000 */ nop -.L809A2F34: -/* 003D4 809A2F34 308400FF */ andi $a0, $a0, 0x00FF ## $a0 = 000000FF -/* 003D8 809A2F38 00043600 */ sll $a2, $a0, 24 -/* 003DC 809A2F3C AC660004 */ sw $a2, 0x0004($v1) ## 00000004 -/* 003E0 809A2F40 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 003E4 809A2F44 00045C00 */ sll $t3, $a0, 16 -/* 003E8 809A2F48 00CB6025 */ or $t4, $a2, $t3 ## $t4 = 00000000 -/* 003EC 809A2F4C 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 003F0 809A2F50 AE0902D0 */ sw $t1, 0x02D0($s0) ## 000002D0 -/* 003F4 809A2F54 358D00FF */ ori $t5, $t4, 0x00FF ## $t5 = 000000FF -/* 003F8 809A2F58 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 003FC 809A2F5C AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 00400 809A2F60 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00404 809A2F64 44C8F800 */ ctc1 $t0, $31 -/* 00408 809A2F68 24080040 */ addiu $t0, $zero, 0x0040 ## $t0 = 00000040 -/* 0040C 809A2F6C 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 00410 809A2F70 AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 -/* 00414 809A2F74 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 00418 809A2F78 8FB80098 */ lw $t8, 0x0098($sp) -/* 0041C 809A2F7C 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 00420 809A2F80 240E0080 */ addiu $t6, $zero, 0x0080 ## $t6 = 00000080 -/* 00424 809A2F84 8F040000 */ lw $a0, 0x0000($t8) ## 00000008 -/* 00428 809A2F88 AFA0001C */ sw $zero, 0x001C($sp) -/* 0042C 809A2F8C AFA90018 */ sw $t1, 0x0018($sp) -/* 00430 809A2F90 AFA80014 */ sw $t0, 0x0014($sp) -/* 00434 809A2F94 AFB90010 */ sw $t9, 0x0010($sp) -/* 00438 809A2F98 862A0052 */ lh $t2, 0x0052($s1) ## 00000052 -/* 0043C 809A2F9C 240D0020 */ addiu $t5, $zero, 0x0020 ## $t5 = 00000020 -/* 00440 809A2FA0 AFAD0024 */ sw $t5, 0x0024($sp) -/* 00444 809A2FA4 000A0823 */ subu $at, $zero, $t2 -/* 00448 809A2FA8 00015880 */ sll $t3, $at, 2 -/* 0044C 809A2FAC 01615821 */ addu $t3, $t3, $at -/* 00450 809A2FB0 000B5880 */ sll $t3, $t3, 2 -/* 00454 809A2FB4 316C01FF */ andi $t4, $t3, 0x01FF ## $t4 = 00000000 -/* 00458 809A2FB8 AFAC0020 */ sw $t4, 0x0020($sp) -/* 0045C 809A2FBC AFAE0028 */ sw $t6, 0x0028($sp) -/* 00460 809A2FC0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00464 809A2FC4 0C0253D0 */ jal Gfx_TwoTexScroll -/* 00468 809A2FC8 AFA20058 */ sw $v0, 0x0058($sp) -/* 0046C 809A2FCC 8FA30058 */ lw $v1, 0x0058($sp) -/* 00470 809A2FD0 3C06809A */ lui $a2, %hi(D_809A3288) ## $a2 = 809A0000 -/* 00474 809A2FD4 3C09DE00 */ lui $t1, 0xDE00 ## $t1 = DE000000 -/* 00478 809A2FD8 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 0047C 809A2FDC 862F0050 */ lh $t7, 0x0050($s1) ## 00000050 -/* 00480 809A2FE0 24C63288 */ addiu $a2, $a2, %lo(D_809A3288) ## $a2 = 809A3288 -/* 00484 809A2FE4 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFD0 -/* 00488 809A2FE8 31F87FFF */ andi $t8, $t7, 0x7FFF ## $t8 = 00000000 -/* 0048C 809A2FEC 17000006 */ bne $t8, $zero, .L809A3008 -/* 00490 809A2FF0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00494 809A2FF4 8639005C */ lh $t9, 0x005C($s1) ## 0000005C -/* 00498 809A2FF8 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 -/* 0049C 809A2FFC 2B210012 */ slti $at, $t9, 0x0012 -/* 004A0 809A3000 5020000A */ beql $at, $zero, .L809A302C -/* 004A4 809A3004 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -.L809A3008: -/* 004A8 809A3008 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 004AC 809A300C 3C0A0405 */ lui $t2, 0x0405 ## $t2 = 04050000 -/* 004B0 809A3010 254AD5A0 */ addiu $t2, $t2, 0xD5A0 ## $t2 = 0404D5A0 -/* 004B4 809A3014 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 -/* 004B8 809A3018 AE0802D0 */ sw $t0, 0x02D0($s0) ## 000002D0 -/* 004BC 809A301C AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 -/* 004C0 809A3020 10000008 */ beq $zero, $zero, .L809A3044 -/* 004C4 809A3024 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 004C8 809A3028 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -.L809A302C: -/* 004CC 809A302C 3C0D0405 */ lui $t5, 0x0405 ## $t5 = 04050000 -/* 004D0 809A3030 25ADD4E0 */ addiu $t5, $t5, 0xD4E0 ## $t5 = 0404D4E0 -/* 004D4 809A3034 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 004D8 809A3038 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 -/* 004DC 809A303C AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 004E0 809A3040 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -.L809A3044: -/* 004E4 809A3044 0C031AD5 */ jal Graph_CloseDisps -/* 004E8 809A3048 240700D5 */ addiu $a3, $zero, 0x00D5 ## $a3 = 000000D5 -/* 004EC 809A304C 8FBF003C */ lw $ra, 0x003C($sp) -/* 004F0 809A3050 8FB00034 */ lw $s0, 0x0034($sp) -/* 004F4 809A3054 8FB10038 */ lw $s1, 0x0038($sp) -/* 004F8 809A3058 03E00008 */ jr $ra -/* 004FC 809A305C 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/func_809A3060.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/func_809A3060.s deleted file mode 100644 index 04b4c971f2..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/func_809A3060.s +++ /dev/null @@ -1,136 +0,0 @@ -.late_rodata -glabel D_809A32A8 - .float 9.58738019108e-05 - -glabel D_809A32AC - .float 9.58738019108e-05 - -.text -glabel func_809A3060 -/* 00500 809A3060 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00504 809A3064 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00508 809A3068 AFB00020 */ sw $s0, 0x0020($sp) -/* 0050C 809A306C AFA40028 */ sw $a0, 0x0028($sp) -/* 00510 809A3070 AFA5002C */ sw $a1, 0x002C($sp) -/* 00514 809A3074 84CE0052 */ lh $t6, 0x0052($a2) ## 00000052 -/* 00518 809A3078 8CC2003C */ lw $v0, 0x003C($a2) ## 0000003C -/* 0051C 809A307C 00C08025 */ or $s0, $a2, $zero ## $s0 = 00000000 -/* 00520 809A3080 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 00524 809A3084 10400067 */ beq $v0, $zero, .L809A3224 -/* 00528 809A3088 A4CF0052 */ sh $t7, 0x0052($a2) ## 00000052 -/* 0052C 809A308C 90580114 */ lbu $t8, 0x0114($v0) ## 00000114 -/* 00530 809A3090 26040042 */ addiu $a0, $s0, 0x0042 ## $a0 = 00000042 -/* 00534 809A3094 2B010016 */ slti $at, $t8, 0x0016 -/* 00538 809A3098 54200006 */ bnel $at, $zero, .L809A30B4 -/* 0053C 809A309C 8C490130 */ lw $t1, 0x0130($v0) ## 00000130 -/* 00540 809A30A0 84D9005C */ lh $t9, 0x005C($a2) ## 0000005C -/* 00544 809A30A4 8CC2003C */ lw $v0, 0x003C($a2) ## 0000003C -/* 00548 809A30A8 27280001 */ addiu $t0, $t9, 0x0001 ## $t0 = 00000001 -/* 0054C 809A30AC A4C8005C */ sh $t0, 0x005C($a2) ## 0000005C -/* 00550 809A30B0 8C490130 */ lw $t1, 0x0130($v0) ## 00000130 -.L809A30B4: -/* 00554 809A30B4 51200056 */ beql $t1, $zero, .L809A3210 -/* 00558 809A30B8 8619004C */ lh $t9, 0x004C($s0) ## 0000004C -/* 0055C 809A30BC 86050040 */ lh $a1, 0x0040($s0) ## 00000040 -/* 00560 809A30C0 AFA00010 */ sw $zero, 0x0010($sp) -/* 00564 809A30C4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00568 809A30C8 000538C3 */ sra $a3, $a1, 3 -/* 0056C 809A30CC 00073C00 */ sll $a3, $a3, 16 -/* 00570 809A30D0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00574 809A30D4 00073C03 */ sra $a3, $a3, 16 -/* 00578 809A30D8 8603004E */ lh $v1, 0x004E($s0) ## 0000004E -/* 0057C 809A30DC 04630027 */ bgezl $v1, .L809A317C -/* 00580 809A30E0 86080050 */ lh $t0, 0x0050($s0) ## 00000050 -/* 00584 809A30E4 8E02003C */ lw $v0, 0x003C($s0) ## 0000003C -/* 00588 809A30E8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0058C 809A30EC C44C0024 */ lwc1 $f12, 0x0024($v0) ## 00000024 -/* 00590 809A30F0 C44E0028 */ lwc1 $f14, 0x0028($v0) ## 00000028 -/* 00594 809A30F4 0C034261 */ jal Matrix_Translate -/* 00598 809A30F8 8C46002C */ lw $a2, 0x002C($v0) ## 0000002C -/* 0059C 809A30FC 8E0B003C */ lw $t3, 0x003C($s0) ## 0000003C -/* 005A0 809A3100 860A004A */ lh $t2, 0x004A($s0) ## 0000004A -/* 005A4 809A3104 3C01809A */ lui $at, %hi(D_809A32A8) ## $at = 809A0000 -/* 005A8 809A3108 856C00B6 */ lh $t4, 0x00B6($t3) ## 000000B6 -/* 005AC 809A310C C42832A8 */ lwc1 $f8, %lo(D_809A32A8)($at) -/* 005B0 809A3110 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 005B4 809A3114 014C6821 */ addu $t5, $t2, $t4 -/* 005B8 809A3118 448D2000 */ mtc1 $t5, $f4 ## $f4 = 0.00 -/* 005BC 809A311C 00000000 */ nop -/* 005C0 809A3120 468021A0 */ cvt.s.w $f6, $f4 -/* 005C4 809A3124 46083302 */ mul.s $f12, $f6, $f8 -/* 005C8 809A3128 0C034348 */ jal Matrix_RotateY -/* 005CC 809A312C 00000000 */ nop -/* 005D0 809A3130 8E0F003C */ lw $t7, 0x003C($s0) ## 0000003C -/* 005D4 809A3134 860E0048 */ lh $t6, 0x0048($s0) ## 00000048 -/* 005D8 809A3138 3C01809A */ lui $at, %hi(D_809A32AC) ## $at = 809A0000 -/* 005DC 809A313C 85F800B4 */ lh $t8, 0x00B4($t7) ## 000000B4 -/* 005E0 809A3140 C43232AC */ lwc1 $f18, %lo(D_809A32AC)($at) -/* 005E4 809A3144 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 005E8 809A3148 01D8C821 */ addu $t9, $t6, $t8 -/* 005EC 809A314C 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 -/* 005F0 809A3150 00000000 */ nop -/* 005F4 809A3154 46805420 */ cvt.s.w $f16, $f10 -/* 005F8 809A3158 46128302 */ mul.s $f12, $f16, $f18 -/* 005FC 809A315C 0C0342DC */ jal Matrix_RotateX -/* 00600 809A3160 00000000 */ nop -/* 00604 809A3164 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C -/* 00608 809A3168 0C0346BD */ jal Matrix_MultVec3f -/* 0060C 809A316C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00610 809A3170 1000002D */ beq $zero, $zero, .L809A3228 -/* 00614 809A3174 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00618 809A3178 86080050 */ lh $t0, 0x0050($s0) ## 00000050 -.L809A317C: -/* 0061C 809A317C 00035080 */ sll $t2, $v1, 2 -/* 00620 809A3180 0003C080 */ sll $t8, $v1, 2 -/* 00624 809A3184 31098000 */ andi $t1, $t0, 0x8000 ## $t1 = 00000000 -/* 00628 809A3188 51200016 */ beql $t1, $zero, .L809A31E4 -/* 0062C 809A318C 8E0E003C */ lw $t6, 0x003C($s0) ## 0000003C -/* 00630 809A3190 8E0B003C */ lw $t3, 0x003C($s0) ## 0000003C -/* 00634 809A3194 01435023 */ subu $t2, $t2, $v1 -/* 00638 809A3198 000A5040 */ sll $t2, $t2, 1 -/* 0063C 809A319C 016A1021 */ addu $v0, $t3, $t2 -/* 00640 809A31A0 844C014C */ lh $t4, 0x014C($v0) ## 0000014C -/* 00644 809A31A4 448C2000 */ mtc1 $t4, $f4 ## $f4 = 0.00 -/* 00648 809A31A8 00000000 */ nop -/* 0064C 809A31AC 468021A0 */ cvt.s.w $f6, $f4 -/* 00650 809A31B0 E6060000 */ swc1 $f6, 0x0000($s0) ## 00000000 -/* 00654 809A31B4 844D014E */ lh $t5, 0x014E($v0) ## 0000014E -/* 00658 809A31B8 448D4000 */ mtc1 $t5, $f8 ## $f8 = 0.00 -/* 0065C 809A31BC 00000000 */ nop -/* 00660 809A31C0 468042A0 */ cvt.s.w $f10, $f8 -/* 00664 809A31C4 E60A0004 */ swc1 $f10, 0x0004($s0) ## 00000004 -/* 00668 809A31C8 844F0150 */ lh $t7, 0x0150($v0) ## 00000150 -/* 0066C 809A31CC 448F8000 */ mtc1 $t7, $f16 ## $f16 = 0.00 -/* 00670 809A31D0 00000000 */ nop -/* 00674 809A31D4 468084A0 */ cvt.s.w $f18, $f16 -/* 00678 809A31D8 10000012 */ beq $zero, $zero, .L809A3224 -/* 0067C 809A31DC E6120008 */ swc1 $f18, 0x0008($s0) ## 00000008 -/* 00680 809A31E0 8E0E003C */ lw $t6, 0x003C($s0) ## 0000003C -.L809A31E4: -/* 00684 809A31E4 0303C023 */ subu $t8, $t8, $v1 -/* 00688 809A31E8 0018C080 */ sll $t8, $t8, 2 -/* 0068C 809A31EC 01D81021 */ addu $v0, $t6, $t8 -/* 00690 809A31F0 C444014C */ lwc1 $f4, 0x014C($v0) ## 0000014C -/* 00694 809A31F4 E6040000 */ swc1 $f4, 0x0000($s0) ## 00000000 -/* 00698 809A31F8 C4460150 */ lwc1 $f6, 0x0150($v0) ## 00000150 -/* 0069C 809A31FC E6060004 */ swc1 $f6, 0x0004($s0) ## 00000004 -/* 006A0 809A3200 C4480154 */ lwc1 $f8, 0x0154($v0) ## 00000154 -/* 006A4 809A3204 10000007 */ beq $zero, $zero, .L809A3224 -/* 006A8 809A3208 E6080008 */ swc1 $f8, 0x0008($s0) ## 00000008 -/* 006AC 809A320C 8619004C */ lh $t9, 0x004C($s0) ## 0000004C -.L809A3210: -/* 006B0 809A3210 53200004 */ beql $t9, $zero, .L809A3224 -/* 006B4 809A3214 AE00003C */ sw $zero, 0x003C($s0) ## 0000003C -/* 006B8 809A3218 10000002 */ beq $zero, $zero, .L809A3224 -/* 006BC 809A321C A600005C */ sh $zero, 0x005C($s0) ## 0000005C -/* 006C0 809A3220 AE00003C */ sw $zero, 0x003C($s0) ## 0000003C -.L809A3224: -/* 006C4 809A3224 8FBF0024 */ lw $ra, 0x0024($sp) -.L809A3228: -/* 006C8 809A3228 8FB00020 */ lw $s0, 0x0020($sp) -/* 006CC 809A322C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 006D0 809A3230 03E00008 */ jr $ra -/* 006D4 809A3234 00000000 */ nop -/* 006D8 809A3238 00000000 */ nop -/* 006DC 809A323C 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/EffectSsEnIce_Init.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/EffectSsEnIce_Init.s deleted file mode 100644 index d496d610fc..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/EffectSsEnIce_Init.s +++ /dev/null @@ -1,185 +0,0 @@ -.rdata -glabel D_809A3BA0 - .asciz "Effect_Ss_En_Ice_ct():pid->mode_swがエラーです。\n" - .balign 4 - -.text -glabel EffectSsEnIce_Init -/* 00000 809A3330 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00004 809A3334 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00008 809A3338 AFA40030 */ sw $a0, 0x0030($sp) -/* 0000C 809A333C AFA50034 */ sw $a1, 0x0034($sp) -/* 00010 809A3340 84E20038 */ lh $v0, 0x0038($a3) ## 00000038 -/* 00014 809A3344 3C0E809A */ lui $t6, %hi(D_809A3B88) ## $t6 = 809A0000 -/* 00018 809A3348 25CE3B88 */ addiu $t6, $t6, %lo(D_809A3B88) ## $t6 = 809A3B88 -/* 0001C 809A334C 14400054 */ bne $v0, $zero, .L809A34A0 -/* 00020 809A3350 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00024 809A3354 8DD80000 */ lw $t8, 0x0000($t6) ## 809A3B88 -/* 00028 809A3358 27A20020 */ addiu $v0, $sp, 0x0020 ## $v0 = FFFFFFF0 -/* 0002C 809A335C 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 00030 809A3360 AC580000 */ sw $t8, 0x0000($v0) ## FFFFFFF0 -/* 00034 809A3364 8DCF0004 */ lw $t7, 0x0004($t6) ## 809A3B8C -/* 00038 809A3368 AC4F0004 */ sw $t7, 0x0004($v0) ## FFFFFFF4 -/* 0003C 809A336C 8DD80008 */ lw $t8, 0x0008($t6) ## 809A3B90 -/* 00040 809A3370 AC580008 */ sw $t8, 0x0008($v0) ## FFFFFFF8 -/* 00044 809A3374 8CE80004 */ lw $t0, 0x0004($a3) ## 00000004 -/* 00048 809A3378 2418000A */ addiu $t8, $zero, 0x000A ## $t8 = 0000000A -/* 0004C 809A337C ACC80000 */ sw $t0, 0x0000($a2) ## 00000000 -/* 00050 809A3380 8CF90008 */ lw $t9, 0x0008($a3) ## 00000008 -/* 00054 809A3384 C4C40000 */ lwc1 $f4, 0x0000($a2) ## 00000000 -/* 00058 809A3388 ACD90004 */ sw $t9, 0x0004($a2) ## 00000004 -/* 0005C 809A338C 8CE8000C */ lw $t0, 0x000C($a3) ## 0000000C -/* 00060 809A3390 C4CA0004 */ lwc1 $f10, 0x0004($a2) ## 00000004 -/* 00064 809A3394 ACC80008 */ sw $t0, 0x0008($a2) ## 00000008 -/* 00068 809A3398 8CE90000 */ lw $t1, 0x0000($a3) ## 00000000 -/* 0006C 809A339C 3C08809A */ lui $t0, %hi(func_809A35DC) ## $t0 = 809A0000 -/* 00070 809A33A0 250835DC */ addiu $t0, $t0, %lo(func_809A35DC) ## $t0 = 809A35DC -/* 00074 809A33A4 C5260024 */ lwc1 $f6, 0x0024($t1) ## 00000024 -/* 00078 809A33A8 3C09809A */ lui $t1, %hi(func_809A3988) ## $t1 = 809A0000 -/* 0007C 809A33AC 25293988 */ addiu $t1, $t1, %lo(func_809A3988) ## $t1 = 809A3988 -/* 00080 809A33B0 46062201 */ sub.s $f8, $f4, $f6 -/* 00084 809A33B4 C4C40008 */ lwc1 $f4, 0x0008($a2) ## 00000008 -/* 00088 809A33B8 E4C8002C */ swc1 $f8, 0x002C($a2) ## 0000002C -/* 0008C 809A33BC 8CEA0000 */ lw $t2, 0x0000($a3) ## 00000000 -/* 00090 809A33C0 C5500028 */ lwc1 $f16, 0x0028($t2) ## 00000028 -/* 00094 809A33C4 46105481 */ sub.s $f18, $f10, $f16 -/* 00098 809A33C8 44818000 */ mtc1 $at, $f16 ## $f16 = 100.00 -/* 0009C 809A33CC 3C014780 */ lui $at, 0x4780 ## $at = 47800000 -/* 000A0 809A33D0 44816000 */ mtc1 $at, $f12 ## $f12 = 65536.00 -/* 000A4 809A33D4 E4D20030 */ swc1 $f18, 0x0030($a2) ## 00000030 -/* 000A8 809A33D8 8CEB0000 */ lw $t3, 0x0000($a3) ## 00000000 -/* 000AC 809A33DC C566002C */ lwc1 $f6, 0x002C($t3) ## 0000002C -/* 000B0 809A33E0 46062201 */ sub.s $f8, $f4, $f6 -/* 000B4 809A33E4 E4C80034 */ swc1 $f8, 0x0034($a2) ## 00000034 -/* 000B8 809A33E8 8C4D0000 */ lw $t5, 0x0000($v0) ## FFFFFFF0 -/* 000BC 809A33EC ACCD000C */ sw $t5, 0x000C($a2) ## 0000000C -/* 000C0 809A33F0 8C4C0004 */ lw $t4, 0x0004($v0) ## FFFFFFF4 -/* 000C4 809A33F4 ACCC0010 */ sw $t4, 0x0010($a2) ## 00000010 -/* 000C8 809A33F8 8C4D0008 */ lw $t5, 0x0008($v0) ## FFFFFFF8 -/* 000CC 809A33FC ACCD0014 */ sw $t5, 0x0014($a2) ## 00000014 -/* 000D0 809A3400 8C4F0000 */ lw $t7, 0x0000($v0) ## FFFFFFF0 -/* 000D4 809A3404 ACCF0018 */ sw $t7, 0x0018($a2) ## 00000018 -/* 000D8 809A3408 8C4E0004 */ lw $t6, 0x0004($v0) ## FFFFFFF4 -/* 000DC 809A340C ACCE001C */ sw $t6, 0x001C($a2) ## 0000001C -/* 000E0 809A3410 8C4F0008 */ lw $t7, 0x0008($v0) ## FFFFFFF8 -/* 000E4 809A3414 A4D8005C */ sh $t8, 0x005C($a2) ## 0000005C -/* 000E8 809A3418 ACCF0020 */ sw $t7, 0x0020($a2) ## 00000020 -/* 000EC 809A341C 8CF90000 */ lw $t9, 0x0000($a3) ## 00000000 -/* 000F0 809A3420 ACC80028 */ sw $t0, 0x0028($a2) ## 00000028 -/* 000F4 809A3424 ACC90024 */ sw $t1, 0x0024($a2) ## 00000024 -/* 000F8 809A3428 ACD9003C */ sw $t9, 0x003C($a2) ## 0000003C -/* 000FC 809A342C C4EA0010 */ lwc1 $f10, 0x0010($a3) ## 00000010 -/* 00100 809A3430 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 00104 809A3434 46105482 */ mul.s $f18, $f10, $f16 -/* 00108 809A3438 4600910D */ trunc.w.s $f4, $f18 -/* 0010C 809A343C 440B2000 */ mfc1 $t3, $f4 -/* 00110 809A3440 00000000 */ nop -/* 00114 809A3444 A4CB0058 */ sh $t3, 0x0058($a2) ## 00000058 -/* 00118 809A3448 90EC002C */ lbu $t4, 0x002C($a3) ## 0000002C -/* 0011C 809A344C A4CC0048 */ sh $t4, 0x0048($a2) ## 00000048 -/* 00120 809A3450 90ED002D */ lbu $t5, 0x002D($a3) ## 0000002D -/* 00124 809A3454 A4CD004A */ sh $t5, 0x004A($a2) ## 0000004A -/* 00128 809A3458 90EE002E */ lbu $t6, 0x002E($a3) ## 0000002E -/* 0012C 809A345C A4CE004C */ sh $t6, 0x004C($a2) ## 0000004C -/* 00130 809A3460 90EF002F */ lbu $t7, 0x002F($a3) ## 0000002F -/* 00134 809A3464 A4CF004E */ sh $t7, 0x004E($a2) ## 0000004E -/* 00138 809A3468 90F80030 */ lbu $t8, 0x0030($a3) ## 00000030 -/* 0013C 809A346C A4D80050 */ sh $t8, 0x0050($a2) ## 00000050 -/* 00140 809A3470 90F90031 */ lbu $t9, 0x0031($a3) ## 00000031 -/* 00144 809A3474 A4D90052 */ sh $t9, 0x0052($a2) ## 00000052 -/* 00148 809A3478 90E80032 */ lbu $t0, 0x0032($a3) ## 00000032 -/* 0014C 809A347C A4C90056 */ sh $t1, 0x0056($a2) ## 00000056 -/* 00150 809A3480 A4C80054 */ sh $t0, 0x0054($a2) ## 00000054 -/* 00154 809A3484 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 00158 809A3488 AFA60038 */ sw $a2, 0x0038($sp) -/* 0015C 809A348C 4600018D */ trunc.w.s $f6, $f0 -/* 00160 809A3490 8FA60038 */ lw $a2, 0x0038($sp) -/* 00164 809A3494 440B3000 */ mfc1 $t3, $f6 -/* 00168 809A3498 1000004B */ beq $zero, $zero, .L809A35C8 -/* 0016C 809A349C A4CB0044 */ sh $t3, 0x0044($a2) ## 00000044 -.L809A34A0: -/* 00170 809A34A0 14410045 */ bne $v0, $at, .L809A35B8 -/* 00174 809A34A4 3C04809A */ lui $a0, %hi(D_809A3BA0) ## $a0 = 809A0000 -/* 00178 809A34A8 24E20004 */ addiu $v0, $a3, 0x0004 ## $v0 = 00000004 -/* 0017C 809A34AC 8C4D0000 */ lw $t5, 0x0000($v0) ## 00000004 -/* 00180 809A34B0 3C0B809A */ lui $t3, %hi(func_809A35DC) ## $t3 = 809A0000 -/* 00184 809A34B4 256B35DC */ addiu $t3, $t3, %lo(func_809A35DC) ## $t3 = 809A35DC -/* 00188 809A34B8 ACCD0000 */ sw $t5, 0x0000($a2) ## 00000000 -/* 0018C 809A34BC 8C4C0004 */ lw $t4, 0x0004($v0) ## 00000008 -/* 00190 809A34C0 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 00194 809A34C4 44815000 */ mtc1 $at, $f10 ## $f10 = 100.00 -/* 00198 809A34C8 ACCC0004 */ sw $t4, 0x0004($a2) ## 00000004 -/* 0019C 809A34CC 8C4D0008 */ lw $t5, 0x0008($v0) ## 0000000C -/* 001A0 809A34D0 3C0C809A */ lui $t4, %hi(func_809A3B60) ## $t4 = 809A0000 -/* 001A4 809A34D4 258C3B60 */ addiu $t4, $t4, %lo(func_809A3B60) ## $t4 = 809A3B60 -/* 001A8 809A34D8 ACCD0008 */ sw $t5, 0x0008($a2) ## 00000008 -/* 001AC 809A34DC 8C4F0000 */ lw $t7, 0x0000($v0) ## 00000004 -/* 001B0 809A34E0 ACCF002C */ sw $t7, 0x002C($a2) ## 0000002C -/* 001B4 809A34E4 8C4E0004 */ lw $t6, 0x0004($v0) ## 00000008 -/* 001B8 809A34E8 ACCE0030 */ sw $t6, 0x0030($a2) ## 00000030 -/* 001BC 809A34EC 8C4F0008 */ lw $t7, 0x0008($v0) ## 0000000C -/* 001C0 809A34F0 ACCF0034 */ sw $t7, 0x0034($a2) ## 00000034 -/* 001C4 809A34F4 8CF90014 */ lw $t9, 0x0014($a3) ## 00000014 -/* 001C8 809A34F8 ACD9000C */ sw $t9, 0x000C($a2) ## 0000000C -/* 001CC 809A34FC 8CF80018 */ lw $t8, 0x0018($a3) ## 00000018 -/* 001D0 809A3500 ACD80010 */ sw $t8, 0x0010($a2) ## 00000010 -/* 001D4 809A3504 8CF9001C */ lw $t9, 0x001C($a3) ## 0000001C -/* 001D8 809A3508 ACD90014 */ sw $t9, 0x0014($a2) ## 00000014 -/* 001DC 809A350C 8CE90020 */ lw $t1, 0x0020($a3) ## 00000020 -/* 001E0 809A3510 ACC90018 */ sw $t1, 0x0018($a2) ## 00000018 -/* 001E4 809A3514 8CE80024 */ lw $t0, 0x0024($a3) ## 00000024 -/* 001E8 809A3518 ACC8001C */ sw $t0, 0x001C($a2) ## 0000001C -/* 001EC 809A351C 8CE90028 */ lw $t1, 0x0028($a3) ## 00000028 -/* 001F0 809A3520 ACC90020 */ sw $t1, 0x0020($a2) ## 00000020 -/* 001F4 809A3524 8CEA0034 */ lw $t2, 0x0034($a3) ## 00000034 -/* 001F8 809A3528 ACCB0028 */ sw $t3, 0x0028($a2) ## 00000028 -/* 001FC 809A352C ACCC0024 */ sw $t4, 0x0024($a2) ## 00000024 -/* 00200 809A3530 A4CA005C */ sh $t2, 0x005C($a2) ## 0000005C -/* 00204 809A3534 8CED0034 */ lw $t5, 0x0034($a3) ## 00000034 -/* 00208 809A3538 A4CD0040 */ sh $t5, 0x0040($a2) ## 00000040 -/* 0020C 809A353C C4E80010 */ lwc1 $f8, 0x0010($a3) ## 00000010 -/* 00210 809A3540 460A4402 */ mul.s $f16, $f8, $f10 -/* 00214 809A3544 4600848D */ trunc.w.s $f18, $f16 -/* 00218 809A3548 440F9000 */ mfc1 $t7, $f18 -/* 0021C 809A354C 00000000 */ nop -/* 00220 809A3550 A4CF0058 */ sh $t7, 0x0058($a2) ## 00000058 -/* 00224 809A3554 C4EE0014 */ lwc1 $f14, 0x0014($a3) ## 00000014 -/* 00228 809A3558 C4EC001C */ lwc1 $f12, 0x001C($a3) ## 0000001C -/* 0022C 809A355C AFA7003C */ sw $a3, 0x003C($sp) -/* 00230 809A3560 0C034199 */ jal atan2s - -/* 00234 809A3564 AFA60038 */ sw $a2, 0x0038($sp) -/* 00238 809A3568 8FA60038 */ lw $a2, 0x0038($sp) -/* 0023C 809A356C 8FA7003C */ lw $a3, 0x003C($sp) -/* 00240 809A3570 A4C20042 */ sh $v0, 0x0042($a2) ## 00000042 -/* 00244 809A3574 A4C00044 */ sh $zero, 0x0044($a2) ## 00000044 -/* 00248 809A3578 90F8002C */ lbu $t8, 0x002C($a3) ## 0000002C -/* 0024C 809A357C A4D80048 */ sh $t8, 0x0048($a2) ## 00000048 -/* 00250 809A3580 90F9002D */ lbu $t9, 0x002D($a3) ## 0000002D -/* 00254 809A3584 A4D9004A */ sh $t9, 0x004A($a2) ## 0000004A -/* 00258 809A3588 90E8002E */ lbu $t0, 0x002E($a3) ## 0000002E -/* 0025C 809A358C A4C8004C */ sh $t0, 0x004C($a2) ## 0000004C -/* 00260 809A3590 90E9002F */ lbu $t1, 0x002F($a3) ## 0000002F -/* 00264 809A3594 A4C9004E */ sh $t1, 0x004E($a2) ## 0000004E -/* 00268 809A3598 90EA0030 */ lbu $t2, 0x0030($a3) ## 00000030 -/* 0026C 809A359C A4CA0050 */ sh $t2, 0x0050($a2) ## 00000050 -/* 00270 809A35A0 90EB0031 */ lbu $t3, 0x0031($a3) ## 00000031 -/* 00274 809A35A4 A4CB0052 */ sh $t3, 0x0052($a2) ## 00000052 -/* 00278 809A35A8 90EC0032 */ lbu $t4, 0x0032($a3) ## 00000032 -/* 0027C 809A35AC A4C00056 */ sh $zero, 0x0056($a2) ## 00000056 -/* 00280 809A35B0 10000005 */ beq $zero, $zero, .L809A35C8 -/* 00284 809A35B4 A4CC0054 */ sh $t4, 0x0054($a2) ## 00000054 -.L809A35B8: -/* 00288 809A35B8 0C00084C */ jal osSyncPrintf - -/* 0028C 809A35BC 24843BA0 */ addiu $a0, $a0, %lo(D_809A3BA0) ## $a0 = 00003BA0 -/* 00290 809A35C0 10000002 */ beq $zero, $zero, .L809A35CC -/* 00294 809A35C4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L809A35C8: -/* 00298 809A35C8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L809A35CC: -/* 0029C 809A35CC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 002A0 809A35D0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 002A4 809A35D4 03E00008 */ jr $ra -/* 002A8 809A35D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A35DC.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A35DC.s deleted file mode 100644 index 88e6f4d790..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A35DC.s +++ /dev/null @@ -1,269 +0,0 @@ -.rdata -glabel D_809A3BD4 - .asciz "../z_eff_en_ice.c" - .balign 4 - -glabel D_809A3BE8 - .asciz "../z_eff_en_ice.c" - .balign 4 - -glabel D_809A3BFC - .asciz "../z_eff_en_ice.c" - .balign 4 - -.late_rodata -glabel D_809A3C10 - .float 0.01 - -glabel D_809A3C14 - .float 9.58738019108e-05 - -glabel D_809A3C18 - .float 9.58738019108e-05 - -glabel D_809A3C1C - .float 89.8 - -.text -glabel func_809A35DC -/* 002AC 809A35DC 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 -/* 002B0 809A35E0 AFBF003C */ sw $ra, 0x003C($sp) -/* 002B4 809A35E4 AFB10038 */ sw $s1, 0x0038($sp) -/* 002B8 809A35E8 AFB00034 */ sw $s0, 0x0034($sp) -/* 002BC 809A35EC AFA40098 */ sw $a0, 0x0098($sp) -/* 002C0 809A35F0 AFA5009C */ sw $a1, 0x009C($sp) -/* 002C4 809A35F4 84CF0058 */ lh $t7, 0x0058($a2) ## 00000058 -/* 002C8 809A35F8 3C01809A */ lui $at, %hi(D_809A3C10) ## $at = 809A0000 -/* 002CC 809A35FC C4283C10 */ lwc1 $f8, %lo(D_809A3C10)($at) -/* 002D0 809A3600 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 002D4 809A3604 8C910000 */ lw $s1, 0x0000($a0) ## 00000000 -/* 002D8 809A3608 3C180001 */ lui $t8, 0x0001 ## $t8 = 00010000 -/* 002DC 809A360C 468021A0 */ cvt.s.w $f6, $f4 -/* 002E0 809A3610 0304C021 */ addu $t8, $t8, $a0 -/* 002E4 809A3614 00C08025 */ or $s0, $a2, $zero ## $s0 = 00000000 -/* 002E8 809A3618 3C06809A */ lui $a2, %hi(D_809A3BD4) ## $a2 = 809A0000 -/* 002EC 809A361C 24C63BD4 */ addiu $a2, $a2, %lo(D_809A3BD4) ## $a2 = 809A3BD4 -/* 002F0 809A3620 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFCC -/* 002F4 809A3624 46083282 */ mul.s $f10, $f6, $f8 -/* 002F8 809A3628 240700EB */ addiu $a3, $zero, 0x00EB ## $a3 = 000000EB -/* 002FC 809A362C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00300 809A3630 E7AA008C */ swc1 $f10, 0x008C($sp) -/* 00304 809A3634 8F181DE4 */ lw $t8, 0x1DE4($t8) ## 00011DE4 -/* 00308 809A3638 0C031AB1 */ jal Graph_OpenDisps -/* 0030C 809A363C AFB8007C */ sw $t8, 0x007C($sp) -/* 00310 809A3640 86190056 */ lh $t9, 0x0056($s0) ## 00000056 -/* 00314 809A3644 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00318 809A3648 5320000B */ beql $t9, $zero, .L809A3678 -/* 0031C 809A364C 86020040 */ lh $v0, 0x0040($s0) ## 00000040 -/* 00320 809A3650 8609005C */ lh $t1, 0x005C($s0) ## 0000005C -/* 00324 809A3654 00095080 */ sll $t2, $t1, 2 -/* 00328 809A3658 01495023 */ subu $t2, $t2, $t1 -/* 0032C 809A365C 000A5080 */ sll $t2, $t2, 2 -/* 00330 809A3660 448A8000 */ mtc1 $t2, $f16 ## $f16 = 0.00 -/* 00334 809A3664 00000000 */ nop -/* 00338 809A3668 468084A0 */ cvt.s.w $f18, $f16 -/* 0033C 809A366C 10000018 */ beq $zero, $zero, .L809A36D0 -/* 00340 809A3670 E7B20078 */ swc1 $f18, 0x0078($sp) -/* 00344 809A3674 86020040 */ lh $v0, 0x0040($s0) ## 00000040 -.L809A3678: -/* 00348 809A3678 58400012 */ blezl $v0, .L809A36C4 -/* 0034C 809A367C 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 00350 809A3680 8603005C */ lh $v1, 0x005C($s0) ## 0000005C -/* 00354 809A3684 00025843 */ sra $t3, $v0, 1 -/* 00358 809A3688 006B082A */ slt $at, $v1, $t3 -/* 0035C 809A368C 5020000D */ beql $at, $zero, .L809A36C4 -/* 00360 809A3690 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 00364 809A3694 44832000 */ mtc1 $v1, $f4 ## $f4 = 0.00 -/* 00368 809A3698 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 -/* 0036C 809A369C 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 00370 809A36A0 46802020 */ cvt.s.w $f0, $f4 -/* 00374 809A36A4 44818000 */ mtc1 $at, $f16 ## $f16 = 255.00 -/* 00378 809A36A8 468042A0 */ cvt.s.w $f10, $f8 -/* 0037C 809A36AC 46000180 */ add.s $f6, $f0, $f0 -/* 00380 809A36B0 460A3083 */ div.s $f2, $f6, $f10 -/* 00384 809A36B4 46101082 */ mul.s $f2, $f2, $f16 -/* 00388 809A36B8 10000005 */ beq $zero, $zero, .L809A36D0 -/* 0038C 809A36BC E7A20078 */ swc1 $f2, 0x0078($sp) -/* 00390 809A36C0 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -.L809A36C4: -/* 00394 809A36C4 44819000 */ mtc1 $at, $f18 ## $f18 = 255.00 -/* 00398 809A36C8 00000000 */ nop -/* 0039C 809A36CC E7B20078 */ swc1 $f18, 0x0078($sp) -.L809A36D0: -/* 003A0 809A36D0 C60C0000 */ lwc1 $f12, 0x0000($s0) ## 00000000 -/* 003A4 809A36D4 C60E0004 */ lwc1 $f14, 0x0004($s0) ## 00000004 -/* 003A8 809A36D8 0C034261 */ jal Matrix_Translate -/* 003AC 809A36DC 8E060008 */ lw $a2, 0x0008($s0) ## 00000008 -/* 003B0 809A36E0 C7AC008C */ lwc1 $f12, 0x008C($sp) -/* 003B4 809A36E4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 003B8 809A36E8 44066000 */ mfc1 $a2, $f12 -/* 003BC 809A36EC 0C0342A3 */ jal Matrix_Scale -/* 003C0 809A36F0 46006386 */ mov.s $f14, $f12 -/* 003C4 809A36F4 860C0042 */ lh $t4, 0x0042($s0) ## 00000042 -/* 003C8 809A36F8 3C01809A */ lui $at, %hi(D_809A3C14) ## $at = 809A0000 -/* 003CC 809A36FC C4263C14 */ lwc1 $f6, %lo(D_809A3C14)($at) -/* 003D0 809A3700 448C2000 */ mtc1 $t4, $f4 ## $f4 = 0.00 -/* 003D4 809A3704 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 003D8 809A3708 46802220 */ cvt.s.w $f8, $f4 -/* 003DC 809A370C 46064302 */ mul.s $f12, $f8, $f6 -/* 003E0 809A3710 0C034348 */ jal Matrix_RotateY -/* 003E4 809A3714 00000000 */ nop -/* 003E8 809A3718 860D0044 */ lh $t5, 0x0044($s0) ## 00000044 -/* 003EC 809A371C 3C01809A */ lui $at, %hi(D_809A3C18) ## $at = 809A0000 -/* 003F0 809A3720 C4323C18 */ lwc1 $f18, %lo(D_809A3C18)($at) -/* 003F4 809A3724 448D5000 */ mtc1 $t5, $f10 ## $f10 = 0.00 -/* 003F8 809A3728 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 003FC 809A372C 46805420 */ cvt.s.w $f16, $f10 -/* 00400 809A3730 46128302 */ mul.s $f12, $f16, $f18 -/* 00404 809A3734 0C0342DC */ jal Matrix_RotateX -/* 00408 809A3738 00000000 */ nop -/* 0040C 809A373C 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 00410 809A3740 3C0EDA38 */ lui $t6, 0xDA38 ## $t6 = DA380000 -/* 00414 809A3744 35CE0003 */ ori $t6, $t6, 0x0003 ## $t6 = DA380003 -/* 00418 809A3748 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 0041C 809A374C AE2F02D0 */ sw $t7, 0x02D0($s1) ## 000002D0 -/* 00420 809A3750 3C05809A */ lui $a1, %hi(D_809A3BE8) ## $a1 = 809A0000 -/* 00424 809A3754 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 00428 809A3758 24A53BE8 */ addiu $a1, $a1, %lo(D_809A3BE8) ## $a1 = 809A3BE8 -/* 0042C 809A375C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00430 809A3760 24060105 */ addiu $a2, $zero, 0x0105 ## $a2 = 00000105 -/* 00434 809A3764 0C0346A2 */ jal Matrix_NewMtx -/* 00438 809A3768 AFA20060 */ sw $v0, 0x0060($sp) -/* 0043C 809A376C 8FA30060 */ lw $v1, 0x0060($sp) -/* 00440 809A3770 3C01809A */ lui $at, %hi(D_809A3C1C) ## $at = 809A0000 -/* 00444 809A3774 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00448 809A3778 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 0044C 809A377C C4203C1C */ lwc1 $f0, %lo(D_809A3C1C)($at) -/* 00450 809A3780 8FB80098 */ lw $t8, 0x0098($sp) -/* 00454 809A3784 E7A40084 */ swc1 $f4, 0x0084($sp) -/* 00458 809A3788 E7A00080 */ swc1 $f0, 0x0080($sp) -/* 0045C 809A378C E7A00088 */ swc1 $f0, 0x0088($sp) -/* 00460 809A3790 0C024F61 */ jal func_80093D84 -/* 00464 809A3794 8F040000 */ lw $a0, 0x0000($t8) ## 00000000 -/* 00468 809A3798 8FA20098 */ lw $v0, 0x0098($sp) -/* 0046C 809A379C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00470 809A37A0 27A60080 */ addiu $a2, $sp, 0x0080 ## $a2 = FFFFFFE8 -/* 00474 809A37A4 244500E0 */ addiu $a1, $v0, 0x00E0 ## $a1 = 000000E0 -/* 00478 809A37A8 0C00BAD1 */ jal func_8002EB44 -/* 0047C 809A37AC 8C470000 */ lw $a3, 0x0000($v0) ## 00000000 -/* 00480 809A37B0 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 00484 809A37B4 8FA8007C */ lw $t0, 0x007C($sp) -/* 00488 809A37B8 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 -/* 0048C 809A37BC 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 00490 809A37C0 AE3902D0 */ sw $t9, 0x02D0($s1) ## 000002D0 -/* 00494 809A37C4 35290020 */ ori $t1, $t1, 0x0020 ## $t1 = DB060020 -/* 00498 809A37C8 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 0049C 809A37CC 8FAA0098 */ lw $t2, 0x0098($sp) -/* 004A0 809A37D0 00087840 */ sll $t7, $t0, 1 -/* 004A4 809A37D4 31EE00FF */ andi $t6, $t7, 0x00FF ## $t6 = 00000000 -/* 004A8 809A37D8 8D440000 */ lw $a0, 0x0000($t2) ## 00000000 -/* 004AC 809A37DC 24190020 */ addiu $t9, $zero, 0x0020 ## $t9 = 00000020 -/* 004B0 809A37E0 240B0020 */ addiu $t3, $zero, 0x0020 ## $t3 = 00000020 -/* 004B4 809A37E4 240C0010 */ addiu $t4, $zero, 0x0010 ## $t4 = 00000010 -/* 004B8 809A37E8 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 004BC 809A37EC 24180040 */ addiu $t8, $zero, 0x0040 ## $t8 = 00000040 -/* 004C0 809A37F0 AFB80024 */ sw $t8, 0x0024($sp) -/* 004C4 809A37F4 AFAD0018 */ sw $t5, 0x0018($sp) -/* 004C8 809A37F8 AFAC0014 */ sw $t4, 0x0014($sp) -/* 004CC 809A37FC AFAB0010 */ sw $t3, 0x0010($sp) -/* 004D0 809A3800 AFB90028 */ sw $t9, 0x0028($sp) -/* 004D4 809A3804 AFAE0020 */ sw $t6, 0x0020($sp) -/* 004D8 809A3808 AFA0001C */ sw $zero, 0x001C($sp) -/* 004DC 809A380C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 004E0 809A3810 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 004E4 809A3814 AFA2005C */ sw $v0, 0x005C($sp) -/* 004E8 809A3818 0C0253D0 */ jal Gfx_TwoTexScroll -/* 004EC 809A381C 310700FF */ andi $a3, $t0, 0x00FF ## $a3 = 00000000 -/* 004F0 809A3820 8FA3005C */ lw $v1, 0x005C($sp) -/* 004F4 809A3824 3C0AFA00 */ lui $t2, 0xFA00 ## $t2 = FA000000 -/* 004F8 809A3828 354A0080 */ ori $t2, $t2, 0x0080 ## $t2 = FA000080 -/* 004FC 809A382C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00500 809A3830 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 00504 809A3834 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFCC -/* 00508 809A3838 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0050C 809A383C 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 00510 809A3840 AE2902D0 */ sw $t1, 0x02D0($s1) ## 000002D0 -/* 00514 809A3844 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 00518 809A3848 860F0048 */ lh $t7, 0x0048($s0) ## 00000048 -/* 0051C 809A384C 860B004E */ lh $t3, 0x004E($s0) ## 0000004E -/* 00520 809A3850 8619004A */ lh $t9, 0x004A($s0) ## 0000004A -/* 00524 809A3854 860D004C */ lh $t5, 0x004C($s0) ## 0000004C -/* 00528 809A3858 000F7600 */ sll $t6, $t7, 24 -/* 0052C 809A385C 316C00FF */ andi $t4, $t3, 0x00FF ## $t4 = 00000000 -/* 00530 809A3860 018EC025 */ or $t8, $t4, $t6 ## $t8 = 00000000 -/* 00534 809A3864 332900FF */ andi $t1, $t9, 0x00FF ## $t1 = 00000000 -/* 00538 809A3868 00095400 */ sll $t2, $t1, 16 -/* 0053C 809A386C 31AF00FF */ andi $t7, $t5, 0x00FF ## $t7 = 00000000 -/* 00540 809A3870 000F6200 */ sll $t4, $t7, 8 -/* 00544 809A3874 030A5825 */ or $t3, $t8, $t2 ## $t3 = FA000080 -/* 00548 809A3878 016C7025 */ or $t6, $t3, $t4 ## $t6 = FA000080 -/* 0054C 809A387C AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 00550 809A3880 8E2302D0 */ lw $v1, 0x02D0($s1) ## 000002D0 -/* 00554 809A3884 3C09FB00 */ lui $t1, 0xFB00 ## $t1 = FB000000 -/* 00558 809A3888 444FF800 */ cfc1 $t7, $31 -/* 0055C 809A388C 24790008 */ addiu $t9, $v1, 0x0008 ## $t9 = 00000008 -/* 00560 809A3890 AE3902D0 */ sw $t9, 0x02D0($s1) ## 000002D0 -/* 00564 809A3894 AC690000 */ sw $t1, 0x0000($v1) ## 00000000 -/* 00568 809A3898 860B0050 */ lh $t3, 0x0050($s0) ## 00000050 -/* 0056C 809A389C C7A80078 */ lwc1 $f8, 0x0078($sp) -/* 00570 809A38A0 86180054 */ lh $t8, 0x0054($s0) ## 00000054 -/* 00574 809A38A4 000B6600 */ sll $t4, $t3, 24 -/* 00578 809A38A8 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 0057C 809A38AC 44CBF800 */ ctc1 $t3, $31 -/* 00580 809A38B0 86190052 */ lh $t9, 0x0052($s0) ## 00000052 -/* 00584 809A38B4 330A00FF */ andi $t2, $t8, 0x00FF ## $t2 = 00000000 -/* 00588 809A38B8 460041A4 */ cvt.w.s $f6, $f8 -/* 0058C 809A38BC 000A6A00 */ sll $t5, $t2, 8 -/* 00590 809A38C0 332900FF */ andi $t1, $t9, 0x00FF ## $t1 = 00000008 -/* 00594 809A38C4 0009C400 */ sll $t8, $t1, 16 -/* 00598 809A38C8 444BF800 */ cfc1 $t3, $31 -/* 0059C 809A38CC 01AC7025 */ or $t6, $t5, $t4 ## $t6 = 00000000 -/* 005A0 809A38D0 01D85025 */ or $t2, $t6, $t8 ## $t2 = 00000000 -/* 005A4 809A38D4 316B0078 */ andi $t3, $t3, 0x0078 ## $t3 = 00000000 -/* 005A8 809A38D8 11600013 */ beq $t3, $zero, .L809A3928 -/* 005AC 809A38DC 3C09DE00 */ lui $t1, 0xDE00 ## $t1 = DE000000 -/* 005B0 809A38E0 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 005B4 809A38E4 44813000 */ mtc1 $at, $f6 ## $f6 = 2147483648.00 -/* 005B8 809A38E8 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 005BC 809A38EC 46064181 */ sub.s $f6, $f8, $f6 -/* 005C0 809A38F0 44CBF800 */ ctc1 $t3, $31 -/* 005C4 809A38F4 00000000 */ nop -/* 005C8 809A38F8 460031A4 */ cvt.w.s $f6, $f6 -/* 005CC 809A38FC 444BF800 */ cfc1 $t3, $31 -/* 005D0 809A3900 00000000 */ nop -/* 005D4 809A3904 316B0078 */ andi $t3, $t3, 0x0078 ## $t3 = 00000000 -/* 005D8 809A3908 15600005 */ bne $t3, $zero, .L809A3920 -/* 005DC 809A390C 00000000 */ nop -/* 005E0 809A3910 440B3000 */ mfc1 $t3, $f6 -/* 005E4 809A3914 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 005E8 809A3918 10000007 */ beq $zero, $zero, .L809A3938 -/* 005EC 809A391C 01615825 */ or $t3, $t3, $at ## $t3 = 80000000 -.L809A3920: -/* 005F0 809A3920 10000005 */ beq $zero, $zero, .L809A3938 -/* 005F4 809A3924 240BFFFF */ addiu $t3, $zero, 0xFFFF ## $t3 = FFFFFFFF -.L809A3928: -/* 005F8 809A3928 440B3000 */ mfc1 $t3, $f6 -/* 005FC 809A392C 00000000 */ nop -/* 00600 809A3930 0560FFFB */ bltz $t3, .L809A3920 -/* 00604 809A3934 00000000 */ nop -.L809A3938: -/* 00608 809A3938 316D00FF */ andi $t5, $t3, 0x00FF ## $t5 = 000000FF -/* 0060C 809A393C 014D6025 */ or $t4, $t2, $t5 ## $t4 = 000000FF -/* 00610 809A3940 AC6C0004 */ sw $t4, 0x0004($v1) ## 00000004 -/* 00614 809A3944 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 00618 809A3948 3C0E0403 */ lui $t6, 0x0403 ## $t6 = 04030000 -/* 0061C 809A394C 44CFF800 */ ctc1 $t7, $31 -/* 00620 809A3950 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 00624 809A3954 AE3902D0 */ sw $t9, 0x02D0($s1) ## 000002D0 -/* 00628 809A3958 25CE3818 */ addiu $t6, $t6, 0x3818 ## $t6 = 04033818 -/* 0062C 809A395C 3C06809A */ lui $a2, %hi(D_809A3BFC) ## $a2 = 809A0000 -/* 00630 809A3960 24C63BFC */ addiu $a2, $a2, %lo(D_809A3BFC) ## $a2 = 809A3BFC -/* 00634 809A3964 24070126 */ addiu $a3, $zero, 0x0126 ## $a3 = 00000126 -/* 00638 809A3968 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 0063C 809A396C 0C031AD5 */ jal Graph_CloseDisps -/* 00640 809A3970 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 00644 809A3974 8FBF003C */ lw $ra, 0x003C($sp) -/* 00648 809A3978 8FB00034 */ lw $s0, 0x0034($sp) -/* 0064C 809A397C 8FB10038 */ lw $s1, 0x0038($sp) -/* 00650 809A3980 03E00008 */ jr $ra -/* 00654 809A3984 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A3988.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A3988.s deleted file mode 100644 index 6380d915d2..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A3988.s +++ /dev/null @@ -1,138 +0,0 @@ -.late_rodata -glabel D_809A3C20 - .float 65535.0 - -.text -glabel func_809A3988 -/* 00658 809A3988 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0065C 809A398C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00660 809A3990 AFB00020 */ sw $s0, 0x0020($sp) -/* 00664 809A3994 F7B40018 */ sdc1 $f20, 0x0018($sp) -/* 00668 809A3998 AFA40030 */ sw $a0, 0x0030($sp) -/* 0066C 809A399C AFA50034 */ sw $a1, 0x0034($sp) -/* 00670 809A39A0 8CC2003C */ lw $v0, 0x003C($a2) ## 0000003C -/* 00674 809A39A4 00C08025 */ or $s0, $a2, $zero ## $s0 = 00000000 -/* 00678 809A39A8 50400043 */ beql $v0, $zero, .L809A3AB8 -/* 0067C 809A39AC 8609005C */ lh $t1, 0x005C($s0) ## 0000005C -/* 00680 809A39B0 8C4E0130 */ lw $t6, 0x0130($v0) ## 00000130 -/* 00684 809A39B4 51C00040 */ beql $t6, $zero, .L809A3AB8 -/* 00688 809A39B8 8609005C */ lh $t1, 0x005C($s0) ## 0000005C -/* 0068C 809A39BC 84C3005C */ lh $v1, 0x005C($a2) ## 0000005C -/* 00690 809A39C0 28610009 */ slti $at, $v1, 0x0009 -/* 00694 809A39C4 54200018 */ bnel $at, $zero, .L809A3A28 -/* 00698 809A39C8 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 0069C 809A39CC 904F0114 */ lbu $t7, 0x0114($v0) ## 00000114 -/* 006A0 809A39D0 51E00015 */ beql $t7, $zero, .L809A3A28 -/* 006A4 809A39D4 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 006A8 809A39D8 94580112 */ lhu $t8, 0x0112($v0) ## 00000112 -/* 006AC 809A39DC 3319C000 */ andi $t9, $t8, 0xC000 ## $t9 = 00000000 -/* 006B0 809A39E0 57200011 */ bnel $t9, $zero, .L809A3A28 -/* 006B4 809A39E4 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 006B8 809A39E8 C4440024 */ lwc1 $f4, 0x0024($v0) ## 00000024 -/* 006BC 809A39EC C4C6002C */ lwc1 $f6, 0x002C($a2) ## 0000002C -/* 006C0 809A39F0 C4D00030 */ lwc1 $f16, 0x0030($a2) ## 00000030 -/* 006C4 809A39F4 24680001 */ addiu $t0, $v1, 0x0001 ## $t0 = 00000001 -/* 006C8 809A39F8 46062200 */ add.s $f8, $f4, $f6 -/* 006CC 809A39FC C4C60034 */ lwc1 $f6, 0x0034($a2) ## 00000034 -/* 006D0 809A3A00 E4C80000 */ swc1 $f8, 0x0000($a2) ## 00000000 -/* 006D4 809A3A04 C44A0028 */ lwc1 $f10, 0x0028($v0) ## 00000028 -/* 006D8 809A3A08 46105480 */ add.s $f18, $f10, $f16 -/* 006DC 809A3A0C E4D20004 */ swc1 $f18, 0x0004($a2) ## 00000004 -/* 006E0 809A3A10 C444002C */ lwc1 $f4, 0x002C($v0) ## 0000002C -/* 006E4 809A3A14 A4C8005C */ sh $t0, 0x005C($a2) ## 0000005C -/* 006E8 809A3A18 46062200 */ add.s $f8, $f4, $f6 -/* 006EC 809A3A1C 1000004B */ beq $zero, $zero, .L809A3B4C -/* 006F0 809A3A20 E4C80008 */ swc1 $f8, 0x0008($a2) ## 00000008 -/* 006F4 809A3A24 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -.L809A3A28: -/* 006F8 809A3A28 14610048 */ bne $v1, $at, .L809A3B4C -/* 006FC 809A3A2C 24440024 */ addiu $a0, $v0, 0x0024 ## $a0 = 00000024 -/* 00700 809A3A30 0C01E01A */ jal Math_Vec3f_Yaw - -/* 00704 809A3A34 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00708 809A3A38 00022400 */ sll $a0, $v0, 16 -/* 0070C 809A3A3C 0C01DE1C */ jal Math_Sins - ## sins? -/* 00710 809A3A40 00042403 */ sra $a0, $a0, 16 -/* 00714 809A3A44 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00718 809A3A48 46000506 */ mov.s $f20, $f0 -/* 0071C 809A3A4C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00720 809A3A50 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 -/* 00724 809A3A54 8E04003C */ lw $a0, 0x003C($s0) ## 0000003C -/* 00728 809A3A58 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0072C 809A3A5C 460A0400 */ add.s $f16, $f0, $f10 -/* 00730 809A3A60 24840024 */ addiu $a0, $a0, 0x0024 ## $a0 = 00000024 -/* 00734 809A3A64 46148482 */ mul.s $f18, $f16, $f20 -/* 00738 809A3A68 0C01E01A */ jal Math_Vec3f_Yaw - -/* 0073C 809A3A6C E6120018 */ swc1 $f18, 0x0018($s0) ## 00000018 -/* 00740 809A3A70 00022400 */ sll $a0, $v0, 16 -/* 00744 809A3A74 0C01DE0D */ jal Math_Coss - ## coss? -/* 00748 809A3A78 00042403 */ sra $a0, $a0, 16 -/* 0074C 809A3A7C 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00750 809A3A80 46000506 */ mov.s $f20, $f0 -/* 00754 809A3A84 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00758 809A3A88 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 0075C 809A3A8C 3C01BFC0 */ lui $at, 0xBFC0 ## $at = BFC00000 -/* 00760 809A3A90 44815000 */ mtc1 $at, $f10 ## $f10 = -1.50 -/* 00764 809A3A94 46040180 */ add.s $f6, $f0, $f4 -/* 00768 809A3A98 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 0076C 809A3A9C 44818000 */ mtc1 $at, $f16 ## $f16 = 5.00 -/* 00770 809A3AA0 E60A001C */ swc1 $f10, 0x001C($s0) ## 0000001C -/* 00774 809A3AA4 46143202 */ mul.s $f8, $f6, $f20 -/* 00778 809A3AA8 E6100010 */ swc1 $f16, 0x0010($s0) ## 00000010 -/* 0077C 809A3AAC 10000027 */ beq $zero, $zero, .L809A3B4C -/* 00780 809A3AB0 E6080020 */ swc1 $f8, 0x0020($s0) ## 00000020 -/* 00784 809A3AB4 8609005C */ lh $t1, 0x005C($s0) ## 0000005C -.L809A3AB8: -/* 00788 809A3AB8 29210009 */ slti $at, $t1, 0x0009 -/* 0078C 809A3ABC 14200023 */ bne $at, $zero, .L809A3B4C -/* 00790 809A3AC0 3C01809A */ lui $at, %hi(D_809A3C20) ## $at = 809A0000 -/* 00794 809A3AC4 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 00798 809A3AC8 C42C3C20 */ lwc1 $f12, %lo(D_809A3C20)($at) -/* 0079C 809A3ACC 4600048D */ trunc.w.s $f18, $f0 -/* 007A0 809A3AD0 44029000 */ mfc1 $v0, $f18 -/* 007A4 809A3AD4 00000000 */ nop -/* 007A8 809A3AD8 00022400 */ sll $a0, $v0, 16 -/* 007AC 809A3ADC 00042403 */ sra $a0, $a0, 16 -/* 007B0 809A3AE0 0C01DE1C */ jal Math_Sins - ## sins? -/* 007B4 809A3AE4 A7A2002E */ sh $v0, 0x002E($sp) -/* 007B8 809A3AE8 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 007BC 809A3AEC 46000506 */ mov.s $f20, $f0 -/* 007C0 809A3AF0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 007C4 809A3AF4 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 007C8 809A3AF8 00000000 */ nop -/* 007CC 809A3AFC 46040180 */ add.s $f6, $f0, $f4 -/* 007D0 809A3B00 46143202 */ mul.s $f8, $f6, $f20 -/* 007D4 809A3B04 E6080018 */ swc1 $f8, 0x0018($s0) ## 00000018 -/* 007D8 809A3B08 0C01DE0D */ jal Math_Coss - ## coss? -/* 007DC 809A3B0C 87A4002E */ lh $a0, 0x002E($sp) -/* 007E0 809A3B10 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 007E4 809A3B14 46000506 */ mov.s $f20, $f0 -/* 007E8 809A3B18 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 007EC 809A3B1C 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 -/* 007F0 809A3B20 3C01BFC0 */ lui $at, 0xBFC0 ## $at = BFC00000 -/* 007F4 809A3B24 44812000 */ mtc1 $at, $f4 ## $f4 = -1.50 -/* 007F8 809A3B28 460A0400 */ add.s $f16, $f0, $f10 -/* 007FC 809A3B2C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 00800 809A3B30 44813000 */ mtc1 $at, $f6 ## $f6 = 5.00 -/* 00804 809A3B34 240B0008 */ addiu $t3, $zero, 0x0008 ## $t3 = 00000008 -/* 00808 809A3B38 46148482 */ mul.s $f18, $f16, $f20 -/* 0080C 809A3B3C A60B005C */ sh $t3, 0x005C($s0) ## 0000005C -/* 00810 809A3B40 E604001C */ swc1 $f4, 0x001C($s0) ## 0000001C -/* 00814 809A3B44 E6060010 */ swc1 $f6, 0x0010($s0) ## 00000010 -/* 00818 809A3B48 E6120020 */ swc1 $f18, 0x0020($s0) ## 00000020 -.L809A3B4C: -/* 0081C 809A3B4C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00820 809A3B50 D7B40018 */ ldc1 $f20, 0x0018($sp) -/* 00824 809A3B54 8FB00020 */ lw $s0, 0x0020($sp) -/* 00828 809A3B58 03E00008 */ jr $ra -/* 0082C 809A3B5C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A3B60.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A3B60.s deleted file mode 100644 index d55bcdb6e0..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A3B60.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_809A3B60 -/* 00830 809A3B60 AFA40000 */ sw $a0, 0x0000($sp) -/* 00834 809A3B64 AFA50004 */ sw $a1, 0x0004($sp) -/* 00838 809A3B68 84CE0044 */ lh $t6, 0x0044($a2) ## 00000044 -/* 0083C 809A3B6C 84CF0046 */ lh $t7, 0x0046($a2) ## 00000046 -/* 00840 809A3B70 01CFC021 */ addu $t8, $t6, $t7 -/* 00844 809A3B74 03E00008 */ jr $ra -/* 00848 809A3B78 A4D80044 */ sh $t8, 0x0044($a2) ## 00000044 -/* 0084C 809A3B7C 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fcircle/EffectSsFcircle_Init.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fcircle/EffectSsFcircle_Init.s deleted file mode 100644 index e591b9c55b..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fcircle/EffectSsFcircle_Init.s +++ /dev/null @@ -1,48 +0,0 @@ -glabel EffectSsFcircle_Init -/* 00000 809A4120 AFA40000 */ sw $a0, 0x0000($sp) -/* 00004 809A4124 AFA50004 */ sw $a1, 0x0004($sp) -/* 00008 809A4128 8CEF0004 */ lw $t7, 0x0004($a3) ## 00000004 -/* 0000C 809A412C 3C0A0402 */ lui $t2, 0x0402 ## $t2 = 04020000 -/* 00010 809A4130 3C0C809A */ lui $t4, %hi(func_809A41DC) ## $t4 = 809A0000 -/* 00014 809A4134 ACCF0000 */ sw $t7, 0x0000($a2) ## 00000000 -/* 00018 809A4138 8CEE0008 */ lw $t6, 0x0008($a3) ## 00000008 -/* 0001C 809A413C 3C0D809A */ lui $t5, %hi(func_809A44E0) ## $t5 = 809A0000 -/* 00020 809A4140 254A84B0 */ addiu $t2, $t2, 0x84B0 ## $t2 = 040184B0 -/* 00024 809A4144 ACCE0004 */ sw $t6, 0x0004($a2) ## 00000004 -/* 00028 809A4148 8CEF000C */ lw $t7, 0x000C($a3) ## 0000000C -/* 0002C 809A414C 240B0014 */ addiu $t3, $zero, 0x0014 ## $t3 = 00000014 -/* 00030 809A4150 258C41DC */ addiu $t4, $t4, %lo(func_809A41DC) ## $t4 = 809A41DC -/* 00034 809A4154 ACCF0008 */ sw $t7, 0x0008($a2) ## 00000008 -/* 00038 809A4158 8CF80000 */ lw $t8, 0x0000($a3) ## 00000000 -/* 0003C 809A415C 25AD44E0 */ addiu $t5, $t5, %lo(func_809A44E0) ## $t5 = 809A44E0 -/* 00040 809A4160 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 00044 809A4164 ACD8003C */ sw $t8, 0x003C($a2) ## 0000003C -/* 00048 809A4168 8CF90000 */ lw $t9, 0x0000($a3) ## 00000000 -/* 0004C 809A416C C4E40004 */ lwc1 $f4, 0x0004($a3) ## 00000004 -/* 00050 809A4170 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00054 809A4174 C7260024 */ lwc1 $f6, 0x0024($t9) ## 00000024 -/* 00058 809A4178 46062201 */ sub.s $f8, $f4, $f6 -/* 0005C 809A417C E4C8002C */ swc1 $f8, 0x002C($a2) ## 0000002C -/* 00060 809A4180 8CE80000 */ lw $t0, 0x0000($a3) ## 00000000 -/* 00064 809A4184 C4EA0008 */ lwc1 $f10, 0x0008($a3) ## 00000008 -/* 00068 809A4188 C5100028 */ lwc1 $f16, 0x0028($t0) ## 00000028 -/* 0006C 809A418C 46105481 */ sub.s $f18, $f10, $f16 -/* 00070 809A4190 E4D20030 */ swc1 $f18, 0x0030($a2) ## 00000030 -/* 00074 809A4194 8CE90000 */ lw $t1, 0x0000($a3) ## 00000000 -/* 00078 809A4198 C4E4000C */ lwc1 $f4, 0x000C($a3) ## 0000000C -/* 0007C 809A419C C526002C */ lwc1 $f6, 0x002C($t1) ## 0000002C -/* 00080 809A41A0 ACCA0038 */ sw $t2, 0x0038($a2) ## 00000038 -/* 00084 809A41A4 A4CB005C */ sh $t3, 0x005C($a2) ## 0000005C -/* 00088 809A41A8 46062201 */ sub.s $f8, $f4, $f6 -/* 0008C 809A41AC ACCC0028 */ sw $t4, 0x0028($a2) ## 00000028 -/* 00090 809A41B0 ACCD0024 */ sw $t5, 0x0024($a2) ## 00000024 -/* 00094 809A41B4 A4CE0046 */ sh $t6, 0x0046($a2) ## 00000046 -/* 00098 809A41B8 E4C80034 */ swc1 $f8, 0x0034($a2) ## 00000034 -/* 0009C 809A41BC 84EF0010 */ lh $t7, 0x0010($a3) ## 00000010 -/* 000A0 809A41C0 A4CF0050 */ sh $t7, 0x0050($a2) ## 00000050 -/* 000A4 809A41C4 84F80012 */ lh $t8, 0x0012($a3) ## 00000012 -/* 000A8 809A41C8 A4D80052 */ sh $t8, 0x0052($a2) ## 00000052 -/* 000AC 809A41CC 8CF90000 */ lw $t9, 0x0000($a3) ## 00000000 -/* 000B0 809A41D0 872800B6 */ lh $t0, 0x00B6($t9) ## 000000B6 -/* 000B4 809A41D4 03E00008 */ jr $ra -/* 000B8 809A41D8 A4C80054 */ sh $t0, 0x0054($a2) ## 00000054 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fcircle/func_809A41DC.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fcircle/func_809A41DC.s deleted file mode 100644 index 9bf2577b91..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fcircle/func_809A41DC.s +++ /dev/null @@ -1,224 +0,0 @@ -.rdata -glabel D_809A45A0 - .asciz "../z_eff_fcircle.c" - .balign 4 - -glabel D_809A45B4 - .asciz "../z_eff_fcircle.c" - .balign 4 - -glabel D_809A45C8 - .asciz "../z_eff_fcircle.c" - .balign 4 - -.late_rodata -glabel D_809A45DC - .float 0.001 - -glabel D_809A45E0 - .float 0.025 - -glabel D_809A45E4 - .float 0.01 - -glabel D_809A45E8 - .float 9.58738019108e-05 - -.text -glabel func_809A41DC -/* 000BC 809A41DC 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 -/* 000C0 809A41E0 AFB10038 */ sw $s1, 0x0038($sp) -/* 000C4 809A41E4 AFBF003C */ sw $ra, 0x003C($sp) -/* 000C8 809A41E8 AFB00034 */ sw $s0, 0x0034($sp) -/* 000CC 809A41EC AFA40080 */ sw $a0, 0x0080($sp) -/* 000D0 809A41F0 AFA50084 */ sw $a1, 0x0084($sp) -/* 000D4 809A41F4 8C900000 */ lw $s0, 0x0000($a0) ## 00000000 -/* 000D8 809A41F8 00C08825 */ or $s1, $a2, $zero ## $s1 = 00000000 -/* 000DC 809A41FC 3C06809A */ lui $a2, %hi(D_809A45A0) ## $a2 = 809A0000 -/* 000E0 809A4200 24C645A0 */ addiu $a2, $a2, %lo(D_809A45A0) ## $a2 = 809A45A0 -/* 000E4 809A4204 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFD8 -/* 000E8 809A4208 24070095 */ addiu $a3, $zero, 0x0095 ## $a3 = 00000095 -/* 000EC 809A420C 0C031AB1 */ jal Graph_OpenDisps -/* 000F0 809A4210 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 000F4 809A4214 862F005C */ lh $t7, 0x005C($s1) ## 0000005C -/* 000F8 809A4218 3C01809A */ lui $at, %hi(D_809A45DC) ## $at = 809A0000 -/* 000FC 809A421C C42245DC */ lwc1 $f2, %lo(D_809A45DC)($at) -/* 00100 809A4220 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 00104 809A4224 3C01809A */ lui $at, %hi(D_809A45E0) ## $at = 809A0000 -/* 00108 809A4228 C42845E0 */ lwc1 $f8, %lo(D_809A45E0)($at) -/* 0010C 809A422C 468021A0 */ cvt.s.w $f6, $f4 -/* 00110 809A4230 86380056 */ lh $t8, 0x0056($s1) ## 00000056 -/* 00114 809A4234 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00118 809A4238 44818000 */ mtc1 $at, $f16 ## $f16 = 0.50 -/* 0011C 809A423C 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 00120 809A4240 86390052 */ lh $t9, 0x0052($s1) ## 00000052 -/* 00124 809A4244 46083282 */ mul.s $f10, $f6, $f8 -/* 00128 809A4248 3C01809A */ lui $at, %hi(D_809A45E4) ## $at = 809A0000 -/* 0012C 809A424C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00130 809A4250 468021A0 */ cvt.s.w $f6, $f4 -/* 00134 809A4254 460A8480 */ add.s $f18, $f16, $f10 -/* 00138 809A4258 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 -/* 0013C 809A425C C43045E4 */ lwc1 $f16, %lo(D_809A45E4)($at) -/* 00140 809A4260 46123202 */ mul.s $f8, $f6, $f18 -/* 00144 809A4264 46805120 */ cvt.s.w $f4, $f10 -/* 00148 809A4268 46104002 */ mul.s $f0, $f8, $f16 -/* 0014C 809A426C 00000000 */ nop -/* 00150 809A4270 46022182 */ mul.s $f6, $f4, $f2 -/* 00154 809A4274 00000000 */ nop -/* 00158 809A4278 46003482 */ mul.s $f18, $f6, $f0 -/* 0015C 809A427C E7B20074 */ swc1 $f18, 0x0074($sp) -/* 00160 809A4280 86290050 */ lh $t1, 0x0050($s1) ## 00000050 -/* 00164 809A4284 44894000 */ mtc1 $t1, $f8 ## $f8 = 0.00 -/* 00168 809A4288 00000000 */ nop -/* 0016C 809A428C 46804420 */ cvt.s.w $f16, $f8 -/* 00170 809A4290 46028282 */ mul.s $f10, $f16, $f2 -/* 00174 809A4294 00000000 */ nop -/* 00178 809A4298 46005102 */ mul.s $f4, $f10, $f0 -/* 0017C 809A429C E7A40070 */ swc1 $f4, 0x0070($sp) -/* 00180 809A42A0 8E260008 */ lw $a2, 0x0008($s1) ## 00000008 -/* 00184 809A42A4 C62E0004 */ lwc1 $f14, 0x0004($s1) ## 00000004 -/* 00188 809A42A8 0C034261 */ jal Matrix_Translate -/* 0018C 809A42AC C62C0000 */ lwc1 $f12, 0x0000($s1) ## 00000000 -/* 00190 809A42B0 C7AC0070 */ lwc1 $f12, 0x0070($sp) -/* 00194 809A42B4 C7AE0074 */ lwc1 $f14, 0x0074($sp) -/* 00198 809A42B8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0019C 809A42BC 44066000 */ mfc1 $a2, $f12 -/* 001A0 809A42C0 0C0342A3 */ jal Matrix_Scale -/* 001A4 809A42C4 00000000 */ nop -/* 001A8 809A42C8 862A0054 */ lh $t2, 0x0054($s1) ## 00000054 -/* 001AC 809A42CC 3C01809A */ lui $at, %hi(D_809A45E8) ## $at = 809A0000 -/* 001B0 809A42D0 C42845E8 */ lwc1 $f8, %lo(D_809A45E8)($at) -/* 001B4 809A42D4 448A3000 */ mtc1 $t2, $f6 ## $f6 = 0.00 -/* 001B8 809A42D8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 001BC 809A42DC 468034A0 */ cvt.s.w $f18, $f6 -/* 001C0 809A42E0 46089302 */ mul.s $f12, $f18, $f8 -/* 001C4 809A42E4 0C034348 */ jal Matrix_RotateY -/* 001C8 809A42E8 00000000 */ nop -/* 001CC 809A42EC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 001D0 809A42F0 3C0CDA38 */ lui $t4, 0xDA38 ## $t4 = DA380000 -/* 001D4 809A42F4 358C0003 */ ori $t4, $t4, 0x0003 ## $t4 = DA380003 -/* 001D8 809A42F8 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 001DC 809A42FC AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 -/* 001E0 809A4300 3C05809A */ lui $a1, %hi(D_809A45B4) ## $a1 = 809A0000 -/* 001E4 809A4304 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 001E8 809A4308 24A545B4 */ addiu $a1, $a1, %lo(D_809A45B4) ## $a1 = 809A45B4 -/* 001EC 809A430C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 001F0 809A4310 240600A3 */ addiu $a2, $zero, 0x00A3 ## $a2 = 000000A3 -/* 001F4 809A4314 0C0346A2 */ jal Matrix_NewMtx -/* 001F8 809A4318 AFA20054 */ sw $v0, 0x0054($sp) -/* 001FC 809A431C 8FA30054 */ lw $v1, 0x0054($sp) -/* 00200 809A4320 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00204 809A4324 8FAD0080 */ lw $t5, 0x0080($sp) -/* 00208 809A4328 0C024F61 */ jal func_80093D84 -/* 0020C 809A432C 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 -/* 00210 809A4330 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00214 809A4334 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 00218 809A4338 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 -/* 0021C 809A433C 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 00220 809A4340 AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 -/* 00224 809A4344 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 00228 809A4348 8FB80080 */ lw $t8, 0x0080($sp) -/* 0022C 809A434C 3C030001 */ lui $v1, 0x0001 ## $v1 = 00010000 -/* 00230 809A4350 240E0040 */ addiu $t6, $zero, 0x0040 ## $t6 = 00000040 -/* 00234 809A4354 00781821 */ addu $v1, $v1, $t8 -/* 00238 809A4358 8C631DE4 */ lw $v1, 0x1DE4($v1) ## 00011DE4 -/* 0023C 809A435C 8F040000 */ lw $a0, 0x0000($t8) ## 00000000 -/* 00240 809A4360 24190020 */ addiu $t9, $zero, 0x0020 ## $t9 = 00000020 -/* 00244 809A4364 00030823 */ subu $at, $zero, $v1 -/* 00248 809A4368 00015900 */ sll $t3, $at, 4 -/* 0024C 809A436C 01615823 */ subu $t3, $t3, $at -/* 00250 809A4370 316C00FF */ andi $t4, $t3, 0x00FF ## $t4 = 00000000 -/* 00254 809A4374 24090040 */ addiu $t1, $zero, 0x0040 ## $t1 = 00000040 -/* 00258 809A4378 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 0025C 809A437C 240D0020 */ addiu $t5, $zero, 0x0020 ## $t5 = 00000020 -/* 00260 809A4380 AFAD0024 */ sw $t5, 0x0024($sp) -/* 00264 809A4384 AFAA0018 */ sw $t2, 0x0018($sp) -/* 00268 809A4388 AFA90014 */ sw $t1, 0x0014($sp) -/* 0026C 809A438C AFAC0020 */ sw $t4, 0x0020($sp) -/* 00270 809A4390 AFB90010 */ sw $t9, 0x0010($sp) -/* 00274 809A4394 AFAE0028 */ sw $t6, 0x0028($sp) -/* 00278 809A4398 AFA0001C */ sw $zero, 0x001C($sp) -/* 0027C 809A439C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00280 809A43A0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00284 809A43A4 AFA20050 */ sw $v0, 0x0050($sp) -/* 00288 809A43A8 0C0253D0 */ jal Gfx_TwoTexScroll -/* 0028C 809A43AC 3066007F */ andi $a2, $v1, 0x007F ## $a2 = 00000000 -/* 00290 809A43B0 8FA80050 */ lw $t0, 0x0050($sp) -/* 00294 809A43B4 3C18FA00 */ lui $t8, 0xFA00 ## $t8 = FA000000 -/* 00298 809A43B8 37188080 */ ori $t8, $t8, 0x8080 ## $t8 = FA008080 -/* 0029C 809A43BC AD020004 */ sw $v0, 0x0004($t0) ## 00000004 -/* 002A0 809A43C0 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 -/* 002A4 809A43C4 3C01414C */ lui $at, 0x414C ## $at = 414C0000 -/* 002A8 809A43C8 44812000 */ mtc1 $at, $f4 ## $f4 = 12.75 -/* 002AC 809A43CC 246F0008 */ addiu $t7, $v1, 0x0008 ## $t7 = 00000008 -/* 002B0 809A43D0 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 -/* 002B4 809A43D4 AC780000 */ sw $t8, 0x0000($v1) ## 00000000 -/* 002B8 809A43D8 8639005C */ lh $t9, 0x005C($s1) ## 0000005C -/* 002BC 809A43DC 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 002C0 809A43E0 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 002C4 809A43E4 44998000 */ mtc1 $t9, $f16 ## $f16 = 0.00 -/* 002C8 809A43E8 3C0FFF00 */ lui $t7, 0xFF00 ## $t7 = FF000000 -/* 002CC 809A43EC 3C0EFB00 */ lui $t6, 0xFB00 ## $t6 = FB000000 -/* 002D0 809A43F0 468082A0 */ cvt.s.w $f10, $f16 -/* 002D4 809A43F4 3C19DE00 */ lui $t9, 0xDE00 ## $t9 = DE000000 -/* 002D8 809A43F8 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFD8 -/* 002DC 809A43FC 46045182 */ mul.s $f6, $f10, $f4 -/* 002E0 809A4400 4449F800 */ cfc1 $t1, $31 -/* 002E4 809A4404 44CAF800 */ ctc1 $t2, $31 -/* 002E8 809A4408 00000000 */ nop -/* 002EC 809A440C 460034A4 */ cvt.w.s $f18, $f6 -/* 002F0 809A4410 444AF800 */ cfc1 $t2, $31 -/* 002F4 809A4414 00000000 */ nop -/* 002F8 809A4418 314A0078 */ andi $t2, $t2, 0x0078 ## $t2 = 00000000 -/* 002FC 809A441C 51400013 */ beql $t2, $zero, .L809A446C -/* 00300 809A4420 440A9000 */ mfc1 $t2, $f18 -/* 00304 809A4424 44819000 */ mtc1 $at, $f18 ## $f18 = 2147483648.00 -/* 00308 809A4428 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 0030C 809A442C 46123481 */ sub.s $f18, $f6, $f18 -/* 00310 809A4430 44CAF800 */ ctc1 $t2, $31 -/* 00314 809A4434 00000000 */ nop -/* 00318 809A4438 460094A4 */ cvt.w.s $f18, $f18 -/* 0031C 809A443C 444AF800 */ cfc1 $t2, $31 -/* 00320 809A4440 00000000 */ nop -/* 00324 809A4444 314A0078 */ andi $t2, $t2, 0x0078 ## $t2 = 00000000 -/* 00328 809A4448 15400005 */ bne $t2, $zero, .L809A4460 -/* 0032C 809A444C 00000000 */ nop -/* 00330 809A4450 440A9000 */ mfc1 $t2, $f18 -/* 00334 809A4454 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00338 809A4458 10000007 */ beq $zero, $zero, .L809A4478 -/* 0033C 809A445C 01415025 */ or $t2, $t2, $at ## $t2 = 80000000 -.L809A4460: -/* 00340 809A4460 10000005 */ beq $zero, $zero, .L809A4478 -/* 00344 809A4464 240AFFFF */ addiu $t2, $zero, 0xFFFF ## $t2 = FFFFFFFF -/* 00348 809A4468 440A9000 */ mfc1 $t2, $f18 -.L809A446C: -/* 0034C 809A446C 00000000 */ nop -/* 00350 809A4470 0540FFFB */ bltz $t2, .L809A4460 -/* 00354 809A4474 00000000 */ nop -.L809A4478: -/* 00358 809A4478 314B00FF */ andi $t3, $t2, 0x00FF ## $t3 = 000000FF -/* 0035C 809A447C 3C01FFDC */ lui $at, 0xFFDC ## $at = FFDC0000 -/* 00360 809A4480 01616025 */ or $t4, $t3, $at ## $t4 = FFDC00FF -/* 00364 809A4484 AC6C0004 */ sw $t4, 0x0004($v1) ## 00000004 -/* 00368 809A4488 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 0036C 809A448C 44C9F800 */ ctc1 $t1, $31 -/* 00370 809A4490 3C06809A */ lui $a2, %hi(D_809A45C8) ## $a2 = 809A0000 -/* 00374 809A4494 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 00378 809A4498 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 0037C 809A449C AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 00380 809A44A0 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 00384 809A44A4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00388 809A44A8 24C645C8 */ addiu $a2, $a2, %lo(D_809A45C8) ## $a2 = 809A45C8 -/* 0038C 809A44AC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00390 809A44B0 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 00394 809A44B4 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 00398 809A44B8 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 0039C 809A44BC 8E290038 */ lw $t1, 0x0038($s1) ## 00000038 -/* 003A0 809A44C0 240700BA */ addiu $a3, $zero, 0x00BA ## $a3 = 000000BA -/* 003A4 809A44C4 0C031AD5 */ jal Graph_CloseDisps -/* 003A8 809A44C8 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 003AC 809A44CC 8FBF003C */ lw $ra, 0x003C($sp) -/* 003B0 809A44D0 8FB00034 */ lw $s0, 0x0034($sp) -/* 003B4 809A44D4 8FB10038 */ lw $s1, 0x0038($sp) -/* 003B8 809A44D8 03E00008 */ jr $ra -/* 003BC 809A44DC 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fcircle/func_809A44E0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fcircle/func_809A44E0.s deleted file mode 100644 index 2f9f621c41..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fcircle/func_809A44E0.s +++ /dev/null @@ -1,49 +0,0 @@ -glabel func_809A44E0 -/* 003C0 809A44E0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 003C4 809A44E4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 003C8 809A44E8 AFA40018 */ sw $a0, 0x0018($sp) -/* 003CC 809A44EC AFA5001C */ sw $a1, 0x001C($sp) -/* 003D0 809A44F0 8CC2003C */ lw $v0, 0x003C($a2) ## 0000003C -/* 003D4 809A44F4 00C03825 */ or $a3, $a2, $zero ## $a3 = 00000000 -/* 003D8 809A44F8 50400022 */ beql $v0, $zero, .L809A4584 -/* 003DC 809A44FC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 003E0 809A4500 8C4E0130 */ lw $t6, 0x0130($v0) ## 00000130 -/* 003E4 809A4504 24E40056 */ addiu $a0, $a3, 0x0056 ## $a0 = 00000056 -/* 003E8 809A4508 24050064 */ addiu $a1, $zero, 0x0064 ## $a1 = 00000064 -/* 003EC 809A450C 51C0001C */ beql $t6, $zero, .L809A4580 -/* 003F0 809A4510 ACE0003C */ sw $zero, 0x003C($a3) ## 0000003C -/* 003F4 809A4514 C4440024 */ lwc1 $f4, 0x0024($v0) ## 00000024 -/* 003F8 809A4518 C4C6002C */ lwc1 $f6, 0x002C($a2) ## 0000002C -/* 003FC 809A451C C4D00030 */ lwc1 $f16, 0x0030($a2) ## 00000030 -/* 00400 809A4520 24180014 */ addiu $t8, $zero, 0x0014 ## $t8 = 00000014 -/* 00404 809A4524 46062200 */ add.s $f8, $f4, $f6 -/* 00408 809A4528 C4C60034 */ lwc1 $f6, 0x0034($a2) ## 00000034 -/* 0040C 809A452C E4C80000 */ swc1 $f8, 0x0000($a2) ## 00000000 -/* 00410 809A4530 C44A0028 */ lwc1 $f10, 0x0028($v0) ## 00000028 -/* 00414 809A4534 46105480 */ add.s $f18, $f10, $f16 -/* 00418 809A4538 E4D20004 */ swc1 $f18, 0x0004($a2) ## 00000004 -/* 0041C 809A453C C444002C */ lwc1 $f4, 0x002C($v0) ## 0000002C -/* 00420 809A4540 46062200 */ add.s $f8, $f4, $f6 -/* 00424 809A4544 E4C80008 */ swc1 $f8, 0x0008($a2) ## 00000008 -/* 00428 809A4548 844F00B6 */ lh $t7, 0x00B6($v0) ## 000000B6 -/* 0042C 809A454C A4CF0054 */ sh $t7, 0x0054($a2) ## 00000054 -/* 00430 809A4550 90430114 */ lbu $v1, 0x0114($v0) ## 00000114 -/* 00434 809A4554 28610015 */ slti $at, $v1, 0x0015 -/* 00438 809A4558 54200004 */ bnel $at, $zero, .L809A456C -/* 0043C 809A455C A4E3005C */ sh $v1, 0x005C($a3) ## 0000005C -/* 00440 809A4560 10000002 */ beq $zero, $zero, .L809A456C -/* 00444 809A4564 A4D8005C */ sh $t8, 0x005C($a2) ## 0000005C -/* 00448 809A4568 A4E3005C */ sh $v1, 0x005C($a3) ## 0000005C -.L809A456C: -/* 0044C 809A456C 0C01DE5F */ jal Math_ApproxS - -/* 00450 809A4570 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 00454 809A4574 10000003 */ beq $zero, $zero, .L809A4584 -/* 00458 809A4578 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0045C 809A457C ACE0003C */ sw $zero, 0x003C($a3) ## 0000003C -.L809A4580: -/* 00460 809A4580 8FBF0014 */ lw $ra, 0x0014($sp) -.L809A4584: -/* 00464 809A4584 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00468 809A4588 03E00008 */ jr $ra -/* 0046C 809A458C 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/EffectSsFhgFlash_Init.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/EffectSsFhgFlash_Init.s deleted file mode 100644 index fed6b6b091..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/EffectSsFhgFlash_Init.s +++ /dev/null @@ -1,231 +0,0 @@ -.rdata -glabel D_809A5580 - .asciz "Effect_Ss_Fhg_Flash_ct():pffd->modeエラー\n" - .balign 4 - -.text -glabel EffectSsFhgFlash_Init -/* 00000 809A4660 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 00004 809A4664 3C0E809A */ lui $t6, %hi(D_809A5088) ## $t6 = 809A0000 -/* 00008 809A4668 AFBF001C */ sw $ra, 0x001C($sp) -/* 0000C 809A466C AFB10018 */ sw $s1, 0x0018($sp) -/* 00010 809A4670 AFB00014 */ sw $s0, 0x0014($sp) -/* 00014 809A4674 AFA40058 */ sw $a0, 0x0058($sp) -/* 00018 809A4678 AFA5005C */ sw $a1, 0x005C($sp) -/* 0001C 809A467C 25CE5088 */ addiu $t6, $t6, %lo(D_809A5088) ## $t6 = 809A5088 -/* 00020 809A4680 8DD80000 */ lw $t8, 0x0000($t6) ## 809A5088 -/* 00024 809A4684 27A30040 */ addiu $v1, $sp, 0x0040 ## $v1 = FFFFFFE8 -/* 00028 809A4688 3C08809A */ lui $t0, %hi(D_809A5094) ## $t0 = 809A0000 -/* 0002C 809A468C AC780000 */ sw $t8, 0x0000($v1) ## FFFFFFE8 -/* 00030 809A4690 8DCF0004 */ lw $t7, 0x0004($t6) ## 809A508C -/* 00034 809A4694 25085094 */ addiu $t0, $t0, %lo(D_809A5094) ## $t0 = 809A5094 -/* 00038 809A4698 27B90034 */ addiu $t9, $sp, 0x0034 ## $t9 = FFFFFFDC -/* 0003C 809A469C AC6F0004 */ sw $t7, 0x0004($v1) ## FFFFFFEC -/* 00040 809A46A0 8DD80008 */ lw $t8, 0x0008($t6) ## 809A5090 -/* 00044 809A46A4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00048 809A46A8 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 0004C 809A46AC AC780008 */ sw $t8, 0x0008($v1) ## FFFFFFF0 -/* 00050 809A46B0 8D0A0000 */ lw $t2, 0x0000($t0) ## 809A5094 -/* 00054 809A46B4 8D090004 */ lw $t1, 0x0004($t0) ## 809A5098 -/* 00058 809A46B8 00C08025 */ or $s0, $a2, $zero ## $s0 = 00000000 -/* 0005C 809A46BC AF2A0000 */ sw $t2, 0x0000($t9) ## FFFFFFDC -/* 00060 809A46C0 8D0A0008 */ lw $t2, 0x0008($t0) ## 809A509C -/* 00064 809A46C4 AF290004 */ sw $t1, 0x0004($t9) ## FFFFFFE0 -/* 00068 809A46C8 00E08825 */ or $s1, $a3, $zero ## $s1 = 00000000 -/* 0006C 809A46CC AF2A0008 */ sw $t2, 0x0008($t9) ## FFFFFFE4 -/* 00070 809A46D0 90EB002C */ lbu $t3, 0x002C($a3) ## 0000002C -/* 00074 809A46D4 8FA40058 */ lw $a0, 0x0058($sp) -/* 00078 809A46D8 2405005A */ addiu $a1, $zero, 0x005A ## $a1 = 0000005A -/* 0007C 809A46DC 1560004E */ bne $t3, $zero, .L809A4818 -/* 00080 809A46E0 00812021 */ addu $a0, $a0, $at -/* 00084 809A46E4 0C02604B */ jal Object_GetIndex - ## ObjectIndex -/* 00088 809A46E8 AFA40020 */ sw $a0, 0x0020($sp) -/* 0008C 809A46EC 8FA40020 */ lw $a0, 0x0020($sp) -/* 00090 809A46F0 04400044 */ bltz $v0, .L809A4804 -/* 00094 809A46F4 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 00098 809A46F8 0C026062 */ jal Object_IsLoaded - -/* 0009C 809A46FC AFA2004C */ sw $v0, 0x004C($sp) -/* 000A0 809A4700 10400040 */ beq $v0, $zero, .L809A4804 -/* 000A4 809A4704 8FA5004C */ lw $a1, 0x004C($sp) -/* 000A8 809A4708 8FAC0058 */ lw $t4, 0x0058($sp) -/* 000AC 809A470C 00056900 */ sll $t5, $a1, 4 -/* 000B0 809A4710 01A56821 */ addu $t5, $t5, $a1 -/* 000B4 809A4714 000D6880 */ sll $t5, $t5, 2 -/* 000B8 809A4718 3C0F0001 */ lui $t7, 0x0001 ## $t7 = 00010000 -/* 000BC 809A471C 018D7021 */ addu $t6, $t4, $t5 -/* 000C0 809A4720 01EE7821 */ addu $t7, $t7, $t6 -/* 000C4 809A4724 8DEF17B4 */ lw $t7, 0x17B4($t7) ## 000117B4 -/* 000C8 809A4728 3C048016 */ lui $a0, %hi(gSegments) -/* 000CC 809A472C 24846FA8 */ addiu $a0, %lo(gSegments) -/* 000D0 809A4730 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 000D4 809A4734 8C830018 */ lw $v1, 0x0018($a0) ## 80166FC0 -/* 000D8 809A4738 01E1C021 */ addu $t8, $t7, $at -/* 000DC 809A473C AC980018 */ sw $t8, 0x0018($a0) ## 80166FC0 -/* 000E0 809A4740 A6050044 */ sh $a1, 0x0044($s0) ## 00000044 -/* 000E4 809A4744 8E280000 */ lw $t0, 0x0000($s1) ## 00000000 -/* 000E8 809A4748 240E0064 */ addiu $t6, $zero, 0x0064 ## $t6 = 00000064 -/* 000EC 809A474C 3C020601 */ lui $v0, 0x0601 ## $v0 = 06010000 -/* 000F0 809A4750 AE080000 */ sw $t0, 0x0000($s0) ## 00000000 -/* 000F4 809A4754 8E390004 */ lw $t9, 0x0004($s1) ## 00000004 -/* 000F8 809A4758 24422160 */ addiu $v0, $v0, 0x2160 ## $v0 = 06012160 -/* 000FC 809A475C 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 00100 809A4760 AE190004 */ sw $t9, 0x0004($s0) ## 00000004 -/* 00104 809A4764 8E280008 */ lw $t0, 0x0008($s1) ## 00000008 -/* 00108 809A4768 3C19809A */ lui $t9, %hi(func_809A49B8) ## $t9 = 809A0000 -/* 0010C 809A476C 273949B8 */ addiu $t9, $t9, %lo(func_809A49B8) ## $t9 = 809A49B8 -/* 00110 809A4770 AE080008 */ sw $t0, 0x0008($s0) ## 00000008 -/* 00114 809A4774 8E2A000C */ lw $t2, 0x000C($s1) ## 0000000C -/* 00118 809A4778 3C08809A */ lui $t0, %hi(func_809A4E28) ## $t0 = 809A0000 -/* 0011C 809A477C 25084E28 */ addiu $t0, $t0, %lo(func_809A4E28) ## $t0 = 809A4E28 -/* 00120 809A4780 AE0A000C */ sw $t2, 0x000C($s0) ## 0000000C -/* 00124 809A4784 8E290010 */ lw $t1, 0x0010($s1) ## 00000010 -/* 00128 809A4788 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 0012C 809A478C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00130 809A4790 AE090010 */ sw $t1, 0x0010($s0) ## 00000010 -/* 00134 809A4794 8E2A0014 */ lw $t2, 0x0014($s1) ## 00000014 -/* 00138 809A4798 00024900 */ sll $t1, $v0, 4 -/* 0013C 809A479C AE0A0014 */ sw $t2, 0x0014($s0) ## 00000014 -/* 00140 809A47A0 8E2C0018 */ lw $t4, 0x0018($s1) ## 00000018 -/* 00144 809A47A4 00095702 */ srl $t2, $t1, 28 -/* 00148 809A47A8 AE0C0018 */ sw $t4, 0x0018($s0) ## 00000018 -/* 0014C 809A47AC 8E2B001C */ lw $t3, 0x001C($s1) ## 0000001C -/* 00150 809A47B0 AE0B001C */ sw $t3, 0x001C($s0) ## 0000001C -/* 00154 809A47B4 8E2C0020 */ lw $t4, 0x0020($s1) ## 00000020 -/* 00158 809A47B8 000A5880 */ sll $t3, $t2, 2 -/* 0015C 809A47BC AE0C0020 */ sw $t4, 0x0020($s0) ## 00000020 -/* 00160 809A47C0 922D0026 */ lbu $t5, 0x0026($s1) ## 00000026 -/* 00164 809A47C4 A60E005C */ sh $t6, 0x005C($s0) ## 0000005C -/* 00168 809A47C8 008B6021 */ addu $t4, $a0, $t3 -/* 0016C 809A47CC A60D0048 */ sh $t5, 0x0048($s0) ## 00000048 -/* 00170 809A47D0 862F0024 */ lh $t7, 0x0024($s1) ## 00000024 -/* 00174 809A47D4 A6180040 */ sh $t8, 0x0040($s0) ## 00000040 -/* 00178 809A47D8 AE190028 */ sw $t9, 0x0028($s0) ## 00000028 -/* 0017C 809A47DC AE080024 */ sw $t0, 0x0024($s0) ## 00000024 -/* 00180 809A47E0 A60F0050 */ sh $t7, 0x0050($s0) ## 00000050 -/* 00184 809A47E4 8D8D0000 */ lw $t5, 0x0000($t4) ## 00000000 -/* 00188 809A47E8 00417024 */ and $t6, $v0, $at -/* 0018C 809A47EC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00190 809A47F0 01AE7821 */ addu $t7, $t5, $t6 -/* 00194 809A47F4 01E1C021 */ addu $t8, $t7, $at -/* 00198 809A47F8 AE180038 */ sw $t8, 0x0038($s0) ## 00000038 -/* 0019C 809A47FC 10000068 */ beq $zero, $zero, .L809A49A0 -/* 001A0 809A4800 AC830018 */ sw $v1, 0x0018($a0) ## 80166FC0 -.L809A4804: -/* 001A4 809A4804 3C04809A */ lui $a0, %hi(D_809A5580) ## $a0 = 809A0000 -/* 001A8 809A4808 0C00084C */ jal osSyncPrintf - -/* 001AC 809A480C 24845580 */ addiu $a0, $a0, %lo(D_809A5580) ## $a0 = 809A5580 -/* 001B0 809A4810 10000064 */ beq $zero, $zero, .L809A49A4 -/* 001B4 809A4814 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L809A4818: -/* 001B8 809A4818 8E390028 */ lw $t9, 0x0028($s1) ## 00000028 -/* 001BC 809A481C 27A20024 */ addiu $v0, $sp, 0x0024 ## $v0 = FFFFFFCC -/* 001C0 809A4820 AE19003C */ sw $t9, 0x003C($s0) ## 0000003C -/* 001C4 809A4824 8C690000 */ lw $t1, 0x0000($v1) ## 00000000 -/* 001C8 809A4828 8C680004 */ lw $t0, 0x0004($v1) ## 00000004 -/* 001CC 809A482C AC490000 */ sw $t1, 0x0000($v0) ## FFFFFFCC -/* 001D0 809A4830 8C690008 */ lw $t1, 0x0008($v1) ## 00000008 -/* 001D4 809A4834 8C4B0000 */ lw $t3, 0x0000($v0) ## FFFFFFCC -/* 001D8 809A4838 AC480004 */ sw $t0, 0x0004($v0) ## FFFFFFD0 -/* 001DC 809A483C AC490008 */ sw $t1, 0x0008($v0) ## FFFFFFD4 -/* 001E0 809A4840 AE0B0018 */ sw $t3, 0x0018($s0) ## 00000018 -/* 001E4 809A4844 8C4A0004 */ lw $t2, 0x0004($v0) ## FFFFFFD0 -/* 001E8 809A4848 AE0A001C */ sw $t2, 0x001C($s0) ## 0000001C -/* 001EC 809A484C 8C4B0008 */ lw $t3, 0x0008($v0) ## FFFFFFD4 -/* 001F0 809A4850 AE0B0020 */ sw $t3, 0x0020($s0) ## 00000020 -/* 001F4 809A4854 8C4D0000 */ lw $t5, 0x0000($v0) ## FFFFFFCC -/* 001F8 809A4858 AE0D000C */ sw $t5, 0x000C($s0) ## 0000000C -/* 001FC 809A485C 8C4C0004 */ lw $t4, 0x0004($v0) ## FFFFFFD0 -/* 00200 809A4860 AE0C0010 */ sw $t4, 0x0010($s0) ## 00000010 -/* 00204 809A4864 8C4D0008 */ lw $t5, 0x0008($v0) ## FFFFFFD4 -/* 00208 809A4868 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 0020C 809A486C AE0D0014 */ sw $t5, 0x0014($s0) ## 00000014 -/* 00210 809A4870 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00214 809A4874 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 -/* 00218 809A4878 00000000 */ nop -/* 0021C 809A487C 46040182 */ mul.s $f6, $f0, $f4 -/* 00220 809A4880 4600320D */ trunc.w.s $f8, $f6 -/* 00224 809A4884 44194000 */ mfc1 $t9, $f8 -/* 00228 809A4888 00000000 */ nop -/* 0022C 809A488C 2728006F */ addiu $t0, $t9, 0x006F ## $t0 = 0000006F -/* 00230 809A4890 A608005C */ sh $t0, 0x005C($s0) ## 0000005C -/* 00234 809A4894 86290024 */ lh $t1, 0x0024($s1) ## 00000024 -/* 00238 809A4898 44895000 */ mtc1 $t1, $f10 ## $f10 = 0.00 -/* 0023C 809A489C 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 00240 809A48A0 46805320 */ cvt.s.w $f12, $f10 -/* 00244 809A48A4 4600040D */ trunc.w.s $f16, $f0 -/* 00248 809A48A8 862E0024 */ lh $t6, 0x0024($s1) ## 00000024 -/* 0024C 809A48AC 3C19809A */ lui $t9, %hi(func_809A4BE8) ## $t9 = 809A0000 -/* 00250 809A48B0 3C08809A */ lui $t0, %hi(func_809A4EC0) ## $t0 = 809A0000 -/* 00254 809A48B4 440D8000 */ mfc1 $t5, $f16 -/* 00258 809A48B8 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 0025C 809A48BC 27394BE8 */ addiu $t9, $t9, %lo(func_809A4BE8) ## $t9 = 809A4BE8 -/* 00260 809A48C0 25084EC0 */ addiu $t0, $t0, %lo(func_809A4EC0) ## $t0 = 809A4EC0 -/* 00264 809A48C4 01AE7821 */ addu $t7, $t5, $t6 -/* 00268 809A48C8 A60F0050 */ sh $t7, 0x0050($s0) ## 00000050 -/* 0026C 809A48CC A6180040 */ sh $t8, 0x0040($s0) ## 00000040 -/* 00270 809A48D0 AE190028 */ sw $t9, 0x0028($s0) ## 00000028 -/* 00274 809A48D4 AE080024 */ sw $t0, 0x0024($s0) ## 00000024 -/* 00278 809A48D8 92290026 */ lbu $t1, 0x0026($s1) ## 00000026 -/* 0027C 809A48DC 3C048016 */ lui $a0, %hi(gSegments) -/* 00280 809A48E0 3C02809A */ lui $v0, %hi(D_809A5100) ## $v0 = 809A0000 -/* 00284 809A48E4 A6090048 */ sh $t1, 0x0048($s0) ## 00000048 -/* 00288 809A48E8 922A0026 */ lbu $t2, 0x0026($s1) ## 00000026 -/* 0028C 809A48EC 27AB0034 */ addiu $t3, $sp, 0x0034 ## $t3 = FFFFFFDC -/* 00290 809A48F0 24846FA8 */ addiu $a0, %lo(gSegments) -/* 00294 809A48F4 11400018 */ beq $t2, $zero, .L809A4958 -/* 00298 809A48F8 24425100 */ addiu $v0, $v0, %lo(D_809A5100) ## $v0 = 809A5100 -/* 0029C 809A48FC 8D6D0000 */ lw $t5, 0x0000($t3) ## FFFFFFDC -/* 002A0 809A4900 3C02809A */ lui $v0, %hi(D_809A5100) ## $v0 = 809A0000 -/* 002A4 809A4904 24425100 */ addiu $v0, $v0, %lo(D_809A5100) ## $v0 = 809A5100 -/* 002A8 809A4908 AE0D0000 */ sw $t5, 0x0000($s0) ## 00000000 -/* 002AC 809A490C 8D6C0004 */ lw $t4, 0x0004($t3) ## FFFFFFE0 -/* 002B0 809A4910 00027100 */ sll $t6, $v0, 4 -/* 002B4 809A4914 3C048016 */ lui $a0, %hi(gSegments) -/* 002B8 809A4918 AE0C0004 */ sw $t4, 0x0004($s0) ## 00000004 -/* 002BC 809A491C 8D6D0008 */ lw $t5, 0x0008($t3) ## FFFFFFE4 -/* 002C0 809A4920 000E7F02 */ srl $t7, $t6, 28 -/* 002C4 809A4924 24846FA8 */ addiu $a0, %lo(gSegments) -/* 002C8 809A4928 000FC080 */ sll $t8, $t7, 2 -/* 002CC 809A492C 0098C821 */ addu $t9, $a0, $t8 -/* 002D0 809A4930 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 002D4 809A4934 AE0D0008 */ sw $t5, 0x0008($s0) ## 00000008 -/* 002D8 809A4938 8F280000 */ lw $t0, 0x0000($t9) ## 809A4BE8 -/* 002DC 809A493C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 002E0 809A4940 00414824 */ and $t1, $v0, $at -/* 002E4 809A4944 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 002E8 809A4948 01095021 */ addu $t2, $t0, $t1 -/* 002EC 809A494C 01415821 */ addu $t3, $t2, $at -/* 002F0 809A4950 10000013 */ beq $zero, $zero, .L809A49A0 -/* 002F4 809A4954 AE0B0038 */ sw $t3, 0x0038($s0) ## 00000038 -.L809A4958: -/* 002F8 809A4958 8E2D0000 */ lw $t5, 0x0000($s1) ## 00000000 -/* 002FC 809A495C 00027100 */ sll $t6, $v0, 4 -/* 00300 809A4960 000E7F02 */ srl $t7, $t6, 28 -/* 00304 809A4964 AE0D0000 */ sw $t5, 0x0000($s0) ## 00000000 -/* 00308 809A4968 8E2C0004 */ lw $t4, 0x0004($s1) ## 00000004 -/* 0030C 809A496C 000FC080 */ sll $t8, $t7, 2 -/* 00310 809A4970 0098C821 */ addu $t9, $a0, $t8 -/* 00314 809A4974 AE0C0004 */ sw $t4, 0x0004($s0) ## 00000004 -/* 00318 809A4978 8E2D0008 */ lw $t5, 0x0008($s1) ## 00000008 -/* 0031C 809A497C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00320 809A4980 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00324 809A4984 AE0D0008 */ sw $t5, 0x0008($s0) ## 00000008 -/* 00328 809A4988 8F280000 */ lw $t0, 0x0000($t9) ## 809A4BE8 -/* 0032C 809A498C 00414824 */ and $t1, $v0, $at -/* 00330 809A4990 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00334 809A4994 01095021 */ addu $t2, $t0, $t1 -/* 00338 809A4998 01415821 */ addu $t3, $t2, $at -/* 0033C 809A499C AE0B0038 */ sw $t3, 0x0038($s0) ## 00000038 -.L809A49A0: -/* 00340 809A49A0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L809A49A4: -/* 00344 809A49A4 8FBF001C */ lw $ra, 0x001C($sp) -/* 00348 809A49A8 8FB00014 */ lw $s0, 0x0014($sp) -/* 0034C 809A49AC 8FB10018 */ lw $s1, 0x0018($sp) -/* 00350 809A49B0 03E00008 */ jr $ra -/* 00354 809A49B4 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A49B8.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A49B8.s deleted file mode 100644 index c6711f3df9..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A49B8.s +++ /dev/null @@ -1,159 +0,0 @@ -.rdata -glabel D_809A55AC - .asciz "../z_eff_fhg_flash.c" - .balign 4 - -glabel D_809A55C4 - .asciz "../z_eff_fhg_flash.c" - .balign 4 - -glabel D_809A55DC - .asciz "../z_eff_fhg_flash.c" - .balign 4 - -.late_rodata -glabel D_809A563C - .float 3.1416 - -.text -glabel func_809A49B8 -/* 00358 809A49B8 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 -/* 0035C 809A49BC AFBF001C */ sw $ra, 0x001C($sp) -/* 00360 809A49C0 AFB10018 */ sw $s1, 0x0018($sp) -/* 00364 809A49C4 AFB00014 */ sw $s0, 0x0014($sp) -/* 00368 809A49C8 AFA40060 */ sw $a0, 0x0060($sp) -/* 0036C 809A49CC AFA50064 */ sw $a1, 0x0064($sp) -/* 00370 809A49D0 84CF0050 */ lh $t7, 0x0050($a2) ## 00000050 -/* 00374 809A49D4 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 00378 809A49D8 44814000 */ mtc1 $at, $f8 ## $f8 = 100.00 -/* 0037C 809A49DC 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 00380 809A49E0 8C900000 */ lw $s0, 0x0000($a0) ## 00000000 -/* 00384 809A49E4 3C090001 */ lui $t1, 0x0001 ## $t1 = 00010000 -/* 00388 809A49E8 468021A0 */ cvt.s.w $f6, $f4 -/* 0038C 809A49EC 00C08825 */ or $s1, $a2, $zero ## $s1 = 00000000 -/* 00390 809A49F0 2407010C */ addiu $a3, $zero, 0x010C ## $a3 = 0000010C -/* 00394 809A49F4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00398 809A49F8 46083283 */ div.s $f10, $f6, $f8 -/* 0039C 809A49FC E7AA0054 */ swc1 $f10, 0x0054($sp) -/* 003A0 809A4A00 84D80044 */ lh $t8, 0x0044($a2) ## 00000044 -/* 003A4 809A4A04 3C06809A */ lui $a2, %hi(D_809A55AC) ## $a2 = 809A0000 -/* 003A8 809A4A08 24C655AC */ addiu $a2, $a2, %lo(D_809A55AC) ## $a2 = 809A55AC -/* 003AC 809A4A0C 0018C900 */ sll $t9, $t8, 4 -/* 003B0 809A4A10 0338C821 */ addu $t9, $t9, $t8 -/* 003B4 809A4A14 0019C880 */ sll $t9, $t9, 2 -/* 003B8 809A4A18 00994021 */ addu $t0, $a0, $t9 -/* 003BC 809A4A1C 01284821 */ addu $t1, $t1, $t0 -/* 003C0 809A4A20 8D2917B4 */ lw $t1, 0x17B4($t1) ## 000117B4 -/* 003C4 809A4A24 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFDC -/* 003C8 809A4A28 0C031AB1 */ jal Graph_OpenDisps -/* 003CC 809A4A2C AFA90050 */ sw $t1, 0x0050($sp) -/* 003D0 809A4A30 C62C0000 */ lwc1 $f12, 0x0000($s1) ## 00000000 -/* 003D4 809A4A34 C62E0004 */ lwc1 $f14, 0x0004($s1) ## 00000004 -/* 003D8 809A4A38 8E260008 */ lw $a2, 0x0008($s1) ## 00000008 -/* 003DC 809A4A3C 0C034261 */ jal Matrix_Translate -/* 003E0 809A4A40 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 003E4 809A4A44 C7AC0054 */ lwc1 $f12, 0x0054($sp) -/* 003E8 809A4A48 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 003EC 809A4A4C 44066000 */ mfc1 $a2, $f12 -/* 003F0 809A4A50 0C0342A3 */ jal Matrix_Scale -/* 003F4 809A4A54 46006386 */ mov.s $f14, $f12 -/* 003F8 809A4A58 8FA40050 */ lw $a0, 0x0050($sp) -/* 003FC 809A4A5C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00400 809A4A60 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 -/* 00404 809A4A64 00815021 */ addu $t2, $a0, $at -/* 00408 809A4A68 3C018016 */ lui $at, %hi(gSegments+0x18) -/* 0040C 809A4A6C AC2A6FC0 */ sw $t2, %lo(gSegments+0x18)($at) -/* 00410 809A4A70 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00414 809A4A74 358C0018 */ ori $t4, $t4, 0x0018 ## $t4 = DB060018 -/* 00418 809A4A78 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 0041C 809A4A7C AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 -/* 00420 809A4A80 AC440004 */ sw $a0, 0x0004($v0) ## 00000004 -/* 00424 809A4A84 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 00428 809A4A88 8FAD0060 */ lw $t5, 0x0060($sp) -/* 0042C 809A4A8C 0C024F61 */ jal func_80093D84 -/* 00430 809A4A90 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 -/* 00434 809A4A94 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00438 809A4A98 3C18FA00 */ lui $t8, 0xFA00 ## $t8 = FA000000 -/* 0043C 809A4A9C 2401FF00 */ addiu $at, $zero, 0xFF00 ## $at = FFFFFF00 -/* 00440 809A4AA0 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 00444 809A4AA4 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 -/* 00448 809A4AA8 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 0044C 809A4AAC 862E0040 */ lh $t6, 0x0040($s1) ## 00000040 -/* 00450 809A4AB0 3C0AFB00 */ lui $t2, 0xFB00 ## $t2 = FB000000 -/* 00454 809A4AB4 3C0D809A */ lui $t5, %hi(D_809A50A0) ## $t5 = 809A0000 -/* 00458 809A4AB8 31D900FF */ andi $t9, $t6, 0x00FF ## $t9 = 00000000 -/* 0045C 809A4ABC 03214025 */ or $t0, $t9, $at ## $t0 = FFFFFF00 -/* 00460 809A4AC0 AC480004 */ sw $t0, 0x0004($v0) ## 00000004 -/* 00464 809A4AC4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00468 809A4AC8 25AD50A0 */ addiu $t5, $t5, %lo(D_809A50A0) ## $t5 = 809A50A0 -/* 0046C 809A4ACC 3C19E700 */ lui $t9, 0xE700 ## $t9 = E7000000 -/* 00470 809A4AD0 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 00474 809A4AD4 AE0902D0 */ sw $t1, 0x02D0($s0) ## 000002D0 -/* 00478 809A4AD8 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 0047C 809A4ADC 862B0048 */ lh $t3, 0x0048($s1) ## 00000048 -/* 00480 809A4AE0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00484 809A4AE4 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 -/* 00488 809A4AE8 000B6080 */ sll $t4, $t3, 2 -/* 0048C 809A4AEC 018B6023 */ subu $t4, $t4, $t3 -/* 00490 809A4AF0 018D1821 */ addu $v1, $t4, $t5 -/* 00494 809A4AF4 90780002 */ lbu $t8, 0x0002($v1) ## 00000002 -/* 00498 809A4AF8 90680000 */ lbu $t0, 0x0000($v1) ## 00000000 -/* 0049C 809A4AFC 906C0001 */ lbu $t4, 0x0001($v1) ## 00000001 -/* 004A0 809A4B00 00187200 */ sll $t6, $t8, 8 -/* 004A4 809A4B04 00084E00 */ sll $t1, $t0, 24 -/* 004A8 809A4B08 01C95025 */ or $t2, $t6, $t1 ## $t2 = 00000008 -/* 004AC 809A4B0C 000C6C00 */ sll $t5, $t4, 16 -/* 004B0 809A4B10 014D7825 */ or $t7, $t2, $t5 ## $t7 = 809A50A8 -/* 004B4 809A4B14 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 004B8 809A4B18 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 004BC 809A4B1C 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 004C0 809A4B20 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 004C4 809A4B24 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 004C8 809A4B28 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 004CC 809A4B2C 8FA40060 */ lw $a0, 0x0060($sp) -/* 004D0 809A4B30 0C0347F5 */ jal func_800D1FD4 -/* 004D4 809A4B34 00812021 */ addu $a0, $a0, $at -/* 004D8 809A4B38 86280046 */ lh $t0, 0x0046($s1) ## 00000046 -/* 004DC 809A4B3C 3C014700 */ lui $at, 0x4700 ## $at = 47000000 -/* 004E0 809A4B40 44812000 */ mtc1 $at, $f4 ## $f4 = 32768.00 -/* 004E4 809A4B44 44888000 */ mtc1 $t0, $f16 ## $f16 = 0.00 -/* 004E8 809A4B48 3C01809A */ lui $at, %hi(D_809A563C) ## $at = 809A0000 -/* 004EC 809A4B4C C428563C */ lwc1 $f8, %lo(D_809A563C)($at) -/* 004F0 809A4B50 468084A0 */ cvt.s.w $f18, $f16 -/* 004F4 809A4B54 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 004F8 809A4B58 46049183 */ div.s $f6, $f18, $f4 -/* 004FC 809A4B5C 46083302 */ mul.s $f12, $f6, $f8 -/* 00500 809A4B60 0C0343B5 */ jal Matrix_RotateZ -/* 00504 809A4B64 00000000 */ nop -/* 00508 809A4B68 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 0050C 809A4B6C 3C09DA38 */ lui $t1, 0xDA38 ## $t1 = DA380000 -/* 00510 809A4B70 35290003 */ ori $t1, $t1, 0x0003 ## $t1 = DA380003 -/* 00514 809A4B74 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 00518 809A4B78 AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 -/* 0051C 809A4B7C 3C05809A */ lui $a1, %hi(D_809A55C4) ## $a1 = 809A0000 -/* 00520 809A4B80 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 00524 809A4B84 24A555C4 */ addiu $a1, $a1, %lo(D_809A55C4) ## $a1 = 809A55C4 -/* 00528 809A4B88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0052C 809A4B8C 24060146 */ addiu $a2, $zero, 0x0146 ## $a2 = 00000146 -/* 00530 809A4B90 0C0346A2 */ jal Matrix_NewMtx -/* 00534 809A4B94 AFA20028 */ sw $v0, 0x0028($sp) -/* 00538 809A4B98 8FA30028 */ lw $v1, 0x0028($sp) -/* 0053C 809A4B9C 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 -/* 00540 809A4BA0 3C06809A */ lui $a2, %hi(D_809A55DC) ## $a2 = 809A0000 -/* 00544 809A4BA4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00548 809A4BA8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 0054C 809A4BAC 24C655DC */ addiu $a2, $a2, %lo(D_809A55DC) ## $a2 = 809A55DC -/* 00550 809A4BB0 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFDC -/* 00554 809A4BB4 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 00558 809A4BB8 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 -/* 0055C 809A4BBC AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 00560 809A4BC0 8E2A0038 */ lw $t2, 0x0038($s1) ## 00000038 -/* 00564 809A4BC4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00568 809A4BC8 2407014A */ addiu $a3, $zero, 0x014A ## $a3 = 0000014A -/* 0056C 809A4BCC 0C031AD5 */ jal Graph_CloseDisps -/* 00570 809A4BD0 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 -/* 00574 809A4BD4 8FBF001C */ lw $ra, 0x001C($sp) -/* 00578 809A4BD8 8FB00014 */ lw $s0, 0x0014($sp) -/* 0057C 809A4BDC 8FB10018 */ lw $s1, 0x0018($sp) -/* 00580 809A4BE0 03E00008 */ jr $ra -/* 00584 809A4BE4 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4BE8.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4BE8.s deleted file mode 100644 index 1eeb71d308..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4BE8.s +++ /dev/null @@ -1,168 +0,0 @@ -.rdata -glabel D_809A55F4 - .asciz "../z_eff_fhg_flash.c" - .balign 4 - -glabel D_809A560C - .asciz "../z_eff_fhg_flash.c" - .balign 4 - -glabel D_809A5624 - .asciz "../z_eff_fhg_flash.c" - .balign 4 - -.late_rodata -glabel D_809A5640 - .float 1.1416 - -glabel D_809A5644 - .float 3.1416 - -.text -glabel func_809A4BE8 -/* 00588 809A4BE8 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 -/* 0058C 809A4BEC AFBF001C */ sw $ra, 0x001C($sp) -/* 00590 809A4BF0 AFB10018 */ sw $s1, 0x0018($sp) -/* 00594 809A4BF4 AFB00014 */ sw $s0, 0x0014($sp) -/* 00598 809A4BF8 AFA40060 */ sw $a0, 0x0060($sp) -/* 0059C 809A4BFC AFA50064 */ sw $a1, 0x0064($sp) -/* 005A0 809A4C00 84CF0050 */ lh $t7, 0x0050($a2) ## 00000050 -/* 005A4 809A4C04 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 005A8 809A4C08 44814000 */ mtc1 $at, $f8 ## $f8 = 100.00 -/* 005AC 809A4C0C 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 005B0 809A4C10 8C900000 */ lw $s0, 0x0000($a0) ## 00000000 -/* 005B4 809A4C14 00C08825 */ or $s1, $a2, $zero ## $s1 = 00000000 -/* 005B8 809A4C18 468021A0 */ cvt.s.w $f6, $f4 -/* 005BC 809A4C1C 3C06809A */ lui $a2, %hi(D_809A55F4) ## $a2 = 809A0000 -/* 005C0 809A4C20 24C655F4 */ addiu $a2, $a2, %lo(D_809A55F4) ## $a2 = 809A55F4 -/* 005C4 809A4C24 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE0 -/* 005C8 809A4C28 2407015A */ addiu $a3, $zero, 0x015A ## $a3 = 0000015A -/* 005CC 809A4C2C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 005D0 809A4C30 46083283 */ div.s $f10, $f6, $f8 -/* 005D4 809A4C34 0C031AB1 */ jal Graph_OpenDisps -/* 005D8 809A4C38 E7AA0054 */ swc1 $f10, 0x0054($sp) -/* 005DC 809A4C3C C62C0000 */ lwc1 $f12, 0x0000($s1) ## 00000000 -/* 005E0 809A4C40 C62E0004 */ lwc1 $f14, 0x0004($s1) ## 00000004 -/* 005E4 809A4C44 8E260008 */ lw $a2, 0x0008($s1) ## 00000008 -/* 005E8 809A4C48 0C034261 */ jal Matrix_Translate -/* 005EC 809A4C4C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 005F0 809A4C50 C7AC0054 */ lwc1 $f12, 0x0054($sp) -/* 005F4 809A4C54 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 005F8 809A4C58 44066000 */ mfc1 $a2, $f12 -/* 005FC 809A4C5C 0C0342A3 */ jal Matrix_Scale -/* 00600 809A4C60 46006386 */ mov.s $f14, $f12 -/* 00604 809A4C64 86380048 */ lh $t8, 0x0048($s1) ## 00000048 -/* 00608 809A4C68 8FB90060 */ lw $t9, 0x0060($sp) -/* 0060C 809A4C6C 8FAC0060 */ lw $t4, 0x0060($sp) -/* 00610 809A4C70 13000019 */ beq $t8, $zero, .L809A4CD8 -/* 00614 809A4C74 00000000 */ nop -/* 00618 809A4C78 0C025011 */ jal func_80094044 -/* 0061C 809A4C7C 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 -/* 00620 809A4C80 86280046 */ lh $t0, 0x0046($s1) ## 00000046 -/* 00624 809A4C84 3C014700 */ lui $at, 0x4700 ## $at = 47000000 -/* 00628 809A4C88 44812000 */ mtc1 $at, $f4 ## $f4 = 32768.00 -/* 0062C 809A4C8C 44888000 */ mtc1 $t0, $f16 ## $f16 = 0.00 -/* 00630 809A4C90 3C01809A */ lui $at, %hi(D_809A5640) ## $at = 809A0000 -/* 00634 809A4C94 C4285640 */ lwc1 $f8, %lo(D_809A5640)($at) -/* 00638 809A4C98 468084A0 */ cvt.s.w $f18, $f16 -/* 0063C 809A4C9C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00640 809A4CA0 46049183 */ div.s $f6, $f18, $f4 -/* 00644 809A4CA4 46083302 */ mul.s $f12, $f6, $f8 -/* 00648 809A4CA8 0C0342DC */ jal Matrix_RotateX -/* 0064C 809A4CAC 00000000 */ nop -/* 00650 809A4CB0 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00654 809A4CB4 3C0AE200 */ lui $t2, 0xE200 ## $t2 = E2000000 -/* 00658 809A4CB8 3C0B0C18 */ lui $t3, 0x0C18 ## $t3 = 0C180000 -/* 0065C 809A4CBC 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 00660 809A4CC0 AE0902D0 */ sw $t1, 0x02D0($s0) ## 000002D0 -/* 00664 809A4CC4 356B4DD8 */ ori $t3, $t3, 0x4DD8 ## $t3 = 0C184DD8 -/* 00668 809A4CC8 354A001C */ ori $t2, $t2, 0x001C ## $t2 = E200001C -/* 0066C 809A4CCC AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 00670 809A4CD0 10000011 */ beq $zero, $zero, .L809A4D18 -/* 00674 809A4CD4 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -.L809A4CD8: -/* 00678 809A4CD8 0C024F61 */ jal func_80093D84 -/* 0067C 809A4CDC 8D840000 */ lw $a0, 0x0000($t4) ## 00000000 -/* 00680 809A4CE0 8FA40060 */ lw $a0, 0x0060($sp) -/* 00684 809A4CE4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00688 809A4CE8 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 -/* 0068C 809A4CEC 0C0347F5 */ jal func_800D1FD4 -/* 00690 809A4CF0 00812021 */ addu $a0, $a0, $at -/* 00694 809A4CF4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00698 809A4CF8 3C0EE200 */ lui $t6, 0xE200 ## $t6 = E2000000 -/* 0069C 809A4CFC 3C0F0C18 */ lui $t7, 0x0C18 ## $t7 = 0C180000 -/* 006A0 809A4D00 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 006A4 809A4D04 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 006A8 809A4D08 35EF49D8 */ ori $t7, $t7, 0x49D8 ## $t7 = 0C1849D8 -/* 006AC 809A4D0C 35CE001C */ ori $t6, $t6, 0x001C ## $t6 = E200001C -/* 006B0 809A4D10 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 006B4 809A4D14 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -.L809A4D18: -/* 006B8 809A4D18 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 006BC 809A4D1C 3C19E700 */ lui $t9, 0xE700 ## $t9 = E7000000 -/* 006C0 809A4D20 3C09FA00 */ lui $t1, 0xFA00 ## $t1 = FA000000 -/* 006C4 809A4D24 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 006C8 809A4D28 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 006CC 809A4D2C AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 006D0 809A4D30 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 006D4 809A4D34 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 006D8 809A4D38 2401FF00 */ addiu $at, $zero, 0xFF00 ## $at = FFFFFF00 -/* 006DC 809A4D3C 3C0F00FF */ lui $t7, 0x00FF ## $t7 = 00FF0000 -/* 006E0 809A4D40 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 -/* 006E4 809A4D44 AE0802D0 */ sw $t0, 0x02D0($s0) ## 000002D0 -/* 006E8 809A4D48 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 006EC 809A4D4C 862A0040 */ lh $t2, 0x0040($s1) ## 00000040 -/* 006F0 809A4D50 35EF9B00 */ ori $t7, $t7, 0x9B00 ## $t7 = 00FF9B00 -/* 006F4 809A4D54 3C0EFB00 */ lui $t6, 0xFB00 ## $t6 = FB000000 -/* 006F8 809A4D58 314B00FF */ andi $t3, $t2, 0x00FF ## $t3 = 00000000 -/* 006FC 809A4D5C 01616025 */ or $t4, $t3, $at ## $t4 = FFFFFF00 -/* 00700 809A4D60 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 00704 809A4D64 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00708 809A4D68 3C014700 */ lui $at, 0x4700 ## $at = 47000000 -/* 0070C 809A4D6C 44819000 */ mtc1 $at, $f18 ## $f18 = 32768.00 -/* 00710 809A4D70 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 00714 809A4D74 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 00718 809A4D78 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 0071C 809A4D7C AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 00720 809A4D80 86380046 */ lh $t8, 0x0046($s1) ## 00000046 -/* 00724 809A4D84 3C01809A */ lui $at, %hi(D_809A5644) ## $at = 809A0000 -/* 00728 809A4D88 C4265644 */ lwc1 $f6, %lo(D_809A5644)($at) -/* 0072C 809A4D8C 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 -/* 00730 809A4D90 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00734 809A4D94 46805420 */ cvt.s.w $f16, $f10 -/* 00738 809A4D98 46128103 */ div.s $f4, $f16, $f18 -/* 0073C 809A4D9C 46062302 */ mul.s $f12, $f4, $f6 -/* 00740 809A4DA0 0C0343B5 */ jal Matrix_RotateZ -/* 00744 809A4DA4 00000000 */ nop -/* 00748 809A4DA8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 0074C 809A4DAC 3C08DA38 */ lui $t0, 0xDA38 ## $t0 = DA380000 -/* 00750 809A4DB0 35080003 */ ori $t0, $t0, 0x0003 ## $t0 = DA380003 -/* 00754 809A4DB4 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 00758 809A4DB8 AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0 -/* 0075C 809A4DBC 3C05809A */ lui $a1, %hi(D_809A560C) ## $a1 = 809A0000 -/* 00760 809A4DC0 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 -/* 00764 809A4DC4 24A5560C */ addiu $a1, $a1, %lo(D_809A560C) ## $a1 = 809A560C -/* 00768 809A4DC8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0076C 809A4DCC 2406018B */ addiu $a2, $zero, 0x018B ## $a2 = 0000018B -/* 00770 809A4DD0 0C0346A2 */ jal Matrix_NewMtx -/* 00774 809A4DD4 AFA20028 */ sw $v0, 0x0028($sp) -/* 00778 809A4DD8 8FA30028 */ lw $v1, 0x0028($sp) -/* 0077C 809A4DDC 3C0ADE00 */ lui $t2, 0xDE00 ## $t2 = DE000000 -/* 00780 809A4DE0 3C06809A */ lui $a2, %hi(D_809A5624) ## $a2 = 809A0000 -/* 00784 809A4DE4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00788 809A4DE8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 0078C 809A4DEC 24C65624 */ addiu $a2, $a2, %lo(D_809A5624) ## $a2 = 809A5624 -/* 00790 809A4DF0 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE0 -/* 00794 809A4DF4 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 00798 809A4DF8 AE0902D0 */ sw $t1, 0x02D0($s0) ## 000002D0 -/* 0079C 809A4DFC AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 007A0 809A4E00 8E2B0038 */ lw $t3, 0x0038($s1) ## 00000038 -/* 007A4 809A4E04 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 007A8 809A4E08 2407018F */ addiu $a3, $zero, 0x018F ## $a3 = 0000018F -/* 007AC 809A4E0C 0C031AD5 */ jal Graph_CloseDisps -/* 007B0 809A4E10 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 007B4 809A4E14 8FBF001C */ lw $ra, 0x001C($sp) -/* 007B8 809A4E18 8FB00014 */ lw $s0, 0x0014($sp) -/* 007BC 809A4E1C 8FB10018 */ lw $s1, 0x0018($sp) -/* 007C0 809A4E20 03E00008 */ jr $ra -/* 007C4 809A4E24 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4E28.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4E28.s deleted file mode 100644 index e2a70abd3b..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4E28.s +++ /dev/null @@ -1,49 +0,0 @@ -.late_rodata -glabel D_809A5648 - .float 20000.0 - -.text -glabel func_809A4E28 -/* 007C8 809A4E28 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 007CC 809A4E2C AFBF0014 */ sw $ra, 0x0014($sp) -/* 007D0 809A4E30 AFA40018 */ sw $a0, 0x0018($sp) -/* 007D4 809A4E34 AFA5001C */ sw $a1, 0x001C($sp) -/* 007D8 809A4E38 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 007DC 809A4E3C AFA60020 */ sw $a2, 0x0020($sp) -/* 007E0 809A4E40 3C01809A */ lui $at, %hi(D_809A5648) ## $at = 809A0000 -/* 007E4 809A4E44 C4245648 */ lwc1 $f4, %lo(D_809A5648)($at) -/* 007E8 809A4E48 8FA60020 */ lw $a2, 0x0020($sp) -/* 007EC 809A4E4C 46040182 */ mul.s $f6, $f0, $f4 -/* 007F0 809A4E50 84CE0046 */ lh $t6, 0x0046($a2) ## 00000046 -/* 007F4 809A4E54 84C20050 */ lh $v0, 0x0050($a2) ## 00000050 -/* 007F8 809A4E58 244BFFF6 */ addiu $t3, $v0, 0xFFF6 ## $t3 = FFFFFFF6 -/* 007FC 809A4E5C 4600320D */ trunc.w.s $f8, $f6 -/* 00800 809A4E60 44084000 */ mfc1 $t0, $f8 -/* 00804 809A4E64 00000000 */ nop -/* 00808 809A4E68 01C84821 */ addu $t1, $t6, $t0 -/* 0080C 809A4E6C 252A4000 */ addiu $t2, $t1, 0x4000 ## $t2 = 00004000 -/* 00810 809A4E70 18400007 */ blez $v0, .L809A4E90 -/* 00814 809A4E74 A4CA0046 */ sh $t2, 0x0046($a2) ## 00000046 -/* 00818 809A4E78 A4CB0050 */ sh $t3, 0x0050($a2) ## 00000050 -/* 0081C 809A4E7C 84CC0050 */ lh $t4, 0x0050($a2) ## 00000050 -/* 00820 809A4E80 5D800004 */ bgtzl $t4, .L809A4E94 -/* 00824 809A4E84 84C20040 */ lh $v0, 0x0040($a2) ## 00000040 -/* 00828 809A4E88 A4C00050 */ sh $zero, 0x0050($a2) ## 00000050 -/* 0082C 809A4E8C A4C0005C */ sh $zero, 0x005C($a2) ## 0000005C -.L809A4E90: -/* 00830 809A4E90 84C20040 */ lh $v0, 0x0040($a2) ## 00000040 -.L809A4E94: -/* 00834 809A4E94 18400006 */ blez $v0, .L809A4EB0 -/* 00838 809A4E98 244DFFF6 */ addiu $t5, $v0, 0xFFF6 ## $t5 = FFFFFFF6 -/* 0083C 809A4E9C A4CD0040 */ sh $t5, 0x0040($a2) ## 00000040 -/* 00840 809A4EA0 84CF0040 */ lh $t7, 0x0040($a2) ## 00000040 -/* 00844 809A4EA4 5DE00003 */ bgtzl $t7, .L809A4EB4 -/* 00848 809A4EA8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0084C 809A4EAC A4C00040 */ sh $zero, 0x0040($a2) ## 00000040 -.L809A4EB0: -/* 00850 809A4EB0 8FBF0014 */ lw $ra, 0x0014($sp) -.L809A4EB4: -/* 00854 809A4EB4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00858 809A4EB8 03E00008 */ jr $ra -/* 0085C 809A4EBC 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4EC0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4EC0.s deleted file mode 100644 index 97135dd6ea..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4EC0.s +++ /dev/null @@ -1,137 +0,0 @@ -.late_rodata -glabel D_809A564C - .float 20000.0 - -glabel D_809A5650 - .float 17.9 - -glabel D_809A5654 - .float 23.9 - -.text -glabel func_809A4EC0 -/* 00860 809A4EC0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00864 809A4EC4 AFBF001C */ sw $ra, 0x001C($sp) -/* 00868 809A4EC8 AFB00018 */ sw $s0, 0x0018($sp) -/* 0086C 809A4ECC 00C08025 */ or $s0, $a2, $zero ## $s0 = 00000000 -/* 00870 809A4ED0 AFA40038 */ sw $a0, 0x0038($sp) -/* 00874 809A4ED4 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00878 809A4ED8 AFA5003C */ sw $a1, 0x003C($sp) -/* 0087C 809A4EDC 3C01809A */ lui $at, %hi(D_809A564C) ## $at = 809A0000 -/* 00880 809A4EE0 C424564C */ lwc1 $f4, %lo(D_809A564C)($at) -/* 00884 809A4EE4 860E0046 */ lh $t6, 0x0046($s0) ## 00000046 -/* 00888 809A4EE8 86020048 */ lh $v0, 0x0048($s0) ## 00000048 -/* 0088C 809A4EEC 46040182 */ mul.s $f6, $f0, $f4 -/* 00890 809A4EF0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00894 809A4EF4 4600320D */ trunc.w.s $f8, $f6 -/* 00898 809A4EF8 44084000 */ mfc1 $t0, $f8 -/* 0089C 809A4EFC 00000000 */ nop -/* 008A0 809A4F00 01C84821 */ addu $t1, $t6, $t0 -/* 008A4 809A4F04 252A4000 */ addiu $t2, $t1, 0x4000 ## $t2 = 00004000 -/* 008A8 809A4F08 14410026 */ bne $v0, $at, .L809A4FA4 -/* 008AC 809A4F0C A60A0046 */ sh $t2, 0x0046($s0) ## 00000046 -/* 008B0 809A4F10 8FAB0038 */ lw $t3, 0x0038($sp) -/* 008B4 809A4F14 3C01809A */ lui $at, %hi(D_809A5650) ## $at = 809A0000 -/* 008B8 809A4F18 C42C5650 */ lwc1 $f12, %lo(D_809A5650)($at) -/* 008BC 809A4F1C 8D6C1C44 */ lw $t4, 0x1C44($t3) ## 00001C44 -/* 008C0 809A4F20 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 008C4 809A4F24 AFAC0030 */ sw $t4, 0x0030($sp) -/* 008C8 809A4F28 4600028D */ trunc.w.s $f10, $f0 -/* 008CC 809A4F2C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 008D0 809A4F30 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 -/* 008D4 809A4F34 440F5000 */ mfc1 $t7, $f10 -/* 008D8 809A4F38 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 008DC 809A4F3C A7AF0036 */ sh $t7, 0x0036($sp) -/* 008E0 809A4F40 87B90036 */ lh $t9, 0x0036($sp) -/* 008E4 809A4F44 8FB80030 */ lw $t8, 0x0030($sp) -/* 008E8 809A4F48 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -/* 008EC 809A4F4C 00197080 */ sll $t6, $t9, 2 -/* 008F0 809A4F50 01D97023 */ subu $t6, $t6, $t9 -/* 008F4 809A4F54 000E7080 */ sll $t6, $t6, 2 -/* 008F8 809A4F58 030E1021 */ addu $v0, $t8, $t6 -/* 008FC 809A4F5C C4500908 */ lwc1 $f16, 0x0908($v0) ## 00000908 -/* 00900 809A4F60 44816000 */ mtc1 $at, $f12 ## $f12 = 15.00 -/* 00904 809A4F64 46100480 */ add.s $f18, $f0, $f16 -/* 00908 809A4F68 E6120000 */ swc1 $f18, 0x0000($s0) ## 00000000 -/* 0090C 809A4F6C 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 00910 809A4F70 AFA20024 */ sw $v0, 0x0024($sp) -/* 00914 809A4F74 8FA80024 */ lw $t0, 0x0024($sp) -/* 00918 809A4F78 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 0091C 809A4F7C 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 -/* 00920 809A4F80 C504090C */ lwc1 $f4, 0x090C($t0) ## 0000090C -/* 00924 809A4F84 46040180 */ add.s $f6, $f0, $f4 -/* 00928 809A4F88 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 0092C 809A4F8C E6060004 */ swc1 $f6, 0x0004($s0) ## 00000004 -/* 00930 809A4F90 8FA90024 */ lw $t1, 0x0024($sp) -/* 00934 809A4F94 C5280910 */ lwc1 $f8, 0x0910($t1) ## 00000910 -/* 00938 809A4F98 46080280 */ add.s $f10, $f0, $f8 -/* 0093C 809A4F9C 10000027 */ beq $zero, $zero, .L809A503C -/* 00940 809A4FA0 E60A0008 */ swc1 $f10, 0x0008($s0) ## 00000008 -.L809A4FA4: -/* 00944 809A4FA4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00948 809A4FA8 54410025 */ bnel $v0, $at, .L809A5040 -/* 0094C 809A4FAC 8608005C */ lh $t0, 0x005C($s0) ## 0000005C -/* 00950 809A4FB0 8E0A003C */ lw $t2, 0x003C($s0) ## 0000003C -/* 00954 809A4FB4 3C01809A */ lui $at, %hi(D_809A5654) ## $at = 809A0000 -/* 00958 809A4FB8 C42C5654 */ lwc1 $f12, %lo(D_809A5654)($at) -/* 0095C 809A4FBC 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 00960 809A4FC0 AFAA002C */ sw $t2, 0x002C($sp) -/* 00964 809A4FC4 4600040D */ trunc.w.s $f16, $f0 -/* 00968 809A4FC8 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -/* 0096C 809A4FCC 44816000 */ mtc1 $at, $f12 ## $f12 = 15.00 -/* 00970 809A4FD0 440C8000 */ mfc1 $t4, $f16 -/* 00974 809A4FD4 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 00978 809A4FD8 A7AC0036 */ sh $t4, 0x0036($sp) -/* 0097C 809A4FDC 87AF0036 */ lh $t7, 0x0036($sp) -/* 00980 809A4FE0 8FAD002C */ lw $t5, 0x002C($sp) -/* 00984 809A4FE4 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00988 809A4FE8 000FC880 */ sll $t9, $t7, 2 -/* 0098C 809A4FEC 032FC823 */ subu $t9, $t9, $t7 -/* 00990 809A4FF0 0019C880 */ sll $t9, $t9, 2 -/* 00994 809A4FF4 01B91021 */ addu $v0, $t5, $t9 -/* 00998 809A4FF8 C4520218 */ lwc1 $f18, 0x0218($v0) ## 00000218 -/* 0099C 809A4FFC 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 009A0 809A5000 46120100 */ add.s $f4, $f0, $f18 -/* 009A4 809A5004 E6040000 */ swc1 $f4, 0x0000($s0) ## 00000000 -/* 009A8 809A5008 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 009AC 809A500C AFA20024 */ sw $v0, 0x0024($sp) -/* 009B0 809A5010 8FB80024 */ lw $t8, 0x0024($sp) -/* 009B4 809A5014 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -/* 009B8 809A5018 44816000 */ mtc1 $at, $f12 ## $f12 = 15.00 -/* 009BC 809A501C C706021C */ lwc1 $f6, 0x021C($t8) ## 0000021C -/* 009C0 809A5020 46060200 */ add.s $f8, $f0, $f6 -/* 009C4 809A5024 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 009C8 809A5028 E6080004 */ swc1 $f8, 0x0004($s0) ## 00000004 -/* 009CC 809A502C 8FAE0024 */ lw $t6, 0x0024($sp) -/* 009D0 809A5030 C5CA0220 */ lwc1 $f10, 0x0220($t6) ## 00000220 -/* 009D4 809A5034 460A0400 */ add.s $f16, $f0, $f10 -/* 009D8 809A5038 E6100008 */ swc1 $f16, 0x0008($s0) ## 00000008 -.L809A503C: -/* 009DC 809A503C 8608005C */ lh $t0, 0x005C($s0) ## 0000005C -.L809A5040: -/* 009E0 809A5040 29010064 */ slti $at, $t0, 0x0064 -/* 009E4 809A5044 5020000A */ beql $at, $zero, .L809A5070 -/* 009E8 809A5048 8FBF001C */ lw $ra, 0x001C($sp) -/* 009EC 809A504C 86090040 */ lh $t1, 0x0040($s0) ## 00000040 -/* 009F0 809A5050 252AFFCE */ addiu $t2, $t1, 0xFFCE ## $t2 = FFFFFFCE -/* 009F4 809A5054 A60A0040 */ sh $t2, 0x0040($s0) ## 00000040 -/* 009F8 809A5058 860B0040 */ lh $t3, 0x0040($s0) ## 00000040 -/* 009FC 809A505C 05630004 */ bgezl $t3, .L809A5070 -/* 00A00 809A5060 8FBF001C */ lw $ra, 0x001C($sp) -/* 00A04 809A5064 A6000040 */ sh $zero, 0x0040($s0) ## 00000040 -/* 00A08 809A5068 A600005C */ sh $zero, 0x005C($s0) ## 0000005C -/* 00A0C 809A506C 8FBF001C */ lw $ra, 0x001C($sp) -.L809A5070: -/* 00A10 809A5070 8FB00018 */ lw $s0, 0x0018($sp) -/* 00A14 809A5074 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00A18 809A5078 03E00008 */ jr $ra -/* 00A1C 809A507C 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/EffectSsFireTail_Init.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/EffectSsFireTail_Init.s deleted file mode 100644 index 54c3daa4c8..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/EffectSsFireTail_Init.s +++ /dev/null @@ -1,72 +0,0 @@ -glabel EffectSsFireTail_Init -/* 00000 809A5740 AFA40000 */ sw $a0, 0x0000($sp) -/* 00004 809A5744 AFA50004 */ sw $a1, 0x0004($sp) -/* 00008 809A5748 8CEF0004 */ lw $t7, 0x0004($a3) ## 00000004 -/* 0000C 809A574C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00010 809A5750 3C0A809A */ lui $t2, %hi(func_809A5858) ## $t2 = 809A0000 -/* 00014 809A5754 ACCF0000 */ sw $t7, 0x0000($a2) ## 00000000 -/* 00018 809A5758 8CEE0008 */ lw $t6, 0x0008($a3) ## 00000008 -/* 0001C 809A575C 3C0B809A */ lui $t3, %hi(func_809A5D98) ## $t3 = 809A0000 -/* 00020 809A5760 254A5858 */ addiu $t2, $t2, %lo(func_809A5858) ## $t2 = 809A5858 -/* 00024 809A5764 ACCE0004 */ sw $t6, 0x0004($a2) ## 00000004 -/* 00028 809A5768 8CEF000C */ lw $t7, 0x000C($a3) ## 0000000C -/* 0002C 809A576C 256B5D98 */ addiu $t3, $t3, %lo(func_809A5D98) ## $t3 = 809A5D98 -/* 00030 809A5770 3C01447A */ lui $at, 0x447A ## $at = 447A0000 -/* 00034 809A5774 ACCF0008 */ sw $t7, 0x0008($a2) ## 00000008 -/* 00038 809A5778 8CF90014 */ lw $t9, 0x0014($a3) ## 00000014 -/* 0003C 809A577C 44813000 */ mtc1 $at, $f6 ## $f6 = 1000.00 -/* 00040 809A5780 240FFFF6 */ addiu $t7, $zero, 0xFFF6 ## $t7 = FFFFFFF6 -/* 00044 809A5784 ACD9002C */ sw $t9, 0x002C($a2) ## 0000002C -/* 00048 809A5788 8CF80018 */ lw $t8, 0x0018($a3) ## 00000018 -/* 0004C 809A578C ACD80030 */ sw $t8, 0x0030($a2) ## 00000030 -/* 00050 809A5790 8CF9001C */ lw $t9, 0x001C($a3) ## 0000001C -/* 00054 809A5794 E4C0000C */ swc1 $f0, 0x000C($a2) ## 0000000C -/* 00058 809A5798 E4C00010 */ swc1 $f0, 0x0010($a2) ## 00000010 -/* 0005C 809A579C E4C00014 */ swc1 $f0, 0x0014($a2) ## 00000014 -/* 00060 809A57A0 E4C00018 */ swc1 $f0, 0x0018($a2) ## 00000018 -/* 00064 809A57A4 E4C0001C */ swc1 $f0, 0x001C($a2) ## 0000001C -/* 00068 809A57A8 E4C00020 */ swc1 $f0, 0x0020($a2) ## 00000020 -/* 0006C 809A57AC ACD90034 */ sw $t9, 0x0034($a2) ## 00000034 -/* 00070 809A57B0 8CE80030 */ lw $t0, 0x0030($a3) ## 00000030 -/* 00074 809A57B4 2418FFF1 */ addiu $t8, $zero, 0xFFF1 ## $t8 = FFFFFFF1 -/* 00078 809A57B8 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 0007C 809A57BC A4C8005C */ sh $t0, 0x005C($a2) ## 0000005C -/* 00080 809A57C0 8CE90000 */ lw $t1, 0x0000($a3) ## 00000000 -/* 00084 809A57C4 ACCA0028 */ sw $t2, 0x0028($a2) ## 00000028 -/* 00088 809A57C8 ACCB0024 */ sw $t3, 0x0024($a2) ## 00000024 -/* 0008C 809A57CC ACC9003C */ sw $t1, 0x003C($a2) ## 0000003C -/* 00090 809A57D0 C4E40010 */ lwc1 $f4, 0x0010($a3) ## 00000010 -/* 00094 809A57D4 46062202 */ mul.s $f8, $f4, $f6 -/* 00098 809A57D8 4600428D */ trunc.w.s $f10, $f8 -/* 0009C 809A57DC 440D5000 */ mfc1 $t5, $f10 -/* 000A0 809A57E0 00000000 */ nop -/* 000A4 809A57E4 A4CD0040 */ sh $t5, 0x0040($a2) ## 00000040 -/* 000A8 809A57E8 8CEE0030 */ lw $t6, 0x0030($a3) ## 00000030 -/* 000AC 809A57EC A4CF0044 */ sh $t7, 0x0044($a2) ## 00000044 -/* 000B0 809A57F0 A4D80046 */ sh $t8, 0x0046($a2) ## 00000046 -/* 000B4 809A57F4 A4CE0042 */ sh $t6, 0x0042($a2) ## 00000042 -/* 000B8 809A57F8 84E30020 */ lh $v1, 0x0020($a3) ## 00000020 -/* 000BC 809A57FC 54600004 */ bnel $v1, $zero, .L809A5810 -/* 000C0 809A5800 A4C30054 */ sh $v1, 0x0054($a2) ## 00000054 -/* 000C4 809A5804 A4F90020 */ sh $t9, 0x0020($a3) ## 00000020 -/* 000C8 809A5808 84E30020 */ lh $v1, 0x0020($a3) ## 00000020 -/* 000CC 809A580C A4C30054 */ sh $v1, 0x0054($a2) ## 00000054 -.L809A5810: -/* 000D0 809A5810 90E80022 */ lbu $t0, 0x0022($a3) ## 00000022 -/* 000D4 809A5814 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 000D8 809A5818 A4C80048 */ sh $t0, 0x0048($a2) ## 00000048 -/* 000DC 809A581C 90E90023 */ lbu $t1, 0x0023($a3) ## 00000023 -/* 000E0 809A5820 A4C9004A */ sh $t1, 0x004A($a2) ## 0000004A -/* 000E4 809A5824 90EA0024 */ lbu $t2, 0x0024($a3) ## 00000024 -/* 000E8 809A5828 A4CA004C */ sh $t2, 0x004C($a2) ## 0000004C -/* 000EC 809A582C 90EB0026 */ lbu $t3, 0x0026($a3) ## 00000026 -/* 000F0 809A5830 A4CB004E */ sh $t3, 0x004E($a2) ## 0000004E -/* 000F4 809A5834 90EC0027 */ lbu $t4, 0x0027($a3) ## 00000027 -/* 000F8 809A5838 A4CC0050 */ sh $t4, 0x0050($a2) ## 00000050 -/* 000FC 809A583C 90ED0028 */ lbu $t5, 0x0028($a3) ## 00000028 -/* 00100 809A5840 A4CD0052 */ sh $t5, 0x0052($a2) ## 00000052 -/* 00104 809A5844 84EE002C */ lh $t6, 0x002C($a3) ## 0000002C -/* 00108 809A5848 A4CE0056 */ sh $t6, 0x0056($a2) ## 00000056 -/* 0010C 809A584C 84EF002A */ lh $t7, 0x002A($a3) ## 0000002A -/* 00110 809A5850 03E00008 */ jr $ra -/* 00114 809A5854 A4CF0058 */ sh $t7, 0x0058($a2) ## 00000058 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/func_809A5858.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/func_809A5858.s deleted file mode 100644 index 49719284ae..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/func_809A5858.s +++ /dev/null @@ -1,382 +0,0 @@ -.rdata -glabel D_809A5DE0 - .asciz "../z_eff_fire_tail.c" - .balign 4 - -glabel D_809A5DF8 - .asciz "../z_eff_fire_tail.c" - .balign 4 - -glabel D_809A5E10 - .asciz "../z_eff_fire_tail.c" - .balign 4 - -.late_rodata -glabel D_809A5E28 - .float 0.1 - -glabel D_809A5E2C - .float 9.58738019108e-05 - -glabel D_809A5E30 - .float 0.0174532923847 - -glabel D_809A5E34 - .float 1.00000006569e-05 - -glabel D_809A5E38 - .float 0.1 - -glabel D_809A5E3C - .float 0.01 - -.text -glabel func_809A5858 -/* 00118 809A5858 27BDFF48 */ addiu $sp, $sp, 0xFF48 ## $sp = FFFFFF48 -/* 0011C 809A585C AFB00038 */ sw $s0, 0x0038($sp) -/* 00120 809A5860 AFBF0044 */ sw $ra, 0x0044($sp) -/* 00124 809A5864 AFB20040 */ sw $s2, 0x0040($sp) -/* 00128 809A5868 AFB1003C */ sw $s1, 0x003C($sp) -/* 0012C 809A586C AFA500BC */ sw $a1, 0x00BC($sp) -/* 00130 809A5870 8C920000 */ lw $s2, 0x0000($a0) ## 00000000 -/* 00134 809A5874 00C08025 */ or $s0, $a2, $zero ## $s0 = 00000000 -/* 00138 809A5878 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 0013C 809A587C 3C06809A */ lui $a2, %hi(D_809A5DE0) ## $a2 = 809A0000 -/* 00140 809A5880 24C65DE0 */ addiu $a2, $a2, %lo(D_809A5DE0) ## $a2 = 809A5DE0 -/* 00144 809A5884 27A40080 */ addiu $a0, $sp, 0x0080 ## $a0 = FFFFFFC8 -/* 00148 809A5888 240700B6 */ addiu $a3, $zero, 0x00B6 ## $a3 = 000000B6 -/* 0014C 809A588C 0C031AB1 */ jal Graph_OpenDisps -/* 00150 809A5890 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 00154 809A5894 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00158 809A5898 00000000 */ nop -/* 0015C 809A589C E7A000A8 */ swc1 $f0, 0x00A8($sp) -/* 00160 809A58A0 E7A000A4 */ swc1 $f0, 0x00A4($sp) -/* 00164 809A58A4 E7A000A0 */ swc1 $f0, 0x00A0($sp) -/* 00168 809A58A8 8E02003C */ lw $v0, 0x003C($s0) ## 0000003C -/* 0016C 809A58AC 1040004A */ beq $v0, $zero, .L809A59D8 -/* 00170 809A58B0 260E002C */ addiu $t6, $s0, 0x002C ## $t6 = 0000002C -/* 00174 809A58B4 AFAE0050 */ sw $t6, 0x0050($sp) -/* 00178 809A58B8 8C59005C */ lw $t9, 0x005C($v0) ## 0000005C -/* 0017C 809A58BC ADD90000 */ sw $t9, 0x0000($t6) ## 0000002C -/* 00180 809A58C0 8C580060 */ lw $t8, 0x0060($v0) ## 00000060 -/* 00184 809A58C4 ADD80004 */ sw $t8, 0x0004($t6) ## 00000030 -/* 00188 809A58C8 8C590064 */ lw $t9, 0x0064($v0) ## 00000064 -/* 0018C 809A58CC ADD90008 */ sw $t9, 0x0008($t6) ## 00000034 -/* 00190 809A58D0 86030056 */ lh $v1, 0x0056($s0) ## 00000056 -/* 00194 809A58D4 04630011 */ bgezl $v1, .L809A591C -/* 00198 809A58D8 8E281C44 */ lw $t0, 0x1C44($s1) ## 00001C44 -/* 0019C 809A58DC 8E02003C */ lw $v0, 0x003C($s0) ## 0000003C -/* 001A0 809A58E0 C6120008 */ lwc1 $f18, 0x0008($s0) ## 00000008 -/* 001A4 809A58E4 C6100000 */ lwc1 $f16, 0x0000($s0) ## 00000000 -/* 001A8 809A58E8 C44A002C */ lwc1 $f10, 0x002C($v0) ## 0000002C -/* 001AC 809A58EC C4480024 */ lwc1 $f8, 0x0024($v0) ## 00000024 -/* 001B0 809A58F0 C6060004 */ lwc1 $f6, 0x0004($s0) ## 00000004 -/* 001B4 809A58F4 460A9280 */ add.s $f10, $f18, $f10 -/* 001B8 809A58F8 C4520028 */ lwc1 $f18, 0x0028($v0) ## 00000028 -/* 001BC 809A58FC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 001C0 809A5900 46088300 */ add.s $f12, $f16, $f8 -/* 001C4 809A5904 44065000 */ mfc1 $a2, $f10 -/* 001C8 809A5908 0C034261 */ jal Matrix_Translate -/* 001CC 809A590C 46123380 */ add.s $f14, $f6, $f18 -/* 001D0 809A5910 10000039 */ beq $zero, $zero, .L809A59F8 -/* 001D4 809A5914 27A400A0 */ addiu $a0, $sp, 0x00A0 ## $a0 = FFFFFFE8 -/* 001D8 809A5918 8E281C44 */ lw $t0, 0x1C44($s1) ## 00001C44 -.L809A591C: -/* 001DC 809A591C A7A3007A */ sh $v1, 0x007A($sp) -/* 001E0 809A5920 AFA8007C */ sw $t0, 0x007C($sp) -/* 001E4 809A5924 862907A0 */ lh $t1, 0x07A0($s1) ## 000007A0 -/* 001E8 809A5928 00095080 */ sll $t2, $t1, 2 -/* 001EC 809A592C 022A5821 */ addu $t3, $s1, $t2 -/* 001F0 809A5930 0C016A7D */ jal func_8005A9F4 -/* 001F4 809A5934 8D640790 */ lw $a0, 0x0790($t3) ## 00000790 -/* 001F8 809A5938 00022400 */ sll $a0, $v0, 16 -/* 001FC 809A593C 0C01DE1C */ jal Math_Sins - ## sins? -/* 00200 809A5940 00042403 */ sra $a0, $a0, 16 -/* 00204 809A5944 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 00208 809A5948 44814000 */ mtc1 $at, $f8 ## $f8 = 5.00 -/* 0020C 809A594C 87AD007A */ lh $t5, 0x007A($sp) -/* 00210 809A5950 8FAC007C */ lw $t4, 0x007C($sp) -/* 00214 809A5954 46080282 */ mul.s $f10, $f0, $f8 -/* 00218 809A5958 000D7080 */ sll $t6, $t5, 2 -/* 0021C 809A595C 01CD7023 */ subu $t6, $t6, $t5 -/* 00220 809A5960 000E7080 */ sll $t6, $t6, 2 -/* 00224 809A5964 018E1821 */ addu $v1, $t4, $t6 -/* 00228 809A5968 C4660908 */ lwc1 $f6, 0x0908($v1) ## 00000908 -/* 0022C 809A596C 460A3401 */ sub.s $f16, $f6, $f10 -/* 00230 809A5970 E6100000 */ swc1 $f16, 0x0000($s0) ## 00000000 -/* 00234 809A5974 C472090C */ lwc1 $f18, 0x090C($v1) ## 0000090C -/* 00238 809A5978 E6120004 */ swc1 $f18, 0x0004($s0) ## 00000004 -/* 0023C 809A597C 862F07A0 */ lh $t7, 0x07A0($s1) ## 000007A0 -/* 00240 809A5980 000FC080 */ sll $t8, $t7, 2 -/* 00244 809A5984 0238C821 */ addu $t9, $s1, $t8 -/* 00248 809A5988 8F240790 */ lw $a0, 0x0790($t9) ## 00000790 -/* 0024C 809A598C 0C016A7D */ jal func_8005A9F4 -/* 00250 809A5990 AFA30054 */ sw $v1, 0x0054($sp) -/* 00254 809A5994 00022400 */ sll $a0, $v0, 16 -/* 00258 809A5998 0C01DE0D */ jal Math_Coss - ## coss? -/* 0025C 809A599C 00042403 */ sra $a0, $a0, 16 -/* 00260 809A59A0 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 00264 809A59A4 44814000 */ mtc1 $at, $f8 ## $f8 = 5.00 -/* 00268 809A59A8 8FA30054 */ lw $v1, 0x0054($sp) -/* 0026C 809A59AC C60C0000 */ lwc1 $f12, 0x0000($s0) ## 00000000 -/* 00270 809A59B0 46080182 */ mul.s $f6, $f0, $f8 -/* 00274 809A59B4 C4640910 */ lwc1 $f4, 0x0910($v1) ## 00000910 -/* 00278 809A59B8 C60E0004 */ lwc1 $f14, 0x0004($s0) ## 00000004 -/* 0027C 809A59BC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00280 809A59C0 46062281 */ sub.s $f10, $f4, $f6 -/* 00284 809A59C4 E60A0008 */ swc1 $f10, 0x0008($s0) ## 00000008 -/* 00288 809A59C8 0C034261 */ jal Matrix_Translate -/* 0028C 809A59CC 8E060008 */ lw $a2, 0x0008($s0) ## 00000008 -/* 00290 809A59D0 10000009 */ beq $zero, $zero, .L809A59F8 -/* 00294 809A59D4 27A400A0 */ addiu $a0, $sp, 0x00A0 ## $a0 = FFFFFFE8 -.L809A59D8: -/* 00298 809A59D8 C60C0000 */ lwc1 $f12, 0x0000($s0) ## 00000000 -/* 0029C 809A59DC C60E0004 */ lwc1 $f14, 0x0004($s0) ## 00000004 -/* 002A0 809A59E0 8E060008 */ lw $a2, 0x0008($s0) ## 00000008 -/* 002A4 809A59E4 0C034261 */ jal Matrix_Translate -/* 002A8 809A59E8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 002AC 809A59EC 2608002C */ addiu $t0, $s0, 0x002C ## $t0 = 0000002C -/* 002B0 809A59F0 AFA80050 */ sw $t0, 0x0050($sp) -/* 002B4 809A59F4 27A400A0 */ addiu $a0, $sp, 0x00A0 ## $a0 = FFFFFFE8 -.L809A59F8: -/* 002B8 809A59F8 0C01E01A */ jal Math_Vec3f_Yaw - -/* 002BC 809A59FC 8FA50050 */ lw $a1, 0x0050($sp) -/* 002C0 809A5A00 A7A2005E */ sh $v0, 0x005E($sp) -/* 002C4 809A5A04 862907A0 */ lh $t1, 0x07A0($s1) ## 000007A0 -/* 002C8 809A5A08 00095080 */ sll $t2, $t1, 2 -/* 002CC 809A5A0C 022A5821 */ addu $t3, $s1, $t2 -/* 002D0 809A5A10 0C016A7D */ jal func_8005A9F4 -/* 002D4 809A5A14 8D640790 */ lw $a0, 0x0790($t3) ## 00000790 -/* 002D8 809A5A18 87AD005E */ lh $t5, 0x005E($sp) -/* 002DC 809A5A1C 01A21823 */ subu $v1, $t5, $v0 -/* 002E0 809A5A20 00032400 */ sll $a0, $v1, 16 -/* 002E4 809A5A24 A7A300AE */ sh $v1, 0x00AE($sp) -/* 002E8 809A5A28 0C01DE0D */ jal Math_Coss - ## coss? -/* 002EC 809A5A2C 00042403 */ sra $a0, $a0, 16 -/* 002F0 809A5A30 46000005 */ abs.s $f0, $f0 -/* 002F4 809A5A34 87A400AE */ lh $a0, 0x00AE($sp) -/* 002F8 809A5A38 0C01DE1C */ jal Math_Sins - ## sins? -/* 002FC 809A5A3C E7A0009C */ swc1 $f0, 0x009C($sp) -/* 00300 809A5A40 27A400A0 */ addiu $a0, $sp, 0x00A0 ## $a0 = FFFFFFE8 -/* 00304 809A5A44 8FA50050 */ lw $a1, 0x0050($sp) -/* 00308 809A5A48 0C01E00A */ jal Math_Vec3f_DistXZ - -/* 0030C 809A5A4C E7A00098 */ swc1 $f0, 0x0098($sp) -/* 00310 809A5A50 860C0054 */ lh $t4, 0x0054($s0) ## 00000054 -/* 00314 809A5A54 3C01809A */ lui $at, %hi(D_809A5E28) ## $at = 809A0000 -/* 00318 809A5A58 C4285E28 */ lwc1 $f8, %lo(D_809A5E28)($at) -/* 0031C 809A5A5C 448C8000 */ mtc1 $t4, $f16 ## $f16 = 0.00 -/* 00320 809A5A60 00000000 */ nop -/* 00324 809A5A64 468084A0 */ cvt.s.w $f18, $f16 -/* 00328 809A5A68 46089102 */ mul.s $f4, $f18, $f8 -/* 0032C 809A5A6C 46040183 */ div.s $f6, $f0, $f4 -/* 00330 809A5A70 E7A60094 */ swc1 $f6, 0x0094($sp) -/* 00334 809A5A74 862E07A0 */ lh $t6, 0x07A0($s1) ## 000007A0 -/* 00338 809A5A78 000E7880 */ sll $t7, $t6, 2 -/* 0033C 809A5A7C 022FC021 */ addu $t8, $s1, $t7 -/* 00340 809A5A80 0C016A7D */ jal func_8005A9F4 -/* 00344 809A5A84 8F040790 */ lw $a0, 0x0790($t8) ## 00000790 -/* 00348 809A5A88 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 0034C 809A5A8C 0041C821 */ addu $t9, $v0, $at -/* 00350 809A5A90 00194400 */ sll $t0, $t9, 16 -/* 00354 809A5A94 00084C03 */ sra $t1, $t0, 16 -/* 00358 809A5A98 44895000 */ mtc1 $t1, $f10 ## $f10 = 0.00 -/* 0035C 809A5A9C 3C01809A */ lui $at, %hi(D_809A5E2C) ## $at = 809A0000 -/* 00360 809A5AA0 C4325E2C */ lwc1 $f18, %lo(D_809A5E2C)($at) -/* 00364 809A5AA4 46805420 */ cvt.s.w $f16, $f10 -/* 00368 809A5AA8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0036C 809A5AAC 46128302 */ mul.s $f12, $f16, $f18 -/* 00370 809A5AB0 0C034348 */ jal Matrix_RotateY -/* 00374 809A5AB4 00000000 */ nop -/* 00378 809A5AB8 860A0044 */ lh $t2, 0x0044($s0) ## 00000044 -/* 0037C 809A5ABC C7A20098 */ lwc1 $f2, 0x0098($sp) -/* 00380 809A5AC0 C7AA0094 */ lwc1 $f10, 0x0094($sp) -/* 00384 809A5AC4 448A4000 */ mtc1 $t2, $f8 ## $f8 = 0.00 -/* 00388 809A5AC8 3C01809A */ lui $at, %hi(D_809A5E30) ## $at = 809A0000 -/* 0038C 809A5ACC C4325E30 */ lwc1 $f18, %lo(D_809A5E30)($at) -/* 00390 809A5AD0 46804120 */ cvt.s.w $f4, $f8 -/* 00394 809A5AD4 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00398 809A5AD8 46022182 */ mul.s $f6, $f4, $f2 -/* 0039C 809A5ADC 00000000 */ nop -/* 003A0 809A5AE0 460A3402 */ mul.s $f16, $f6, $f10 -/* 003A4 809A5AE4 00000000 */ nop -/* 003A8 809A5AE8 46128302 */ mul.s $f12, $f16, $f18 -/* 003AC 809A5AEC 0C0343B5 */ jal Matrix_RotateZ -/* 003B0 809A5AF0 00000000 */ nop -/* 003B4 809A5AF4 860B005C */ lh $t3, 0x005C($s0) ## 0000005C -/* 003B8 809A5AF8 860C0042 */ lh $t4, 0x0042($s0) ## 00000042 -/* 003BC 809A5AFC 860E0040 */ lh $t6, 0x0040($s0) ## 00000040 -/* 003C0 809A5B00 256D0001 */ addiu $t5, $t3, 0x0001 ## $t5 = 00000001 -/* 003C4 809A5B04 448D4000 */ mtc1 $t5, $f8 ## $f8 = 0.00 -/* 003C8 809A5B08 448C3000 */ mtc1 $t4, $f6 ## $f6 = 0.00 -/* 003CC 809A5B0C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 003D0 809A5B10 46804120 */ cvt.s.w $f4, $f8 -/* 003D4 809A5B14 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 003D8 809A5B18 448E4000 */ mtc1 $t6, $f8 ## $f8 = 0.00 -/* 003DC 809A5B1C 3C01809A */ lui $at, %hi(D_809A5E34) ## $at = 809A0000 -/* 003E0 809A5B20 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 003E4 809A5B24 468032A0 */ cvt.s.w $f10, $f6 -/* 003E8 809A5B28 468041A0 */ cvt.s.w $f6, $f8 -/* 003EC 809A5B2C 460A2403 */ div.s $f16, $f4, $f10 -/* 003F0 809A5B30 C4245E34 */ lwc1 $f4, %lo(D_809A5E34)($at) -/* 003F4 809A5B34 46100081 */ sub.s $f2, $f0, $f16 -/* 003F8 809A5B38 46021482 */ mul.s $f18, $f2, $f2 -/* 003FC 809A5B3C 46120081 */ sub.s $f2, $f0, $f18 -/* 00400 809A5B40 46043282 */ mul.s $f10, $f6, $f4 -/* 00404 809A5B44 00000000 */ nop -/* 00408 809A5B48 46025382 */ mul.s $f14, $f10, $f2 -/* 0040C 809A5B4C 44067000 */ mfc1 $a2, $f14 -/* 00410 809A5B50 E7AE00A8 */ swc1 $f14, 0x00A8($sp) -/* 00414 809A5B54 E7AE00A4 */ swc1 $f14, 0x00A4($sp) -/* 00418 809A5B58 E7AE00A0 */ swc1 $f14, 0x00A0($sp) -/* 0041C 809A5B5C 0C0342A3 */ jal Matrix_Scale -/* 00420 809A5B60 46007306 */ mov.s $f12, $f14 -/* 00424 809A5B64 860F0046 */ lh $t7, 0x0046($s0) ## 00000046 -/* 00428 809A5B68 3C01809A */ lui $at, %hi(D_809A5E38) ## $at = 809A0000 -/* 0042C 809A5B6C C4205E38 */ lwc1 $f0, %lo(D_809A5E38)($at) -/* 00430 809A5B70 448F9000 */ mtc1 $t7, $f18 ## $f18 = 0.00 -/* 00434 809A5B74 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00438 809A5B78 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 0043C 809A5B7C 46809220 */ cvt.s.w $f8, $f18 -/* 00440 809A5B80 3C01809A */ lui $at, %hi(D_809A5E3C) ## $at = 809A0000 -/* 00444 809A5B84 C4265E3C */ lwc1 $f6, %lo(D_809A5E3C)($at) -/* 00448 809A5B88 C7A2009C */ lwc1 $f2, 0x009C($sp) -/* 0044C 809A5B8C C7B00094 */ lwc1 $f16, 0x0094($sp) -/* 00450 809A5B90 46064102 */ mul.s $f4, $f8, $f6 -/* 00454 809A5B94 00000000 */ nop -/* 00458 809A5B98 46022282 */ mul.s $f10, $f4, $f2 -/* 0045C 809A5B9C 00000000 */ nop -/* 00460 809A5BA0 46105482 */ mul.s $f18, $f10, $f16 -/* 00464 809A5BA4 460C9080 */ add.s $f2, $f18, $f12 -/* 00468 809A5BA8 4600103C */ c.lt.s $f2, $f0 -/* 0046C 809A5BAC E7A2009C */ swc1 $f2, 0x009C($sp) -/* 00470 809A5BB0 45000002 */ bc1f .L809A5BBC -/* 00474 809A5BB4 00000000 */ nop -/* 00478 809A5BB8 E7A0009C */ swc1 $f0, 0x009C($sp) -.L809A5BBC: -/* 0047C 809A5BBC C7AE009C */ lwc1 $f14, 0x009C($sp) -/* 00480 809A5BC0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00484 809A5BC4 460E6203 */ div.s $f8, $f12, $f14 -/* 00488 809A5BC8 44064000 */ mfc1 $a2, $f8 -/* 0048C 809A5BCC 0C0342A3 */ jal Matrix_Scale -/* 00490 809A5BD0 00000000 */ nop -/* 00494 809A5BD4 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 -/* 00498 809A5BD8 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 -/* 0049C 809A5BDC 37390003 */ ori $t9, $t9, 0x0003 ## $t9 = DA380003 -/* 004A0 809A5BE0 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 004A4 809A5BE4 AE5802D0 */ sw $t8, 0x02D0($s2) ## 000002D0 -/* 004A8 809A5BE8 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 004AC 809A5BEC 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 004B0 809A5BF0 3C05809A */ lui $a1, %hi(D_809A5DF8) ## $a1 = 809A0000 -/* 004B4 809A5BF4 24A55DF8 */ addiu $a1, $a1, %lo(D_809A5DF8) ## $a1 = 809A5DF8 -/* 004B8 809A5BF8 240600EE */ addiu $a2, $zero, 0x00EE ## $a2 = 000000EE -/* 004BC 809A5BFC 0C0346A2 */ jal Matrix_NewMtx -/* 004C0 809A5C00 AFA20074 */ sw $v0, 0x0074($sp) -/* 004C4 809A5C04 8FA30074 */ lw $v1, 0x0074($sp) -/* 004C8 809A5C08 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 004CC 809A5C0C 0C024F61 */ jal func_80093D84 -/* 004D0 809A5C10 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 004D4 809A5C14 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 -/* 004D8 809A5C18 3C09FA00 */ lui $t1, 0xFA00 ## $t1 = FA000000 -/* 004DC 809A5C1C 35290080 */ ori $t1, $t1, 0x0080 ## $t1 = FA000080 -/* 004E0 809A5C20 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 -/* 004E4 809A5C24 AE4802D0 */ sw $t0, 0x02D0($s2) ## 000002D0 -/* 004E8 809A5C28 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 004EC 809A5C2C 860A004C */ lh $t2, 0x004C($s0) ## 0000004C -/* 004F0 809A5C30 8619004A */ lh $t9, 0x004A($s0) ## 0000004A -/* 004F4 809A5C34 860E0048 */ lh $t6, 0x0048($s0) ## 00000048 -/* 004F8 809A5C38 314B00FF */ andi $t3, $t2, 0x00FF ## $t3 = 00000000 -/* 004FC 809A5C3C 000B6A00 */ sll $t5, $t3, 8 -/* 00500 809A5C40 332800FF */ andi $t0, $t9, 0x00FF ## $t0 = 00000000 -/* 00504 809A5C44 000E7E00 */ sll $t7, $t6, 24 -/* 00508 809A5C48 01AFC025 */ or $t8, $t5, $t7 ## $t8 = 00000000 -/* 0050C 809A5C4C 00084C00 */ sll $t1, $t0, 16 -/* 00510 809A5C50 03095025 */ or $t2, $t8, $t1 ## $t2 = FA000080 -/* 00514 809A5C54 354B00FF */ ori $t3, $t2, 0x00FF ## $t3 = FA0000FF -/* 00518 809A5C58 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 0051C 809A5C5C 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 -/* 00520 809A5C60 3C0EFB00 */ lui $t6, 0xFB00 ## $t6 = FB000000 -/* 00524 809A5C64 3C08DB06 */ lui $t0, 0xDB06 ## $t0 = DB060000 -/* 00528 809A5C68 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 0052C 809A5C6C AE4C02D0 */ sw $t4, 0x02D0($s2) ## 000002D0 -/* 00530 809A5C70 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 00534 809A5C74 860D0052 */ lh $t5, 0x0052($s0) ## 00000052 -/* 00538 809A5C78 860B0050 */ lh $t3, 0x0050($s0) ## 00000050 -/* 0053C 809A5C7C 8618004E */ lh $t8, 0x004E($s0) ## 0000004E -/* 00540 809A5C80 31AF00FF */ andi $t7, $t5, 0x00FF ## $t7 = 00000000 -/* 00544 809A5C84 000FCA00 */ sll $t9, $t7, 8 -/* 00548 809A5C88 316C00FF */ andi $t4, $t3, 0x00FF ## $t4 = 000000FF -/* 0054C 809A5C8C 00184E00 */ sll $t1, $t8, 24 -/* 00550 809A5C90 03295025 */ or $t2, $t9, $t1 ## $t2 = FA000080 -/* 00554 809A5C94 000C7400 */ sll $t6, $t4, 16 -/* 00558 809A5C98 014E6825 */ or $t5, $t2, $t6 ## $t5 = FB000080 -/* 0055C 809A5C9C AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 00560 809A5CA0 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 -/* 00564 809A5CA4 35080020 */ ori $t0, $t0, 0x0020 ## $t0 = DB060020 -/* 00568 809A5CA8 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 0056C 809A5CAC 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 00570 809A5CB0 AE4F02D0 */ sw $t7, 0x02D0($s2) ## 000002D0 -/* 00574 809A5CB4 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 -/* 00578 809A5CB8 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 0057C 809A5CBC 24190040 */ addiu $t9, $zero, 0x0040 ## $t9 = 00000040 -/* 00580 809A5CC0 24180020 */ addiu $t8, $zero, 0x0020 ## $t8 = 00000020 -/* 00584 809A5CC4 AFB80010 */ sw $t8, 0x0010($sp) -/* 00588 809A5CC8 AFB90014 */ sw $t9, 0x0014($sp) -/* 0058C 809A5CCC AFA0001C */ sw $zero, 0x001C($sp) -/* 00590 809A5CD0 AFA90018 */ sw $t1, 0x0018($sp) -/* 00594 809A5CD4 8E2B009C */ lw $t3, 0x009C($s1) ## 0000009C -/* 00598 809A5CD8 240D0080 */ addiu $t5, $zero, 0x0080 ## $t5 = 00000080 -/* 0059C 809A5CDC 240E0020 */ addiu $t6, $zero, 0x0020 ## $t6 = 00000020 -/* 005A0 809A5CE0 000B0823 */ subu $at, $zero, $t3 -/* 005A4 809A5CE4 00016080 */ sll $t4, $at, 2 -/* 005A8 809A5CE8 01816021 */ addu $t4, $t4, $at -/* 005AC 809A5CEC 000C6080 */ sll $t4, $t4, 2 -/* 005B0 809A5CF0 318A01FF */ andi $t2, $t4, 0x01FF ## $t2 = 000000FF -/* 005B4 809A5CF4 AFAA0020 */ sw $t2, 0x0020($sp) -/* 005B8 809A5CF8 AFAE0024 */ sw $t6, 0x0024($sp) -/* 005BC 809A5CFC AFAD0028 */ sw $t5, 0x0028($sp) -/* 005C0 809A5D00 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 005C4 809A5D04 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 005C8 809A5D08 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 005CC 809A5D0C 0C0253D0 */ jal Gfx_TwoTexScroll -/* 005D0 809A5D10 AFA20068 */ sw $v0, 0x0068($sp) -/* 005D4 809A5D14 8FA30068 */ lw $v1, 0x0068($sp) -/* 005D8 809A5D18 3C06809A */ lui $a2, %hi(D_809A5E10) ## $a2 = 809A0000 -/* 005DC 809A5D1C 3C0BDE00 */ lui $t3, 0xDE00 ## $t3 = DE000000 -/* 005E0 809A5D20 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 005E4 809A5D24 860F0058 */ lh $t7, 0x0058($s0) ## 00000058 -/* 005E8 809A5D28 24C65E10 */ addiu $a2, $a2, %lo(D_809A5E10) ## $a2 = 809A5E10 -/* 005EC 809A5D2C 27A40080 */ addiu $a0, $sp, 0x0080 ## $a0 = FFFFFFC8 -/* 005F0 809A5D30 11E0000A */ beq $t7, $zero, .L809A5D5C -/* 005F4 809A5D34 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 005F8 809A5D38 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 -/* 005FC 809A5D3C 3C190405 */ lui $t9, 0x0405 ## $t9 = 04050000 -/* 00600 809A5D40 2739D5A0 */ addiu $t9, $t9, 0xD5A0 ## $t9 = 0404D5A0 -/* 00604 809A5D44 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 -/* 00608 809A5D48 AE4802D0 */ sw $t0, 0x02D0($s2) ## 000002D0 -/* 0060C 809A5D4C 3C18DE00 */ lui $t8, 0xDE00 ## $t8 = DE000000 -/* 00610 809A5D50 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 00614 809A5D54 10000008 */ beq $zero, $zero, .L809A5D78 -/* 00618 809A5D58 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -.L809A5D5C: -/* 0061C 809A5D5C 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 -/* 00620 809A5D60 3C0C0405 */ lui $t4, 0x0405 ## $t4 = 04050000 -/* 00624 809A5D64 258CD4E0 */ addiu $t4, $t4, 0xD4E0 ## $t4 = 0404D4E0 -/* 00628 809A5D68 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 0062C 809A5D6C AE4902D0 */ sw $t1, 0x02D0($s2) ## 000002D0 -/* 00630 809A5D70 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 00634 809A5D74 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -.L809A5D78: -/* 00638 809A5D78 0C031AD5 */ jal Graph_CloseDisps -/* 0063C 809A5D7C 24070111 */ addiu $a3, $zero, 0x0111 ## $a3 = 00000111 -/* 00640 809A5D80 8FBF0044 */ lw $ra, 0x0044($sp) -/* 00644 809A5D84 8FB00038 */ lw $s0, 0x0038($sp) -/* 00648 809A5D88 8FB1003C */ lw $s1, 0x003C($sp) -/* 0064C 809A5D8C 8FB20040 */ lw $s2, 0x0040($sp) -/* 00650 809A5D90 03E00008 */ jr $ra -/* 00654 809A5D94 27BD00B8 */ addiu $sp, $sp, 0x00B8 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/func_809A5D98.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/func_809A5D98.s deleted file mode 100644 index cccee9c051..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/func_809A5D98.s +++ /dev/null @@ -1,20 +0,0 @@ -.late_rodata -glabel D_809A5E40 - .float 0.9 - -.text -glabel func_809A5D98 -/* 00658 809A5D98 AFA40000 */ sw $a0, 0x0000($sp) -/* 0065C 809A5D9C AFA50004 */ sw $a1, 0x0004($sp) -/* 00660 809A5DA0 84CE0040 */ lh $t6, 0x0040($a2) ## 00000040 -/* 00664 809A5DA4 3C01809A */ lui $at, %hi(D_809A5E40) ## $at = 809A0000 -/* 00668 809A5DA8 C4285E40 */ lwc1 $f8, %lo(D_809A5E40)($at) -/* 0066C 809A5DAC 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 00670 809A5DB0 00000000 */ nop -/* 00674 809A5DB4 468021A0 */ cvt.s.w $f6, $f4 -/* 00678 809A5DB8 46083282 */ mul.s $f10, $f6, $f8 -/* 0067C 809A5DBC 4600540D */ trunc.w.s $f16, $f10 -/* 00680 809A5DC0 44188000 */ mfc1 $t8, $f16 -/* 00684 809A5DC4 03E00008 */ jr $ra -/* 00688 809A5DC8 A4D80040 */ sh $t8, 0x0040($a2) ## 00000040 -/* 0068C 809A5DCC 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Fire/EffectSsGFire_Init.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Fire/EffectSsGFire_Init.s deleted file mode 100644 index daf7debe32..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Fire/EffectSsGFire_Init.s +++ /dev/null @@ -1,81 +0,0 @@ -glabel EffectSsGFire_Init -/* 00000 809A5ED0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00004 809A5ED4 3C0E809A */ lui $t6, %hi(D_809A60D8) ## $t6 = 809A0000 -/* 00008 809A5ED8 AFA40020 */ sw $a0, 0x0020($sp) -/* 0000C 809A5EDC AFA50024 */ sw $a1, 0x0024($sp) -/* 00010 809A5EE0 25CE60D8 */ addiu $t6, $t6, %lo(D_809A60D8) ## $t6 = 809A60D8 -/* 00014 809A5EE4 8DD80000 */ lw $t8, 0x0000($t6) ## 809A60D8 -/* 00018 809A5EE8 27A30010 */ addiu $v1, $sp, 0x0010 ## $v1 = FFFFFFF0 -/* 0001C 809A5EEC 27A40004 */ addiu $a0, $sp, 0x0004 ## $a0 = FFFFFFE4 -/* 00020 809A5EF0 AC780000 */ sw $t8, 0x0000($v1) ## FFFFFFF0 -/* 00024 809A5EF4 8DCF0004 */ lw $t7, 0x0004($t6) ## 809A60DC -/* 00028 809A5EF8 8C680000 */ lw $t0, 0x0000($v1) ## FFFFFFF0 -/* 0002C 809A5EFC 3C020402 */ lui $v0, 0x0402 ## $v0 = 04020000 -/* 00030 809A5F00 AC6F0004 */ sw $t7, 0x0004($v1) ## FFFFFFF4 -/* 00034 809A5F04 8DD80008 */ lw $t8, 0x0008($t6) ## 809A60E0 -/* 00038 809A5F08 AC880000 */ sw $t0, 0x0000($a0) ## FFFFFFE4 -/* 0003C 809A5F0C 8C8A0000 */ lw $t2, 0x0000($a0) ## FFFFFFE4 -/* 00040 809A5F10 AC8F0004 */ sw $t7, 0x0004($a0) ## FFFFFFE8 -/* 00044 809A5F14 AC780008 */ sw $t8, 0x0008($v1) ## FFFFFFF8 -/* 00048 809A5F18 AC980008 */ sw $t8, 0x0008($a0) ## FFFFFFEC -/* 0004C 809A5F1C ACCA0018 */ sw $t2, 0x0018($a2) ## 00000018 -/* 00050 809A5F20 8C890004 */ lw $t1, 0x0004($a0) ## FFFFFFE8 -/* 00054 809A5F24 2442C220 */ addiu $v0, $v0, 0xC220 ## $v0 = 0401C220 -/* 00058 809A5F28 0002C900 */ sll $t9, $v0, 4 -/* 0005C 809A5F2C ACC9001C */ sw $t1, 0x001C($a2) ## 0000001C -/* 00060 809A5F30 8C8A0008 */ lw $t2, 0x0008($a0) ## FFFFFFEC -/* 00064 809A5F34 3C0F809A */ lui $t7, %hi(func_809A6010) ## $t7 = 809A0000 -/* 00068 809A5F38 3C18809A */ lui $t8, %hi(func_809A60B4) ## $t8 = 809A0000 -/* 0006C 809A5F3C ACCA0020 */ sw $t2, 0x0020($a2) ## 00000020 -/* 00070 809A5F40 8C8C0000 */ lw $t4, 0x0000($a0) ## FFFFFFE4 -/* 00074 809A5F44 00194702 */ srl $t0, $t9, 28 -/* 00078 809A5F48 25EF6010 */ addiu $t7, $t7, %lo(func_809A6010) ## $t7 = 809A6010 -/* 0007C 809A5F4C ACCC000C */ sw $t4, 0x000C($a2) ## 0000000C -/* 00080 809A5F50 8C8B0004 */ lw $t3, 0x0004($a0) ## FFFFFFE8 -/* 00084 809A5F54 271860B4 */ addiu $t8, $t8, %lo(func_809A60B4) ## $t8 = 809A60B4 -/* 00088 809A5F58 00084880 */ sll $t1, $t0, 2 -/* 0008C 809A5F5C ACCB0010 */ sw $t3, 0x0010($a2) ## 00000010 -/* 00090 809A5F60 8C8C0008 */ lw $t4, 0x0008($a0) ## FFFFFFEC -/* 00094 809A5F64 3C0A8016 */ lui $t2, %hi(gSegments) -/* 00098 809A5F68 01495021 */ addu $t2, $t2, $t1 -/* 0009C 809A5F6C ACCC0014 */ sw $t4, 0x0014($a2) ## 00000014 -/* 000A0 809A5F70 8CEE0000 */ lw $t6, 0x0000($a3) ## 00000000 -/* 000A4 809A5F74 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 000A8 809A5F78 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 000AC 809A5F7C ACCE0000 */ sw $t6, 0x0000($a2) ## 00000000 -/* 000B0 809A5F80 8CED0004 */ lw $t5, 0x0004($a3) ## 00000004 -/* 000B4 809A5F84 00415824 */ and $t3, $v0, $at -/* 000B8 809A5F88 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 000BC 809A5F8C ACCD0004 */ sw $t5, 0x0004($a2) ## 00000004 -/* 000C0 809A5F90 8CEE0008 */ lw $t6, 0x0008($a3) ## 00000008 -/* 000C4 809A5F94 ACCF0028 */ sw $t7, 0x0028($a2) ## 00000028 -/* 000C8 809A5F98 ACD80024 */ sw $t8, 0x0024($a2) ## 00000024 -/* 000CC 809A5F9C ACCE0008 */ sw $t6, 0x0008($a2) ## 00000008 -/* 000D0 809A5FA0 8D4A6FA8 */ lw $t2, %lo(gSegments)($t2) -/* 000D4 809A5FA4 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF -/* 000D8 809A5FA8 240E0008 */ addiu $t6, $zero, 0x0008 ## $t6 = 00000008 -/* 000DC 809A5FAC 014B6021 */ addu $t4, $t2, $t3 -/* 000E0 809A5FB0 01816821 */ addu $t5, $t4, $at -/* 000E4 809A5FB4 240F00C8 */ addiu $t7, $zero, 0x00C8 ## $t7 = 000000C8 -/* 000E8 809A5FB8 24180032 */ addiu $t8, $zero, 0x0032 ## $t8 = 00000032 -/* 000EC 809A5FBC 241900DC */ addiu $t9, $zero, 0x00DC ## $t9 = 000000DC -/* 000F0 809A5FC0 24080050 */ addiu $t0, $zero, 0x0050 ## $t0 = 00000050 -/* 000F4 809A5FC4 24090082 */ addiu $t1, $zero, 0x0082 ## $t1 = 00000082 -/* 000F8 809A5FC8 240A001E */ addiu $t2, $zero, 0x001E ## $t2 = 0000001E -/* 000FC 809A5FCC ACCD0038 */ sw $t5, 0x0038($a2) ## 00000038 -/* 00100 809A5FD0 A4CE005C */ sh $t6, 0x005C($a2) ## 0000005C -/* 00104 809A5FD4 A4C0005A */ sh $zero, 0x005A($a2) ## 0000005A -/* 00108 809A5FD8 A4CF0042 */ sh $t7, 0x0042($a2) ## 00000042 -/* 0010C 809A5FDC A4C00040 */ sh $zero, 0x0040($a2) ## 00000040 -/* 00110 809A5FE0 A4D80044 */ sh $t8, 0x0044($a2) ## 00000044 -/* 00114 809A5FE4 A4C50046 */ sh $a1, 0x0046($a2) ## 00000046 -/* 00118 809A5FE8 A4D90048 */ sh $t9, 0x0048($a2) ## 00000048 -/* 0011C 809A5FEC A4C8004A */ sh $t0, 0x004A($a2) ## 0000004A -/* 00120 809A5FF0 A4C5004C */ sh $a1, 0x004C($a2) ## 0000004C -/* 00124 809A5FF4 A4C9004E */ sh $t1, 0x004E($a2) ## 0000004E -/* 00128 809A5FF8 A4CA0050 */ sh $t2, 0x0050($a2) ## 00000050 -/* 0012C 809A5FFC A4C00052 */ sh $zero, 0x0052($a2) ## 00000052 -/* 00130 809A6000 A4C00054 */ sh $zero, 0x0054($a2) ## 00000054 -/* 00134 809A6004 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00138 809A6008 03E00008 */ jr $ra -/* 0013C 809A600C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Fire/func_809A6010.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Fire/func_809A6010.s deleted file mode 100644 index 2cc6102ec9..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Fire/func_809A6010.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_809A6010 -/* 00140 809A6010 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00144 809A6014 3C0E809A */ lui $t6, %hi(D_809A60E4) ## $t6 = 809A0000 -/* 00148 809A6018 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0014C 809A601C AFA50044 */ sw $a1, 0x0044($sp) -/* 00150 809A6020 25CE60E4 */ addiu $t6, $t6, %lo(D_809A60E4) ## $t6 = 809A60E4 -/* 00154 809A6024 8DD80000 */ lw $t8, 0x0000($t6) ## 809A60E4 -/* 00158 809A6028 27A30020 */ addiu $v1, $sp, 0x0020 ## $v1 = FFFFFFE0 -/* 0015C 809A602C 24010064 */ addiu $at, $zero, 0x0064 ## $at = 00000064 -/* 00160 809A6030 AC780000 */ sw $t8, 0x0000($v1) ## FFFFFFE0 -/* 00164 809A6034 8DCF0004 */ lw $t7, 0x0004($t6) ## 809A60E8 -/* 00168 809A6038 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 0016C 809A603C AC6F0004 */ sw $t7, 0x0004($v1) ## FFFFFFE4 -/* 00170 809A6040 8DD80008 */ lw $t8, 0x0008($t6) ## 809A60EC -/* 00174 809A6044 AC780008 */ sw $t8, 0x0008($v1) ## FFFFFFE8 -/* 00178 809A6048 8DCF000C */ lw $t7, 0x000C($t6) ## 809A60F0 -/* 0017C 809A604C AC6F000C */ sw $t7, 0x000C($v1) ## FFFFFFEC -/* 00180 809A6050 8DD80010 */ lw $t8, 0x0010($t6) ## 809A60F4 -/* 00184 809A6054 AC780010 */ sw $t8, 0x0010($v1) ## FFFFFFF0 -/* 00188 809A6058 8DCF0014 */ lw $t7, 0x0014($t6) ## 809A60F8 -/* 0018C 809A605C AC6F0014 */ sw $t7, 0x0014($v1) ## FFFFFFF4 -/* 00190 809A6060 8DD80018 */ lw $t8, 0x0018($t6) ## 809A60FC -/* 00194 809A6064 AC780018 */ sw $t8, 0x0018($v1) ## FFFFFFF8 -/* 00198 809A6068 8DCF001C */ lw $t7, 0x001C($t6) ## 809A6100 -/* 0019C 809A606C AC6F001C */ sw $t7, 0x001C($v1) ## FFFFFFFC -/* 001A0 809A6070 84C20040 */ lh $v0, 0x0040($a2) ## 00000040 -/* 001A4 809A6074 0041001A */ div $zero, $v0, $at -/* 001A8 809A6078 00001012 */ mflo $v0 -/* 001AC 809A607C 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 001B0 809A6080 00000000 */ nop -/* 001B4 809A6084 0041001A */ div $zero, $v0, $at -/* 001B8 809A6088 00001010 */ mfhi $v0 -/* 001BC 809A608C 00021400 */ sll $v0, $v0, 16 -/* 001C0 809A6090 00021403 */ sra $v0, $v0, 16 -/* 001C4 809A6094 0002C880 */ sll $t9, $v0, 2 -/* 001C8 809A6098 00794021 */ addu $t0, $v1, $t9 -/* 001CC 809A609C 0C009FE0 */ jal func_80027F80 -/* 001D0 809A60A0 8D060000 */ lw $a2, 0x0000($t0) ## 00000000 -/* 001D4 809A60A4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 001D8 809A60A8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 001DC 809A60AC 03E00008 */ jr $ra -/* 001E0 809A60B0 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Fire/func_809A60B4.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Fire/func_809A60B4.s deleted file mode 100644 index 4e7d2e0715..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Fire/func_809A60B4.s +++ /dev/null @@ -1,8 +0,0 @@ -glabel func_809A60B4 -/* 001E4 809A60B4 AFA40000 */ sw $a0, 0x0000($sp) -/* 001E8 809A60B8 AFA50004 */ sw $a1, 0x0004($sp) -/* 001EC 809A60BC 84CE0040 */ lh $t6, 0x0040($a2) ## 00000040 -/* 001F0 809A60C0 84CF0044 */ lh $t7, 0x0044($a2) ## 00000044 -/* 001F4 809A60C4 01CFC021 */ addu $t8, $t6, $t7 -/* 001F8 809A60C8 03E00008 */ jr $ra -/* 001FC 809A60CC A4D80040 */ sh $t8, 0x0040($a2) ## 00000040 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma/EffectSsGMagma_Init.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma/EffectSsGMagma_Init.s deleted file mode 100644 index 3f8d585346..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma/EffectSsGMagma_Init.s +++ /dev/null @@ -1,88 +0,0 @@ -glabel EffectSsGMagma_Init -/* 00000 809A6150 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00004 809A6154 3C0E809A */ lui $t6, %hi(D_809A6328) ## $t6 = 809A0000 -/* 00008 809A6158 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0000C 809A615C AFA40038 */ sw $a0, 0x0038($sp) -/* 00010 809A6160 AFA5003C */ sw $a1, 0x003C($sp) -/* 00014 809A6164 25CE6328 */ addiu $t6, $t6, %lo(D_809A6328) ## $t6 = 809A6328 -/* 00018 809A6168 8DD80000 */ lw $t8, 0x0000($t6) ## 809A6328 -/* 0001C 809A616C 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFF0 -/* 00020 809A6170 27A3001C */ addiu $v1, $sp, 0x001C ## $v1 = FFFFFFE4 -/* 00024 809A6174 AC980000 */ sw $t8, 0x0000($a0) ## FFFFFFF0 -/* 00028 809A6178 8DCF0004 */ lw $t7, 0x0004($t6) ## 809A632C -/* 0002C 809A617C 8C880000 */ lw $t0, 0x0000($a0) ## FFFFFFF0 -/* 00030 809A6180 3C020402 */ lui $v0, 0x0402 ## $v0 = 04020000 -/* 00034 809A6184 AC8F0004 */ sw $t7, 0x0004($a0) ## FFFFFFF4 -/* 00038 809A6188 8DD80008 */ lw $t8, 0x0008($t6) ## 809A6330 -/* 0003C 809A618C AC680000 */ sw $t0, 0x0000($v1) ## FFFFFFE4 -/* 00040 809A6190 8C6A0000 */ lw $t2, 0x0000($v1) ## FFFFFFE4 -/* 00044 809A6194 AC6F0004 */ sw $t7, 0x0004($v1) ## FFFFFFE8 -/* 00048 809A6198 AC980008 */ sw $t8, 0x0008($a0) ## FFFFFFF8 -/* 0004C 809A619C AC780008 */ sw $t8, 0x0008($v1) ## FFFFFFEC -/* 00050 809A61A0 ACCA0018 */ sw $t2, 0x0018($a2) ## 00000018 -/* 00054 809A61A4 8C690004 */ lw $t1, 0x0004($v1) ## FFFFFFE8 -/* 00058 809A61A8 24424410 */ addiu $v0, $v0, 0x4410 ## $v0 = 04024410 -/* 0005C 809A61AC 0002C900 */ sll $t9, $v0, 4 -/* 00060 809A61B0 ACC9001C */ sw $t1, 0x001C($a2) ## 0000001C -/* 00064 809A61B4 8C6A0008 */ lw $t2, 0x0008($v1) ## FFFFFFEC -/* 00068 809A61B8 3C0F809A */ lui $t7, %hi(func_809A62A8) ## $t7 = 809A0000 -/* 0006C 809A61BC 3C18809A */ lui $t8, %hi(func_809A6300) ## $t8 = 809A0000 -/* 00070 809A61C0 ACCA0020 */ sw $t2, 0x0020($a2) ## 00000020 -/* 00074 809A61C4 8C6C0000 */ lw $t4, 0x0000($v1) ## FFFFFFE4 -/* 00078 809A61C8 00194702 */ srl $t0, $t9, 28 -/* 0007C 809A61CC 25EF62A8 */ addiu $t7, $t7, %lo(func_809A62A8) ## $t7 = 809A62A8 -/* 00080 809A61D0 ACCC000C */ sw $t4, 0x000C($a2) ## 0000000C -/* 00084 809A61D4 8C6B0004 */ lw $t3, 0x0004($v1) ## FFFFFFE8 -/* 00088 809A61D8 27186300 */ addiu $t8, $t8, %lo(func_809A6300) ## $t8 = 809A6300 -/* 0008C 809A61DC 00084880 */ sll $t1, $t0, 2 -/* 00090 809A61E0 ACCB0010 */ sw $t3, 0x0010($a2) ## 00000010 -/* 00094 809A61E4 8C6C0008 */ lw $t4, 0x0008($v1) ## FFFFFFEC -/* 00098 809A61E8 3C0A8016 */ lui $t2, %hi(gSegments) -/* 0009C 809A61EC 01495021 */ addu $t2, $t2, $t1 -/* 000A0 809A61F0 ACCC0014 */ sw $t4, 0x0014($a2) ## 00000014 -/* 000A4 809A61F4 8CEE0000 */ lw $t6, 0x0000($a3) ## 00000000 -/* 000A8 809A61F8 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 000AC 809A61FC 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 000B0 809A6200 ACCE0000 */ sw $t6, 0x0000($a2) ## 00000000 -/* 000B4 809A6204 8CED0004 */ lw $t5, 0x0004($a3) ## 00000004 -/* 000B8 809A6208 00415824 */ and $t3, $v0, $at -/* 000BC 809A620C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 000C0 809A6210 ACCD0004 */ sw $t5, 0x0004($a2) ## 00000004 -/* 000C4 809A6214 8CEE0008 */ lw $t6, 0x0008($a3) ## 00000008 -/* 000C8 809A6218 ACCF0028 */ sw $t7, 0x0028($a2) ## 00000028 -/* 000CC 809A621C ACD80024 */ sw $t8, 0x0024($a2) ## 00000024 -/* 000D0 809A6220 ACCE0008 */ sw $t6, 0x0008($a2) ## 00000008 -/* 000D4 809A6224 8D4A6FA8 */ lw $t2, %lo(gSegments)($t2) -/* 000D8 809A6228 240E0010 */ addiu $t6, $zero, 0x0010 ## $t6 = 00000010 -/* 000DC 809A622C A4CE005C */ sh $t6, 0x005C($a2) ## 0000005C -/* 000E0 809A6230 014B6021 */ addu $t4, $t2, $t3 -/* 000E4 809A6234 01816821 */ addu $t5, $t4, $at -/* 000E8 809A6238 ACCD0038 */ sw $t5, 0x0038($a2) ## 00000038 -/* 000EC 809A623C 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 000F0 809A6240 AFA60040 */ sw $a2, 0x0040($sp) -/* 000F4 809A6244 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 000F8 809A6248 44812000 */ mtc1 $at, $f4 ## $f4 = 100.00 -/* 000FC 809A624C 8FA60040 */ lw $a2, 0x0040($sp) -/* 00100 809A6250 240300FF */ addiu $v1, $zero, 0x00FF ## $v1 = 000000FF -/* 00104 809A6254 46040182 */ mul.s $f6, $f0, $f4 -/* 00108 809A6258 240A0032 */ addiu $t2, $zero, 0x0032 ## $t2 = 00000032 -/* 0010C 809A625C A4C00040 */ sh $zero, 0x0040($a2) ## 00000040 -/* 00110 809A6260 A4CA0044 */ sh $t2, 0x0044($a2) ## 00000044 -/* 00114 809A6264 A4C30046 */ sh $v1, 0x0046($a2) ## 00000046 -/* 00118 809A6268 A4C30048 */ sh $v1, 0x0048($a2) ## 00000048 -/* 0011C 809A626C A4C0004A */ sh $zero, 0x004A($a2) ## 0000004A -/* 00120 809A6270 4600320D */ trunc.w.s $f8, $f6 -/* 00124 809A6274 A4C3004C */ sh $v1, 0x004C($a2) ## 0000004C -/* 00128 809A6278 A4C3004E */ sh $v1, 0x004E($a2) ## 0000004E -/* 0012C 809A627C A4C00050 */ sh $zero, 0x0050($a2) ## 00000050 -/* 00130 809A6280 44084000 */ mfc1 $t0, $f8 -/* 00134 809A6284 A4C00052 */ sh $zero, 0x0052($a2) ## 00000052 -/* 00138 809A6288 A4C00054 */ sh $zero, 0x0054($a2) ## 00000054 -/* 0013C 809A628C 250900C8 */ addiu $t1, $t0, 0x00C8 ## $t1 = 000000C8 -/* 00140 809A6290 A4C90042 */ sh $t1, 0x0042($a2) ## 00000042 -/* 00144 809A6294 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00148 809A6298 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 0014C 809A629C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00150 809A62A0 03E00008 */ jr $ra -/* 00154 809A62A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma/func_809A62A8.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma/func_809A62A8.s deleted file mode 100644 index aba7eff06d..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma/func_809A62A8.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_809A62A8 -/* 00158 809A62A8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0015C 809A62AC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00160 809A62B0 AFA5001C */ sw $a1, 0x001C($sp) -/* 00164 809A62B4 84C20040 */ lh $v0, 0x0040($a2) ## 00000040 -/* 00168 809A62B8 24010064 */ addiu $at, $zero, 0x0064 ## $at = 00000064 -/* 0016C 809A62BC 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 00170 809A62C0 0041001A */ div $zero, $v0, $at -/* 00174 809A62C4 00001012 */ mflo $v0 -/* 00178 809A62C8 00021400 */ sll $v0, $v0, 16 -/* 0017C 809A62CC 00021403 */ sra $v0, $v0, 16 -/* 00180 809A62D0 28410008 */ slti $at, $v0, 0x0008 -/* 00184 809A62D4 14200002 */ bne $at, $zero, .L809A62E0 -/* 00188 809A62D8 3C06809A */ lui $a2, %hi(D_809A6334) ## $a2 = 809A0000 -/* 0018C 809A62DC 24020007 */ addiu $v0, $zero, 0x0007 ## $v0 = 00000007 -.L809A62E0: -/* 00190 809A62E0 00027080 */ sll $t6, $v0, 2 -/* 00194 809A62E4 00CE3021 */ addu $a2, $a2, $t6 -/* 00198 809A62E8 0C009FE0 */ jal func_80027F80 -/* 0019C 809A62EC 8CC66334 */ lw $a2, %lo(D_809A6334)($a2) -/* 001A0 809A62F0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 001A4 809A62F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 001A8 809A62F8 03E00008 */ jr $ra -/* 001AC 809A62FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma/func_809A6300.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma/func_809A6300.s deleted file mode 100644 index 163c050688..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma/func_809A6300.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_809A6300 -/* 001B0 809A6300 AFA40000 */ sw $a0, 0x0000($sp) -/* 001B4 809A6304 AFA50004 */ sw $a1, 0x0004($sp) -/* 001B8 809A6308 84CE0040 */ lh $t6, 0x0040($a2) ## 00000040 -/* 001BC 809A630C 84CF0044 */ lh $t7, 0x0044($a2) ## 00000044 -/* 001C0 809A6310 01CFC021 */ addu $t8, $t6, $t7 -/* 001C4 809A6314 03E00008 */ jr $ra -/* 001C8 809A6318 A4D80040 */ sh $t8, 0x0040($a2) ## 00000040 -/* 001CC 809A631C 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/EffectSsGMagma2_Init.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/EffectSsGMagma2_Init.s deleted file mode 100644 index 2ab925794f..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/EffectSsGMagma2_Init.s +++ /dev/null @@ -1,119 +0,0 @@ -glabel EffectSsGMagma2_Init -/* 00000 809A63A0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00004 809A63A4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00008 809A63A8 AFA40038 */ sw $a0, 0x0038($sp) -/* 0000C 809A63AC 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 00010 809A63B0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00014 809A63B4 AFA5003C */ sw $a1, 0x003C($sp) -/* 00018 809A63B8 00812021 */ addu $a0, $a0, $at -/* 0001C 809A63BC AFA4001C */ sw $a0, 0x001C($sp) -/* 00020 809A63C0 24050019 */ addiu $a1, $zero, 0x0019 ## $a1 = 00000019 -/* 00024 809A63C4 AFA60040 */ sw $a2, 0x0040($sp) -/* 00028 809A63C8 0C02604B */ jal Object_GetIndex - ## ObjectIndex -/* 0002C 809A63CC AFA70044 */ sw $a3, 0x0044($sp) -/* 00030 809A63D0 8FA4001C */ lw $a0, 0x001C($sp) -/* 00034 809A63D4 8FA60040 */ lw $a2, 0x0040($sp) -/* 00038 809A63D8 8FA70044 */ lw $a3, 0x0044($sp) -/* 0003C 809A63DC 0440005D */ bltz $v0, .L809A6554 -/* 00040 809A63E0 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 00044 809A63E4 AFA20034 */ sw $v0, 0x0034($sp) -/* 00048 809A63E8 AFA60040 */ sw $a2, 0x0040($sp) -/* 0004C 809A63EC 0C026062 */ jal Object_IsLoaded - -/* 00050 809A63F0 AFA70044 */ sw $a3, 0x0044($sp) -/* 00054 809A63F4 8FA50034 */ lw $a1, 0x0034($sp) -/* 00058 809A63F8 8FA60040 */ lw $a2, 0x0040($sp) -/* 0005C 809A63FC 10400055 */ beq $v0, $zero, .L809A6554 -/* 00060 809A6400 8FA70044 */ lw $a3, 0x0044($sp) -/* 00064 809A6404 3C0E809A */ lui $t6, %hi(D_809A689C) ## $t6 = 809A0000 -/* 00068 809A6408 25CE689C */ addiu $t6, $t6, %lo(D_809A689C) ## $t6 = 809A689C -/* 0006C 809A640C 8DD80000 */ lw $t8, 0x0000($t6) ## 809A689C -/* 00070 809A6410 27A30024 */ addiu $v1, $sp, 0x0024 ## $v1 = FFFFFFEC -/* 00074 809A6414 00054100 */ sll $t0, $a1, 4 -/* 00078 809A6418 AC780000 */ sw $t8, 0x0000($v1) ## FFFFFFEC -/* 0007C 809A641C 8DCF0004 */ lw $t7, 0x0004($t6) ## 809A68A0 -/* 00080 809A6420 01054021 */ addu $t0, $t0, $a1 -/* 00084 809A6424 00084080 */ sll $t0, $t0, 2 -/* 00088 809A6428 AC6F0004 */ sw $t7, 0x0004($v1) ## FFFFFFF0 -/* 0008C 809A642C 8DD80008 */ lw $t8, 0x0008($t6) ## 809A68A4 -/* 00090 809A6430 3C0A0001 */ lui $t2, 0x0001 ## $t2 = 00010000 -/* 00094 809A6434 3C048016 */ lui $a0, %hi(gSegments) -/* 00098 809A6438 AC780008 */ sw $t8, 0x0008($v1) ## FFFFFFF4 -/* 0009C 809A643C 8FB90038 */ lw $t9, 0x0038($sp) -/* 000A0 809A6440 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 000A4 809A6444 24846FA8 */ addiu $a0, %lo(gSegments) -/* 000A8 809A6448 03284821 */ addu $t1, $t9, $t0 -/* 000AC 809A644C 01495021 */ addu $t2, $t2, $t1 -/* 000B0 809A6450 8D4A17B4 */ lw $t2, 0x17B4($t2) ## 000117B4 -/* 000B4 809A6454 3C020602 */ lui $v0, 0x0602 ## $v0 = 06020000 -/* 000B8 809A6458 24425A90 */ addiu $v0, $v0, 0x5A90 ## $v0 = 06025A90 -/* 000BC 809A645C 01415821 */ addu $t3, $t2, $at -/* 000C0 809A6460 AC8B0018 */ sw $t3, 0x0018($a0) ## 80166FC0 -/* 000C4 809A6464 A4C50054 */ sh $a1, 0x0054($a2) ## 00000054 -/* 000C8 809A6468 8CED0000 */ lw $t5, 0x0000($a3) ## 00000000 -/* 000CC 809A646C 00025900 */ sll $t3, $v0, 4 -/* 000D0 809A6470 3C09809A */ lui $t1, %hi(func_809A6568) ## $t1 = 809A0000 -/* 000D4 809A6474 ACCD0000 */ sw $t5, 0x0000($a2) ## 00000000 -/* 000D8 809A6478 8CEC0004 */ lw $t4, 0x0004($a3) ## 00000004 -/* 000DC 809A647C 3C0A809A */ lui $t2, %hi(func_809A67C0) ## $t2 = 809A0000 -/* 000E0 809A6480 24080064 */ addiu $t0, $zero, 0x0064 ## $t0 = 00000064 -/* 000E4 809A6484 ACCC0004 */ sw $t4, 0x0004($a2) ## 00000004 -/* 000E8 809A6488 8CED0008 */ lw $t5, 0x0008($a3) ## 00000008 -/* 000EC 809A648C 000B6702 */ srl $t4, $t3, 28 -/* 000F0 809A6490 25296568 */ addiu $t1, $t1, %lo(func_809A6568) ## $t1 = 809A6568 -/* 000F4 809A6494 ACCD0008 */ sw $t5, 0x0008($a2) ## 00000008 -/* 000F8 809A6498 8C6F0000 */ lw $t7, 0x0000($v1) ## FFFFFFEC -/* 000FC 809A649C 254A67C0 */ addiu $t2, $t2, %lo(func_809A67C0) ## $t2 = 809A67C0 -/* 00100 809A64A0 000C6880 */ sll $t5, $t4, 2 -/* 00104 809A64A4 ACCF000C */ sw $t7, 0x000C($a2) ## 0000000C -/* 00108 809A64A8 8C6E0004 */ lw $t6, 0x0004($v1) ## FFFFFFF0 -/* 0010C 809A64AC 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00110 809A64B0 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00114 809A64B4 ACCE0010 */ sw $t6, 0x0010($a2) ## 00000010 -/* 00118 809A64B8 8C6F0008 */ lw $t7, 0x0008($v1) ## FFFFFFF4 -/* 0011C 809A64BC 008D7021 */ addu $t6, $a0, $t5 -/* 00120 809A64C0 ACCF0014 */ sw $t7, 0x0014($a2) ## 00000014 -/* 00124 809A64C4 8C790000 */ lw $t9, 0x0000($v1) ## FFFFFFEC -/* 00128 809A64C8 ACD90018 */ sw $t9, 0x0018($a2) ## 00000018 -/* 0012C 809A64CC 8C780004 */ lw $t8, 0x0004($v1) ## FFFFFFF0 -/* 00130 809A64D0 ACD8001C */ sw $t8, 0x001C($a2) ## 0000001C -/* 00134 809A64D4 8C790008 */ lw $t9, 0x0008($v1) ## FFFFFFF4 -/* 00138 809A64D8 A4C8005C */ sh $t0, 0x005C($a2) ## 0000005C -/* 0013C 809A64DC ACC90028 */ sw $t1, 0x0028($a2) ## 00000028 -/* 00140 809A64E0 ACCA0024 */ sw $t2, 0x0024($a2) ## 00000024 -/* 00144 809A64E4 ACD90020 */ sw $t9, 0x0020($a2) ## 00000020 -/* 00148 809A64E8 8DCF0000 */ lw $t7, 0x0000($t6) ## 809A689C -/* 0014C 809A64EC 0041C024 */ and $t8, $v0, $at -/* 00150 809A64F0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00154 809A64F4 01F8C821 */ addu $t9, $t7, $t8 -/* 00158 809A64F8 03214021 */ addu $t0, $t9, $at -/* 0015C 809A64FC ACC80038 */ sw $t0, 0x0038($a2) ## 00000038 -/* 00160 809A6500 A4C0004C */ sh $zero, 0x004C($a2) ## 0000004C -/* 00164 809A6504 84E90016 */ lh $t1, 0x0016($a3) ## 00000016 -/* 00168 809A6508 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 0016C 809A650C A4C90052 */ sh $t1, 0x0052($a2) ## 00000052 -/* 00170 809A6510 84EA0014 */ lh $t2, 0x0014($a3) ## 00000014 -/* 00174 809A6514 A4CA0050 */ sh $t2, 0x0050($a2) ## 00000050 -/* 00178 809A6518 84EB0018 */ lh $t3, 0x0018($a3) ## 00000018 -/* 0017C 809A651C A4CB0056 */ sh $t3, 0x0056($a2) ## 00000056 -/* 00180 809A6520 90EC000C */ lbu $t4, 0x000C($a3) ## 0000000C -/* 00184 809A6524 A4CC0040 */ sh $t4, 0x0040($a2) ## 00000040 -/* 00188 809A6528 90ED000D */ lbu $t5, 0x000D($a3) ## 0000000D -/* 0018C 809A652C A4CD0042 */ sh $t5, 0x0042($a2) ## 00000042 -/* 00190 809A6530 90EE000F */ lbu $t6, 0x000F($a3) ## 0000000F -/* 00194 809A6534 A4CE0044 */ sh $t6, 0x0044($a2) ## 00000044 -/* 00198 809A6538 90EF0010 */ lbu $t7, 0x0010($a3) ## 00000010 -/* 0019C 809A653C A4CF0046 */ sh $t7, 0x0046($a2) ## 00000046 -/* 001A0 809A6540 90F80011 */ lbu $t8, 0x0011($a3) ## 00000011 -/* 001A4 809A6544 A4D80048 */ sh $t8, 0x0048($a2) ## 00000048 -/* 001A8 809A6548 90F90013 */ lbu $t9, 0x0013($a3) ## 00000013 -/* 001AC 809A654C 10000002 */ beq $zero, $zero, .L809A6558 -/* 001B0 809A6550 A4D9004A */ sh $t9, 0x004A($a2) ## 0000004A -.L809A6554: -/* 001B4 809A6554 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L809A6558: -/* 001B8 809A6558 8FBF0014 */ lw $ra, 0x0014($sp) -/* 001BC 809A655C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 001C0 809A6560 03E00008 */ jr $ra -/* 001C4 809A6564 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/func_809A6568.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/func_809A6568.s deleted file mode 100644 index 76bff7b37c..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/func_809A6568.s +++ /dev/null @@ -1,167 +0,0 @@ -.rdata -glabel D_809A68B0 - .asciz "../z_eff_ss_g_magma2.c" - .balign 4 - -glabel D_809A68C8 - .asciz "../z_eff_ss_g_magma2.c" - .balign 4 - -glabel D_809A68E0 - .asciz "../z_eff_ss_g_magma2.c" - .balign 4 - -.text -glabel func_809A6568 -/* 001C8 809A6568 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 -/* 001CC 809A656C AFBF001C */ sw $ra, 0x001C($sp) -/* 001D0 809A6570 AFB10018 */ sw $s1, 0x0018($sp) -/* 001D4 809A6574 AFB00014 */ sw $s0, 0x0014($sp) -/* 001D8 809A6578 AFA40060 */ sw $a0, 0x0060($sp) -/* 001DC 809A657C AFA50064 */ sw $a1, 0x0064($sp) -/* 001E0 809A6580 84CF0056 */ lh $t7, 0x0056($a2) ## 00000056 -/* 001E4 809A6584 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 001E8 809A6588 44814000 */ mtc1 $at, $f8 ## $f8 = 100.00 -/* 001EC 809A658C 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 001F0 809A6590 8C900000 */ lw $s0, 0x0000($a0) ## 00000000 -/* 001F4 809A6594 3C090001 */ lui $t1, 0x0001 ## $t1 = 00010000 -/* 001F8 809A6598 468021A0 */ cvt.s.w $f6, $f4 -/* 001FC 809A659C 00C08825 */ or $s1, $a2, $zero ## $s1 = 00000000 -/* 00200 809A65A0 24070105 */ addiu $a3, $zero, 0x0105 ## $a3 = 00000105 -/* 00204 809A65A4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00208 809A65A8 46083283 */ div.s $f10, $f6, $f8 -/* 0020C 809A65AC E7AA0054 */ swc1 $f10, 0x0054($sp) -/* 00210 809A65B0 84D80054 */ lh $t8, 0x0054($a2) ## 00000054 -/* 00214 809A65B4 3C06809A */ lui $a2, %hi(D_809A68B0) ## $a2 = 809A0000 -/* 00218 809A65B8 24C668B0 */ addiu $a2, $a2, %lo(D_809A68B0) ## $a2 = 809A68B0 -/* 0021C 809A65BC 0018C900 */ sll $t9, $t8, 4 -/* 00220 809A65C0 0338C821 */ addu $t9, $t9, $t8 -/* 00224 809A65C4 0019C880 */ sll $t9, $t9, 2 -/* 00228 809A65C8 00994021 */ addu $t0, $a0, $t9 -/* 0022C 809A65CC 01284821 */ addu $t1, $t1, $t0 -/* 00230 809A65D0 8D2917B4 */ lw $t1, 0x17B4($t1) ## 000117B4 -/* 00234 809A65D4 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFDC -/* 00238 809A65D8 0C031AB1 */ jal Graph_OpenDisps -/* 0023C 809A65DC AFA90050 */ sw $t1, 0x0050($sp) -/* 00240 809A65E0 C62C0000 */ lwc1 $f12, 0x0000($s1) ## 00000000 -/* 00244 809A65E4 C62E0004 */ lwc1 $f14, 0x0004($s1) ## 00000004 -/* 00248 809A65E8 8E260008 */ lw $a2, 0x0008($s1) ## 00000008 -/* 0024C 809A65EC 0C034261 */ jal Matrix_Translate -/* 00250 809A65F0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00254 809A65F4 C7AC0054 */ lwc1 $f12, 0x0054($sp) -/* 00258 809A65F8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0025C 809A65FC 44066000 */ mfc1 $a2, $f12 -/* 00260 809A6600 0C0342A3 */ jal Matrix_Scale -/* 00264 809A6604 46006386 */ mov.s $f14, $f12 -/* 00268 809A6608 8FA40050 */ lw $a0, 0x0050($sp) -/* 0026C 809A660C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00270 809A6610 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 -/* 00274 809A6614 00815021 */ addu $t2, $a0, $at -/* 00278 809A6618 3C018016 */ lui $at, %hi(gSegments+0x18) -/* 0027C 809A661C AC2A6FC0 */ sw $t2, %lo(gSegments+0x18)($at) -/* 00280 809A6620 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00284 809A6624 358C0018 */ ori $t4, $t4, 0x0018 ## $t4 = DB060018 -/* 00288 809A6628 3C0FDA38 */ lui $t7, 0xDA38 ## $t7 = DA380000 -/* 0028C 809A662C 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 00290 809A6630 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 -/* 00294 809A6634 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 00298 809A6638 AC440004 */ sw $a0, 0x0004($v0) ## 00000004 -/* 0029C 809A663C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 002A0 809A6640 35EF0003 */ ori $t7, $t7, 0x0003 ## $t7 = DA380003 -/* 002A4 809A6644 3C05809A */ lui $a1, %hi(D_809A68C8) ## $a1 = 809A0000 -/* 002A8 809A6648 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 002AC 809A664C AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 002B0 809A6650 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 002B4 809A6654 24A568C8 */ addiu $a1, $a1, %lo(D_809A68C8) ## $a1 = 809A68C8 -/* 002B8 809A6658 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 002BC 809A665C 2406011A */ addiu $a2, $zero, 0x011A ## $a2 = 0000011A -/* 002C0 809A6660 0C0346A2 */ jal Matrix_NewMtx -/* 002C4 809A6664 AFA20034 */ sw $v0, 0x0034($sp) -/* 002C8 809A6668 8FA30034 */ lw $v1, 0x0034($sp) -/* 002CC 809A666C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 002D0 809A6670 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 002D4 809A6674 86380052 */ lh $t8, 0x0052($s1) ## 00000052 -/* 002D8 809A6678 17000006 */ bne $t8, $zero, .L809A6694 -/* 002DC 809A667C 00000000 */ nop -/* 002E0 809A6680 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 -/* 002E4 809A6684 0C024DDD */ jal Gfx_CallSetupDL -/* 002E8 809A6688 2405003D */ addiu $a1, $zero, 0x003D ## $a1 = 0000003D -/* 002EC 809A668C 10000004 */ beq $zero, $zero, .L809A66A0 -/* 002F0 809A6690 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 -.L809A6694: -/* 002F4 809A6694 0C024DDD */ jal Gfx_CallSetupDL -/* 002F8 809A6698 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 -/* 002FC 809A669C AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 -.L809A66A0: -/* 00300 809A66A0 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00304 809A66A4 3C19FA00 */ lui $t9, 0xFA00 ## $t9 = FA000000 -/* 00308 809A66A8 3C0AFB00 */ lui $t2, 0xFB00 ## $t2 = FB000000 -/* 0030C 809A66AC 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 00310 809A66B0 AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 -/* 00314 809A66B4 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 00318 809A66B8 862F0042 */ lh $t7, 0x0042($s1) ## 00000042 -/* 0031C 809A66BC 862B0040 */ lh $t3, 0x0040($s1) ## 00000040 -/* 00320 809A66C0 86280044 */ lh $t0, 0x0044($s1) ## 00000044 -/* 00324 809A66C4 31F800FF */ andi $t8, $t7, 0x00FF ## $t8 = 00000000 -/* 00328 809A66C8 000B6600 */ sll $t4, $t3, 24 -/* 0032C 809A66CC 310900FF */ andi $t1, $t0, 0x00FF ## $t1 = 00000000 -/* 00330 809A66D0 012C6825 */ or $t5, $t1, $t4 ## $t5 = 00000000 -/* 00334 809A66D4 00187400 */ sll $t6, $t8, 16 -/* 00338 809A66D8 01AEC825 */ or $t9, $t5, $t6 ## $t9 = 00000008 -/* 0033C 809A66DC AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 00340 809A66E0 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00344 809A66E4 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 -/* 00348 809A66E8 358C0020 */ ori $t4, $t4, 0x0020 ## $t4 = DB060020 -/* 0034C 809A66EC 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 -/* 00350 809A66F0 AE0802D0 */ sw $t0, 0x02D0($s0) ## 000002D0 -/* 00354 809A66F4 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 00358 809A66F8 862E0048 */ lh $t6, 0x0048($s1) ## 00000048 -/* 0035C 809A66FC 862F0046 */ lh $t7, 0x0046($s1) ## 00000046 -/* 00360 809A6700 862B004A */ lh $t3, 0x004A($s1) ## 0000004A -/* 00364 809A6704 31D900FF */ andi $t9, $t6, 0x00FF ## $t9 = 00000008 -/* 00368 809A6708 000FC600 */ sll $t8, $t7, 24 -/* 0036C 809A670C 316900FF */ andi $t1, $t3, 0x00FF ## $t1 = 00000000 -/* 00370 809A6710 01386825 */ or $t5, $t1, $t8 ## $t5 = 00000000 -/* 00374 809A6714 00194400 */ sll $t0, $t9, 16 -/* 00378 809A6718 01A85025 */ or $t2, $t5, $t0 ## $t2 = 00000008 -/* 0037C 809A671C AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 -/* 00380 809A6720 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00384 809A6724 3C04809A */ lui $a0, %hi(D_809A6860) ## $a0 = 809A0000 -/* 00388 809A6728 3C088016 */ lui $t0, %hi(gSegments) -/* 0038C 809A672C 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 00390 809A6730 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 -/* 00394 809A6734 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 00398 809A6738 862F004C */ lh $t7, 0x004C($s1) ## 0000004C -/* 0039C 809A673C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 003A0 809A6740 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 003A4 809A6744 000F4880 */ sll $t1, $t7, 2 -/* 003A8 809A6748 00892021 */ addu $a0, $a0, $t1 -/* 003AC 809A674C 8C846860 */ lw $a0, %lo(D_809A6860)($a0) -/* 003B0 809A6750 3C0FDE00 */ lui $t7, 0xDE00 ## $t7 = DE000000 -/* 003B4 809A6754 3C06809A */ lui $a2, %hi(D_809A68E0) ## $a2 = 809A0000 -/* 003B8 809A6758 00047100 */ sll $t6, $a0, 4 -/* 003BC 809A675C 000ECF02 */ srl $t9, $t6, 28 -/* 003C0 809A6760 00196880 */ sll $t5, $t9, 2 -/* 003C4 809A6764 010D4021 */ addu $t0, $t0, $t5 -/* 003C8 809A6768 8D086FA8 */ lw $t0, %lo(gSegments)($t0) -/* 003CC 809A676C 0081C024 */ and $t8, $a0, $at -/* 003D0 809A6770 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 003D4 809A6774 03085021 */ addu $t2, $t8, $t0 -/* 003D8 809A6778 01415821 */ addu $t3, $t2, $at -/* 003DC 809A677C AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 003E0 809A6780 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 003E4 809A6784 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFDC -/* 003E8 809A6788 24C668E0 */ addiu $a2, $a2, %lo(D_809A68E0) ## $a2 = 809A68E0 -/* 003EC 809A678C 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 003F0 809A6790 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 -/* 003F4 809A6794 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 003F8 809A6798 8E290038 */ lw $t1, 0x0038($s1) ## 00000038 -/* 003FC 809A679C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00400 809A67A0 24070137 */ addiu $a3, $zero, 0x0137 ## $a3 = 00000137 -/* 00404 809A67A4 0C031AD5 */ jal Graph_CloseDisps -/* 00408 809A67A8 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 0040C 809A67AC 8FBF001C */ lw $ra, 0x001C($sp) -/* 00410 809A67B0 8FB00014 */ lw $s0, 0x0014($sp) -/* 00414 809A67B4 8FB10018 */ lw $s1, 0x0018($sp) -/* 00418 809A67B8 03E00008 */ jr $ra -/* 0041C 809A67BC 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/func_809A67C0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/func_809A67C0.s deleted file mode 100644 index 5b4f273a09..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/func_809A67C0.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_809A67C0 -/* 00420 809A67C0 AFA40000 */ sw $a0, 0x0000($sp) -/* 00424 809A67C4 AFA50004 */ sw $a1, 0x0004($sp) -/* 00428 809A67C8 84CE004E */ lh $t6, 0x004E($a2) ## 0000004E -/* 0042C 809A67CC 84CF0050 */ lh $t7, 0x0050($a2) ## 00000050 -/* 00430 809A67D0 01CFC021 */ addu $t8, $t6, $t7 -/* 00434 809A67D4 A4D8004E */ sh $t8, 0x004E($a2) ## 0000004E -/* 00438 809A67D8 84C2004E */ lh $v0, 0x004E($a2) ## 0000004E -/* 0043C 809A67DC 2841000A */ slti $at, $v0, 0x000A -/* 00440 809A67E0 1420001C */ bne $at, $zero, .L809A6854 -/* 00444 809A67E4 00000000 */ nop -/* 00448 809A67E8 84C8004C */ lh $t0, 0x004C($a2) ## 0000004C -/* 0044C 809A67EC 2459FFF6 */ addiu $t9, $v0, 0xFFF6 ## $t9 = FFFFFFF6 -/* 00450 809A67F0 A4D9004E */ sh $t9, 0x004E($a2) ## 0000004E -/* 00454 809A67F4 25090001 */ addiu $t1, $t0, 0x0001 ## $t1 = 00000001 -/* 00458 809A67F8 A4C9004C */ sh $t1, 0x004C($a2) ## 0000004C -/* 0045C 809A67FC 84CA004C */ lh $t2, 0x004C($a2) ## 0000004C -/* 00460 809A6800 2941000A */ slti $at, $t2, 0x000A -/* 00464 809A6804 54200003 */ bnel $at, $zero, .L809A6814 -/* 00468 809A6808 84CB0052 */ lh $t3, 0x0052($a2) ## 00000052 -/* 0046C 809A680C A4C0005C */ sh $zero, 0x005C($a2) ## 0000005C -/* 00470 809A6810 84CB0052 */ lh $t3, 0x0052($a2) ## 00000052 -.L809A6814: -/* 00474 809A6814 1560000F */ bne $t3, $zero, .L809A6854 -/* 00478 809A6818 00000000 */ nop -/* 0047C 809A681C 84CC0042 */ lh $t4, 0x0042($a2) ## 00000042 -/* 00480 809A6820 258DFFE6 */ addiu $t5, $t4, 0xFFE6 ## $t5 = FFFFFFE6 -/* 00484 809A6824 A4CD0042 */ sh $t5, 0x0042($a2) ## 00000042 -/* 00488 809A6828 84CE0042 */ lh $t6, 0x0042($a2) ## 00000042 -/* 0048C 809A682C 5DC00003 */ bgtzl $t6, .L809A683C -/* 00490 809A6830 84CF0046 */ lh $t7, 0x0046($a2) ## 00000046 -/* 00494 809A6834 A4C00042 */ sh $zero, 0x0042($a2) ## 00000042 -/* 00498 809A6838 84CF0046 */ lh $t7, 0x0046($a2) ## 00000046 -.L809A683C: -/* 0049C 809A683C 25F8FFE6 */ addiu $t8, $t7, 0xFFE6 ## $t8 = FFFFFFE6 -/* 004A0 809A6840 A4D80046 */ sh $t8, 0x0046($a2) ## 00000046 -/* 004A4 809A6844 84D90046 */ lh $t9, 0x0046($a2) ## 00000046 -/* 004A8 809A6848 1F200002 */ bgtz $t9, .L809A6854 -/* 004AC 809A684C 00000000 */ nop -/* 004B0 809A6850 A4C00046 */ sh $zero, 0x0046($a2) ## 00000046 -.L809A6854: -/* 004B4 809A6854 03E00008 */ jr $ra -/* 004B8 809A6858 00000000 */ nop -/* 004BC 809A685C 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/EffectSsGRipple_Init.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/EffectSsGRipple_Init.s deleted file mode 100644 index 2f440c10a7..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/EffectSsGRipple_Init.s +++ /dev/null @@ -1,95 +0,0 @@ -glabel EffectSsGRipple_Init -/* 00000 809A6960 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00004 809A6964 3C0E809A */ lui $t6, %hi(D_809A6E88) ## $t6 = 809A0000 -/* 00008 809A6968 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0000C 809A696C AFB10020 */ sw $s1, 0x0020($sp) -/* 00010 809A6970 AFB0001C */ sw $s0, 0x001C($sp) -/* 00014 809A6974 AFA50054 */ sw $a1, 0x0054($sp) -/* 00018 809A6978 25CE6E88 */ addiu $t6, $t6, %lo(D_809A6E88) ## $t6 = 809A6E88 -/* 0001C 809A697C 8DD80000 */ lw $t8, 0x0000($t6) ## 809A6E88 -/* 00020 809A6980 27A80040 */ addiu $t0, $sp, 0x0040 ## $t0 = FFFFFFF0 -/* 00024 809A6984 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFDC -/* 00028 809A6988 AD180000 */ sw $t8, 0x0000($t0) ## FFFFFFF0 -/* 0002C 809A698C 8DCF0004 */ lw $t7, 0x0004($t6) ## 809A6E8C -/* 00030 809A6990 3C030402 */ lui $v1, 0x0402 ## $v1 = 04020000 -/* 00034 809A6994 246354B0 */ addiu $v1, $v1, 0x54B0 ## $v1 = 040254B0 -/* 00038 809A6998 AD0F0004 */ sw $t7, 0x0004($t0) ## FFFFFFF4 -/* 0003C 809A699C 8DD80008 */ lw $t8, 0x0008($t6) ## 809A6E90 -/* 00040 809A69A0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00044 809A69A4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00048 809A69A8 AD180008 */ sw $t8, 0x0008($t0) ## FFFFFFF8 -/* 0004C 809A69AC AFA0003C */ sw $zero, 0x003C($sp) -/* 00050 809A69B0 8D090000 */ lw $t1, 0x0000($t0) ## FFFFFFF0 -/* 00054 809A69B4 8D190004 */ lw $t9, 0x0004($t0) ## FFFFFFF4 -/* 00058 809A69B8 0003C100 */ sll $t8, $v1, 4 -/* 0005C 809A69BC ACA90000 */ sw $t1, 0x0000($a1) ## FFFFFFDC -/* 00060 809A69C0 8D090008 */ lw $t1, 0x0008($t0) ## FFFFFFF8 -/* 00064 809A69C4 8CAB0000 */ lw $t3, 0x0000($a1) ## FFFFFFDC -/* 00068 809A69C8 ACB90004 */ sw $t9, 0x0004($a1) ## FFFFFFE0 -/* 0006C 809A69CC ACA90008 */ sw $t1, 0x0008($a1) ## FFFFFFE4 -/* 00070 809A69D0 ACCB0018 */ sw $t3, 0x0018($a2) ## 00000018 -/* 00074 809A69D4 8CAA0004 */ lw $t2, 0x0004($a1) ## FFFFFFE0 -/* 00078 809A69D8 0018CF02 */ srl $t9, $t8, 28 -/* 0007C 809A69DC 00194880 */ sll $t1, $t9, 2 -/* 00080 809A69E0 ACCA001C */ sw $t2, 0x001C($a2) ## 0000001C -/* 00084 809A69E4 8CAB0008 */ lw $t3, 0x0008($a1) ## FFFFFFE4 -/* 00088 809A69E8 3C0A8016 */ lui $t2, %hi(gSegments) -/* 0008C 809A69EC 01495021 */ addu $t2, $t2, $t1 -/* 00090 809A69F0 ACCB0020 */ sw $t3, 0x0020($a2) ## 00000020 -/* 00094 809A69F4 8CAD0000 */ lw $t5, 0x0000($a1) ## FFFFFFDC -/* 00098 809A69F8 00615824 */ and $t3, $v1, $at -/* 0009C 809A69FC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 000A0 809A6A00 ACCD000C */ sw $t5, 0x000C($a2) ## 0000000C -/* 000A4 809A6A04 8CAC0004 */ lw $t4, 0x0004($a1) ## FFFFFFE0 -/* 000A8 809A6A08 3C18809A */ lui $t8, %hi(func_809A6D08) ## $t8 = 809A0000 -/* 000AC 809A6A0C 3C19809A */ lui $t9, %hi(func_809A6D40) ## $t9 = 809A0000 -/* 000B0 809A6A10 ACCC0010 */ sw $t4, 0x0010($a2) ## 00000010 -/* 000B4 809A6A14 8CAD0008 */ lw $t5, 0x0008($a1) ## FFFFFFE4 -/* 000B8 809A6A18 27186D08 */ addiu $t8, $t8, %lo(func_809A6D08) ## $t8 = 809A6D08 -/* 000BC 809A6A1C 27396D40 */ addiu $t9, $t9, %lo(func_809A6D40) ## $t9 = 809A6D40 -/* 000C0 809A6A20 ACCD0014 */ sw $t5, 0x0014($a2) ## 00000014 -/* 000C4 809A6A24 8CEF0000 */ lw $t7, 0x0000($a3) ## 00000000 -/* 000C8 809A6A28 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF -/* 000CC 809A6A2C 00C08025 */ or $s0, $a2, $zero ## $s0 = 00000000 -/* 000D0 809A6A30 ACCF0000 */ sw $t7, 0x0000($a2) ## 00000000 -/* 000D4 809A6A34 8CEE0004 */ lw $t6, 0x0004($a3) ## 00000004 -/* 000D8 809A6A38 248507C0 */ addiu $a1, $a0, 0x07C0 ## $a1 = 000007C0 -/* 000DC 809A6A3C ACCE0004 */ sw $t6, 0x0004($a2) ## 00000004 -/* 000E0 809A6A40 8CEF0008 */ lw $t7, 0x0008($a3) ## 00000008 -/* 000E4 809A6A44 ACCF0008 */ sw $t7, 0x0008($a2) ## 00000008 -/* 000E8 809A6A48 8D4A6FA8 */ lw $t2, %lo(gSegments)($t2) -/* 000EC 809A6A4C 014B6021 */ addu $t4, $t2, $t3 -/* 000F0 809A6A50 01816821 */ addu $t5, $t4, $at -/* 000F4 809A6A54 ACCD0038 */ sw $t5, 0x0038($a2) ## 00000038 -/* 000F8 809A6A58 84EE0010 */ lh $t6, 0x0010($a3) ## 00000010 -/* 000FC 809A6A5C A4C0005A */ sh $zero, 0x005A($a2) ## 0000005A -/* 00100 809A6A60 ACD80028 */ sw $t8, 0x0028($a2) ## 00000028 -/* 00104 809A6A64 25CF0014 */ addiu $t7, $t6, 0x0014 ## $t7 = 809A6E9C -/* 00108 809A6A68 A4CF005C */ sh $t7, 0x005C($a2) ## 0000005C -/* 0010C 809A6A6C ACD90024 */ sw $t9, 0x0024($a2) ## 00000024 -/* 00110 809A6A70 84E9000C */ lh $t1, 0x000C($a3) ## 0000000C -/* 00114 809A6A74 27AC003C */ addiu $t4, $sp, 0x003C ## $t4 = FFFFFFEC -/* 00118 809A6A78 A4C90042 */ sh $t1, 0x0042($a2) ## 00000042 -/* 0011C 809A6A7C 84EA000E */ lh $t2, 0x000E($a3) ## 0000000E -/* 00120 809A6A80 A4CA0044 */ sh $t2, 0x0044($a2) ## 00000044 -/* 00124 809A6A84 84EB0010 */ lh $t3, 0x0010($a3) ## 00000010 -/* 00128 809A6A88 A4C20046 */ sh $v0, 0x0046($a2) ## 00000046 -/* 0012C 809A6A8C A4C20048 */ sh $v0, 0x0048($a2) ## 00000048 -/* 00130 809A6A90 A4C2004A */ sh $v0, 0x004A($a2) ## 0000004A -/* 00134 809A6A94 A4C2004C */ sh $v0, 0x004C($a2) ## 0000004C -/* 00138 809A6A98 A4C2004E */ sh $v0, 0x004E($a2) ## 0000004E -/* 0013C 809A6A9C A4C20050 */ sh $v0, 0x0050($a2) ## 00000050 -/* 00140 809A6AA0 A4C20052 */ sh $v0, 0x0052($a2) ## 00000052 -/* 00144 809A6AA4 A4C20054 */ sh $v0, 0x0054($a2) ## 00000054 -/* 00148 809A6AA8 A4CB0056 */ sh $t3, 0x0056($a2) ## 00000056 -/* 0014C 809A6AAC 00E03025 */ or $a2, $a3, $zero ## $a2 = 00000000 -/* 00150 809A6AB0 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 -/* 00154 809A6AB4 0C0108E7 */ jal func_8004239C -/* 00158 809A6AB8 AFAC0010 */ sw $t4, 0x0010($sp) -/* 0015C 809A6ABC A6020040 */ sh $v0, 0x0040($s0) ## 00000040 -/* 00160 809A6AC0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00164 809A6AC4 8FB10020 */ lw $s1, 0x0020($sp) -/* 00168 809A6AC8 8FB0001C */ lw $s0, 0x001C($sp) -/* 0016C 809A6ACC 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 00170 809A6AD0 03E00008 */ jr $ra -/* 00174 809A6AD4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/func_809A6AD8.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/func_809A6AD8.s deleted file mode 100644 index 43fd5c272a..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/func_809A6AD8.s +++ /dev/null @@ -1,157 +0,0 @@ -.rdata -glabel D_809A6EA0 - .asciz "../z_eff_ss_g_ripple.c" - .balign 4 - -glabel D_809A6EB8 - .asciz "../z_eff_ss_g_ripple.c" - .balign 4 - -.late_rodata -glabel D_809A6ED0 - .float 0.0025 - -.text -glabel func_809A6AD8 -/* 00178 809A6AD8 27BDFED8 */ addiu $sp, $sp, 0xFED8 ## $sp = FFFFFED8 -/* 0017C 809A6ADC AFBF001C */ sw $ra, 0x001C($sp) -/* 00180 809A6AE0 AFB10018 */ sw $s1, 0x0018($sp) -/* 00184 809A6AE4 AFB00014 */ sw $s0, 0x0014($sp) -/* 00188 809A6AE8 AFA40128 */ sw $a0, 0x0128($sp) -/* 0018C 809A6AEC AFA60130 */ sw $a2, 0x0130($sp) -/* 00190 809A6AF0 8C900000 */ lw $s0, 0x0000($a0) ## 00000000 -/* 00194 809A6AF4 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00198 809A6AF8 3C06809A */ lui $a2, %hi(D_809A6EA0) ## $a2 = 809A0000 -/* 0019C 809A6AFC 24C66EA0 */ addiu $a2, $a2, %lo(D_809A6EA0) ## $a2 = 809A6EA0 -/* 001A0 809A6B00 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFF18 -/* 001A4 809A6B04 240700C7 */ addiu $a3, $zero, 0x00C7 ## $a3 = 000000C7 -/* 001A8 809A6B08 0C031AB1 */ jal Graph_OpenDisps -/* 001AC 809A6B0C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 001B0 809A6B10 862F0042 */ lh $t7, 0x0042($s1) ## 00000042 -/* 001B4 809A6B14 3C01809A */ lui $at, %hi(D_809A6ED0) ## $at = 809A0000 -/* 001B8 809A6B18 C4286ED0 */ lwc1 $f8, %lo(D_809A6ED0)($at) -/* 001BC 809A6B1C 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 001C0 809A6B20 86220040 */ lh $v0, 0x0040($s1) ## 00000040 -/* 001C4 809A6B24 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 001C8 809A6B28 468021A0 */ cvt.s.w $f6, $f4 -/* 001CC 809A6B2C 8FA40128 */ lw $a0, 0x0128($sp) -/* 001D0 809A6B30 46083082 */ mul.s $f2, $f6, $f8 -/* 001D4 809A6B34 5041000E */ beql $v0, $at, .L809A6B70 -/* 001D8 809A6B38 C6200004 */ lwc1 $f0, 0x0004($s1) ## 00000004 -/* 001DC 809A6B3C 8C8307C0 */ lw $v1, 0x07C0($a0) ## 000007C0 -/* 001E0 809A6B40 94780024 */ lhu $t8, 0x0024($v1) ## 00000024 -/* 001E4 809A6B44 0058082A */ slt $at, $v0, $t8 -/* 001E8 809A6B48 50200009 */ beql $at, $zero, .L809A6B70 -/* 001EC 809A6B4C C6200004 */ lwc1 $f0, 0x0004($s1) ## 00000004 -/* 001F0 809A6B50 8C680028 */ lw $t0, 0x0028($v1) ## 00000028 -/* 001F4 809A6B54 0002C900 */ sll $t9, $v0, 4 -/* 001F8 809A6B58 03284821 */ addu $t1, $t9, $t0 -/* 001FC 809A6B5C 852A0002 */ lh $t2, 0x0002($t1) ## 00000002 -/* 00200 809A6B60 448A5000 */ mtc1 $t2, $f10 ## $f10 = 0.00 -/* 00204 809A6B64 10000002 */ beq $zero, $zero, .L809A6B70 -/* 00208 809A6B68 46805020 */ cvt.s.w $f0, $f10 -/* 0020C 809A6B6C C6200004 */ lwc1 $f0, 0x0004($s1) ## 00000004 -.L809A6B70: -/* 00210 809A6B70 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 00214 809A6B74 44060000 */ mfc1 $a2, $f0 -/* 00218 809A6B78 8E270008 */ lw $a3, 0x0008($s1) ## 00000008 -/* 0021C 809A6B7C E7A20120 */ swc1 $f2, 0x0120($sp) -/* 00220 809A6B80 0C029E89 */ jal SkinMatrix_SetTranslate -/* 00224 809A6B84 27A400DC */ addiu $a0, $sp, 0x00DC ## $a0 = FFFFFFB4 -/* 00228 809A6B88 C7A20120 */ lwc1 $f2, 0x0120($sp) -/* 0022C 809A6B8C 27A4009C */ addiu $a0, $sp, 0x009C ## $a0 = FFFFFF74 -/* 00230 809A6B90 44051000 */ mfc1 $a1, $f2 -/* 00234 809A6B94 44061000 */ mfc1 $a2, $f2 -/* 00238 809A6B98 44071000 */ mfc1 $a3, $f2 -/* 0023C 809A6B9C 0C029DA9 */ jal SkinMatrix_SetScale -/* 00240 809A6BA0 00000000 */ nop -/* 00244 809A6BA4 27A400DC */ addiu $a0, $sp, 0x00DC ## $a0 = FFFFFFB4 -/* 00248 809A6BA8 27A5009C */ addiu $a1, $sp, 0x009C ## $a1 = FFFFFF74 -/* 0024C 809A6BAC 0C029BE8 */ jal SkinMatrix_MtxFMtxFMult -/* 00250 809A6BB0 27A6005C */ addiu $a2, $sp, 0x005C ## $a2 = FFFFFF34 -/* 00254 809A6BB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00258 809A6BB8 0C029F9C */ jal SkinMatrix_MtxFToNewMtx -/* 0025C 809A6BBC 27A5005C */ addiu $a1, $sp, 0x005C ## $a1 = FFFFFF34 -/* 00260 809A6BC0 10400046 */ beq $v0, $zero, .L809A6CDC -/* 00264 809A6BC4 3C0CDA38 */ lui $t4, 0xDA38 ## $t4 = DA380000 -/* 00268 809A6BC8 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 -/* 0026C 809A6BCC 358C0003 */ ori $t4, $t4, 0x0003 ## $t4 = DA380003 -/* 00270 809A6BD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00274 809A6BD4 246B0008 */ addiu $t3, $v1, 0x0008 ## $t3 = 00000008 -/* 00278 809A6BD8 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 -/* 0027C 809A6BDC AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00280 809A6BE0 0C0252F1 */ jal func_80094BC4 -/* 00284 809A6BE4 AC6C0000 */ sw $t4, 0x0000($v1) ## 00000000 -/* 00288 809A6BE8 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 -/* 0028C 809A6BEC 3C0EFA00 */ lui $t6, 0xFA00 ## $t6 = FA000000 -/* 00290 809A6BF0 246D0008 */ addiu $t5, $v1, 0x0008 ## $t5 = 00000008 -/* 00294 809A6BF4 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 00298 809A6BF8 AC6E0000 */ sw $t6, 0x0000($v1) ## 00000000 -/* 0029C 809A6BFC 862F004C */ lh $t7, 0x004C($s1) ## 0000004C -/* 002A0 809A6C00 862B0048 */ lh $t3, 0x0048($s1) ## 00000048 -/* 002A4 809A6C04 86280046 */ lh $t0, 0x0046($s1) ## 00000046 -/* 002A8 809A6C08 31F800FF */ andi $t8, $t7, 0x00FF ## $t8 = 00000000 -/* 002AC 809A6C0C 862F004A */ lh $t7, 0x004A($s1) ## 0000004A -/* 002B0 809A6C10 316C00FF */ andi $t4, $t3, 0x00FF ## $t4 = 00000000 -/* 002B4 809A6C14 00084E00 */ sll $t1, $t0, 24 -/* 002B8 809A6C18 03095025 */ or $t2, $t8, $t1 ## $t2 = 00000000 -/* 002BC 809A6C1C 000C6C00 */ sll $t5, $t4, 16 -/* 002C0 809A6C20 31F900FF */ andi $t9, $t7, 0x00FF ## $t9 = 00000000 -/* 002C4 809A6C24 00194200 */ sll $t0, $t9, 8 -/* 002C8 809A6C28 014D7025 */ or $t6, $t2, $t5 ## $t6 = 00000008 -/* 002CC 809A6C2C 01C8C025 */ or $t8, $t6, $t0 ## $t8 = 00000008 -/* 002D0 809A6C30 AC780004 */ sw $t8, 0x0004($v1) ## 00000004 -/* 002D4 809A6C34 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 -/* 002D8 809A6C38 3C0BFB00 */ lui $t3, 0xFB00 ## $t3 = FB000000 -/* 002DC 809A6C3C 24690008 */ addiu $t1, $v1, 0x0008 ## $t1 = 00000008 -/* 002E0 809A6C40 AE0902D0 */ sw $t1, 0x02D0($s0) ## 000002D0 -/* 002E4 809A6C44 AC6B0000 */ sw $t3, 0x0000($v1) ## 00000000 -/* 002E8 809A6C48 862C0054 */ lh $t4, 0x0054($s1) ## 00000054 -/* 002EC 809A6C4C 86280050 */ lh $t0, 0x0050($s1) ## 00000050 -/* 002F0 809A6C50 862F004E */ lh $t7, 0x004E($s1) ## 0000004E -/* 002F4 809A6C54 318A00FF */ andi $t2, $t4, 0x00FF ## $t2 = 00000000 -/* 002F8 809A6C58 862C0052 */ lh $t4, 0x0052($s1) ## 00000052 -/* 002FC 809A6C5C 311800FF */ andi $t8, $t0, 0x00FF ## $t8 = 00000000 -/* 00300 809A6C60 000FCE00 */ sll $t9, $t7, 24 -/* 00304 809A6C64 01597025 */ or $t6, $t2, $t9 ## $t6 = 00000000 -/* 00308 809A6C68 00184C00 */ sll $t1, $t8, 16 -/* 0030C 809A6C6C 318D00FF */ andi $t5, $t4, 0x00FF ## $t5 = 00000000 -/* 00310 809A6C70 000D7A00 */ sll $t7, $t5, 8 -/* 00314 809A6C74 01C95825 */ or $t3, $t6, $t1 ## $t3 = 00000008 -/* 00318 809A6C78 016F5025 */ or $t2, $t3, $t7 ## $t2 = 00000008 -/* 0031C 809A6C7C AC6A0004 */ sw $t2, 0x0004($v1) ## 00000004 -/* 00320 809A6C80 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 -/* 00324 809A6C84 3C08E300 */ lui $t0, 0xE300 ## $t0 = E3000000 -/* 00328 809A6C88 35081A01 */ ori $t0, $t0, 0x1A01 ## $t0 = E3001A01 -/* 0032C 809A6C8C 24790008 */ addiu $t9, $v1, 0x0008 ## $t9 = 00000008 -/* 00330 809A6C90 AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0 -/* 00334 809A6C94 24180020 */ addiu $t8, $zero, 0x0020 ## $t8 = 00000020 -/* 00338 809A6C98 AC780004 */ sw $t8, 0x0004($v1) ## 00000004 -/* 0033C 809A6C9C AC680000 */ sw $t0, 0x0000($v1) ## 00000000 -/* 00340 809A6CA0 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 -/* 00344 809A6CA4 3C09E300 */ lui $t1, 0xE300 ## $t1 = E3000000 -/* 00348 809A6CA8 35291801 */ ori $t1, $t1, 0x1801 ## $t1 = E3001801 -/* 0034C 809A6CAC 246E0008 */ addiu $t6, $v1, 0x0008 ## $t6 = 00000008 -/* 00350 809A6CB0 AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 -/* 00354 809A6CB4 240C0080 */ addiu $t4, $zero, 0x0080 ## $t4 = 00000080 -/* 00358 809A6CB8 AC6C0004 */ sw $t4, 0x0004($v1) ## 00000004 -/* 0035C 809A6CBC AC690000 */ sw $t1, 0x0000($v1) ## 00000000 -/* 00360 809A6CC0 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 -/* 00364 809A6CC4 3C0BDE00 */ lui $t3, 0xDE00 ## $t3 = DE000000 -/* 00368 809A6CC8 246D0008 */ addiu $t5, $v1, 0x0008 ## $t5 = 00000008 -/* 0036C 809A6CCC AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 00370 809A6CD0 AC6B0000 */ sw $t3, 0x0000($v1) ## 00000000 -/* 00374 809A6CD4 8E2F0038 */ lw $t7, 0x0038($s1) ## 00000038 -/* 00378 809A6CD8 AC6F0004 */ sw $t7, 0x0004($v1) ## 00000004 -.L809A6CDC: -/* 0037C 809A6CDC 3C06809A */ lui $a2, %hi(D_809A6EB8) ## $a2 = 809A0000 -/* 00380 809A6CE0 24C66EB8 */ addiu $a2, $a2, %lo(D_809A6EB8) ## $a2 = 809A6EB8 -/* 00384 809A6CE4 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFF18 -/* 00388 809A6CE8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0038C 809A6CEC 0C031AD5 */ jal Graph_CloseDisps -/* 00390 809A6CF0 240700F7 */ addiu $a3, $zero, 0x00F7 ## $a3 = 000000F7 -/* 00394 809A6CF4 8FBF001C */ lw $ra, 0x001C($sp) -/* 00398 809A6CF8 8FB00014 */ lw $s0, 0x0014($sp) -/* 0039C 809A6CFC 8FB10018 */ lw $s1, 0x0018($sp) -/* 003A0 809A6D00 03E00008 */ jr $ra -/* 003A4 809A6D04 27BD0128 */ addiu $sp, $sp, 0x0128 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/func_809A6D08.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/func_809A6D08.s deleted file mode 100644 index bba759e6d0..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/func_809A6D08.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_809A6D08 -/* 003A8 809A6D08 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 003AC 809A6D0C AFBF0014 */ sw $ra, 0x0014($sp) -/* 003B0 809A6D10 AFA5001C */ sw $a1, 0x001C($sp) -/* 003B4 809A6D14 84CE0056 */ lh $t6, 0x0056($a2) ## 00000056 -/* 003B8 809A6D18 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 003BC 809A6D1C 3C060402 */ lui $a2, 0x0402 ## $a2 = 04020000 -/* 003C0 809A6D20 55C00004 */ bnel $t6, $zero, .L809A6D34 -/* 003C4 809A6D24 8FBF0014 */ lw $ra, 0x0014($sp) -/* 003C8 809A6D28 0C269AB6 */ jal func_809A6AD8 -/* 003CC 809A6D2C 24C644B0 */ addiu $a2, $a2, 0x44B0 ## $a2 = 040244B0 -/* 003D0 809A6D30 8FBF0014 */ lw $ra, 0x0014($sp) -.L809A6D34: -/* 003D4 809A6D34 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 003D8 809A6D38 03E00008 */ jr $ra -/* 003DC 809A6D3C 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/func_809A6D40.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/func_809A6D40.s deleted file mode 100644 index fd01b56fcf..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/func_809A6D40.s +++ /dev/null @@ -1,87 +0,0 @@ -glabel func_809A6D40 -/* 003E0 809A6D40 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 003E4 809A6D44 AFBF0024 */ sw $ra, 0x0024($sp) -/* 003E8 809A6D48 AFB00020 */ sw $s0, 0x0020($sp) -/* 003EC 809A6D4C AFA40040 */ sw $a0, 0x0040($sp) -/* 003F0 809A6D50 AFA50044 */ sw $a1, 0x0044($sp) -/* 003F4 809A6D54 84C20056 */ lh $v0, 0x0056($a2) ## 00000056 -/* 003F8 809A6D58 00C08025 */ or $s0, $a2, $zero ## $s0 = 00000000 -/* 003FC 809A6D5C 14400003 */ bne $v0, $zero, .L809A6D6C -/* 00400 809A6D60 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 00404 809A6D64 10000003 */ beq $zero, $zero, .L809A6D74 -/* 00408 809A6D68 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L809A6D6C: -/* 0040C 809A6D6C A60E0056 */ sh $t6, 0x0056($s0) ## 00000056 -/* 00410 809A6D70 86030056 */ lh $v1, 0x0056($s0) ## 00000056 -.L809A6D74: -/* 00414 809A6D74 5460003D */ bnel $v1, $zero, .L809A6E6C -/* 00418 809A6D78 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0041C 809A6D7C 860F0042 */ lh $t7, 0x0042($s0) ## 00000042 -/* 00420 809A6D80 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00424 809A6D84 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 -/* 00428 809A6D88 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 0042C 809A6D8C 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 -/* 00430 809A6D90 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 00434 809A6D94 468021A0 */ cvt.s.w $f6, $f4 -/* 00438 809A6D98 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFFC -/* 0043C 809A6D9C 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 00440 809A6DA0 E7A6003C */ swc1 $f6, 0x003C($sp) -/* 00444 809A6DA4 86180044 */ lh $t8, 0x0044($s0) ## 00000044 -/* 00448 809A6DA8 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 0044C 809A6DAC 44984000 */ mtc1 $t8, $f8 ## $f8 = 0.00 -/* 00450 809A6DB0 00000000 */ nop -/* 00454 809A6DB4 46804220 */ cvt.s.w $f8, $f8 -/* 00458 809A6DB8 44054000 */ mfc1 $a1, $f8 -/* 0045C 809A6DBC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 00460 809A6DC0 00000000 */ nop -/* 00464 809A6DC4 8609004C */ lh $t1, 0x004C($s0) ## 0000004C -/* 00468 809A6DC8 C7B0003C */ lwc1 $f16, 0x003C($sp) -/* 0046C 809A6DCC 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 -/* 00470 809A6DD0 44892000 */ mtc1 $t1, $f4 ## $f4 = 0.00 -/* 00474 809A6DD4 4600848D */ trunc.w.s $f18, $f16 -/* 00478 809A6DD8 44818000 */ mtc1 $at, $f16 ## $f16 = 7.00 -/* 0047C 809A6DDC 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 -/* 00480 809A6DE0 468021A0 */ cvt.s.w $f6, $f4 -/* 00484 809A6DE4 44089000 */ mfc1 $t0, $f18 -/* 00488 809A6DE8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 0048C 809A6DEC 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFF8 -/* 00490 809A6DF0 A6080042 */ sh $t0, 0x0042($s0) ## 00000042 -/* 00494 809A6DF4 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 00498 809A6DF8 E7A60038 */ swc1 $f6, 0x0038($sp) -/* 0049C 809A6DFC 860A0054 */ lh $t2, 0x0054($s0) ## 00000054 -/* 004A0 809A6E00 3C074170 */ lui $a3, 0x4170 ## $a3 = 41700000 -/* 004A4 809A6E04 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 004A8 809A6E08 448A4000 */ mtc1 $t2, $f8 ## $f8 = 0.00 -/* 004AC 809A6E0C 00000000 */ nop -/* 004B0 809A6E10 468042A0 */ cvt.s.w $f10, $f8 -/* 004B4 809A6E14 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 004B8 809A6E18 E7AA0034 */ swc1 $f10, 0x0034($sp) -/* 004BC 809A6E1C 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 -/* 004C0 809A6E20 44819000 */ mtc1 $at, $f18 ## $f18 = 7.00 -/* 004C4 809A6E24 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 -/* 004C8 809A6E28 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 004CC 809A6E2C 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFF4 -/* 004D0 809A6E30 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 004D4 809A6E34 3C074170 */ lui $a3, 0x4170 ## $a3 = 41700000 -/* 004D8 809A6E38 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 004DC 809A6E3C E7B20010 */ swc1 $f18, 0x0010($sp) -/* 004E0 809A6E40 C7A40038 */ lwc1 $f4, 0x0038($sp) -/* 004E4 809A6E44 4600218D */ trunc.w.s $f6, $f4 -/* 004E8 809A6E48 440C3000 */ mfc1 $t4, $f6 -/* 004EC 809A6E4C 00000000 */ nop -/* 004F0 809A6E50 A60C004C */ sh $t4, 0x004C($s0) ## 0000004C -/* 004F4 809A6E54 C7A80034 */ lwc1 $f8, 0x0034($sp) -/* 004F8 809A6E58 4600428D */ trunc.w.s $f10, $f8 -/* 004FC 809A6E5C 440E5000 */ mfc1 $t6, $f10 -/* 00500 809A6E60 00000000 */ nop -/* 00504 809A6E64 A60E0054 */ sh $t6, 0x0054($s0) ## 00000054 -/* 00508 809A6E68 8FBF0024 */ lw $ra, 0x0024($sp) -.L809A6E6C: -/* 0050C 809A6E6C 8FB00020 */ lw $s0, 0x0020($sp) -/* 00510 809A6E70 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00514 809A6E74 03E00008 */ jr $ra -/* 00518 809A6E78 00000000 */ nop -/* 0051C 809A6E7C 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Splash/EffectSsGSplash_Init.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Splash/EffectSsGSplash_Init.s deleted file mode 100644 index 9060b2c8e6..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Splash/EffectSsGSplash_Init.s +++ /dev/null @@ -1,144 +0,0 @@ -glabel EffectSsGSplash_Init -/* 00000 809A7540 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00004 809A7544 3C0E809A */ lui $t6, %hi(D_809A7948) ## $t6 = 809A0000 -/* 00008 809A7548 AFA40020 */ sw $a0, 0x0020($sp) -/* 0000C 809A754C AFA50024 */ sw $a1, 0x0024($sp) -/* 00010 809A7550 25CE7948 */ addiu $t6, $t6, %lo(D_809A7948) ## $t6 = 809A7948 -/* 00014 809A7554 8DD80000 */ lw $t8, 0x0000($t6) ## 809A7948 -/* 00018 809A7558 27A20010 */ addiu $v0, $sp, 0x0010 ## $v0 = FFFFFFF0 -/* 0001C 809A755C 27A30004 */ addiu $v1, $sp, 0x0004 ## $v1 = FFFFFFE4 -/* 00020 809A7560 AC580000 */ sw $t8, 0x0000($v0) ## FFFFFFF0 -/* 00024 809A7564 8DCF0004 */ lw $t7, 0x0004($t6) ## 809A794C -/* 00028 809A7568 8C480000 */ lw $t0, 0x0000($v0) ## FFFFFFF0 -/* 0002C 809A756C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00030 809A7570 AC4F0004 */ sw $t7, 0x0004($v0) ## FFFFFFF4 -/* 00034 809A7574 8DD80008 */ lw $t8, 0x0008($t6) ## 809A7950 -/* 00038 809A7578 AC680000 */ sw $t0, 0x0000($v1) ## FFFFFFE4 -/* 0003C 809A757C 8C6A0000 */ lw $t2, 0x0000($v1) ## FFFFFFE4 -/* 00040 809A7580 AC6F0004 */ sw $t7, 0x0004($v1) ## FFFFFFE8 -/* 00044 809A7584 AC580008 */ sw $t8, 0x0008($v0) ## FFFFFFF8 -/* 00048 809A7588 AC780008 */ sw $t8, 0x0008($v1) ## FFFFFFEC -/* 0004C 809A758C ACCA0018 */ sw $t2, 0x0018($a2) ## 00000018 -/* 00050 809A7590 8C690004 */ lw $t1, 0x0004($v1) ## FFFFFFE8 -/* 00054 809A7594 3C0F809A */ lui $t7, %hi(func_809A7760) ## $t7 = 809A0000 -/* 00058 809A7598 3C18809A */ lui $t8, %hi(func_809A7864) ## $t8 = 809A0000 -/* 0005C 809A759C ACC9001C */ sw $t1, 0x001C($a2) ## 0000001C -/* 00060 809A75A0 8C6A0008 */ lw $t2, 0x0008($v1) ## FFFFFFEC -/* 00064 809A75A4 25EF7760 */ addiu $t7, $t7, %lo(func_809A7760) ## $t7 = 809A7760 -/* 00068 809A75A8 27187864 */ addiu $t8, $t8, %lo(func_809A7864) ## $t8 = 809A7864 -/* 0006C 809A75AC ACCA0020 */ sw $t2, 0x0020($a2) ## 00000020 -/* 00070 809A75B0 8C6C0000 */ lw $t4, 0x0000($v1) ## FFFFFFE4 -/* 00074 809A75B4 3C020402 */ lui $v0, 0x0402 ## $v0 = 04020000 -/* 00078 809A75B8 24427DF0 */ addiu $v0, $v0, 0x7DF0 ## $v0 = 04027DF0 -/* 0007C 809A75BC ACCC000C */ sw $t4, 0x000C($a2) ## 0000000C -/* 00080 809A75C0 8C6B0004 */ lw $t3, 0x0004($v1) ## FFFFFFE8 -/* 00084 809A75C4 00024900 */ sll $t1, $v0, 4 -/* 00088 809A75C8 00095702 */ srl $t2, $t1, 28 -/* 0008C 809A75CC ACCB0010 */ sw $t3, 0x0010($a2) ## 00000010 -/* 00090 809A75D0 8C6C0008 */ lw $t4, 0x0008($v1) ## FFFFFFEC -/* 00094 809A75D4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00098 809A75D8 000A5880 */ sll $t3, $t2, 2 -/* 0009C 809A75DC ACCC0014 */ sw $t4, 0x0014($a2) ## 00000014 -/* 000A0 809A75E0 8CEE0000 */ lw $t6, 0x0000($a3) ## 00000000 -/* 000A4 809A75E4 3C0C8016 */ lui $t4, %hi(gSegments) -/* 000A8 809A75E8 24080258 */ addiu $t0, $zero, 0x0258 ## $t0 = 00000258 -/* 000AC 809A75EC ACCE0000 */ sw $t6, 0x0000($a2) ## 00000000 -/* 000B0 809A75F0 8CED0004 */ lw $t5, 0x0004($a3) ## 00000004 -/* 000B4 809A75F4 018B6021 */ addu $t4, $t4, $t3 -/* 000B8 809A75F8 ACCD0004 */ sw $t5, 0x0004($a2) ## 00000004 -/* 000BC 809A75FC 8CEE0008 */ lw $t6, 0x0008($a3) ## 00000008 -/* 000C0 809A7600 ACCF0028 */ sw $t7, 0x0028($a2) ## 00000028 -/* 000C4 809A7604 ACD80024 */ sw $t8, 0x0024($a2) ## 00000024 -/* 000C8 809A7608 ACCE0008 */ sw $t6, 0x0008($a2) ## 00000008 -/* 000CC 809A760C 84F9000E */ lh $t9, 0x000E($a3) ## 0000000E -/* 000D0 809A7610 00416824 */ and $t5, $v0, $at -/* 000D4 809A7614 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 000D8 809A7618 17200002 */ bne $t9, $zero, .L809A7624 -/* 000DC 809A761C 24180008 */ addiu $t8, $zero, 0x0008 ## $t8 = 00000008 -/* 000E0 809A7620 A4E8000E */ sh $t0, 0x000E($a3) ## 0000000E -.L809A7624: -/* 000E4 809A7624 8D8C6FA8 */ lw $t4, %lo(gSegments)($t4) -/* 000E8 809A7628 A4D8005C */ sh $t8, 0x005C($a2) ## 0000005C -/* 000EC 809A762C 24080064 */ addiu $t0, $zero, 0x0064 ## $t0 = 00000064 -/* 000F0 809A7630 018D7021 */ addu $t6, $t4, $t5 -/* 000F4 809A7634 01C17821 */ addu $t7, $t6, $at -/* 000F8 809A7638 ACCF0038 */ sw $t7, 0x0038($a2) ## 00000038 -/* 000FC 809A763C 84F9000E */ lh $t9, 0x000E($a3) ## 0000000E -/* 00100 809A7640 A4C00040 */ sh $zero, 0x0040($a2) ## 00000040 -/* 00104 809A7644 A4C80044 */ sh $t0, 0x0044($a2) ## 00000044 -/* 00108 809A7648 A4D90042 */ sh $t9, 0x0042($a2) ## 00000042 -/* 0010C 809A764C 90E9000D */ lbu $t1, 0x000D($a3) ## 0000000D -/* 00110 809A7650 51200015 */ beql $t1, $zero, .L809A76A8 -/* 00114 809A7654 90E2000C */ lbu $v0, 0x000C($a3) ## 0000000C -/* 00118 809A7658 90EA0010 */ lbu $t2, 0x0010($a3) ## 00000010 -/* 0011C 809A765C A4CA0046 */ sh $t2, 0x0046($a2) ## 00000046 -/* 00120 809A7660 90EB0011 */ lbu $t3, 0x0011($a3) ## 00000011 -/* 00124 809A7664 A4CB0048 */ sh $t3, 0x0048($a2) ## 00000048 -/* 00128 809A7668 90EC0012 */ lbu $t4, 0x0012($a3) ## 00000012 -/* 0012C 809A766C A4CC004A */ sh $t4, 0x004A($a2) ## 0000004A -/* 00130 809A7670 90ED0013 */ lbu $t5, 0x0013($a3) ## 00000013 -/* 00134 809A7674 A4CD004C */ sh $t5, 0x004C($a2) ## 0000004C -/* 00138 809A7678 90EE0014 */ lbu $t6, 0x0014($a3) ## 00000014 -/* 0013C 809A767C A4CE004E */ sh $t6, 0x004E($a2) ## 0000004E -/* 00140 809A7680 90EF0015 */ lbu $t7, 0x0015($a3) ## 00000015 -/* 00144 809A7684 A4CF0050 */ sh $t7, 0x0050($a2) ## 00000050 -/* 00148 809A7688 90F80016 */ lbu $t8, 0x0016($a3) ## 00000016 -/* 0014C 809A768C A4D80052 */ sh $t8, 0x0052($a2) ## 00000052 -/* 00150 809A7690 90F90017 */ lbu $t9, 0x0017($a3) ## 00000017 -/* 00154 809A7694 A4D90054 */ sh $t9, 0x0054($a2) ## 00000054 -/* 00158 809A7698 90E8000C */ lbu $t0, 0x000C($a3) ## 0000000C -/* 0015C 809A769C 1000002D */ beq $zero, $zero, .L809A7754 -/* 00160 809A76A0 A4C80056 */ sh $t0, 0x0056($a2) ## 00000056 -/* 00164 809A76A4 90E2000C */ lbu $v0, 0x000C($a3) ## 0000000C -.L809A76A8: -/* 00168 809A76A8 240400C8 */ addiu $a0, $zero, 0x00C8 ## $a0 = 000000C8 -/* 0016C 809A76AC 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 00170 809A76B0 50400009 */ beql $v0, $zero, .L809A76D8 -/* 00174 809A76B4 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF -/* 00178 809A76B8 50430012 */ beql $v0, $v1, .L809A7704 -/* 0017C 809A76BC 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF -/* 00180 809A76C0 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 -/* 00184 809A76C4 10430019 */ beq $v0, $v1, .L809A772C -/* 00188 809A76C8 240400C8 */ addiu $a0, $zero, 0x00C8 ## $a0 = 000000C8 -/* 0018C 809A76CC 10000022 */ beq $zero, $zero, .L809A7758 -/* 00190 809A76D0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00194 809A76D4 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF -.L809A76D8: -/* 00198 809A76D8 A4C20046 */ sh $v0, 0x0046($a2) ## 00000046 -/* 0019C 809A76DC A4C20048 */ sh $v0, 0x0048($a2) ## 00000048 -/* 001A0 809A76E0 A4C2004A */ sh $v0, 0x004A($a2) ## 0000004A -/* 001A4 809A76E4 A4C4004C */ sh $a0, 0x004C($a2) ## 0000004C -/* 001A8 809A76E8 A4C2004E */ sh $v0, 0x004E($a2) ## 0000004E -/* 001AC 809A76EC A4C20050 */ sh $v0, 0x0050($a2) ## 00000050 -/* 001B0 809A76F0 A4C20052 */ sh $v0, 0x0052($a2) ## 00000052 -/* 001B4 809A76F4 A4C40054 */ sh $a0, 0x0054($a2) ## 00000054 -/* 001B8 809A76F8 10000016 */ beq $zero, $zero, .L809A7754 -/* 001BC 809A76FC A4C00056 */ sh $zero, 0x0056($a2) ## 00000056 -/* 001C0 809A7700 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF -.L809A7704: -/* 001C4 809A7704 A4C20046 */ sh $v0, 0x0046($a2) ## 00000046 -/* 001C8 809A7708 A4C20048 */ sh $v0, 0x0048($a2) ## 00000048 -/* 001CC 809A770C A4C2004A */ sh $v0, 0x004A($a2) ## 0000004A -/* 001D0 809A7710 A4C2004C */ sh $v0, 0x004C($a2) ## 0000004C -/* 001D4 809A7714 A4C2004E */ sh $v0, 0x004E($a2) ## 0000004E -/* 001D8 809A7718 A4C20050 */ sh $v0, 0x0050($a2) ## 00000050 -/* 001DC 809A771C A4C20052 */ sh $v0, 0x0052($a2) ## 00000052 -/* 001E0 809A7720 A4C20054 */ sh $v0, 0x0054($a2) ## 00000054 -/* 001E4 809A7724 1000000B */ beq $zero, $zero, .L809A7754 -/* 001E8 809A7728 A4C30056 */ sh $v1, 0x0056($a2) ## 00000056 -.L809A772C: -/* 001EC 809A772C 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF -/* 001F0 809A7730 A4C20046 */ sh $v0, 0x0046($a2) ## 00000046 -/* 001F4 809A7734 A4C20048 */ sh $v0, 0x0048($a2) ## 00000048 -/* 001F8 809A7738 A4C2004A */ sh $v0, 0x004A($a2) ## 0000004A -/* 001FC 809A773C A4C4004C */ sh $a0, 0x004C($a2) ## 0000004C -/* 00200 809A7740 A4C2004E */ sh $v0, 0x004E($a2) ## 0000004E -/* 00204 809A7744 A4C20050 */ sh $v0, 0x0050($a2) ## 00000050 -/* 00208 809A7748 A4C20052 */ sh $v0, 0x0052($a2) ## 00000052 -/* 0020C 809A774C A4C40054 */ sh $a0, 0x0054($a2) ## 00000054 -/* 00210 809A7750 A4C30056 */ sh $v1, 0x0056($a2) ## 00000056 -.L809A7754: -/* 00214 809A7754 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L809A7758: -/* 00218 809A7758 03E00008 */ jr $ra -/* 0021C 809A775C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Splash/func_809A7760.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Splash/func_809A7760.s deleted file mode 100644 index ac4b1e2208..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Splash/func_809A7760.s +++ /dev/null @@ -1,73 +0,0 @@ -glabel func_809A7760 -/* 00220 809A7760 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00224 809A7764 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00228 809A7768 AFA5001C */ sw $a1, 0x001C($sp) -/* 0022C 809A776C 84C20056 */ lh $v0, 0x0056($a2) ## 00000056 -/* 00230 809A7770 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 00234 809A7774 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00238 809A7778 10400008 */ beq $v0, $zero, .L809A779C -/* 0023C 809A777C 3C06809A */ lui $a2, %hi(D_809A7954) ## $a2 = 809A0000 -/* 00240 809A7780 10410016 */ beq $v0, $at, .L809A77DC -/* 00244 809A7784 3C06809A */ lui $a2, %hi(D_809A7954) ## $a2 = 809A0000 -/* 00248 809A7788 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0024C 809A778C 10410023 */ beq $v0, $at, .L809A781C -/* 00250 809A7790 3C06809A */ lui $a2, %hi(D_809A7954) ## $a2 = 809A0000 -/* 00254 809A7794 10000030 */ beq $zero, $zero, .L809A7858 -/* 00258 809A7798 8FBF0014 */ lw $ra, 0x0014($sp) -.L809A779C: -/* 0025C 809A779C 84A20040 */ lh $v0, 0x0040($a1) ## 00000040 -/* 00260 809A77A0 24010064 */ addiu $at, $zero, 0x0064 ## $at = 00000064 -/* 00264 809A77A4 0041001A */ div $zero, $v0, $at -/* 00268 809A77A8 00001012 */ mflo $v0 -/* 0026C 809A77AC 00021400 */ sll $v0, $v0, 16 -/* 00270 809A77B0 00021403 */ sra $v0, $v0, 16 -/* 00274 809A77B4 28410008 */ slti $at, $v0, 0x0008 -/* 00278 809A77B8 54200003 */ bnel $at, $zero, .L809A77C8 -/* 0027C 809A77BC 00027080 */ sll $t6, $v0, 2 -/* 00280 809A77C0 24020007 */ addiu $v0, $zero, 0x0007 ## $v0 = 00000007 -/* 00284 809A77C4 00027080 */ sll $t6, $v0, 2 -.L809A77C8: -/* 00288 809A77C8 00CE3021 */ addu $a2, $a2, $t6 -/* 0028C 809A77CC 0C009FE0 */ jal func_80027F80 -/* 00290 809A77D0 8CC67954 */ lw $a2, %lo(D_809A7954)($a2) -/* 00294 809A77D4 10000020 */ beq $zero, $zero, .L809A7858 -/* 00298 809A77D8 8FBF0014 */ lw $ra, 0x0014($sp) -.L809A77DC: -/* 0029C 809A77DC 84A20040 */ lh $v0, 0x0040($a1) ## 00000040 -/* 002A0 809A77E0 24010064 */ addiu $at, $zero, 0x0064 ## $at = 00000064 -/* 002A4 809A77E4 0041001A */ div $zero, $v0, $at -/* 002A8 809A77E8 00001012 */ mflo $v0 -/* 002AC 809A77EC 00021400 */ sll $v0, $v0, 16 -/* 002B0 809A77F0 00021403 */ sra $v0, $v0, 16 -/* 002B4 809A77F4 28410008 */ slti $at, $v0, 0x0008 -/* 002B8 809A77F8 54200003 */ bnel $at, $zero, .L809A7808 -/* 002BC 809A77FC 00027880 */ sll $t7, $v0, 2 -/* 002C0 809A7800 24020007 */ addiu $v0, $zero, 0x0007 ## $v0 = 00000007 -/* 002C4 809A7804 00027880 */ sll $t7, $v0, 2 -.L809A7808: -/* 002C8 809A7808 00CF3021 */ addu $a2, $a2, $t7 -/* 002CC 809A780C 0C009FE0 */ jal func_80027F80 -/* 002D0 809A7810 8CC67954 */ lw $a2, %lo(D_809A7954)($a2) -/* 002D4 809A7814 10000010 */ beq $zero, $zero, .L809A7858 -/* 002D8 809A7818 8FBF0014 */ lw $ra, 0x0014($sp) -.L809A781C: -/* 002DC 809A781C 84A20040 */ lh $v0, 0x0040($a1) ## 00000040 -/* 002E0 809A7820 24010064 */ addiu $at, $zero, 0x0064 ## $at = 00000064 -/* 002E4 809A7824 0041001A */ div $zero, $v0, $at -/* 002E8 809A7828 00001012 */ mflo $v0 -/* 002EC 809A782C 00021400 */ sll $v0, $v0, 16 -/* 002F0 809A7830 00021403 */ sra $v0, $v0, 16 -/* 002F4 809A7834 28410008 */ slti $at, $v0, 0x0008 -/* 002F8 809A7838 54200003 */ bnel $at, $zero, .L809A7848 -/* 002FC 809A783C 0002C080 */ sll $t8, $v0, 2 -/* 00300 809A7840 24020007 */ addiu $v0, $zero, 0x0007 ## $v0 = 00000007 -/* 00304 809A7844 0002C080 */ sll $t8, $v0, 2 -.L809A7848: -/* 00308 809A7848 00D83021 */ addu $a2, $a2, $t8 -/* 0030C 809A784C 0C009FE0 */ jal func_80027F80 -/* 00310 809A7850 8CC67954 */ lw $a2, %lo(D_809A7954)($a2) -/* 00314 809A7854 8FBF0014 */ lw $ra, 0x0014($sp) -.L809A7858: -/* 00318 809A7858 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0031C 809A785C 03E00008 */ jr $ra -/* 00320 809A7860 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Splash/func_809A7864.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Splash/func_809A7864.s deleted file mode 100644 index c2ce8cd8b7..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Splash/func_809A7864.s +++ /dev/null @@ -1,63 +0,0 @@ -.late_rodata -glabel D_809A7980 - .float 0.002 - -.text -glabel func_809A7864 -/* 00324 809A7864 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00328 809A7868 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0032C 809A786C AFB00020 */ sw $s0, 0x0020($sp) -/* 00330 809A7870 AFA5003C */ sw $a1, 0x003C($sp) -/* 00334 809A7874 84CE0056 */ lh $t6, 0x0056($a2) ## 00000056 -/* 00338 809A7878 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0033C 809A787C 00C08025 */ or $s0, $a2, $zero ## $s0 = 00000000 -/* 00340 809A7880 55C10024 */ bnel $t6, $at, .L809A7914 -/* 00344 809A7884 860D0040 */ lh $t5, 0x0040($s0) ## 00000040 -/* 00348 809A7888 84CF005C */ lh $t7, 0x005C($a2) ## 0000005C -/* 0034C 809A788C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00350 809A7890 55E10020 */ bnel $t7, $at, .L809A7914 -/* 00354 809A7894 860D0040 */ lh $t5, 0x0040($s0) ## 00000040 -/* 00358 809A7898 8CD90000 */ lw $t9, 0x0000($a2) ## 00000000 -/* 0035C 809A789C 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFF4 -/* 00360 809A78A0 3C01809A */ lui $at, %hi(D_809A7980) ## $at = 809A0000 -/* 00364 809A78A4 ACB90000 */ sw $t9, 0x0000($a1) ## FFFFFFF4 -/* 00368 809A78A8 8CD80004 */ lw $t8, 0x0004($a2) ## 00000004 -/* 0036C 809A78AC 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 -/* 00370 809A78B0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00374 809A78B4 ACB80004 */ sw $t8, 0x0004($a1) ## FFFFFFF8 -/* 00378 809A78B8 8CD90008 */ lw $t9, 0x0008($a2) ## 00000008 -/* 0037C 809A78BC ACB90008 */ sw $t9, 0x0008($a1) ## FFFFFFFC -/* 00380 809A78C0 84C80042 */ lh $t0, 0x0042($a2) ## 00000042 -/* 00384 809A78C4 C4287980 */ lwc1 $f8, %lo(D_809A7980)($at) -/* 00388 809A78C8 C7B00030 */ lwc1 $f16, 0x0030($sp) -/* 0038C 809A78CC 00084880 */ sll $t1, $t0, 2 -/* 00390 809A78D0 01284821 */ addu $t1, $t1, $t0 -/* 00394 809A78D4 00094880 */ sll $t1, $t1, 2 -/* 00398 809A78D8 44892000 */ mtc1 $t1, $f4 ## $f4 = 0.00 -/* 0039C 809A78DC AFAA0010 */ sw $t2, 0x0010($sp) -/* 003A0 809A78E0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 003A4 809A78E4 468021A0 */ cvt.s.w $f6, $f4 -/* 003A8 809A78E8 46083282 */ mul.s $f10, $f6, $f8 -/* 003AC 809A78EC 460A8480 */ add.s $f18, $f16, $f10 -/* 003B0 809A78F0 E7B20030 */ swc1 $f18, 0x0030($sp) -/* 003B4 809A78F4 860B0042 */ lh $t3, 0x0042($s0) ## 00000042 -/* 003B8 809A78F8 05610003 */ bgez $t3, .L809A7908 -/* 003BC 809A78FC 000B6043 */ sra $t4, $t3, 1 -/* 003C0 809A7900 25610001 */ addiu $at, $t3, 0x0001 ## $at = 00000001 -/* 003C4 809A7904 00016043 */ sra $t4, $at, 1 -.L809A7908: -/* 003C8 809A7908 0C00A527 */ jal func_8002949C -/* 003CC 809A790C AFAC0014 */ sw $t4, 0x0014($sp) -/* 003D0 809A7910 860D0040 */ lh $t5, 0x0040($s0) ## 00000040 -.L809A7914: -/* 003D4 809A7914 860E0044 */ lh $t6, 0x0044($s0) ## 00000044 -/* 003D8 809A7918 01AE7821 */ addu $t7, $t5, $t6 -/* 003DC 809A791C A60F0040 */ sh $t7, 0x0040($s0) ## 00000040 -/* 003E0 809A7920 8FBF0024 */ lw $ra, 0x0024($sp) -/* 003E4 809A7924 8FB00020 */ lw $s0, 0x0020($sp) -/* 003E8 809A7928 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 003EC 809A792C 03E00008 */ jr $ra -/* 003F0 809A7930 00000000 */ nop -/* 003F4 809A7934 00000000 */ nop -/* 003F8 809A7938 00000000 */ nop -/* 003FC 809A793C 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/EffectSsHahen_Init.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/EffectSsHahen_Init.s deleted file mode 100644 index 00e8a92bb6..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/EffectSsHahen_Init.s +++ /dev/null @@ -1,110 +0,0 @@ -glabel EffectSsHahen_Init -/* 00070 809A7A60 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00074 809A7A64 AFBF001C */ sw $ra, 0x001C($sp) -/* 00078 809A7A68 AFB10018 */ sw $s1, 0x0018($sp) -/* 0007C 809A7A6C AFB00014 */ sw $s0, 0x0014($sp) -/* 00080 809A7A70 AFA40020 */ sw $a0, 0x0020($sp) -/* 00084 809A7A74 AFA50024 */ sw $a1, 0x0024($sp) -/* 00088 809A7A78 8CEF0000 */ lw $t7, 0x0000($a3) ## 00000000 -/* 0008C 809A7A7C 240A00C8 */ addiu $t2, $zero, 0x00C8 ## $t2 = 000000C8 -/* 00090 809A7A80 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00094 809A7A84 ACCF0000 */ sw $t7, 0x0000($a2) ## 00000000 -/* 00098 809A7A88 8CEE0004 */ lw $t6, 0x0004($a3) ## 00000004 -/* 0009C 809A7A8C 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 000A0 809A7A90 00C08025 */ or $s0, $a2, $zero ## $s0 = 00000000 -/* 000A4 809A7A94 ACCE0004 */ sw $t6, 0x0004($a2) ## 00000004 -/* 000A8 809A7A98 8CEF0008 */ lw $t7, 0x0008($a3) ## 00000008 -/* 000AC 809A7A9C 00E08825 */ or $s1, $a3, $zero ## $s1 = 00000000 -/* 000B0 809A7AA0 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 000B4 809A7AA4 ACCF0008 */ sw $t7, 0x0008($a2) ## 00000008 -/* 000B8 809A7AA8 8CF9000C */ lw $t9, 0x000C($a3) ## 0000000C -/* 000BC 809A7AAC 3C0F8016 */ lui $t7, %hi(gSegments) -/* 000C0 809A7AB0 ACD9000C */ sw $t9, 0x000C($a2) ## 0000000C -/* 000C4 809A7AB4 8CF80010 */ lw $t8, 0x0010($a3) ## 00000010 -/* 000C8 809A7AB8 ACD80010 */ sw $t8, 0x0010($a2) ## 00000010 -/* 000CC 809A7ABC 8CF90014 */ lw $t9, 0x0014($a3) ## 00000014 -/* 000D0 809A7AC0 ACD90014 */ sw $t9, 0x0014($a2) ## 00000014 -/* 000D4 809A7AC4 8CE90018 */ lw $t1, 0x0018($a3) ## 00000018 -/* 000D8 809A7AC8 ACC90018 */ sw $t1, 0x0018($a2) ## 00000018 -/* 000DC 809A7ACC 8CE8001C */ lw $t0, 0x001C($a3) ## 0000001C -/* 000E0 809A7AD0 ACC8001C */ sw $t0, 0x001C($a2) ## 0000001C -/* 000E4 809A7AD4 8CE90020 */ lw $t1, 0x0020($a3) ## 00000020 -/* 000E8 809A7AD8 A4CA005C */ sh $t2, 0x005C($a2) ## 0000005C -/* 000EC 809A7ADC ACC90020 */ sw $t1, 0x0020($a2) ## 00000020 -/* 000F0 809A7AE0 8CE20024 */ lw $v0, 0x0024($a3) ## 00000024 -/* 000F4 809A7AE4 2409FFFF */ addiu $t1, $zero, 0xFFFF ## $t1 = FFFFFFFF -/* 000F8 809A7AE8 10400008 */ beq $v0, $zero, .L809A7B0C -/* 000FC 809A7AEC 00000000 */ nop -/* 00100 809A7AF0 ACC20038 */ sw $v0, 0x0038($a2) ## 00000038 -/* 00104 809A7AF4 84EB002C */ lh $t3, 0x002C($a3) ## 0000002C -/* 00108 809A7AF8 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 0010C 809A7AFC 0C269E7C */ jal func_809A79F0 -/* 00110 809A7B00 A4CB0048 */ sh $t3, 0x0048($a2) ## 00000048 -/* 00114 809A7B04 1000000F */ beq $zero, $zero, .L809A7B44 -/* 00118 809A7B08 860A0048 */ lh $t2, 0x0048($s0) ## 00000048 -.L809A7B0C: -/* 0011C 809A7B0C 3C020401 */ lui $v0, 0x0401 ## $v0 = 04010000 -/* 00120 809A7B10 2442C0D0 */ addiu $v0, $v0, 0xC0D0 ## $v0 = 0400C0D0 -/* 00124 809A7B14 00026100 */ sll $t4, $v0, 4 -/* 00128 809A7B18 000C6F02 */ srl $t5, $t4, 28 -/* 0012C 809A7B1C 000D7080 */ sll $t6, $t5, 2 -/* 00130 809A7B20 01EE7821 */ addu $t7, $t7, $t6 -/* 00134 809A7B24 8DEF6FA8 */ lw $t7, %lo(gSegments)($t7) -/* 00138 809A7B28 0041C024 */ and $t8, $v0, $at -/* 0013C 809A7B2C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00140 809A7B30 01F8C821 */ addu $t9, $t7, $t8 -/* 00144 809A7B34 03214021 */ addu $t0, $t9, $at -/* 00148 809A7B38 AE080038 */ sw $t0, 0x0038($s0) ## 00000038 -/* 0014C 809A7B3C A6090048 */ sh $t1, 0x0048($s0) ## 00000048 -/* 00150 809A7B40 860A0048 */ lh $t2, 0x0048($s0) ## 00000048 -.L809A7B44: -/* 00154 809A7B44 24010069 */ addiu $at, $zero, 0x0069 ## $at = 00000069 -/* 00158 809A7B48 3C0F809A */ lui $t7, %hi(func_809A7F84) ## $t7 = 809A0000 -/* 0015C 809A7B4C 15410009 */ bne $t2, $at, .L809A7B74 -/* 00160 809A7B50 25EF7F84 */ addiu $t7, $t7, %lo(func_809A7F84) ## $t7 = 809A7F84 -/* 00164 809A7B54 8E0C0038 */ lw $t4, 0x0038($s0) ## 00000038 -/* 00168 809A7B58 3C0B0401 */ lui $t3, 0x0401 ## $t3 = 04010000 -/* 0016C 809A7B5C 256BCD80 */ addiu $t3, $t3, 0xCD80 ## $t3 = 0400CD80 -/* 00170 809A7B60 156C0004 */ bne $t3, $t4, .L809A7B74 -/* 00174 809A7B64 3C0D809A */ lui $t5, %hi(func_809A7D9C) ## $t5 = 809A0000 -/* 00178 809A7B68 25AD7D9C */ addiu $t5, $t5, %lo(func_809A7D9C) ## $t5 = 809A7D9C -/* 0017C 809A7B6C 10000004 */ beq $zero, $zero, .L809A7B80 -/* 00180 809A7B70 AE0D0028 */ sw $t5, 0x0028($s0) ## 00000028 -.L809A7B74: -/* 00184 809A7B74 3C0E809A */ lui $t6, %hi(func_809A7BFC) ## $t6 = 809A0000 -/* 00188 809A7B78 25CE7BFC */ addiu $t6, $t6, %lo(func_809A7BFC) ## $t6 = 809A7BFC -/* 0018C 809A7B7C AE0E0028 */ sw $t6, 0x0028($s0) ## 00000028 -.L809A7B80: -/* 00190 809A7B80 AE0F0024 */ sw $t7, 0x0024($s0) ## 00000024 -/* 00194 809A7B84 86380028 */ lh $t8, 0x0028($s1) ## 00000028 -/* 00198 809A7B88 A6180044 */ sh $t8, 0x0044($s0) ## 00000044 -/* 0019C 809A7B8C 8639002A */ lh $t9, 0x002A($s1) ## 0000002A -/* 001A0 809A7B90 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 001A4 809A7B94 A6190046 */ sh $t9, 0x0046($s0) ## 00000046 -/* 001A8 809A7B98 3C01439D */ lui $at, 0x439D ## $at = 439D0000 -/* 001AC 809A7B9C 44812000 */ mtc1 $at, $f4 ## $f4 = 314.00 -/* 001B0 809A7BA0 00000000 */ nop -/* 001B4 809A7BA4 46040182 */ mul.s $f6, $f0, $f4 -/* 001B8 809A7BA8 4600320D */ trunc.w.s $f8, $f6 -/* 001BC 809A7BAC 44094000 */ mfc1 $t1, $f8 -/* 001C0 809A7BB0 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 001C4 809A7BB4 A6090040 */ sh $t1, 0x0040($s0) ## 00000040 -/* 001C8 809A7BB8 3C01439D */ lui $at, 0x439D ## $at = 439D0000 -/* 001CC 809A7BBC 44815000 */ mtc1 $at, $f10 ## $f10 = 314.00 -/* 001D0 809A7BC0 240D00C8 */ addiu $t5, $zero, 0x00C8 ## $t5 = 000000C8 -/* 001D4 809A7BC4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 001D8 809A7BC8 460A0402 */ mul.s $f16, $f0, $f10 -/* 001DC 809A7BCC 4600848D */ trunc.w.s $f18, $f16 -/* 001E0 809A7BD0 440B9000 */ mfc1 $t3, $f18 -/* 001E4 809A7BD4 00000000 */ nop -/* 001E8 809A7BD8 A60B0042 */ sh $t3, 0x0042($s0) ## 00000042 -/* 001EC 809A7BDC 862C002E */ lh $t4, 0x002E($s1) ## 0000002E -/* 001F0 809A7BE0 01AC7023 */ subu $t6, $t5, $t4 -/* 001F4 809A7BE4 A60E004C */ sh $t6, 0x004C($s0) ## 0000004C -/* 001F8 809A7BE8 8FBF001C */ lw $ra, 0x001C($sp) -/* 001FC 809A7BEC 8FB10018 */ lw $s1, 0x0018($sp) -/* 00200 809A7BF0 8FB00014 */ lw $s0, 0x0014($sp) -/* 00204 809A7BF4 03E00008 */ jr $ra -/* 00208 809A7BF8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A79F0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A79F0.s deleted file mode 100644 index d967dc5b1c..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A79F0.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_809A79F0 -/* 00000 809A79F0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00004 809A79F4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00008 809A79F8 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 0000C 809A79FC 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 00010 809A7A00 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00014 809A7A04 00A12021 */ addu $a0, $a1, $at -/* 00018 809A7A08 84C50048 */ lh $a1, 0x0048($a2) ## 00000048 -/* 0001C 809A7A0C AFA60020 */ sw $a2, 0x0020($sp) -/* 00020 809A7A10 0C02604B */ jal Object_GetIndex - ## ObjectIndex -/* 00024 809A7A14 AFA40018 */ sw $a0, 0x0018($sp) -/* 00028 809A7A18 8FA60020 */ lw $a2, 0x0020($sp) -/* 0002C 809A7A1C 00027400 */ sll $t6, $v0, 16 -/* 00030 809A7A20 000E7C03 */ sra $t7, $t6, 16 -/* 00034 809A7A24 8FA40018 */ lw $a0, 0x0018($sp) -/* 00038 809A7A28 05E00006 */ bltz $t7, .L809A7A44 -/* 0003C 809A7A2C A4C2004A */ sh $v0, 0x004A($a2) ## 0000004A -/* 00040 809A7A30 84C5004A */ lh $a1, 0x004A($a2) ## 0000004A -/* 00044 809A7A34 0C026062 */ jal Object_IsLoaded - -/* 00048 809A7A38 AFA60020 */ sw $a2, 0x0020($sp) -/* 0004C 809A7A3C 14400004 */ bne $v0, $zero, .L809A7A50 -/* 00050 809A7A40 8FA60020 */ lw $a2, 0x0020($sp) -.L809A7A44: -/* 00054 809A7A44 2418FFFF */ addiu $t8, $zero, 0xFFFF ## $t8 = FFFFFFFF -/* 00058 809A7A48 A4D8005C */ sh $t8, 0x005C($a2) ## 0000005C -/* 0005C 809A7A4C ACC00028 */ sw $zero, 0x0028($a2) ## 00000028 -.L809A7A50: -/* 00060 809A7A50 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00064 809A7A54 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00068 809A7A58 03E00008 */ jr $ra -/* 0006C 809A7A5C 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7BFC.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7BFC.s deleted file mode 100644 index 7f27dff838..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7BFC.s +++ /dev/null @@ -1,130 +0,0 @@ -.rdata -glabel D_809A8020 - .asciz "../z_eff_hahen.c" - .balign 4 - -glabel D_809A8034 - .asciz "../z_eff_hahen.c" - .balign 4 - -glabel D_809A8048 - .asciz "../z_eff_hahen.c" - .balign 4 - -.late_rodata -glabel D_809A8098 - .float 0.001 - -glabel D_809A809C - .float 0.01 - -glabel D_809A80A0 - .float 0.01 - -.text -glabel func_809A7BFC -/* 0020C 809A7BFC 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00210 809A7C00 AFBF001C */ sw $ra, 0x001C($sp) -/* 00214 809A7C04 AFB10018 */ sw $s1, 0x0018($sp) -/* 00218 809A7C08 AFB00014 */ sw $s0, 0x0014($sp) -/* 0021C 809A7C0C AFA40050 */ sw $a0, 0x0050($sp) -/* 00220 809A7C10 AFA50054 */ sw $a1, 0x0054($sp) -/* 00224 809A7C14 84CF0046 */ lh $t7, 0x0046($a2) ## 00000046 -/* 00228 809A7C18 3C01809B */ lui $at, %hi(D_809A8098) ## $at = 809B0000 -/* 0022C 809A7C1C C4288098 */ lwc1 $f8, %lo(D_809A8098)($at) -/* 00230 809A7C20 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 00234 809A7C24 8C900000 */ lw $s0, 0x0000($a0) ## 00000000 -/* 00238 809A7C28 00C08825 */ or $s1, $a2, $zero ## $s1 = 00000000 -/* 0023C 809A7C2C 468021A0 */ cvt.s.w $f6, $f4 -/* 00240 809A7C30 3C06809B */ lui $a2, %hi(D_809A8020) ## $a2 = 809B0000 -/* 00244 809A7C34 24C68020 */ addiu $a2, $a2, %lo(D_809A8020) ## $a2 = 809A8020 -/* 00248 809A7C38 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE0 -/* 0024C 809A7C3C 240700D0 */ addiu $a3, $zero, 0x00D0 ## $a3 = 000000D0 -/* 00250 809A7C40 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00254 809A7C44 46083282 */ mul.s $f10, $f6, $f8 -/* 00258 809A7C48 0C031AB1 */ jal Graph_OpenDisps -/* 0025C 809A7C4C E7AA0044 */ swc1 $f10, 0x0044($sp) -/* 00260 809A7C50 86380048 */ lh $t8, 0x0048($s1) ## 00000048 -/* 00264 809A7C54 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 00268 809A7C58 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0026C 809A7C5C 53010012 */ beql $t8, $at, .L809A7CA8 -/* 00270 809A7C60 C62C0000 */ lwc1 $f12, 0x0000($s1) ## 00000000 -/* 00274 809A7C64 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 00278 809A7C68 3C08DB06 */ lui $t0, 0xDB06 ## $t0 = DB060000 -/* 0027C 809A7C6C 35080018 */ ori $t0, $t0, 0x0018 ## $t0 = DB060018 -/* 00280 809A7C70 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 00284 809A7C74 AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 -/* 00288 809A7C78 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 -/* 0028C 809A7C7C 862A004A */ lh $t2, 0x004A($s1) ## 0000004A -/* 00290 809A7C80 8FA90050 */ lw $t1, 0x0050($sp) -/* 00294 809A7C84 3C0D0001 */ lui $t5, 0x0001 ## $t5 = 00010000 -/* 00298 809A7C88 000A5900 */ sll $t3, $t2, 4 -/* 0029C 809A7C8C 016A5821 */ addu $t3, $t3, $t2 -/* 002A0 809A7C90 000B5880 */ sll $t3, $t3, 2 -/* 002A4 809A7C94 012B6021 */ addu $t4, $t1, $t3 -/* 002A8 809A7C98 01AC6821 */ addu $t5, $t5, $t4 -/* 002AC 809A7C9C 8DAD17B4 */ lw $t5, 0x17B4($t5) ## 000117B4 -/* 002B0 809A7CA0 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 002B4 809A7CA4 C62C0000 */ lwc1 $f12, 0x0000($s1) ## 00000000 -.L809A7CA8: -/* 002B8 809A7CA8 C62E0004 */ lwc1 $f14, 0x0004($s1) ## 00000004 -/* 002BC 809A7CAC 0C034261 */ jal Matrix_Translate -/* 002C0 809A7CB0 8E260008 */ lw $a2, 0x0008($s1) ## 00000008 -/* 002C4 809A7CB4 862E0042 */ lh $t6, 0x0042($s1) ## 00000042 -/* 002C8 809A7CB8 3C01809B */ lui $at, %hi(D_809A809C) ## $at = 809B0000 -/* 002CC 809A7CBC C424809C */ lwc1 $f4, %lo(D_809A809C)($at) -/* 002D0 809A7CC0 448E8000 */ mtc1 $t6, $f16 ## $f16 = 0.00 -/* 002D4 809A7CC4 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 002D8 809A7CC8 468084A0 */ cvt.s.w $f18, $f16 -/* 002DC 809A7CCC 46049302 */ mul.s $f12, $f18, $f4 -/* 002E0 809A7CD0 0C034348 */ jal Matrix_RotateY -/* 002E4 809A7CD4 00000000 */ nop -/* 002E8 809A7CD8 862F0040 */ lh $t7, 0x0040($s1) ## 00000040 -/* 002EC 809A7CDC 3C01809B */ lui $at, %hi(D_809A80A0) ## $at = 809B0000 -/* 002F0 809A7CE0 C42A80A0 */ lwc1 $f10, %lo(D_809A80A0)($at) -/* 002F4 809A7CE4 448F3000 */ mtc1 $t7, $f6 ## $f6 = 0.00 -/* 002F8 809A7CE8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 002FC 809A7CEC 46803220 */ cvt.s.w $f8, $f6 -/* 00300 809A7CF0 460A4302 */ mul.s $f12, $f8, $f10 -/* 00304 809A7CF4 0C0342DC */ jal Matrix_RotateX -/* 00308 809A7CF8 00000000 */ nop -/* 0030C 809A7CFC C7AC0044 */ lwc1 $f12, 0x0044($sp) -/* 00310 809A7D00 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00314 809A7D04 44066000 */ mfc1 $a2, $f12 -/* 00318 809A7D08 0C0342A3 */ jal Matrix_Scale -/* 0031C 809A7D0C 46006386 */ mov.s $f14, $f12 -/* 00320 809A7D10 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 00324 809A7D14 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 -/* 00328 809A7D18 37390003 */ ori $t9, $t9, 0x0003 ## $t9 = DA380003 -/* 0032C 809A7D1C 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 00330 809A7D20 AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 -/* 00334 809A7D24 3C05809B */ lui $a1, %hi(D_809A8034) ## $a1 = 809B0000 -/* 00338 809A7D28 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 0033C 809A7D2C 24A58034 */ addiu $a1, $a1, %lo(D_809A8034) ## $a1 = 809A8034 -/* 00340 809A7D30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00344 809A7D34 240600E4 */ addiu $a2, $zero, 0x00E4 ## $a2 = 000000E4 -/* 00348 809A7D38 0C0346A2 */ jal Matrix_NewMtx -/* 0034C 809A7D3C AFA20028 */ sw $v0, 0x0028($sp) -/* 00350 809A7D40 8FA30028 */ lw $v1, 0x0028($sp) -/* 00354 809A7D44 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00358 809A7D48 8FA80050 */ lw $t0, 0x0050($sp) -/* 0035C 809A7D4C 0C024F46 */ jal func_80093D18 -/* 00360 809A7D50 8D040000 */ lw $a0, 0x0000($t0) ## 00000000 -/* 00364 809A7D54 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 00368 809A7D58 3C09DE00 */ lui $t1, 0xDE00 ## $t1 = DE000000 -/* 0036C 809A7D5C 3C06809B */ lui $a2, %hi(D_809A8048) ## $a2 = 809B0000 -/* 00370 809A7D60 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 00374 809A7D64 AE0A02C0 */ sw $t2, 0x02C0($s0) ## 000002C0 -/* 00378 809A7D68 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 0037C 809A7D6C 8E2B0038 */ lw $t3, 0x0038($s1) ## 00000038 -/* 00380 809A7D70 24C68048 */ addiu $a2, $a2, %lo(D_809A8048) ## $a2 = 809A8048 -/* 00384 809A7D74 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE0 -/* 00388 809A7D78 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0038C 809A7D7C 240700EC */ addiu $a3, $zero, 0x00EC ## $a3 = 000000EC -/* 00390 809A7D80 0C031AD5 */ jal Graph_CloseDisps -/* 00394 809A7D84 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 00398 809A7D88 8FBF001C */ lw $ra, 0x001C($sp) -/* 0039C 809A7D8C 8FB00014 */ lw $s0, 0x0014($sp) -/* 003A0 809A7D90 8FB10018 */ lw $s1, 0x0018($sp) -/* 003A4 809A7D94 03E00008 */ jr $ra -/* 003A8 809A7D98 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7D9C.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7D9C.s deleted file mode 100644 index 765a279256..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7D9C.s +++ /dev/null @@ -1,148 +0,0 @@ -.rdata -glabel D_809A805C - .asciz "../z_eff_hahen.c" - .balign 4 - -glabel D_809A8070 - .asciz "../z_eff_hahen.c" - .balign 4 - -glabel D_809A8084 - .asciz "../z_eff_hahen.c" - .balign 4 - -.late_rodata -glabel D_809A80A4 - .float 0.001 - -glabel D_809A80A8 - .float 0.01 - -glabel D_809A80AC - .float 0.01 - -.text -glabel func_809A7D9C -/* 003AC 809A7D9C 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 003B0 809A7DA0 AFBF001C */ sw $ra, 0x001C($sp) -/* 003B4 809A7DA4 AFB10018 */ sw $s1, 0x0018($sp) -/* 003B8 809A7DA8 AFB00014 */ sw $s0, 0x0014($sp) -/* 003BC 809A7DAC AFA40058 */ sw $a0, 0x0058($sp) -/* 003C0 809A7DB0 AFA5005C */ sw $a1, 0x005C($sp) -/* 003C4 809A7DB4 84CF0046 */ lh $t7, 0x0046($a2) ## 00000046 -/* 003C8 809A7DB8 3C01809B */ lui $at, %hi(D_809A80A4) ## $at = 809B0000 -/* 003CC 809A7DBC C42880A4 */ lwc1 $f8, %lo(D_809A80A4)($at) -/* 003D0 809A7DC0 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 003D4 809A7DC4 8C900000 */ lw $s0, 0x0000($a0) ## 00000000 -/* 003D8 809A7DC8 00C08825 */ or $s1, $a2, $zero ## $s1 = 00000000 -/* 003DC 809A7DCC 468021A0 */ cvt.s.w $f6, $f4 -/* 003E0 809A7DD0 3C06809B */ lui $a2, %hi(D_809A805C) ## $a2 = 809B0000 -/* 003E4 809A7DD4 24C6805C */ addiu $a2, $a2, %lo(D_809A805C) ## $a2 = 809A805C -/* 003E8 809A7DD8 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE0 -/* 003EC 809A7DDC 240700FD */ addiu $a3, $zero, 0x00FD ## $a3 = 000000FD -/* 003F0 809A7DE0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 003F4 809A7DE4 46083282 */ mul.s $f10, $f6, $f8 -/* 003F8 809A7DE8 0C031AB1 */ jal Graph_OpenDisps -/* 003FC 809A7DEC E7AA004C */ swc1 $f10, 0x004C($sp) -/* 00400 809A7DF0 86380048 */ lh $t8, 0x0048($s1) ## 00000048 -/* 00404 809A7DF4 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 00408 809A7DF8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0040C 809A7DFC 53010012 */ beql $t8, $at, .L809A7E48 -/* 00410 809A7E00 C62C0000 */ lwc1 $f12, 0x0000($s1) ## 00000000 -/* 00414 809A7E04 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 00418 809A7E08 3C08DB06 */ lui $t0, 0xDB06 ## $t0 = DB060000 -/* 0041C 809A7E0C 35080018 */ ori $t0, $t0, 0x0018 ## $t0 = DB060018 -/* 00420 809A7E10 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 00424 809A7E14 AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 -/* 00428 809A7E18 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 -/* 0042C 809A7E1C 862A004A */ lh $t2, 0x004A($s1) ## 0000004A -/* 00430 809A7E20 8FA90058 */ lw $t1, 0x0058($sp) -/* 00434 809A7E24 3C0D0001 */ lui $t5, 0x0001 ## $t5 = 00010000 -/* 00438 809A7E28 000A5900 */ sll $t3, $t2, 4 -/* 0043C 809A7E2C 016A5821 */ addu $t3, $t3, $t2 -/* 00440 809A7E30 000B5880 */ sll $t3, $t3, 2 -/* 00444 809A7E34 012B6021 */ addu $t4, $t1, $t3 -/* 00448 809A7E38 01AC6821 */ addu $t5, $t5, $t4 -/* 0044C 809A7E3C 8DAD17B4 */ lw $t5, 0x17B4($t5) ## 000117B4 -/* 00450 809A7E40 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 00454 809A7E44 C62C0000 */ lwc1 $f12, 0x0000($s1) ## 00000000 -.L809A7E48: -/* 00458 809A7E48 C62E0004 */ lwc1 $f14, 0x0004($s1) ## 00000004 -/* 0045C 809A7E4C 0C034261 */ jal Matrix_Translate -/* 00460 809A7E50 8E260008 */ lw $a2, 0x0008($s1) ## 00000008 -/* 00464 809A7E54 862E0042 */ lh $t6, 0x0042($s1) ## 00000042 -/* 00468 809A7E58 3C01809B */ lui $at, %hi(D_809A80A8) ## $at = 809B0000 -/* 0046C 809A7E5C C42480A8 */ lwc1 $f4, %lo(D_809A80A8)($at) -/* 00470 809A7E60 448E8000 */ mtc1 $t6, $f16 ## $f16 = 0.00 -/* 00474 809A7E64 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00478 809A7E68 468084A0 */ cvt.s.w $f18, $f16 -/* 0047C 809A7E6C 46049302 */ mul.s $f12, $f18, $f4 -/* 00480 809A7E70 0C034348 */ jal Matrix_RotateY -/* 00484 809A7E74 00000000 */ nop -/* 00488 809A7E78 862F0040 */ lh $t7, 0x0040($s1) ## 00000040 -/* 0048C 809A7E7C 3C01809B */ lui $at, %hi(D_809A80AC) ## $at = 809B0000 -/* 00490 809A7E80 C42A80AC */ lwc1 $f10, %lo(D_809A80AC)($at) -/* 00494 809A7E84 448F3000 */ mtc1 $t7, $f6 ## $f6 = 0.00 -/* 00498 809A7E88 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0049C 809A7E8C 46803220 */ cvt.s.w $f8, $f6 -/* 004A0 809A7E90 460A4302 */ mul.s $f12, $f8, $f10 -/* 004A4 809A7E94 0C0342DC */ jal Matrix_RotateX -/* 004A8 809A7E98 00000000 */ nop -/* 004AC 809A7E9C C7AC004C */ lwc1 $f12, 0x004C($sp) -/* 004B0 809A7EA0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 004B4 809A7EA4 44066000 */ mfc1 $a2, $f12 -/* 004B8 809A7EA8 0C0342A3 */ jal Matrix_Scale -/* 004BC 809A7EAC 46006386 */ mov.s $f14, $f12 -/* 004C0 809A7EB0 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 004C4 809A7EB4 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 -/* 004C8 809A7EB8 37390003 */ ori $t9, $t9, 0x0003 ## $t9 = DA380003 -/* 004CC 809A7EBC 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 004D0 809A7EC0 AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 -/* 004D4 809A7EC4 3C05809B */ lui $a1, %hi(D_809A8070) ## $a1 = 809B0000 -/* 004D8 809A7EC8 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 004DC 809A7ECC 24A58070 */ addiu $a1, $a1, %lo(D_809A8070) ## $a1 = 809A8070 -/* 004E0 809A7ED0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 004E4 809A7ED4 2406010F */ addiu $a2, $zero, 0x010F ## $a2 = 0000010F -/* 004E8 809A7ED8 0C0346A2 */ jal Matrix_NewMtx -/* 004EC 809A7EDC AFA20030 */ sw $v0, 0x0030($sp) -/* 004F0 809A7EE0 8FA30030 */ lw $v1, 0x0030($sp) -/* 004F4 809A7EE4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 004F8 809A7EE8 8FA80058 */ lw $t0, 0x0058($sp) -/* 004FC 809A7EEC 0C024F46 */ jal func_80093D18 -/* 00500 809A7EF0 8D040000 */ lw $a0, 0x0000($t0) ## 00000000 -/* 00504 809A7EF4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 00508 809A7EF8 3C09FC41 */ lui $t1, 0xFC41 ## $t1 = FC410000 -/* 0050C 809A7EFC 3C0BFF8F */ lui $t3, 0xFF8F ## $t3 = FF8F0000 -/* 00510 809A7F00 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 00514 809A7F04 AE0A02C0 */ sw $t2, 0x02C0($s0) ## 000002C0 -/* 00518 809A7F08 356BFFFF */ ori $t3, $t3, 0xFFFF ## $t3 = FF8FFFFF -/* 0051C 809A7F0C 3529C683 */ ori $t1, $t1, 0xC683 ## $t1 = FC41C683 -/* 00520 809A7F10 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 00524 809A7F14 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 00528 809A7F18 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 0052C 809A7F1C 3C0DFA00 */ lui $t5, 0xFA00 ## $t5 = FA000000 -/* 00530 809A7F20 3C0E6464 */ lui $t6, 0x6464 ## $t6 = 64640000 -/* 00534 809A7F24 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 00538 809A7F28 AE0C02C0 */ sw $t4, 0x02C0($s0) ## 000002C0 -/* 0053C 809A7F2C 35CE78FF */ ori $t6, $t6, 0x78FF ## $t6 = 646478FF -/* 00540 809A7F30 35AD0001 */ ori $t5, $t5, 0x0001 ## $t5 = FA000001 -/* 00544 809A7F34 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 00548 809A7F38 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 0054C 809A7F3C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 00550 809A7F40 3C18DE00 */ lui $t8, 0xDE00 ## $t8 = DE000000 -/* 00554 809A7F44 3C06809B */ lui $a2, %hi(D_809A8084) ## $a2 = 809B0000 -/* 00558 809A7F48 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 0055C 809A7F4C AE0F02C0 */ sw $t7, 0x02C0($s0) ## 000002C0 -/* 00560 809A7F50 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 00564 809A7F54 8E390038 */ lw $t9, 0x0038($s1) ## 00000038 -/* 00568 809A7F58 24C68084 */ addiu $a2, $a2, %lo(D_809A8084) ## $a2 = 809A8084 -/* 0056C 809A7F5C 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE0 -/* 00570 809A7F60 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00574 809A7F64 24070120 */ addiu $a3, $zero, 0x0120 ## $a3 = 00000120 -/* 00578 809A7F68 0C031AD5 */ jal Graph_CloseDisps -/* 0057C 809A7F6C AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 00580 809A7F70 8FBF001C */ lw $ra, 0x001C($sp) -/* 00584 809A7F74 8FB00014 */ lw $s0, 0x0014($sp) -/* 00588 809A7F78 8FB10018 */ lw $s1, 0x0018($sp) -/* 0058C 809A7F7C 03E00008 */ jr $ra -/* 00590 809A7F80 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7F84.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7F84.s deleted file mode 100644 index 50dcf51a39..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7F84.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_809A7F84 -/* 00594 809A7F84 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00598 809A7F88 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0059C 809A7F8C AFA40018 */ sw $a0, 0x0018($sp) -/* 005A0 809A7F90 AFA5001C */ sw $a1, 0x001C($sp) -/* 005A4 809A7F94 84CE0040 */ lh $t6, 0x0040($a2) ## 00000040 -/* 005A8 809A7F98 84D80042 */ lh $t8, 0x0042($a2) ## 00000042 -/* 005AC 809A7F9C 8C821C44 */ lw $v0, 0x1C44($a0) ## 00001C44 -/* 005B0 809A7FA0 25CF0037 */ addiu $t7, $t6, 0x0037 ## $t7 = 00000037 -/* 005B4 809A7FA4 2719000A */ addiu $t9, $t8, 0x000A ## $t9 = 0000000A -/* 005B8 809A7FA8 A4CF0040 */ sh $t7, 0x0040($a2) ## 00000040 -/* 005BC 809A7FAC A4D90042 */ sh $t9, 0x0042($a2) ## 00000042 -/* 005C0 809A7FB0 C4C60004 */ lwc1 $f6, 0x0004($a2) ## 00000004 -/* 005C4 809A7FB4 C4440080 */ lwc1 $f4, 0x0080($v0) ## 00000080 -/* 005C8 809A7FB8 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 005CC 809A7FBC 4604303E */ c.le.s $f6, $f4 -/* 005D0 809A7FC0 00000000 */ nop -/* 005D4 809A7FC4 45020008 */ bc1fl .L809A7FE8 -/* 005D8 809A7FC8 84CA0048 */ lh $t2, 0x0048($a2) ## 00000048 -/* 005DC 809A7FCC 84C8005C */ lh $t0, 0x005C($a2) ## 0000005C -/* 005E0 809A7FD0 84C9004C */ lh $t1, 0x004C($a2) ## 0000004C -/* 005E4 809A7FD4 0109082A */ slt $at, $t0, $t1 -/* 005E8 809A7FD8 50200003 */ beql $at, $zero, .L809A7FE8 -/* 005EC 809A7FDC 84CA0048 */ lh $t2, 0x0048($a2) ## 00000048 -/* 005F0 809A7FE0 A4C0005C */ sh $zero, 0x005C($a2) ## 0000005C -/* 005F4 809A7FE4 84CA0048 */ lh $t2, 0x0048($a2) ## 00000048 -.L809A7FE8: -/* 005F8 809A7FE8 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 005FC 809A7FEC 51410004 */ beql $t2, $at, .L809A8000 -/* 00600 809A7FF0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00604 809A7FF4 0C269E7C */ jal func_809A79F0 -/* 00608 809A7FF8 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 0060C 809A7FFC 8FBF0014 */ lw $ra, 0x0014($sp) -.L809A8000: -/* 00610 809A8000 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00614 809A8004 03E00008 */ jr $ra -/* 00618 809A8008 00000000 */ nop -/* 0061C 809A800C 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/EffectSsHitMark_Init.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/EffectSsHitMark_Init.s deleted file mode 100644 index 2ac9f95f5e..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/EffectSsHitMark_Init.s +++ /dev/null @@ -1,66 +0,0 @@ -glabel EffectSsHitMark_Init -/* 00000 809A8150 AFA40000 */ sw $a0, 0x0000($sp) -/* 00004 809A8154 AFA50004 */ sw $a1, 0x0004($sp) -/* 00008 809A8158 8CEF0008 */ lw $t7, 0x0008($a3) ## 00000008 -/* 0000C 809A815C 3C020402 */ lui $v0, 0x0402 ## $v0 = 04020000 -/* 00010 809A8160 24421770 */ addiu $v0, $v0, 0x1770 ## $v0 = 04021770 -/* 00014 809A8164 ACCF0000 */ sw $t7, 0x0000($a2) ## 00000000 -/* 00018 809A8168 8CEE000C */ lw $t6, 0x000C($a3) ## 0000000C -/* 0001C 809A816C 0002C100 */ sll $t8, $v0, 4 -/* 00020 809A8170 0018CF02 */ srl $t9, $t8, 28 -/* 00024 809A8174 ACCE0004 */ sw $t6, 0x0004($a2) ## 00000004 -/* 00028 809A8178 8CEF0010 */ lw $t7, 0x0010($a3) ## 00000010 -/* 0002C 809A817C 00194080 */ sll $t0, $t9, 2 -/* 00030 809A8180 3C098016 */ lui $t1, %hi(gSegments) -/* 00034 809A8184 01284821 */ addu $t1, $t1, $t0 -/* 00038 809A8188 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 0003C 809A818C ACCF0008 */ sw $t7, 0x0008($a2) ## 00000008 -/* 00040 809A8190 8D296FA8 */ lw $t1, %lo(gSegments)($t1) -/* 00044 809A8194 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00048 809A8198 00415024 */ and $t2, $v0, $at -/* 0004C 809A819C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00050 809A81A0 012A5821 */ addu $t3, $t1, $t2 -/* 00054 809A81A4 01616021 */ addu $t4, $t3, $at -/* 00058 809A81A8 ACCC0038 */ sw $t4, 0x0038($a2) ## 00000038 -/* 0005C 809A81AC 8CED0000 */ lw $t5, 0x0000($a3) ## 00000000 -/* 00060 809A81B0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00064 809A81B4 3C18809B */ lui $t8, %hi(func_809A824C) ## $t8 = 809B0000 -/* 00068 809A81B8 15A10004 */ bne $t5, $at, .L809A81CC -/* 0006C 809A81BC 2718824C */ addiu $t8, $t8, %lo(func_809A824C) ## $t8 = 809A824C -/* 00070 809A81C0 240E0010 */ addiu $t6, $zero, 0x0010 ## $t6 = 00000010 -/* 00074 809A81C4 10000003 */ beq $zero, $zero, .L809A81D4 -/* 00078 809A81C8 A4CE005C */ sh $t6, 0x005C($a2) ## 0000005C -.L809A81CC: -/* 0007C 809A81CC 240F0008 */ addiu $t7, $zero, 0x0008 ## $t7 = 00000008 -/* 00080 809A81D0 A4CF005C */ sh $t7, 0x005C($a2) ## 0000005C -.L809A81D4: -/* 00084 809A81D4 3C19809B */ lui $t9, %hi(func_809A8484) ## $t9 = 809B0000 -/* 00088 809A81D8 27398484 */ addiu $t9, $t9, %lo(func_809A8484) ## $t9 = 809A8484 -/* 0008C 809A81DC ACD80028 */ sw $t8, 0x0028($a2) ## 00000028 -/* 00090 809A81E0 ACD90024 */ sw $t9, 0x0024($a2) ## 00000024 -/* 00094 809A81E4 8CE20000 */ lw $v0, 0x0000($a3) ## 00000000 -/* 00098 809A81E8 A4C00040 */ sh $zero, 0x0040($a2) ## 00000040 -/* 0009C 809A81EC 8CE80000 */ lw $t0, 0x0000($a3) ## 00000000 -/* 000A0 809A81F0 00021080 */ sll $v0, $v0, 2 -/* 000A4 809A81F4 00024880 */ sll $t1, $v0, 2 -/* 000A8 809A81F8 3C0A809B */ lui $t2, %hi(D_809A85B0) ## $t2 = 809B0000 -/* 000AC 809A81FC 254A85B0 */ addiu $t2, $t2, %lo(D_809A85B0) ## $t2 = 809A85B0 -/* 000B0 809A8200 01224823 */ subu $t1, $t1, $v0 -/* 000B4 809A8204 012A1821 */ addu $v1, $t1, $t2 -/* 000B8 809A8208 A4C80042 */ sh $t0, 0x0042($a2) ## 00000042 -/* 000BC 809A820C 906B0000 */ lbu $t3, 0x0000($v1) ## 00000000 -/* 000C0 809A8210 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 000C4 809A8214 A4CB0044 */ sh $t3, 0x0044($a2) ## 00000044 -/* 000C8 809A8218 906C0001 */ lbu $t4, 0x0001($v1) ## 00000001 -/* 000CC 809A821C A4CC0046 */ sh $t4, 0x0046($a2) ## 00000046 -/* 000D0 809A8220 906D0002 */ lbu $t5, 0x0002($v1) ## 00000002 -/* 000D4 809A8224 A4CD0048 */ sh $t5, 0x0048($a2) ## 00000048 -/* 000D8 809A8228 906E0003 */ lbu $t6, 0x0003($v1) ## 00000003 -/* 000DC 809A822C A4CE004A */ sh $t6, 0x004A($a2) ## 0000004A -/* 000E0 809A8230 906F0004 */ lbu $t7, 0x0004($v1) ## 00000004 -/* 000E4 809A8234 A4CF004C */ sh $t7, 0x004C($a2) ## 0000004C -/* 000E8 809A8238 90780005 */ lbu $t8, 0x0005($v1) ## 00000005 -/* 000EC 809A823C A4D8004E */ sh $t8, 0x004E($a2) ## 0000004E -/* 000F0 809A8240 84F90004 */ lh $t9, 0x0004($a3) ## 00000004 -/* 000F4 809A8244 03E00008 */ jr $ra -/* 000F8 809A8248 A4D90050 */ sh $t9, 0x0050($a2) ## 00000050 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/func_809A824C.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/func_809A824C.s deleted file mode 100644 index e9bdd54004..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/func_809A824C.s +++ /dev/null @@ -1,154 +0,0 @@ -.rdata -glabel D_809A8670 - .asciz "../z_eff_ss_hitmark.c" - .balign 4 - -glabel D_809A8688 - .asciz "../z_eff_ss_hitmark.c" - .balign 4 - -.text -glabel func_809A824C -/* 000FC 809A824C 27BDFEA0 */ addiu $sp, $sp, 0xFEA0 ## $sp = FFFFFEA0 -/* 00100 809A8250 AFB10018 */ sw $s1, 0x0018($sp) -/* 00104 809A8254 AFBF001C */ sw $ra, 0x001C($sp) -/* 00108 809A8258 AFB00014 */ sw $s0, 0x0014($sp) -/* 0010C 809A825C AFA40160 */ sw $a0, 0x0160($sp) -/* 00110 809A8260 AFA50164 */ sw $a1, 0x0164($sp) -/* 00114 809A8264 8C900000 */ lw $s0, 0x0000($a0) ## 00000000 -/* 00118 809A8268 00C08825 */ or $s1, $a2, $zero ## $s1 = 00000000 -/* 0011C 809A826C 3C06809B */ lui $a2, %hi(D_809A8670) ## $a2 = 809B0000 -/* 00120 809A8270 24C68670 */ addiu $a2, $a2, %lo(D_809A8670) ## $a2 = 809A8670 -/* 00124 809A8274 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFEDC -/* 00128 809A8278 24070129 */ addiu $a3, $zero, 0x0129 ## $a3 = 00000129 -/* 0012C 809A827C 0C031AB1 */ jal Graph_OpenDisps -/* 00130 809A8280 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00134 809A8284 27A4011C */ addiu $a0, $sp, 0x011C ## $a0 = FFFFFFBC -/* 00138 809A8288 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 0013C 809A828C 8E260004 */ lw $a2, 0x0004($s1) ## 00000004 -/* 00140 809A8290 0C029E89 */ jal SkinMatrix_SetTranslate -/* 00144 809A8294 8E270008 */ lw $a3, 0x0008($s1) ## 00000008 -/* 00148 809A8298 862F0050 */ lh $t7, 0x0050($s1) ## 00000050 -/* 0014C 809A829C 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 00150 809A82A0 44814000 */ mtc1 $at, $f8 ## $f8 = 100.00 -/* 00154 809A82A4 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 00158 809A82A8 27A400DC */ addiu $a0, $sp, 0x00DC ## $a0 = FFFFFF7C -/* 0015C 809A82AC 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 00160 809A82B0 468021A0 */ cvt.s.w $f6, $f4 -/* 00164 809A82B4 46083003 */ div.s $f0, $f6, $f8 -/* 00168 809A82B8 44050000 */ mfc1 $a1, $f0 -/* 0016C 809A82BC 44060000 */ mfc1 $a2, $f0 -/* 00170 809A82C0 0C029DA9 */ jal SkinMatrix_SetScale -/* 00174 809A82C4 00000000 */ nop -/* 00178 809A82C8 8FA50160 */ lw $a1, 0x0160($sp) -/* 0017C 809A82CC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00180 809A82D0 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 -/* 00184 809A82D4 27A4011C */ addiu $a0, $sp, 0x011C ## $a0 = FFFFFFBC -/* 00188 809A82D8 27A6005C */ addiu $a2, $sp, 0x005C ## $a2 = FFFFFEFC -/* 0018C 809A82DC 0C029BE8 */ jal SkinMatrix_MtxFMtxFMult -/* 00190 809A82E0 00A12821 */ addu $a1, $a1, $at -/* 00194 809A82E4 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFEFC -/* 00198 809A82E8 27A500DC */ addiu $a1, $sp, 0x00DC ## $a1 = FFFFFF7C -/* 0019C 809A82EC 0C029BE8 */ jal SkinMatrix_MtxFMtxFMult -/* 001A0 809A82F0 27A6009C */ addiu $a2, $sp, 0x009C ## $a2 = FFFFFF3C -/* 001A4 809A82F4 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 -/* 001A8 809A82F8 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 -/* 001AC 809A82FC 3C088013 */ lui $t0, %hi(gMtxClear) -/* 001B0 809A8300 24780008 */ addiu $t8, $v1, 0x0008 ## $t8 = 00000008 -/* 001B4 809A8304 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 001B8 809A8308 2508DB20 */ addiu $t0, %lo(gMtxClear) -/* 001BC 809A830C 37390003 */ ori $t9, $t9, 0x0003 ## $t9 = DA380003 -/* 001C0 809A8310 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 001C4 809A8314 27A5009C */ addiu $a1, $sp, 0x009C ## $a1 = FFFFFF3C -/* 001C8 809A8318 AC790000 */ sw $t9, 0x0000($v1) ## 00000000 -/* 001CC 809A831C 0C029F9C */ jal SkinMatrix_MtxFToNewMtx -/* 001D0 809A8320 AC680004 */ sw $t0, 0x0004($v1) ## 00000004 -/* 001D4 809A8324 1040004C */ beq $v0, $zero, .L809A8458 -/* 001D8 809A8328 3C0ADA38 */ lui $t2, 0xDA38 ## $t2 = DA380000 -/* 001DC 809A832C 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 -/* 001E0 809A8330 354A0003 */ ori $t2, $t2, 0x0003 ## $t2 = DA380003 -/* 001E4 809A8334 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 -/* 001E8 809A8338 24690008 */ addiu $t1, $v1, 0x0008 ## $t1 = 00000008 -/* 001EC 809A833C AE0902D0 */ sw $t1, 0x02D0($s0) ## 000002D0 -/* 001F0 809A8340 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 001F4 809A8344 AC6A0000 */ sw $t2, 0x0000($v1) ## 00000000 -/* 001F8 809A8348 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 -/* 001FC 809A834C 358C0020 */ ori $t4, $t4, 0x0020 ## $t4 = DB060020 -/* 00200 809A8350 3C04809B */ lui $a0, %hi(D_809A85E0) ## $a0 = 809B0000 -/* 00204 809A8354 246B0008 */ addiu $t3, $v1, 0x0008 ## $t3 = 00000008 -/* 00208 809A8358 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 -/* 0020C 809A835C AC6C0000 */ sw $t4, 0x0000($v1) ## 00000000 -/* 00210 809A8360 86380042 */ lh $t8, 0x0042($s1) ## 00000042 -/* 00214 809A8364 862D0040 */ lh $t5, 0x0040($s1) ## 00000040 -/* 00218 809A8368 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 0021C 809A836C 0018C940 */ sll $t9, $t8, 5 -/* 00220 809A8370 000D7080 */ sll $t6, $t5, 2 -/* 00224 809A8374 01D94021 */ addu $t0, $t6, $t9 -/* 00228 809A8378 00882021 */ addu $a0, $a0, $t0 -/* 0022C 809A837C 8C8485E0 */ lw $a0, %lo(D_809A85E0)($a0) -/* 00230 809A8380 3C0D8016 */ lui $t5, %hi(gSegments) -/* 00234 809A8384 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00238 809A8388 00045100 */ sll $t2, $a0, 4 -/* 0023C 809A838C 000A5F02 */ srl $t3, $t2, 28 -/* 00240 809A8390 000B6080 */ sll $t4, $t3, 2 -/* 00244 809A8394 01AC6821 */ addu $t5, $t5, $t4 -/* 00248 809A8398 8DAD6FA8 */ lw $t5, %lo(gSegments)($t5) -/* 0024C 809A839C 00814824 */ and $t1, $a0, $at -/* 00250 809A83A0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00254 809A83A4 012D7821 */ addu $t7, $t1, $t5 -/* 00258 809A83A8 01E1C021 */ addu $t8, $t7, $at -/* 0025C 809A83AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00260 809A83B0 0C025314 */ jal func_80094C50 -/* 00264 809A83B4 AC780004 */ sw $t8, 0x0004($v1) ## 00000004 -/* 00268 809A83B8 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 -/* 0026C 809A83BC 3C19FA00 */ lui $t9, 0xFA00 ## $t9 = FA000000 -/* 00270 809A83C0 246E0008 */ addiu $t6, $v1, 0x0008 ## $t6 = 00000008 -/* 00274 809A83C4 AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 -/* 00278 809A83C8 AC790000 */ sw $t9, 0x0000($v1) ## 00000000 -/* 0027C 809A83CC 86280048 */ lh $t0, 0x0048($s1) ## 00000048 -/* 00280 809A83D0 86380046 */ lh $t8, 0x0046($s1) ## 00000046 -/* 00284 809A83D4 86290044 */ lh $t1, 0x0044($s1) ## 00000044 -/* 00288 809A83D8 310A00FF */ andi $t2, $t0, 0x00FF ## $t2 = 00000000 -/* 0028C 809A83DC 000A5A00 */ sll $t3, $t2, 8 -/* 00290 809A83E0 330E00FF */ andi $t6, $t8, 0x00FF ## $t6 = 00000000 -/* 00294 809A83E4 00096E00 */ sll $t5, $t1, 24 -/* 00298 809A83E8 016D7825 */ or $t7, $t3, $t5 ## $t7 = 00000000 -/* 0029C 809A83EC 000ECC00 */ sll $t9, $t6, 16 -/* 002A0 809A83F0 01F94025 */ or $t0, $t7, $t9 ## $t0 = FA000000 -/* 002A4 809A83F4 350A00FF */ ori $t2, $t0, 0x00FF ## $t2 = FA0000FF -/* 002A8 809A83F8 AC6A0004 */ sw $t2, 0x0004($v1) ## 00000004 -/* 002AC 809A83FC 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 -/* 002B0 809A8400 3C09FB00 */ lui $t1, 0xFB00 ## $t1 = FB000000 -/* 002B4 809A8404 3C0EDE00 */ lui $t6, 0xDE00 ## $t6 = DE000000 -/* 002B8 809A8408 246C0008 */ addiu $t4, $v1, 0x0008 ## $t4 = 00000008 -/* 002BC 809A840C AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 -/* 002C0 809A8410 AC690000 */ sw $t1, 0x0000($v1) ## 00000000 -/* 002C4 809A8414 862B004E */ lh $t3, 0x004E($s1) ## 0000004E -/* 002C8 809A8418 862A004C */ lh $t2, 0x004C($s1) ## 0000004C -/* 002CC 809A841C 862F004A */ lh $t7, 0x004A($s1) ## 0000004A -/* 002D0 809A8420 316D00FF */ andi $t5, $t3, 0x00FF ## $t5 = 00000000 -/* 002D4 809A8424 000DC200 */ sll $t8, $t5, 8 -/* 002D8 809A8428 314C00FF */ andi $t4, $t2, 0x00FF ## $t4 = 000000FF -/* 002DC 809A842C 000FCE00 */ sll $t9, $t7, 24 -/* 002E0 809A8430 03194025 */ or $t0, $t8, $t9 ## $t0 = FA000000 -/* 002E4 809A8434 000C4C00 */ sll $t1, $t4, 16 -/* 002E8 809A8438 01095825 */ or $t3, $t0, $t1 ## $t3 = FB000000 -/* 002EC 809A843C AC6B0004 */ sw $t3, 0x0004($v1) ## 00000004 -/* 002F0 809A8440 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 -/* 002F4 809A8444 246D0008 */ addiu $t5, $v1, 0x0008 ## $t5 = 00000008 -/* 002F8 809A8448 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 002FC 809A844C AC6E0000 */ sw $t6, 0x0000($v1) ## 00000000 -/* 00300 809A8450 8E2F0038 */ lw $t7, 0x0038($s1) ## 00000038 -/* 00304 809A8454 AC6F0004 */ sw $t7, 0x0004($v1) ## 00000004 -.L809A8458: -/* 00308 809A8458 3C06809B */ lui $a2, %hi(D_809A8688) ## $a2 = 809B0000 -/* 0030C 809A845C 24C68688 */ addiu $a2, $a2, %lo(D_809A8688) ## $a2 = 809A8688 -/* 00310 809A8460 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFEDC -/* 00314 809A8464 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00318 809A8468 0C031AD5 */ jal Graph_CloseDisps -/* 0031C 809A846C 24070155 */ addiu $a3, $zero, 0x0155 ## $a3 = 00000155 -/* 00320 809A8470 8FBF001C */ lw $ra, 0x001C($sp) -/* 00324 809A8474 8FB00014 */ lw $s0, 0x0014($sp) -/* 00328 809A8478 8FB10018 */ lw $s1, 0x0018($sp) -/* 0032C 809A847C 03E00008 */ jr $ra -/* 00330 809A8480 27BD0160 */ addiu $sp, $sp, 0x0160 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/func_809A8484.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/func_809A8484.s deleted file mode 100644 index 62c1e3fc7c..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/func_809A8484.s +++ /dev/null @@ -1,80 +0,0 @@ -glabel func_809A8484 -/* 00334 809A8484 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00338 809A8488 AFBF001C */ sw $ra, 0x001C($sp) -/* 0033C 809A848C AFB10018 */ sw $s1, 0x0018($sp) -/* 00340 809A8490 AFB00014 */ sw $s0, 0x0014($sp) -/* 00344 809A8494 AFA40020 */ sw $a0, 0x0020($sp) -/* 00348 809A8498 AFA50024 */ sw $a1, 0x0024($sp) -/* 0034C 809A849C 84CE0042 */ lh $t6, 0x0042($a2) ## 00000042 -/* 00350 809A84A0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00354 809A84A4 00C08025 */ or $s0, $a2, $zero ## $s0 = 00000000 -/* 00358 809A84A8 15C1000A */ bne $t6, $at, .L809A84D4 -/* 0035C 809A84AC 3C0C809B */ lui $t4, %hi(D_809A85B0) ## $t4 = 809B0000 -/* 00360 809A84B0 84C2005C */ lh $v0, 0x005C($a2) ## 0000005C -/* 00364 809A84B4 240F000F */ addiu $t7, $zero, 0x000F ## $t7 = 0000000F -/* 00368 809A84B8 01E2C023 */ subu $t8, $t7, $v0 -/* 0036C 809A84BC 07010003 */ bgez $t8, .L809A84CC -/* 00370 809A84C0 0018C843 */ sra $t9, $t8, 1 -/* 00374 809A84C4 27010001 */ addiu $at, $t8, 0x0001 ## $at = 00000001 -/* 00378 809A84C8 0001C843 */ sra $t9, $at, 1 -.L809A84CC: -/* 0037C 809A84CC 10000005 */ beq $zero, $zero, .L809A84E4 -/* 00380 809A84D0 A6190040 */ sh $t9, 0x0040($s0) ## 00000040 -.L809A84D4: -/* 00384 809A84D4 8602005C */ lh $v0, 0x005C($s0) ## 0000005C -/* 00388 809A84D8 24080007 */ addiu $t0, $zero, 0x0007 ## $t0 = 00000007 -/* 0038C 809A84DC 01024823 */ subu $t1, $t0, $v0 -/* 00390 809A84E0 A6090040 */ sh $t1, 0x0040($s0) ## 00000040 -.L809A84E4: -/* 00394 809A84E4 860A0040 */ lh $t2, 0x0040($s0) ## 00000040 -/* 00398 809A84E8 258C85B0 */ addiu $t4, $t4, %lo(D_809A85B0) ## $t4 = 809A85B0 -/* 0039C 809A84EC 5140002B */ beql $t2, $zero, .L809A859C -/* 003A0 809A84F0 8FBF001C */ lw $ra, 0x001C($sp) -/* 003A4 809A84F4 86030042 */ lh $v1, 0x0042($s0) ## 00000042 -/* 003A8 809A84F8 86040044 */ lh $a0, 0x0044($s0) ## 00000044 -/* 003AC 809A84FC 24460001 */ addiu $a2, $v0, 0x0001 ## $a2 = 00000001 -/* 003B0 809A8500 00031880 */ sll $v1, $v1, 2 -/* 003B4 809A8504 24630002 */ addiu $v1, $v1, 0x0002 ## $v1 = 00000002 -/* 003B8 809A8508 00035880 */ sll $t3, $v1, 2 -/* 003BC 809A850C 01635823 */ subu $t3, $t3, $v1 -/* 003C0 809A8510 016C8821 */ addu $s1, $t3, $t4 -/* 003C4 809A8514 0C009F75 */ jal func_80027DD4 -/* 003C8 809A8518 92250000 */ lbu $a1, 0x0000($s1) ## 00000000 -/* 003CC 809A851C 8606005C */ lh $a2, 0x005C($s0) ## 0000005C -/* 003D0 809A8520 A6020044 */ sh $v0, 0x0044($s0) ## 00000044 -/* 003D4 809A8524 92250001 */ lbu $a1, 0x0001($s1) ## 00000001 -/* 003D8 809A8528 86040046 */ lh $a0, 0x0046($s0) ## 00000046 -/* 003DC 809A852C 0C009F75 */ jal func_80027DD4 -/* 003E0 809A8530 24C60001 */ addiu $a2, $a2, 0x0001 ## $a2 = 00000001 -/* 003E4 809A8534 8606005C */ lh $a2, 0x005C($s0) ## 0000005C -/* 003E8 809A8538 A6020046 */ sh $v0, 0x0046($s0) ## 00000046 -/* 003EC 809A853C 92250002 */ lbu $a1, 0x0002($s1) ## 00000002 -/* 003F0 809A8540 86040048 */ lh $a0, 0x0048($s0) ## 00000048 -/* 003F4 809A8544 0C009F75 */ jal func_80027DD4 -/* 003F8 809A8548 24C60001 */ addiu $a2, $a2, 0x0001 ## $a2 = 00000001 -/* 003FC 809A854C 8606005C */ lh $a2, 0x005C($s0) ## 0000005C -/* 00400 809A8550 A6020048 */ sh $v0, 0x0048($s0) ## 00000048 -/* 00404 809A8554 92250003 */ lbu $a1, 0x0003($s1) ## 00000003 -/* 00408 809A8558 8604004A */ lh $a0, 0x004A($s0) ## 0000004A -/* 0040C 809A855C 0C009F75 */ jal func_80027DD4 -/* 00410 809A8560 24C60001 */ addiu $a2, $a2, 0x0001 ## $a2 = 00000001 -/* 00414 809A8564 8606005C */ lh $a2, 0x005C($s0) ## 0000005C -/* 00418 809A8568 A602004A */ sh $v0, 0x004A($s0) ## 0000004A -/* 0041C 809A856C 92250004 */ lbu $a1, 0x0004($s1) ## 00000004 -/* 00420 809A8570 8604004C */ lh $a0, 0x004C($s0) ## 0000004C -/* 00424 809A8574 0C009F75 */ jal func_80027DD4 -/* 00428 809A8578 24C60001 */ addiu $a2, $a2, 0x0001 ## $a2 = 00000001 -/* 0042C 809A857C 8606005C */ lh $a2, 0x005C($s0) ## 0000005C -/* 00430 809A8580 A602004C */ sh $v0, 0x004C($s0) ## 0000004C -/* 00434 809A8584 92250005 */ lbu $a1, 0x0005($s1) ## 00000005 -/* 00438 809A8588 8604004E */ lh $a0, 0x004E($s0) ## 0000004E -/* 0043C 809A858C 0C009F75 */ jal func_80027DD4 -/* 00440 809A8590 24C60001 */ addiu $a2, $a2, 0x0001 ## $a2 = 00000001 -/* 00444 809A8594 A602004E */ sh $v0, 0x004E($s0) ## 0000004E -/* 00448 809A8598 8FBF001C */ lw $ra, 0x001C($sp) -.L809A859C: -/* 0044C 809A859C 8FB00014 */ lw $s0, 0x0014($sp) -/* 00450 809A85A0 8FB10018 */ lw $s1, 0x0018($sp) -/* 00454 809A85A4 03E00008 */ jr $ra -/* 00458 809A85A8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0045C 809A85AC 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/EffectSsIcePiece_Init.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/EffectSsIcePiece_Init.s deleted file mode 100644 index 50ff1f03d7..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/EffectSsIcePiece_Init.s +++ /dev/null @@ -1,87 +0,0 @@ -glabel EffectSsIcePiece_Init -/* 00000 809A8700 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00004 809A8704 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00008 809A8708 AFA40028 */ sw $a0, 0x0028($sp) -/* 0000C 809A870C AFA5002C */ sw $a1, 0x002C($sp) -/* 00010 809A8710 8CEF0000 */ lw $t7, 0x0000($a3) ## 00000000 -/* 00014 809A8714 3C0D809B */ lui $t5, %hi(func_809A8850) ## $t5 = 809B0000 -/* 00018 809A8718 25AD8850 */ addiu $t5, $t5, %lo(func_809A8850) ## $t5 = 809A8850 -/* 0001C 809A871C ACCF0000 */ sw $t7, 0x0000($a2) ## 00000000 -/* 00020 809A8720 8CEE0004 */ lw $t6, 0x0004($a3) ## 00000004 -/* 00024 809A8724 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 00028 809A8728 44813000 */ mtc1 $at, $f6 ## $f6 = 100.00 -/* 0002C 809A872C ACCE0004 */ sw $t6, 0x0004($a2) ## 00000004 -/* 00030 809A8730 8CEF0008 */ lw $t7, 0x0008($a3) ## 00000008 -/* 00034 809A8734 3C0E809B */ lui $t6, %hi(func_809A8AC0) ## $t6 = 809B0000 -/* 00038 809A8738 25CE8AC0 */ addiu $t6, $t6, %lo(func_809A8AC0) ## $t6 = 809A8AC0 -/* 0003C 809A873C ACCF0008 */ sw $t7, 0x0008($a2) ## 00000008 -/* 00040 809A8740 8CF90000 */ lw $t9, 0x0000($a3) ## 00000000 -/* 00044 809A8744 ACD9002C */ sw $t9, 0x002C($a2) ## 0000002C -/* 00048 809A8748 8CF80004 */ lw $t8, 0x0004($a3) ## 00000004 -/* 0004C 809A874C ACD80030 */ sw $t8, 0x0030($a2) ## 00000030 -/* 00050 809A8750 8CF90008 */ lw $t9, 0x0008($a3) ## 00000008 -/* 00054 809A8754 ACD90034 */ sw $t9, 0x0034($a2) ## 00000034 -/* 00058 809A8758 8CE90010 */ lw $t1, 0x0010($a3) ## 00000010 -/* 0005C 809A875C ACC9000C */ sw $t1, 0x000C($a2) ## 0000000C -/* 00060 809A8760 8CE80014 */ lw $t0, 0x0014($a3) ## 00000014 -/* 00064 809A8764 ACC80010 */ sw $t0, 0x0010($a2) ## 00000010 -/* 00068 809A8768 8CE90018 */ lw $t1, 0x0018($a3) ## 00000018 -/* 0006C 809A876C ACC90014 */ sw $t1, 0x0014($a2) ## 00000014 -/* 00070 809A8770 8CEB001C */ lw $t3, 0x001C($a3) ## 0000001C -/* 00074 809A8774 ACCB0018 */ sw $t3, 0x0018($a2) ## 00000018 -/* 00078 809A8778 8CEA0020 */ lw $t2, 0x0020($a3) ## 00000020 -/* 0007C 809A877C ACCA001C */ sw $t2, 0x001C($a2) ## 0000001C -/* 00080 809A8780 8CEB0024 */ lw $t3, 0x0024($a3) ## 00000024 -/* 00084 809A8784 ACCB0020 */ sw $t3, 0x0020($a2) ## 00000020 -/* 00088 809A8788 8CEC0028 */ lw $t4, 0x0028($a3) ## 00000028 -/* 0008C 809A878C ACCD0028 */ sw $t5, 0x0028($a2) ## 00000028 -/* 00090 809A8790 ACCE0024 */ sw $t6, 0x0024($a2) ## 00000024 -/* 00094 809A8794 A4CC005C */ sh $t4, 0x005C($a2) ## 0000005C -/* 00098 809A8798 8CEF0028 */ lw $t7, 0x0028($a3) ## 00000028 -/* 0009C 809A879C A4CF0040 */ sh $t7, 0x0040($a2) ## 00000040 -/* 000A0 809A87A0 C4E4000C */ lwc1 $f4, 0x000C($a3) ## 0000000C -/* 000A4 809A87A4 46062202 */ mul.s $f8, $f4, $f6 -/* 000A8 809A87A8 4600428D */ trunc.w.s $f10, $f8 -/* 000AC 809A87AC 44195000 */ mfc1 $t9, $f10 -/* 000B0 809A87B0 00000000 */ nop -/* 000B4 809A87B4 A4D90048 */ sh $t9, 0x0048($a2) ## 00000048 -/* 000B8 809A87B8 C4EE0010 */ lwc1 $f14, 0x0010($a3) ## 00000010 -/* 000BC 809A87BC C4EC0018 */ lwc1 $f12, 0x0018($a3) ## 00000018 -/* 000C0 809A87C0 AFA70034 */ sw $a3, 0x0034($sp) -/* 000C4 809A87C4 0C034199 */ jal atan2s - -/* 000C8 809A87C8 AFA60030 */ sw $a2, 0x0030($sp) -/* 000CC 809A87CC 8FA60030 */ lw $a2, 0x0030($sp) -/* 000D0 809A87D0 8FA70034 */ lw $a3, 0x0034($sp) -/* 000D4 809A87D4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 000D8 809A87D8 A4C20042 */ sh $v0, 0x0042($a2) ## 00000042 -/* 000DC 809A87DC A4C00044 */ sh $zero, 0x0044($a2) ## 00000044 -/* 000E0 809A87E0 C4E00014 */ lwc1 $f0, 0x0014($a3) ## 00000014 -/* 000E4 809A87E4 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 000E8 809A87E8 46000005 */ abs.s $f0, $f0 -/* 000EC 809A87EC E7A0001C */ swc1 $f0, 0x001C($sp) -/* 000F0 809A87F0 C4E00010 */ lwc1 $f0, 0x0010($a3) ## 00000010 -/* 000F4 809A87F4 46000005 */ abs.s $f0, $f0 -/* 000F8 809A87F8 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 000FC 809A87FC E7A00020 */ swc1 $f0, 0x0020($sp) -/* 00100 809A8800 C7B00020 */ lwc1 $f16, 0x0020($sp) -/* 00104 809A8804 C7B2001C */ lwc1 $f18, 0x001C($sp) -/* 00108 809A8808 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 0010C 809A880C 44813000 */ mtc1 $at, $f6 ## $f6 = 100.00 -/* 00110 809A8810 46128100 */ add.s $f4, $f16, $f18 -/* 00114 809A8814 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00118 809A8818 44815000 */ mtc1 $at, $f10 ## $f10 = 0.50 -/* 0011C 809A881C 8FA60030 */ lw $a2, 0x0030($sp) -/* 00120 809A8820 46062202 */ mul.s $f8, $f4, $f6 -/* 00124 809A8824 460A0400 */ add.s $f16, $f0, $f10 -/* 00128 809A8828 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 0012C 809A882C 46088482 */ mul.s $f18, $f16, $f8 -/* 00130 809A8830 4600910D */ trunc.w.s $f4, $f18 -/* 00134 809A8834 44092000 */ mfc1 $t1, $f4 -/* 00138 809A8838 00000000 */ nop -/* 0013C 809A883C A4C90046 */ sh $t1, 0x0046($a2) ## 00000046 -/* 00140 809A8840 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00144 809A8844 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00148 809A8848 03E00008 */ jr $ra -/* 0014C 809A884C 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/func_809A8850.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/func_809A8850.s deleted file mode 100644 index be6052fb60..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/func_809A8850.s +++ /dev/null @@ -1,183 +0,0 @@ -.rdata -glabel D_809A8B20 - .asciz "../z_eff_ice_piece.c" - .balign 4 - -glabel D_809A8B38 - .asciz "../z_eff_ice_piece.c" - .balign 4 - -glabel D_809A8B50 - .asciz "../z_eff_ice_piece.c" - .balign 4 - -.late_rodata -glabel D_809A8B68 - .float 0.01 - -glabel D_809A8B6C - .float 9.58738019108e-05 - -glabel D_809A8B70 - .float 9.58738019108e-05 - -.text -glabel func_809A8850 -/* 00150 809A8850 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 -/* 00154 809A8854 AFBF003C */ sw $ra, 0x003C($sp) -/* 00158 809A8858 AFB10038 */ sw $s1, 0x0038($sp) -/* 0015C 809A885C AFB00034 */ sw $s0, 0x0034($sp) -/* 00160 809A8860 AFA40088 */ sw $a0, 0x0088($sp) -/* 00164 809A8864 AFA5008C */ sw $a1, 0x008C($sp) -/* 00168 809A8868 84CF0048 */ lh $t7, 0x0048($a2) ## 00000048 -/* 0016C 809A886C 3C01809B */ lui $at, %hi(D_809A8B68) ## $at = 809B0000 -/* 00170 809A8870 C4288B68 */ lwc1 $f8, %lo(D_809A8B68)($at) -/* 00174 809A8874 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 00178 809A8878 8C910000 */ lw $s1, 0x0000($a0) ## 00000000 -/* 0017C 809A887C 00C08025 */ or $s0, $a2, $zero ## $s0 = 00000000 -/* 00180 809A8880 468021A0 */ cvt.s.w $f6, $f4 -/* 00184 809A8884 3C06809B */ lui $a2, %hi(D_809A8B20) ## $a2 = 809B0000 -/* 00188 809A8888 24C68B20 */ addiu $a2, $a2, %lo(D_809A8B20) ## $a2 = 809A8B20 -/* 0018C 809A888C 240700A1 */ addiu $a3, $zero, 0x00A1 ## $a3 = 000000A1 -/* 00190 809A8890 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00194 809A8894 46083282 */ mul.s $f10, $f6, $f8 -/* 00198 809A8898 E7AA007C */ swc1 $f10, 0x007C($sp) -/* 0019C 809A889C 8C98009C */ lw $t8, 0x009C($a0) ## 0000009C -/* 001A0 809A88A0 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFD8 -/* 001A4 809A88A4 0C031AB1 */ jal Graph_OpenDisps -/* 001A8 809A88A8 AFB80078 */ sw $t8, 0x0078($sp) -/* 001AC 809A88AC 86020040 */ lh $v0, 0x0040($s0) ## 00000040 -/* 001B0 809A88B0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 001B4 809A88B4 58400012 */ blezl $v0, .L809A8900 -/* 001B8 809A88B8 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 001BC 809A88BC 8603005C */ lh $v1, 0x005C($s0) ## 0000005C -/* 001C0 809A88C0 0002C843 */ sra $t9, $v0, 1 -/* 001C4 809A88C4 0079082A */ slt $at, $v1, $t9 -/* 001C8 809A88C8 5020000D */ beql $at, $zero, .L809A8900 -/* 001CC 809A88CC 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 001D0 809A88D0 44838000 */ mtc1 $v1, $f16 ## $f16 = 0.00 -/* 001D4 809A88D4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 001D8 809A88D8 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 001DC 809A88DC 46808020 */ cvt.s.w $f0, $f16 -/* 001E0 809A88E0 44814000 */ mtc1 $at, $f8 ## $f8 = 255.00 -/* 001E4 809A88E4 468021A0 */ cvt.s.w $f6, $f4 -/* 001E8 809A88E8 46000480 */ add.s $f18, $f0, $f0 -/* 001EC 809A88EC 46069083 */ div.s $f2, $f18, $f6 -/* 001F0 809A88F0 46081082 */ mul.s $f2, $f2, $f8 -/* 001F4 809A88F4 10000005 */ beq $zero, $zero, .L809A890C -/* 001F8 809A88F8 E7A20074 */ swc1 $f2, 0x0074($sp) -/* 001FC 809A88FC 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -.L809A8900: -/* 00200 809A8900 44815000 */ mtc1 $at, $f10 ## $f10 = 255.00 -/* 00204 809A8904 00000000 */ nop -/* 00208 809A8908 E7AA0074 */ swc1 $f10, 0x0074($sp) -.L809A890C: -/* 0020C 809A890C C60C0000 */ lwc1 $f12, 0x0000($s0) ## 00000000 -/* 00210 809A8910 C60E0004 */ lwc1 $f14, 0x0004($s0) ## 00000004 -/* 00214 809A8914 0C034261 */ jal Matrix_Translate -/* 00218 809A8918 8E060008 */ lw $a2, 0x0008($s0) ## 00000008 -/* 0021C 809A891C C7AC007C */ lwc1 $f12, 0x007C($sp) -/* 00220 809A8920 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00224 809A8924 44066000 */ mfc1 $a2, $f12 -/* 00228 809A8928 0C0342A3 */ jal Matrix_Scale -/* 0022C 809A892C 46006386 */ mov.s $f14, $f12 -/* 00230 809A8930 86080042 */ lh $t0, 0x0042($s0) ## 00000042 -/* 00234 809A8934 3C01809B */ lui $at, %hi(D_809A8B6C) ## $at = 809B0000 -/* 00238 809A8938 C4328B6C */ lwc1 $f18, %lo(D_809A8B6C)($at) -/* 0023C 809A893C 44888000 */ mtc1 $t0, $f16 ## $f16 = 0.00 -/* 00240 809A8940 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00244 809A8944 46808120 */ cvt.s.w $f4, $f16 -/* 00248 809A8948 46122302 */ mul.s $f12, $f4, $f18 -/* 0024C 809A894C 0C034348 */ jal Matrix_RotateY -/* 00250 809A8950 00000000 */ nop -/* 00254 809A8954 86090044 */ lh $t1, 0x0044($s0) ## 00000044 -/* 00258 809A8958 3C01809B */ lui $at, %hi(D_809A8B70) ## $at = 809B0000 -/* 0025C 809A895C C42A8B70 */ lwc1 $f10, %lo(D_809A8B70)($at) -/* 00260 809A8960 44893000 */ mtc1 $t1, $f6 ## $f6 = 0.00 -/* 00264 809A8964 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00268 809A8968 46803220 */ cvt.s.w $f8, $f6 -/* 0026C 809A896C 460A4302 */ mul.s $f12, $f8, $f10 -/* 00270 809A8970 0C0342DC */ jal Matrix_RotateX -/* 00274 809A8974 00000000 */ nop -/* 00278 809A8978 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 0027C 809A897C 3C0BDA38 */ lui $t3, 0xDA38 ## $t3 = DA380000 -/* 00280 809A8980 356B0003 */ ori $t3, $t3, 0x0003 ## $t3 = DA380003 -/* 00284 809A8984 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 00288 809A8988 AE2A02D0 */ sw $t2, 0x02D0($s1) ## 000002D0 -/* 0028C 809A898C 3C05809B */ lui $a1, %hi(D_809A8B38) ## $a1 = 809B0000 -/* 00290 809A8990 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 00294 809A8994 24A58B38 */ addiu $a1, $a1, %lo(D_809A8B38) ## $a1 = 809A8B38 -/* 00298 809A8998 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0029C 809A899C 240600B9 */ addiu $a2, $zero, 0x00B9 ## $a2 = 000000B9 -/* 002A0 809A89A0 0C0346A2 */ jal Matrix_NewMtx -/* 002A4 809A89A4 AFA2005C */ sw $v0, 0x005C($sp) -/* 002A8 809A89A8 8FA3005C */ lw $v1, 0x005C($sp) -/* 002AC 809A89AC AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 002B0 809A89B0 8FAC0088 */ lw $t4, 0x0088($sp) -/* 002B4 809A89B4 0C024F61 */ jal func_80093D84 -/* 002B8 809A89B8 8D840000 */ lw $a0, 0x0000($t4) ## 00000000 -/* 002BC 809A89BC 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 002C0 809A89C0 3C0FFB00 */ lui $t7, 0xFB00 ## $t7 = FB000000 -/* 002C4 809A89C4 3C010032 */ lui $at, 0x0032 ## $at = 00320000 -/* 002C8 809A89C8 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 002CC 809A89CC AE2D02D0 */ sw $t5, 0x02D0($s1) ## 000002D0 -/* 002D0 809A89D0 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 002D4 809A89D4 C7B00074 */ lwc1 $f16, 0x0074($sp) -/* 002D8 809A89D8 34216400 */ ori $at, $at, 0x6400 ## $at = 00326400 -/* 002DC 809A89DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 002E0 809A89E0 4600810D */ trunc.w.s $f4, $f16 -/* 002E4 809A89E4 44192000 */ mfc1 $t9, $f4 -/* 002E8 809A89E8 00000000 */ nop -/* 002EC 809A89EC 332800FF */ andi $t0, $t9, 0x00FF ## $t0 = 00000000 -/* 002F0 809A89F0 01014825 */ or $t1, $t0, $at ## $t1 = 00326400 -/* 002F4 809A89F4 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 002F8 809A89F8 0C00D0D7 */ jal func_8003435C -/* 002FC 809A89FC 8FA50088 */ lw $a1, 0x0088($sp) -/* 00300 809A8A00 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 00304 809A8A04 8FA30078 */ lw $v1, 0x0078($sp) -/* 00308 809A8A08 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 0030C 809A8A0C 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 00310 809A8A10 AE2A02D0 */ sw $t2, 0x02D0($s1) ## 000002D0 -/* 00314 809A8A14 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020 -/* 00318 809A8A18 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 0031C 809A8A1C 8FAC0088 */ lw $t4, 0x0088($sp) -/* 00320 809A8A20 0003C040 */ sll $t8, $v1, 1 -/* 00324 809A8A24 331900FF */ andi $t9, $t8, 0x00FF ## $t9 = 00000000 -/* 00328 809A8A28 8D840000 */ lw $a0, 0x0000($t4) ## 00000000 -/* 0032C 809A8A2C 240D0020 */ addiu $t5, $zero, 0x0020 ## $t5 = 00000020 -/* 00330 809A8A30 240F0010 */ addiu $t7, $zero, 0x0010 ## $t7 = 00000010 -/* 00334 809A8A34 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 00338 809A8A38 24080040 */ addiu $t0, $zero, 0x0040 ## $t0 = 00000040 -/* 0033C 809A8A3C 24090020 */ addiu $t1, $zero, 0x0020 ## $t1 = 00000020 -/* 00340 809A8A40 AFA90028 */ sw $t1, 0x0028($sp) -/* 00344 809A8A44 AFA80024 */ sw $t0, 0x0024($sp) -/* 00348 809A8A48 AFAE0018 */ sw $t6, 0x0018($sp) -/* 0034C 809A8A4C AFAF0014 */ sw $t7, 0x0014($sp) -/* 00350 809A8A50 AFAD0010 */ sw $t5, 0x0010($sp) -/* 00354 809A8A54 AFB90020 */ sw $t9, 0x0020($sp) -/* 00358 809A8A58 AFA0001C */ sw $zero, 0x001C($sp) -/* 0035C 809A8A5C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00360 809A8A60 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00364 809A8A64 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 00368 809A8A68 0C0253D0 */ jal Gfx_TwoTexScroll -/* 0036C 809A8A6C 306700FF */ andi $a3, $v1, 0x00FF ## $a3 = 00000000 -/* 00370 809A8A70 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 -/* 00374 809A8A74 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 00378 809A8A78 3C0C0403 */ lui $t4, 0x0403 ## $t4 = 04030000 -/* 0037C 809A8A7C 258C3720 */ addiu $t4, $t4, 0x3720 ## $t4 = 04033720 -/* 00380 809A8A80 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 00384 809A8A84 AE2A02D0 */ sw $t2, 0x02D0($s1) ## 000002D0 -/* 00388 809A8A88 3C0BDE00 */ lui $t3, 0xDE00 ## $t3 = DE000000 -/* 0038C 809A8A8C 3C06809B */ lui $a2, %hi(D_809A8B50) ## $a2 = 809B0000 -/* 00390 809A8A90 24C68B50 */ addiu $a2, $a2, %lo(D_809A8B50) ## $a2 = 809A8B50 -/* 00394 809A8A94 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFD8 -/* 00398 809A8A98 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0039C 809A8A9C 240700D1 */ addiu $a3, $zero, 0x00D1 ## $a3 = 000000D1 -/* 003A0 809A8AA0 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 003A4 809A8AA4 0C031AD5 */ jal Graph_CloseDisps -/* 003A8 809A8AA8 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 003AC 809A8AAC 8FBF003C */ lw $ra, 0x003C($sp) -/* 003B0 809A8AB0 8FB00034 */ lw $s0, 0x0034($sp) -/* 003B4 809A8AB4 8FB10038 */ lw $s1, 0x0038($sp) -/* 003B8 809A8AB8 03E00008 */ jr $ra -/* 003BC 809A8ABC 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/func_809A8AC0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/func_809A8AC0.s deleted file mode 100644 index 779f7296a5..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/func_809A8AC0.s +++ /dev/null @@ -1,26 +0,0 @@ -.late_rodata -glabel D_809A8B74 - .float 0.85 - -.text -glabel func_809A8AC0 -/* 003C0 809A8AC0 AFA40000 */ sw $a0, 0x0000($sp) -/* 003C4 809A8AC4 AFA50004 */ sw $a1, 0x0004($sp) -/* 003C8 809A8AC8 3C01809B */ lui $at, %hi(D_809A8B74) ## $at = 809B0000 -/* 003CC 809A8ACC C4208B74 */ lwc1 $f0, %lo(D_809A8B74)($at) -/* 003D0 809A8AD0 C4C4000C */ lwc1 $f4, 0x000C($a2) ## 0000000C -/* 003D4 809A8AD4 C4C80010 */ lwc1 $f8, 0x0010($a2) ## 00000010 -/* 003D8 809A8AD8 C4D00014 */ lwc1 $f16, 0x0014($a2) ## 00000014 -/* 003DC 809A8ADC 46002182 */ mul.s $f6, $f4, $f0 -/* 003E0 809A8AE0 84CE0044 */ lh $t6, 0x0044($a2) ## 00000044 -/* 003E4 809A8AE4 84CF0046 */ lh $t7, 0x0046($a2) ## 00000046 -/* 003E8 809A8AE8 46004282 */ mul.s $f10, $f8, $f0 -/* 003EC 809A8AEC 01CFC021 */ addu $t8, $t6, $t7 -/* 003F0 809A8AF0 46008482 */ mul.s $f18, $f16, $f0 -/* 003F4 809A8AF4 A4D80044 */ sh $t8, 0x0044($a2) ## 00000044 -/* 003F8 809A8AF8 E4C6000C */ swc1 $f6, 0x000C($a2) ## 0000000C -/* 003FC 809A8AFC E4CA0010 */ swc1 $f10, 0x0010($a2) ## 00000010 -/* 00400 809A8B00 03E00008 */ jr $ra -/* 00404 809A8B04 E4D20014 */ swc1 $f18, 0x0014($a2) ## 00000014 -/* 00408 809A8B08 00000000 */ nop -/* 0040C 809A8B0C 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/EffectSsIceSmoke_Init.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/EffectSsIceSmoke_Init.s deleted file mode 100644 index 4fea3c78d2..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/EffectSsIceSmoke_Init.s +++ /dev/null @@ -1,89 +0,0 @@ -.rdata -glabel D_809A90C0 - .asciz "Effect_SS_Ice_Smoke_ct():バンク Object_Bank_Fzが有りません。\n" - .balign 4 - -.text -glabel EffectSsIceSmoke_Init -/* 00000 809A8BF0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00004 809A8BF4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00008 809A8BF8 AFA40038 */ sw $a0, 0x0038($sp) -/* 0000C 809A8BFC 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 00010 809A8C00 AFBF001C */ sw $ra, 0x001C($sp) -/* 00014 809A8C04 AFB00018 */ sw $s0, 0x0018($sp) -/* 00018 809A8C08 AFA5003C */ sw $a1, 0x003C($sp) -/* 0001C 809A8C0C 00812021 */ addu $a0, $a0, $at -/* 00020 809A8C10 00C08025 */ or $s0, $a2, $zero ## $s0 = 00000000 -/* 00024 809A8C14 AFA70044 */ sw $a3, 0x0044($sp) -/* 00028 809A8C18 AFA40024 */ sw $a0, 0x0024($sp) -/* 0002C 809A8C1C 0C02604B */ jal Object_GetIndex - ## ObjectIndex -/* 00030 809A8C20 24050114 */ addiu $a1, $zero, 0x0114 ## $a1 = 00000114 -/* 00034 809A8C24 8FA40024 */ lw $a0, 0x0024($sp) -/* 00038 809A8C28 04400032 */ bltz $v0, .L809A8CF4 -/* 0003C 809A8C2C 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 00040 809A8C30 0C026062 */ jal Object_IsLoaded - -/* 00044 809A8C34 AFA2002C */ sw $v0, 0x002C($sp) -/* 00048 809A8C38 1040002E */ beq $v0, $zero, .L809A8CF4 -/* 0004C 809A8C3C 3C090001 */ lui $t1, 0x0001 ## $t1 = 00010000 -/* 00050 809A8C40 8FB8002C */ lw $t8, 0x002C($sp) -/* 00054 809A8C44 3C028016 */ lui $v0, %hi(gSegments) -/* 00058 809A8C48 8FAF0038 */ lw $t7, 0x0038($sp) -/* 0005C 809A8C4C 24426FA8 */ addiu $v0, %lo(gSegments) -/* 00060 809A8C50 0018C900 */ sll $t9, $t8, 4 -/* 00064 809A8C54 8C4E0018 */ lw $t6, 0x0018($v0) ## 80166FC0 -/* 00068 809A8C58 0338C821 */ addu $t9, $t9, $t8 -/* 0006C 809A8C5C 0019C880 */ sll $t9, $t9, 2 -/* 00070 809A8C60 01F94021 */ addu $t0, $t7, $t9 -/* 00074 809A8C64 01284821 */ addu $t1, $t1, $t0 -/* 00078 809A8C68 AFAE0028 */ sw $t6, 0x0028($sp) -/* 0007C 809A8C6C 8D2917B4 */ lw $t1, 0x17B4($t1) ## 000117B4 -/* 00080 809A8C70 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00084 809A8C74 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00088 809A8C78 01215021 */ addu $t2, $t1, $at -/* 0008C 809A8C7C AC4A0018 */ sw $t2, 0x0018($v0) ## 80166FC0 -/* 00090 809A8C80 0C01DF90 */ jal Math_Vec3f_Copy - ## Vec3f_Copy -/* 00094 809A8C84 8FA50044 */ lw $a1, 0x0044($sp) -/* 00098 809A8C88 8FA50044 */ lw $a1, 0x0044($sp) -/* 0009C 809A8C8C 2604000C */ addiu $a0, $s0, 0x000C ## $a0 = 0000000C -/* 000A0 809A8C90 0C01DF90 */ jal Math_Vec3f_Copy - ## Vec3f_Copy -/* 000A4 809A8C94 24A5000C */ addiu $a1, $a1, 0x000C ## $a1 = 0000000C -/* 000A8 809A8C98 8FA50044 */ lw $a1, 0x0044($sp) -/* 000AC 809A8C9C 26040018 */ addiu $a0, $s0, 0x0018 ## $a0 = 00000018 -/* 000B0 809A8CA0 0C01DF90 */ jal Math_Vec3f_Copy - ## Vec3f_Copy -/* 000B4 809A8CA4 24A50018 */ addiu $a1, $a1, 0x0018 ## $a1 = 00000018 -/* 000B8 809A8CA8 8FAB002C */ lw $t3, 0x002C($sp) -/* 000BC 809A8CAC A6000042 */ sh $zero, 0x0042($s0) ## 00000042 -/* 000C0 809A8CB0 3C18809B */ lui $t8, %hi(func_809A8D18) ## $t8 = 809B0000 -/* 000C4 809A8CB4 A60B0040 */ sh $t3, 0x0040($s0) ## 00000040 -/* 000C8 809A8CB8 8FAC0044 */ lw $t4, 0x0044($sp) -/* 000CC 809A8CBC 3C0F809B */ lui $t7, %hi(func_809A9030) ## $t7 = 809B0000 -/* 000D0 809A8CC0 240E0032 */ addiu $t6, $zero, 0x0032 ## $t6 = 00000032 -/* 000D4 809A8CC4 858D0024 */ lh $t5, 0x0024($t4) ## 00000024 -/* 000D8 809A8CC8 27188D18 */ addiu $t8, $t8, %lo(func_809A8D18) ## $t8 = 809A8D18 -/* 000DC 809A8CCC 25EF9030 */ addiu $t7, $t7, %lo(func_809A9030) ## $t7 = 809A9030 -/* 000E0 809A8CD0 A60E005C */ sh $t6, 0x005C($s0) ## 0000005C -/* 000E4 809A8CD4 AE180028 */ sw $t8, 0x0028($s0) ## 00000028 -/* 000E8 809A8CD8 AE0F0024 */ sw $t7, 0x0024($s0) ## 00000024 -/* 000EC 809A8CDC A60D0044 */ sh $t5, 0x0044($s0) ## 00000044 -/* 000F0 809A8CE0 8FB90028 */ lw $t9, 0x0028($sp) -/* 000F4 809A8CE4 3C018016 */ lui $at, %hi(gSegments+0x18) -/* 000F8 809A8CE8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 000FC 809A8CEC 10000005 */ beq $zero, $zero, .L809A8D04 -/* 00100 809A8CF0 AC396FC0 */ sw $t9, %lo(gSegments+0x18)($at) -.L809A8CF4: -/* 00104 809A8CF4 3C04809B */ lui $a0, %hi(D_809A90C0) ## $a0 = 809B0000 -/* 00108 809A8CF8 0C00084C */ jal osSyncPrintf - -/* 0010C 809A8CFC 248490C0 */ addiu $a0, $a0, %lo(D_809A90C0) ## $a0 = 809A90C0 -/* 00110 809A8D00 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L809A8D04: -/* 00114 809A8D04 8FBF001C */ lw $ra, 0x001C($sp) -/* 00118 809A8D08 8FB00018 */ lw $s0, 0x0018($sp) -/* 0011C 809A8D0C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00120 809A8D10 03E00008 */ jr $ra -/* 00124 809A8D14 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A8D18.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A8D18.s deleted file mode 100644 index 90ec342365..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A8D18.s +++ /dev/null @@ -1,223 +0,0 @@ -.rdata -glabel D_809A9100 - .asciz "../z_eff_ss_ice_smoke.c" - .balign 4 - -glabel D_809A9118 - .asciz "../z_eff_ss_ice_smoke.c" - .balign 4 - -glabel D_809A9130 - .asciz "../z_eff_ss_ice_smoke.c" - .balign 4 - -.late_rodata -glabel D_809A9148 - .word 0x38D1B717, 0x00000000 - - -.text -glabel func_809A8D18 -/* 00128 809A8D18 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 -/* 0012C 809A8D1C AFBF003C */ sw $ra, 0x003C($sp) -/* 00130 809A8D20 AFB00038 */ sw $s0, 0x0038($sp) -/* 00134 809A8D24 AFA40090 */ sw $a0, 0x0090($sp) -/* 00138 809A8D28 AFA50094 */ sw $a1, 0x0094($sp) -/* 0013C 809A8D2C AFA60098 */ sw $a2, 0x0098($sp) -/* 00140 809A8D30 84D80040 */ lh $t8, 0x0040($a2) ## 00000040 -/* 00144 809A8D34 3C0C0001 */ lui $t4, 0x0001 ## $t4 = 00010000 -/* 00148 809A8D38 3C06809B */ lui $a2, %hi(D_809A9100) ## $a2 = 809B0000 -/* 0014C 809A8D3C 0018C900 */ sll $t9, $t8, 4 -/* 00150 809A8D40 0338C821 */ addu $t9, $t9, $t8 -/* 00154 809A8D44 0019C880 */ sll $t9, $t9, 2 -/* 00158 809A8D48 00995821 */ addu $t3, $a0, $t9 -/* 0015C 809A8D4C 018B6021 */ addu $t4, $t4, $t3 -/* 00160 809A8D50 8D8C17B4 */ lw $t4, 0x17B4($t4) ## 000117B4 -/* 00164 809A8D54 24C69100 */ addiu $a2, $a2, %lo(D_809A9100) ## $a2 = 809A9100 -/* 00168 809A8D58 2407009B */ addiu $a3, $zero, 0x009B ## $a3 = 0000009B -/* 0016C 809A8D5C AFAC0088 */ sw $t4, 0x0088($sp) -/* 00170 809A8D60 8C850000 */ lw $a1, 0x0000($a0) ## 00000000 -/* 00174 809A8D64 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFD8 -/* 00178 809A8D68 0C031AB1 */ jal Graph_OpenDisps -/* 0017C 809A8D6C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00180 809A8D70 8FA40090 */ lw $a0, 0x0090($sp) -/* 00184 809A8D74 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00188 809A8D78 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 0018C 809A8D7C 00812021 */ addu $a0, $a0, $at -/* 00190 809A8D80 AFA40044 */ sw $a0, 0x0044($sp) -/* 00194 809A8D84 0C02604B */ jal Object_GetIndex - ## ObjectIndex -/* 00198 809A8D88 24050114 */ addiu $a1, $zero, 0x0114 ## $a1 = 00000114 -/* 0019C 809A8D8C 8FA40044 */ lw $a0, 0x0044($sp) -/* 001A0 809A8D90 04400098 */ bltz $v0, .L809A8FF4 -/* 001A4 809A8D94 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 001A8 809A8D98 0C026062 */ jal Object_IsLoaded - -/* 001AC 809A8D9C 00000000 */ nop -/* 001B0 809A8DA0 50400095 */ beql $v0, $zero, .L809A8FF8 -/* 001B4 809A8DA4 8FAB0098 */ lw $t3, 0x0098($sp) -/* 001B8 809A8DA8 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 -/* 001BC 809A8DAC 3C0FE700 */ lui $t7, 0xE700 ## $t7 = E7000000 -/* 001C0 809A8DB0 246D0008 */ addiu $t5, $v1, 0x0008 ## $t5 = 00000008 -/* 001C4 809A8DB4 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 001C8 809A8DB8 AC600004 */ sw $zero, 0x0004($v1) ## 00000004 -/* 001CC 809A8DBC AC6F0000 */ sw $t7, 0x0000($v1) ## 00000000 -/* 001D0 809A8DC0 8FB80090 */ lw $t8, 0x0090($sp) -/* 001D4 809A8DC4 0C024F61 */ jal func_80093D84 -/* 001D8 809A8DC8 8F040000 */ lw $a0, 0x0000($t8) ## 00000000 -/* 001DC 809A8DCC 8FA40088 */ lw $a0, 0x0088($sp) -/* 001E0 809A8DD0 3C0A8016 */ lui $t2, %hi(gSegments) -/* 001E4 809A8DD4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 001E8 809A8DD8 254A6FA8 */ addiu $t2, %lo(gSegments) -/* 001EC 809A8DDC 0081C821 */ addu $t9, $a0, $at -/* 001F0 809A8DE0 AD590018 */ sw $t9, 0x0018($t2) ## 80166FC0 -/* 001F4 809A8DE4 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 -/* 001F8 809A8DE8 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 -/* 001FC 809A8DEC 358C0018 */ ori $t4, $t4, 0x0018 ## $t4 = DB060018 -/* 00200 809A8DF0 246B0008 */ addiu $t3, $v1, 0x0008 ## $t3 = 00000008 -/* 00204 809A8DF4 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 -/* 00208 809A8DF8 AC640004 */ sw $a0, 0x0004($v1) ## 00000004 -/* 0020C 809A8DFC AC6C0000 */ sw $t4, 0x0000($v1) ## 00000000 -/* 00210 809A8E00 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 -/* 00214 809A8E04 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00218 809A8E08 248430A0 */ addiu $a0, $a0, 0x30A0 ## $a0 = 060030A0 -/* 0021C 809A8E0C 00047900 */ sll $t7, $a0, 4 -/* 00220 809A8E10 000FC702 */ srl $t8, $t7, 28 -/* 00224 809A8E14 246E0008 */ addiu $t6, $v1, 0x0008 ## $t6 = 00000008 -/* 00228 809A8E18 AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 -/* 0022C 809A8E1C 0018C880 */ sll $t9, $t8, 2 -/* 00230 809A8E20 3C0DDE00 */ lui $t5, 0xDE00 ## $t5 = DE000000 -/* 00234 809A8E24 01595821 */ addu $t3, $t2, $t9 -/* 00238 809A8E28 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 0023C 809A8E2C AC6D0000 */ sw $t5, 0x0000($v1) ## 00000000 -/* 00240 809A8E30 8D6C0000 */ lw $t4, 0x0000($t3) ## 00000008 -/* 00244 809A8E34 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00248 809A8E38 00817024 */ and $t6, $a0, $at -/* 0024C 809A8E3C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00250 809A8E40 018E6821 */ addu $t5, $t4, $t6 -/* 00254 809A8E44 01A17821 */ addu $t7, $t5, $at -/* 00258 809A8E48 AC6F0004 */ sw $t7, 0x0004($v1) ## 00000004 -/* 0025C 809A8E4C 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 -/* 00260 809A8E50 3C19E700 */ lui $t9, 0xE700 ## $t9 = E7000000 -/* 00264 809A8E54 3C0CFA00 */ lui $t4, 0xFA00 ## $t4 = FA000000 -/* 00268 809A8E58 24780008 */ addiu $t8, $v1, 0x0008 ## $t8 = 00000008 -/* 0026C 809A8E5C AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 00270 809A8E60 AC790000 */ sw $t9, 0x0000($v1) ## 00000000 -/* 00274 809A8E64 AC600004 */ sw $zero, 0x0004($v1) ## 00000004 -/* 00278 809A8E68 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 -/* 0027C 809A8E6C 8FA90098 */ lw $t1, 0x0098($sp) -/* 00280 809A8E70 3C01C3EB */ lui $at, 0xC3EB ## $at = C3EB0000 -/* 00284 809A8E74 246B0008 */ addiu $t3, $v1, 0x0008 ## $t3 = 00000008 -/* 00288 809A8E78 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 -/* 0028C 809A8E7C AC6C0000 */ sw $t4, 0x0000($v1) ## 00000000 -/* 00290 809A8E80 852E0042 */ lh $t6, 0x0042($t1) ## 00000042 -/* 00294 809A8E84 3421EB00 */ ori $at, $at, 0xEB00 ## $at = C3EBEB00 -/* 00298 809A8E88 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 -/* 0029C 809A8E8C 31CD00FF */ andi $t5, $t6, 0x00FF ## $t5 = 00000008 -/* 002A0 809A8E90 01A17825 */ or $t7, $t5, $at ## $t7 = C3EBEB08 -/* 002A4 809A8E94 AC6F0004 */ sw $t7, 0x0004($v1) ## 00000004 -/* 002A8 809A8E98 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 -/* 002AC 809A8E9C 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 -/* 002B0 809A8EA0 240F0020 */ addiu $t7, $zero, 0x0020 ## $t7 = 00000020 -/* 002B4 809A8EA4 24780008 */ addiu $t8, $v1, 0x0008 ## $t8 = 00000008 -/* 002B8 809A8EA8 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 002BC 809A8EAC AC790000 */ sw $t9, 0x0000($v1) ## 00000000 -/* 002C0 809A8EB0 8522005C */ lh $v0, 0x005C($t1) ## 0000005C -/* 002C4 809A8EB4 8FAB0090 */ lw $t3, 0x0090($sp) -/* 002C8 809A8EB8 24180020 */ addiu $t8, $zero, 0x0020 ## $t8 = 00000020 -/* 002CC 809A8EBC 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 002D0 809A8EC0 8D640000 */ lw $a0, 0x0000($t3) ## 00000008 -/* 002D4 809A8EC4 240E0040 */ addiu $t6, $zero, 0x0040 ## $t6 = 00000040 -/* 002D8 809A8EC8 240C0020 */ addiu $t4, $zero, 0x0020 ## $t4 = 00000020 -/* 002DC 809A8ECC 00023080 */ sll $a2, $v0, 2 -/* 002E0 809A8ED0 00023900 */ sll $a3, $v0, 4 -/* 002E4 809A8ED4 AFAC0010 */ sw $t4, 0x0010($sp) -/* 002E8 809A8ED8 AFAE0014 */ sw $t6, 0x0014($sp) -/* 002EC 809A8EDC AFB80028 */ sw $t8, 0x0028($sp) -/* 002F0 809A8EE0 AFAF0024 */ sw $t7, 0x0024($sp) -/* 002F4 809A8EE4 AFA00020 */ sw $zero, 0x0020($sp) -/* 002F8 809A8EE8 AFA0001C */ sw $zero, 0x001C($sp) -/* 002FC 809A8EEC AFAD0018 */ sw $t5, 0x0018($sp) -/* 00300 809A8EF0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00304 809A8EF4 AFA30050 */ sw $v1, 0x0050($sp) -/* 00308 809A8EF8 00E23823 */ subu $a3, $a3, $v0 -/* 0030C 809A8EFC 0C0253D0 */ jal Gfx_TwoTexScroll -/* 00310 809A8F00 00C23023 */ subu $a2, $a2, $v0 -/* 00314 809A8F04 8FA80050 */ lw $t0, 0x0050($sp) -/* 00318 809A8F08 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0031C 809A8F0C AD020004 */ sw $v0, 0x0004($t0) ## 00000004 -/* 00320 809A8F10 8FA20098 */ lw $v0, 0x0098($sp) -/* 00324 809A8F14 C44C0000 */ lwc1 $f12, 0x0000($v0) ## 00000000 -/* 00328 809A8F18 C44E0004 */ lwc1 $f14, 0x0004($v0) ## 00000004 -/* 0032C 809A8F1C 0C034261 */ jal Matrix_Translate -/* 00330 809A8F20 8C460008 */ lw $a2, 0x0008($v0) ## 00000008 -/* 00334 809A8F24 8FA40090 */ lw $a0, 0x0090($sp) -/* 00338 809A8F28 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0033C 809A8F2C 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 -/* 00340 809A8F30 0C0347F5 */ jal func_800D1FD4 -/* 00344 809A8F34 00812021 */ addu $a0, $a0, $at -/* 00348 809A8F38 8FB90098 */ lw $t9, 0x0098($sp) -/* 0034C 809A8F3C 3C01809B */ lui $at, %hi(D_809A9148) ## $at = 809B0000 -/* 00350 809A8F40 C4289148 */ lwc1 $f8, %lo(D_809A9148)($at) -/* 00354 809A8F44 872B0044 */ lh $t3, 0x0044($t9) ## 00000044 -/* 00358 809A8F48 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0035C 809A8F4C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00360 809A8F50 448B2000 */ mtc1 $t3, $f4 ## $f4 = 0.00 -/* 00364 809A8F54 00000000 */ nop -/* 00368 809A8F58 468021A0 */ cvt.s.w $f6, $f4 -/* 0036C 809A8F5C 46083302 */ mul.s $f12, $f6, $f8 -/* 00370 809A8F60 0C0342A3 */ jal Matrix_Scale -/* 00374 809A8F64 46006386 */ mov.s $f14, $f12 -/* 00378 809A8F68 8FAC0090 */ lw $t4, 0x0090($sp) -/* 0037C 809A8F6C 3C05809B */ lui $a1, %hi(D_809A9118) ## $a1 = 809B0000 -/* 00380 809A8F70 24A59118 */ addiu $a1, $a1, %lo(D_809A9118) ## $a1 = 809A9118 -/* 00384 809A8F74 240600C4 */ addiu $a2, $zero, 0x00C4 ## $a2 = 000000C4 -/* 00388 809A8F78 0C0346A2 */ jal Matrix_NewMtx -/* 0038C 809A8F7C 8D840000 */ lw $a0, 0x0000($t4) ## 00000000 -/* 00390 809A8F80 1040001F */ beq $v0, $zero, .L809A9000 -/* 00394 809A8F84 3C0DDA38 */ lui $t5, 0xDA38 ## $t5 = DA380000 -/* 00398 809A8F88 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 -/* 0039C 809A8F8C 35AD0003 */ ori $t5, $t5, 0x0003 ## $t5 = DA380003 -/* 003A0 809A8F90 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 003A4 809A8F94 246E0008 */ addiu $t6, $v1, 0x0008 ## $t6 = 00000008 -/* 003A8 809A8F98 AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 -/* 003AC 809A8F9C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 003B0 809A8FA0 AC6D0000 */ sw $t5, 0x0000($v1) ## 00000000 -/* 003B4 809A8FA4 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 -/* 003B8 809A8FA8 24843158 */ addiu $a0, $a0, 0x3158 ## $a0 = 06003158 -/* 003BC 809A8FAC 0004C900 */ sll $t9, $a0, 4 -/* 003C0 809A8FB0 00195F02 */ srl $t3, $t9, 28 -/* 003C4 809A8FB4 246F0008 */ addiu $t7, $v1, 0x0008 ## $t7 = 00000008 -/* 003C8 809A8FB8 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 -/* 003CC 809A8FBC 000B6080 */ sll $t4, $t3, 2 -/* 003D0 809A8FC0 3C0E8016 */ lui $t6, %hi(gSegments) -/* 003D4 809A8FC4 3C18DE00 */ lui $t8, 0xDE00 ## $t8 = DE000000 -/* 003D8 809A8FC8 01CC7021 */ addu $t6, $t6, $t4 -/* 003DC 809A8FCC 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 003E0 809A8FD0 AC780000 */ sw $t8, 0x0000($v1) ## 00000000 -/* 003E4 809A8FD4 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) -/* 003E8 809A8FD8 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 003EC 809A8FDC 00816824 */ and $t5, $a0, $at -/* 003F0 809A8FE0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 003F4 809A8FE4 01CD7821 */ addu $t7, $t6, $t5 -/* 003F8 809A8FE8 01E1C021 */ addu $t8, $t7, $at -/* 003FC 809A8FEC 10000004 */ beq $zero, $zero, .L809A9000 -/* 00400 809A8FF0 AC780004 */ sw $t8, 0x0004($v1) ## 00000004 -.L809A8FF4: -/* 00404 809A8FF4 8FAB0098 */ lw $t3, 0x0098($sp) -.L809A8FF8: -/* 00408 809A8FF8 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF -/* 0040C 809A8FFC A579005C */ sh $t9, 0x005C($t3) ## 0000005C -.L809A9000: -/* 00410 809A9000 8FAC0090 */ lw $t4, 0x0090($sp) -/* 00414 809A9004 3C06809B */ lui $a2, %hi(D_809A9130) ## $a2 = 809B0000 -/* 00418 809A9008 24C69130 */ addiu $a2, $a2, %lo(D_809A9130) ## $a2 = 809A9130 -/* 0041C 809A900C 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFD8 -/* 00420 809A9010 240700D2 */ addiu $a3, $zero, 0x00D2 ## $a3 = 000000D2 -/* 00424 809A9014 0C031AD5 */ jal Graph_CloseDisps -/* 00428 809A9018 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 0042C 809A901C 8FBF003C */ lw $ra, 0x003C($sp) -/* 00430 809A9020 8FB00038 */ lw $s0, 0x0038($sp) -/* 00434 809A9024 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 -/* 00438 809A9028 03E00008 */ jr $ra -/* 0043C 809A902C 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A9030.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A9030.s deleted file mode 100644 index 9527a016a1..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A9030.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_809A9030 -/* 00440 809A9030 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00444 809A9034 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00448 809A9038 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 0044C 809A903C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00450 809A9040 AFA50024 */ sw $a1, 0x0024($sp) -/* 00454 809A9044 00812021 */ addu $a0, $a0, $at -/* 00458 809A9048 AFA60028 */ sw $a2, 0x0028($sp) -/* 0045C 809A904C AFA40018 */ sw $a0, 0x0018($sp) -/* 00460 809A9050 0C02604B */ jal Object_GetIndex - ## ObjectIndex -/* 00464 809A9054 24050114 */ addiu $a1, $zero, 0x0114 ## $a1 = 00000114 -/* 00468 809A9058 8FA30028 */ lw $v1, 0x0028($sp) -/* 0046C 809A905C 8FA40018 */ lw $a0, 0x0018($sp) -/* 00470 809A9060 0440000B */ bltz $v0, .L809A9090 -/* 00474 809A9064 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 00478 809A9068 0C026062 */ jal Object_IsLoaded - -/* 0047C 809A906C 00000000 */ nop -/* 00480 809A9070 10400007 */ beq $v0, $zero, .L809A9090 -/* 00484 809A9074 8FA30028 */ lw $v1, 0x0028($sp) -/* 00488 809A9078 84620042 */ lh $v0, 0x0042($v1) ## 00000042 -/* 0048C 809A907C 28410064 */ slti $at, $v0, 0x0064 -/* 00490 809A9080 10200005 */ beq $at, $zero, .L809A9098 -/* 00494 809A9084 244E000A */ addiu $t6, $v0, 0x000A ## $t6 = 0000000A -/* 00498 809A9088 10000003 */ beq $zero, $zero, .L809A9098 -/* 0049C 809A908C A46E0042 */ sh $t6, 0x0042($v1) ## 00000042 -.L809A9090: -/* 004A0 809A9090 240FFFFF */ addiu $t7, $zero, 0xFFFF ## $t7 = FFFFFFFF -/* 004A4 809A9094 A46F005C */ sh $t7, 0x005C($v1) ## 0000005C -.L809A9098: -/* 004A8 809A9098 8FBF0014 */ lw $ra, 0x0014($sp) -/* 004AC 809A909C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 004B0 809A90A0 03E00008 */ jr $ra -/* 004B4 809A90A4 00000000 */ nop -/* 004B8 809A90A8 00000000 */ nop -/* 004BC 809A90AC 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_K_Fire/EffectSsKFire_Init.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_K_Fire/EffectSsKFire_Init.s deleted file mode 100644 index f5a9f02179..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_K_Fire/EffectSsKFire_Init.s +++ /dev/null @@ -1,54 +0,0 @@ -glabel EffectSsKFire_Init -/* 00000 809A91B0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00004 809A91B4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00008 809A91B8 AFA40018 */ sw $a0, 0x0018($sp) -/* 0000C 809A91BC AFA5001C */ sw $a1, 0x001C($sp) -/* 00010 809A91C0 8CEF0000 */ lw $t7, 0x0000($a3) ## 00000000 -/* 00014 809A91C4 240A0064 */ addiu $t2, $zero, 0x0064 ## $t2 = 00000064 -/* 00018 809A91C8 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF -/* 0001C 809A91CC ACCF0000 */ sw $t7, 0x0000($a2) ## 00000000 -/* 00020 809A91D0 8CEE0004 */ lw $t6, 0x0004($a3) ## 00000004 -/* 00024 809A91D4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 00028 809A91D8 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 -/* 0002C 809A91DC ACCE0004 */ sw $t6, 0x0004($a2) ## 00000004 -/* 00030 809A91E0 8CEF0008 */ lw $t7, 0x0008($a3) ## 00000008 -/* 00034 809A91E4 ACCF0008 */ sw $t7, 0x0008($a2) ## 00000008 -/* 00038 809A91E8 8CF9000C */ lw $t9, 0x000C($a3) ## 0000000C -/* 0003C 809A91EC ACD9000C */ sw $t9, 0x000C($a2) ## 0000000C -/* 00040 809A91F0 8CF80010 */ lw $t8, 0x0010($a3) ## 00000010 -/* 00044 809A91F4 ACD80010 */ sw $t8, 0x0010($a2) ## 00000010 -/* 00048 809A91F8 8CF90014 */ lw $t9, 0x0014($a3) ## 00000014 -/* 0004C 809A91FC ACD90014 */ sw $t9, 0x0014($a2) ## 00000014 -/* 00050 809A9200 8CE90018 */ lw $t1, 0x0018($a3) ## 00000018 -/* 00054 809A9204 ACC90018 */ sw $t1, 0x0018($a2) ## 00000018 -/* 00058 809A9208 8CE8001C */ lw $t0, 0x001C($a3) ## 0000001C -/* 0005C 809A920C ACC8001C */ sw $t0, 0x001C($a2) ## 0000001C -/* 00060 809A9210 8CE90020 */ lw $t1, 0x0020($a3) ## 00000020 -/* 00064 809A9214 A4CA005C */ sh $t2, 0x005C($a2) ## 0000005C -/* 00068 809A9218 ACC90020 */ sw $t1, 0x0020($a2) ## 00000020 -/* 0006C 809A921C 84EB0024 */ lh $t3, 0x0024($a3) ## 00000024 -/* 00070 809A9220 A4CC0040 */ sh $t4, 0x0040($a2) ## 00000040 -/* 00074 809A9224 A4CB004C */ sh $t3, 0x004C($a2) ## 0000004C -/* 00078 809A9228 AFA70024 */ sw $a3, 0x0024($sp) -/* 0007C 809A922C 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 00080 809A9230 AFA60020 */ sw $a2, 0x0020($sp) -/* 00084 809A9234 4600010D */ trunc.w.s $f4, $f0 -/* 00088 809A9238 8FA60020 */ lw $a2, 0x0020($sp) -/* 0008C 809A923C 8FA70024 */ lw $a3, 0x0024($sp) -/* 00090 809A9240 3C09809B */ lui $t1, %hi(func_809A9280) ## $t1 = 809B0000 -/* 00094 809A9244 44182000 */ mfc1 $t8, $f4 -/* 00098 809A9248 3C0A809B */ lui $t2, %hi(func_809A951C) ## $t2 = 809B0000 -/* 0009C 809A924C 25299280 */ addiu $t1, $t1, %lo(func_809A9280) ## $t1 = 809A9280 -/* 000A0 809A9250 2719FFE7 */ addiu $t9, $t8, 0xFFE7 ## $t9 = FFFFFFE7 -/* 000A4 809A9254 A4D90044 */ sh $t9, 0x0044($a2) ## 00000044 -/* 000A8 809A9258 90E80026 */ lbu $t0, 0x0026($a3) ## 00000026 -/* 000AC 809A925C 254A951C */ addiu $t2, $t2, %lo(func_809A951C) ## $t2 = 809A951C -/* 000B0 809A9260 ACC90028 */ sw $t1, 0x0028($a2) ## 00000028 -/* 000B4 809A9264 ACCA0024 */ sw $t2, 0x0024($a2) ## 00000024 -/* 000B8 809A9268 A4C80046 */ sh $t0, 0x0046($a2) ## 00000046 -/* 000BC 809A926C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 000C0 809A9270 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 000C4 809A9274 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 000C8 809A9278 03E00008 */ jr $ra -/* 000CC 809A927C 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_K_Fire/func_809A9280.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_K_Fire/func_809A9280.s deleted file mode 100644 index 4d205b23dc..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_K_Fire/func_809A9280.s +++ /dev/null @@ -1,192 +0,0 @@ -.rdata -glabel D_809A95D0 - .asciz "../z_eff_k_fire.c" - .balign 4 - -glabel D_809A95E4 - .asciz "../z_eff_k_fire.c" - .balign 4 - -glabel D_809A95F8 - .asciz "../z_eff_k_fire.c" - .balign 4 - -.late_rodata -glabel D_809A960C - .float 10000.0 - -glabel D_809A9610 - .float 3.14159274101 - -.text -glabel func_809A9280 -/* 000D0 809A9280 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 -/* 000D4 809A9284 AFBF003C */ sw $ra, 0x003C($sp) -/* 000D8 809A9288 AFB10038 */ sw $s1, 0x0038($sp) -/* 000DC 809A928C AFB00034 */ sw $s0, 0x0034($sp) -/* 000E0 809A9290 AFA40088 */ sw $a0, 0x0088($sp) -/* 000E4 809A9294 AFA5008C */ sw $a1, 0x008C($sp) -/* 000E8 809A9298 84CF004A */ lh $t7, 0x004A($a2) ## 0000004A -/* 000EC 809A929C 3C01809B */ lui $at, %hi(D_809A960C) ## $at = 809B0000 -/* 000F0 809A92A0 C420960C */ lwc1 $f0, %lo(D_809A960C)($at) -/* 000F4 809A92A4 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 000F8 809A92A8 8C910000 */ lw $s1, 0x0000($a0) ## 00000000 -/* 000FC 809A92AC 00C08025 */ or $s0, $a2, $zero ## $s0 = 00000000 -/* 00100 809A92B0 468021A0 */ cvt.s.w $f6, $f4 -/* 00104 809A92B4 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFDC -/* 00108 809A92B8 24070098 */ addiu $a3, $zero, 0x0098 ## $a3 = 00000098 -/* 0010C 809A92BC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00110 809A92C0 46003203 */ div.s $f8, $f6, $f0 -/* 00114 809A92C4 E7A8007C */ swc1 $f8, 0x007C($sp) -/* 00118 809A92C8 84D80048 */ lh $t8, 0x0048($a2) ## 00000048 -/* 0011C 809A92CC 3C06809B */ lui $a2, %hi(D_809A95D0) ## $a2 = 809B0000 -/* 00120 809A92D0 24C695D0 */ addiu $a2, $a2, %lo(D_809A95D0) ## $a2 = 809A95D0 -/* 00124 809A92D4 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 -/* 00128 809A92D8 00000000 */ nop -/* 0012C 809A92DC 46805420 */ cvt.s.w $f16, $f10 -/* 00130 809A92E0 46008483 */ div.s $f18, $f16, $f0 -/* 00134 809A92E4 0C031AB1 */ jal Graph_OpenDisps -/* 00138 809A92E8 E7B20078 */ swc1 $f18, 0x0078($sp) -/* 0013C 809A92EC C60C0000 */ lwc1 $f12, 0x0000($s0) ## 00000000 -/* 00140 809A92F0 C60E0004 */ lwc1 $f14, 0x0004($s0) ## 00000004 -/* 00144 809A92F4 8E060008 */ lw $a2, 0x0008($s0) ## 00000008 -/* 00148 809A92F8 0C034261 */ jal Matrix_Translate -/* 0014C 809A92FC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00150 809A9300 C7AC007C */ lwc1 $f12, 0x007C($sp) -/* 00154 809A9304 C7AE0078 */ lwc1 $f14, 0x0078($sp) -/* 00158 809A9308 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0015C 809A930C 44066000 */ mfc1 $a2, $f12 -/* 00160 809A9310 0C0342A3 */ jal Matrix_Scale -/* 00164 809A9314 00000000 */ nop -/* 00168 809A9318 8FB90088 */ lw $t9, 0x0088($sp) -/* 0016C 809A931C 0C024F61 */ jal func_80093D84 -/* 00170 809A9320 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 -/* 00174 809A9324 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 00178 809A9328 8FA80088 */ lw $t0, 0x0088($sp) -/* 0017C 809A932C 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 -/* 00180 809A9330 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 00184 809A9334 AE2902D0 */ sw $t1, 0x02D0($s1) ## 000002D0 -/* 00188 809A9338 354A0020 */ ori $t2, $t2, 0x0020 ## $t2 = DB060020 -/* 0018C 809A933C AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 00190 809A9340 8D040000 */ lw $a0, 0x0000($t0) ## 00000000 -/* 00194 809A9344 240B0020 */ addiu $t3, $zero, 0x0020 ## $t3 = 00000020 -/* 00198 809A9348 240C0040 */ addiu $t4, $zero, 0x0040 ## $t4 = 00000040 -/* 0019C 809A934C 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 001A0 809A9350 AFAD0018 */ sw $t5, 0x0018($sp) -/* 001A4 809A9354 AFAC0014 */ sw $t4, 0x0014($sp) -/* 001A8 809A9358 AFAB0010 */ sw $t3, 0x0010($sp) -/* 001AC 809A935C AFA0001C */ sw $zero, 0x001C($sp) -/* 001B0 809A9360 860E0044 */ lh $t6, 0x0044($s0) ## 00000044 -/* 001B4 809A9364 8D0F009C */ lw $t7, 0x009C($t0) ## 0000009C -/* 001B8 809A9368 24090080 */ addiu $t1, $zero, 0x0080 ## $t1 = 00000080 -/* 001BC 809A936C 24190020 */ addiu $t9, $zero, 0x0020 ## $t9 = 00000020 -/* 001C0 809A9370 01CF0019 */ multu $t6, $t7 -/* 001C4 809A9374 AFB90024 */ sw $t9, 0x0024($sp) -/* 001C8 809A9378 AFA90028 */ sw $t1, 0x0028($sp) -/* 001CC 809A937C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 001D0 809A9380 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 001D4 809A9384 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 001D8 809A9388 AFA20060 */ sw $v0, 0x0060($sp) -/* 001DC 809A938C 0000C012 */ mflo $t8 -/* 001E0 809A9390 AFB80020 */ sw $t8, 0x0020($sp) -/* 001E4 809A9394 0C0253D0 */ jal Gfx_TwoTexScroll -/* 001E8 809A9398 00000000 */ nop -/* 001EC 809A939C 8FA30060 */ lw $v1, 0x0060($sp) -/* 001F0 809A93A0 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 001F4 809A93A4 860A0046 */ lh $t2, 0x0046($s0) ## 00000046 -/* 001F8 809A93A8 29410064 */ slti $at, $t2, 0x0064 -/* 001FC 809A93AC 54200015 */ bnel $at, $zero, .L809A9404 -/* 00200 809A93B0 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 00204 809A93B4 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 00208 809A93B8 3C0CFA00 */ lui $t4, 0xFA00 ## $t4 = FA000000 -/* 0020C 809A93BC 358C8080 */ ori $t4, $t4, 0x8080 ## $t4 = FA008080 -/* 00210 809A93C0 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 00214 809A93C4 AE2B02D0 */ sw $t3, 0x02D0($s1) ## 000002D0 -/* 00218 809A93C8 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 0021C 809A93CC 860D0040 */ lh $t5, 0x0040($s0) ## 00000040 -/* 00220 809A93D0 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 -/* 00224 809A93D4 3C19FB00 */ lui $t9, 0xFB00 ## $t9 = FB000000 -/* 00228 809A93D8 31AE00FF */ andi $t6, $t5, 0x00FF ## $t6 = 00000000 -/* 0022C 809A93DC 01C17825 */ or $t7, $t6, $at ## $t7 = FFFF0000 -/* 00230 809A93E0 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 00234 809A93E4 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 00238 809A93E8 3C09FF0A */ lui $t1, 0xFF0A ## $t1 = FF0A0000 -/* 0023C 809A93EC 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 00240 809A93F0 AE3802D0 */ sw $t8, 0x02D0($s1) ## 000002D0 -/* 00244 809A93F4 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 00248 809A93F8 10000014 */ beq $zero, $zero, .L809A944C -/* 0024C 809A93FC AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 00250 809A9400 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -.L809A9404: -/* 00254 809A9404 3C0BFA00 */ lui $t3, 0xFA00 ## $t3 = FA000000 -/* 00258 809A9408 356B8080 */ ori $t3, $t3, 0x8080 ## $t3 = FA008080 -/* 0025C 809A940C 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 00260 809A9410 AE2A02D0 */ sw $t2, 0x02D0($s1) ## 000002D0 -/* 00264 809A9414 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 00268 809A9418 860C0040 */ lh $t4, 0x0040($s0) ## 00000040 -/* 0026C 809A941C 2401FF00 */ addiu $at, $zero, 0xFF00 ## $at = FFFFFF00 -/* 00270 809A9420 3C1900FF */ lui $t9, 0x00FF ## $t9 = 00FF0000 -/* 00274 809A9424 318D00FF */ andi $t5, $t4, 0x00FF ## $t5 = 00000080 -/* 00278 809A9428 01A17025 */ or $t6, $t5, $at ## $t6 = FFFFFF80 -/* 0027C 809A942C AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 00280 809A9430 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 00284 809A9434 3739FF00 */ ori $t9, $t9, 0xFF00 ## $t9 = 00FFFF00 -/* 00288 809A9438 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 -/* 0028C 809A943C 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 00290 809A9440 AE2F02D0 */ sw $t7, 0x02D0($s1) ## 000002D0 -/* 00294 809A9444 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 00298 809A9448 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -.L809A944C: -/* 0029C 809A944C 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 002A0 809A9450 3C0AE700 */ lui $t2, 0xE700 ## $t2 = E7000000 -/* 002A4 809A9454 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 002A8 809A9458 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 002AC 809A945C AE2902D0 */ sw $t1, 0x02D0($s1) ## 000002D0 -/* 002B0 809A9460 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 002B4 809A9464 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 002B8 809A9468 8FA40088 */ lw $a0, 0x0088($sp) -/* 002BC 809A946C 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 -/* 002C0 809A9470 0C0347F5 */ jal func_800D1FD4 -/* 002C4 809A9474 00812021 */ addu $a0, $a0, $at -/* 002C8 809A9478 8FAB008C */ lw $t3, 0x008C($sp) -/* 002CC 809A947C 3C01809B */ lui $at, %hi(D_809A9610) ## $at = 809B0000 -/* 002D0 809A9480 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 002D4 809A9484 316C0001 */ andi $t4, $t3, 0x0001 ## $t4 = 00000000 -/* 002D8 809A9488 51800004 */ beql $t4, $zero, .L809A949C -/* 002DC 809A948C 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 002E0 809A9490 0C034348 */ jal Matrix_RotateY -/* 002E4 809A9494 C42C9610 */ lwc1 $f12, %lo(D_809A9610)($at) -/* 002E8 809A9498 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -.L809A949C: -/* 002EC 809A949C 3C0EDA38 */ lui $t6, 0xDA38 ## $t6 = DA380000 -/* 002F0 809A94A0 35CE0003 */ ori $t6, $t6, 0x0003 ## $t6 = DA380003 -/* 002F4 809A94A4 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 002F8 809A94A8 AE2D02D0 */ sw $t5, 0x02D0($s1) ## 000002D0 -/* 002FC 809A94AC AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 00300 809A94B0 8FAF0088 */ lw $t7, 0x0088($sp) -/* 00304 809A94B4 3C05809B */ lui $a1, %hi(D_809A95E4) ## $a1 = 809B0000 -/* 00308 809A94B8 24A595E4 */ addiu $a1, $a1, %lo(D_809A95E4) ## $a1 = 809A95E4 -/* 0030C 809A94BC 240600D7 */ addiu $a2, $zero, 0x00D7 ## $a2 = 000000D7 -/* 00310 809A94C0 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 00314 809A94C4 0C0346A2 */ jal Matrix_NewMtx -/* 00318 809A94C8 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 0031C 809A94CC AE020004 */ sw $v0, 0x0004($s0) ## 00000004 -/* 00320 809A94D0 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 00324 809A94D4 3C090405 */ lui $t1, 0x0405 ## $t1 = 04050000 -/* 00328 809A94D8 2529D4E0 */ addiu $t1, $t1, 0xD4E0 ## $t1 = 0404D4E0 -/* 0032C 809A94DC 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 00330 809A94E0 AE3802D0 */ sw $t8, 0x02D0($s1) ## 000002D0 -/* 00334 809A94E4 3C19DE00 */ lui $t9, 0xDE00 ## $t9 = DE000000 -/* 00338 809A94E8 3C06809B */ lui $a2, %hi(D_809A95F8) ## $a2 = 809B0000 -/* 0033C 809A94EC 24C695F8 */ addiu $a2, $a2, %lo(D_809A95F8) ## $a2 = 809A95F8 -/* 00340 809A94F0 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFDC -/* 00344 809A94F4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00348 809A94F8 240700DC */ addiu $a3, $zero, 0x00DC ## $a3 = 000000DC -/* 0034C 809A94FC AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 00350 809A9500 0C031AD5 */ jal Graph_CloseDisps -/* 00354 809A9504 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 00358 809A9508 8FBF003C */ lw $ra, 0x003C($sp) -/* 0035C 809A950C 8FB00034 */ lw $s0, 0x0034($sp) -/* 00360 809A9510 8FB10038 */ lw $s1, 0x0038($sp) -/* 00364 809A9514 03E00008 */ jr $ra -/* 00368 809A9518 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_K_Fire/func_809A951C.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_K_Fire/func_809A951C.s deleted file mode 100644 index 76a6dfcfb5..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_K_Fire/func_809A951C.s +++ /dev/null @@ -1,46 +0,0 @@ -glabel func_809A951C -/* 0036C 809A951C AFA40000 */ sw $a0, 0x0000($sp) -/* 00370 809A9520 AFA50004 */ sw $a1, 0x0004($sp) -/* 00374 809A9524 84C3004C */ lh $v1, 0x004C($a2) ## 0000004C -/* 00378 809A9528 84C2004A */ lh $v0, 0x004A($a2) ## 0000004A -/* 0037C 809A952C 0043082A */ slt $at, $v0, $v1 -/* 00380 809A9530 1020000F */ beq $at, $zero, .L809A9570 -/* 00384 809A9534 244E0004 */ addiu $t6, $v0, 0x0004 ## $t6 = 00000004 -/* 00388 809A9538 A4CE004A */ sh $t6, 0x004A($a2) ## 0000004A -/* 0038C 809A953C 84CF0048 */ lh $t7, 0x0048($a2) ## 00000048 -/* 00390 809A9540 84D9004A */ lh $t9, 0x004A($a2) ## 0000004A -/* 00394 809A9544 25F80004 */ addiu $t8, $t7, 0x0004 ## $t8 = 00000004 -/* 00398 809A9548 0079082A */ slt $at, $v1, $t9 -/* 0039C 809A954C 10200011 */ beq $at, $zero, .L809A9594 -/* 003A0 809A9550 A4D80048 */ sh $t8, 0x0048($a2) ## 00000048 -/* 003A4 809A9554 84C80046 */ lh $t0, 0x0046($a2) ## 00000046 -/* 003A8 809A9558 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 003AC 809A955C A4C3004A */ sh $v1, 0x004A($a2) ## 0000004A -/* 003B0 809A9560 5101000D */ beql $t0, $at, .L809A9598 -/* 003B4 809A9564 84CB0046 */ lh $t3, 0x0046($a2) ## 00000046 -/* 003B8 809A9568 1000000A */ beq $zero, $zero, .L809A9594 -/* 003BC 809A956C A4C30048 */ sh $v1, 0x0048($a2) ## 00000048 -.L809A9570: -/* 003C0 809A9570 84C20040 */ lh $v0, 0x0040($a2) ## 00000040 -/* 003C4 809A9574 18400007 */ blez $v0, .L809A9594 -/* 003C8 809A9578 2449FFF6 */ addiu $t1, $v0, 0xFFF6 ## $t1 = FFFFFFF6 -/* 003CC 809A957C A4C90040 */ sh $t1, 0x0040($a2) ## 00000040 -/* 003D0 809A9580 84CA0040 */ lh $t2, 0x0040($a2) ## 00000040 -/* 003D4 809A9584 5D400004 */ bgtzl $t2, .L809A9598 -/* 003D8 809A9588 84CB0046 */ lh $t3, 0x0046($a2) ## 00000046 -/* 003DC 809A958C A4C00040 */ sh $zero, 0x0040($a2) ## 00000040 -/* 003E0 809A9590 A4C0005C */ sh $zero, 0x005C($a2) ## 0000005C -.L809A9594: -/* 003E4 809A9594 84CB0046 */ lh $t3, 0x0046($a2) ## 00000046 -.L809A9598: -/* 003E8 809A9598 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 003EC 809A959C 15610004 */ bne $t3, $at, .L809A95B0 -/* 003F0 809A95A0 00000000 */ nop -/* 003F4 809A95A4 84CC0048 */ lh $t4, 0x0048($a2) ## 00000048 -/* 003F8 809A95A8 258D0001 */ addiu $t5, $t4, 0x0001 ## $t5 = 00000001 -/* 003FC 809A95AC A4CD0048 */ sh $t5, 0x0048($a2) ## 00000048 -.L809A95B0: -/* 00400 809A95B0 03E00008 */ jr $ra -/* 00404 809A95B4 00000000 */ nop -/* 00408 809A95B8 00000000 */ nop -/* 0040C 809A95BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/EffectSsKakera_Init.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/EffectSsKakera_Init.s deleted file mode 100644 index 29cc4e7ba3..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/EffectSsKakera_Init.s +++ /dev/null @@ -1,127 +0,0 @@ -.rdata -glabel D_809AA5C0 - .asciz "shape_modelがNULL\n" - .balign 4 - -glabel D_809AA5D4 - .asciz "../z_eff_kakera.c" - .balign 4 - -.late_rodata -glabel D_809AA668 - .float 32767.0 - -glabel D_809AA66C - .float 32767.0 - -.text -glabel EffectSsKakera_Init -/* 00000 809A9680 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00004 809A9684 AFBF001C */ sw $ra, 0x001C($sp) -/* 00008 809A9688 AFB10018 */ sw $s1, 0x0018($sp) -/* 0000C 809A968C AFB00014 */ sw $s0, 0x0014($sp) -/* 00010 809A9690 AFA40020 */ sw $a0, 0x0020($sp) -/* 00014 809A9694 AFA50024 */ sw $a1, 0x0024($sp) -/* 00018 809A9698 8CEF0000 */ lw $t7, 0x0000($a3) ## 00000000 -/* 0001C 809A969C 24090065 */ addiu $t1, $zero, 0x0065 ## $t1 = 00000065 -/* 00020 809A96A0 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 00024 809A96A4 ACCF0000 */ sw $t7, 0x0000($a2) ## 00000000 -/* 00028 809A96A8 8CEE0004 */ lw $t6, 0x0004($a3) ## 00000004 -/* 0002C 809A96AC 00C08025 */ or $s0, $a2, $zero ## $s0 = 00000000 -/* 00030 809A96B0 00E08825 */ or $s1, $a3, $zero ## $s1 = 00000000 -/* 00034 809A96B4 ACCE0004 */ sw $t6, 0x0004($a2) ## 00000004 -/* 00038 809A96B8 8CEF0008 */ lw $t7, 0x0008($a3) ## 00000008 -/* 0003C 809A96BC 3C04809B */ lui $a0, %hi(D_809AA5C0) ## $a0 = 809B0000 -/* 00040 809A96C0 ACCF0008 */ sw $t7, 0x0008($a2) ## 00000008 -/* 00044 809A96C4 8CF9000C */ lw $t9, 0x000C($a3) ## 0000000C -/* 00048 809A96C8 ACD9000C */ sw $t9, 0x000C($a2) ## 0000000C -/* 0004C 809A96CC 8CF80010 */ lw $t8, 0x0010($a3) ## 00000010 -/* 00050 809A96D0 ACD80010 */ sw $t8, 0x0010($a2) ## 00000010 -/* 00054 809A96D4 8CF90014 */ lw $t9, 0x0014($a3) ## 00000014 -/* 00058 809A96D8 ACD90014 */ sw $t9, 0x0014($a2) ## 00000014 -/* 0005C 809A96DC 8CE80034 */ lw $t0, 0x0034($a3) ## 00000034 -/* 00060 809A96E0 A0C9005E */ sb $t1, 0x005E($a2) ## 0000005E -/* 00064 809A96E4 A4C8005C */ sh $t0, 0x005C($a2) ## 0000005C -/* 00068 809A96E8 8CE3003C */ lw $v1, 0x003C($a3) ## 0000003C -/* 0006C 809A96EC 10600011 */ beq $v1, $zero, .L809A9734 -/* 00070 809A96F0 00000000 */ nop -/* 00074 809A96F4 ACC30038 */ sw $v1, 0x0038($a2) ## 00000038 -/* 00078 809A96F8 84E6003A */ lh $a2, 0x003A($a3) ## 0000003A -/* 0007C 809A96FC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00080 809A9700 240AFFFF */ addiu $t2, $zero, 0xFFFF ## $t2 = FFFFFFFF -/* 00084 809A9704 10C10005 */ beq $a2, $at, .L809A971C -/* 00088 809A9708 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0008C 809A970C 10C10003 */ beq $a2, $at, .L809A971C -/* 00090 809A9710 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00094 809A9714 14C10003 */ bne $a2, $at, .L809A9724 -/* 00098 809A9718 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L809A971C: -/* 0009C 809A971C 1000000B */ beq $zero, $zero, .L809A974C -/* 000A0 809A9720 A60A0054 */ sh $t2, 0x0054($s0) ## 00000054 -.L809A9724: -/* 000A4 809A9724 0C26A6EA */ jal func_809A9BA8 -/* 000A8 809A9728 A6060054 */ sh $a2, 0x0054($s0) ## 00000054 -/* 000AC 809A972C 10000007 */ beq $zero, $zero, .L809A974C -/* 000B0 809A9730 00000000 */ nop -.L809A9734: -/* 000B4 809A9734 0C00084C */ jal osSyncPrintf - -/* 000B8 809A9738 2484A5C0 */ addiu $a0, $a0, %lo(D_809AA5C0) ## $a0 = FFFFA5C0 -/* 000BC 809A973C 3C04809B */ lui $a0, %hi(D_809AA5D4) ## $a0 = 809B0000 -/* 000C0 809A9740 2484A5D4 */ addiu $a0, $a0, %lo(D_809AA5D4) ## $a0 = 809AA5D4 -/* 000C4 809A9744 0C000B94 */ jal LogUtils_HungupThread -/* 000C8 809A9748 240500B2 */ addiu $a1, $zero, 0x00B2 ## $a1 = 000000B2 -.L809A974C: -/* 000CC 809A974C 3C0B809B */ lui $t3, %hi(func_809A9874) ## $t3 = 809B0000 -/* 000D0 809A9750 3C0C809B */ lui $t4, %hi(func_809AA430) ## $t4 = 809B0000 -/* 000D4 809A9754 256B9874 */ addiu $t3, $t3, %lo(func_809A9874) ## $t3 = 809A9874 -/* 000D8 809A9758 258CA430 */ addiu $t4, $t4, %lo(func_809AA430) ## $t4 = 809AA430 -/* 000DC 809A975C AE0B0028 */ sw $t3, 0x0028($s0) ## 00000028 -/* 000E0 809A9760 AE0C0024 */ sw $t4, 0x0024($s0) ## 00000024 -/* 000E4 809A9764 8E2E0018 */ lw $t6, 0x0018($s1) ## 00000018 -/* 000E8 809A9768 AE0E002C */ sw $t6, 0x002C($s0) ## 0000002C -/* 000EC 809A976C 8E2D001C */ lw $t5, 0x001C($s1) ## 0000001C -/* 000F0 809A9770 AE0D0030 */ sw $t5, 0x0030($s0) ## 00000030 -/* 000F4 809A9774 8E2E0020 */ lw $t6, 0x0020($s1) ## 00000020 -/* 000F8 809A9778 AE0E0034 */ sw $t6, 0x0034($s0) ## 00000034 -/* 000FC 809A977C 862F002C */ lh $t7, 0x002C($s1) ## 0000002C -/* 00100 809A9780 A60F0040 */ sh $t7, 0x0040($s0) ## 00000040 -/* 00104 809A9784 86380024 */ lh $t8, 0x0024($s1) ## 00000024 -/* 00108 809A9788 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 0010C 809A978C A6180042 */ sh $t8, 0x0042($s0) ## 00000042 -/* 00110 809A9790 3C01809B */ lui $at, %hi(D_809AA668) ## $at = 809B0000 -/* 00114 809A9794 C424A668 */ lwc1 $f4, %lo(D_809AA668)($at) -/* 00118 809A9798 46040182 */ mul.s $f6, $f0, $f4 -/* 0011C 809A979C 4600320D */ trunc.w.s $f8, $f6 -/* 00120 809A97A0 44084000 */ mfc1 $t0, $f8 -/* 00124 809A97A4 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00128 809A97A8 A6080044 */ sh $t0, 0x0044($s0) ## 00000044 -/* 0012C 809A97AC 3C01809B */ lui $at, %hi(D_809AA66C) ## $at = 809B0000 -/* 00130 809A97B0 C42AA66C */ lwc1 $f10, %lo(D_809AA66C)($at) -/* 00134 809A97B4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00138 809A97B8 460A0402 */ mul.s $f16, $f0, $f10 -/* 0013C 809A97BC 4600848D */ trunc.w.s $f18, $f16 -/* 00140 809A97C0 440A9000 */ mfc1 $t2, $f18 -/* 00144 809A97C4 00000000 */ nop -/* 00148 809A97C8 A60A0046 */ sh $t2, 0x0046($s0) ## 00000046 -/* 0014C 809A97CC 862B0026 */ lh $t3, 0x0026($s1) ## 00000026 -/* 00150 809A97D0 A60B0048 */ sh $t3, 0x0048($s0) ## 00000048 -/* 00154 809A97D4 862C0028 */ lh $t4, 0x0028($s1) ## 00000028 -/* 00158 809A97D8 A60C004A */ sh $t4, 0x004A($s0) ## 0000004A -/* 0015C 809A97DC 862D002A */ lh $t5, 0x002A($s1) ## 0000002A -/* 00160 809A97E0 A60D004C */ sh $t5, 0x004C($s0) ## 0000004C -/* 00164 809A97E4 862E002E */ lh $t6, 0x002E($s1) ## 0000002E -/* 00168 809A97E8 A60E004E */ sh $t6, 0x004E($s0) ## 0000004E -/* 0016C 809A97EC 862F0030 */ lh $t7, 0x0030($s1) ## 00000030 -/* 00170 809A97F0 A60F0050 */ sh $t7, 0x0050($s0) ## 00000050 -/* 00174 809A97F4 86380032 */ lh $t8, 0x0032($s1) ## 00000032 -/* 00178 809A97F8 A6180052 */ sh $t8, 0x0052($s0) ## 00000052 -/* 0017C 809A97FC 86390038 */ lh $t9, 0x0038($s1) ## 00000038 -/* 00180 809A9800 A6190058 */ sh $t9, 0x0058($s0) ## 00000058 -/* 00184 809A9804 8FBF001C */ lw $ra, 0x001C($sp) -/* 00188 809A9808 8FB10018 */ lw $s1, 0x0018($sp) -/* 0018C 809A980C 8FB00014 */ lw $s0, 0x0014($sp) -/* 00190 809A9810 03E00008 */ jr $ra -/* 00194 809A9814 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9818.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9818.s deleted file mode 100644 index aa5c3cf2b1..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9818.s +++ /dev/null @@ -1,33 +0,0 @@ -.rdata -glabel D_809AA5E8 - .asciz "範囲がマイナス！！(randomD_sectionUniformity)\n" - .balign 4 - -.text -glabel func_809A9818 -/* 00198 809A9818 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 0019C 809A981C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 001A0 809A9820 3C04809B */ lui $a0, %hi(D_809AA5E8) ## $a0 = 809B0000 -/* 001A4 809A9824 4604703C */ c.lt.s $f14, $f4 -/* 001A8 809A9828 AFBF0014 */ sw $ra, 0x0014($sp) -/* 001AC 809A982C E7AC0018 */ swc1 $f12, 0x0018($sp) -/* 001B0 809A9830 2484A5E8 */ addiu $a0, $a0, %lo(D_809AA5E8) ## $a0 = 809AA5E8 -/* 001B4 809A9834 45000004 */ bc1f .L809A9848 -/* 001B8 809A9838 00000000 */ nop -/* 001BC 809A983C 0C00084C */ jal osSyncPrintf - -/* 001C0 809A9840 E7AE001C */ swc1 $f14, 0x001C($sp) -/* 001C4 809A9844 C7AE001C */ lwc1 $f14, 0x001C($sp) -.L809A9848: -/* 001C8 809A9848 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 001CC 809A984C E7AE001C */ swc1 $f14, 0x001C($sp) -/* 001D0 809A9850 C7AE001C */ lwc1 $f14, 0x001C($sp) -/* 001D4 809A9854 8FBF0014 */ lw $ra, 0x0014($sp) -/* 001D8 809A9858 C7AA0018 */ lwc1 $f10, 0x0018($sp) -/* 001DC 809A985C 460E0082 */ mul.s $f2, $f0, $f14 -/* 001E0 809A9860 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 001E4 809A9864 46021180 */ add.s $f6, $f2, $f2 -/* 001E8 809A9868 460E3201 */ sub.s $f8, $f6, $f14 -/* 001EC 809A986C 03E00008 */ jr $ra -/* 001F0 809A9870 460A4000 */ add.s $f0, $f8, $f10 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9874.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9874.s deleted file mode 100644 index 790fe56292..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9874.s +++ /dev/null @@ -1,238 +0,0 @@ -.rdata -glabel D_809AA618 - .asciz "../z_eff_kakera.c" - .balign 4 - -glabel D_809AA62C - .asciz "../z_eff_kakera.c" - .balign 4 - -glabel D_809AA640 - .asciz "../z_eff_kakera.c" - .balign 4 - -glabel D_809AA654 - .asciz "../z_eff_kakera.c" - .balign 4 - -.late_rodata -glabel D_809AA670 - .float 0.01 - -glabel D_809AA674 - .float 0.01 - -.text -glabel func_809A9874 -/* 001F4 809A9874 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 001F8 809A9878 AFBF001C */ sw $ra, 0x001C($sp) -/* 001FC 809A987C AFB10018 */ sw $s1, 0x0018($sp) -/* 00200 809A9880 AFB00014 */ sw $s0, 0x0014($sp) -/* 00204 809A9884 AFA40068 */ sw $a0, 0x0068($sp) -/* 00208 809A9888 AFA5006C */ sw $a1, 0x006C($sp) -/* 0020C 809A988C 84CF004E */ lh $t7, 0x004E($a2) ## 0000004E -/* 00210 809A9890 3C013B80 */ lui $at, 0x3B80 ## $at = 3B800000 -/* 00214 809A9894 44814000 */ mtc1 $at, $f8 ## $f8 = 0.00 -/* 00218 809A9898 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 0021C 809A989C 8C900000 */ lw $s0, 0x0000($a0) ## 00000000 -/* 00220 809A98A0 00C08825 */ or $s1, $a2, $zero ## $s1 = 00000000 -/* 00224 809A98A4 468021A0 */ cvt.s.w $f6, $f4 -/* 00228 809A98A8 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC -/* 0022C 809A98AC 240700F1 */ addiu $a3, $zero, 0x00F1 ## $a3 = 000000F1 -/* 00230 809A98B0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00234 809A98B4 46083282 */ mul.s $f10, $f6, $f8 -/* 00238 809A98B8 E7AA005C */ swc1 $f10, 0x005C($sp) -/* 0023C 809A98BC 84D80058 */ lh $t8, 0x0058($a2) ## 00000058 -/* 00240 809A98C0 3C06809B */ lui $a2, %hi(D_809AA618) ## $a2 = 809B0000 -/* 00244 809A98C4 24C6A618 */ addiu $a2, $a2, %lo(D_809AA618) ## $a2 = 809AA618 -/* 00248 809A98C8 0C031AB1 */ jal Graph_OpenDisps -/* 0024C 809A98CC AFB80058 */ sw $t8, 0x0058($sp) -/* 00250 809A98D0 86390054 */ lh $t9, 0x0054($s1) ## 00000054 -/* 00254 809A98D4 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 00258 809A98D8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0025C 809A98DC 5321002A */ beql $t9, $at, .L809A9988 -/* 00260 809A98E0 C62C0000 */ lwc1 $f12, 0x0000($s1) ## 00000000 -/* 00264 809A98E4 86280048 */ lh $t0, 0x0048($s1) ## 00000048 -/* 00268 809A98E8 24010080 */ addiu $at, $zero, 0x0080 ## $at = 00000080 -/* 0026C 809A98EC 000849C3 */ sra $t1, $t0, 7 -/* 00270 809A98F0 312A0001 */ andi $t2, $t1, 0x0001 ## $t2 = 00000000 -/* 00274 809A98F4 000A59C0 */ sll $t3, $t2, 7 -/* 00278 809A98F8 55610013 */ bnel $t3, $at, .L809A9948 -/* 0027C 809A98FC 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 00280 809A9900 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00284 809A9904 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 -/* 00288 809A9908 35AD0018 */ ori $t5, $t5, 0x0018 ## $t5 = DB060018 -/* 0028C 809A990C 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 00290 809A9910 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 -/* 00294 809A9914 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 00298 809A9918 862F0056 */ lh $t7, 0x0056($s1) ## 00000056 -/* 0029C 809A991C 8FAE0068 */ lw $t6, 0x0068($sp) -/* 002A0 809A9920 3C080001 */ lui $t0, 0x0001 ## $t0 = 00010000 -/* 002A4 809A9924 000FC100 */ sll $t8, $t7, 4 -/* 002A8 809A9928 030FC021 */ addu $t8, $t8, $t7 -/* 002AC 809A992C 0018C080 */ sll $t8, $t8, 2 -/* 002B0 809A9930 01D8C821 */ addu $t9, $t6, $t8 -/* 002B4 809A9934 01194021 */ addu $t0, $t0, $t9 -/* 002B8 809A9938 8D0817B4 */ lw $t0, 0x17B4($t0) ## 000117B4 -/* 002BC 809A993C 10000011 */ beq $zero, $zero, .L809A9984 -/* 002C0 809A9940 AC480004 */ sw $t0, 0x0004($v0) ## 00000004 -/* 002C4 809A9944 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -.L809A9948: -/* 002C8 809A9948 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 -/* 002CC 809A994C 354A0018 */ ori $t2, $t2, 0x0018 ## $t2 = DB060018 -/* 002D0 809A9950 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 002D4 809A9954 AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 -/* 002D8 809A9958 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 002DC 809A995C 862C0056 */ lh $t4, 0x0056($s1) ## 00000056 -/* 002E0 809A9960 8FAB0068 */ lw $t3, 0x0068($sp) -/* 002E4 809A9964 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 -/* 002E8 809A9968 000C6900 */ sll $t5, $t4, 4 -/* 002EC 809A996C 01AC6821 */ addu $t5, $t5, $t4 -/* 002F0 809A9970 000D6880 */ sll $t5, $t5, 2 -/* 002F4 809A9974 016D7821 */ addu $t7, $t3, $t5 -/* 002F8 809A9978 01CF7021 */ addu $t6, $t6, $t7 -/* 002FC 809A997C 8DCE17B4 */ lw $t6, 0x17B4($t6) ## 000117B4 -/* 00300 809A9980 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -.L809A9984: -/* 00304 809A9984 C62C0000 */ lwc1 $f12, 0x0000($s1) ## 00000000 -.L809A9988: -/* 00308 809A9988 C62E0004 */ lwc1 $f14, 0x0004($s1) ## 00000004 -/* 0030C 809A998C 0C034261 */ jal Matrix_Translate -/* 00310 809A9990 8E260008 */ lw $a2, 0x0008($s1) ## 00000008 -/* 00314 809A9994 86380046 */ lh $t8, 0x0046($s1) ## 00000046 -/* 00318 809A9998 3C01809B */ lui $at, %hi(D_809AA670) ## $at = 809B0000 -/* 0031C 809A999C C424A670 */ lwc1 $f4, %lo(D_809AA670)($at) -/* 00320 809A99A0 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 -/* 00324 809A99A4 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00328 809A99A8 468084A0 */ cvt.s.w $f18, $f16 -/* 0032C 809A99AC 46049302 */ mul.s $f12, $f18, $f4 -/* 00330 809A99B0 0C034348 */ jal Matrix_RotateY -/* 00334 809A99B4 00000000 */ nop -/* 00338 809A99B8 86390044 */ lh $t9, 0x0044($s1) ## 00000044 -/* 0033C 809A99BC 3C01809B */ lui $at, %hi(D_809AA674) ## $at = 809B0000 -/* 00340 809A99C0 C42AA674 */ lwc1 $f10, %lo(D_809AA674)($at) -/* 00344 809A99C4 44993000 */ mtc1 $t9, $f6 ## $f6 = 0.00 -/* 00348 809A99C8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0034C 809A99CC 46803220 */ cvt.s.w $f8, $f6 -/* 00350 809A99D0 460A4302 */ mul.s $f12, $f8, $f10 -/* 00354 809A99D4 0C0342DC */ jal Matrix_RotateX -/* 00358 809A99D8 00000000 */ nop -/* 0035C 809A99DC C7AC005C */ lwc1 $f12, 0x005C($sp) -/* 00360 809A99E0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00364 809A99E4 44066000 */ mfc1 $a2, $f12 -/* 00368 809A99E8 0C0342A3 */ jal Matrix_Scale -/* 0036C 809A99EC 46006386 */ mov.s $f14, $f12 -/* 00370 809A99F0 86280048 */ lh $t0, 0x0048($s1) ## 00000048 -/* 00374 809A99F4 24010080 */ addiu $at, $zero, 0x0080 ## $at = 00000080 -/* 00378 809A99F8 3C18DA38 */ lui $t8, 0xDA38 ## $t8 = DA380000 -/* 0037C 809A99FC 000849C3 */ sra $t1, $t0, 7 -/* 00380 809A9A00 312A0001 */ andi $t2, $t1, 0x0001 ## $t2 = 00000000 -/* 00384 809A9A04 000A61C0 */ sll $t4, $t2, 7 -/* 00388 809A9A08 15810030 */ bne $t4, $at, .L809A9ACC -/* 0038C 809A9A0C 37180003 */ ori $t8, $t8, 0x0003 ## $t8 = DA380003 -/* 00390 809A9A10 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00394 809A9A14 3C0DDA38 */ lui $t5, 0xDA38 ## $t5 = DA380000 -/* 00398 809A9A18 35AD0003 */ ori $t5, $t5, 0x0003 ## $t5 = DA380003 -/* 0039C 809A9A1C 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 003A0 809A9A20 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 -/* 003A4 809A9A24 3C05809B */ lui $a1, %hi(D_809AA62C) ## $a1 = 809B0000 -/* 003A8 809A9A28 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 003AC 809A9A2C 24A5A62C */ addiu $a1, $a1, %lo(D_809AA62C) ## $a1 = 809AA62C -/* 003B0 809A9A30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 003B4 809A9A34 2406010C */ addiu $a2, $zero, 0x010C ## $a2 = 0000010C -/* 003B8 809A9A38 0C0346A2 */ jal Matrix_NewMtx -/* 003BC 809A9A3C AFA20038 */ sw $v0, 0x0038($sp) -/* 003C0 809A9A40 8FA30038 */ lw $v1, 0x0038($sp) -/* 003C4 809A9A44 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 003C8 809A9A48 8FAF0068 */ lw $t7, 0x0068($sp) -/* 003CC 809A9A4C 0C024F61 */ jal func_80093D84 -/* 003D0 809A9A50 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 003D4 809A9A54 8FA50058 */ lw $a1, 0x0058($sp) -/* 003D8 809A9A58 3C18FA00 */ lui $t8, 0xFA00 ## $t8 = FA000000 -/* 003DC 809A9A5C 3C08809B */ lui $t0, %hi(D_809AA528) ## $t0 = 809B0000 -/* 003E0 809A9A60 04A00012 */ bltz $a1, .L809A9AAC -/* 003E4 809A9A64 0005C880 */ sll $t9, $a1, 2 -/* 003E8 809A9A68 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 003EC 809A9A6C 0325C823 */ subu $t9, $t9, $a1 -/* 003F0 809A9A70 2508A528 */ addiu $t0, $t0, %lo(D_809AA528) ## $t0 = 809AA528 -/* 003F4 809A9A74 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 003F8 809A9A78 AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 -/* 003FC 809A9A7C 03281821 */ addu $v1, $t9, $t0 -/* 00400 809A9A80 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 00404 809A9A84 906D0000 */ lbu $t5, 0x0000($v1) ## 00000000 -/* 00408 809A9A88 906A0002 */ lbu $t2, 0x0002($v1) ## 00000002 -/* 0040C 809A9A8C 90790001 */ lbu $t9, 0x0001($v1) ## 00000001 -/* 00410 809A9A90 000D7E00 */ sll $t7, $t5, 24 -/* 00414 809A9A94 000A6200 */ sll $t4, $t2, 8 -/* 00418 809A9A98 018F7025 */ or $t6, $t4, $t7 ## $t6 = 00000000 -/* 0041C 809A9A9C 00194400 */ sll $t0, $t9, 16 -/* 00420 809A9AA0 01C84825 */ or $t1, $t6, $t0 ## $t1 = 809AA528 -/* 00424 809A9AA4 352A00FF */ ori $t2, $t1, 0x00FF ## $t2 = 809AA5FF -/* 00428 809A9AA8 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 -.L809A9AAC: -/* 0042C 809A9AAC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00430 809A9AB0 3C0DDE00 */ lui $t5, 0xDE00 ## $t5 = DE000000 -/* 00434 809A9AB4 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 00438 809A9AB8 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 -/* 0043C 809A9ABC AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 00440 809A9AC0 8E2C0038 */ lw $t4, 0x0038($s1) ## 00000038 -/* 00444 809A9AC4 1000002D */ beq $zero, $zero, .L809A9B7C -/* 00448 809A9AC8 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -.L809A9ACC: -/* 0044C 809A9ACC 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 00450 809A9AD0 3C05809B */ lui $a1, %hi(D_809AA640) ## $a1 = 809B0000 -/* 00454 809A9AD4 24A5A640 */ addiu $a1, $a1, %lo(D_809AA640) ## $a1 = 809AA640 -/* 00458 809A9AD8 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 0045C 809A9ADC AE0F02C0 */ sw $t7, 0x02C0($s0) ## 000002C0 -/* 00460 809A9AE0 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 00464 809A9AE4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00468 809A9AE8 2406011E */ addiu $a2, $zero, 0x011E ## $a2 = 0000011E -/* 0046C 809A9AEC 0C0346A2 */ jal Matrix_NewMtx -/* 00470 809A9AF0 AFA2002C */ sw $v0, 0x002C($sp) -/* 00474 809A9AF4 8FA3002C */ lw $v1, 0x002C($sp) -/* 00478 809A9AF8 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 0047C 809A9AFC 8FB90068 */ lw $t9, 0x0068($sp) -/* 00480 809A9B00 0C024F46 */ jal func_80093D18 -/* 00484 809A9B04 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 -/* 00488 809A9B08 8FA50058 */ lw $a1, 0x0058($sp) -/* 0048C 809A9B0C 3C08FA00 */ lui $t0, 0xFA00 ## $t0 = FA000000 -/* 00490 809A9B10 3C0A809B */ lui $t2, %hi(D_809AA528) ## $t2 = 809B0000 -/* 00494 809A9B14 04A00012 */ bltz $a1, .L809A9B60 -/* 00498 809A9B18 00054880 */ sll $t1, $a1, 2 -/* 0049C 809A9B1C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 004A0 809A9B20 01254823 */ subu $t1, $t1, $a1 -/* 004A4 809A9B24 254AA528 */ addiu $t2, $t2, %lo(D_809AA528) ## $t2 = 809AA528 -/* 004A8 809A9B28 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 004AC 809A9B2C AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 -/* 004B0 809A9B30 012A1821 */ addu $v1, $t1, $t2 -/* 004B4 809A9B34 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 -/* 004B8 809A9B38 90780000 */ lbu $t8, 0x0000($v1) ## 00000000 -/* 004BC 809A9B3C 906D0002 */ lbu $t5, 0x0002($v1) ## 00000002 -/* 004C0 809A9B40 90690001 */ lbu $t1, 0x0001($v1) ## 00000001 -/* 004C4 809A9B44 0018CE00 */ sll $t9, $t8, 24 -/* 004C8 809A9B48 000D6200 */ sll $t4, $t5, 8 -/* 004CC 809A9B4C 01997025 */ or $t6, $t4, $t9 ## $t6 = 00000000 -/* 004D0 809A9B50 00095400 */ sll $t2, $t1, 16 -/* 004D4 809A9B54 01CA5825 */ or $t3, $t6, $t2 ## $t3 = 809AA528 -/* 004D8 809A9B58 356D00FF */ ori $t5, $t3, 0x00FF ## $t5 = 809AA5FF -/* 004DC 809A9B5C AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -.L809A9B60: -/* 004E0 809A9B60 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 004E4 809A9B64 3C18DE00 */ lui $t8, 0xDE00 ## $t8 = DE000000 -/* 004E8 809A9B68 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 004EC 809A9B6C AE0F02C0 */ sw $t7, 0x02C0($s0) ## 000002C0 -/* 004F0 809A9B70 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 004F4 809A9B74 8E2C0038 */ lw $t4, 0x0038($s1) ## 00000038 -/* 004F8 809A9B78 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -.L809A9B7C: -/* 004FC 809A9B7C 3C06809B */ lui $a2, %hi(D_809AA654) ## $a2 = 809B0000 -/* 00500 809A9B80 24C6A654 */ addiu $a2, $a2, %lo(D_809AA654) ## $a2 = 809AA654 -/* 00504 809A9B84 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC -/* 00508 809A9B88 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0050C 809A9B8C 0C031AD5 */ jal Graph_CloseDisps -/* 00510 809A9B90 2407012E */ addiu $a3, $zero, 0x012E ## $a3 = 0000012E -/* 00514 809A9B94 8FBF001C */ lw $ra, 0x001C($sp) -/* 00518 809A9B98 8FB00014 */ lw $s0, 0x0014($sp) -/* 0051C 809A9B9C 8FB10018 */ lw $s1, 0x0018($sp) -/* 00520 809A9BA0 03E00008 */ jr $ra -/* 00524 809A9BA4 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9BA8.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9BA8.s deleted file mode 100644 index 443f68db8d..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9BA8.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_809A9BA8 -/* 00528 809A9BA8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0052C 809A9BAC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00530 809A9BB0 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00534 809A9BB4 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 00538 809A9BB8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0053C 809A9BBC 00A12021 */ addu $a0, $a1, $at -/* 00540 809A9BC0 84C50054 */ lh $a1, 0x0054($a2) ## 00000054 -/* 00544 809A9BC4 AFA60020 */ sw $a2, 0x0020($sp) -/* 00548 809A9BC8 0C02604B */ jal Object_GetIndex - ## ObjectIndex -/* 0054C 809A9BCC AFA4001C */ sw $a0, 0x001C($sp) -/* 00550 809A9BD0 8FA60020 */ lw $a2, 0x0020($sp) -/* 00554 809A9BD4 8FA4001C */ lw $a0, 0x001C($sp) -/* 00558 809A9BD8 A4C20056 */ sh $v0, 0x0056($a2) ## 00000056 -/* 0055C 809A9BDC 84C50056 */ lh $a1, 0x0056($a2) ## 00000056 -/* 00560 809A9BE0 04A20006 */ bltzl $a1, .L809A9BFC -/* 00564 809A9BE4 A4C0005C */ sh $zero, 0x005C($a2) ## 0000005C -/* 00568 809A9BE8 0C026062 */ jal Object_IsLoaded - -/* 0056C 809A9BEC AFA60020 */ sw $a2, 0x0020($sp) -/* 00570 809A9BF0 14400003 */ bne $v0, $zero, .L809A9C00 -/* 00574 809A9BF4 8FA60020 */ lw $a2, 0x0020($sp) -/* 00578 809A9BF8 A4C0005C */ sh $zero, 0x005C($a2) ## 0000005C -.L809A9BFC: -/* 0057C 809A9BFC ACC00028 */ sw $zero, 0x0028($a2) ## 00000028 -.L809A9C00: -/* 00580 809A9C00 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00584 809A9C04 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00588 809A9C08 03E00008 */ jr $ra -/* 0058C 809A9C0C 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9C10.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9C10.s deleted file mode 100644 index b48973d9cf..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9C10.s +++ /dev/null @@ -1,115 +0,0 @@ -glabel func_809A9C10 -/* 00590 809A9C10 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 00594 809A9C14 AFBF002C */ sw $ra, 0x002C($sp) -/* 00598 809A9C18 AFB00028 */ sw $s0, 0x0028($sp) -/* 0059C 809A9C1C F7B60020 */ sdc1 $f22, 0x0020($sp) -/* 005A0 809A9C20 F7B40018 */ sdc1 $f20, 0x0018($sp) -/* 005A4 809A9C24 848E004A */ lh $t6, 0x004A($a0) ## 0000004A -/* 005A8 809A9C28 848F004C */ lh $t7, 0x004C($a0) ## 0000004C -/* 005AC 809A9C2C 84980052 */ lh $t8, 0x0052($a0) ## 00000052 -/* 005B0 809A9C30 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 005B4 809A9C34 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 -/* 005B8 809A9C38 3C013A80 */ lui $at, 0x3A80 ## $at = 3A800000 -/* 005BC 809A9C3C 468021A0 */ cvt.s.w $f6, $f4 -/* 005C0 809A9C40 44810000 */ mtc1 $at, $f0 ## $f0 = 0.00 -/* 005C4 809A9C44 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 005C8 809A9C48 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 005CC 809A9C4C 4480B000 */ mtc1 $zero, $f22 ## $f22 = 0.00 -/* 005D0 809A9C50 468042A0 */ cvt.s.w $f10, $f8 -/* 005D4 809A9C54 46003482 */ mul.s $f18, $f6, $f0 -/* 005D8 809A9C58 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 005DC 809A9C5C 4600B306 */ mov.s $f12, $f22 -/* 005E0 809A9C60 46005502 */ mul.s $f20, $f10, $f0 -/* 005E4 809A9C64 44815000 */ mtc1 $at, $f10 ## $f10 = 4.00 -/* 005E8 809A9C68 E7B20034 */ swc1 $f18, 0x0034($sp) -/* 005EC 809A9C6C 468021A0 */ cvt.s.w $f6, $f4 -/* 005F0 809A9C70 46003202 */ mul.s $f8, $f6, $f0 -/* 005F4 809A9C74 00000000 */ nop -/* 005F8 809A9C78 460A4382 */ mul.s $f14, $f8, $f10 -/* 005FC 809A9C7C 0C26A606 */ jal func_809A9818 -/* 00600 809A9C80 E7AE0044 */ swc1 $f14, 0x0044($sp) -/* 00604 809A9C84 C604000C */ lwc1 $f4, 0x000C($s0) ## 0000000C -/* 00608 809A9C88 4600B306 */ mov.s $f12, $f22 -/* 0060C 809A9C8C C7AE0044 */ lwc1 $f14, 0x0044($sp) -/* 00610 809A9C90 46002081 */ sub.s $f2, $f4, $f0 -/* 00614 809A9C94 0C26A606 */ jal func_809A9818 -/* 00618 809A9C98 E7A20038 */ swc1 $f2, 0x0038($sp) -/* 0061C 809A9C9C C6060010 */ lwc1 $f6, 0x0010($s0) ## 00000010 -/* 00620 809A9CA0 4600B306 */ mov.s $f12, $f22 -/* 00624 809A9CA4 C7AE0044 */ lwc1 $f14, 0x0044($sp) -/* 00628 809A9CA8 46003401 */ sub.s $f16, $f6, $f0 -/* 0062C 809A9CAC 0C26A606 */ jal func_809A9818 -/* 00630 809A9CB0 E7B0003C */ swc1 $f16, 0x003C($sp) -/* 00634 809A9CB4 C7A20038 */ lwc1 $f2, 0x0038($sp) -/* 00638 809A9CB8 C6080014 */ lwc1 $f8, 0x0014($s0) ## 00000014 -/* 0063C 809A9CBC C7B0003C */ lwc1 $f16, 0x003C($sp) -/* 00640 809A9CC0 4602B03C */ c.lt.s $f22, $f2 -/* 00644 809A9CC4 C7B20034 */ lwc1 $f18, 0x0034($sp) -/* 00648 809A9CC8 46004301 */ sub.s $f12, $f8, $f0 -/* 0064C 809A9CCC 4500000B */ bc1f .L809A9CFC -/* 00650 809A9CD0 00000000 */ nop -/* 00654 809A9CD4 46121282 */ mul.s $f10, $f2, $f18 -/* 00658 809A9CD8 00000000 */ nop -/* 0065C 809A9CDC 46021102 */ mul.s $f4, $f2, $f2 -/* 00660 809A9CE0 00000000 */ nop -/* 00664 809A9CE4 46142182 */ mul.s $f6, $f4, $f20 -/* 00668 809A9CE8 C604000C */ lwc1 $f4, 0x000C($s0) ## 0000000C -/* 0066C 809A9CEC 46065200 */ add.s $f8, $f10, $f6 -/* 00670 809A9CF0 46082281 */ sub.s $f10, $f4, $f8 -/* 00674 809A9CF4 1000000A */ beq $zero, $zero, .L809A9D20 -/* 00678 809A9CF8 E60A000C */ swc1 $f10, 0x000C($s0) ## 0000000C -.L809A9CFC: -/* 0067C 809A9CFC 46121182 */ mul.s $f6, $f2, $f18 -/* 00680 809A9D00 00000000 */ nop -/* 00684 809A9D04 46021102 */ mul.s $f4, $f2, $f2 -/* 00688 809A9D08 00000000 */ nop -/* 0068C 809A9D0C 46142202 */ mul.s $f8, $f4, $f20 -/* 00690 809A9D10 C604000C */ lwc1 $f4, 0x000C($s0) ## 0000000C -/* 00694 809A9D14 46083281 */ sub.s $f10, $f6, $f8 -/* 00698 809A9D18 460A2181 */ sub.s $f6, $f4, $f10 -/* 0069C 809A9D1C E606000C */ swc1 $f6, 0x000C($s0) ## 0000000C -.L809A9D20: -/* 006A0 809A9D20 4610B03C */ c.lt.s $f22, $f16 -/* 006A4 809A9D24 00000000 */ nop -/* 006A8 809A9D28 4500000A */ bc1f .L809A9D54 -/* 006AC 809A9D2C 00000000 */ nop -/* 006B0 809A9D30 46128002 */ mul.s $f0, $f16, $f18 -/* 006B4 809A9D34 C6040010 */ lwc1 $f4, 0x0010($s0) ## 00000010 -/* 006B8 809A9D38 46108202 */ mul.s $f8, $f16, $f16 -/* 006BC 809A9D3C 00000000 */ nop -/* 006C0 809A9D40 46144082 */ mul.s $f2, $f8, $f20 -/* 006C4 809A9D44 46020280 */ add.s $f10, $f0, $f2 -/* 006C8 809A9D48 460A2181 */ sub.s $f6, $f4, $f10 -/* 006CC 809A9D4C 10000009 */ beq $zero, $zero, .L809A9D74 -/* 006D0 809A9D50 E6060010 */ swc1 $f6, 0x0010($s0) ## 00000010 -.L809A9D54: -/* 006D4 809A9D54 46128002 */ mul.s $f0, $f16, $f18 -/* 006D8 809A9D58 C6040010 */ lwc1 $f4, 0x0010($s0) ## 00000010 -/* 006DC 809A9D5C 46108202 */ mul.s $f8, $f16, $f16 -/* 006E0 809A9D60 00000000 */ nop -/* 006E4 809A9D64 46144082 */ mul.s $f2, $f8, $f20 -/* 006E8 809A9D68 46020281 */ sub.s $f10, $f0, $f2 -/* 006EC 809A9D6C 460A2181 */ sub.s $f6, $f4, $f10 -/* 006F0 809A9D70 E6060010 */ swc1 $f6, 0x0010($s0) ## 00000010 -.L809A9D74: -/* 006F4 809A9D74 460CB03C */ c.lt.s $f22, $f12 -/* 006F8 809A9D78 00000000 */ nop -/* 006FC 809A9D7C 45020007 */ bc1fl .L809A9D9C -/* 00700 809A9D80 46020201 */ sub.s $f8, $f0, $f2 -/* 00704 809A9D84 46020100 */ add.s $f4, $f0, $f2 -/* 00708 809A9D88 C6080014 */ lwc1 $f8, 0x0014($s0) ## 00000014 -/* 0070C 809A9D8C 46044281 */ sub.s $f10, $f8, $f4 -/* 00710 809A9D90 10000005 */ beq $zero, $zero, .L809A9DA8 -/* 00714 809A9D94 E60A0014 */ swc1 $f10, 0x0014($s0) ## 00000014 -/* 00718 809A9D98 46020201 */ sub.s $f8, $f0, $f2 -.L809A9D9C: -/* 0071C 809A9D9C C6060014 */ lwc1 $f6, 0x0014($s0) ## 00000014 -/* 00720 809A9DA0 46083101 */ sub.s $f4, $f6, $f8 -/* 00724 809A9DA4 E6040014 */ swc1 $f4, 0x0014($s0) ## 00000014 -.L809A9DA8: -/* 00728 809A9DA8 8FBF002C */ lw $ra, 0x002C($sp) -/* 0072C 809A9DAC D7B40018 */ ldc1 $f20, 0x0018($sp) -/* 00730 809A9DB0 D7B60020 */ ldc1 $f22, 0x0020($sp) -/* 00734 809A9DB4 8FB00028 */ lw $s0, 0x0028($sp) -/* 00738 809A9DB8 03E00008 */ jr $ra -/* 0073C 809A9DBC 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9DC0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9DC0.s deleted file mode 100644 index 897b727bfb..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9DC0.s +++ /dev/null @@ -1,7 +0,0 @@ -glabel func_809A9DC0 -/* 00740 809A9DC0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00744 809A9DC4 00000000 */ nop -/* 00748 809A9DC8 E4800020 */ swc1 $f0, 0x0020($a0) ## 00000020 -/* 0074C 809A9DCC E480001C */ swc1 $f0, 0x001C($a0) ## 0000001C -/* 00750 809A9DD0 03E00008 */ jr $ra -/* 00754 809A9DD4 E4800018 */ swc1 $f0, 0x0018($a0) ## 00000018 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9DD8.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9DD8.s deleted file mode 100644 index ead82b37fa..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9DD8.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_809A9DD8 -/* 00758 809A9DD8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0075C 809A9DDC 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 00760 809A9DE0 E7AC0000 */ swc1 $f12, 0x0000($sp) -/* 00764 809A9DE4 03E00008 */ jr $ra -/* 00768 809A9DE8 AFA50004 */ sw $a1, 0x0004($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9DEC.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9DEC.s deleted file mode 100644 index 6b78937206..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9DEC.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_809A9DEC -/* 0076C 809A9DEC 00057080 */ sll $t6, $a1, 2 -/* 00770 809A9DF0 3C01809B */ lui $at, %hi(D_809AA530) ## $at = 809B0000 -/* 00774 809A9DF4 002E0821 */ addu $at, $at, $t6 -/* 00778 809A9DF8 C422A530 */ lwc1 $f2, %lo(D_809AA530)($at) -/* 0077C 809A9DFC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00780 809A9E00 460C103C */ c.lt.s $f2, $f12 -/* 00784 809A9E04 00000000 */ nop -/* 00788 809A9E08 45020004 */ bc1fl .L809A9E1C -/* 0078C 809A9E0C 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 00790 809A9E10 03E00008 */ jr $ra -/* 00794 809A9E14 460C1003 */ div.s $f0, $f2, $f12 -.L809A9E18: -/* 00798 809A9E18 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -.L809A9E1C: -/* 0079C 809A9E1C 00000000 */ nop -/* 007A0 809A9E20 03E00008 */ jr $ra -/* 007A4 809A9E24 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9E28.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9E28.s deleted file mode 100644 index b4a22b3341..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9E28.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_809A9E28 -/* 007A8 809A9E28 460C6082 */ mul.s $f2, $f12, $f12 -/* 007AC 809A9E2C 00057080 */ sll $t6, $a1, 2 -/* 007B0 809A9E30 3C01809B */ lui $at, %hi(D_809AA530) ## $at = 809B0000 -/* 007B4 809A9E34 002E0821 */ addu $at, $at, $t6 -/* 007B8 809A9E38 C42EA530 */ lwc1 $f14, %lo(D_809AA530)($at) -/* 007BC 809A9E3C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 007C0 809A9E40 4602703C */ c.lt.s $f14, $f2 -/* 007C4 809A9E44 00000000 */ nop -/* 007C8 809A9E48 45020004 */ bc1fl .L809A9E5C -/* 007CC 809A9E4C 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 007D0 809A9E50 03E00008 */ jr $ra -/* 007D4 809A9E54 46027003 */ div.s $f0, $f14, $f2 -.L809A9E58: -/* 007D8 809A9E58 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -.L809A9E5C: -/* 007DC 809A9E5C 00000000 */ nop -/* 007E0 809A9E60 03E00008 */ jr $ra -/* 007E4 809A9E64 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9E68.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9E68.s deleted file mode 100644 index eca7862347..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9E68.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_809A9E68 -/* 007E8 809A9E68 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 007EC 809A9E6C AFBF0014 */ sw $ra, 0x0014($sp) -/* 007F0 809A9E70 0C26A78A */ jal func_809A9E28 -/* 007F4 809A9E74 00000000 */ nop -/* 007F8 809A9E78 8FBF0014 */ lw $ra, 0x0014($sp) -/* 007FC 809A9E7C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00800 809A9E80 03E00008 */ jr $ra -/* 00804 809A9E84 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9E88.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9E88.s deleted file mode 100644 index bf6d741a5f..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9E88.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_809A9E88 -/* 00808 809A9E88 84820040 */ lh $v0, 0x0040($a0) ## 00000040 -/* 0080C 809A9E8C 44866000 */ mtc1 $a2, $f12 ## $f12 = 0.00 -/* 00810 809A9E90 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00814 809A9E94 30420003 */ andi $v0, $v0, 0x0003 ## $v0 = 00000000 -/* 00818 809A9E98 1040001B */ beq $v0, $zero, .L809A9F08 -/* 0081C 809A9E9C 00027080 */ sll $t6, $v0, 2 -/* 00820 809A9EA0 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 00824 809A9EA4 3C0F809B */ lui $t7, %hi(D_809AA558) ## $t7 = 809B0000 -/* 00828 809A9EA8 25EFA558 */ addiu $t7, $t7, %lo(D_809AA558) ## $t7 = 809AA558 -/* 0082C 809A9EAC 460C103C */ c.lt.s $f2, $f12 -/* 00830 809A9EB0 01CF1821 */ addu $v1, $t6, $t7 -/* 00834 809A9EB4 45020004 */ bc1fl .L809A9EC8 -/* 00838 809A9EB8 46001006 */ mov.s $f0, $f2 -/* 0083C 809A9EBC 10000002 */ beq $zero, $zero, .L809A9EC8 -/* 00840 809A9EC0 460C1003 */ div.s $f0, $f2, $f12 -/* 00844 809A9EC4 46001006 */ mov.s $f0, $f2 -.L809A9EC8: -/* 00848 809A9EC8 C464FFFC */ lwc1 $f4, -0x0004($v1) ## FFFFFFFC -/* 0084C 809A9ECC C4A60008 */ lwc1 $f6, 0x0008($a1) ## 00000008 -/* 00850 809A9ED0 C4900018 */ lwc1 $f16, 0x0018($a0) ## 00000018 -/* 00854 809A9ED4 46062202 */ mul.s $f8, $f4, $f6 -/* 00858 809A9ED8 00000000 */ nop -/* 0085C 809A9EDC 46004282 */ mul.s $f10, $f8, $f0 -/* 00860 809A9EE0 460A8480 */ add.s $f18, $f16, $f10 -/* 00864 809A9EE4 C48A0020 */ lwc1 $f10, 0x0020($a0) ## 00000020 -/* 00868 809A9EE8 E4920018 */ swc1 $f18, 0x0018($a0) ## 00000018 -/* 0086C 809A9EEC C4A60000 */ lwc1 $f6, 0x0000($a1) ## 00000000 -/* 00870 809A9EF0 C464FFFC */ lwc1 $f4, -0x0004($v1) ## FFFFFFFC -/* 00874 809A9EF4 46062202 */ mul.s $f8, $f4, $f6 -/* 00878 809A9EF8 00000000 */ nop -/* 0087C 809A9EFC 46004402 */ mul.s $f16, $f8, $f0 -/* 00880 809A9F00 46105481 */ sub.s $f18, $f10, $f16 -/* 00884 809A9F04 E4920020 */ swc1 $f18, 0x0020($a0) ## 00000020 -.L809A9F08: -/* 00888 809A9F08 03E00008 */ jr $ra -/* 0088C 809A9F0C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9F10.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9F10.s deleted file mode 100644 index f598b0b4b6..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9F10.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_809A9F10 -/* 00890 809A9F10 AFA50004 */ sw $a1, 0x0004($sp) -/* 00894 809A9F14 AFA60008 */ sw $a2, 0x0008($sp) -/* 00898 809A9F18 84820040 */ lh $v0, 0x0040($a0) ## 00000040 -/* 0089C 809A9F1C 3C01809B */ lui $at, %hi(D_809AA560) ## $at = 809B0000 -/* 008A0 809A9F20 00021083 */ sra $v0, $v0, 2 -/* 008A4 809A9F24 30420007 */ andi $v0, $v0, 0x0007 ## $v0 = 00000000 -/* 008A8 809A9F28 10400006 */ beq $v0, $zero, .L809A9F44 -/* 008AC 809A9F2C 00027080 */ sll $t6, $v0, 2 -/* 008B0 809A9F30 002E0821 */ addu $at, $at, $t6 -/* 008B4 809A9F34 C426A560 */ lwc1 $f6, %lo(D_809AA560)($at) -/* 008B8 809A9F38 C484001C */ lwc1 $f4, 0x001C($a0) ## 0000001C -/* 008BC 809A9F3C 46062200 */ add.s $f8, $f4, $f6 -/* 008C0 809A9F40 E488001C */ swc1 $f8, 0x001C($a0) ## 0000001C -.L809A9F44: -/* 008C4 809A9F44 03E00008 */ jr $ra -/* 008C8 809A9F48 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9F4C.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9F4C.s deleted file mode 100644 index 1417b820c8..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9F4C.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_809A9F4C -/* 008CC 809A9F4C 84820040 */ lh $v0, 0x0040($a0) ## 00000040 -/* 008D0 809A9F50 44866000 */ mtc1 $a2, $f12 ## $f12 = 0.00 -/* 008D4 809A9F54 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 008D8 809A9F58 00021143 */ sra $v0, $v0, 5 -/* 008DC 809A9F5C 30420003 */ andi $v0, $v0, 0x0003 ## $v0 = 00000000 -/* 008E0 809A9F60 1040001B */ beq $v0, $zero, .L809A9FD0 -/* 008E4 809A9F64 00027080 */ sll $t6, $v0, 2 -/* 008E8 809A9F68 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 008EC 809A9F6C 3C0F809B */ lui $t7, %hi(D_809AA57C) ## $t7 = 809B0000 -/* 008F0 809A9F70 25EFA57C */ addiu $t7, $t7, %lo(D_809AA57C) ## $t7 = 809AA57C -/* 008F4 809A9F74 460C103C */ c.lt.s $f2, $f12 -/* 008F8 809A9F78 01CF1821 */ addu $v1, $t6, $t7 -/* 008FC 809A9F7C 45020004 */ bc1fl .L809A9F90 -/* 00900 809A9F80 46001006 */ mov.s $f0, $f2 -/* 00904 809A9F84 10000002 */ beq $zero, $zero, .L809A9F90 -/* 00908 809A9F88 460C1003 */ div.s $f0, $f2, $f12 -/* 0090C 809A9F8C 46001006 */ mov.s $f0, $f2 -.L809A9F90: -/* 00910 809A9F90 C4A40000 */ lwc1 $f4, 0x0000($a1) ## 00000000 -/* 00914 809A9F94 C466FFFC */ lwc1 $f6, -0x0004($v1) ## FFFFFFFC -/* 00918 809A9F98 C4900018 */ lwc1 $f16, 0x0018($a0) ## 00000018 -/* 0091C 809A9F9C 46062202 */ mul.s $f8, $f4, $f6 -/* 00920 809A9FA0 00000000 */ nop -/* 00924 809A9FA4 46004282 */ mul.s $f10, $f8, $f0 -/* 00928 809A9FA8 460A8481 */ sub.s $f18, $f16, $f10 -/* 0092C 809A9FAC C48A0020 */ lwc1 $f10, 0x0020($a0) ## 00000020 -/* 00930 809A9FB0 E4920018 */ swc1 $f18, 0x0018($a0) ## 00000018 -/* 00934 809A9FB4 C466FFFC */ lwc1 $f6, -0x0004($v1) ## FFFFFFFC -/* 00938 809A9FB8 C4A40008 */ lwc1 $f4, 0x0008($a1) ## 00000008 -/* 0093C 809A9FBC 46062202 */ mul.s $f8, $f4, $f6 -/* 00940 809A9FC0 00000000 */ nop -/* 00944 809A9FC4 46004402 */ mul.s $f16, $f8, $f0 -/* 00948 809A9FC8 46105481 */ sub.s $f18, $f10, $f16 -/* 0094C 809A9FCC E4920020 */ swc1 $f18, 0x0020($a0) ## 00000020 -.L809A9FD0: -/* 00950 809A9FD0 03E00008 */ jr $ra -/* 00954 809A9FD4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9FD8.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9FD8.s deleted file mode 100644 index 761379052c..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9FD8.s +++ /dev/null @@ -1,62 +0,0 @@ -.late_rodata -glabel D_809AA678 - .float 0.01 - -.text -glabel func_809A9FD8 -/* 00958 809A9FD8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0095C 809A9FDC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00960 809A9FE0 AFA5001C */ sw $a1, 0x001C($sp) -/* 00964 809A9FE4 84850040 */ lh $a1, 0x0040($a0) ## 00000040 -/* 00968 809A9FE8 3C19809B */ lui $t9, %hi(D_809AA588) ## $t9 = 809B0000 -/* 0096C 809A9FEC 44866000 */ mtc1 $a2, $f12 ## $f12 = 0.00 -/* 00970 809A9FF0 000529C3 */ sra $a1, $a1, 7 -/* 00974 809A9FF4 30A5000F */ andi $a1, $a1, 0x000F ## $a1 = 00000000 -/* 00978 809A9FF8 00057080 */ sll $t6, $a1, 2 -/* 0097C 809A9FFC 032EC821 */ addu $t9, $t9, $t6 -/* 00980 809AA000 8F39A588 */ lw $t9, %lo(D_809AA588)($t9) -/* 00984 809AA004 AFA40018 */ sw $a0, 0x0018($sp) -/* 00988 809AA008 0320F809 */ jalr $ra, $t9 -/* 0098C 809AA00C 00000000 */ nop -/* 00990 809AA010 8FA40018 */ lw $a0, 0x0018($sp) -/* 00994 809AA014 3C013A80 */ lui $at, 0x3A80 ## $at = 3A800000 -/* 00998 809AA018 44815000 */ mtc1 $at, $f10 ## $f10 = 0.00 -/* 0099C 809AA01C 848F0052 */ lh $t7, 0x0052($a0) ## 00000052 -/* 009A0 809AA020 46000306 */ mov.s $f12, $f0 -/* 009A4 809AA024 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 009A8 809AA028 00000000 */ nop -/* 009AC 809AA02C 468021A0 */ cvt.s.w $f6, $f4 -/* 009B0 809AA030 46003202 */ mul.s $f8, $f6, $f0 -/* 009B4 809AA034 00000000 */ nop -/* 009B8 809AA038 460A4382 */ mul.s $f14, $f8, $f10 -/* 009BC 809AA03C 0C26A606 */ jal func_809A9818 -/* 009C0 809AA040 00000000 */ nop -/* 009C4 809AA044 8FA40018 */ lw $a0, 0x0018($sp) -/* 009C8 809AA048 3C01809B */ lui $at, %hi(D_809AA678) ## $at = 809B0000 -/* 009CC 809AA04C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 009D0 809AA050 C4900018 */ lwc1 $f16, 0x0018($a0) ## 00000018 -/* 009D4 809AA054 C484001C */ lwc1 $f4, 0x001C($a0) ## 0000001C -/* 009D8 809AA058 C4880020 */ lwc1 $f8, 0x0020($a0) ## 00000020 -/* 009DC 809AA05C 46008482 */ mul.s $f18, $f16, $f0 -/* 009E0 809AA060 00000000 */ nop -/* 009E4 809AA064 46002182 */ mul.s $f6, $f4, $f0 -/* 009E8 809AA068 00000000 */ nop -/* 009EC 809AA06C 46004282 */ mul.s $f10, $f8, $f0 -/* 009F0 809AA070 E4920018 */ swc1 $f18, 0x0018($a0) ## 00000018 -/* 009F4 809AA074 C4920018 */ lwc1 $f18, 0x0018($a0) ## 00000018 -/* 009F8 809AA078 E486001C */ swc1 $f6, 0x001C($a0) ## 0000001C -/* 009FC 809AA07C C486001C */ lwc1 $f6, 0x001C($a0) ## 0000001C -/* 00A00 809AA080 E48A0020 */ swc1 $f10, 0x0020($a0) ## 00000020 -/* 00A04 809AA084 C430A678 */ lwc1 $f16, %lo(D_809AA678)($at) -/* 00A08 809AA088 C48A0020 */ lwc1 $f10, 0x0020($a0) ## 00000020 -/* 00A0C 809AA08C 46100082 */ mul.s $f2, $f0, $f16 -/* 00A10 809AA090 46029100 */ add.s $f4, $f18, $f2 -/* 00A14 809AA094 46023200 */ add.s $f8, $f6, $f2 -/* 00A18 809AA098 E4840018 */ swc1 $f4, 0x0018($a0) ## 00000018 -/* 00A1C 809AA09C 46025400 */ add.s $f16, $f10, $f2 -/* 00A20 809AA0A0 E488001C */ swc1 $f8, 0x001C($a0) ## 0000001C -/* 00A24 809AA0A4 E4900020 */ swc1 $f16, 0x0020($a0) ## 00000020 -/* 00A28 809AA0A8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00A2C 809AA0AC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00A30 809AA0B0 03E00008 */ jr $ra -/* 00A34 809AA0B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809AA0B8.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809AA0B8.s deleted file mode 100644 index 2745972a8d..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809AA0B8.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_809AA0B8 -/* 00A38 809AA0B8 AFA50004 */ sw $a1, 0x0004($sp) -/* 00A3C 809AA0BC AFA60008 */ sw $a2, 0x0008($sp) -/* 00A40 809AA0C0 848E0042 */ lh $t6, 0x0042($a0) ## 00000042 -/* 00A44 809AA0C4 3C013B80 */ lui $at, 0x3B80 ## $at = 3B800000 -/* 00A48 809AA0C8 44814000 */ mtc1 $at, $f8 ## $f8 = 0.00 -/* 00A4C 809AA0CC 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 00A50 809AA0D0 C490001C */ lwc1 $f16, 0x001C($a0) ## 0000001C -/* 00A54 809AA0D4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00A58 809AA0D8 468021A0 */ cvt.s.w $f6, $f4 -/* 00A5C 809AA0DC 46083282 */ mul.s $f10, $f6, $f8 -/* 00A60 809AA0E0 460A8480 */ add.s $f18, $f16, $f10 -/* 00A64 809AA0E4 03E00008 */ jr $ra -/* 00A68 809AA0E8 E492001C */ swc1 $f18, 0x001C($a0) ## 0000001C diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809AA0EC.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809AA0EC.s deleted file mode 100644 index 0d153c35ae..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809AA0EC.s +++ /dev/null @@ -1,88 +0,0 @@ -glabel func_809AA0EC -/* 00A6C 809AA0EC 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00A70 809AA0F0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00A74 809AA0F4 AFB00020 */ sw $s0, 0x0020($sp) -/* 00A78 809AA0F8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00A7C 809AA0FC 0C26A770 */ jal func_809A9DC0 -/* 00A80 809AA100 F7B40018 */ sdc1 $f20, 0x0018($sp) -/* 00A84 809AA104 C6040000 */ lwc1 $f4, 0x0000($s0) ## 00000000 -/* 00A88 809AA108 C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C -/* 00A8C 809AA10C 3C01447A */ lui $at, 0x447A ## $at = 447A0000 -/* 00A90 809AA110 46062201 */ sub.s $f8, $f4, $f6 -/* 00A94 809AA114 E7A8002C */ swc1 $f8, 0x002C($sp) -/* 00A98 809AA118 C6100030 */ lwc1 $f16, 0x0030($s0) ## 00000030 -/* 00A9C 809AA11C C60A0004 */ lwc1 $f10, 0x0004($s0) ## 00000004 -/* 00AA0 809AA120 46105481 */ sub.s $f18, $f10, $f16 -/* 00AA4 809AA124 C7AA002C */ lwc1 $f10, 0x002C($sp) -/* 00AA8 809AA128 E7B20030 */ swc1 $f18, 0x0030($sp) -/* 00AAC 809AA12C C6060034 */ lwc1 $f6, 0x0034($s0) ## 00000034 -/* 00AB0 809AA130 C6040008 */ lwc1 $f4, 0x0008($s0) ## 00000008 -/* 00AB4 809AA134 460A5402 */ mul.s $f16, $f10, $f10 -/* 00AB8 809AA138 C7B20030 */ lwc1 $f18, 0x0030($sp) -/* 00ABC 809AA13C 46062201 */ sub.s $f8, $f4, $f6 -/* 00AC0 809AA140 46129102 */ mul.s $f4, $f18, $f18 -/* 00AC4 809AA144 44819000 */ mtc1 $at, $f18 ## $f18 = 1000.00 -/* 00AC8 809AA148 E7A80034 */ swc1 $f8, 0x0034($sp) -/* 00ACC 809AA14C C7A80034 */ lwc1 $f8, 0x0034($sp) -/* 00AD0 809AA150 46084282 */ mul.s $f10, $f8, $f8 -/* 00AD4 809AA154 46048180 */ add.s $f6, $f16, $f4 -/* 00AD8 809AA158 460A3000 */ add.s $f0, $f6, $f10 -/* 00ADC 809AA15C 46000504 */ sqrt.s $f20, $f0 -/* 00AE0 809AA160 4614903C */ c.lt.s $f18, $f20 -/* 00AE4 809AA164 00000000 */ nop -/* 00AE8 809AA168 45020004 */ bc1fl .L809AA17C -/* 00AEC 809AA16C 860E0040 */ lh $t6, 0x0040($s0) ## 00000040 -/* 00AF0 809AA170 1000002A */ beq $zero, $zero, .L809AA21C -/* 00AF4 809AA174 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00AF8 809AA178 860E0040 */ lh $t6, 0x0040($s0) ## 00000040 -.L809AA17C: -/* 00AFC 809AA17C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B00 809AA180 51C0001E */ beql $t6, $zero, .L809AA1FC -/* 00B04 809AA184 4406A000 */ mfc1 $a2, $f20 -/* 00B08 809AA188 4406A000 */ mfc1 $a2, $f20 -/* 00B0C 809AA18C 0C26A7A2 */ jal func_809A9E88 -/* 00B10 809AA190 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFF4 -/* 00B14 809AA194 14400003 */ bne $v0, $zero, .L809AA1A4 -/* 00B18 809AA198 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B1C 809AA19C 1000001F */ beq $zero, $zero, .L809AA21C -/* 00B20 809AA1A0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L809AA1A4: -/* 00B24 809AA1A4 4406A000 */ mfc1 $a2, $f20 -/* 00B28 809AA1A8 0C26A7C4 */ jal func_809A9F10 -/* 00B2C 809AA1AC 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFF4 -/* 00B30 809AA1B0 14400003 */ bne $v0, $zero, .L809AA1C0 -/* 00B34 809AA1B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B38 809AA1B8 10000018 */ beq $zero, $zero, .L809AA21C -/* 00B3C 809AA1BC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L809AA1C0: -/* 00B40 809AA1C0 4406A000 */ mfc1 $a2, $f20 -/* 00B44 809AA1C4 0C26A7D3 */ jal func_809A9F4C -/* 00B48 809AA1C8 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFF4 -/* 00B4C 809AA1CC 14400003 */ bne $v0, $zero, .L809AA1DC -/* 00B50 809AA1D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B54 809AA1D4 10000011 */ beq $zero, $zero, .L809AA21C -/* 00B58 809AA1D8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L809AA1DC: -/* 00B5C 809AA1DC 4406A000 */ mfc1 $a2, $f20 -/* 00B60 809AA1E0 0C26A7F6 */ jal func_809A9FD8 -/* 00B64 809AA1E4 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFF4 -/* 00B68 809AA1E8 54400004 */ bnel $v0, $zero, .L809AA1FC -/* 00B6C 809AA1EC 4406A000 */ mfc1 $a2, $f20 -/* 00B70 809AA1F0 1000000A */ beq $zero, $zero, .L809AA21C -/* 00B74 809AA1F4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00B78 809AA1F8 4406A000 */ mfc1 $a2, $f20 -.L809AA1FC: -/* 00B7C 809AA1FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B80 809AA200 0C26A82E */ jal func_809AA0B8 -/* 00B84 809AA204 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFF4 -/* 00B88 809AA208 54400004 */ bnel $v0, $zero, .L809AA21C -/* 00B8C 809AA20C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00B90 809AA210 10000002 */ beq $zero, $zero, .L809AA21C -/* 00B94 809AA214 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00B98 809AA218 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L809AA21C: -/* 00B9C 809AA21C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00BA0 809AA220 D7B40018 */ ldc1 $f20, 0x0018($sp) -/* 00BA4 809AA224 8FB00020 */ lw $s0, 0x0020($sp) -/* 00BA8 809AA228 03E00008 */ jr $ra -/* 00BAC 809AA22C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809AA230.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809AA230.s deleted file mode 100644 index 04ff4fe5cc..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809AA230.s +++ /dev/null @@ -1,153 +0,0 @@ -.late_rodata -glabel D_809AA67C - .float 0.9 - -glabel D_809AA680 - .float 0.2 - -glabel D_809AA684 - .float -0.8 - -glabel D_809AA688 - .float 0.9 - -glabel D_809AA68C - .float 0.2 - -.text -glabel func_809AA230 -/* 00BB0 809AA230 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00BB4 809AA234 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00BB8 809AA238 AFA5001C */ sw $a1, 0x001C($sp) -/* 00BBC 809AA23C 848F0050 */ lh $t7, 0x0050($a0) ## 00000050 -/* 00BC0 809AA240 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00BC4 809AA244 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 00BC8 809AA248 55E00032 */ bnel $t7, $zero, .L809AA314 -/* 00BCC 809AA24C 84E30048 */ lh $v1, 0x0048($a3) ## 00000048 -/* 00BD0 809AA250 84830048 */ lh $v1, 0x0048($a0) ## 00000048 -/* 00BD4 809AA254 24010010 */ addiu $at, $zero, 0x0010 ## $at = 00000010 -/* 00BD8 809AA258 0003C103 */ sra $t8, $v1, 4 -/* 00BDC 809AA25C 33190001 */ andi $t9, $t8, 0x0001 ## $t9 = 00000000 -/* 00BE0 809AA260 00194100 */ sll $t0, $t9, 4 -/* 00BE4 809AA264 1501001B */ bne $t0, $at, .L809AA2D4 -/* 00BE8 809AA268 00036083 */ sra $t4, $v1, 2 -/* 00BEC 809AA26C 00034883 */ sra $t1, $v1, 2 -/* 00BF0 809AA270 312A0003 */ andi $t2, $t1, 0x0003 ## $t2 = 00000000 -/* 00BF4 809AA274 448A3000 */ mtc1 $t2, $f6 ## $f6 = 0.00 -/* 00BF8 809AA278 C4440080 */ lwc1 $f4, 0x0080($v0) ## 00000080 -/* 00BFC 809AA27C C4900004 */ lwc1 $f16, 0x0004($a0) ## 00000004 -/* 00C00 809AA280 46803220 */ cvt.s.w $f8, $f6 -/* 00C04 809AA284 306BFF9F */ andi $t3, $v1, 0xFF9F ## $t3 = 00000000 -/* 00C08 809AA288 46082281 */ sub.s $f10, $f4, $f8 -/* 00C0C 809AA28C 460A803E */ c.le.s $f16, $f10 -/* 00C10 809AA290 00000000 */ nop -/* 00C14 809AA294 45020063 */ bc1fl .L809AA424 -/* 00C18 809AA298 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00C1C 809AA29C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00C20 809AA2A0 A4800052 */ sh $zero, 0x0052($a0) ## 00000052 -/* 00C24 809AA2A4 84820052 */ lh $v0, 0x0052($a0) ## 00000052 -/* 00C28 809AA2A8 A4800040 */ sh $zero, 0x0040($a0) ## 00000040 -/* 00C2C 809AA2AC A48B0048 */ sh $t3, 0x0048($a0) ## 00000048 -/* 00C30 809AA2B0 E4800020 */ swc1 $f0, 0x0020($a0) ## 00000020 -/* 00C34 809AA2B4 E480001C */ swc1 $f0, 0x001C($a0) ## 0000001C -/* 00C38 809AA2B8 E4800018 */ swc1 $f0, 0x0018($a0) ## 00000018 -/* 00C3C 809AA2BC E4800014 */ swc1 $f0, 0x0014($a0) ## 00000014 -/* 00C40 809AA2C0 E4800010 */ swc1 $f0, 0x0010($a0) ## 00000010 -/* 00C44 809AA2C4 E480000C */ swc1 $f0, 0x000C($a0) ## 0000000C -/* 00C48 809AA2C8 A482004A */ sh $v0, 0x004A($a0) ## 0000004A -/* 00C4C 809AA2CC 10000054 */ beq $zero, $zero, .L809AA420 -/* 00C50 809AA2D0 A4820042 */ sh $v0, 0x0042($a0) ## 00000042 -.L809AA2D4: -/* 00C54 809AA2D4 318D0003 */ andi $t5, $t4, 0x0003 ## $t5 = 00000000 -/* 00C58 809AA2D8 448D3000 */ mtc1 $t5, $f6 ## $f6 = 0.00 -/* 00C5C 809AA2DC C4520080 */ lwc1 $f18, 0x0080($v0) ## 00000080 -/* 00C60 809AA2E0 3C014416 */ lui $at, 0x4416 ## $at = 44160000 -/* 00C64 809AA2E4 46803120 */ cvt.s.w $f4, $f6 -/* 00C68 809AA2E8 44815000 */ mtc1 $at, $f10 ## $f10 = 600.00 -/* 00C6C 809AA2EC C4E60004 */ lwc1 $f6, 0x0004($a3) ## 00000004 -/* 00C70 809AA2F0 46049201 */ sub.s $f8, $f18, $f4 -/* 00C74 809AA2F4 460A4401 */ sub.s $f16, $f8, $f10 -/* 00C78 809AA2F8 4610303E */ c.le.s $f6, $f16 -/* 00C7C 809AA2FC 00000000 */ nop -/* 00C80 809AA300 45020048 */ bc1fl .L809AA424 -/* 00C84 809AA304 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00C88 809AA308 10000045 */ beq $zero, $zero, .L809AA420 -/* 00C8C 809AA30C A4E0005C */ sh $zero, 0x005C($a3) ## 0000005C -/* 00C90 809AA310 84E30048 */ lh $v1, 0x0048($a3) ## 00000048 -.L809AA314: -/* 00C94 809AA314 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00C98 809AA318 30620003 */ andi $v0, $v1, 0x0003 ## $v0 = 00000000 -/* 00C9C 809AA31C 10400007 */ beq $v0, $zero, .L809AA33C -/* 00CA0 809AA320 00000000 */ nop -/* 00CA4 809AA324 10410007 */ beq $v0, $at, .L809AA344 -/* 00CA8 809AA328 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00CAC 809AA32C 10410033 */ beq $v0, $at, .L809AA3FC -/* 00CB0 809AA330 8FA4001C */ lw $a0, 0x001C($sp) -/* 00CB4 809AA334 1000003B */ beq $zero, $zero, .L809AA424 -/* 00CB8 809AA338 8FBF0014 */ lw $ra, 0x0014($sp) -.L809AA33C: -/* 00CBC 809AA33C 10000038 */ beq $zero, $zero, .L809AA420 -/* 00CC0 809AA340 A4E00050 */ sh $zero, 0x0050($a3) ## 00000050 -.L809AA344: -/* 00CC4 809AA344 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00CC8 809AA348 C4F20010 */ lwc1 $f18, 0x0010($a3) ## 00000010 -/* 00CCC 809AA34C 8FA4001C */ lw $a0, 0x001C($sp) -/* 00CD0 809AA350 00037083 */ sra $t6, $v1, 2 -/* 00CD4 809AA354 4600903C */ c.lt.s $f18, $f0 -/* 00CD8 809AA358 31CF0003 */ andi $t7, $t6, 0x0003 ## $t7 = 00000000 -/* 00CDC 809AA35C 000FC080 */ sll $t8, $t7, 2 -/* 00CE0 809AA360 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 00CE4 809AA364 4500002E */ bc1f .L809AA420 -/* 00CE8 809AA368 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 -/* 00CEC 809AA36C 3C06809B */ lui $a2, %hi(D_809AA5B0) ## $a2 = 809B0000 -/* 00CF0 809AA370 00D83021 */ addu $a2, $a2, $t8 -/* 00CF4 809AA374 8CC6A5B0 */ lw $a2, %lo(D_809AA5B0)($a2) -/* 00CF8 809AA378 0C00F8C3 */ jal func_8003E30C -/* 00CFC 809AA37C AFA70018 */ sw $a3, 0x0018($sp) -/* 00D00 809AA380 10400027 */ beq $v0, $zero, .L809AA420 -/* 00D04 809AA384 8FA70018 */ lw $a3, 0x0018($sp) -/* 00D08 809AA388 3C01809B */ lui $at, %hi(D_809AA67C) ## $at = 809B0000 -/* 00D0C 809AA38C C42CA67C */ lwc1 $f12, %lo(D_809AA67C)($at) -/* 00D10 809AA390 3C01809B */ lui $at, %hi(D_809AA680) ## $at = 809B0000 -/* 00D14 809AA394 C42EA680 */ lwc1 $f14, %lo(D_809AA680)($at) -/* 00D18 809AA398 0C26A606 */ jal func_809A9818 -/* 00D1C 809AA39C AFA70018 */ sw $a3, 0x0018($sp) -/* 00D20 809AA3A0 8FA70018 */ lw $a3, 0x0018($sp) -/* 00D24 809AA3A4 3C01809B */ lui $at, %hi(D_809AA684) ## $at = 809B0000 -/* 00D28 809AA3A8 C4E4000C */ lwc1 $f4, 0x000C($a3) ## 0000000C -/* 00D2C 809AA3AC C4EA0010 */ lwc1 $f10, 0x0010($a3) ## 00000010 -/* 00D30 809AA3B0 46002202 */ mul.s $f8, $f4, $f0 -/* 00D34 809AA3B4 E4E8000C */ swc1 $f8, 0x000C($a3) ## 0000000C -/* 00D38 809AA3B8 C430A684 */ lwc1 $f16, %lo(D_809AA684)($at) -/* 00D3C 809AA3BC 3C01809B */ lui $at, %hi(D_809AA688) ## $at = 809B0000 -/* 00D40 809AA3C0 46105182 */ mul.s $f6, $f10, $f16 -/* 00D44 809AA3C4 E4E60010 */ swc1 $f6, 0x0010($a3) ## 00000010 -/* 00D48 809AA3C8 C42CA688 */ lwc1 $f12, %lo(D_809AA688)($at) -/* 00D4C 809AA3CC 3C01809B */ lui $at, %hi(D_809AA68C) ## $at = 809B0000 -/* 00D50 809AA3D0 0C26A606 */ jal func_809A9818 -/* 00D54 809AA3D4 C42EA68C */ lwc1 $f14, %lo(D_809AA68C)($at) -/* 00D58 809AA3D8 8FA70018 */ lw $a3, 0x0018($sp) -/* 00D5C 809AA3DC C4F20014 */ lwc1 $f18, 0x0014($a3) ## 00000014 -/* 00D60 809AA3E0 84E20050 */ lh $v0, 0x0050($a3) ## 00000050 -/* 00D64 809AA3E4 46009102 */ mul.s $f4, $f18, $f0 -/* 00D68 809AA3E8 2459FFFF */ addiu $t9, $v0, 0xFFFF ## $t9 = FFFFFFFF -/* 00D6C 809AA3EC 1840000C */ blez $v0, .L809AA420 -/* 00D70 809AA3F0 E4E40014 */ swc1 $f4, 0x0014($a3) ## 00000014 -/* 00D74 809AA3F4 1000000A */ beq $zero, $zero, .L809AA420 -/* 00D78 809AA3F8 A4F90050 */ sh $t9, 0x0050($a3) ## 00000050 -.L809AA3FC: -/* 00D7C 809AA3FC 00034083 */ sra $t0, $v1, 2 -/* 00D80 809AA400 31090003 */ andi $t1, $t0, 0x0003 ## $t1 = 00000000 -/* 00D84 809AA404 00095080 */ sll $t2, $t1, 2 -/* 00D88 809AA408 3C06809B */ lui $a2, %hi(D_809AA5B0) ## $a2 = 809B0000 -/* 00D8C 809AA40C 00CA3021 */ addu $a2, $a2, $t2 -/* 00D90 809AA410 8CC6A5B0 */ lw $a2, %lo(D_809AA5B0)($a2) -/* 00D94 809AA414 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 -/* 00D98 809AA418 0C00F8C3 */ jal func_8003E30C -/* 00D9C 809AA41C 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -.L809AA420: -/* 00DA0 809AA420 8FBF0014 */ lw $ra, 0x0014($sp) -.L809AA424: -/* 00DA4 809AA424 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00DA8 809AA428 03E00008 */ jr $ra -/* 00DAC 809AA42C 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809AA430.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809AA430.s deleted file mode 100644 index 734306f609..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809AA430.s +++ /dev/null @@ -1,67 +0,0 @@ -glabel func_809AA430 -/* 00DB0 809AA430 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00DB4 809AA434 AFBF001C */ sw $ra, 0x001C($sp) -/* 00DB8 809AA438 AFB00018 */ sw $s0, 0x0018($sp) -/* 00DBC 809AA43C AFA40020 */ sw $a0, 0x0020($sp) -/* 00DC0 809AA440 AFA50024 */ sw $a1, 0x0024($sp) -/* 00DC4 809AA444 84C20048 */ lh $v0, 0x0048($a2) ## 00000048 -/* 00DC8 809AA448 24010020 */ addiu $at, $zero, 0x0020 ## $at = 00000020 -/* 00DCC 809AA44C 00C08025 */ or $s0, $a2, $zero ## $s0 = 00000000 -/* 00DD0 809AA450 00021143 */ sra $v0, $v0, 5 -/* 00DD4 809AA454 30420003 */ andi $v0, $v0, 0x0003 ## $v0 = 00000000 -/* 00DD8 809AA458 00021140 */ sll $v0, $v0, 5 -/* 00DDC 809AA45C 10410007 */ beq $v0, $at, .L809AA47C -/* 00DE0 809AA460 24010040 */ addiu $at, $zero, 0x0040 ## $at = 00000040 -/* 00DE4 809AA464 1041000C */ beq $v0, $at, .L809AA498 -/* 00DE8 809AA468 24010060 */ addiu $at, $zero, 0x0060 ## $at = 00000060 -/* 00DEC 809AA46C 50410012 */ beql $v0, $at, .L809AA4B8 -/* 00DF0 809AA470 860C0044 */ lh $t4, 0x0044($s0) ## 00000044 -/* 00DF4 809AA474 10000015 */ beq $zero, $zero, .L809AA4CC -/* 00DF8 809AA478 00000000 */ nop -.L809AA47C: -/* 00DFC 809AA47C 860E0044 */ lh $t6, 0x0044($s0) ## 00000044 -/* 00E00 809AA480 86180046 */ lh $t8, 0x0046($s0) ## 00000046 -/* 00E04 809AA484 25CF000B */ addiu $t7, $t6, 0x000B ## $t7 = 0000000B -/* 00E08 809AA488 27190003 */ addiu $t9, $t8, 0x0003 ## $t9 = 00000003 -/* 00E0C 809AA48C A60F0044 */ sh $t7, 0x0044($s0) ## 00000044 -/* 00E10 809AA490 1000000E */ beq $zero, $zero, .L809AA4CC -/* 00E14 809AA494 A6190046 */ sh $t9, 0x0046($s0) ## 00000046 -.L809AA498: -/* 00E18 809AA498 86080044 */ lh $t0, 0x0044($s0) ## 00000044 -/* 00E1C 809AA49C 860A0046 */ lh $t2, 0x0046($s0) ## 00000046 -/* 00E20 809AA4A0 25090041 */ addiu $t1, $t0, 0x0041 ## $t1 = 00000041 -/* 00E24 809AA4A4 254B000B */ addiu $t3, $t2, 0x000B ## $t3 = 0000000B -/* 00E28 809AA4A8 A6090044 */ sh $t1, 0x0044($s0) ## 00000044 -/* 00E2C 809AA4AC 10000007 */ beq $zero, $zero, .L809AA4CC -/* 00E30 809AA4B0 A60B0046 */ sh $t3, 0x0046($s0) ## 00000046 -/* 00E34 809AA4B4 860C0044 */ lh $t4, 0x0044($s0) ## 00000044 -.L809AA4B8: -/* 00E38 809AA4B8 860E0046 */ lh $t6, 0x0046($s0) ## 00000046 -/* 00E3C 809AA4BC 258D009B */ addiu $t5, $t4, 0x009B ## $t5 = 0000009B -/* 00E40 809AA4C0 25CF001F */ addiu $t7, $t6, 0x001F ## $t7 = 0000001F -/* 00E44 809AA4C4 A60D0044 */ sh $t5, 0x0044($s0) ## 00000044 -/* 00E48 809AA4C8 A60F0046 */ sh $t7, 0x0046($s0) ## 00000046 -.L809AA4CC: -/* 00E4C 809AA4CC 0C26A704 */ jal func_809A9C10 -/* 00E50 809AA4D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E54 809AA4D4 0C26A83B */ jal func_809AA0EC -/* 00E58 809AA4D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E5C 809AA4DC 14400002 */ bne $v0, $zero, .L809AA4E8 -/* 00E60 809AA4E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E64 809AA4E4 A600005C */ sh $zero, 0x005C($s0) ## 0000005C -.L809AA4E8: -/* 00E68 809AA4E8 0C26A88C */ jal func_809AA230 -/* 00E6C 809AA4EC 8FA50020 */ lw $a1, 0x0020($sp) -/* 00E70 809AA4F0 86180054 */ lh $t8, 0x0054($s0) ## 00000054 -/* 00E74 809AA4F4 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 00E78 809AA4F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E7C 809AA4FC 53010004 */ beql $t8, $at, .L809AA510 -/* 00E80 809AA500 8FBF001C */ lw $ra, 0x001C($sp) -/* 00E84 809AA504 0C26A6EA */ jal func_809A9BA8 -/* 00E88 809AA508 8FA50020 */ lw $a1, 0x0020($sp) -/* 00E8C 809AA50C 8FBF001C */ lw $ra, 0x001C($sp) -.L809AA510: -/* 00E90 809AA510 8FB00018 */ lw $s0, 0x0018($sp) -/* 00E94 809AA514 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00E98 809AA518 03E00008 */ jr $ra -/* 00E9C 809AA51C 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/EffectSsKiraKira_Init.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/EffectSsKiraKira_Init.s deleted file mode 100644 index e4e6fd462e..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/EffectSsKiraKira_Init.s +++ /dev/null @@ -1,108 +0,0 @@ -glabel EffectSsKiraKira_Init -/* 00000 809AA810 AFA40000 */ sw $a0, 0x0000($sp) -/* 00004 809AA814 AFA50004 */ sw $a1, 0x0004($sp) -/* 00008 809AA818 8CEF0000 */ lw $t7, 0x0000($a3) ## 00000000 -/* 0000C 809AA81C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00010 809AA820 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00014 809AA824 ACCF0000 */ sw $t7, 0x0000($a2) ## 00000000 -/* 00018 809AA828 8CEE0004 */ lw $t6, 0x0004($a3) ## 00000004 -/* 0001C 809AA82C ACCE0004 */ sw $t6, 0x0004($a2) ## 00000004 -/* 00020 809AA830 8CEF0008 */ lw $t7, 0x0008($a3) ## 00000008 -/* 00024 809AA834 3C0E8016 */ lui $t6, %hi(gSegments) -/* 00028 809AA838 ACCF0008 */ sw $t7, 0x0008($a2) ## 00000008 -/* 0002C 809AA83C 8CF9000C */ lw $t9, 0x000C($a3) ## 0000000C -/* 00030 809AA840 3C0F8016 */ lui $t7, %hi(gSegments) -/* 00034 809AA844 ACD9000C */ sw $t9, 0x000C($a2) ## 0000000C -/* 00038 809AA848 8CF80010 */ lw $t8, 0x0010($a3) ## 00000010 -/* 0003C 809AA84C ACD80010 */ sw $t8, 0x0010($a2) ## 00000010 -/* 00040 809AA850 8CF90014 */ lw $t9, 0x0014($a3) ## 00000014 -/* 00044 809AA854 ACD90014 */ sw $t9, 0x0014($a2) ## 00000014 -/* 00048 809AA858 8CE90018 */ lw $t1, 0x0018($a3) ## 00000018 -/* 0004C 809AA85C ACC90018 */ sw $t1, 0x0018($a2) ## 00000018 -/* 00050 809AA860 8CE8001C */ lw $t0, 0x001C($a3) ## 0000001C -/* 00054 809AA864 ACC8001C */ sw $t0, 0x001C($a2) ## 0000001C -/* 00058 809AA868 8CE90020 */ lw $t1, 0x0020($a3) ## 00000020 -/* 0005C 809AA86C ACC90020 */ sw $t1, 0x0020($a2) ## 00000020 -/* 00060 809AA870 84E20032 */ lh $v0, 0x0032($a3) ## 00000032 -/* 00064 809AA874 3C09809B */ lui $t1, %hi(func_809AAD6C) ## $t1 = 809B0000 -/* 00068 809AA878 2529AD6C */ addiu $t1, $t1, %lo(func_809AAD6C) ## $t1 = 809AAD6C -/* 0006C 809AA87C 04410017 */ bgez $v0, .L809AA8DC -/* 00070 809AA880 A4C2005C */ sh $v0, 0x005C($a2) ## 0000005C -/* 00074 809AA884 3C020403 */ lui $v0, 0x0403 ## $v0 = 04030000 -/* 00078 809AA888 84CA005C */ lh $t2, 0x005C($a2) ## 0000005C -/* 0007C 809AA88C 24427880 */ addiu $v0, $v0, 0x7880 ## $v0 = 04037880 -/* 00080 809AA890 00026100 */ sll $t4, $v0, 4 -/* 00084 809AA894 000C6F02 */ srl $t5, $t4, 28 -/* 00088 809AA898 000D7080 */ sll $t6, $t5, 2 -/* 0008C 809AA89C 000A5823 */ subu $t3, $zero, $t2 -/* 00090 809AA8A0 A4CB005C */ sh $t3, 0x005C($a2) ## 0000005C -/* 00094 809AA8A4 01EE7821 */ addu $t7, $t7, $t6 -/* 00098 809AA8A8 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 0009C 809AA8AC 8DEF6FA8 */ lw $t7, %lo(gSegments)($t7) -/* 000A0 809AA8B0 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 000A4 809AA8B4 0041C024 */ and $t8, $v0, $at -/* 000A8 809AA8B8 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 000AC 809AA8BC 01F8C821 */ addu $t9, $t7, $t8 -/* 000B0 809AA8C0 03214021 */ addu $t0, $t9, $at -/* 000B4 809AA8C4 ACC80038 */ sw $t0, 0x0038($a2) ## 00000038 -/* 000B8 809AA8C8 ACC90024 */ sw $t1, 0x0024($a2) ## 00000024 -/* 000BC 809AA8CC 84EA002E */ lh $t2, 0x002E($a3) ## 0000002E -/* 000C0 809AA8D0 A4C00056 */ sh $zero, 0x0056($a2) ## 00000056 -/* 000C4 809AA8D4 1000001A */ beq $zero, $zero, .L809AA940 -/* 000C8 809AA8D8 A4CA0052 */ sh $t2, 0x0052($a2) ## 00000052 -.L809AA8DC: -/* 000CC 809AA8DC 3C020403 */ lui $v0, 0x0403 ## $v0 = 04030000 -/* 000D0 809AA8E0 24427880 */ addiu $v0, $v0, 0x7880 ## $v0 = 04037880 -/* 000D4 809AA8E4 00025900 */ sll $t3, $v0, 4 -/* 000D8 809AA8E8 000B6702 */ srl $t4, $t3, 28 -/* 000DC 809AA8EC 000C6880 */ sll $t5, $t4, 2 -/* 000E0 809AA8F0 01CD7021 */ addu $t6, $t6, $t5 -/* 000E4 809AA8F4 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) -/* 000E8 809AA8F8 00417824 */ and $t7, $v0, $at -/* 000EC 809AA8FC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 000F0 809AA900 01CFC021 */ addu $t8, $t6, $t7 -/* 000F4 809AA904 0301C821 */ addu $t9, $t8, $at -/* 000F8 809AA908 ACD90038 */ sw $t9, 0x0038($a2) ## 00000038 -/* 000FC 809AA90C 90E80038 */ lbu $t0, 0x0038($a3) ## 00000038 -/* 00100 809AA910 3C0A809B */ lui $t2, %hi(func_809AACAC) ## $t2 = 809B0000 -/* 00104 809AA914 3C09809B */ lui $t1, %hi(func_809AABF0) ## $t1 = 809B0000 -/* 00108 809AA918 15000004 */ bne $t0, $zero, .L809AA92C -/* 0010C 809AA91C 254AACAC */ addiu $t2, $t2, %lo(func_809AACAC) ## $t2 = 809AACAC -/* 00110 809AA920 2529ABF0 */ addiu $t1, $t1, %lo(func_809AABF0) ## $t1 = 809AABF0 -/* 00114 809AA924 10000002 */ beq $zero, $zero, .L809AA930 -/* 00118 809AA928 ACC90024 */ sw $t1, 0x0024($a2) ## 00000024 -.L809AA92C: -/* 0011C 809AA92C ACCA0024 */ sw $t2, 0x0024($a2) ## 00000024 -.L809AA930: -/* 00120 809AA930 90EB002B */ lbu $t3, 0x002B($a3) ## 0000002B -/* 00124 809AA934 A4CB0052 */ sh $t3, 0x0052($a2) ## 00000052 -/* 00128 809AA938 84EC002E */ lh $t4, 0x002E($a3) ## 0000002E -/* 0012C 809AA93C A4CC0056 */ sh $t4, 0x0056($a2) ## 00000056 -.L809AA940: -/* 00130 809AA940 3C0D809B */ lui $t5, %hi(func_809AA9AC) ## $t5 = 809B0000 -/* 00134 809AA944 25ADA9AC */ addiu $t5, $t5, %lo(func_809AA9AC) ## $t5 = 809AA9AC -/* 00138 809AA948 ACCD0028 */ sw $t5, 0x0028($a2) ## 00000028 -/* 0013C 809AA94C 84EE0034 */ lh $t6, 0x0034($a3) ## 00000034 -/* 00140 809AA950 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00144 809AA954 A4CE0040 */ sh $t6, 0x0040($a2) ## 00000040 -/* 00148 809AA958 84EF0036 */ lh $t7, 0x0036($a3) ## 00000036 -/* 0014C 809AA95C A4CF0042 */ sh $t7, 0x0042($a2) ## 00000042 -/* 00150 809AA960 90F80024 */ lbu $t8, 0x0024($a3) ## 00000024 -/* 00154 809AA964 A4D80044 */ sh $t8, 0x0044($a2) ## 00000044 -/* 00158 809AA968 90F90025 */ lbu $t9, 0x0025($a3) ## 00000025 -/* 0015C 809AA96C A4D90046 */ sh $t9, 0x0046($a2) ## 00000046 -/* 00160 809AA970 90E80026 */ lbu $t0, 0x0026($a3) ## 00000026 -/* 00164 809AA974 A4C80048 */ sh $t0, 0x0048($a2) ## 00000048 -/* 00168 809AA978 90E90027 */ lbu $t1, 0x0027($a3) ## 00000027 -/* 0016C 809AA97C A4C9004A */ sh $t1, 0x004A($a2) ## 0000004A -/* 00170 809AA980 90EA0028 */ lbu $t2, 0x0028($a3) ## 00000028 -/* 00174 809AA984 A4CA004C */ sh $t2, 0x004C($a2) ## 0000004C -/* 00178 809AA988 90EB0029 */ lbu $t3, 0x0029($a3) ## 00000029 -/* 0017C 809AA98C A4CB004E */ sh $t3, 0x004E($a2) ## 0000004E -/* 00180 809AA990 90EC002A */ lbu $t4, 0x002A($a3) ## 0000002A -/* 00184 809AA994 A4CC0050 */ sh $t4, 0x0050($a2) ## 00000050 -/* 00188 809AA998 84ED002C */ lh $t5, 0x002C($a3) ## 0000002C -/* 0018C 809AA99C A4CD0054 */ sh $t5, 0x0054($a2) ## 00000054 -/* 00190 809AA9A0 8CEE0030 */ lw $t6, 0x0030($a3) ## 00000030 -/* 00194 809AA9A4 03E00008 */ jr $ra -/* 00198 809AA9A8 A4CE0058 */ sh $t6, 0x0058($a2) ## 00000058 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AA9AC.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AA9AC.s deleted file mode 100644 index 3acf5187d4..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AA9AC.s +++ /dev/null @@ -1,161 +0,0 @@ -.rdata -glabel D_809AAE10 - .asciz "../z_eff_ss_kirakira.c" - .balign 4 - -glabel D_809AAE28 - .asciz "../z_eff_ss_kirakira.c" - .balign 4 - -.late_rodata -glabel D_809AAE40 - .float 10000.0 - -.text -glabel func_809AA9AC -/* 0019C 809AA9AC 27BDFE20 */ addiu $sp, $sp, 0xFE20 ## $sp = FFFFFE20 -/* 001A0 809AA9B0 AFBF001C */ sw $ra, 0x001C($sp) -/* 001A4 809AA9B4 AFB10018 */ sw $s1, 0x0018($sp) -/* 001A8 809AA9B8 AFB00014 */ sw $s0, 0x0014($sp) -/* 001AC 809AA9BC AFA401E0 */ sw $a0, 0x01E0($sp) -/* 001B0 809AA9C0 AFA501E4 */ sw $a1, 0x01E4($sp) -/* 001B4 809AA9C4 84CE0056 */ lh $t6, 0x0056($a2) ## 00000056 -/* 001B8 809AA9C8 3C01809B */ lui $at, %hi(D_809AAE40) ## $at = 809B0000 -/* 001BC 809AA9CC C428AE40 */ lwc1 $f8, %lo(D_809AAE40)($at) -/* 001C0 809AA9D0 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 001C4 809AA9D4 00C08025 */ or $s0, $a2, $zero ## $s0 = 00000000 -/* 001C8 809AA9D8 3C06809B */ lui $a2, %hi(D_809AAE10) ## $a2 = 809B0000 -/* 001CC 809AA9DC 468021A0 */ cvt.s.w $f6, $f4 -/* 001D0 809AA9E0 24C6AE10 */ addiu $a2, $a2, %lo(D_809AAE10) ## $a2 = 809AAE10 -/* 001D4 809AA9E4 24070101 */ addiu $a3, $zero, 0x0101 ## $a3 = 00000101 -/* 001D8 809AA9E8 46083283 */ div.s $f10, $f6, $f8 -/* 001DC 809AA9EC E7AA01D8 */ swc1 $f10, 0x01D8($sp) -/* 001E0 809AA9F0 8C910000 */ lw $s1, 0x0000($a0) ## 00000000 -/* 001E4 809AA9F4 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFE5C -/* 001E8 809AA9F8 0C031AB1 */ jal Graph_OpenDisps -/* 001EC 809AA9FC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 001F0 809AAA00 27A40194 */ addiu $a0, $sp, 0x0194 ## $a0 = FFFFFFB4 -/* 001F4 809AAA04 8E050000 */ lw $a1, 0x0000($s0) ## 00000000 -/* 001F8 809AAA08 8E060004 */ lw $a2, 0x0004($s0) ## 00000004 -/* 001FC 809AAA0C 0C029E89 */ jal SkinMatrix_SetTranslate -/* 00200 809AAA10 8E070008 */ lw $a3, 0x0008($s0) ## 00000008 -/* 00204 809AAA14 27A40154 */ addiu $a0, $sp, 0x0154 ## $a0 = FFFFFF74 -/* 00208 809AAA18 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0020C 809AAA1C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00210 809AAA20 0C029DC1 */ jal SkinMatrix_SetRotateRPY -/* 00214 809AAA24 86070042 */ lh $a3, 0x0042($s0) ## 00000042 -/* 00218 809AAA28 C7A001D8 */ lwc1 $f0, 0x01D8($sp) -/* 0021C 809AAA2C 27A40114 */ addiu $a0, $sp, 0x0114 ## $a0 = FFFFFF34 -/* 00220 809AAA30 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 00224 809AAA34 44050000 */ mfc1 $a1, $f0 -/* 00228 809AAA38 44060000 */ mfc1 $a2, $f0 -/* 0022C 809AAA3C 0C029DA9 */ jal SkinMatrix_SetScale -/* 00230 809AAA40 00000000 */ nop -/* 00234 809AAA44 8FA501E0 */ lw $a1, 0x01E0($sp) -/* 00238 809AAA48 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0023C 809AAA4C 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 -/* 00240 809AAA50 27A40194 */ addiu $a0, $sp, 0x0194 ## $a0 = FFFFFFB4 -/* 00244 809AAA54 27A600D4 */ addiu $a2, $sp, 0x00D4 ## $a2 = FFFFFEF4 -/* 00248 809AAA58 0C029BE8 */ jal SkinMatrix_MtxFMtxFMult -/* 0024C 809AAA5C 00A12821 */ addu $a1, $a1, $at -/* 00250 809AAA60 27A400D4 */ addiu $a0, $sp, 0x00D4 ## $a0 = FFFFFEF4 -/* 00254 809AAA64 27A50154 */ addiu $a1, $sp, 0x0154 ## $a1 = FFFFFF74 -/* 00258 809AAA68 0C029BE8 */ jal SkinMatrix_MtxFMtxFMult -/* 0025C 809AAA6C 27A60094 */ addiu $a2, $sp, 0x0094 ## $a2 = FFFFFEB4 -/* 00260 809AAA70 27A40094 */ addiu $a0, $sp, 0x0094 ## $a0 = FFFFFEB4 -/* 00264 809AAA74 27A50114 */ addiu $a1, $sp, 0x0114 ## $a1 = FFFFFF34 -/* 00268 809AAA78 0C029BE8 */ jal SkinMatrix_MtxFMtxFMult -/* 0026C 809AAA7C 27A60054 */ addiu $a2, $sp, 0x0054 ## $a2 = FFFFFE74 -/* 00270 809AAA80 8E2302D0 */ lw $v1, 0x02D0($s1) ## 000002D0 -/* 00274 809AAA84 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 -/* 00278 809AAA88 3C088013 */ lui $t0, %hi(gMtxClear) -/* 0027C 809AAA8C 24780008 */ addiu $t8, $v1, 0x0008 ## $t8 = 00000008 -/* 00280 809AAA90 AE3802D0 */ sw $t8, 0x02D0($s1) ## 000002D0 -/* 00284 809AAA94 2508DB20 */ addiu $t0, %lo(gMtxClear) -/* 00288 809AAA98 37390003 */ ori $t9, $t9, 0x0003 ## $t9 = DA380003 -/* 0028C 809AAA9C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00290 809AAAA0 27A50054 */ addiu $a1, $sp, 0x0054 ## $a1 = FFFFFE74 -/* 00294 809AAAA4 AC790000 */ sw $t9, 0x0000($v1) ## 00000000 -/* 00298 809AAAA8 0C029F9C */ jal SkinMatrix_MtxFToNewMtx -/* 0029C 809AAAAC AC680004 */ sw $t0, 0x0004($v1) ## 00000004 -/* 002A0 809AAAB0 10400044 */ beq $v0, $zero, .L809AABC4 -/* 002A4 809AAAB4 3C0ADA38 */ lui $t2, 0xDA38 ## $t2 = DA380000 -/* 002A8 809AAAB8 8E2302D0 */ lw $v1, 0x02D0($s1) ## 000002D0 -/* 002AC 809AAABC 354A0003 */ ori $t2, $t2, 0x0003 ## $t2 = DA380003 -/* 002B0 809AAAC0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 002B4 809AAAC4 24690008 */ addiu $t1, $v1, 0x0008 ## $t1 = 00000008 -/* 002B8 809AAAC8 AE2902D0 */ sw $t1, 0x02D0($s1) ## 000002D0 -/* 002BC 809AAACC AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 002C0 809AAAD0 0C024F05 */ jal func_80093C14 -/* 002C4 809AAAD4 AC6A0000 */ sw $t2, 0x0000($v1) ## 00000000 -/* 002C8 809AAAD8 8E2302D0 */ lw $v1, 0x02D0($s1) ## 000002D0 -/* 002CC 809AAADC 3C0CFA00 */ lui $t4, 0xFA00 ## $t4 = FA000000 -/* 002D0 809AAAE0 358C8080 */ ori $t4, $t4, 0x8080 ## $t4 = FA008080 -/* 002D4 809AAAE4 246B0008 */ addiu $t3, $v1, 0x0008 ## $t3 = 00000008 -/* 002D8 809AAAE8 AE2B02D0 */ sw $t3, 0x02D0($s1) ## 000002D0 -/* 002DC 809AAAEC AC6C0000 */ sw $t4, 0x0000($v1) ## 00000000 -/* 002E0 809AAAF0 860D0058 */ lh $t5, 0x0058($s0) ## 00000058 -/* 002E4 809AAAF4 3C01425C */ lui $at, 0x425C ## $at = 425C0000 -/* 002E8 809AAAF8 44818000 */ mtc1 $at, $f16 ## $f16 = 55.00 -/* 002EC 809AAAFC 448D9000 */ mtc1 $t5, $f18 ## $f18 = 0.00 -/* 002F0 809AAB00 860E005C */ lh $t6, 0x005C($s0) ## 0000005C -/* 002F4 809AAB04 860F0046 */ lh $t7, 0x0046($s0) ## 00000046 -/* 002F8 809AAB08 46809120 */ cvt.s.w $f4, $f18 -/* 002FC 809AAB0C 448E4000 */ mtc1 $t6, $f8 ## $f8 = 0.00 -/* 00300 809AAB10 860C0044 */ lh $t4, 0x0044($s0) ## 00000044 -/* 00304 809AAB14 31F800FF */ andi $t8, $t7, 0x00FF ## $t8 = 00000000 -/* 00308 809AAB18 0018CC00 */ sll $t9, $t8, 16 -/* 0030C 809AAB1C 468042A0 */ cvt.s.w $f10, $f8 -/* 00310 809AAB20 000C6E00 */ sll $t5, $t4, 24 -/* 00314 809AAB24 3C0FFB00 */ lui $t7, 0xFB00 ## $t7 = FB000000 -/* 00318 809AAB28 46048183 */ div.s $f6, $f16, $f4 -/* 0031C 809AAB2C 460A3482 */ mul.s $f18, $f6, $f10 -/* 00320 809AAB30 4600940D */ trunc.w.s $f16, $f18 -/* 00324 809AAB34 44088000 */ mfc1 $t0, $f16 -/* 00328 809AAB38 00000000 */ nop -/* 0032C 809AAB3C 250900C8 */ addiu $t1, $t0, 0x00C8 ## $t1 = 000000C8 -/* 00330 809AAB40 312A00FF */ andi $t2, $t1, 0x00FF ## $t2 = 000000C8 -/* 00334 809AAB44 86090048 */ lh $t1, 0x0048($s0) ## 00000048 -/* 00338 809AAB48 014D7025 */ or $t6, $t2, $t5 ## $t6 = 000000C8 -/* 0033C 809AAB4C 01D94025 */ or $t0, $t6, $t9 ## $t0 = 000000C8 -/* 00340 809AAB50 312B00FF */ andi $t3, $t1, 0x00FF ## $t3 = 000000C8 -/* 00344 809AAB54 000B6200 */ sll $t4, $t3, 8 -/* 00348 809AAB58 010C5025 */ or $t2, $t0, $t4 ## $t2 = FA0080C8 -/* 0034C 809AAB5C AC6A0004 */ sw $t2, 0x0004($v1) ## 00000004 -/* 00350 809AAB60 8E2302D0 */ lw $v1, 0x02D0($s1) ## 000002D0 -/* 00354 809AAB64 246D0008 */ addiu $t5, $v1, 0x0008 ## $t5 = 00000008 -/* 00358 809AAB68 AE2D02D0 */ sw $t5, 0x02D0($s1) ## 000002D0 -/* 0035C 809AAB6C AC6F0000 */ sw $t7, 0x0000($v1) ## 00000000 -/* 00360 809AAB70 86180052 */ lh $t8, 0x0052($s0) ## 00000052 -/* 00364 809AAB74 860C004E */ lh $t4, 0x004E($s0) ## 0000004E -/* 00368 809AAB78 8609004C */ lh $t1, 0x004C($s0) ## 0000004C -/* 0036C 809AAB7C 330E00FF */ andi $t6, $t8, 0x00FF ## $t6 = 00000000 -/* 00370 809AAB80 86180050 */ lh $t8, 0x0050($s0) ## 00000050 -/* 00374 809AAB84 318A00FF */ andi $t2, $t4, 0x00FF ## $t2 = 00000080 -/* 00378 809AAB88 00095E00 */ sll $t3, $t1, 24 -/* 0037C 809AAB8C 01CB4025 */ or $t0, $t6, $t3 ## $t0 = 000000C8 -/* 00380 809AAB90 000A6C00 */ sll $t5, $t2, 16 -/* 00384 809AAB94 331900FF */ andi $t9, $t8, 0x00FF ## $t9 = 00000000 -/* 00388 809AAB98 00194A00 */ sll $t1, $t9, 8 -/* 0038C 809AAB9C 010D7825 */ or $t7, $t0, $t5 ## $t7 = 000000C8 -/* 00390 809AABA0 01E97025 */ or $t6, $t7, $t1 ## $t6 = 000000C8 -/* 00394 809AABA4 AC6E0004 */ sw $t6, 0x0004($v1) ## 00000004 -/* 00398 809AABA8 8E2302D0 */ lw $v1, 0x02D0($s1) ## 000002D0 -/* 0039C 809AABAC 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 -/* 003A0 809AABB0 246B0008 */ addiu $t3, $v1, 0x0008 ## $t3 = 00000008 -/* 003A4 809AABB4 AE2B02D0 */ sw $t3, 0x02D0($s1) ## 000002D0 -/* 003A8 809AABB8 AC6C0000 */ sw $t4, 0x0000($v1) ## 00000000 -/* 003AC 809AABBC 8E0A0038 */ lw $t2, 0x0038($s0) ## 00000038 -/* 003B0 809AABC0 AC6A0004 */ sw $t2, 0x0004($v1) ## 00000004 -.L809AABC4: -/* 003B4 809AABC4 3C06809B */ lui $a2, %hi(D_809AAE28) ## $a2 = 809B0000 -/* 003B8 809AABC8 24C6AE28 */ addiu $a2, $a2, %lo(D_809AAE28) ## $a2 = 809AAE28 -/* 003BC 809AABCC 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFE5C -/* 003C0 809AABD0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 003C4 809AABD4 0C031AD5 */ jal Graph_CloseDisps -/* 003C8 809AABD8 2407012D */ addiu $a3, $zero, 0x012D ## $a3 = 0000012D -/* 003CC 809AABDC 8FBF001C */ lw $ra, 0x001C($sp) -/* 003D0 809AABE0 8FB00014 */ lw $s0, 0x0014($sp) -/* 003D4 809AABE4 8FB10018 */ lw $s1, 0x0018($sp) -/* 003D8 809AABE8 03E00008 */ jr $ra -/* 003DC 809AABEC 27BD01E0 */ addiu $sp, $sp, 0x01E0 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AABF0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AABF0.s deleted file mode 100644 index f7cd51e3db..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AABF0.s +++ /dev/null @@ -1,66 +0,0 @@ -.late_rodata -glabel D_809AAE44 - .float 0.4 - -glabel D_809AAE48 - .float 0.2 - -glabel D_809AAE4C - .float 0.4 - -glabel D_809AAE50 - .float 0.2 - -.text -glabel func_809AABF0 -/* 003E0 809AABF0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 003E4 809AABF4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 003E8 809AABF8 AFA40018 */ sw $a0, 0x0018($sp) -/* 003EC 809AABFC AFA5001C */ sw $a1, 0x001C($sp) -/* 003F0 809AAC00 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 003F4 809AAC04 AFA60020 */ sw $a2, 0x0020($sp) -/* 003F8 809AAC08 3C01809B */ lui $at, %hi(D_809AAE44) ## $at = 809B0000 -/* 003FC 809AAC0C C424AE44 */ lwc1 $f4, %lo(D_809AAE44)($at) -/* 00400 809AAC10 3C01809B */ lui $at, %hi(D_809AAE48) ## $at = 809B0000 -/* 00404 809AAC14 C428AE48 */ lwc1 $f8, %lo(D_809AAE48)($at) -/* 00408 809AAC18 46040182 */ mul.s $f6, $f0, $f4 -/* 0040C 809AAC1C 8FA60020 */ lw $a2, 0x0020($sp) -/* 00410 809AAC20 46083281 */ sub.s $f10, $f6, $f8 -/* 00414 809AAC24 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00418 809AAC28 E4CA0018 */ swc1 $f10, 0x0018($a2) ## 00000018 -/* 0041C 809AAC2C 3C01809B */ lui $at, %hi(D_809AAE4C) ## $at = 809B0000 -/* 00420 809AAC30 C430AE4C */ lwc1 $f16, %lo(D_809AAE4C)($at) -/* 00424 809AAC34 8FA60020 */ lw $a2, 0x0020($sp) -/* 00428 809AAC38 3C01809B */ lui $at, %hi(D_809AAE50) ## $at = 809B0000 -/* 0042C 809AAC3C 46100482 */ mul.s $f18, $f0, $f16 -/* 00430 809AAC40 84C20054 */ lh $v0, 0x0054($a2) ## 00000054 -/* 00434 809AAC44 84CE0052 */ lh $t6, 0x0052($a2) ## 00000052 -/* 00438 809AAC48 C424AE50 */ lwc1 $f4, %lo(D_809AAE50)($at) -/* 0043C 809AAC4C 0002C023 */ subu $t8, $zero, $v0 -/* 00440 809AAC50 01C27821 */ addu $t7, $t6, $v0 -/* 00444 809AAC54 A4CF0052 */ sh $t7, 0x0052($a2) ## 00000052 -/* 00448 809AAC58 46049181 */ sub.s $f6, $f18, $f4 -/* 0044C 809AAC5C 84C30052 */ lh $v1, 0x0052($a2) ## 00000052 -/* 00450 809AAC60 04610004 */ bgez $v1, .L809AAC74 -/* 00454 809AAC64 E4C60020 */ swc1 $f6, 0x0020($a2) ## 00000020 -/* 00458 809AAC68 A4C00052 */ sh $zero, 0x0052($a2) ## 00000052 -/* 0045C 809AAC6C 10000007 */ beq $zero, $zero, .L809AAC8C -/* 00460 809AAC70 A4D80054 */ sh $t8, 0x0054($a2) ## 00000054 -.L809AAC74: -/* 00464 809AAC74 28610100 */ slti $at, $v1, 0x0100 -/* 00468 809AAC78 14200004 */ bne $at, $zero, .L809AAC8C -/* 0046C 809AAC7C 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 00470 809AAC80 00024023 */ subu $t0, $zero, $v0 -/* 00474 809AAC84 A4D90052 */ sh $t9, 0x0052($a2) ## 00000052 -/* 00478 809AAC88 A4C80054 */ sh $t0, 0x0054($a2) ## 00000054 -.L809AAC8C: -/* 0047C 809AAC8C 84C90042 */ lh $t1, 0x0042($a2) ## 00000042 -/* 00480 809AAC90 84CA0040 */ lh $t2, 0x0040($a2) ## 00000040 -/* 00484 809AAC94 012A5821 */ addu $t3, $t1, $t2 -/* 00488 809AAC98 A4CB0042 */ sh $t3, 0x0042($a2) ## 00000042 -/* 0048C 809AAC9C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00490 809AACA0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00494 809AACA4 03E00008 */ jr $ra -/* 00498 809AACA8 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AACAC.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AACAC.s deleted file mode 100644 index f3d056f650..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AACAC.s +++ /dev/null @@ -1,64 +0,0 @@ -.late_rodata -glabel D_809AAE54 - .float 0.95 - -glabel D_809AAE58 - .float 0.2 - -glabel D_809AAE5C - .float 0.2 - -.text -glabel func_809AACAC -/* 0049C 809AACAC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 004A0 809AACB0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 004A4 809AACB4 AFA40018 */ sw $a0, 0x0018($sp) -/* 004A8 809AACB8 AFA5001C */ sw $a1, 0x001C($sp) -/* 004AC 809AACBC 3C01809B */ lui $at, %hi(D_809AAE54) ## $at = 809B0000 -/* 004B0 809AACC0 C420AE54 */ lwc1 $f0, %lo(D_809AAE54)($at) -/* 004B4 809AACC4 C4C4000C */ lwc1 $f4, 0x000C($a2) ## 0000000C -/* 004B8 809AACC8 C4C80014 */ lwc1 $f8, 0x0014($a2) ## 00000014 -/* 004BC 809AACCC 3C01809B */ lui $at, %hi(D_809AAE58) ## $at = 809B0000 -/* 004C0 809AACD0 46002182 */ mul.s $f6, $f4, $f0 -/* 004C4 809AACD4 00000000 */ nop -/* 004C8 809AACD8 46004282 */ mul.s $f10, $f8, $f0 -/* 004CC 809AACDC E4C6000C */ swc1 $f6, 0x000C($a2) ## 0000000C -/* 004D0 809AACE0 E4CA0014 */ swc1 $f10, 0x0014($a2) ## 00000014 -/* 004D4 809AACE4 AFA60020 */ sw $a2, 0x0020($sp) -/* 004D8 809AACE8 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 004DC 809AACEC C42CAE58 */ lwc1 $f12, %lo(D_809AAE58)($at) -/* 004E0 809AACF0 8FA60020 */ lw $a2, 0x0020($sp) -/* 004E4 809AACF4 3C01809B */ lui $at, %hi(D_809AAE5C) ## $at = 809B0000 -/* 004E8 809AACF8 E4C00018 */ swc1 $f0, 0x0018($a2) ## 00000018 -/* 004EC 809AACFC 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 004F0 809AAD00 C42CAE5C */ lwc1 $f12, %lo(D_809AAE5C)($at) -/* 004F4 809AAD04 8FA60020 */ lw $a2, 0x0020($sp) -/* 004F8 809AAD08 84C20054 */ lh $v0, 0x0054($a2) ## 00000054 -/* 004FC 809AAD0C 84CE0052 */ lh $t6, 0x0052($a2) ## 00000052 -/* 00500 809AAD10 E4C00020 */ swc1 $f0, 0x0020($a2) ## 00000020 -/* 00504 809AAD14 0002C023 */ subu $t8, $zero, $v0 -/* 00508 809AAD18 01C27821 */ addu $t7, $t6, $v0 -/* 0050C 809AAD1C A4CF0052 */ sh $t7, 0x0052($a2) ## 00000052 -/* 00510 809AAD20 84C30052 */ lh $v1, 0x0052($a2) ## 00000052 -/* 00514 809AAD24 04610004 */ bgez $v1, .L809AAD38 -/* 00518 809AAD28 28610100 */ slti $at, $v1, 0x0100 -/* 0051C 809AAD2C A4C00052 */ sh $zero, 0x0052($a2) ## 00000052 -/* 00520 809AAD30 10000006 */ beq $zero, $zero, .L809AAD4C -/* 00524 809AAD34 A4D80054 */ sh $t8, 0x0054($a2) ## 00000054 -.L809AAD38: -/* 00528 809AAD38 14200004 */ bne $at, $zero, .L809AAD4C -/* 0052C 809AAD3C 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 00530 809AAD40 00024023 */ subu $t0, $zero, $v0 -/* 00534 809AAD44 A4D90052 */ sh $t9, 0x0052($a2) ## 00000052 -/* 00538 809AAD48 A4C80054 */ sh $t0, 0x0054($a2) ## 00000054 -.L809AAD4C: -/* 0053C 809AAD4C 84C90042 */ lh $t1, 0x0042($a2) ## 00000042 -/* 00540 809AAD50 84CA0040 */ lh $t2, 0x0040($a2) ## 00000040 -/* 00544 809AAD54 012A5821 */ addu $t3, $t1, $t2 -/* 00548 809AAD58 A4CB0042 */ sh $t3, 0x0042($a2) ## 00000042 -/* 0054C 809AAD5C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00550 809AAD60 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00554 809AAD64 03E00008 */ jr $ra -/* 00558 809AAD68 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AAD6C.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AAD6C.s deleted file mode 100644 index c9a9982b9a..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AAD6C.s +++ /dev/null @@ -1,39 +0,0 @@ -glabel func_809AAD6C -/* 0055C 809AAD6C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00560 809AAD70 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00564 809AAD74 AFA40018 */ sw $a0, 0x0018($sp) -/* 00568 809AAD78 AFA5001C */ sw $a1, 0x001C($sp) -/* 0056C 809AAD7C 84CE0058 */ lh $t6, 0x0058($a2) ## 00000058 -/* 00570 809AAD80 3C014700 */ lui $at, 0x4700 ## $at = 47000000 -/* 00574 809AAD84 44812000 */ mtc1 $at, $f4 ## $f4 = 32768.00 -/* 00578 809AAD88 448E3000 */ mtc1 $t6, $f6 ## $f6 = 0.00 -/* 0057C 809AAD8C 84CF005C */ lh $t7, 0x005C($a2) ## 0000005C -/* 00580 809AAD90 AFA60020 */ sw $a2, 0x0020($sp) -/* 00584 809AAD94 46803220 */ cvt.s.w $f8, $f6 -/* 00588 809AAD98 448F8000 */ mtc1 $t7, $f16 ## $f16 = 0.00 -/* 0058C 809AAD9C 00000000 */ nop -/* 00590 809AADA0 468084A0 */ cvt.s.w $f18, $f16 -/* 00594 809AADA4 46082283 */ div.s $f10, $f4, $f8 -/* 00598 809AADA8 46125182 */ mul.s $f6, $f10, $f18 -/* 0059C 809AADAC 4600310D */ trunc.w.s $f4, $f6 -/* 005A0 809AADB0 44042000 */ mfc1 $a0, $f4 -/* 005A4 809AADB4 00000000 */ nop -/* 005A8 809AADB8 00042400 */ sll $a0, $a0, 16 -/* 005AC 809AADBC 0C01DE1C */ jal Math_Sins - ## sins? -/* 005B0 809AADC0 00042403 */ sra $a0, $a0, 16 -/* 005B4 809AADC4 8FA60020 */ lw $a2, 0x0020($sp) -/* 005B8 809AADC8 84D90052 */ lh $t9, 0x0052($a2) ## 00000052 -/* 005BC 809AADCC 44994000 */ mtc1 $t9, $f8 ## $f8 = 0.00 -/* 005C0 809AADD0 00000000 */ nop -/* 005C4 809AADD4 46804420 */ cvt.s.w $f16, $f8 -/* 005C8 809AADD8 46100282 */ mul.s $f10, $f0, $f16 -/* 005CC 809AADDC 4600548D */ trunc.w.s $f18, $f10 -/* 005D0 809AADE0 44099000 */ mfc1 $t1, $f18 -/* 005D4 809AADE4 00000000 */ nop -/* 005D8 809AADE8 A4C90056 */ sh $t1, 0x0056($a2) ## 00000056 -/* 005DC 809AADEC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 005E0 809AADF0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 005E4 809AADF4 03E00008 */ jr $ra -/* 005E8 809AADF8 00000000 */ nop -/* 005EC 809AADFC 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/EffectSsLightning_Init.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/EffectSsLightning_Init.s deleted file mode 100644 index 00b6ad49a9..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/EffectSsLightning_Init.s +++ /dev/null @@ -1,58 +0,0 @@ -glabel EffectSsLightning_Init -/* 00000 809AAEF0 AFA40000 */ sw $a0, 0x0000($sp) -/* 00004 809AAEF4 AFA50004 */ sw $a1, 0x0004($sp) -/* 00008 809AAEF8 8CEF0000 */ lw $t7, 0x0000($a3) ## 00000000 -/* 0000C 809AAEFC 3C030403 */ lui $v1, 0x0403 ## $v1 = 04030000 -/* 00010 809AAF00 2463CF30 */ addiu $v1, $v1, 0xCF30 ## $v1 = 0402CF30 -/* 00014 809AAF04 ACCF0000 */ sw $t7, 0x0000($a2) ## 00000000 -/* 00018 809AAF08 8CEE0004 */ lw $t6, 0x0004($a3) ## 00000004 -/* 0001C 809AAF0C 0003C100 */ sll $t8, $v1, 4 -/* 00020 809AAF10 0018CF02 */ srl $t9, $t8, 28 -/* 00024 809AAF14 ACCE0004 */ sw $t6, 0x0004($a2) ## 00000004 -/* 00028 809AAF18 8CEF0008 */ lw $t7, 0x0008($a3) ## 00000008 -/* 0002C 809AAF1C 00194080 */ sll $t0, $t9, 2 -/* 00030 809AAF20 3C098016 */ lui $t1, %hi(gSegments) -/* 00034 809AAF24 01284821 */ addu $t1, $t1, $t0 -/* 00038 809AAF28 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 0003C 809AAF2C ACCF0008 */ sw $t7, 0x0008($a2) ## 00000008 -/* 00040 809AAF30 8D296FA8 */ lw $t1, %lo(gSegments)($t1) -/* 00044 809AAF34 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00048 809AAF38 00615024 */ and $t2, $v1, $at -/* 0004C 809AAF3C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00050 809AAF40 012A5821 */ addu $t3, $t1, $t2 -/* 00054 809AAF44 01616021 */ addu $t4, $t3, $at -/* 00058 809AAF48 ACCC0038 */ sw $t4, 0x0038($a2) ## 00000038 -/* 0005C 809AAF4C 84ED0018 */ lh $t5, 0x0018($a3) ## 00000018 -/* 00060 809AAF50 3C0E809B */ lui $t6, %hi(func_809AB078) ## $t6 = 809B0000 -/* 00064 809AAF54 3C0F809B */ lui $t7, %hi(func_809AB338) ## $t7 = 809B0000 -/* 00068 809AAF58 25CEB078 */ addiu $t6, $t6, %lo(func_809AB078) ## $t6 = 809AB078 -/* 0006C 809AAF5C 25EFB338 */ addiu $t7, $t7, %lo(func_809AB338) ## $t7 = 809AB338 -/* 00070 809AAF60 ACCE0028 */ sw $t6, 0x0028($a2) ## 00000028 -/* 00074 809AAF64 ACCF0024 */ sw $t7, 0x0024($a2) ## 00000024 -/* 00078 809AAF68 A4CD005C */ sh $t5, 0x005C($a2) ## 0000005C -/* 0007C 809AAF6C 90F8000C */ lbu $t8, 0x000C($a3) ## 0000000C -/* 00080 809AAF70 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00084 809AAF74 A4D80040 */ sh $t8, 0x0040($a2) ## 00000040 -/* 00088 809AAF78 90F9000D */ lbu $t9, 0x000D($a3) ## 0000000D -/* 0008C 809AAF7C A4D90042 */ sh $t9, 0x0042($a2) ## 00000042 -/* 00090 809AAF80 90E8000E */ lbu $t0, 0x000E($a3) ## 0000000E -/* 00094 809AAF84 A4C80044 */ sh $t0, 0x0044($a2) ## 00000044 -/* 00098 809AAF88 90E9000F */ lbu $t1, 0x000F($a3) ## 0000000F -/* 0009C 809AAF8C A4C90046 */ sh $t1, 0x0046($a2) ## 00000046 -/* 000A0 809AAF90 90EA0010 */ lbu $t2, 0x0010($a3) ## 00000010 -/* 000A4 809AAF94 A4CA0048 */ sh $t2, 0x0048($a2) ## 00000048 -/* 000A8 809AAF98 90EB0011 */ lbu $t3, 0x0011($a3) ## 00000011 -/* 000AC 809AAF9C A4CB004A */ sh $t3, 0x004A($a2) ## 0000004A -/* 000B0 809AAFA0 90EC0012 */ lbu $t4, 0x0012($a3) ## 00000012 -/* 000B4 809AAFA4 A4CC004C */ sh $t4, 0x004C($a2) ## 0000004C -/* 000B8 809AAFA8 90ED0013 */ lbu $t5, 0x0013($a3) ## 00000013 -/* 000BC 809AAFAC A4CD004E */ sh $t5, 0x004E($a2) ## 0000004E -/* 000C0 809AAFB0 84EE001A */ lh $t6, 0x001A($a3) ## 0000001A -/* 000C4 809AAFB4 A4CE0050 */ sh $t6, 0x0050($a2) ## 00000050 -/* 000C8 809AAFB8 84EF0014 */ lh $t7, 0x0014($a3) ## 00000014 -/* 000CC 809AAFBC A4CF0052 */ sh $t7, 0x0052($a2) ## 00000052 -/* 000D0 809AAFC0 84F80016 */ lh $t8, 0x0016($a3) ## 00000016 -/* 000D4 809AAFC4 A4D80054 */ sh $t8, 0x0054($a2) ## 00000054 -/* 000D8 809AAFC8 84F90018 */ lh $t9, 0x0018($a3) ## 00000018 -/* 000DC 809AAFCC 03E00008 */ jr $ra -/* 000E0 809AAFD0 A4D90056 */ sh $t9, 0x0056($a2) ## 00000056 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AAFD4.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AAFD4.s deleted file mode 100644 index aa9858c667..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AAFD4.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_809AAFD4 -/* 000E4 809AAFD4 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 000E8 809AAFD8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 000EC 809AAFDC AFA40078 */ sw $a0, 0x0078($sp) -/* 000F0 809AAFE0 AFA5007C */ sw $a1, 0x007C($sp) -/* 000F4 809AAFE4 AFA60080 */ sw $a2, 0x0080($sp) -/* 000F8 809AAFE8 AFA70084 */ sw $a3, 0x0084($sp) -/* 000FC 809AAFEC 0C009D38 */ jal EffectSs_Delete -/* 00100 809AAFF0 27A40018 */ addiu $a0, $sp, 0x0018 ## $a0 = FFFFFFA0 -/* 00104 809AAFF4 8FAE0084 */ lw $t6, 0x0084($sp) -/* 00108 809AAFF8 27A50018 */ addiu $a1, $sp, 0x0018 ## $a1 = FFFFFFA0 -/* 0010C 809AAFFC 00A0C825 */ or $t9, $a1, $zero ## $t9 = FFFFFFA0 -/* 00110 809AB000 25C80060 */ addiu $t0, $t6, 0x0060 ## $t0 = 00000060 -.L809AB004: -/* 00114 809AB004 8DD80000 */ lw $t8, 0x0000($t6) ## 00000000 -/* 00118 809AB008 25CE000C */ addiu $t6, $t6, 0x000C ## $t6 = 0000000C -/* 0011C 809AB00C 2739000C */ addiu $t9, $t9, 0x000C ## $t9 = FFFFFFAC -/* 00120 809AB010 AF38FFF4 */ sw $t8, -0x000C($t9) ## FFFFFFA0 -/* 00124 809AB014 8DCFFFF8 */ lw $t7, -0x0008($t6) ## 00000004 -/* 00128 809AB018 AF2FFFF8 */ sw $t7, -0x0008($t9) ## FFFFFFA4 -/* 0012C 809AB01C 8DD8FFFC */ lw $t8, -0x0004($t6) ## 00000008 -/* 00130 809AB020 15C8FFF8 */ bne $t6, $t0, .L809AB004 -/* 00134 809AB024 AF38FFFC */ sw $t8, -0x0004($t9) ## FFFFFFA8 -/* 00138 809AB028 8FA9007C */ lw $t1, 0x007C($sp) -/* 0013C 809AB02C 8D2B0000 */ lw $t3, 0x0000($t1) ## 00000000 -/* 00140 809AB030 ACAB0000 */ sw $t3, 0x0000($a1) ## FFFFFFA0 -/* 00144 809AB034 8D2A0004 */ lw $t2, 0x0004($t1) ## 00000004 -/* 00148 809AB038 ACAA0004 */ sw $t2, 0x0004($a1) ## FFFFFFA4 -/* 0014C 809AB03C 8D2B0008 */ lw $t3, 0x0008($t1) ## 00000008 -/* 00150 809AB040 ACAB0008 */ sw $t3, 0x0008($a1) ## FFFFFFA8 -/* 00154 809AB044 87AC0068 */ lh $t4, 0x0068($sp) -/* 00158 809AB048 87A80082 */ lh $t0, 0x0082($sp) -/* 0015C 809AB04C 87AE006E */ lh $t6, 0x006E($sp) -/* 00160 809AB050 258DFFFF */ addiu $t5, $t4, 0xFFFF ## $t5 = FFFFFFFF -/* 00164 809AB054 A7AD0068 */ sh $t5, 0x0068($sp) -/* 00168 809AB058 8FA40078 */ lw $a0, 0x0078($sp) -/* 0016C 809AB05C A7A8006C */ sh $t0, 0x006C($sp) -/* 00170 809AB060 0C009DC1 */ jal EffectSs_Insert -/* 00174 809AB064 A7AE0074 */ sh $t6, 0x0074($sp) -/* 00178 809AB068 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0017C 809AB06C 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 -/* 00180 809AB070 03E00008 */ jr $ra -/* 00184 809AB074 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AB078.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AB078.s deleted file mode 100644 index a91172a123..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AB078.s +++ /dev/null @@ -1,196 +0,0 @@ -.rdata -glabel D_809AB560 - .asciz "../z_eff_ss_lightning.c" - .balign 4 - -glabel D_809AB578 - .asciz "../z_eff_ss_lightning.c" - .balign 4 - -.late_rodata -glabel D_809AB590 - .float 0.01 - -glabel D_809AB594 - .float 0.6 - -.text -glabel func_809AB078 -/* 00188 809AB078 27BDFE18 */ addiu $sp, $sp, 0xFE18 ## $sp = FFFFFE18 -/* 0018C 809AB07C AFB00014 */ sw $s0, 0x0014($sp) -/* 00190 809AB080 AFBF001C */ sw $ra, 0x001C($sp) -/* 00194 809AB084 AFB10018 */ sw $s1, 0x0018($sp) -/* 00198 809AB088 AFA401E8 */ sw $a0, 0x01E8($sp) -/* 0019C 809AB08C AFA501EC */ sw $a1, 0x01EC($sp) -/* 001A0 809AB090 8C910000 */ lw $s1, 0x0000($a0) ## 00000000 -/* 001A4 809AB094 00C08025 */ or $s0, $a2, $zero ## $s0 = 00000000 -/* 001A8 809AB098 3C06809B */ lui $a2, %hi(D_809AB560) ## $a2 = 809B0000 -/* 001AC 809AB09C 24C6B560 */ addiu $a2, $a2, %lo(D_809AB560) ## $a2 = 809AB560 -/* 001B0 809AB0A0 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFE58 -/* 001B4 809AB0A4 240700E9 */ addiu $a3, $zero, 0x00E9 ## $a3 = 000000E9 -/* 001B8 809AB0A8 0C031AB1 */ jal Graph_OpenDisps -/* 001BC 809AB0AC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 001C0 809AB0B0 860F0052 */ lh $t7, 0x0052($s0) ## 00000052 -/* 001C4 809AB0B4 86180056 */ lh $t8, 0x0056($s0) ## 00000056 -/* 001C8 809AB0B8 8619005C */ lh $t9, 0x005C($s0) ## 0000005C -/* 001CC 809AB0BC 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 001D0 809AB0C0 3C01809B */ lui $at, %hi(D_809AB590) ## $at = 809B0000 -/* 001D4 809AB0C4 C428B590 */ lwc1 $f8, %lo(D_809AB590)($at) -/* 001D8 809AB0C8 468021A0 */ cvt.s.w $f6, $f4 -/* 001DC 809AB0CC 03191023 */ subu $v0, $t8, $t9 -/* 001E0 809AB0D0 00021400 */ sll $v0, $v0, 16 -/* 001E4 809AB0D4 00021403 */ sra $v0, $v0, 16 -/* 001E8 809AB0D8 28410008 */ slti $at, $v0, 0x0008 -/* 001EC 809AB0DC 27A40164 */ addiu $a0, $sp, 0x0164 ## $a0 = FFFFFF7C -/* 001F0 809AB0E0 46083082 */ mul.s $f2, $f6, $f8 -/* 001F4 809AB0E4 54200003 */ bnel $at, $zero, .L809AB0F4 -/* 001F8 809AB0E8 8E050000 */ lw $a1, 0x0000($s0) ## 00000000 -/* 001FC 809AB0EC 24020007 */ addiu $v0, $zero, 0x0007 ## $v0 = 00000007 -/* 00200 809AB0F0 8E050000 */ lw $a1, 0x0000($s0) ## 00000000 -.L809AB0F4: -/* 00204 809AB0F4 8E060004 */ lw $a2, 0x0004($s0) ## 00000004 -/* 00208 809AB0F8 8E070008 */ lw $a3, 0x0008($s0) ## 00000008 -/* 0020C 809AB0FC E7A2005C */ swc1 $f2, 0x005C($sp) -/* 00210 809AB100 0C029E89 */ jal SkinMatrix_SetTranslate -/* 00214 809AB104 A7A2005A */ sh $v0, 0x005A($sp) -/* 00218 809AB108 3C01809B */ lui $at, %hi(D_809AB594) ## $at = 809B0000 -/* 0021C 809AB10C C7A2005C */ lwc1 $f2, 0x005C($sp) -/* 00220 809AB110 C42AB594 */ lwc1 $f10, %lo(D_809AB594)($at) -/* 00224 809AB114 27A40124 */ addiu $a0, $sp, 0x0124 ## $a0 = FFFFFF3C -/* 00228 809AB118 44061000 */ mfc1 $a2, $f2 -/* 0022C 809AB11C 460A1002 */ mul.s $f0, $f2, $f10 -/* 00230 809AB120 44050000 */ mfc1 $a1, $f0 -/* 00234 809AB124 44070000 */ mfc1 $a3, $f0 -/* 00238 809AB128 0C029DA9 */ jal SkinMatrix_SetScale -/* 0023C 809AB12C 00000000 */ nop -/* 00240 809AB130 C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C -/* 00244 809AB134 C6040030 */ lwc1 $f4, 0x0030($s0) ## 00000030 -/* 00248 809AB138 27A400E4 */ addiu $a0, $sp, 0x00E4 ## $a0 = FFFFFEFC -/* 0024C 809AB13C 4600848D */ trunc.w.s $f18, $f16 -/* 00250 809AB140 86070054 */ lh $a3, 0x0054($s0) ## 00000054 -/* 00254 809AB144 4600218D */ trunc.w.s $f6, $f4 -/* 00258 809AB148 44059000 */ mfc1 $a1, $f18 -/* 0025C 809AB14C 44063000 */ mfc1 $a2, $f6 -/* 00260 809AB150 00052C00 */ sll $a1, $a1, 16 -/* 00264 809AB154 00052C03 */ sra $a1, $a1, 16 -/* 00268 809AB158 00063400 */ sll $a2, $a2, 16 -/* 0026C 809AB15C 0C029DC1 */ jal SkinMatrix_SetRotateRPY -/* 00270 809AB160 00063403 */ sra $a2, $a2, 16 -/* 00274 809AB164 8FA501E8 */ lw $a1, 0x01E8($sp) -/* 00278 809AB168 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0027C 809AB16C 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 -/* 00280 809AB170 27A40164 */ addiu $a0, $sp, 0x0164 ## $a0 = FFFFFF7C -/* 00284 809AB174 27A600A4 */ addiu $a2, $sp, 0x00A4 ## $a2 = FFFFFEBC -/* 00288 809AB178 0C029BE8 */ jal SkinMatrix_MtxFMtxFMult -/* 0028C 809AB17C 00A12821 */ addu $a1, $a1, $at -/* 00290 809AB180 27A400A4 */ addiu $a0, $sp, 0x00A4 ## $a0 = FFFFFEBC -/* 00294 809AB184 27A500E4 */ addiu $a1, $sp, 0x00E4 ## $a1 = FFFFFEFC -/* 00298 809AB188 0C029BE8 */ jal SkinMatrix_MtxFMtxFMult -/* 0029C 809AB18C 27A60064 */ addiu $a2, $sp, 0x0064 ## $a2 = FFFFFE7C -/* 002A0 809AB190 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFE7C -/* 002A4 809AB194 27A50124 */ addiu $a1, $sp, 0x0124 ## $a1 = FFFFFF3C -/* 002A8 809AB198 0C029BE8 */ jal SkinMatrix_MtxFMtxFMult -/* 002AC 809AB19C 27A601A4 */ addiu $a2, $sp, 0x01A4 ## $a2 = FFFFFFBC -/* 002B0 809AB1A0 8E2302D0 */ lw $v1, 0x02D0($s1) ## 000002D0 -/* 002B4 809AB1A4 3C0BDA38 */ lui $t3, 0xDA38 ## $t3 = DA380000 -/* 002B8 809AB1A8 3C0C8013 */ lui $t4, %hi(gMtxClear) -/* 002BC 809AB1AC 246A0008 */ addiu $t2, $v1, 0x0008 ## $t2 = 00000008 -/* 002C0 809AB1B0 AE2A02D0 */ sw $t2, 0x02D0($s1) ## 000002D0 -/* 002C4 809AB1B4 258CDB20 */ addiu $t4, %lo(gMtxClear) -/* 002C8 809AB1B8 356B0003 */ ori $t3, $t3, 0x0003 ## $t3 = DA380003 -/* 002CC 809AB1BC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 002D0 809AB1C0 27A501A4 */ addiu $a1, $sp, 0x01A4 ## $a1 = FFFFFFBC -/* 002D4 809AB1C4 AC6B0000 */ sw $t3, 0x0000($v1) ## 00000000 -/* 002D8 809AB1C8 0C029F9C */ jal SkinMatrix_MtxFToNewMtx -/* 002DC 809AB1CC AC6C0004 */ sw $t4, 0x0004($v1) ## 00000004 -/* 002E0 809AB1D0 1040004E */ beq $v0, $zero, .L809AB30C -/* 002E4 809AB1D4 3C0EDA38 */ lui $t6, 0xDA38 ## $t6 = DA380000 -/* 002E8 809AB1D8 8E2302D0 */ lw $v1, 0x02D0($s1) ## 000002D0 -/* 002EC 809AB1DC 35CE0003 */ ori $t6, $t6, 0x0003 ## $t6 = DA380003 -/* 002F0 809AB1E0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 002F4 809AB1E4 246D0008 */ addiu $t5, $v1, 0x0008 ## $t5 = 00000008 -/* 002F8 809AB1E8 AE2D02D0 */ sw $t5, 0x02D0($s1) ## 000002D0 -/* 002FC 809AB1EC AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00300 809AB1F0 0C025314 */ jal func_80094C50 -/* 00304 809AB1F4 AC6E0000 */ sw $t6, 0x0000($v1) ## 00000000 -/* 00308 809AB1F8 8E2302D0 */ lw $v1, 0x02D0($s1) ## 000002D0 -/* 0030C 809AB1FC 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 -/* 00310 809AB200 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 -/* 00314 809AB204 246F0008 */ addiu $t7, $v1, 0x0008 ## $t7 = 00000008 -/* 00318 809AB208 AE2F02D0 */ sw $t7, 0x02D0($s1) ## 000002D0 -/* 0031C 809AB20C AC780000 */ sw $t8, 0x0000($v1) ## 00000000 -/* 00320 809AB210 87B9005A */ lh $t9, 0x005A($sp) -/* 00324 809AB214 3C04809B */ lui $a0, %hi(D_809AB538) ## $a0 = 809B0000 -/* 00328 809AB218 3C0D8016 */ lui $t5, %hi(gSegments) -/* 0032C 809AB21C 00194080 */ sll $t0, $t9, 2 -/* 00330 809AB220 00882021 */ addu $a0, $a0, $t0 -/* 00334 809AB224 8C84B538 */ lw $a0, %lo(D_809AB538)($a0) -/* 00338 809AB228 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 0033C 809AB22C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00340 809AB230 00045100 */ sll $t2, $a0, 4 -/* 00344 809AB234 000A5F02 */ srl $t3, $t2, 28 -/* 00348 809AB238 000B6080 */ sll $t4, $t3, 2 -/* 0034C 809AB23C 01AC6821 */ addu $t5, $t5, $t4 -/* 00350 809AB240 8DAD6FA8 */ lw $t5, %lo(gSegments)($t5) -/* 00354 809AB244 00814824 */ and $t1, $a0, $at -/* 00358 809AB248 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0035C 809AB24C 012D7021 */ addu $t6, $t1, $t5 -/* 00360 809AB250 01C17821 */ addu $t7, $t6, $at -/* 00364 809AB254 AC6F0004 */ sw $t7, 0x0004($v1) ## 00000004 -/* 00368 809AB258 8E2302D0 */ lw $v1, 0x02D0($s1) ## 000002D0 -/* 0036C 809AB25C 3C19FA00 */ lui $t9, 0xFA00 ## $t9 = FA000000 -/* 00370 809AB260 24780008 */ addiu $t8, $v1, 0x0008 ## $t8 = 00000008 -/* 00374 809AB264 AE3802D0 */ sw $t8, 0x02D0($s1) ## 000002D0 -/* 00378 809AB268 AC790000 */ sw $t9, 0x0000($v1) ## 00000000 -/* 0037C 809AB26C 86080046 */ lh $t0, 0x0046($s0) ## 00000046 -/* 00380 809AB270 860E0042 */ lh $t6, 0x0042($s0) ## 00000042 -/* 00384 809AB274 860C0040 */ lh $t4, 0x0040($s0) ## 00000040 -/* 00388 809AB278 310A00FF */ andi $t2, $t0, 0x00FF ## $t2 = 00000000 -/* 0038C 809AB27C 86080044 */ lh $t0, 0x0044($s0) ## 00000044 -/* 00390 809AB280 31CF00FF */ andi $t7, $t6, 0x00FF ## $t7 = 00000000 -/* 00394 809AB284 000C4E00 */ sll $t1, $t4, 24 -/* 00398 809AB288 01496825 */ or $t5, $t2, $t1 ## $t5 = 00000000 -/* 0039C 809AB28C 000FC400 */ sll $t8, $t7, 16 -/* 003A0 809AB290 310B00FF */ andi $t3, $t0, 0x00FF ## $t3 = 00000000 -/* 003A4 809AB294 000B6200 */ sll $t4, $t3, 8 -/* 003A8 809AB298 01B8C825 */ or $t9, $t5, $t8 ## $t9 = 00000008 -/* 003AC 809AB29C 032C5025 */ or $t2, $t9, $t4 ## $t2 = 00000008 -/* 003B0 809AB2A0 AC6A0004 */ sw $t2, 0x0004($v1) ## 00000004 -/* 003B4 809AB2A4 8E2302D0 */ lw $v1, 0x02D0($s1) ## 000002D0 -/* 003B8 809AB2A8 3C0EFB00 */ lui $t6, 0xFB00 ## $t6 = FB000000 -/* 003BC 809AB2AC 24690008 */ addiu $t1, $v1, 0x0008 ## $t1 = 00000008 -/* 003C0 809AB2B0 AE2902D0 */ sw $t1, 0x02D0($s1) ## 000002D0 -/* 003C4 809AB2B4 AC6E0000 */ sw $t6, 0x0000($v1) ## 00000000 -/* 003C8 809AB2B8 860F004E */ lh $t7, 0x004E($s0) ## 0000004E -/* 003CC 809AB2BC 860C004A */ lh $t4, 0x004A($s0) ## 0000004A -/* 003D0 809AB2C0 86080048 */ lh $t0, 0x0048($s0) ## 00000048 -/* 003D4 809AB2C4 31ED00FF */ andi $t5, $t7, 0x00FF ## $t5 = 00000000 -/* 003D8 809AB2C8 860F004C */ lh $t7, 0x004C($s0) ## 0000004C -/* 003DC 809AB2CC 318A00FF */ andi $t2, $t4, 0x00FF ## $t2 = 00000000 -/* 003E0 809AB2D0 00085E00 */ sll $t3, $t0, 24 -/* 003E4 809AB2D4 01ABC825 */ or $t9, $t5, $t3 ## $t9 = 00000000 -/* 003E8 809AB2D8 000A4C00 */ sll $t1, $t2, 16 -/* 003EC 809AB2DC 31F800FF */ andi $t8, $t7, 0x00FF ## $t8 = 00000000 -/* 003F0 809AB2E0 00184200 */ sll $t0, $t8, 8 -/* 003F4 809AB2E4 03297025 */ or $t6, $t9, $t1 ## $t6 = 00000008 -/* 003F8 809AB2E8 01C86825 */ or $t5, $t6, $t0 ## $t5 = 00000008 -/* 003FC 809AB2EC AC6D0004 */ sw $t5, 0x0004($v1) ## 00000004 -/* 00400 809AB2F0 8E2302D0 */ lw $v1, 0x02D0($s1) ## 000002D0 -/* 00404 809AB2F4 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 -/* 00408 809AB2F8 246B0008 */ addiu $t3, $v1, 0x0008 ## $t3 = 00000008 -/* 0040C 809AB2FC AE2B02D0 */ sw $t3, 0x02D0($s1) ## 000002D0 -/* 00410 809AB300 AC6C0000 */ sw $t4, 0x0000($v1) ## 00000000 -/* 00414 809AB304 8E0A0038 */ lw $t2, 0x0038($s0) ## 00000038 -/* 00418 809AB308 AC6A0004 */ sw $t2, 0x0004($v1) ## 00000004 -.L809AB30C: -/* 0041C 809AB30C 3C06809B */ lui $a2, %hi(D_809AB578) ## $a2 = 809B0000 -/* 00420 809AB310 24C6B578 */ addiu $a2, $a2, %lo(D_809AB578) ## $a2 = 809AB578 -/* 00424 809AB314 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFE58 -/* 00428 809AB318 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0042C 809AB31C 0C031AD5 */ jal Graph_CloseDisps -/* 00430 809AB320 24070119 */ addiu $a3, $zero, 0x0119 ## $a3 = 00000119 -/* 00434 809AB324 8FBF001C */ lw $ra, 0x001C($sp) -/* 00438 809AB328 8FB00014 */ lw $s0, 0x0014($sp) -/* 0043C 809AB32C 8FB10018 */ lw $s1, 0x0018($sp) -/* 00440 809AB330 03E00008 */ jr $ra -/* 00444 809AB334 27BD01E8 */ addiu $sp, $sp, 0x01E8 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AB338.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AB338.s deleted file mode 100644 index 7872d7eb9a..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AB338.s +++ /dev/null @@ -1,147 +0,0 @@ -.late_rodata -glabel D_809AB598 - .float 3640.0 - -glabel D_809AB59C - .float 0.01 - -glabel D_809AB5A0 - .float 0.1 - -.text -glabel func_809AB338 -/* 00448 809AB338 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 0044C 809AB33C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00450 809AB340 AFB10020 */ sw $s1, 0x0020($sp) -/* 00454 809AB344 AFB0001C */ sw $s0, 0x001C($sp) -/* 00458 809AB348 F7B40010 */ sdc1 $f20, 0x0010($sp) -/* 0045C 809AB34C AFA50054 */ sw $a1, 0x0054($sp) -/* 00460 809AB350 84CE0050 */ lh $t6, 0x0050($a2) ## 00000050 -/* 00464 809AB354 00C08025 */ or $s0, $a2, $zero ## $s0 = 00000000 -/* 00468 809AB358 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 0046C 809AB35C 51C0006C */ beql $t6, $zero, .L809AB510 -/* 00470 809AB360 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00474 809AB364 84CF005C */ lh $t7, 0x005C($a2) ## 0000005C -/* 00478 809AB368 84D90056 */ lh $t9, 0x0056($a2) ## 00000056 -/* 0047C 809AB36C 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 00480 809AB370 57190067 */ bnel $t8, $t9, .L809AB510 -/* 00484 809AB374 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00488 809AB378 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 0048C 809AB37C 00000000 */ nop -/* 00490 809AB380 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00494 809AB384 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 00498 809AB388 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 0049C 809AB38C 4604003C */ c.lt.s $f0, $f4 -/* 004A0 809AB390 00000000 */ nop -/* 004A4 809AB394 45000003 */ bc1f .L809AB3A4 -/* 004A8 809AB398 00000000 */ nop -/* 004AC 809AB39C 10000001 */ beq $zero, $zero, .L809AB3A4 -/* 004B0 809AB3A0 2403FFFF */ addiu $v1, $zero, 0xFFFF ## $v1 = FFFFFFFF -.L809AB3A4: -/* 004B4 809AB3A4 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 004B8 809AB3A8 AFA30034 */ sw $v1, 0x0034($sp) -/* 004BC 809AB3AC 3C01809B */ lui $at, %hi(D_809AB598) ## $at = 809B0000 -/* 004C0 809AB3B0 C426B598 */ lwc1 $f6, %lo(D_809AB598)($at) -/* 004C4 809AB3B4 8FA30034 */ lw $v1, 0x0034($sp) -/* 004C8 809AB3B8 86020054 */ lh $v0, 0x0054($s0) ## 00000054 -/* 004CC 809AB3BC 46060202 */ mul.s $f8, $f0, $f6 -/* 004D0 809AB3C0 3C01809B */ lui $at, %hi(D_809AB59C) ## $at = 809B0000 -/* 004D4 809AB3C4 C424B59C */ lwc1 $f4, %lo(D_809AB59C)($at) -/* 004D8 809AB3C8 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 004DC 809AB3CC 2444C000 */ addiu $a0, $v0, 0xC000 ## $a0 = FFFFC000 -/* 004E0 809AB3D0 00042400 */ sll $a0, $a0, 16 -/* 004E4 809AB3D4 00042403 */ sra $a0, $a0, 16 -/* 004E8 809AB3D8 4600428D */ trunc.w.s $f10, $f8 -/* 004EC 809AB3DC 44814000 */ mtc1 $at, $f8 ## $f8 = 80.00 -/* 004F0 809AB3E0 44095000 */ mfc1 $t1, $f10 -/* 004F4 809AB3E4 00000000 */ nop -/* 004F8 809AB3E8 00095400 */ sll $t2, $t1, 16 -/* 004FC 809AB3EC 000A5C03 */ sra $t3, $t2, 16 -/* 00500 809AB3F0 256C0E38 */ addiu $t4, $t3, 0x0E38 ## $t4 = 00000E38 -/* 00504 809AB3F4 01830019 */ multu $t4, $v1 -/* 00508 809AB3F8 00006812 */ mflo $t5 -/* 0050C 809AB3FC 01A27021 */ addu $t6, $t5, $v0 -/* 00510 809AB400 A7AE003E */ sh $t6, 0x003E($sp) -/* 00514 809AB404 860F0052 */ lh $t7, 0x0052($s0) ## 00000052 -/* 00518 809AB408 448F8000 */ mtc1 $t7, $f16 ## $f16 = 0.00 -/* 0051C 809AB40C 00000000 */ nop -/* 00520 809AB410 468084A0 */ cvt.s.w $f18, $f16 -/* 00524 809AB414 46049182 */ mul.s $f6, $f18, $f4 -/* 00528 809AB418 00000000 */ nop -/* 0052C 809AB41C 46083502 */ mul.s $f20, $f6, $f8 -/* 00530 809AB420 0C01DE1C */ jal Math_Sins - ## sins? -/* 00534 809AB424 00000000 */ nop -/* 00538 809AB428 46140282 */ mul.s $f10, $f0, $f20 -/* 0053C 809AB42C C6100004 */ lwc1 $f16, 0x0004($s0) ## 00000004 -/* 00540 809AB430 46105480 */ add.s $f18, $f10, $f16 -/* 00544 809AB434 E7B20044 */ swc1 $f18, 0x0044($sp) -/* 00548 809AB438 86040054 */ lh $a0, 0x0054($s0) ## 00000054 -/* 0054C 809AB43C 2484C000 */ addiu $a0, $a0, 0xC000 ## $a0 = FFFFC000 -/* 00550 809AB440 00042400 */ sll $a0, $a0, 16 -/* 00554 809AB444 0C01DE0D */ jal Math_Coss - ## coss? -/* 00558 809AB448 00042403 */ sra $a0, $a0, 16 -/* 0055C 809AB44C 863807A0 */ lh $t8, 0x07A0($s1) ## 000007A0 -/* 00560 809AB450 46140502 */ mul.s $f20, $f0, $f20 -/* 00564 809AB454 0018C880 */ sll $t9, $t8, 2 -/* 00568 809AB458 02394021 */ addu $t0, $s1, $t9 -/* 0056C 809AB45C 0C016A52 */ jal func_8005A948 -/* 00570 809AB460 8D040790 */ lw $a0, 0x0790($t0) ## 00000790 -/* 00574 809AB464 00022400 */ sll $a0, $v0, 16 -/* 00578 809AB468 0C01DE0D */ jal Math_Coss - ## coss? -/* 0057C 809AB46C 00042403 */ sra $a0, $a0, 16 -/* 00580 809AB470 46140182 */ mul.s $f6, $f0, $f20 -/* 00584 809AB474 C6040000 */ lwc1 $f4, 0x0000($s0) ## 00000000 -/* 00588 809AB478 46062201 */ sub.s $f8, $f4, $f6 -/* 0058C 809AB47C E7A80040 */ swc1 $f8, 0x0040($sp) -/* 00590 809AB480 862907A0 */ lh $t1, 0x07A0($s1) ## 000007A0 -/* 00594 809AB484 00095080 */ sll $t2, $t1, 2 -/* 00598 809AB488 022A5821 */ addu $t3, $s1, $t2 -/* 0059C 809AB48C 0C016A52 */ jal func_8005A948 -/* 005A0 809AB490 8D640790 */ lw $a0, 0x0790($t3) ## 00000790 -/* 005A4 809AB494 00022400 */ sll $a0, $v0, 16 -/* 005A8 809AB498 0C01DE1C */ jal Math_Sins - ## sins? -/* 005AC 809AB49C 00042403 */ sra $a0, $a0, 16 -/* 005B0 809AB4A0 46140282 */ mul.s $f10, $f0, $f20 -/* 005B4 809AB4A4 C6100008 */ lwc1 $f16, 0x0008($s0) ## 00000008 -/* 005B8 809AB4A8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 005BC 809AB4AC 27A50040 */ addiu $a1, $sp, 0x0040 ## $a1 = FFFFFFF0 -/* 005C0 809AB4B0 87A6003E */ lh $a2, 0x003E($sp) -/* 005C4 809AB4B4 02003825 */ or $a3, $s0, $zero ## $a3 = 00000000 -/* 005C8 809AB4B8 46105480 */ add.s $f18, $f10, $f16 -/* 005CC 809AB4BC 0C26ABF5 */ jal func_809AAFD4 -/* 005D0 809AB4C0 E7B20048 */ swc1 $f18, 0x0048($sp) -/* 005D4 809AB4C4 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 005D8 809AB4C8 00000000 */ nop -/* 005DC 809AB4CC 3C01809B */ lui $at, %hi(D_809AB5A0) ## $at = 809B0000 -/* 005E0 809AB4D0 C424B5A0 */ lwc1 $f4, %lo(D_809AB5A0)($at) -/* 005E4 809AB4D4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 005E8 809AB4D8 27A50040 */ addiu $a1, $sp, 0x0040 ## $a1 = FFFFFFF0 -/* 005EC 809AB4DC 4604003C */ c.lt.s $f0, $f4 -/* 005F0 809AB4E0 00000000 */ nop -/* 005F4 809AB4E4 4502000A */ bc1fl .L809AB510 -/* 005F8 809AB4E8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 005FC 809AB4EC 860C0054 */ lh $t4, 0x0054($s0) ## 00000054 -/* 00600 809AB4F0 87AE003E */ lh $t6, 0x003E($sp) -/* 00604 809AB4F4 02003825 */ or $a3, $s0, $zero ## $a3 = 00000000 -/* 00608 809AB4F8 000C6840 */ sll $t5, $t4, 1 -/* 0060C 809AB4FC 01AE3023 */ subu $a2, $t5, $t6 -/* 00610 809AB500 00063400 */ sll $a2, $a2, 16 -/* 00614 809AB504 0C26ABF5 */ jal func_809AAFD4 -/* 00618 809AB508 00063403 */ sra $a2, $a2, 16 -/* 0061C 809AB50C 8FBF0024 */ lw $ra, 0x0024($sp) -.L809AB510: -/* 00620 809AB510 D7B40010 */ ldc1 $f20, 0x0010($sp) -/* 00624 809AB514 8FB0001C */ lw $s0, 0x001C($sp) -/* 00628 809AB518 8FB10020 */ lw $s1, 0x0020($sp) -/* 0062C 809AB51C 03E00008 */ jr $ra -/* 00630 809AB520 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 00634 809AB524 00000000 */ nop -/* 00638 809AB528 00000000 */ nop -/* 0063C 809AB52C 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/EffectSsSibuki_Init.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/EffectSsSibuki_Init.s deleted file mode 100644 index 30a1e5a4fb..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/EffectSsSibuki_Init.s +++ /dev/null @@ -1,120 +0,0 @@ -.late_rodata -glabel D_809ABCD8 - .float 0.01 - -.text -glabel EffectSsSibuki_Init -/* 00000 809AB630 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00004 809AB634 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00008 809AB638 AFA40018 */ sw $a0, 0x0018($sp) -/* 0000C 809AB63C AFA5001C */ sw $a1, 0x001C($sp) -/* 00010 809AB640 8CEF0000 */ lw $t7, 0x0000($a3) ## 00000000 -/* 00014 809AB644 3C0A8016 */ lui $t2, %hi(gGameInfo) -/* 00018 809AB648 3C020405 */ lui $v0, 0x0405 ## $v0 = 04050000 -/* 0001C 809AB64C ACCF0000 */ sw $t7, 0x0000($a2) ## 00000000 -/* 00020 809AB650 8CEE0004 */ lw $t6, 0x0004($a3) ## 00000004 -/* 00024 809AB654 24425DB0 */ addiu $v0, $v0, 0x5DB0 ## $v0 = 04055DB0 -/* 00028 809AB658 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 0002C 809AB65C ACCE0004 */ sw $t6, 0x0004($a2) ## 00000004 -/* 00030 809AB660 8CEF0008 */ lw $t7, 0x0008($a3) ## 00000008 -/* 00034 809AB664 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00038 809AB668 3C0C8016 */ lui $t4, %hi(gSegments) -/* 0003C 809AB66C ACCF0008 */ sw $t7, 0x0008($a2) ## 00000008 -/* 00040 809AB670 8CF9000C */ lw $t9, 0x000C($a3) ## 0000000C -/* 00044 809AB674 3C0F8016 */ lui $t7, %hi(gSegments) -/* 00048 809AB678 ACD9000C */ sw $t9, 0x000C($a2) ## 0000000C -/* 0004C 809AB67C 8CF80010 */ lw $t8, 0x0010($a3) ## 00000010 -/* 00050 809AB680 ACD80010 */ sw $t8, 0x0010($a2) ## 00000010 -/* 00054 809AB684 8CF90014 */ lw $t9, 0x0014($a3) ## 00000014 -/* 00058 809AB688 ACD90014 */ sw $t9, 0x0014($a2) ## 00000014 -/* 0005C 809AB68C 8CE90018 */ lw $t1, 0x0018($a3) ## 00000018 -/* 00060 809AB690 ACC90018 */ sw $t1, 0x0018($a2) ## 00000018 -/* 00064 809AB694 8CE8001C */ lw $t0, 0x001C($a3) ## 0000001C -/* 00068 809AB698 ACC8001C */ sw $t0, 0x001C($a2) ## 0000001C -/* 0006C 809AB69C 8CE90020 */ lw $t1, 0x0020($a3) ## 00000020 -/* 00070 809AB6A0 ACC90020 */ sw $t1, 0x0020($a2) ## 00000020 -/* 00074 809AB6A4 8D4AFA90 */ lw $t2, %lo(gGameInfo)($t2) -/* 00078 809AB6A8 00024900 */ sll $t1, $v0, 4 -/* 0007C 809AB6AC 854B09D8 */ lh $t3, 0x09D8($t2) ## 801609D8 -/* 00080 809AB6B0 00095702 */ srl $t2, $t1, 28 -/* 00084 809AB6B4 51600011 */ beql $t3, $zero, .L809AB6FC -/* 00088 809AB6B8 000A5880 */ sll $t3, $t2, 2 -/* 0008C 809AB6BC 3C020405 */ lui $v0, 0x0405 ## $v0 = 04050000 -/* 00090 809AB6C0 24425EB0 */ addiu $v0, $v0, 0x5EB0 ## $v0 = 04055EB0 -/* 00094 809AB6C4 00026100 */ sll $t4, $v0, 4 -/* 00098 809AB6C8 000C6F02 */ srl $t5, $t4, 28 -/* 0009C 809AB6CC 000D7080 */ sll $t6, $t5, 2 -/* 000A0 809AB6D0 01EE7821 */ addu $t7, $t7, $t6 -/* 000A4 809AB6D4 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 000A8 809AB6D8 8DEF6FA8 */ lw $t7, %lo(gSegments)($t7) -/* 000AC 809AB6DC 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 000B0 809AB6E0 0041C024 */ and $t8, $v0, $at -/* 000B4 809AB6E4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 000B8 809AB6E8 01F8C821 */ addu $t9, $t7, $t8 -/* 000BC 809AB6EC 03214021 */ addu $t0, $t9, $at -/* 000C0 809AB6F0 10000009 */ beq $zero, $zero, .L809AB718 -/* 000C4 809AB6F4 ACC80038 */ sw $t0, 0x0038($a2) ## 00000038 -/* 000C8 809AB6F8 000A5880 */ sll $t3, $t2, 2 -.L809AB6FC: -/* 000CC 809AB6FC 018B6021 */ addu $t4, $t4, $t3 -/* 000D0 809AB700 8D8C6FA8 */ lw $t4, %lo(gSegments)($t4) -/* 000D4 809AB704 00416824 */ and $t5, $v0, $at -/* 000D8 809AB708 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 000DC 809AB70C 018D7021 */ addu $t6, $t4, $t5 -/* 000E0 809AB710 01C17821 */ addu $t7, $t6, $at -/* 000E4 809AB714 ACCF0038 */ sw $t7, 0x0038($a2) ## 00000038 -.L809AB718: -/* 000E8 809AB718 AFA60020 */ sw $a2, 0x0020($sp) -/* 000EC 809AB71C 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 000F0 809AB720 AFA70024 */ sw $a3, 0x0024($sp) -/* 000F4 809AB724 3C038016 */ lui $v1, %hi(gGameInfo) -/* 000F8 809AB728 8C63FA90 */ lw $v1, %lo(gGameInfo)($v1) -/* 000FC 809AB72C 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 -/* 00100 809AB730 44812000 */ mtc1 $at, $f4 ## $f4 = 500.00 -/* 00104 809AB734 84780A54 */ lh $t8, 0x0A54($v1) ## 80160A54 -/* 00108 809AB738 3C01809B */ lui $at, %hi(D_809ABCD8) ## $at = 809B0000 -/* 0010C 809AB73C C432BCD8 */ lwc1 $f18, %lo(D_809ABCD8)($at) -/* 00110 809AB740 44983000 */ mtc1 $t8, $f6 ## $f6 = 0.00 -/* 00114 809AB744 846B0A56 */ lh $t3, 0x0A56($v1) ## 80160A56 -/* 00118 809AB748 8FA60020 */ lw $a2, 0x0020($sp) -/* 0011C 809AB74C 46803220 */ cvt.s.w $f8, $f6 -/* 00120 809AB750 8FA70024 */ lw $a3, 0x0024($sp) -/* 00124 809AB754 3C18809B */ lui $t8, %hi(func_809AB7EC) ## $t8 = 809B0000 -/* 00128 809AB758 3C19809B */ lui $t9, %hi(func_809AB9DC) ## $t9 = 809B0000 -/* 0012C 809AB75C 2718B7EC */ addiu $t8, $t8, %lo(func_809AB7EC) ## $t8 = 809AB7EC -/* 00130 809AB760 2739B9DC */ addiu $t9, $t9, %lo(func_809AB9DC) ## $t9 = 809AB9DC -/* 00134 809AB764 46082280 */ add.s $f10, $f4, $f8 -/* 00138 809AB768 24040064 */ addiu $a0, $zero, 0x0064 ## $a0 = 00000064 -/* 0013C 809AB76C 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF -/* 00140 809AB770 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00144 809AB774 460A0402 */ mul.s $f16, $f0, $f10 -/* 00148 809AB778 00000000 */ nop -/* 0014C 809AB77C 46128182 */ mul.s $f6, $f16, $f18 -/* 00150 809AB780 4600310D */ trunc.w.s $f4, $f6 -/* 00154 809AB784 440A2000 */ mfc1 $t2, $f4 -/* 00158 809AB788 00000000 */ nop -/* 0015C 809AB78C 016A6021 */ addu $t4, $t3, $t2 -/* 00160 809AB790 258D000A */ addiu $t5, $t4, 0x000A ## $t5 = 0000000A -/* 00164 809AB794 A4CD005C */ sh $t5, 0x005C($a2) ## 0000005C -/* 00168 809AB798 84EE0024 */ lh $t6, 0x0024($a3) ## 00000024 -/* 0016C 809AB79C ACD80028 */ sw $t8, 0x0028($a2) ## 00000028 -/* 00170 809AB7A0 ACD90024 */ sw $t9, 0x0024($a2) ## 00000024 -/* 00174 809AB7A4 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 00178 809AB7A8 A4CF0050 */ sh $t7, 0x0050($a2) ## 00000050 -/* 0017C 809AB7AC 84E80026 */ lh $t0, 0x0026($a3) ## 00000026 -/* 00180 809AB7B0 A4C80052 */ sh $t0, 0x0052($a2) ## 00000052 -/* 00184 809AB7B4 84E90028 */ lh $t1, 0x0028($a3) ## 00000028 -/* 00188 809AB7B8 A4C40040 */ sh $a0, 0x0040($a2) ## 00000040 -/* 0018C 809AB7BC A4C40042 */ sh $a0, 0x0042($a2) ## 00000042 -/* 00190 809AB7C0 A4C40044 */ sh $a0, 0x0044($a2) ## 00000044 -/* 00194 809AB7C4 A4C40046 */ sh $a0, 0x0046($a2) ## 00000046 -/* 00198 809AB7C8 A4C50048 */ sh $a1, 0x0048($a2) ## 00000048 -/* 0019C 809AB7CC A4C5004A */ sh $a1, 0x004A($a2) ## 0000004A -/* 001A0 809AB7D0 A4C5004C */ sh $a1, 0x004C($a2) ## 0000004C -/* 001A4 809AB7D4 A4C5004E */ sh $a1, 0x004E($a2) ## 0000004E -/* 001A8 809AB7D8 A4C90054 */ sh $t1, 0x0054($a2) ## 00000054 -/* 001AC 809AB7DC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 001B0 809AB7E0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 001B4 809AB7E4 03E00008 */ jr $ra -/* 001B8 809AB7E8 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB7EC.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB7EC.s deleted file mode 100644 index 8738767ac4..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB7EC.s +++ /dev/null @@ -1,139 +0,0 @@ -.rdata -glabel D_809ABC90 - .asciz "../z_eff_ss_sibuki.c" - .balign 4 - -glabel D_809ABCA8 - .asciz "../z_eff_ss_sibuki.c" - .balign 4 - -glabel D_809ABCC0 - .asciz "../z_eff_ss_sibuki.c" - .balign 4 - -.text -glabel func_809AB7EC -/* 001BC 809AB7EC 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 001C0 809AB7F0 AFBF001C */ sw $ra, 0x001C($sp) -/* 001C4 809AB7F4 AFB10018 */ sw $s1, 0x0018($sp) -/* 001C8 809AB7F8 AFB00014 */ sw $s0, 0x0014($sp) -/* 001CC 809AB7FC AFA40058 */ sw $a0, 0x0058($sp) -/* 001D0 809AB800 AFA5005C */ sw $a1, 0x005C($sp) -/* 001D4 809AB804 84CF0054 */ lh $t7, 0x0054($a2) ## 00000054 -/* 001D8 809AB808 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 001DC 809AB80C 44814000 */ mtc1 $at, $f8 ## $f8 = 100.00 -/* 001E0 809AB810 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 001E4 809AB814 8C910000 */ lw $s1, 0x0000($a0) ## 00000000 -/* 001E8 809AB818 00C08025 */ or $s0, $a2, $zero ## $s0 = 00000000 -/* 001EC 809AB81C 468021A0 */ cvt.s.w $f6, $f4 -/* 001F0 809AB820 3C06809B */ lui $a2, %hi(D_809ABC90) ## $a2 = 809B0000 -/* 001F4 809AB824 24C6BC90 */ addiu $a2, $a2, %lo(D_809ABC90) ## $a2 = 809ABC90 -/* 001F8 809AB828 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 -/* 001FC 809AB82C 240700A3 */ addiu $a3, $zero, 0x00A3 ## $a3 = 000000A3 -/* 00200 809AB830 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00204 809AB834 46083283 */ div.s $f10, $f6, $f8 -/* 00208 809AB838 0C031AB1 */ jal Graph_OpenDisps -/* 0020C 809AB83C E7AA0050 */ swc1 $f10, 0x0050($sp) -/* 00210 809AB840 C60C0000 */ lwc1 $f12, 0x0000($s0) ## 00000000 -/* 00214 809AB844 C60E0004 */ lwc1 $f14, 0x0004($s0) ## 00000004 -/* 00218 809AB848 8E060008 */ lw $a2, 0x0008($s0) ## 00000008 -/* 0021C 809AB84C 0C034261 */ jal Matrix_Translate -/* 00220 809AB850 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00224 809AB854 C7AC0050 */ lwc1 $f12, 0x0050($sp) -/* 00228 809AB858 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0022C 809AB85C 44066000 */ mfc1 $a2, $f12 -/* 00230 809AB860 0C0342A3 */ jal Matrix_Scale -/* 00234 809AB864 46006386 */ mov.s $f14, $f12 -/* 00238 809AB868 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 -/* 0023C 809AB86C 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 -/* 00240 809AB870 37390003 */ ori $t9, $t9, 0x0003 ## $t9 = DA380003 -/* 00244 809AB874 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 00248 809AB878 AE3802C0 */ sw $t8, 0x02C0($s1) ## 000002C0 -/* 0024C 809AB87C 3C05809B */ lui $a1, %hi(D_809ABCA8) ## $a1 = 809B0000 -/* 00250 809AB880 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 00254 809AB884 24A5BCA8 */ addiu $a1, $a1, %lo(D_809ABCA8) ## $a1 = 809ABCA8 -/* 00258 809AB888 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0025C 809AB88C 240600B0 */ addiu $a2, $zero, 0x00B0 ## $a2 = 000000B0 -/* 00260 809AB890 0C0346A2 */ jal Matrix_NewMtx -/* 00264 809AB894 AFA20038 */ sw $v0, 0x0038($sp) -/* 00268 809AB898 8FA30038 */ lw $v1, 0x0038($sp) -/* 0026C 809AB89C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00270 809AB8A0 0C024F46 */ jal func_80093D18 -/* 00274 809AB8A4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00278 809AB8A8 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 -/* 0027C 809AB8AC 3C09FA00 */ lui $t1, 0xFA00 ## $t1 = FA000000 -/* 00280 809AB8B0 3C040402 */ lui $a0, 0x0402 ## $a0 = 04020000 -/* 00284 809AB8B4 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 -/* 00288 809AB8B8 AE2802C0 */ sw $t0, 0x02C0($s1) ## 000002C0 -/* 0028C 809AB8BC AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 00290 809AB8C0 860A0046 */ lh $t2, 0x0046($s0) ## 00000046 -/* 00294 809AB8C4 86180042 */ lh $t8, 0x0042($s0) ## 00000042 -/* 00298 809AB8C8 860D0040 */ lh $t5, 0x0040($s0) ## 00000040 -/* 0029C 809AB8CC 314B00FF */ andi $t3, $t2, 0x00FF ## $t3 = 00000000 -/* 002A0 809AB8D0 860A0044 */ lh $t2, 0x0044($s0) ## 00000044 -/* 002A4 809AB8D4 331900FF */ andi $t9, $t8, 0x00FF ## $t9 = 00000000 -/* 002A8 809AB8D8 000D7600 */ sll $t6, $t5, 24 -/* 002AC 809AB8DC 016E7825 */ or $t7, $t3, $t6 ## $t7 = 00000000 -/* 002B0 809AB8E0 00194400 */ sll $t0, $t9, 16 -/* 002B4 809AB8E4 314C00FF */ andi $t4, $t2, 0x00FF ## $t4 = 00000000 -/* 002B8 809AB8E8 000C6A00 */ sll $t5, $t4, 8 -/* 002BC 809AB8EC 01E84825 */ or $t1, $t7, $t0 ## $t1 = 00000008 -/* 002C0 809AB8F0 012D5825 */ or $t3, $t1, $t5 ## $t3 = 00000008 -/* 002C4 809AB8F4 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 002C8 809AB8F8 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 -/* 002CC 809AB8FC 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 -/* 002D0 809AB900 2484A160 */ addiu $a0, $a0, 0xA160 ## $a0 = 0401A160 -/* 002D4 809AB904 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 002D8 809AB908 AE2E02C0 */ sw $t6, 0x02C0($s1) ## 000002C0 -/* 002DC 809AB90C AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 002E0 809AB910 8619004E */ lh $t9, 0x004E($s0) ## 0000004E -/* 002E4 809AB914 860D004A */ lh $t5, 0x004A($s0) ## 0000004A -/* 002E8 809AB918 860A0048 */ lh $t2, 0x0048($s0) ## 00000048 -/* 002EC 809AB91C 332F00FF */ andi $t7, $t9, 0x00FF ## $t7 = 00000000 -/* 002F0 809AB920 8619004C */ lh $t9, 0x004C($s0) ## 0000004C -/* 002F4 809AB924 31AB00FF */ andi $t3, $t5, 0x00FF ## $t3 = 00000000 -/* 002F8 809AB928 000A6600 */ sll $t4, $t2, 24 -/* 002FC 809AB92C 01EC4825 */ or $t1, $t7, $t4 ## $t1 = 00000000 -/* 00300 809AB930 000B7400 */ sll $t6, $t3, 16 -/* 00304 809AB934 332800FF */ andi $t0, $t9, 0x00FF ## $t0 = 00000000 -/* 00308 809AB938 00085200 */ sll $t2, $t0, 8 -/* 0030C 809AB93C 012EC025 */ or $t8, $t1, $t6 ## $t8 = 00000008 -/* 00310 809AB940 030A7825 */ or $t7, $t8, $t2 ## $t7 = 00000008 -/* 00314 809AB944 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 00318 809AB948 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 -/* 0031C 809AB94C 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 -/* 00320 809AB950 35AD0020 */ ori $t5, $t5, 0x0020 ## $t5 = DB060020 -/* 00324 809AB954 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 00328 809AB958 AE2C02C0 */ sw $t4, 0x02C0($s1) ## 000002C0 -/* 0032C 809AB95C AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 00330 809AB960 8E0B0038 */ lw $t3, 0x0038($s0) ## 00000038 -/* 00334 809AB964 0004C900 */ sll $t9, $a0, 4 -/* 00338 809AB968 00194702 */ srl $t0, $t9, 28 -/* 0033C 809AB96C AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 00340 809AB970 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 -/* 00344 809AB974 0008C080 */ sll $t8, $t0, 2 -/* 00348 809AB978 3C0A8016 */ lui $t2, %hi(gSegments) -/* 0034C 809AB97C 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 00350 809AB980 AE2902C0 */ sw $t1, 0x02C0($s1) ## 000002C0 -/* 00354 809AB984 3C0EDE00 */ lui $t6, 0xDE00 ## $t6 = DE000000 -/* 00358 809AB988 01585021 */ addu $t2, $t2, $t8 -/* 0035C 809AB98C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00360 809AB990 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 00364 809AB994 8D4A6FA8 */ lw $t2, %lo(gSegments)($t2) -/* 00368 809AB998 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 0036C 809AB99C 00817824 */ and $t7, $a0, $at -/* 00370 809AB9A0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00374 809AB9A4 014F6021 */ addu $t4, $t2, $t7 -/* 00378 809AB9A8 01816821 */ addu $t5, $t4, $at -/* 0037C 809AB9AC 3C06809B */ lui $a2, %hi(D_809ABCC0) ## $a2 = 809B0000 -/* 00380 809AB9B0 24C6BCC0 */ addiu $a2, $a2, %lo(D_809ABCC0) ## $a2 = 809ABCC0 -/* 00384 809AB9B4 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 -/* 00388 809AB9B8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0038C 809AB9BC 240700C6 */ addiu $a3, $zero, 0x00C6 ## $a3 = 000000C6 -/* 00390 809AB9C0 0C031AD5 */ jal Graph_CloseDisps -/* 00394 809AB9C4 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 00398 809AB9C8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0039C 809AB9CC 8FB00014 */ lw $s0, 0x0014($sp) -/* 003A0 809AB9D0 8FB10018 */ lw $s1, 0x0018($sp) -/* 003A4 809AB9D4 03E00008 */ jr $ra -/* 003A8 809AB9D8 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB9DC.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB9DC.s deleted file mode 100644 index 6c168b136c..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB9DC.s +++ /dev/null @@ -1,194 +0,0 @@ -.late_rodata -glabel D_809ABCDC - .float 0.01 - -glabel D_809ABCE0 - .float 0.1 - -glabel D_809ABCE4 - .float 0.1 - -glabel D_809ABCE8 - .float 0.1 - -.text -glabel func_809AB9DC -/* 003AC 809AB9DC 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 003B0 809AB9E0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 003B4 809AB9E4 AFB10020 */ sw $s1, 0x0020($sp) -/* 003B8 809AB9E8 AFB0001C */ sw $s0, 0x001C($sp) -/* 003BC 809AB9EC F7B40010 */ sdc1 $f20, 0x0010($sp) -/* 003C0 809AB9F0 AFA50044 */ sw $a1, 0x0044($sp) -/* 003C4 809AB9F4 8C821C44 */ lw $v0, 0x1C44($a0) ## 00001C44 -/* 003C8 809AB9F8 C4C60004 */ lwc1 $f6, 0x0004($a2) ## 00000004 -/* 003CC 809AB9FC 00C08025 */ or $s0, $a2, $zero ## $s0 = 00000000 -/* 003D0 809ABA00 C4440080 */ lwc1 $f4, 0x0080($v0) ## 00000080 -/* 003D4 809ABA04 4604303E */ c.le.s $f6, $f4 -/* 003D8 809ABA08 00000000 */ nop -/* 003DC 809ABA0C 45020003 */ bc1fl .L809ABA1C -/* 003E0 809ABA10 86020050 */ lh $v0, 0x0050($s0) ## 00000050 -/* 003E4 809ABA14 A4C0005C */ sh $zero, 0x005C($a2) ## 0000005C -/* 003E8 809ABA18 86020050 */ lh $v0, 0x0050($s0) ## 00000050 -.L809ABA1C: -/* 003EC 809ABA1C 10400087 */ beq $v0, $zero, .L809ABC3C -/* 003F0 809ABA20 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 003F4 809ABA24 A60E0050 */ sh $t6, 0x0050($s0) ## 00000050 -/* 003F8 809ABA28 860F0050 */ lh $t7, 0x0050($s0) ## 00000050 -/* 003FC 809ABA2C 55E0008E */ bnel $t7, $zero, .L809ABC68 -/* 00400 809ABA30 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00404 809ABA34 0C030129 */ jal Gameplay_GetCamera -/* 00408 809ABA38 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0040C 809ABA3C 0C016A52 */ jal func_8005A948 -/* 00410 809ABA40 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 00414 809ABA44 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00418 809ABA48 A7A2002E */ sh $v0, 0x002E($sp) -/* 0041C 809ABA4C 3C118016 */ lui $s1, %hi(gGameInfo) -/* 00420 809ABA50 2631FA90 */ addiu $s1, %lo(gGameInfo) -/* 00424 809ABA54 8E220000 */ lw $v0, 0x0000($s1) ## 8015FA90 -/* 00428 809ABA58 3C01809B */ lui $at, %hi(D_809ABCDC) ## $at = 809B0000 -/* 0042C 809ABA5C C434BCDC */ lwc1 $f20, %lo(D_809ABCDC)($at) -/* 00430 809ABA60 84580A02 */ lh $t8, 0x0A02($v0) ## 00000A02 -/* 00434 809ABA64 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00438 809ABA68 44818000 */ mtc1 $at, $f16 ## $f16 = 20.00 -/* 0043C 809ABA6C 44984000 */ mtc1 $t8, $f8 ## $f8 = 0.00 -/* 00440 809ABA70 845909FC */ lh $t9, 0x09FC($v0) ## 000009FC -/* 00444 809ABA74 3C01809B */ lui $at, %hi(D_809ABCE0) ## $at = 809B0000 -/* 00448 809ABA78 468042A0 */ cvt.s.w $f10, $f8 -/* 0044C 809ABA7C C424BCE0 */ lwc1 $f4, %lo(D_809ABCE0)($at) -/* 00450 809ABA80 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 00454 809ABA84 86080052 */ lh $t0, 0x0052($s0) ## 00000052 -/* 00458 809ABA88 46002182 */ mul.s $f6, $f4, $f0 -/* 0045C 809ABA8C 87A4002E */ lh $a0, 0x002E($sp) -/* 00460 809ABA90 46105480 */ add.s $f18, $f10, $f16 -/* 00464 809ABA94 44998000 */ mtc1 $t9, $f16 ## $f16 = 0.00 -/* 00468 809ABA98 44815000 */ mtc1 $at, $f10 ## $f10 = 200.00 -/* 0046C 809ABA9C 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 00470 809ABAA0 46808120 */ cvt.s.w $f4, $f16 -/* 00474 809ABAA4 46069202 */ mul.s $f8, $f18, $f6 -/* 00478 809ABAA8 46045480 */ add.s $f18, $f10, $f4 -/* 0047C 809ABAAC 46149182 */ mul.s $f6, $f18, $f20 -/* 00480 809ABAB0 11000005 */ beq $t0, $zero, .L809ABAC8 -/* 00484 809ABAB4 46064080 */ add.s $f2, $f8, $f6 -/* 00488 809ABAB8 44818000 */ mtc1 $at, $f16 ## $f16 = -1.00 -/* 0048C 809ABABC 00000000 */ nop -/* 00490 809ABAC0 46101082 */ mul.s $f2, $f2, $f16 -/* 00494 809ABAC4 00000000 */ nop -.L809ABAC8: -/* 00498 809ABAC8 0C01DE0D */ jal Math_Coss - ## coss? -/* 0049C 809ABACC E7A20030 */ swc1 $f2, 0x0030($sp) -/* 004A0 809ABAD0 C7A20030 */ lwc1 $f2, 0x0030($sp) -/* 004A4 809ABAD4 46020282 */ mul.s $f10, $f0, $f2 -/* 004A8 809ABAD8 E60A000C */ swc1 $f10, 0x000C($s0) ## 0000000C -/* 004AC 809ABADC 0C01DE1C */ jal Math_Sins - ## sins? -/* 004B0 809ABAE0 87A4002E */ lh $a0, 0x002E($sp) -/* 004B4 809ABAE4 C7A20030 */ lwc1 $f2, 0x0030($sp) -/* 004B8 809ABAE8 46000107 */ neg.s $f4, $f0 -/* 004BC 809ABAEC 46022482 */ mul.s $f18, $f4, $f2 -/* 004C0 809ABAF0 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 004C4 809ABAF4 E6120014 */ swc1 $f18, 0x0014($s0) ## 00000014 -/* 004C8 809ABAF8 8E220000 */ lw $v0, 0x0000($s1) ## 8015FA90 -/* 004CC 809ABAFC 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 004D0 809ABB00 44818000 */ mtc1 $at, $f16 ## $f16 = 20.00 -/* 004D4 809ABB04 84490A04 */ lh $t1, 0x0A04($v0) ## 00000A04 -/* 004D8 809ABB08 844A09FE */ lh $t2, 0x09FE($v0) ## 000009FE -/* 004DC 809ABB0C 3C01809B */ lui $at, %hi(D_809ABCE4) ## $at = 809B0000 -/* 004E0 809ABB10 44894000 */ mtc1 $t1, $f8 ## $f8 = 0.00 -/* 004E4 809ABB14 C424BCE4 */ lwc1 $f4, %lo(D_809ABCE4)($at) -/* 004E8 809ABB18 3C01442F */ lui $at, 0x442F ## $at = 442F0000 -/* 004EC 809ABB1C 468041A0 */ cvt.s.w $f6, $f8 -/* 004F0 809ABB20 46002482 */ mul.s $f18, $f4, $f0 -/* 004F4 809ABB24 46103280 */ add.s $f10, $f6, $f16 -/* 004F8 809ABB28 448A8000 */ mtc1 $t2, $f16 ## $f16 = 0.00 -/* 004FC 809ABB2C 44813000 */ mtc1 $at, $f6 ## $f6 = 700.00 -/* 00500 809ABB30 46808120 */ cvt.s.w $f4, $f16 -/* 00504 809ABB34 46125202 */ mul.s $f8, $f10, $f18 -/* 00508 809ABB38 46043280 */ add.s $f10, $f6, $f4 -/* 0050C 809ABB3C 46145482 */ mul.s $f18, $f10, $f20 -/* 00510 809ABB40 46124400 */ add.s $f16, $f8, $f18 -/* 00514 809ABB44 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00518 809ABB48 E6100010 */ swc1 $f16, 0x0010($s0) ## 00000010 -/* 0051C 809ABB4C 8E220000 */ lw $v0, 0x0000($s1) ## 8015FA90 -/* 00520 809ABB50 3C01809B */ lui $at, %hi(D_809ABCE8) ## $at = 809B0000 -/* 00524 809ABB54 C42ABCE8 */ lwc1 $f10, %lo(D_809ABCE8)($at) -/* 00528 809ABB58 844B0A06 */ lh $t3, 0x0A06($v0) ## 00000A06 -/* 0052C 809ABB5C 844C0A00 */ lh $t4, 0x0A00($v0) ## 00000A00 -/* 00530 809ABB60 46005202 */ mul.s $f8, $f10, $f0 -/* 00534 809ABB64 448B3000 */ mtc1 $t3, $f6 ## $f6 = 0.00 -/* 00538 809ABB68 3C01C2C8 */ lui $at, 0xC2C8 ## $at = C2C80000 -/* 0053C 809ABB6C 44818000 */ mtc1 $at, $f16 ## $f16 = -100.00 -/* 00540 809ABB70 46803120 */ cvt.s.w $f4, $f6 -/* 00544 809ABB74 448C3000 */ mtc1 $t4, $f6 ## $f6 = 0.00 -/* 00548 809ABB78 00000000 */ nop -/* 0054C 809ABB7C 468032A0 */ cvt.s.w $f10, $f6 -/* 00550 809ABB80 46082482 */ mul.s $f18, $f4, $f8 -/* 00554 809ABB84 460A8100 */ add.s $f4, $f16, $f10 -/* 00558 809ABB88 46142202 */ mul.s $f8, $f4, $f20 -/* 0055C 809ABB8C 46089180 */ add.s $f6, $f18, $f8 -/* 00560 809ABB90 E606001C */ swc1 $f6, 0x001C($s0) ## 0000001C -/* 00564 809ABB94 8E2D0000 */ lw $t5, 0x0000($s1) ## 8015FA90 -/* 00568 809ABB98 85A309DA */ lh $v1, 0x09DA($t5) ## 000009DA -/* 0056C 809ABB9C 50600032 */ beql $v1, $zero, .L809ABC68 -/* 00570 809ABBA0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00574 809ABBA4 44835000 */ mtc1 $v1, $f10 ## $f10 = 0.00 -/* 00578 809ABBA8 C610000C */ lwc1 $f16, 0x000C($s0) ## 0000000C -/* 0057C 809ABBAC C6060010 */ lwc1 $f6, 0x0010($s0) ## 00000010 -/* 00580 809ABBB0 46805120 */ cvt.s.w $f4, $f10 -/* 00584 809ABBB4 46142482 */ mul.s $f18, $f4, $f20 -/* 00588 809ABBB8 00000000 */ nop -/* 0058C 809ABBBC 46128202 */ mul.s $f8, $f16, $f18 -/* 00590 809ABBC0 E608000C */ swc1 $f8, 0x000C($s0) ## 0000000C -/* 00594 809ABBC4 8E2E0000 */ lw $t6, 0x0000($s1) ## 8015FA90 -/* 00598 809ABBC8 C6080014 */ lwc1 $f8, 0x0014($s0) ## 00000014 -/* 0059C 809ABBCC 85CF09DA */ lh $t7, 0x09DA($t6) ## 000009DA -/* 005A0 809ABBD0 448F5000 */ mtc1 $t7, $f10 ## $f10 = 0.00 -/* 005A4 809ABBD4 00000000 */ nop -/* 005A8 809ABBD8 46805120 */ cvt.s.w $f4, $f10 -/* 005AC 809ABBDC 46142402 */ mul.s $f16, $f4, $f20 -/* 005B0 809ABBE0 00000000 */ nop -/* 005B4 809ABBE4 46103482 */ mul.s $f18, $f6, $f16 -/* 005B8 809ABBE8 E6120010 */ swc1 $f18, 0x0010($s0) ## 00000010 -/* 005BC 809ABBEC 8E380000 */ lw $t8, 0x0000($s1) ## 8015FA90 -/* 005C0 809ABBF0 C612001C */ lwc1 $f18, 0x001C($s0) ## 0000001C -/* 005C4 809ABBF4 871909DA */ lh $t9, 0x09DA($t8) ## 000009DA -/* 005C8 809ABBF8 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 -/* 005CC 809ABBFC 00000000 */ nop -/* 005D0 809ABC00 46805120 */ cvt.s.w $f4, $f10 -/* 005D4 809ABC04 46142182 */ mul.s $f6, $f4, $f20 -/* 005D8 809ABC08 00000000 */ nop -/* 005DC 809ABC0C 46064402 */ mul.s $f16, $f8, $f6 -/* 005E0 809ABC10 E6100014 */ swc1 $f16, 0x0014($s0) ## 00000014 -/* 005E4 809ABC14 8E280000 */ lw $t0, 0x0000($s1) ## 8015FA90 -/* 005E8 809ABC18 850909DC */ lh $t1, 0x09DC($t0) ## 000009DC -/* 005EC 809ABC1C 44895000 */ mtc1 $t1, $f10 ## $f10 = 0.00 -/* 005F0 809ABC20 00000000 */ nop -/* 005F4 809ABC24 46805120 */ cvt.s.w $f4, $f10 -/* 005F8 809ABC28 46142202 */ mul.s $f8, $f4, $f20 -/* 005FC 809ABC2C 00000000 */ nop -/* 00600 809ABC30 46089182 */ mul.s $f6, $f18, $f8 -/* 00604 809ABC34 1000000B */ beq $zero, $zero, .L809ABC64 -/* 00608 809ABC38 E606001C */ swc1 $f6, 0x001C($s0) ## 0000001C -.L809ABC3C: -/* 0060C 809ABC3C 86020054 */ lh $v0, 0x0054($s0) ## 00000054 -/* 00610 809ABC40 3C118016 */ lui $s1, %hi(gGameInfo) -/* 00614 809ABC44 2631FA90 */ addiu $s1, %lo(gGameInfo) -/* 00618 809ABC48 50400007 */ beql $v0, $zero, .L809ABC68 -/* 0061C 809ABC4C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00620 809ABC50 8E2A0000 */ lw $t2, 0x0000($s1) ## 8015FA90 -/* 00624 809ABC54 854B0A08 */ lh $t3, 0x0A08($t2) ## 00000A08 -/* 00628 809ABC58 004B6023 */ subu $t4, $v0, $t3 -/* 0062C 809ABC5C 258DFFFD */ addiu $t5, $t4, 0xFFFD ## $t5 = FFFFFFFD -/* 00630 809ABC60 A60D0054 */ sh $t5, 0x0054($s0) ## 00000054 -.L809ABC64: -/* 00634 809ABC64 8FBF0024 */ lw $ra, 0x0024($sp) -.L809ABC68: -/* 00638 809ABC68 D7B40010 */ ldc1 $f20, 0x0010($sp) -/* 0063C 809ABC6C 8FB0001C */ lw $s0, 0x001C($sp) -/* 00640 809ABC70 8FB10020 */ lw $s1, 0x0020($sp) -/* 00644 809ABC74 03E00008 */ jr $ra -/* 00648 809ABC78 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 0064C 809ABC7C 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki2/EffectSsSibuki2_Init.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki2/EffectSsSibuki2_Init.s deleted file mode 100644 index 1ee0f98164..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki2/EffectSsSibuki2_Init.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel EffectSsSibuki2_Init -/* 00000 809ABD60 AFA40000 */ sw $a0, 0x0000($sp) -/* 00004 809ABD64 AFA50004 */ sw $a1, 0x0004($sp) -/* 00008 809ABD68 8CEF0000 */ lw $t7, 0x0000($a3) ## 00000000 -/* 0000C 809ABD6C 3C0B809B */ lui $t3, %hi(func_809ABE0C) ## $t3 = 809B0000 -/* 00010 809ABD70 3C0C809B */ lui $t4, %hi(func_809AC030) ## $t4 = 809B0000 -/* 00014 809ABD74 ACCF0000 */ sw $t7, 0x0000($a2) ## 00000000 -/* 00018 809ABD78 8CEE0004 */ lw $t6, 0x0004($a3) ## 00000004 -/* 0001C 809ABD7C 240A000A */ addiu $t2, $zero, 0x000A ## $t2 = 0000000A -/* 00020 809ABD80 256BBE0C */ addiu $t3, $t3, %lo(func_809ABE0C) ## $t3 = 809ABE0C -/* 00024 809ABD84 ACCE0004 */ sw $t6, 0x0004($a2) ## 00000004 -/* 00028 809ABD88 8CEF0008 */ lw $t7, 0x0008($a3) ## 00000008 -/* 0002C 809ABD8C 258CC030 */ addiu $t4, $t4, %lo(func_809AC030) ## $t4 = 809AC030 -/* 00030 809ABD90 240300FF */ addiu $v1, $zero, 0x00FF ## $v1 = 000000FF -/* 00034 809ABD94 ACCF0008 */ sw $t7, 0x0008($a2) ## 00000008 -/* 00038 809ABD98 8CF9000C */ lw $t9, 0x000C($a3) ## 0000000C -/* 0003C 809ABD9C 24040064 */ addiu $a0, $zero, 0x0064 ## $a0 = 00000064 -/* 00040 809ABDA0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00044 809ABDA4 ACD9000C */ sw $t9, 0x000C($a2) ## 0000000C -/* 00048 809ABDA8 8CF80010 */ lw $t8, 0x0010($a3) ## 00000010 -/* 0004C 809ABDAC ACD80010 */ sw $t8, 0x0010($a2) ## 00000010 -/* 00050 809ABDB0 8CF90014 */ lw $t9, 0x0014($a3) ## 00000014 -/* 00054 809ABDB4 ACD90014 */ sw $t9, 0x0014($a2) ## 00000014 -/* 00058 809ABDB8 8CE90018 */ lw $t1, 0x0018($a3) ## 00000018 -/* 0005C 809ABDBC ACC90018 */ sw $t1, 0x0018($a2) ## 00000018 -/* 00060 809ABDC0 8CE8001C */ lw $t0, 0x001C($a3) ## 0000001C -/* 00064 809ABDC4 ACC8001C */ sw $t0, 0x001C($a2) ## 0000001C -/* 00068 809ABDC8 8CE90020 */ lw $t1, 0x0020($a3) ## 00000020 -/* 0006C 809ABDCC A4CA005C */ sh $t2, 0x005C($a2) ## 0000005C -/* 00070 809ABDD0 ACCB0028 */ sw $t3, 0x0028($a2) ## 00000028 -/* 00074 809ABDD4 ACCC0024 */ sw $t4, 0x0024($a2) ## 00000024 -/* 00078 809ABDD8 ACC90020 */ sw $t1, 0x0020($a2) ## 00000020 -/* 0007C 809ABDDC 84ED0024 */ lh $t5, 0x0024($a3) ## 00000024 -/* 00080 809ABDE0 A4C30040 */ sh $v1, 0x0040($a2) ## 00000040 -/* 00084 809ABDE4 A4C30042 */ sh $v1, 0x0042($a2) ## 00000042 -/* 00088 809ABDE8 A4C30044 */ sh $v1, 0x0044($a2) ## 00000044 -/* 0008C 809ABDEC A4C30046 */ sh $v1, 0x0046($a2) ## 00000046 -/* 00090 809ABDF0 A4C40048 */ sh $a0, 0x0048($a2) ## 00000048 -/* 00094 809ABDF4 A4C4004A */ sh $a0, 0x004A($a2) ## 0000004A -/* 00098 809ABDF8 A4C4004C */ sh $a0, 0x004C($a2) ## 0000004C -/* 0009C 809ABDFC A4C3004E */ sh $v1, 0x004E($a2) ## 0000004E -/* 000A0 809ABE00 A4C00050 */ sh $zero, 0x0050($a2) ## 00000050 -/* 000A4 809ABE04 03E00008 */ jr $ra -/* 000A8 809ABE08 A4CD0052 */ sh $t5, 0x0052($a2) ## 00000052 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki2/func_809ABE0C.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki2/func_809ABE0C.s deleted file mode 100644 index e978d04741..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki2/func_809ABE0C.s +++ /dev/null @@ -1,152 +0,0 @@ -.rdata -glabel D_809AC090 - .asciz "../z_eff_ss_sibuki2.c" - .balign 4 - -glabel D_809AC0A8 - .asciz "../z_eff_ss_sibuki2.c" - .balign 4 - -glabel D_809AC0C0 - .asciz "../z_eff_ss_sibuki2.c" - .balign 4 - -.text -glabel func_809ABE0C -/* 000AC 809ABE0C 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 000B0 809ABE10 AFBF001C */ sw $ra, 0x001C($sp) -/* 000B4 809ABE14 AFB10018 */ sw $s1, 0x0018($sp) -/* 000B8 809ABE18 AFB00014 */ sw $s0, 0x0014($sp) -/* 000BC 809ABE1C AFA40058 */ sw $a0, 0x0058($sp) -/* 000C0 809ABE20 AFA5005C */ sw $a1, 0x005C($sp) -/* 000C4 809ABE24 84CF0052 */ lh $t7, 0x0052($a2) ## 00000052 -/* 000C8 809ABE28 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 000CC 809ABE2C 44814000 */ mtc1 $at, $f8 ## $f8 = 100.00 -/* 000D0 809ABE30 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 000D4 809ABE34 8C910000 */ lw $s1, 0x0000($a0) ## 00000000 -/* 000D8 809ABE38 00C08025 */ or $s0, $a2, $zero ## $s0 = 00000000 -/* 000DC 809ABE3C 468021A0 */ cvt.s.w $f6, $f4 -/* 000E0 809ABE40 3C06809B */ lui $a2, %hi(D_809AC090) ## $a2 = 809B0000 -/* 000E4 809ABE44 24C6C090 */ addiu $a2, $a2, %lo(D_809AC090) ## $a2 = 809AC090 -/* 000E8 809ABE48 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 -/* 000EC 809ABE4C 2407009E */ addiu $a3, $zero, 0x009E ## $a3 = 0000009E -/* 000F0 809ABE50 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 000F4 809ABE54 46083283 */ div.s $f10, $f6, $f8 -/* 000F8 809ABE58 0C031AB1 */ jal Graph_OpenDisps -/* 000FC 809ABE5C E7AA0050 */ swc1 $f10, 0x0050($sp) -/* 00100 809ABE60 C60C0000 */ lwc1 $f12, 0x0000($s0) ## 00000000 -/* 00104 809ABE64 C60E0004 */ lwc1 $f14, 0x0004($s0) ## 00000004 -/* 00108 809ABE68 8E060008 */ lw $a2, 0x0008($s0) ## 00000008 -/* 0010C 809ABE6C 0C034261 */ jal Matrix_Translate -/* 00110 809ABE70 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00114 809ABE74 C7AC0050 */ lwc1 $f12, 0x0050($sp) -/* 00118 809ABE78 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0011C 809ABE7C 44066000 */ mfc1 $a2, $f12 -/* 00120 809ABE80 0C0342A3 */ jal Matrix_Scale -/* 00124 809ABE84 46006386 */ mov.s $f14, $f12 -/* 00128 809ABE88 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 0012C 809ABE8C 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 -/* 00130 809ABE90 37390003 */ ori $t9, $t9, 0x0003 ## $t9 = DA380003 -/* 00134 809ABE94 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 00138 809ABE98 AE3802D0 */ sw $t8, 0x02D0($s1) ## 000002D0 -/* 0013C 809ABE9C 3C05809B */ lui $a1, %hi(D_809AC0A8) ## $a1 = 809B0000 -/* 00140 809ABEA0 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 00144 809ABEA4 24A5C0A8 */ addiu $a1, $a1, %lo(D_809AC0A8) ## $a1 = 809AC0A8 -/* 00148 809ABEA8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0014C 809ABEAC 240600AB */ addiu $a2, $zero, 0x00AB ## $a2 = 000000AB -/* 00150 809ABEB0 0C0346A2 */ jal Matrix_NewMtx -/* 00154 809ABEB4 AFA20038 */ sw $v0, 0x0038($sp) -/* 00158 809ABEB8 8FA30038 */ lw $v1, 0x0038($sp) -/* 0015C 809ABEBC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00160 809ABEC0 0C024F46 */ jal func_80093D18 -/* 00164 809ABEC4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00168 809ABEC8 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 0016C 809ABECC 3C09FA00 */ lui $t1, 0xFA00 ## $t1 = FA000000 -/* 00170 809ABED0 3C04809B */ lui $a0, %hi(D_809AC068) ## $a0 = 809B0000 -/* 00174 809ABED4 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 -/* 00178 809ABED8 AE2802D0 */ sw $t0, 0x02D0($s1) ## 000002D0 -/* 0017C 809ABEDC AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 00180 809ABEE0 860A0046 */ lh $t2, 0x0046($s0) ## 00000046 -/* 00184 809ABEE4 86180042 */ lh $t8, 0x0042($s0) ## 00000042 -/* 00188 809ABEE8 860D0040 */ lh $t5, 0x0040($s0) ## 00000040 -/* 0018C 809ABEEC 314B00FF */ andi $t3, $t2, 0x00FF ## $t3 = 00000000 -/* 00190 809ABEF0 860A0044 */ lh $t2, 0x0044($s0) ## 00000044 -/* 00194 809ABEF4 331900FF */ andi $t9, $t8, 0x00FF ## $t9 = 00000000 -/* 00198 809ABEF8 000D7600 */ sll $t6, $t5, 24 -/* 0019C 809ABEFC 016E7825 */ or $t7, $t3, $t6 ## $t7 = 00000000 -/* 001A0 809ABF00 00194400 */ sll $t0, $t9, 16 -/* 001A4 809ABF04 314C00FF */ andi $t4, $t2, 0x00FF ## $t4 = 00000000 -/* 001A8 809ABF08 000C6A00 */ sll $t5, $t4, 8 -/* 001AC 809ABF0C 01E84825 */ or $t1, $t7, $t0 ## $t1 = 00000008 -/* 001B0 809ABF10 012D5825 */ or $t3, $t1, $t5 ## $t3 = 00000008 -/* 001B4 809ABF14 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 001B8 809ABF18 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 001BC 809ABF1C 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 -/* 001C0 809ABF20 3C068016 */ lui $a2, %hi(gSegments) -/* 001C4 809ABF24 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 001C8 809ABF28 AE2E02D0 */ sw $t6, 0x02D0($s1) ## 000002D0 -/* 001CC 809ABF2C AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 001D0 809ABF30 8619004E */ lh $t9, 0x004E($s0) ## 0000004E -/* 001D4 809ABF34 860D004A */ lh $t5, 0x004A($s0) ## 0000004A -/* 001D8 809ABF38 860A0048 */ lh $t2, 0x0048($s0) ## 00000048 -/* 001DC 809ABF3C 332F00FF */ andi $t7, $t9, 0x00FF ## $t7 = 00000000 -/* 001E0 809ABF40 8619004C */ lh $t9, 0x004C($s0) ## 0000004C -/* 001E4 809ABF44 31AB00FF */ andi $t3, $t5, 0x00FF ## $t3 = 00000000 -/* 001E8 809ABF48 000A6600 */ sll $t4, $t2, 24 -/* 001EC 809ABF4C 01EC4825 */ or $t1, $t7, $t4 ## $t1 = 00000000 -/* 001F0 809ABF50 000B7400 */ sll $t6, $t3, 16 -/* 001F4 809ABF54 332800FF */ andi $t0, $t9, 0x00FF ## $t0 = 00000000 -/* 001F8 809ABF58 00085200 */ sll $t2, $t0, 8 -/* 001FC 809ABF5C 012EC025 */ or $t8, $t1, $t6 ## $t8 = 00000008 -/* 00200 809ABF60 030A7825 */ or $t7, $t8, $t2 ## $t7 = 00000008 -/* 00204 809ABF64 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 00208 809ABF68 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 0020C 809ABF6C 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 -/* 00210 809ABF70 35AD0020 */ ori $t5, $t5, 0x0020 ## $t5 = DB060020 -/* 00214 809ABF74 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 00218 809ABF78 AE2C02D0 */ sw $t4, 0x02D0($s1) ## 000002D0 -/* 0021C 809ABF7C AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 00220 809ABF80 860B0050 */ lh $t3, 0x0050($s0) ## 00000050 -/* 00224 809ABF84 24C66FA8 */ addiu $a2, %lo(gSegments) -/* 00228 809ABF88 3C0500FF */ lui $a1, 0x00FF ## $a1 = 00FF0000 -/* 0022C 809ABF8C 000B4880 */ sll $t1, $t3, 2 -/* 00230 809ABF90 00892021 */ addu $a0, $a0, $t1 -/* 00234 809ABF94 8C84C068 */ lw $a0, %lo(D_809AC068)($a0) -/* 00238 809ABF98 34A5FFFF */ ori $a1, $a1, 0xFFFF ## $a1 = 00FFFFFF -/* 0023C 809ABF9C 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 00240 809ABFA0 0004C900 */ sll $t9, $a0, 4 -/* 00244 809ABFA4 00194702 */ srl $t0, $t9, 28 -/* 00248 809ABFA8 0008C080 */ sll $t8, $t0, 2 -/* 0024C 809ABFAC 00D85021 */ addu $t2, $a2, $t8 -/* 00250 809ABFB0 8D4F0000 */ lw $t7, 0x0000($t2) ## 00000000 -/* 00254 809ABFB4 00857024 */ and $t6, $a0, $a1 -/* 00258 809ABFB8 3C040402 */ lui $a0, 0x0402 ## $a0 = 04020000 -/* 0025C 809ABFBC 01CF6021 */ addu $t4, $t6, $t7 -/* 00260 809ABFC0 01876821 */ addu $t5, $t4, $a3 -/* 00264 809ABFC4 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 00268 809ABFC8 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 0026C 809ABFCC 2484E2C0 */ addiu $a0, $a0, 0xE2C0 ## $a0 = 0401E2C0 -/* 00270 809ABFD0 0004C900 */ sll $t9, $a0, 4 -/* 00274 809ABFD4 00194702 */ srl $t0, $t9, 28 -/* 00278 809ABFD8 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 0027C 809ABFDC AE2B02D0 */ sw $t3, 0x02D0($s1) ## 000002D0 -/* 00280 809ABFE0 0008C080 */ sll $t8, $t0, 2 -/* 00284 809ABFE4 3C09DE00 */ lui $t1, 0xDE00 ## $t1 = DE000000 -/* 00288 809ABFE8 00D85021 */ addu $t2, $a2, $t8 -/* 0028C 809ABFEC AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 00290 809ABFF0 8D4E0000 */ lw $t6, 0x0000($t2) ## 00000000 -/* 00294 809ABFF4 00857824 */ and $t7, $a0, $a1 -/* 00298 809ABFF8 3C06809B */ lui $a2, %hi(D_809AC0C0) ## $a2 = 809B0000 -/* 0029C 809ABFFC 01CF6021 */ addu $t4, $t6, $t7 -/* 002A0 809AC000 01876821 */ addu $t5, $t4, $a3 -/* 002A4 809AC004 240700C6 */ addiu $a3, $zero, 0x00C6 ## $a3 = 000000C6 -/* 002A8 809AC008 24C6C0C0 */ addiu $a2, $a2, %lo(D_809AC0C0) ## $a2 = 809AC0C0 -/* 002AC 809AC00C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 002B0 809AC010 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 -/* 002B4 809AC014 0C031AD5 */ jal Graph_CloseDisps -/* 002B8 809AC018 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 002BC 809AC01C 8FBF001C */ lw $ra, 0x001C($sp) -/* 002C0 809AC020 8FB00014 */ lw $s0, 0x0014($sp) -/* 002C4 809AC024 8FB10018 */ lw $s1, 0x0018($sp) -/* 002C8 809AC028 03E00008 */ jr $ra -/* 002CC 809AC02C 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki2/func_809AC030.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki2/func_809AC030.s deleted file mode 100644 index 76925f8704..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki2/func_809AC030.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_809AC030 -/* 002D0 809AC030 AFA40000 */ sw $a0, 0x0000($sp) -/* 002D4 809AC034 AFA50004 */ sw $a1, 0x0004($sp) -/* 002D8 809AC038 84C20050 */ lh $v0, 0x0050($a2) ## 00000050 -/* 002DC 809AC03C 28410008 */ slti $at, $v0, 0x0008 -/* 002E0 809AC040 10200002 */ beq $at, $zero, .L809AC04C -/* 002E4 809AC044 244E0001 */ addiu $t6, $v0, 0x0001 ## $t6 = 00000001 -/* 002E8 809AC048 A4CE0050 */ sh $t6, 0x0050($a2) ## 00000050 -.L809AC04C: -/* 002EC 809AC04C 03E00008 */ jr $ra -/* 002F0 809AC050 00000000 */ nop -/* 002F4 809AC054 00000000 */ nop -/* 002F8 809AC058 00000000 */ nop -/* 002FC 809AC05C 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/EffectSsStick_Init.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/EffectSsStick_Init.s deleted file mode 100644 index d8f92fcd38..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/EffectSsStick_Init.s +++ /dev/null @@ -1,91 +0,0 @@ -glabel EffectSsStick_Init -/* 00000 809AC2D0 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 00004 809AC2D4 3C0E809B */ lui $t6, %hi(D_809AC628) ## $t6 = 809B0000 -/* 00008 809AC2D8 AFBF001C */ sw $ra, 0x001C($sp) -/* 0000C 809AC2DC AFB00018 */ sw $s0, 0x0018($sp) -/* 00010 809AC2E0 AFA40048 */ sw $a0, 0x0048($sp) -/* 00014 809AC2E4 AFA5004C */ sw $a1, 0x004C($sp) -/* 00018 809AC2E8 AFA70054 */ sw $a3, 0x0054($sp) -/* 0001C 809AC2EC 25CEC628 */ addiu $t6, $t6, %lo(D_809AC628) ## $t6 = 809AC628 -/* 00020 809AC2F0 8DD80000 */ lw $t8, 0x0000($t6) ## 809AC628 -/* 00024 809AC2F4 27A20038 */ addiu $v0, $sp, 0x0038 ## $v0 = FFFFFFF0 -/* 00028 809AC2F8 3C198016 */ lui $t9, %hi(gSaveContext+4) -/* 0002C 809AC2FC AC580000 */ sw $t8, 0x0000($v0) ## FFFFFFF0 -/* 00030 809AC300 8DCF0004 */ lw $t7, 0x0004($t6) ## 809AC62C -/* 00034 809AC304 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00038 809AC308 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 0003C 809AC30C AC4F0004 */ sw $t7, 0x0004($v0) ## FFFFFFF4 -/* 00040 809AC310 8DD80008 */ lw $t8, 0x0008($t6) ## 809AC630 -/* 00044 809AC314 00C08025 */ or $s0, $a2, $zero ## $s0 = 00000000 -/* 00048 809AC318 AC580008 */ sw $t8, 0x0008($v0) ## FFFFFFF8 -/* 0004C 809AC31C 8DCF000C */ lw $t7, 0x000C($t6) ## 809AC634 -/* 00050 809AC320 AC4F000C */ sw $t7, 0x000C($v0) ## FFFFFFFC -/* 00054 809AC324 8F39E664 */ lw $t9, %lo(gSaveContext+4)($t9) -/* 00058 809AC328 8FA40048 */ lw $a0, 0x0048($sp) -/* 0005C 809AC32C 001948C0 */ sll $t1, $t9, 3 -/* 00060 809AC330 01224021 */ addu $t0, $t1, $v0 -/* 00064 809AC334 85050000 */ lh $a1, 0x0000($t0) ## 00000000 -/* 00068 809AC338 AFA80034 */ sw $t0, 0x0034($sp) -/* 0006C 809AC33C 0C02604B */ jal Object_GetIndex - ## ObjectIndex -/* 00070 809AC340 00812021 */ addu $a0, $a0, $at -/* 00074 809AC344 8FA80034 */ lw $t0, 0x0034($sp) -/* 00078 809AC348 8FA50054 */ lw $a1, 0x0054($sp) -/* 0007C 809AC34C A6020040 */ sh $v0, 0x0040($s0) ## 00000040 -/* 00080 809AC350 8D0A0004 */ lw $t2, 0x0004($t0) ## 00000004 -/* 00084 809AC354 27A30024 */ addiu $v1, $sp, 0x0024 ## $v1 = FFFFFFDC -/* 00088 809AC358 AE0A0038 */ sw $t2, 0x0038($s0) ## 00000038 -/* 0008C 809AC35C 8CAC0000 */ lw $t4, 0x0000($a1) ## 00000000 -/* 00090 809AC360 AC6C0000 */ sw $t4, 0x0000($v1) ## FFFFFFDC -/* 00094 809AC364 8CAB0004 */ lw $t3, 0x0004($a1) ## 00000004 -/* 00098 809AC368 8C6E0000 */ lw $t6, 0x0000($v1) ## FFFFFFDC -/* 0009C 809AC36C AC6B0004 */ sw $t3, 0x0004($v1) ## FFFFFFE0 -/* 000A0 809AC370 8CAC0008 */ lw $t4, 0x0008($a1) ## 00000008 -/* 000A4 809AC374 AC6C0008 */ sw $t4, 0x0008($v1) ## FFFFFFE4 -/* 000A8 809AC378 AE0E0000 */ sw $t6, 0x0000($s0) ## 00000000 -/* 000AC 809AC37C 8C6D0004 */ lw $t5, 0x0004($v1) ## FFFFFFE0 -/* 000B0 809AC380 AE0D0004 */ sw $t5, 0x0004($s0) ## 00000004 -/* 000B4 809AC384 8C6E0008 */ lw $t6, 0x0008($v1) ## FFFFFFE4 -/* 000B8 809AC388 AE0E0008 */ sw $t6, 0x0008($s0) ## 00000008 -/* 000BC 809AC38C 8C780000 */ lw $t8, 0x0000($v1) ## FFFFFFDC -/* 000C0 809AC390 AE18002C */ sw $t8, 0x002C($s0) ## 0000002C -/* 000C4 809AC394 8C6F0004 */ lw $t7, 0x0004($v1) ## FFFFFFE0 -/* 000C8 809AC398 AE0F0030 */ sw $t7, 0x0030($s0) ## 00000030 -/* 000CC 809AC39C 8C780008 */ lw $t8, 0x0008($v1) ## FFFFFFE4 -/* 000D0 809AC3A0 AE180034 */ sw $t8, 0x0034($s0) ## 00000034 -/* 000D4 809AC3A4 84B9000C */ lh $t9, 0x000C($a1) ## 0000000C -/* 000D8 809AC3A8 A6190042 */ sh $t9, 0x0042($s0) ## 00000042 -/* 000DC 809AC3AC 0C01DE1C */ jal Math_Sins - ## sins? -/* 000E0 809AC3B0 84A4000C */ lh $a0, 0x000C($a1) ## 0000000C -/* 000E4 809AC3B4 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 000E8 809AC3B8 44812000 */ mtc1 $at, $f4 ## $f4 = 6.00 -/* 000EC 809AC3BC 8FA50054 */ lw $a1, 0x0054($sp) -/* 000F0 809AC3C0 46040182 */ mul.s $f6, $f0, $f4 -/* 000F4 809AC3C4 E606000C */ swc1 $f6, 0x000C($s0) ## 0000000C -/* 000F8 809AC3C8 0C01DE0D */ jal Math_Coss - ## coss? -/* 000FC 809AC3CC 84A4000C */ lh $a0, 0x000C($a1) ## 0000000C -/* 00100 809AC3D0 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 00104 809AC3D4 44814000 */ mtc1 $at, $f8 ## $f8 = 6.00 -/* 00108 809AC3D8 3C0141D0 */ lui $at, 0x41D0 ## $at = 41D00000 -/* 0010C 809AC3DC 44818000 */ mtc1 $at, $f16 ## $f16 = 26.00 -/* 00110 809AC3E0 46080282 */ mul.s $f10, $f0, $f8 -/* 00114 809AC3E4 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 -/* 00118 809AC3E8 44819000 */ mtc1 $at, $f18 ## $f18 = -4.00 -/* 0011C 809AC3EC 3C0A809B */ lui $t2, %hi(func_809AC42C) ## $t2 = 809B0000 -/* 00120 809AC3F0 3C0B809B */ lui $t3, %hi(func_809AC604) ## $t3 = 809B0000 -/* 00124 809AC3F4 24090014 */ addiu $t1, $zero, 0x0014 ## $t1 = 00000014 -/* 00128 809AC3F8 254AC42C */ addiu $t2, $t2, %lo(func_809AC42C) ## $t2 = 809AC42C -/* 0012C 809AC3FC 256BC604 */ addiu $t3, $t3, %lo(func_809AC604) ## $t3 = 809AC604 -/* 00130 809AC400 E60A0014 */ swc1 $f10, 0x0014($s0) ## 00000014 -/* 00134 809AC404 A609005C */ sh $t1, 0x005C($s0) ## 0000005C -/* 00138 809AC408 AE0A0028 */ sw $t2, 0x0028($s0) ## 00000028 -/* 0013C 809AC40C AE0B0024 */ sw $t3, 0x0024($s0) ## 00000024 -/* 00140 809AC410 E6100010 */ swc1 $f16, 0x0010($s0) ## 00000010 -/* 00144 809AC414 E612001C */ swc1 $f18, 0x001C($s0) ## 0000001C -/* 00148 809AC418 8FBF001C */ lw $ra, 0x001C($sp) -/* 0014C 809AC41C 8FB00018 */ lw $s0, 0x0018($sp) -/* 00150 809AC420 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 00154 809AC424 03E00008 */ jr $ra -/* 00158 809AC428 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC42C.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC42C.s deleted file mode 100644 index 89e71a6de8..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC42C.s +++ /dev/null @@ -1,145 +0,0 @@ -.rdata -glabel D_809AC640 - .asciz "../z_eff_ss_stick.c" - .balign 4 - -glabel D_809AC654 - .asciz "../z_eff_ss_stick.c" - .balign 4 - -glabel D_809AC668 - .asciz "../z_eff_ss_stick.c" - .balign 4 - -.late_rodata -glabel D_809AC67C - .float 0.01 - -glabel D_809AC680 - .float 0.0025 - -glabel D_809AC684 - .float 0.01 - -.text -glabel func_809AC42C -/* 0015C 809AC42C 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00160 809AC430 AFB10018 */ sw $s1, 0x0018($sp) -/* 00164 809AC434 AFBF001C */ sw $ra, 0x001C($sp) -/* 00168 809AC438 AFB00014 */ sw $s0, 0x0014($sp) -/* 0016C 809AC43C AFA40050 */ sw $a0, 0x0050($sp) -/* 00170 809AC440 AFA50054 */ sw $a1, 0x0054($sp) -/* 00174 809AC444 8C900000 */ lw $s0, 0x0000($a0) ## 00000000 -/* 00178 809AC448 00C08825 */ or $s1, $a2, $zero ## $s1 = 00000000 -/* 0017C 809AC44C 3C06809B */ lui $a2, %hi(D_809AC640) ## $a2 = 809B0000 -/* 00180 809AC450 24C6C640 */ addiu $a2, $a2, %lo(D_809AC640) ## $a2 = 809AC640 -/* 00184 809AC454 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 -/* 00188 809AC458 24070099 */ addiu $a3, $zero, 0x0099 ## $a3 = 00000099 -/* 0018C 809AC45C 0C031AB1 */ jal Graph_OpenDisps -/* 00190 809AC460 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00194 809AC464 C62C0000 */ lwc1 $f12, 0x0000($s1) ## 00000000 -/* 00198 809AC468 C62E0004 */ lwc1 $f14, 0x0004($s1) ## 00000004 -/* 0019C 809AC46C 8E260008 */ lw $a2, 0x0008($s1) ## 00000008 -/* 001A0 809AC470 0C034261 */ jal Matrix_Translate -/* 001A4 809AC474 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 001A8 809AC478 3C0F8016 */ lui $t7, %hi(gSaveContext+4) -/* 001AC 809AC47C 8DEFE664 */ lw $t7, %lo(gSaveContext+4)($t7) -/* 001B0 809AC480 3C01809B */ lui $at, %hi(D_809AC684) ## $at = 809B0000 -/* 001B4 809AC484 11E0000F */ beq $t7, $zero, .L809AC4C4 -/* 001B8 809AC488 00000000 */ nop -/* 001BC 809AC48C 3C01809B */ lui $at, %hi(D_809AC67C) ## $at = 809B0000 -/* 001C0 809AC490 C42CC67C */ lwc1 $f12, %lo(D_809AC67C)($at) -/* 001C4 809AC494 3C01809B */ lui $at, %hi(D_809AC680) ## $at = 809B0000 -/* 001C8 809AC498 C42EC680 */ lwc1 $f14, %lo(D_809AC680)($at) -/* 001CC 809AC49C 44066000 */ mfc1 $a2, $f12 -/* 001D0 809AC4A0 0C0342A3 */ jal Matrix_Scale -/* 001D4 809AC4A4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 001D8 809AC4A8 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 -/* 001DC 809AC4AC 86250042 */ lh $a1, 0x0042($s1) ## 00000042 -/* 001E0 809AC4B0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 001E4 809AC4B4 0C034421 */ jal Matrix_RotateRPY -/* 001E8 809AC4B8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 001EC 809AC4BC 10000017 */ beq $zero, $zero, .L809AC51C -/* 001F0 809AC4C0 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -.L809AC4C4: -/* 001F4 809AC4C4 C42CC684 */ lwc1 $f12, %lo(D_809AC684)($at) -/* 001F8 809AC4C8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 001FC 809AC4CC 44066000 */ mfc1 $a2, $f12 -/* 00200 809AC4D0 0C0342A3 */ jal Matrix_Scale -/* 00204 809AC4D4 46006386 */ mov.s $f14, $f12 -/* 00208 809AC4D8 8FB80050 */ lw $t8, 0x0050($sp) -/* 0020C 809AC4DC 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 -/* 00210 809AC4E0 86250042 */ lh $a1, 0x0042($s1) ## 00000042 -/* 00214 809AC4E4 8F06009C */ lw $a2, 0x009C($t8) ## 0000009C -/* 00218 809AC4E8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0021C 809AC4EC 00C00821 */ addu $at, $a2, $zero -/* 00220 809AC4F0 00063080 */ sll $a2, $a2, 2 -/* 00224 809AC4F4 00C13021 */ addu $a2, $a2, $at -/* 00228 809AC4F8 000630C0 */ sll $a2, $a2, 3 -/* 0022C 809AC4FC 00C13023 */ subu $a2, $a2, $at -/* 00230 809AC500 00063100 */ sll $a2, $a2, 4 -/* 00234 809AC504 00C13021 */ addu $a2, $a2, $at -/* 00238 809AC508 00063100 */ sll $a2, $a2, 4 -/* 0023C 809AC50C 00063400 */ sll $a2, $a2, 16 -/* 00240 809AC510 0C034421 */ jal Matrix_RotateRPY -/* 00244 809AC514 00063403 */ sra $a2, $a2, 16 -/* 00248 809AC518 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -.L809AC51C: -/* 0024C 809AC51C 3C08DA38 */ lui $t0, 0xDA38 ## $t0 = DA380000 -/* 00250 809AC520 35080003 */ ori $t0, $t0, 0x0003 ## $t0 = DA380003 -/* 00254 809AC524 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 00258 809AC528 AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 -/* 0025C 809AC52C 3C05809B */ lui $a1, %hi(D_809AC654) ## $a1 = 809B0000 -/* 00260 809AC530 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 -/* 00264 809AC534 24A5C654 */ addiu $a1, $a1, %lo(D_809AC654) ## $a1 = 809AC654 -/* 00268 809AC538 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0026C 809AC53C 240600B0 */ addiu $a2, $zero, 0x00B0 ## $a2 = 000000B0 -/* 00270 809AC540 0C0346A2 */ jal Matrix_NewMtx -/* 00274 809AC544 AFA20030 */ sw $v0, 0x0030($sp) -/* 00278 809AC548 8FA30030 */ lw $v1, 0x0030($sp) -/* 0027C 809AC54C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00280 809AC550 0C024F46 */ jal func_80093D18 -/* 00284 809AC554 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00288 809AC558 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 0028C 809AC55C 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 -/* 00290 809AC560 354A0018 */ ori $t2, $t2, 0x0018 ## $t2 = DB060018 -/* 00294 809AC564 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 00298 809AC568 AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 -/* 0029C 809AC56C AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 002A0 809AC570 862C0040 */ lh $t4, 0x0040($s1) ## 00000040 -/* 002A4 809AC574 8FAB0050 */ lw $t3, 0x0050($sp) -/* 002A8 809AC578 3C0F0001 */ lui $t7, 0x0001 ## $t7 = 00010000 -/* 002AC 809AC57C 000C6900 */ sll $t5, $t4, 4 -/* 002B0 809AC580 01AC6821 */ addu $t5, $t5, $t4 -/* 002B4 809AC584 000D6880 */ sll $t5, $t5, 2 -/* 002B8 809AC588 016D7021 */ addu $t6, $t3, $t5 -/* 002BC 809AC58C 01EE7821 */ addu $t7, $t7, $t6 -/* 002C0 809AC590 8DEF17B4 */ lw $t7, 0x17B4($t7) ## 000117B4 -/* 002C4 809AC594 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 -/* 002C8 809AC598 3C088012 */ lui $t0, %hi(gCullBackDList) -/* 002CC 809AC59C AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 002D0 809AC5A0 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 002D4 809AC5A4 25085F98 */ addiu $t0, %lo(gCullBackDList) -/* 002D8 809AC5A8 37390030 */ ori $t9, $t9, 0x0030 ## $t9 = DB060030 -/* 002DC 809AC5AC 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 002E0 809AC5B0 AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 -/* 002E4 809AC5B4 AC480004 */ sw $t0, 0x0004($v0) ## 00000004 -/* 002E8 809AC5B8 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 002EC 809AC5BC 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 002F0 809AC5C0 3C0ADE00 */ lui $t2, 0xDE00 ## $t2 = DE000000 -/* 002F4 809AC5C4 3C06809B */ lui $a2, %hi(D_809AC668) ## $a2 = 809B0000 -/* 002F8 809AC5C8 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 002FC 809AC5CC AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 -/* 00300 809AC5D0 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 00304 809AC5D4 8E2C0038 */ lw $t4, 0x0038($s1) ## 00000038 -/* 00308 809AC5D8 24C6C668 */ addiu $a2, $a2, %lo(D_809AC668) ## $a2 = 809AC668 -/* 0030C 809AC5DC 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 -/* 00310 809AC5E0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00314 809AC5E4 240700BC */ addiu $a3, $zero, 0x00BC ## $a3 = 000000BC -/* 00318 809AC5E8 0C031AD5 */ jal Graph_CloseDisps -/* 0031C 809AC5EC AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 00320 809AC5F0 8FBF001C */ lw $ra, 0x001C($sp) -/* 00324 809AC5F4 8FB00014 */ lw $s0, 0x0014($sp) -/* 00328 809AC5F8 8FB10018 */ lw $s1, 0x0018($sp) -/* 0032C 809AC5FC 03E00008 */ jr $ra -/* 00330 809AC600 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC604.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC604.s deleted file mode 100644 index 6104e5a7f1..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC604.s +++ /dev/null @@ -1,8 +0,0 @@ -glabel func_809AC604 -/* 00334 809AC604 AFA40000 */ sw $a0, 0x0000($sp) -/* 00338 809AC608 AFA50004 */ sw $a1, 0x0004($sp) -/* 0033C 809AC60C 03E00008 */ jr $ra -/* 00340 809AC610 AFA60008 */ sw $a2, 0x0008($sp) -/* 00344 809AC614 00000000 */ nop -/* 00348 809AC618 00000000 */ nop -/* 0034C 809AC61C 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/EffectSsStone1_Init.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/EffectSsStone1_Init.s deleted file mode 100644 index 6c5d46419d..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/EffectSsStone1_Init.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel EffectSsStone1_Init -/* 00000 809AC700 27BDFFF0 */ addiu $sp, $sp, 0xFFF0 ## $sp = FFFFFFF0 -/* 00004 809AC704 AFA40010 */ sw $a0, 0x0010($sp) -/* 00008 809AC708 AFA50014 */ sw $a1, 0x0014($sp) -/* 0000C 809AC70C 8CEF0000 */ lw $t7, 0x0000($a3) ## 00000000 -/* 00010 809AC710 27A30000 */ addiu $v1, $sp, 0x0000 ## $v1 = FFFFFFF0 -/* 00014 809AC714 240A0008 */ addiu $t2, $zero, 0x0008 ## $t2 = 00000008 -/* 00018 809AC718 AC6F0000 */ sw $t7, 0x0000($v1) ## FFFFFFF0 -/* 0001C 809AC71C 8CEE0004 */ lw $t6, 0x0004($a3) ## 00000004 -/* 00020 809AC720 8C790000 */ lw $t9, 0x0000($v1) ## FFFFFFF0 -/* 00024 809AC724 3C0C809B */ lui $t4, %hi(func_809AC78C) ## $t4 = 809B0000 -/* 00028 809AC728 AC6E0004 */ sw $t6, 0x0004($v1) ## FFFFFFF4 -/* 0002C 809AC72C 8CEF0008 */ lw $t7, 0x0008($a3) ## 00000008 -/* 00030 809AC730 3C0D809B */ lui $t5, %hi(func_809AC9C0) ## $t5 = 809B0000 -/* 00034 809AC734 258CC78C */ addiu $t4, $t4, %lo(func_809AC78C) ## $t4 = 809AC78C -/* 00038 809AC738 AC6F0008 */ sw $t7, 0x0008($v1) ## FFFFFFF8 -/* 0003C 809AC73C ACD90000 */ sw $t9, 0x0000($a2) ## 00000000 -/* 00040 809AC740 8C780004 */ lw $t8, 0x0004($v1) ## FFFFFFF4 -/* 00044 809AC744 25ADC9C0 */ addiu $t5, $t5, %lo(func_809AC9C0) ## $t5 = 809AC9C0 -/* 00048 809AC748 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 0004C 809AC74C ACD80004 */ sw $t8, 0x0004($a2) ## 00000004 -/* 00050 809AC750 8C790008 */ lw $t9, 0x0008($v1) ## FFFFFFF8 -/* 00054 809AC754 ACD90008 */ sw $t9, 0x0008($a2) ## 00000008 -/* 00058 809AC758 8C690000 */ lw $t1, 0x0000($v1) ## FFFFFFF0 -/* 0005C 809AC75C ACC9002C */ sw $t1, 0x002C($a2) ## 0000002C -/* 00060 809AC760 8C680004 */ lw $t0, 0x0004($v1) ## FFFFFFF4 -/* 00064 809AC764 ACC80030 */ sw $t0, 0x0030($a2) ## 00000030 -/* 00068 809AC768 8C690008 */ lw $t1, 0x0008($v1) ## FFFFFFF8 -/* 0006C 809AC76C A4CA005C */ sh $t2, 0x005C($a2) ## 0000005C -/* 00070 809AC770 ACC90034 */ sw $t1, 0x0034($a2) ## 00000034 -/* 00074 809AC774 8CEB000C */ lw $t3, 0x000C($a3) ## 0000000C -/* 00078 809AC778 ACCC0028 */ sw $t4, 0x0028($a2) ## 00000028 -/* 0007C 809AC77C ACCD0024 */ sw $t5, 0x0024($a2) ## 00000024 -/* 00080 809AC780 27BD0010 */ addiu $sp, $sp, 0x0010 ## $sp = 00000000 -/* 00084 809AC784 03E00008 */ jr $ra -/* 00088 809AC788 A4CB0040 */ sh $t3, 0x0040($a2) ## 00000040 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/func_809AC78C.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/func_809AC78C.s deleted file mode 100644 index 6e04b65592..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/func_809AC78C.s +++ /dev/null @@ -1,162 +0,0 @@ -.rdata -glabel D_809ACA70 - .asciz "../z_eff_ss_stone1.c" - .balign 4 - -glabel D_809ACA88 - .asciz "../z_eff_ss_stone1.c" - .balign 4 - -glabel D_809ACAA0 - .asciz "../z_eff_ss_stone1.c" - .balign 4 - -.late_rodata -glabel D_809ACAB8 - .float 1500.0 - -.text -glabel func_809AC78C -/* 0008C 809AC78C 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 00090 809AC790 AFBF001C */ sw $ra, 0x001C($sp) -/* 00094 809AC794 AFB10018 */ sw $s1, 0x0018($sp) -/* 00098 809AC798 AFB00014 */ sw $s0, 0x0014($sp) -/* 0009C 809AC79C AFA40068 */ sw $a0, 0x0068($sp) -/* 000A0 809AC7A0 AFA5006C */ sw $a1, 0x006C($sp) -/* 000A4 809AC7A4 AFA60070 */ sw $a2, 0x0070($sp) -/* 000A8 809AC7A8 84D8005C */ lh $t8, 0x005C($a2) ## 0000005C -/* 000AC 809AC7AC 8C900000 */ lw $s0, 0x0000($a0) ## 00000000 -/* 000B0 809AC7B0 3C08809B */ lui $t0, %hi(D_809ACA08) ## $t0 = 809B0000 -/* 000B4 809AC7B4 0018C880 */ sll $t9, $t8, 2 -/* 000B8 809AC7B8 0338C823 */ subu $t9, $t9, $t8 -/* 000BC 809AC7BC 0019C880 */ sll $t9, $t9, 2 -/* 000C0 809AC7C0 2508CA08 */ addiu $t0, $t0, %lo(D_809ACA08) ## $t0 = 809ACA08 -/* 000C4 809AC7C4 3C06809B */ lui $a2, %hi(D_809ACA70) ## $a2 = 809B0000 -/* 000C8 809AC7C8 03288821 */ addu $s1, $t9, $t0 -/* 000CC 809AC7CC 24C6CA70 */ addiu $a2, $a2, %lo(D_809ACA70) ## $a2 = 809ACA70 -/* 000D0 809AC7D0 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFD0 -/* 000D4 809AC7D4 2407009A */ addiu $a3, $zero, 0x009A ## $a3 = 0000009A -/* 000D8 809AC7D8 0C031AB1 */ jal Graph_OpenDisps -/* 000DC 809AC7DC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 000E0 809AC7E0 8FA40068 */ lw $a0, 0x0068($sp) -/* 000E4 809AC7E4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 000E8 809AC7E8 34211D60 */ ori $at, $at, 0x1D60 ## $at = 00011D60 -/* 000EC 809AC7EC 8FA50070 */ lw $a1, 0x0070($sp) -/* 000F0 809AC7F0 27A60054 */ addiu $a2, $sp, 0x0054 ## $a2 = FFFFFFEC -/* 000F4 809AC7F4 27A70050 */ addiu $a3, $sp, 0x0050 ## $a3 = FFFFFFE8 -/* 000F8 809AC7F8 0C029B84 */ jal SkinMatrix_Vec3fMtxFMultXYZW -/* 000FC 809AC7FC 00812021 */ addu $a0, $a0, $at -/* 00100 809AC800 3C01809B */ lui $at, %hi(D_809ACAB8) ## $at = 809B0000 -/* 00104 809AC804 C422CAB8 */ lwc1 $f2, %lo(D_809ACAB8)($at) -/* 00108 809AC808 C7A00050 */ lwc1 $f0, 0x0050($sp) -/* 0010C 809AC80C 8FA50070 */ lw $a1, 0x0070($sp) -/* 00110 809AC810 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 00114 809AC814 4602003C */ c.lt.s $f0, $f2 -/* 00118 809AC818 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0011C 809AC81C 45020005 */ bc1fl .L809AC834 -/* 00120 809AC820 46020183 */ div.s $f6, $f0, $f2 -/* 00124 809AC824 44812000 */ mtc1 $at, $f4 ## $f4 = 3.00 -/* 00128 809AC828 10000007 */ beq $zero, $zero, .L809AC848 -/* 0012C 809AC82C E7A4004C */ swc1 $f4, 0x004C($sp) -/* 00130 809AC830 46020183 */ div.s $f6, $f0, $f2 -.L809AC834: -/* 00134 809AC834 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 00138 809AC838 44814000 */ mtc1 $at, $f8 ## $f8 = 3.00 -/* 0013C 809AC83C 00000000 */ nop -/* 00140 809AC840 46083302 */ mul.s $f12, $f6, $f8 -/* 00144 809AC844 E7AC004C */ swc1 $f12, 0x004C($sp) -.L809AC848: -/* 00148 809AC848 C4AC0000 */ lwc1 $f12, 0x0000($a1) ## 00000000 -/* 0014C 809AC84C C4AE0004 */ lwc1 $f14, 0x0004($a1) ## 00000004 -/* 00150 809AC850 0C034261 */ jal Matrix_Translate -/* 00154 809AC854 8CA60008 */ lw $a2, 0x0008($a1) ## 00000008 -/* 00158 809AC858 C7AC004C */ lwc1 $f12, 0x004C($sp) -/* 0015C 809AC85C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00160 809AC860 44066000 */ mfc1 $a2, $f12 -/* 00164 809AC864 0C0342A3 */ jal Matrix_Scale -/* 00168 809AC868 46006386 */ mov.s $f14, $f12 -/* 0016C 809AC86C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00170 809AC870 3C0ADA38 */ lui $t2, 0xDA38 ## $t2 = DA380000 -/* 00174 809AC874 354A0003 */ ori $t2, $t2, 0x0003 ## $t2 = DA380003 -/* 00178 809AC878 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 0017C 809AC87C AE0902D0 */ sw $t1, 0x02D0($s0) ## 000002D0 -/* 00180 809AC880 3C05809B */ lui $a1, %hi(D_809ACA88) ## $a1 = 809B0000 -/* 00184 809AC884 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 00188 809AC888 24A5CA88 */ addiu $a1, $a1, %lo(D_809ACA88) ## $a1 = 809ACA88 -/* 0018C 809AC88C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00190 809AC890 240600A8 */ addiu $a2, $zero, 0x00A8 ## $a2 = 000000A8 -/* 00194 809AC894 0C0346A2 */ jal Matrix_NewMtx -/* 00198 809AC898 AFA20034 */ sw $v0, 0x0034($sp) -/* 0019C 809AC89C 8FA30034 */ lw $v1, 0x0034($sp) -/* 001A0 809AC8A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 001A4 809AC8A4 0C025314 */ jal func_80094C50 -/* 001A8 809AC8A8 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 001AC 809AC8AC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 001B0 809AC8B0 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 -/* 001B4 809AC8B4 358C0020 */ ori $t4, $t4, 0x0020 ## $t4 = DB060020 -/* 001B8 809AC8B8 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 001BC 809AC8BC AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 -/* 001C0 809AC8C0 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 001C4 809AC8C4 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 001C8 809AC8C8 3C188016 */ lui $t8, %hi(gSegments) -/* 001CC 809AC8CC 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 001D0 809AC8D0 00046900 */ sll $t5, $a0, 4 -/* 001D4 809AC8D4 000D7702 */ srl $t6, $t5, 28 -/* 001D8 809AC8D8 000E7880 */ sll $t7, $t6, 2 -/* 001DC 809AC8DC 030FC021 */ addu $t8, $t8, $t7 -/* 001E0 809AC8E0 8F186FA8 */ lw $t8, %lo(gSegments)($t8) -/* 001E4 809AC8E4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 001E8 809AC8E8 0081C824 */ and $t9, $a0, $at -/* 001EC 809AC8EC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 001F0 809AC8F0 03194021 */ addu $t0, $t8, $t9 -/* 001F4 809AC8F4 01014821 */ addu $t1, $t0, $at -/* 001F8 809AC8F8 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 001FC 809AC8FC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00200 809AC900 3C0BFA00 */ lui $t3, 0xFA00 ## $t3 = FA000000 -/* 00204 809AC904 3C06809B */ lui $a2, %hi(D_809ACAA0) ## $a2 = 809B0000 -/* 00208 809AC908 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 0020C 809AC90C AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 -/* 00210 809AC910 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 00214 809AC914 92380005 */ lbu $t8, 0x0005($s1) ## 00000005 -/* 00218 809AC918 922D0004 */ lbu $t5, 0x0004($s1) ## 00000004 -/* 0021C 809AC91C 922A0006 */ lbu $t2, 0x0006($s1) ## 00000006 -/* 00220 809AC920 0018CC00 */ sll $t9, $t8, 16 -/* 00224 809AC924 000D7600 */ sll $t6, $t5, 24 -/* 00228 809AC928 01D94025 */ or $t0, $t6, $t9 ## $t0 = 00000000 -/* 0022C 809AC92C 000A5A00 */ sll $t3, $t2, 8 -/* 00230 809AC930 010B6025 */ or $t4, $t0, $t3 ## $t4 = FA000000 -/* 00234 809AC934 358D00FF */ ori $t5, $t4, 0x00FF ## $t5 = FA0000FF -/* 00238 809AC938 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 0023C 809AC93C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00240 809AC940 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 -/* 00244 809AC944 24C6CAA0 */ addiu $a2, $a2, %lo(D_809ACAA0) ## $a2 = 809ACAA0 -/* 00248 809AC948 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 0024C 809AC94C AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 -/* 00250 809AC950 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 00254 809AC954 92280009 */ lbu $t0, 0x0009($s1) ## 00000009 -/* 00258 809AC958 92390008 */ lbu $t9, 0x0008($s1) ## 00000008 -/* 0025C 809AC95C 922F000A */ lbu $t7, 0x000A($s1) ## 0000000A -/* 00260 809AC960 00085C00 */ sll $t3, $t0, 16 -/* 00264 809AC964 00194E00 */ sll $t1, $t9, 24 -/* 00268 809AC968 012B6025 */ or $t4, $t1, $t3 ## $t4 = FA000000 -/* 0026C 809AC96C 000FC200 */ sll $t8, $t7, 8 -/* 00270 809AC970 01987025 */ or $t6, $t4, $t8 ## $t6 = FB000000 -/* 00274 809AC974 35D900FF */ ori $t9, $t6, 0x00FF ## $t9 = FB0000FF -/* 00278 809AC978 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 0027C 809AC97C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00280 809AC980 3C090403 */ lui $t1, 0x0403 ## $t1 = 04030000 -/* 00284 809AC984 25299E90 */ addiu $t1, $t1, 0x9E90 ## $t1 = 04029E90 -/* 00288 809AC988 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 0028C 809AC98C AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 -/* 00290 809AC990 3C08DE00 */ lui $t0, 0xDE00 ## $t0 = DE000000 -/* 00294 809AC994 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFD0 -/* 00298 809AC998 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0029C 809AC99C 240700B7 */ addiu $a3, $zero, 0x00B7 ## $a3 = 000000B7 -/* 002A0 809AC9A0 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 -/* 002A4 809AC9A4 0C031AD5 */ jal Graph_CloseDisps -/* 002A8 809AC9A8 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 002AC 809AC9AC 8FBF001C */ lw $ra, 0x001C($sp) -/* 002B0 809AC9B0 8FB00014 */ lw $s0, 0x0014($sp) -/* 002B4 809AC9B4 8FB10018 */ lw $s1, 0x0018($sp) -/* 002B8 809AC9B8 03E00008 */ jr $ra -/* 002BC 809AC9BC 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/func_809AC9C0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/func_809AC9C0.s deleted file mode 100644 index 6c5b6b0393..0000000000 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/func_809AC9C0.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_809AC9C0 -/* 002C0 809AC9C0 AFA40000 */ sw $a0, 0x0000($sp) -/* 002C4 809AC9C4 AFA50004 */ sw $a1, 0x0004($sp) -/* 002C8 809AC9C8 84CE005C */ lh $t6, 0x005C($a2) ## 0000005C -/* 002CC 809AC9CC 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 002D0 809AC9D0 15C10007 */ bne $t6, $at, .L809AC9F0 -/* 002D4 809AC9D4 00000000 */ nop -/* 002D8 809AC9D8 84CF0040 */ lh $t7, 0x0040($a2) ## 00000040 -/* 002DC 809AC9DC 3C188016 */ lui $t8, %hi(gGameInfo) -/* 002E0 809AC9E0 11E00003 */ beq $t7, $zero, .L809AC9F0 -/* 002E4 809AC9E4 00000000 */ nop -/* 002E8 809AC9E8 8F18FA90 */ lw $t8, %lo(gGameInfo)($t8) -/* 002EC 809AC9EC A7000D38 */ sh $zero, 0x0D38($t8) ## 80160D38 -.L809AC9F0: -/* 002F0 809AC9F0 03E00008 */ jr $ra -/* 002F4 809AC9F4 00000000 */ nop -/* 002F8 809AC9F8 00000000 */ nop -/* 002FC 809AC9FC 00000000 */ nop diff --git a/data/overlays/actors/z_bg_ddan_jd.data.s b/data/overlays/actors/z_bg_ddan_jd.data.s deleted file mode 100644 index f2367896cc..0000000000 --- a/data/overlays/actors/z_bg_ddan_jd.data.s +++ /dev/null @@ -1,20 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel Bg_Ddan_Jd_InitVars - .word 0x00580100, 0x00000030, 0x002B0000, 0x00000170 -.word BgDdanJd_Init -.word BgDdanJd_Destroy -.word BgDdanJd_Update -.word BgDdanJd_Draw -glabel D_80871080 - .word 0x48500064, 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_bg_ddan_jd.reloc.s b/data/overlays/actors/z_bg_ddan_jd.reloc.s deleted file mode 100644 index 22bc0ce77f..0000000000 --- a/data/overlays/actors/z_bg_ddan_jd.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_80871090 - .incbin "baserom/ovl_Bg_Ddan_Jd", 0x5E0, 0x00000060 diff --git a/data/overlays/actors/z_bg_mori_hashigo.data.s b/data/overlays/actors/z_bg_mori_hashigo.data.s deleted file mode 100644 index fffa486f42..0000000000 --- a/data/overlays/actors/z_bg_mori_hashigo.data.s +++ /dev/null @@ -1,29 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel Bg_Mori_Hashigo_InitVars - .word 0x00E20100, 0x00000000, 0x00720000, 0x000001D0 -.word BgMoriHashigo_Init -.word BgMoriHashigo_Destroy -.word BgMoriHashigo_Update -.word 0x00000000 -glabel D_808A2DA0 - .word 0x04000000, 0x00000000, 0x00000000, 0x0001F820, 0x00000000, 0x00010000, 0x00000000, 0x00000000, 0x00190064 -glabel D_808A2DC4 - .word 0x0A000900, 0x00000000, 0x00000001 -.word D_808A2DA0 -glabel D_808A2DD4 - .word 0xB0F403E8, 0xB0F80190, 0xB0FC03E8, 0x801F0003, 0xB04C0028, 0x485003E8 -glabel D_808A2DEC - .word 0xB0F403E8, 0xB0F80190, 0xB0FC03E8, 0x485003E8 -glabel D_808A2DFC - .word 0x40800000, 0x402CCCCD, 0x3FD9999A, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_bg_mori_hashigo.reloc.s b/data/overlays/actors/z_bg_mori_hashigo.reloc.s deleted file mode 100644 index a629692844..0000000000 --- a/data/overlays/actors/z_bg_mori_hashigo.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_808A2F70 - .incbin "baserom/ovl_Bg_Mori_Hashigo", 0xA10, 0x000000F0 diff --git a/data/overlays/actors/z_bg_mori_idomizu.data.s b/data/overlays/actors/z_bg_mori_idomizu.data.s deleted file mode 100644 index 58b71614dd..0000000000 --- a/data/overlays/actors/z_bg_mori_idomizu.data.s +++ /dev/null @@ -1,20 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel D_808A4C10 - .word 0x00000000 -glabel Bg_Mori_Idomizu_InitVars - .word 0x00E40100, 0x00000030, 0x00720000, 0x00000160 -.word BgMoriIdomizu_Init -.word BgMoriIdomizu_Destroy -.word BgMoriIdomizu_Update -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_bg_mori_idomizu.reloc.s b/data/overlays/actors/z_bg_mori_idomizu.reloc.s deleted file mode 100644 index 2947b7304a..0000000000 --- a/data/overlays/actors/z_bg_mori_idomizu.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_808A4D00 - .incbin "baserom/ovl_Bg_Mori_Idomizu", 0x6C0, 0x000000C0 diff --git a/data/overlays/actors/z_en_goroiwa.data.s b/data/overlays/actors/z_en_goroiwa.data.s deleted file mode 100644 index 74188d16d9..0000000000 --- a/data/overlays/actors/z_en_goroiwa.data.s +++ /dev/null @@ -1,47 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel En_Goroiwa_InitVars - .word 0x01300600, 0x00000010, 0x011F0000, 0x000001D4 -.word EnGoroiwa_Init -.word EnGoroiwa_Destroy -.word EnGoroiwa_Update -.word EnGoroiwa_Draw -glabel D_80A4DE80 - .word 0x00000000, 0x20000000, 0x00040000, 0x00000000, 0x00000000, 0x01000100, 0x00000000, 0x00000000, 0x003A0064 -glabel D_80A4DEA4 - .word 0x0A110039, 0x20000000, 0x00000001 -.word D_80A4DE80 -glabel D_80A4DEB4 - .word 0x0000000C, 0x003CFE00, 0x41200000, 0x41133333 -glabel D_80A4DEC4 - .word 0x00000000, 0x426E0000 -glabel D_80A4DECC - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80A4DED8 - .word 0x00000000, 0x3E99999A, 0x00000000 -glabel D_80A4DEE4 - .word 0x00000000, 0x3F800000, 0x00000000 -glabel D_80A4DEF0 - .word 0x00000000, 0x426E0000 -glabel D_80A4DEF8 - .word 0xB86CFCA4, 0xB870C568, 0xC8500064, 0xB0F405DC, 0xB0F80096, 0x30FC05DC -glabel D_80A4DF10 - .word 0x00000000, 0x4414C000 -glabel D_80A4DF18 - .word func_80A4C814 -.word func_80A4C6C8 -glabel D_80A4DF20 - .word func_80A4D9DC -.word func_80A4D8CC -glabel D_80A4DF28 - .word 0x00140006, 0x00000000 - diff --git a/data/overlays/actors/z_en_goroiwa.reloc.s b/data/overlays/actors/z_en_goroiwa.reloc.s deleted file mode 100644 index 463ebef53f..0000000000 --- a/data/overlays/actors/z_en_goroiwa.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_80A4E0B0 - .incbin "baserom/ovl_En_Goroiwa", 0x2410, 0x00000270 diff --git a/data/overlays/effects/z_eff_ss_bubble.data.s b/data/overlays/effects/z_eff_ss_bubble.data.s deleted file mode 100644 index 2f470b3461..0000000000 --- a/data/overlays/effects/z_eff_ss_bubble.data.s +++ /dev/null @@ -1,16 +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 Effect_Ss_Bubble_InitVars -.word 0x00000007 -.word EffectSsBubble_Init -.word 0x00000000, 0x00000000 - diff --git a/data/overlays/effects/z_eff_ss_bubble.reloc.s b/data/overlays/effects/z_eff_ss_bubble.reloc.s deleted file mode 100644 index 5da411ceb3..0000000000 --- a/data/overlays/effects/z_eff_ss_bubble.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_809A04F0 - .incbin "baserom/ovl_Effect_Ss_Bubble", 0x4B0, 0x00000060 diff --git a/data/overlays/effects/z_eff_ss_d_fire.data.s b/data/overlays/effects/z_eff_ss_d_fire.data.s deleted file mode 100644 index 9503d615dc..0000000000 --- a/data/overlays/effects/z_eff_ss_d_fire.data.s +++ /dev/null @@ -1,17 +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 Effect_Ss_D_Fire_InitVars -.word 0x00000006 -.word EffectSsDFire_Init -glabel D_809A09F8 - .word 0x060090A0, 0x060092A0, 0x060094A0, 0x060096A0, 0x00000000, 0x00000000 - diff --git a/data/overlays/effects/z_eff_ss_d_fire.reloc.s b/data/overlays/effects/z_eff_ss_d_fire.reloc.s deleted file mode 100644 index 4479ecd3dc..0000000000 --- a/data/overlays/effects/z_eff_ss_d_fire.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_809A0A50 - .incbin "baserom/ovl_Effect_Ss_D_Fire", 0x500, 0x00000050 diff --git a/data/overlays/effects/z_eff_ss_dead_db.data.s b/data/overlays/effects/z_eff_ss_dead_db.data.s deleted file mode 100644 index bf0d4a7fde..0000000000 --- a/data/overlays/effects/z_eff_ss_dead_db.data.s +++ /dev/null @@ -1,17 +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 Effect_Ss_Dead_Db_InitVars -.word 0x00000020 -.word EffectSsDeadDb_Init -glabel D_809A0F28 - .word 0x0402CFE0, 0x0402D7E0, 0x0402DFE0, 0x0402E7E0, 0x0402EFE0, 0x0402F7E0, 0x0402FFE0, 0x040307E0, 0x04030FE0, 0x040317E0 - diff --git a/data/overlays/effects/z_eff_ss_dead_db.reloc.s b/data/overlays/effects/z_eff_ss_dead_db.reloc.s deleted file mode 100644 index af9e010776..0000000000 --- a/data/overlays/effects/z_eff_ss_dead_db.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_809A0F90 - .incbin "baserom/ovl_Effect_Ss_Dead_Db", 0x4F0, 0x00000050 diff --git a/data/overlays/effects/z_eff_ss_dead_dd.data.s b/data/overlays/effects/z_eff_ss_dead_dd.data.s deleted file mode 100644 index c358b6a50d..0000000000 --- a/data/overlays/effects/z_eff_ss_dead_dd.data.s +++ /dev/null @@ -1,15 +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 Effect_Ss_Dead_Dd_InitVars -.word 0x00000021 -.word EffectSsDeadDd_Init -.word 0x00000000, 0x00000000 diff --git a/data/overlays/effects/z_eff_ss_dead_dd.reloc.s b/data/overlays/effects/z_eff_ss_dead_dd.reloc.s deleted file mode 100644 index bd3353e9dc..0000000000 --- a/data/overlays/effects/z_eff_ss_dead_dd.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_809A15B0 - .incbin "baserom/ovl_Effect_Ss_Dead_Dd", 0x5D0, 0x00000060 diff --git a/data/overlays/effects/z_eff_ss_dead_ds.data.s b/data/overlays/effects/z_eff_ss_dead_ds.data.s deleted file mode 100644 index 5c64c46ad6..0000000000 --- a/data/overlays/effects/z_eff_ss_dead_ds.data.s +++ /dev/null @@ -1,16 +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 Effect_Ss_Dead_Ds_InitVars -.word 0x00000022 -.word EffectSsDeadDs_Init -.word 0x00000000, 0x00000000 - diff --git a/data/overlays/effects/z_eff_ss_dead_ds.reloc.s b/data/overlays/effects/z_eff_ss_dead_ds.reloc.s deleted file mode 100644 index 67dbc3c2c2..0000000000 --- a/data/overlays/effects/z_eff_ss_dead_ds.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_809A1AD0 - .incbin "baserom/ovl_Effect_Ss_Dead_Ds", 0x4C0, 0x00000060 diff --git a/data/overlays/effects/z_eff_ss_dt_bubble.data.s b/data/overlays/effects/z_eff_ss_dt_bubble.data.s deleted file mode 100644 index 2d8e528b61..0000000000 --- a/data/overlays/effects/z_eff_ss_dt_bubble.data.s +++ /dev/null @@ -1,19 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel D_809A2200 - .word 0xFFFF64FF, 0x96FFFFFF, 0x64FFFFFF -glabel D_809A220C - .word 0xAA0000FF, 0x006400FF, 0x0000FFFF -glabel Effect_Ss_Dt_Bubble_InitVars -.word 0x0000000E -.word EffectSsDtBubble_Init - diff --git a/data/overlays/effects/z_eff_ss_dt_bubble.reloc.s b/data/overlays/effects/z_eff_ss_dt_bubble.reloc.s deleted file mode 100644 index dae0596d8f..0000000000 --- a/data/overlays/effects/z_eff_ss_dt_bubble.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_809A2270 - .incbin "baserom/ovl_Effect_Ss_Dt_Bubble", 0x5C0, 0x00000060 diff --git a/data/overlays/effects/z_eff_ss_en_fire.data.s b/data/overlays/effects/z_eff_ss_en_fire.data.s deleted file mode 100644 index 041d5b2700..0000000000 --- a/data/overlays/effects/z_eff_ss_en_fire.data.s +++ /dev/null @@ -1,17 +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 Effect_Ss_En_Fire_InitVars -.word 0x0000001D -.word EffectSsEnFire_Init -glabel D_809A3248 - .word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/effects/z_eff_ss_en_fire.reloc.s b/data/overlays/effects/z_eff_ss_en_fire.reloc.s deleted file mode 100644 index 6e8e54ff0d..0000000000 --- a/data/overlays/effects/z_eff_ss_en_fire.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_809A32B0 - .incbin "baserom/ovl_Effect_Ss_En_Fire", 0x750, 0x00000080 diff --git a/data/overlays/effects/z_eff_ss_en_ice.data.s b/data/overlays/effects/z_eff_ss_en_ice.data.s deleted file mode 100644 index 3bcdc1c4a7..0000000000 --- a/data/overlays/effects/z_eff_ss_en_ice.data.s +++ /dev/null @@ -1,17 +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 Effect_Ss_En_Ice_InitVars -.word 0x0000001B -.word EffectSsEnIce_Init -glabel D_809A3B88 - .word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/effects/z_eff_ss_en_ice.reloc.s b/data/overlays/effects/z_eff_ss_en_ice.reloc.s deleted file mode 100644 index 5ffdcd5b08..0000000000 --- a/data/overlays/effects/z_eff_ss_en_ice.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_809A3C30 - .incbin "baserom/ovl_Effect_Ss_En_Ice", 0x900, 0x00000090 diff --git a/data/overlays/effects/z_eff_ss_fcircle.data.s b/data/overlays/effects/z_eff_ss_fcircle.data.s deleted file mode 100644 index 5435954dbf..0000000000 --- a/data/overlays/effects/z_eff_ss_fcircle.data.s +++ /dev/null @@ -1,16 +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 Effect_Ss_Fcircle_InitVars -.word 0x0000001F -.word EffectSsFcircle_Init -.word 0x00000000, 0x00000000 - diff --git a/data/overlays/effects/z_eff_ss_fcircle.reloc.s b/data/overlays/effects/z_eff_ss_fcircle.reloc.s deleted file mode 100644 index 1f7246cf5e..0000000000 --- a/data/overlays/effects/z_eff_ss_fcircle.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_809A45F0 - .incbin "baserom/ovl_Effect_Ss_Fcircle", 0x4D0, 0x00000070 diff --git a/data/overlays/effects/z_eff_ss_fhg_flash.data.s b/data/overlays/effects/z_eff_ss_fhg_flash.data.s deleted file mode 100644 index 81e33412eb..0000000000 --- a/data/overlays/effects/z_eff_ss_fhg_flash.data.s +++ /dev/null @@ -1,31 +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 Effect_Ss_Fhg_Flash_InitVars -.word 0x00000016 -.word EffectSsFhgFlash_Init -glabel D_809A5088 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_809A5094 - .word 0x00000000, 0xC47A0000, 0x00000000 -glabel D_809A50A0 - .word 0xA5FF3D00, 0xFFFFFF28, 0x00FFFF00, 0x0000FFFF, 0x00FFFF96, 0x00000000, 0x00000000, 0x00000000 -glabel D_809A50C0 - .word 0xFFF6FFF6, 0x00000000, 0x00000400, 0xFFFFFFFF, 0x000AFFF6, 0x00000000, 0x04000400, 0xFFFFFFFF, 0x000A000A, 0x00000000, 0x04000000, 0xFFFFFFFF, 0xFFF6000A, 0x00000000, 0x00000000, 0xFFFFFFFF -glabel D_809A5100 - .word 0xE7000000, 0x00000000, 0xE3001001, 0x00000000, 0xD7000002, 0xFFFFFFFF, 0xFD900000 -.word D_809A5178 -.word 0xF5900000, 0x07054150, 0xE6000000, 0x00000000, 0xF3000000, 0x071FF200, 0xE7000000, 0x00000000, 0xF5880800, 0x00054150, 0xF2000000, 0x0007C07C, 0xFC3097FF, 0x5FFEFE38, 0xD9F0FBFF, 0x00000000, 0x01004008 -.word D_809A50C0 -.word 0x06000204, 0x00000406, 0xDF000000, 0x00000000 -glabel D_809A5178 - .word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x005B3000, 0x00000000, 0x00000000, 0x00000000, 0x000B0000, 0x07000000, 0x00000000, 0x00000000, 0x005BB64B, 0x3A000000, 0x00000000, 0x00000000, 0x005B0000, 0x00000000, 0x00000000, 0x00000000, 0x001E00B6, 0xFF5B0000, 0x00000000, 0x00000000, 0x00251F0C, 0x07000000, 0x0A000000, 0x00000000, 0x00000000, 0xB6FF0000, 0x00000000, 0x00000000, 0x00255B00, 0x071F1E14, 0x0A000000, 0x00000000, 0x00000000, 0x00457350, 0x00000000, 0x00000000, 0x00295B8C, 0x5B5B0000, 0x00000000, 0x00000000, 0x00000000, 0x00455C39, 0x0F000000, 0x00000000, 0x0000A1FF, 0x5B000000, 0x00000000, 0x00000000, 0x00000000, 0x005B5B00, 0x00000000, 0x00000000, 0x005B311C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x5BB60000, 0x00000000, 0x00000000, 0x5BB63100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFB60000, 0x00000000, 0x00000046, 0xEA310000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0072B646, 0x00000000, 0x0000B6A1, 0x81000000, 0x00000000, 0x00000000, 0x00000000, 0x000C0000, 0x00172E19, 0xBDAB5D41, 0x366BEAEA, 0x81000000, 0x00000000, 0x00000000, 0x00000000, 0x06000000, 0x00000074, 0xFFFF0500, 0x0A2342B6, 0xFF000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x005B0000, 0x03030100, 0x00FF0700, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020503, 0x00000000, 0x00466200, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00076200, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00002962, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00003EA1, 0x62000000, 0x00000000, 0x00000000, 0x0000002E, 0xB6350000, 0x00000000, 0x00000000, 0x000000EA, 0x46000000, 0x00000000, 0x00000000, 0x00002EFF, 0xFF5A0000, 0x00000000, 0x00000000, 0x000000FF, 0xFF001700, 0x00000000, 0x00000000, 0x01015BFF, 0xA1A10000, 0x00000000, 0x00000000, 0x00030046, 0x97732100, 0x00000000, 0x00000000, 0x040CB65E, 0x4A5B4600, 0x00000000, 0x00000003, 0x0C0E8C46, 0x1C035C00, 0x00000000, 0x00000017, 0x134F5B00, 0x00000046, 0x46000000, 0x00000000, 0x34D20000, 0x0401005B, 0x00000000, 0x00000000, 0x5BB60000, 0x00000000, 0x30FCB600, 0x0000A1E7, 0x00000001, 0x0100141E, 0x5B000000, 0x00000000, 0x00000000, 0x00000000, 0x0000A1FF, 0x5B46FF00, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000000FC, 0xFFA13100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xB6000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/effects/z_eff_ss_fhg_flash.reloc.s b/data/overlays/effects/z_eff_ss_fhg_flash.reloc.s deleted file mode 100644 index b266d841ce..0000000000 --- a/data/overlays/effects/z_eff_ss_fhg_flash.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_809A5660 - .incbin "baserom/ovl_Effect_Ss_Fhg_Flash", 0x1000, 0x000000E0 diff --git a/data/overlays/effects/z_eff_ss_fire_tail.data.s b/data/overlays/effects/z_eff_ss_fire_tail.data.s deleted file mode 100644 index 07dfab1e60..0000000000 --- a/data/overlays/effects/z_eff_ss_fire_tail.data.s +++ /dev/null @@ -1,16 +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 Effect_Ss_Fire_Tail_InitVars -.word 0x0000001C -.word EffectSsFireTail_Init -.word 0x00000000, 0x00000000 - diff --git a/data/overlays/effects/z_eff_ss_fire_tail.reloc.s b/data/overlays/effects/z_eff_ss_fire_tail.reloc.s deleted file mode 100644 index c8832ba4cf..0000000000 --- a/data/overlays/effects/z_eff_ss_fire_tail.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_809A5E50 - .incbin "baserom/ovl_Effect_Ss_Fire_Tail", 0x710, 0x00000080 diff --git a/data/overlays/effects/z_eff_ss_g_fire.data.s b/data/overlays/effects/z_eff_ss_g_fire.data.s deleted file mode 100644 index d74bf58ce3..0000000000 --- a/data/overlays/effects/z_eff_ss_g_fire.data.s +++ /dev/null @@ -1,19 +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 Effect_Ss_G_Fire_InitVars -.word 0x0000000C -.word EffectSsGFire_Init -glabel D_809A60D8 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_809A60E4 - .word 0x0401A220, 0x0401A620, 0x0401AA20, 0x0401AE20, 0x0401B220, 0x0401B620, 0x0401BA20, 0x0401BE20, 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/effects/z_eff_ss_g_fire.reloc.s b/data/overlays/effects/z_eff_ss_g_fire.reloc.s deleted file mode 100644 index 2d0af7ea11..0000000000 --- a/data/overlays/effects/z_eff_ss_g_fire.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_809A6110 - .incbin "baserom/ovl_Effect_Ss_G_Fire", 0x240, 0x00000040 diff --git a/data/overlays/effects/z_eff_ss_g_magma.data.s b/data/overlays/effects/z_eff_ss_g_magma.data.s deleted file mode 100644 index d3988abf88..0000000000 --- a/data/overlays/effects/z_eff_ss_g_magma.data.s +++ /dev/null @@ -1,19 +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 Effect_Ss_G_Magma_InitVars -.word 0x0000000B -.word EffectSsGMagma_Init -glabel D_809A6328 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_809A6334 - .word 0x04023810, 0x04023990, 0x04023B10, 0x04023C90, 0x04023E10, 0x04023F90, 0x04024110, 0x04024290, 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/effects/z_eff_ss_g_magma.reloc.s b/data/overlays/effects/z_eff_ss_g_magma.reloc.s deleted file mode 100644 index ad7820f784..0000000000 --- a/data/overlays/effects/z_eff_ss_g_magma.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_809A6360 - .incbin "baserom/ovl_Effect_Ss_G_Magma", 0x210, 0x00000040 diff --git a/data/overlays/effects/z_eff_ss_g_magma2.data.s b/data/overlays/effects/z_eff_ss_g_magma2.data.s deleted file mode 100644 index c268db6c15..0000000000 --- a/data/overlays/effects/z_eff_ss_g_magma2.data.s +++ /dev/null @@ -1,19 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel D_809A6860 - .word 0x0602E4E0, 0x0602E8E0, 0x0602ECE0, 0x0602F0E0, 0x0602F4E0, 0x0602F8E0, 0x0602FCE0, 0x060300E0, 0x060304E0, 0x060308E0, 0x060308E0, 0x060308E0, 0x060308E0 -glabel Effect_Ss_G_Magma2_InitVars -.word 0x00000013 -.word EffectSsGMagma2_Init -glabel D_809A689C - .word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/effects/z_eff_ss_g_magma2.reloc.s b/data/overlays/effects/z_eff_ss_g_magma2.reloc.s deleted file mode 100644 index 3d2dca49be..0000000000 --- a/data/overlays/effects/z_eff_ss_g_magma2.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_809A6900 - .incbin "baserom/ovl_Effect_Ss_G_Magma2", 0x560, 0x00000060 diff --git a/data/overlays/effects/z_eff_ss_g_ripple.data.s b/data/overlays/effects/z_eff_ss_g_ripple.data.s deleted file mode 100644 index 62ee8df637..0000000000 --- a/data/overlays/effects/z_eff_ss_g_ripple.data.s +++ /dev/null @@ -1,17 +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 Effect_Ss_G_Ripple_InitVars -.word 0x00000009 -.word EffectSsGRipple_Init -glabel D_809A6E88 - .word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/effects/z_eff_ss_g_ripple.reloc.s b/data/overlays/effects/z_eff_ss_g_ripple.reloc.s deleted file mode 100644 index 783db03584..0000000000 --- a/data/overlays/effects/z_eff_ss_g_ripple.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_809A6EE0 - .incbin "baserom/ovl_Effect_Ss_G_Ripple", 0x580, 0x00000050 diff --git a/data/overlays/effects/z_eff_ss_g_splash.data.s b/data/overlays/effects/z_eff_ss_g_splash.data.s deleted file mode 100644 index 9ebb2da06c..0000000000 --- a/data/overlays/effects/z_eff_ss_g_splash.data.s +++ /dev/null @@ -1,19 +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 Effect_Ss_G_Splash_InitVars -.word 0x0000000A -.word EffectSsGSplash_Init -glabel D_809A7948 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_809A7954 - .word 0x040255F0, 0x04025AF0, 0x04025FF0, 0x040264F0, 0x040269F0, 0x04026EF0, 0x040273F0, 0x040278F0, 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/effects/z_eff_ss_g_splash.reloc.s b/data/overlays/effects/z_eff_ss_g_splash.reloc.s deleted file mode 100644 index 855d7be3a7..0000000000 --- a/data/overlays/effects/z_eff_ss_g_splash.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_809A7990 - .incbin "baserom/ovl_Effect_Ss_G_Splash", 0x450, 0x00000060 diff --git a/data/overlays/effects/z_eff_ss_hahen.data.s b/data/overlays/effects/z_eff_ss_hahen.data.s deleted file mode 100644 index ec5246ce32..0000000000 --- a/data/overlays/effects/z_eff_ss_hahen.data.s +++ /dev/null @@ -1,16 +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 Effect_Ss_Hahen_InitVars -.word 0x0000000F -.word EffectSsHahen_Init -.word 0x00000000, 0x00000000 - diff --git a/data/overlays/effects/z_eff_ss_hahen.reloc.s b/data/overlays/effects/z_eff_ss_hahen.reloc.s deleted file mode 100644 index e6a27d65f5..0000000000 --- a/data/overlays/effects/z_eff_ss_hahen.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_809A80B0 - .incbin "baserom/ovl_Effect_Ss_Hahen", 0x6C0, 0x000000A0 diff --git a/data/overlays/effects/z_eff_ss_hitmark.data.s b/data/overlays/effects/z_eff_ss_hitmark.data.s deleted file mode 100644 index 6907bc0159..0000000000 --- a/data/overlays/effects/z_eff_ss_hitmark.data.s +++ /dev/null @@ -1,20 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel D_809A85B0 - .word 0xFFFFFFFF, 0xFF00FFFF, 0xFFFF0000, 0xFFC864C8, 0x96009664, 0x00643200, 0xFFFFFFFF, 0x0000FFFF, 0x00FF0000, 0xFFFFFF00, 0xFFC8FFFF, 0xFF9600FF -glabel D_809A85E0 - .word 0x0401F370, 0x0401F4F0, 0x0401F670, 0x0401F7F0, 0x0401F970, 0x0401FAF0, 0x0401FC70, 0x0401FDF0, 0x0401FF70, 0x040200F0, 0x04020270, 0x040203F0, 0x04020570, 0x040206F0, 0x04020870, 0x040209F0, 0x04020B70, 0x04020CF0, 0x04020E70, 0x04020FF0, 0x04021170, 0x040212F0, 0x04021470, 0x040215F0, 0x0401F370, 0x0401F4F0, 0x0401F670, 0x0401F7F0, 0x0401F970, 0x0401FAF0, 0x0401FC70, 0x0401FDF0 -glabel Effect_Ss_HitMark_InitVars -.word 0x00000015 -.word EffectSsHitMark_Init -.word 0x00000000, 0x00000000 - diff --git a/data/overlays/effects/z_eff_ss_hitmark.reloc.s b/data/overlays/effects/z_eff_ss_hitmark.reloc.s deleted file mode 100644 index 13a73ffbab..0000000000 --- a/data/overlays/effects/z_eff_ss_hitmark.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_809A86A0 - .incbin "baserom/ovl_Effect_Ss_HitMark", 0x550, 0x00000060 diff --git a/data/overlays/effects/z_eff_ss_ice_piece.data.s b/data/overlays/effects/z_eff_ss_ice_piece.data.s deleted file mode 100644 index d5463af92e..0000000000 --- a/data/overlays/effects/z_eff_ss_ice_piece.data.s +++ /dev/null @@ -1,16 +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 Effect_Ss_Ice_Piece_InitVars -.word 0x0000001A -.word EffectSsIcePiece_Init -.word 0x00000000, 0x00000000 - diff --git a/data/overlays/effects/z_eff_ss_ice_piece.reloc.s b/data/overlays/effects/z_eff_ss_ice_piece.reloc.s deleted file mode 100644 index 43494b116f..0000000000 --- a/data/overlays/effects/z_eff_ss_ice_piece.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_809A8B80 - .incbin "baserom/ovl_Effect_Ss_Ice_Piece", 0x480, 0x00000070 diff --git a/data/overlays/effects/z_eff_ss_ice_smoke.data.s b/data/overlays/effects/z_eff_ss_ice_smoke.data.s deleted file mode 100644 index c29f88ac9d..0000000000 --- a/data/overlays/effects/z_eff_ss_ice_smoke.data.s +++ /dev/null @@ -1,16 +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 Effect_Ss_Ice_Smoke_InitVars -.word 0x00000024 -.word EffectSsIceSmoke_Init -.word 0x00000000, 0x00000000 - diff --git a/data/overlays/effects/z_eff_ss_ice_smoke.reloc.s b/data/overlays/effects/z_eff_ss_ice_smoke.reloc.s deleted file mode 100644 index 4cbcda2a76..0000000000 --- a/data/overlays/effects/z_eff_ss_ice_smoke.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_809A9150 - .incbin "baserom/ovl_Effect_Ss_Ice_Smoke", 0x560, 0x00000060 diff --git a/data/overlays/effects/z_eff_ss_k_fire.data.s b/data/overlays/effects/z_eff_ss_k_fire.data.s deleted file mode 100644 index 55363f5385..0000000000 --- a/data/overlays/effects/z_eff_ss_k_fire.data.s +++ /dev/null @@ -1,16 +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 Effect_Ss_K_Fire_InitVars -.word 0x00000017 -.word EffectSsKFire_Init -.word 0x00000000, 0x00000000 - diff --git a/data/overlays/effects/z_eff_ss_k_fire.reloc.s b/data/overlays/effects/z_eff_ss_k_fire.reloc.s deleted file mode 100644 index 3f18a5d5ff..0000000000 --- a/data/overlays/effects/z_eff_ss_k_fire.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_809A9620 - .incbin "baserom/ovl_Effect_Ss_K_Fire", 0x470, 0x00000060 diff --git a/data/overlays/effects/z_eff_ss_kakera.data.s b/data/overlays/effects/z_eff_ss_kakera.data.s deleted file mode 100644 index ca1415a611..0000000000 --- a/data/overlays/effects/z_eff_ss_kakera.data.s +++ /dev/null @@ -1,38 +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 Effect_Ss_Kakera_InitVars -.word 0x00000019 -.word EffectSsKakera_Init -glabel D_809AA528 - .word 0xFFFFFFEB, 0xAA820000 -glabel D_809AA530 - .word 0x3F800000, 0x42C80000, 0x42200000, 0x40A00000, 0x42C80000, 0x42200000, 0x40A00000, 0x42C80000, 0x42200000, 0x40A00000 -glabel D_809AA558 - .word 0x3D4CCCCD, 0x3F800000 -glabel D_809AA560 - .word 0x40800000, 0x3DCCCCCD, 0x3E99999A, 0x3F666666, 0xBDCCCCCD, 0xBE99999A, 0xBF666666 -glabel D_809AA57C - .word 0x3DCCCCCD, 0x3F800000, 0x40C00000 -glabel D_809AA588 - .word func_809A9DD8 -.word func_809A9DEC -.word func_809A9DEC -.word func_809A9DEC -.word func_809A9E28 -.word func_809A9E28 -.word func_809A9E28 -.word func_809A9E68 -.word func_809A9E68 -.word func_809A9E68 -glabel D_809AA5B0 - .word 0x41200000, 0x41A00000, 0x42200000, 0x00000000 - diff --git a/data/overlays/effects/z_eff_ss_kakera.reloc.s b/data/overlays/effects/z_eff_ss_kakera.reloc.s deleted file mode 100644 index 92610c3213..0000000000 --- a/data/overlays/effects/z_eff_ss_kakera.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_809AA690 - .incbin "baserom/ovl_Effect_Ss_Kakera", 0x1010, 0x00000180 diff --git a/data/overlays/effects/z_eff_ss_kirakira.data.s b/data/overlays/effects/z_eff_ss_kirakira.data.s deleted file mode 100644 index 56f4b73a61..0000000000 --- a/data/overlays/effects/z_eff_ss_kirakira.data.s +++ /dev/null @@ -1,16 +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 Effect_Ss_KiraKira_InitVars -.word 0x00000001 -.word EffectSsKiraKira_Init -.word 0x00000000, 0x00000000 - diff --git a/data/overlays/effects/z_eff_ss_kirakira.reloc.s b/data/overlays/effects/z_eff_ss_kirakira.reloc.s deleted file mode 100644 index 9fa05317d4..0000000000 --- a/data/overlays/effects/z_eff_ss_kirakira.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_809AAE60 - .incbin "baserom/ovl_Effect_Ss_KiraKira", 0x650, 0x00000090 diff --git a/data/overlays/effects/z_eff_ss_lightning.data.s b/data/overlays/effects/z_eff_ss_lightning.data.s deleted file mode 100644 index e3932c5c97..0000000000 --- a/data/overlays/effects/z_eff_ss_lightning.data.s +++ /dev/null @@ -1,17 +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 Effect_Ss_Lightning_InitVars -.word 0x0000000D -.word EffectSsLightning_Init -glabel D_809AB538 - .word 0x04029F30, 0x0402A530, 0x0402AB30, 0x0402B130, 0x0402B730, 0x0402BD30, 0x0402C330, 0x0402C930, 0x00000000, 0x00000000 - diff --git a/data/overlays/effects/z_eff_ss_lightning.reloc.s b/data/overlays/effects/z_eff_ss_lightning.reloc.s deleted file mode 100644 index 64f555269f..0000000000 --- a/data/overlays/effects/z_eff_ss_lightning.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_809AB5B0 - .incbin "baserom/ovl_Effect_Ss_Lightning", 0x6C0, 0x00000080 diff --git a/data/overlays/effects/z_eff_ss_sibuki.data.s b/data/overlays/effects/z_eff_ss_sibuki.data.s deleted file mode 100644 index 6fece2fc00..0000000000 --- a/data/overlays/effects/z_eff_ss_sibuki.data.s +++ /dev/null @@ -1,16 +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 Effect_Ss_Sibuki_InitVars -.word 0x00000011 -.word EffectSsSibuki_Init -.word 0x00000000, 0x00000000 - diff --git a/data/overlays/effects/z_eff_ss_sibuki.reloc.s b/data/overlays/effects/z_eff_ss_sibuki.reloc.s deleted file mode 100644 index 556b219a2a..0000000000 --- a/data/overlays/effects/z_eff_ss_sibuki.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_809ABCF0 - .incbin "baserom/ovl_Effect_Ss_Sibuki", 0x6C0, 0x00000070 diff --git a/data/overlays/effects/z_eff_ss_sibuki2.data.s b/data/overlays/effects/z_eff_ss_sibuki2.data.s deleted file mode 100644 index 2c7d5e972d..0000000000 --- a/data/overlays/effects/z_eff_ss_sibuki2.data.s +++ /dev/null @@ -1,17 +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 Effect_Ss_Sibuki2_InitVars -.word 0x00000012 -.word EffectSsSibuki2_Init -glabel D_809AC068 - .word 0x0401C2C0, 0x0401C2C0, 0x0401C6C0, 0x0401CAC0, 0x0401CEC0, 0x0401D2C0, 0x0401D6C0, 0x0401DAC0, 0x0401DEC0, 0x00000000 - diff --git a/data/overlays/effects/z_eff_ss_sibuki2.reloc.s b/data/overlays/effects/z_eff_ss_sibuki2.reloc.s deleted file mode 100644 index 01c44cbd90..0000000000 --- a/data/overlays/effects/z_eff_ss_sibuki2.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_809AC0E0 - .incbin "baserom/ovl_Effect_Ss_Sibuki2", 0x380, 0x00000050 diff --git a/data/overlays/effects/z_eff_ss_stick.data.s b/data/overlays/effects/z_eff_ss_stick.data.s deleted file mode 100644 index d27c3ea639..0000000000 --- a/data/overlays/effects/z_eff_ss_stick.data.s +++ /dev/null @@ -1,17 +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 Effect_Ss_Stick_InitVars -.word 0x00000010 -.word EffectSsStick_Init -glabel D_809AC628 - .word 0x00140000, 0x0602BA38, 0x00150000, 0x06006CC0, 0x00000000, 0x00000000 - diff --git a/data/overlays/effects/z_eff_ss_stick.reloc.s b/data/overlays/effects/z_eff_ss_stick.reloc.s deleted file mode 100644 index d1b87e18ab..0000000000 --- a/data/overlays/effects/z_eff_ss_stick.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_809AC690 - .incbin "baserom/ovl_Effect_Ss_Stick", 0x3C0, 0x00000070 diff --git a/data/overlays/effects/z_eff_ss_stone1.data.s b/data/overlays/effects/z_eff_ss_stone1.data.s deleted file mode 100644 index 582162375c..0000000000 --- a/data/overlays/effects/z_eff_ss_stone1.data.s +++ /dev/null @@ -1,17 +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 Effect_Ss_Stone1_InitVars -.word 0x00000014 -.word EffectSsStone1_Init -glabel D_809ACA08 - .word 0x04029A90, 0xC80000FF, 0x000000FF, 0x04029690, 0xFF6400FF, 0x640000FF, 0x04029290, 0xFFC800FF, 0xC80000FF, 0x04028E90, 0xFFFF00FF, 0xFF0000FF, 0x04028A90, 0xFFFF96FF, 0xFF9600FF, 0x04028690, 0xFFFFFFFF, 0xFFFF00FF, 0x04028290, 0xFFFFFFFF, 0x00FF00FF, 0x04027E90, 0xFFFFFFFF, 0x00FFFFFF, 0x00000000, 0x00000000 - diff --git a/data/overlays/effects/z_eff_ss_stone1.reloc.s b/data/overlays/effects/z_eff_ss_stone1.reloc.s deleted file mode 100644 index f77948a10d..0000000000 --- a/data/overlays/effects/z_eff_ss_stone1.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_809ACAC0 - .incbin "baserom/ovl_Effect_Ss_Stone1", 0x3C0, 0x00000060 diff --git a/data/z_effect_soft_sprite_old_init.data.s b/data/z_effect_soft_sprite_old_init.data.s deleted file mode 100644 index 26f16e85b9..0000000000 --- a/data/z_effect_soft_sprite_old_init.data.s +++ /dev/null @@ -1,87 +0,0 @@ -.include "macro.inc" - -# assembler directives -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel D_801158C0 - .incbin "baserom.z64", 0xB8CA60, 0xC - -glabel D_801158CC - .incbin "baserom.z64", 0xB8CA6C, 0x4 - -glabel D_801158D0 - .incbin "baserom.z64", 0xB8CA70, 0x4 - -glabel D_801158D4 - .incbin "baserom.z64", 0xB8CA74, 0x4 - -glabel D_801158D8 - .incbin "baserom.z64", 0xB8CA78, 0x4 - -glabel D_801158DC - .incbin "baserom.z64", 0xB8CA7C, 0x4 - -glabel D_801158E0 - .incbin "baserom.z64", 0xB8CA80, 0x4 - -glabel D_801158E4 - .incbin "baserom.z64", 0xB8CA84, 0x4 - -glabel D_801158E8 - .incbin "baserom.z64", 0xB8CA88, 0x4 - -glabel D_801158EC - .incbin "baserom.z64", 0xB8CA8C, 0x4 - -glabel D_801158F0 - .incbin "baserom.z64", 0xB8CA90, 0x4 - -glabel D_801158F4 - .incbin "baserom.z64", 0xB8CA94, 0x4 - -glabel D_801158F8 - .incbin "baserom.z64", 0xB8CA98, 0x4 - -glabel D_801158FC - .incbin "baserom.z64", 0xB8CA9C, 0xC - -glabel D_80115908 - .incbin "baserom.z64", 0xB8CAA8, 0xC - -glabel D_80115914 - .incbin "baserom.z64", 0xB8CAB4, 0xC - -glabel D_80115920 - .incbin "baserom.z64", 0xB8CAC0, 0x4 - -glabel D_80115924 - .incbin "baserom.z64", 0xB8CAC4, 0x8 - -glabel D_8011592C - .incbin "baserom.z64", 0xB8CACC, 0x78 - -glabel D_801159A4 - .incbin "baserom.z64", 0xB8CB44, 0x1 - -glabel D_801159A5 - .incbin "baserom.z64", 0xB8CB45, 0x1 - -glabel D_801159A6 - .incbin "baserom.z64", 0xB8CB46, 0x2 - -glabel D_801159A8 - .incbin "baserom.z64", 0xB8CB48, 0x1 - -glabel D_801159A9 - .incbin "baserom.z64", 0xB8CB49, 0x1 - -glabel D_801159AA - .incbin "baserom.z64", 0xB8CB4A, 0x6 - - diff --git a/include/color.h b/include/color.h index 2724038259..3152fd3cf9 100644 --- a/include/color.h +++ b/include/color.h @@ -5,17 +5,17 @@ typedef struct { u8 r, g, b; } Color_RGB8; +typedef struct { + u8 r, g, b, a; +} Color_RGBA8; + +// only use when necessary for alignment purposes typedef union { struct { u8 r, g, b, a; }; u32 rgba; -} Color_RGBA8; - -// Variant without u32 union -typedef struct { - u8 r, g, b, a; -} Color_RGBA8_n; +} Color_RGBA8_u32; typedef struct { f32 r, g, b, a; diff --git a/include/functions.h b/include/functions.h index de9f438e28..c809471da3 100644 --- a/include/functions.h +++ b/include/functions.h @@ -201,89 +201,142 @@ void EffectSs_DrawAll(GlobalContext* globalCtx); s16 func_80027DD4(s16 arg0, s16 arg1, s32 arg2); s16 func_80027E34(s16 arg0, s16 arg1, f32 arg2); u8 func_80027E84(u8 arg0, u8 arg1, f32 arg2); -// ? func_80027F80(?); -void func_8002829C(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8_n* primColor, - Color_RGBA8_n* envColor, s16 scale, s16 scaleStep); -void func_8002836C(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8_n* primColor, - Color_RGBA8_n* envColor, s16 scale, s16 scaleStep, s16 life); -void func_800283D4(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8_n* primColor, - Color_RGBA8_n* envColor, s16 scale, s16 scaleStep, s16 life); -void func_8002843C(GlobalContext* globalCtx, Vec3f* pos, Vec3f* arg2, Vec3f* arg3, Color_RGBA8_n* arg4, - Color_RGBA8_n* arg5, s16 arg6, s16 arg7, s16 arg8); +void EffectSs_DrawGEffect(GlobalContext* globalCtx, EffectSs* this, void* texture); +void EffectSsDust_Spawn(GlobalContext* globalCtx, u16 drawFlags, Vec3f* pos, Vec3f* velocity, Vec3f* accel, + Color_RGBA8* primColor, Color_RGBA8* envColor, s16 scale, s16 scaleStep, s16 life, + u8 updateMode); +void func_8002829C(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8* primColor, + Color_RGBA8* envColor, s16 scale, s16 scaleStep); +void func_80028304(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8* primColor, + Color_RGBA8* envColor, s16 scale, s16 scaleStep); +void func_8002836C(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8* primColor, + Color_RGBA8* envColor, s16 scale, s16 scaleStep, s16 life); +void func_800283D4(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8* primColor, + Color_RGBA8* envColor, s16 scale, s16 scaleStep, s16 life); +void func_8002843C(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8* primColor, + Color_RGBA8* envColor, s16 scale, s16 scaleStep, s16 life); +void func_800284A4(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8* primColor, + Color_RGBA8* envColor, s16 scale, s16 scaleStep); +void func_80028510(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8* primColor, + Color_RGBA8* envColor, s16 scale, s16 scaleStep); void func_8002857C(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel); +void func_800285EC(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel); void func_8002865C(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, s16 scaleStep); void func_800286CC(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, s16 scaleStep); void func_8002873C(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, s16 scaleStep, s16 life); void func_800287AC(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, s16 scaleStep, s16 life); +void func_8002881C(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8* primColor, + Color_RGBA8* envColor); +void func_80028858(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8* primColor, + Color_RGBA8* envColor); void func_80028990(GlobalContext* globalCtx, f32 randScale, Vec3f* srcPos); void func_80028A54(GlobalContext* globalCtx, f32 randScale, Vec3f* srcPos); -UNK_TYPE func_80028B18(GlobalContext* globalCtx, Vec3f*, Vec3f*, Vec3f*); -void func_80028B74(GlobalContext*, Vec3f*, UNK_PTR, UNK_PTR, Color_RGB8*, Color_RGB8*); -void func_80028BB0(GlobalContext*, Vec3f*, Vec3f*, Vec3f*, Color_RGB8*, Color_RGB8*, s32, s32); -// ? func_80028CEC(?); +void EffectSsKiraKira_SpawnSmallYellow(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel); +void EffectSsKiraKira_SpawnSmall(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, + Color_RGBA8* primColor, Color_RGBA8* envColor); +void EffectSsKiraKira_SpawnDispersed(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, + Color_RGBA8* primColor, Color_RGBA8* envColor, s16 scale, s32 life); +void EffectSsKiraKira_SpawnFocused(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, + Color_RGBA8* primColor, Color_RGBA8* envColor, s16 scale, s32 life); +void EffectSsBomb_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel); +void EffectSsBomb2_SpawnFade(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel); void EffectSsBomb2_SpawnLayered(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, s16 scaleStep); -void func_80028F84(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 radius, s16 radiusStep, - s16 life); -void func_80028FD8(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8* envColor, - Color_RGBA8* primColor, s16 life); -void func_80029024(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel); -void func_80029060(GlobalContext* globalCtx, Actor* actor, Vec3f* pos, Vec3f* velocity, Vec3f* accel, - Color_RGBA8* envColor, Color_RGBA8* primColor, s16 scale, s16 scaleStep); -void func_80029184(GlobalContext* globalCtx, Actor* actor, Vec3f* pos, Vec3f* velocity, Vec3f* accel); -void func_800292DC(GlobalContext* globalCtx, Actor* actor, Vec3f* pos, Vec3f* velocity, Vec3f* accel, - Color_RGBA8* envColor, Color_RGBA8* primColor); -// ? func_80029320(?); -// ? func_800293A0(?); -void func_800293E4(GlobalContext* globalCtx, Vec3f* pos, f32, f32, f32, f32); -void func_80029444(GlobalContext* globalCtx, Vec3f* pos, u32, u32, u32); -void func_8002949C(GlobalContext* globalCtx, Vec3f* pos, u32, u32, u32, u32); -// ? func_80029530(?); -// ? func_80029568(?); -// ? func_800295A0(?); -// ? func_80029618(?); -// ? func_80029694(?); -// ? func_80029724(?); -void func_800297A4(GlobalContext* globalCtx, Vec3f* vec, f32, s32, s32, s32, s32, s32, s32, s32); -void func_800298EC(GlobalContext* globalCtx, Vec3f* vec, s16); -// ? func_8002993C(?); -void func_800299AC(GlobalContext* globalCtx, Vec3f* v); -// ? func_80029B30(?); -// ? func_80029B90(?); -// ? func_80029C00(?); -// ? func_80029C50(?); -void func_80029CA4(GlobalContext* globalCtx, s32 a, Vec3f* pos); -// ? func_80029CC8(?); -void EffectSsFhgFlash_Spawn(GlobalContext*, Vec3f*, Vec3f*, Vec3f*, s16, u8); -void EffectSsFhgFlash_Spawn2(GlobalContext*, Actor*, Vec3f*, s16, u8); -// ? func_80029DBC(?); -void func_80029E8C(GlobalContext* globalCtx, Vec3f* burstDepthY, Vec3f* burstDepthX, Vec3f* burstOrigin, - s16 gravityInfluence, s16 u0, s16 rotSpeed, s16 burstVel, u8 u1, s16 scale, u8 u2, s16 jitter, - s32 duration, s16 u3, s16 objectId, Gfx* dList); -void EffectSsSolderSrchBall_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 arg4, +void EffectSsBlast_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8* primColor, + Color_RGBA8* envColor, s16 scale, s16 scaleStep, s16 sclaeStepDecay, s16 life); +void EffectSsBlast_SpawnWhiteCustomScale(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, + s16 scaleStep, s16 life); +void EffectSsBlast_SpawnShockwave(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, + Color_RGBA8* primColor, Color_RGBA8* envColor, s16 life); +void EffectSsBlast_SpawnWhiteShockwave(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel); +void EffectSsGSpk_SpawnAccel(GlobalContext* globalCtx, Actor* actor, Vec3f* pos, Vec3f* velocity, Vec3f* accel, + Color_RGBA8* primColor, Color_RGBA8* envColor, s16 scale, s16 scaleStep); +void EffectSsGSpk_SpawnNoAccel(GlobalContext* globalCtx, Actor* actor, Vec3f* pos, Vec3f* velocity, Vec3f* accel, + Color_RGBA8* primColor, Color_RGBA8* envColor, s16 scale, s16 scaleStep); +void EffectSsGSpk_SpawnFuse(GlobalContext* globalCtx, Actor* actor, Vec3f* pos, Vec3f* velocity, Vec3f* accel); +void EffectSsGSpk_SpawnRandColor(GlobalContext* globalCtx, Actor* actor, Vec3f* pos, Vec3f* velocity, Vec3f* accel, + s16 scale, s16 scaleStep); +void EffectSsGSpk_SpawnSmall(GlobalContext* globalCtx, Actor* actor, Vec3f* pos, Vec3f* velocity, Vec3f* accel, + Color_RGBA8* primColor, Color_RGBA8* envColor); +void EffectSsDFire_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, s16 scaleStep, + s16 alpha, s16 fadeDelay, s32 life); +void EffectSsDFire_SpawnFixedScale(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 alpha, + s16 fadeDelay); +void EffectSsBubble_Spawn(GlobalContext* globalCtx, Vec3f* pos, f32 yPosOffset, f32 yPosRandScale, f32 xzPosRandScale, + f32 scale); +void EffectSsGRipple_Spawn(GlobalContext* globalCtx, Vec3f* pos, s16 radius, s16 radiusMax, s16 life); +void EffectSsGSplash_Spawn(GlobalContext* globalCtx, Vec3f* pos, Color_RGBA8* primColor, Color_RGBA8* envColor, + s16 type, s16 scale); +void EffectSsGMagma_Spawn(GlobalContext* globalCtx, Vec3f* pos); +void EffectSsGFire_Spawn(GlobalContext* globalCtx, Vec3f* pos); +void EffectSsLightning_Spawn(GlobalContext* globalCtx, Vec3f* pos, Color_RGBA8* primColor, Color_RGBA8* envColor, + s16 scale, s16 yaw, s16 life, s16 numBolts); +void EffectSsDtBubble_SpawnColorProfile(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, + s16 life, s16 colorProfile, s16 randXZ); +void EffectSsDtBubble_SpawnCustomColor(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, + Color_RGBA8* primColor, Color_RGBA8* envColor, s16 scale, s16 life, s16 randXZ); +void EffectSsHahen_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 unused, s16 scale, + s16 objId, s16 life, Gfx* dList); +void EffectSsHahen_SpawnBurst(GlobalContext* globalCtx, Vec3f* pos, f32 burstScale, s16 unused, s16 scale, + s16 randScaleRange, s16 count, s16 objId, s16 life, Gfx* dList); +void EffectSsStick_Spawn(GlobalContext* globalCtx, Vec3f* pos, s16 yaw); +void EffectSsSibuki_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 moveDelay, + s16 direction, s16 scale); +void EffectSsSibuki_SpawnBurst(GlobalContext* globalCtx, Vec3f* pos); +void EffectSsSibuki2_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale); +void EffectSsGMagma2_Spawn(GlobalContext* globalCtx, Vec3f* pos, Color_RGBA8* primColor, Color_RGBA8* envColor, + s16 updateRate, s16 drawMode, s16 scale); +void EffectSsStone1_Spawn(GlobalContext* globalCtx, Vec3f* pos, s32 arg2); +void EffectSsHitMark_Spawn(GlobalContext* globalCtx, s32 type, s16 scale, Vec3f* pos); +void EffectSsHitMark_SpawnFixedScale(GlobalContext* globalCtx, s32 type, Vec3f* pos); +void EffectSsHitMark_SpawnCustomScale(GlobalContext* globalCtx, s32 type, s16 scale, Vec3f* pos); +void EffectSsFhgFlash_SpawnLightBall(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, + u8 param); +void EffectSsFhgFlash_SpawnShock(GlobalContext* globalCtx, Actor* actor, Vec3f* pos, s16 scale, u8 param); +void EffectSsKFire_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scaleMax, u8 type); +void EffectSsSolderSrchBall_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 unused, s16* linkDetected); -// ? func_80029F44(?); -void func_80029FAC(GlobalContext* globalCtx, Vec3f*, f32); -// ? func_8002A140(?); -// ? func_8002A1DC(?); -// ? func_8002A2A4(?); -// ? func_8002A32C(?); -// ? func_8002A3C4(?); -void func_8002A484(GlobalContext*, f32, s16, f32); -// ? func_8002A4D4(?); +void EffectSsKakera_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* arg3, s16 gravity, s16 arg5, + s16 arg6, s16 arg7, s16 arg8, s16 scale, s16 arg10, s16 arg11, s32 life, s16 colorIdx, + s16 objId, Gfx* dList); +void EffectSsIcePiece_Spawn(GlobalContext* globalCtx, Vec3f* pos, f32 scale, Vec3f* velocity, Vec3f* accel, s32 life); +void EffectSsIcePiece_SpawnBurst(GlobalContext* globalCtx, Vec3f* refPos, f32 scale); +void EffectSsEnIce_SpawnFlyingVec3f(GlobalContext* globalCtx, Actor* actor, Vec3f* pos, s16 primR, s16 primG, s16 primB, + s16 primA, s16 envR, s16 envG, s16 envB, f32 scale); +void EffectSsEnIce_SpawnFlyingVec3s(GlobalContext* globalCtx, Actor* actor, Vec3s* pos, s16 primR, s16 primG, s16 primB, + s16 primA, s16 envR, s16 envG, s16 envB, f32 scale); +void EffectSsEnIce_Spawn(GlobalContext* arg0, Vec3f* pos, f32 scale, Vec3f* velocity, Vec3f* accel, + Color_RGBA8* primColor, Color_RGBA8* envColor, s32 life); +void EffectSsFireTail_Spawn(GlobalContext* globalCtx, Actor* actor, Vec3f* pos, f32 scale, Vec3f* arg4, s16 arg5, + Color_RGBA8* primColor, Color_RGBA8* envColor, s16 type, s16 bodyPart, s32 life); +void EffectSsFireTail_SpawnFlame(GlobalContext* globalCtx, Actor* actor, Vec3f* pos, f32 arg3, s16 bodyPart, + f32 colorIntensity); +void EffectSsFireTail_SpawnFlameOnPlayer(GlobalContext* globalCtx, f32 scale, s16 bodyPart, f32 colorIntensity); +void EffectSsEnFire_SpawnVec3f(GlobalContext* globalCtx, Actor* actor, Vec3f* pos, s16 scale, s16 unk_12, s16 flags, + s16 bodyPart); +void EffectSsEnFire_SpawnVec3s(GlobalContext* globalCtx, Actor* actor, Vec3s* vec, s16 scale, s16 arg4, s16 flags, + s16 bodyPart); void EffectSsExtra_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, s16 scoreIdx); -void func_8002A65C(GlobalContext* globalCtx, Actor* actor, Vec3f* pos, s16 arg3, s16 arg4); -void func_8002A6B8(GlobalContext* globalCtx, Vec3f* pos, Vec3f* arg2, Vec3f* arg3, u32 arg4, s32 arg5, u32 arg6, - u32 arg7, u32 arg8, u32 arg9, u32 arg10, u32 arg11, u32 arg12, u32 arg13, u32 arg14, u32 arg15); -// ? func_8002A770(?); -// ? func_8002A824(?); -// ? func_8002A894(?); -// ? func_8002A90C(?); -void EffectSsDeadSound_SpawnStationary(GlobalContext* globalCtx, Vec3f* pos, u16 sfxId, s16 lowerPriority, s16 unk28, - s32 life); -// ? func_8002AA44(?); +void EffectSsFCircle_Spawn(GlobalContext* globalCtx, Actor* actor, Vec3f* pos, s16 radius, s16 height); +void EffectSsDeadDb_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, s16 scaleStep, + s16 primR, s16 primG, s16 primB, s16 primA, s16 envR, s16 envG, s16 envB, s16 unused, + s32 arg14, s16 playSound); +void EffectSsDeadDd_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, s16 scaleStep, + s16 primR, s16 primG, s16 primB, s16 alpha, s16 envR, s16 envG, s16 envB, s16 alphaStep, + s32 life); +void EffectSsDeadDd_SpawnRandYellow(GlobalContext* globalCtx, Vec3f* pos, s16 scale, s16 scaleStep, f32 randPosScale, + s32 randIter, s32 life); +void EffectSsDeadDs_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, s16 scaleStep, + s16 alpha, s32 life); +void EffectSsDeadDs_SpawnStationary(GlobalContext* globalCtx, Vec3f* pos, s16 scale, s16 scaleStep, s16 alpha, + s32 life); +void EffectSsDeadSound_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, u16 sfxId, + s16 lowerPriority, s16 repeatMode, s32 life); +void EffectSsDeadSound_SpawnStationary(GlobalContext* globalCtx, Vec3f* pos, u16 sfxId, s16 lowerPriority, + s16 repeatMode, s32 life); +void EffectSsIceSmoke_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale); void FlagSet_Update(GlobalContext* globalCtx); void Overlay_LoadGameState(GameStateOverlay* overlayEntry); void Overlay_FreeGameState(GameStateOverlay* overlayEntry); @@ -481,7 +534,7 @@ void ActorOverlayTable_Cleanup(void); // ? func_800388E8(?); // ? func_80038924(?); // ? func_800389D4(?); -void func_80038A28(CollisionPoly*, f32, f32, f32, MtxF*); +void func_80038A28(CollisionPoly* poly, f32 x, f32 y, f32 z, MtxF* mtxF); f32 func_80038B7C(CollisionPoly*, Vec3f*); // ? func_80038BE0(?); // ? func_80038D48(?); @@ -526,6 +579,8 @@ f32 func_8003CA64(CollisionContext* colCtx, CollisionPoly** outPoly, s32* bgId, f32 func_8003CB30(CollisionContext*, CollisionPoly*, Vec3f*, MtxF*); f32 func_8003CCA4(CollisionContext*, CollisionPoly**, s32*, Vec3f*); // ? func_8003CDD4(?); +s32 func_8003D464(CollisionContext* colCtx, Vec3f* posResult, Vec3f* posNext, Vec3f* posPrev, f32 arg4, + CollisionPoly** outPoly, f32 checkHeight); s32 func_8003D52C(CollisionContext*, Vec3f*, Vec3f*, Vec3f*, f32, CollisionPoly**, u32*, Actor*, f32); s32 func_8003D594(CollisionContext*, Vec3f*, Vec3f*, Vec3f*, f32, CollisionPoly**, u32*, Actor*, f32); // ? func_8003D600(?); @@ -601,7 +656,8 @@ s32 func_80041FA0(CollisionContext*, CollisionPoly*, u32); // ? func_80042048(?); // ? func_80042108(?); s32 func_8004213C(GlobalContext*, CollisionContext*, f32, f32, f32*, UNK_PTR); -// ? func_80042244(?); +s32 func_8004239C(GlobalContext* globalCtx, CollisionContext* colCtx, Vec3f* arg2, f32 arg3, WaterBox** arg4); +s32 func_80042244(GlobalContext* globalCtx, CollisionContext* colCtx, f32 x, f32 z, f32* ySurface, WaterBox** outWaterBox); // ? func_80042538(?); // ? func_80042548(?); // ? func_8004259C(?); @@ -1178,6 +1234,7 @@ void func_800938B4(GraphicsContext* gfxCtx); void func_8009398C(GraphicsContext* gfxCtx); void func_80093AD0(GraphicsContext* gfxCtx); void func_80093BA8(GraphicsContext* gfxCtx); +void func_80093C14(GraphicsContext* gfxCtx); void func_80093C80(GlobalContext* globalCtx); void func_80093D18(GraphicsContext* gfxCtx); void func_80093D84(GraphicsContext* gfxCtx); @@ -1196,6 +1253,7 @@ void func_80094678(GraphicsContext* gfxCtx); Gfx* func_800946E4(Gfx* gfx); Gfx* func_800947AC(Gfx* gfx); void func_80094A14(GraphicsContext* gfxCtx); +void func_80094BC4(GraphicsContext* gfxCtx); void func_80094C50(GraphicsContext* gfxCtx); void func_80094D28(Gfx** gfxp); Gfx* Gfx_BranchTexScroll(Gfx** gfxp, u32 x, u32 y, s32 width, s32 height); diff --git a/include/variables.h b/include/variables.h index 9577cceed3..c13400a679 100644 --- a/include/variables.h +++ b/include/variables.h @@ -42,8 +42,9 @@ extern Gfx D_04015720[]; extern Gfx D_04015760[]; //extern ? D_0401A0B0; extern u32 D_0401E370; +extern Gfx D_04021770[]; //extern ? D_0402CF30; -//extern ? D_04037730; +extern Gfx D_04037730[]; //extern ? D_04038F00; extern u8 D_04038FB0[]; extern u32 D_0403B030; @@ -253,7 +254,6 @@ extern s32 D_8011D3AC; //extern ? D_8011E098; //extern ? D_8011E09A; extern s16 D_8011E0B0; -extern Color_RGBA8 D_8011E0B4[]; //extern ? D_8011E0D4; extern GameStateOverlay gGameStateOverlayTable[6]; //extern ? D_8011FAF0; @@ -3409,7 +3409,7 @@ extern u8 D_801610DA; //extern ? D_801612EA; //extern ? D_801612EC; extern s32 gTrnsnUnkState; -extern Color_RGBA8 D_801614B0; +extern Color_RGBA8_u32 D_801614B0; extern SpeedMeter gSpeedMeter; //extern ? D_801664F0; //extern ? D_80166500; diff --git a/include/z64.h b/include/z64.h index 28e3866550..16ae69cfd3 100644 --- a/include/z64.h +++ b/include/z64.h @@ -562,7 +562,7 @@ typedef struct { /* 0x18 */ void* polygonArray; /* 0x1C */ void* polygonTypes; /* 0x20 */ void* cameraData; - /* 0x24 */ s16 nbWaterBoxes; + /* 0x24 */ u16 nbWaterBoxes; /* 0x28 */ WaterBox* waterBoxes; } CollisionHeader; @@ -1529,7 +1529,7 @@ typedef struct GfxPrint { /* 0x0C */ u16 baseX; /* 0x0E */ u8 baseY; /* 0x0F */ u8 flag; - /* 0x10 */ Color_RGBA8 color; + /* 0x10 */ Color_RGBA8_u32 color; /* 0x14 */ char unk_14[0x1C]; // unused } GfxPrint; // size = 0x30 @@ -1926,15 +1926,15 @@ typedef struct { typedef struct { /* 0x00 */ u32 type; /* 0x04 */ u32 setScissor; - /* 0x08 */ Color_RGBA8 color; - /* 0x0C */ Color_RGBA8 envColor; + /* 0x08 */ Color_RGBA8_u32 color; + /* 0x0C */ Color_RGBA8_u32 envColor; } struct_801664F0; // size = 0x10 typedef struct { /* 0x00 */ u32 unk_00; /* 0x04 */ u32 setScissor; - /* 0x08 */ Color_RGBA8 primColor; - /* 0x0C */ Color_RGBA8 envColor; + /* 0x08 */ Color_RGBA8_u32 primColor; + /* 0x0C */ Color_RGBA8_u32 envColor; /* 0x10 */ u16* tlut; /* 0x14 */ Gfx* monoDl; } VisMono; // size = 0x18 @@ -1943,8 +1943,8 @@ typedef struct { typedef struct { /* 0x00 */ u32 useRgba; /* 0x04 */ u32 setScissor; - /* 0x08 */ Color_RGBA8 primColor; - /* 0x08 */ Color_RGBA8 envColor; + /* 0x08 */ Color_RGBA8_u32 primColor; + /* 0x08 */ Color_RGBA8_u32 envColor; } struct_80166500; // size = 0x10 typedef struct { diff --git a/include/z64effect.h b/include/z64effect.h index 2fcdc2519a..9be304eace 100644 --- a/include/z64effect.h +++ b/include/z64effect.h @@ -35,8 +35,8 @@ typedef struct { /* 0x490 */ f32 gravity; /* 0x494 */ u32 uDiv; // "u_div" /* 0x498 */ u32 vDiv; // "v_div" - /* 0x49C */ Color_RGBA8_n colorStart[4]; - /* 0x4AC */ Color_RGBA8_n colorEnd[4]; + /* 0x49C */ Color_RGBA8 colorStart[4]; + /* 0x4AC */ Color_RGBA8 colorEnd[4]; /* 0x4BC */ s32 timer; /* 0x4C0 */ s32 duration; } EffectSparkInit; // size = 0x4C4 @@ -49,8 +49,8 @@ typedef struct { /* 0x490 */ f32 gravity; /* 0x494 */ u32 uDiv; // "u_div" /* 0x498 */ u32 vDiv; // "v_div" - /* 0x49C */ Color_RGBA8_n colorStart[4]; - /* 0x4AC */ Color_RGBA8_n colorEnd[4]; + /* 0x49C */ Color_RGBA8 colorStart[4]; + /* 0x4AC */ Color_RGBA8 colorEnd[4]; /* 0x4BC */ s32 timer; /* 0x4C0 */ s32 duration; } EffectSpark; // size = 0x4C4 @@ -86,8 +86,8 @@ typedef struct { /* 0x19 */ u8 unkFlag; /* 0x1A */ u8 drawMode; // 0: simple; 1: simple with alt colors; 2+: smooth /* 0x1B */ u8 mode4Param; - /* 0x1C */ Color_RGBA8_n altPrimColor; // used with drawMode 1 - /* 0x20 */ Color_RGBA8_n altEnvColor; // used with drawMode 1 + /* 0x1C */ Color_RGBA8 altPrimColor; // used with drawMode 1 + /* 0x20 */ Color_RGBA8 altEnvColor; // used with drawMode 1 } EffectBlureInit2; // size = 0x24 typedef struct { @@ -97,16 +97,16 @@ typedef struct { /* 0x188 */ u16 flags; /* 0x18A */ s16 addAngleChange; /* 0x18C */ s16 addAngle; - /* 0x18E */ Color_RGBA8_n p1StartColor; - /* 0x192 */ Color_RGBA8_n p2StartColor; - /* 0x196 */ Color_RGBA8_n p1EndColor; - /* 0x19A */ Color_RGBA8_n p2EndColor; + /* 0x18E */ Color_RGBA8 p1StartColor; + /* 0x192 */ Color_RGBA8 p2StartColor; + /* 0x196 */ Color_RGBA8 p1EndColor; + /* 0x19A */ Color_RGBA8 p2EndColor; /* 0x19E */ u8 numElements; // "now_edge_num" /* 0x19F */ u8 elemDuration; /* 0x1A0 */ u8 unkFlag; /* 0x1A1 */ u8 drawMode; // 0: simple; 1: simple with alt colors; 2+: smooth - /* 0x1A2 */ Color_RGBA8_n altPrimColor; // used with drawMode 1 - /* 0x1A6 */ Color_RGBA8_n altEnvColor; // used with drawMode 1 + /* 0x1A2 */ Color_RGBA8 altPrimColor; // used with drawMode 1 + /* 0x1A6 */ Color_RGBA8 altEnvColor; // used with drawMode 1 } EffectBlure; // size = 0x1AC typedef struct { @@ -122,12 +122,12 @@ typedef struct { typedef struct { /* 0x00 */ u8 numElements; /* 0x02 */ Vec3s position; - /* 0x08 */ Color_RGBA8_n primColorStart; - /* 0x0C */ Color_RGBA8_n envColorStart; - /* 0x10 */ Color_RGBA8_n primColorMid; - /* 0x14 */ Color_RGBA8_n envColorMid; - /* 0x18 */ Color_RGBA8_n primColorEnd; - /* 0x1C */ Color_RGBA8_n envColorEnd; + /* 0x08 */ Color_RGBA8 primColorStart; + /* 0x0C */ Color_RGBA8 envColorStart; + /* 0x10 */ Color_RGBA8 primColorMid; + /* 0x14 */ Color_RGBA8 envColorMid; + /* 0x18 */ Color_RGBA8 primColorEnd; + /* 0x1C */ Color_RGBA8 envColorEnd; /* 0x20 */ f32 deceleration; /* 0x24 */ f32 maxInitialSpeed; /* 0x28 */ f32 lengthCutoff; @@ -140,12 +140,12 @@ typedef struct { /* 0x000 */ EffectShieldParticleElement elements[16]; /* 0x180 */ u8 numElements; /* 0x182 */ Vec3s position; - /* 0x188 */ Color_RGBA8_n primColorStart; - /* 0x18C */ Color_RGBA8_n envColorStart; - /* 0x190 */ Color_RGBA8_n primColorMid; - /* 0x194 */ Color_RGBA8_n envColorMid; - /* 0x198 */ Color_RGBA8_n primColorEnd; - /* 0x19C */ Color_RGBA8_n envColorEnd; + /* 0x188 */ Color_RGBA8 primColorStart; + /* 0x18C */ Color_RGBA8 envColorStart; + /* 0x190 */ Color_RGBA8 primColorMid; + /* 0x194 */ Color_RGBA8 envColorMid; + /* 0x198 */ Color_RGBA8 primColorEnd; + /* 0x19C */ Color_RGBA8 envColorEnd; /* 0x1A0 */ f32 deceleration; /* 0x1A4 */ char unk_1A4[0x04]; /* 0x1A8 */ f32 maxInitialSpeed; @@ -192,9 +192,13 @@ typedef enum { struct EffectSs; +typedef u32 (*EffectSsInitFunc)(struct GlobalContext* globalCtx, u32 index, struct EffectSs* effectSs, void* initParams); +typedef void (*EffectSsUpdateFunc)(struct GlobalContext* globalCtx, u32 index, struct EffectSs* effectSs); +typedef void (*EffectSsDrawFunc)(struct GlobalContext* globalCtx, u32 index, struct EffectSs* effectSs); + typedef struct { /* 0x00 */ u32 type; - /* 0x04 */ u32 (*init)(struct GlobalContext* globalCtx, u32 index, struct EffectSs* effectSs, void* initParams); + /* 0x04 */ EffectSsInitFunc init; } EffectSsInit; // size = 0x08 typedef struct { @@ -211,11 +215,11 @@ typedef struct EffectSs { /* 0x00 */ Vec3f pos; /* 0x0C */ Vec3f velocity; /* 0x18 */ Vec3f accel; - /* 0x24 */ void (*update)(struct GlobalContext* globalCtx, u32 index, struct EffectSs* effectSs); - /* 0x28 */ void (*draw)(struct GlobalContext* globalCtx, u32 index, struct EffectSs* effectSs); - /* 0x2C */ Vec3f unk_2C; - /* 0x38 */ Gfx* displayList; - /* 0x3C */ void* unk_3C; + /* 0x24 */ EffectSsUpdateFunc update; + /* 0x28 */ EffectSsDrawFunc draw; + /* 0x2C */ Vec3f vec; // usage specific per effect + /* 0x38 */ void* gfx; // mostly used for display lists, sometimes textures + /* 0x3C */ Actor* actor; // interfacing actor, usually the actor that spawned the effect /* 0x40 */ s16 regs[13]; // specific per effect /* 0x5A */ u16 flags; /* 0x5C */ s16 life; // -1 means this entry is free @@ -229,6 +233,21 @@ typedef struct { /* 0x08 */ s32 tableSize; } EffectSsInfo; // size = 0x0C +/* G Effect Regs */ + +#define rgTexIdx regs[0] +#define rgScale regs[1] +#define rgTexIdxStep regs[2] +#define rgPrimColorR regs[3] +#define rgPrimColorG regs[4] +#define rgPrimColorB regs[5] +#define rgPrimColorA regs[6] +#define rgEnvColorR regs[7] +#define rgEnvColorG regs[8] +#define rgEnvColorB regs[9] +#define rgEnvColorA regs[10] +#define rgObjBankIdx regs[11] + typedef enum { /* 0x00 */ EFFECT_SS_DUST, /* 0x01 */ EFFECT_SS_KIRAKIRA, diff --git a/include/z64transition.h b/include/z64transition.h index 45b9b12b14..ca010ec86e 100644 --- a/include/z64transition.h +++ b/include/z64transition.h @@ -24,8 +24,8 @@ typedef struct { } TransitionUnk; // size = 0xE0 typedef struct { - /* 0x000 */ Color_RGBA8 color; - /* 0x004 */ Color_RGBA8 envColor; + /* 0x000 */ Color_RGBA8_u32 color; + /* 0x004 */ Color_RGBA8_u32 envColor; /* 0x008 */ u8 direction; /* 0x009 */ u8 frame; /* 0x00A */ u8 isDone; @@ -41,13 +41,13 @@ typedef struct { /* 0x000 */ u8 fadeType; /* 0x001 */ u8 isDone; /* 0x002 */ u8 fadeDirection; - /* 0x004 */ Color_RGBA8 fadeColor; + /* 0x004 */ Color_RGBA8_u32 fadeColor; /* 0x008 */ u16 fadeTimer; } TransitionFade; // size = 0xC typedef struct { - /* 0x000 */ Color_RGBA8 color; - /* 0x004 */ Color_RGBA8 envColor; + /* 0x000 */ Color_RGBA8_u32 color; + /* 0x004 */ Color_RGBA8_u32 envColor; /* 0x008 */ s32 texX; /* 0x00C */ s32 texY; /* 0x010 */ s32 step; @@ -65,7 +65,7 @@ typedef struct { } TransitionCircle; // size = 0x228; typedef struct { - /* 0x000 */ Color_RGBA8 color; + /* 0x000 */ Color_RGBA8_u32 color; /* 0x004 */ f32 transPos; /* 0x008 */ f32 step; /* 0x00C */ s32 state; diff --git a/spec b/spec index bcfa674459..51187d28f9 100644 --- a/spec +++ b/spec @@ -279,7 +279,6 @@ beginseg include "build/src/code/z_effect.o" include "build/src/code/z_effect_soft_sprite.o" include "build/src/code/z_effect_soft_sprite_old_init.o" - include "build/data/z_effect_soft_sprite_old_init.data.o" include "build/src/code/z_effect_soft_sprite_dlftbls.o" include "build/src/code/flg_set.o" include "build/src/code/z_DLF.o" @@ -667,8 +666,7 @@ endseg beginseg name "ovl_Bg_Ddan_Jd" include "build/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.o" - include "build/data/overlays/actors/z_bg_ddan_jd.data.o" - include "build/data/overlays/actors/z_bg_ddan_jd.reloc.o" + include "build/src/overlays/actors/ovl_Bg_Ddan_Jd/ovl_Bg_Ddan_Jd_reloc.o" endseg beginseg @@ -1111,8 +1109,7 @@ endseg beginseg name "ovl_Bg_Mori_Hashigo" include "build/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.o" - include "build/data/overlays/actors/z_bg_mori_hashigo.data.o" - include "build/data/overlays/actors/z_bg_mori_hashigo.reloc.o" + include "build/src/overlays/actors/ovl_Bg_Mori_Hashigo/ovl_Bg_Mori_Hashigo_reloc.o" endseg beginseg @@ -1130,8 +1127,7 @@ endseg beginseg name "ovl_Bg_Mori_Idomizu" include "build/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.o" - include "build/data/overlays/actors/z_bg_mori_idomizu.data.o" - include "build/data/overlays/actors/z_bg_mori_idomizu.reloc.o" + include "build/src/overlays/actors/ovl_Bg_Mori_Idomizu/ovl_Bg_Mori_Idomizu_reloc.o" endseg beginseg @@ -1691,36 +1687,31 @@ endseg beginseg name "ovl_Effect_Ss_Bubble" include "build/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.o" - include "build/data/overlays/effects/z_eff_ss_bubble.data.o" - include "build/data/overlays/effects/z_eff_ss_bubble.reloc.o" + include "build/src/overlays/effects/ovl_Effect_Ss_Bubble/ovl_Effect_Ss_Bubble_reloc.o" endseg beginseg name "ovl_Effect_Ss_D_Fire" include "build/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.o" - include "build/data/overlays/effects/z_eff_ss_d_fire.data.o" - include "build/data/overlays/effects/z_eff_ss_d_fire.reloc.o" + include "build/src/overlays/effects/ovl_Effect_Ss_D_Fire/ovl_Effect_Ss_D_Fire_reloc.o" endseg beginseg name "ovl_Effect_Ss_Dead_Db" include "build/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.o" - include "build/data/overlays/effects/z_eff_ss_dead_db.data.o" - include "build/data/overlays/effects/z_eff_ss_dead_db.reloc.o" + include "build/src/overlays/effects/ovl_Effect_Ss_Dead_Db/ovl_Effect_Ss_Dead_Db_reloc.o" endseg beginseg name "ovl_Effect_Ss_Dead_Dd" include "build/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.o" - include "build/data/overlays/effects/z_eff_ss_dead_dd.data.o" - include "build/data/overlays/effects/z_eff_ss_dead_dd.reloc.o" + include "build/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/ovl_Effect_Ss_Dead_Dd_reloc.o" endseg beginseg name "ovl_Effect_Ss_Dead_Ds" include "build/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.o" - include "build/data/overlays/effects/z_eff_ss_dead_ds.data.o" - include "build/data/overlays/effects/z_eff_ss_dead_ds.reloc.o" + include "build/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/ovl_Effect_Ss_Dead_Ds_reloc.o" endseg beginseg @@ -1732,8 +1723,7 @@ endseg beginseg name "ovl_Effect_Ss_Dt_Bubble" include "build/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.o" - include "build/data/overlays/effects/z_eff_ss_dt_bubble.data.o" - include "build/data/overlays/effects/z_eff_ss_dt_bubble.reloc.o" + include "build/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/ovl_Effect_Ss_Dt_Bubble_reloc.o" endseg beginseg @@ -1745,15 +1735,13 @@ endseg beginseg name "ovl_Effect_Ss_En_Fire" include "build/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.o" - include "build/data/overlays/effects/z_eff_ss_en_fire.data.o" - include "build/data/overlays/effects/z_eff_ss_en_fire.reloc.o" + include "build/src/overlays/effects/ovl_Effect_Ss_En_Fire/ovl_Effect_Ss_En_Fire_reloc.o" endseg beginseg name "ovl_Effect_Ss_En_Ice" include "build/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.o" - include "build/data/overlays/effects/z_eff_ss_en_ice.data.o" - include "build/data/overlays/effects/z_eff_ss_en_ice.reloc.o" + include "build/src/overlays/effects/ovl_Effect_Ss_En_Ice/ovl_Effect_Ss_En_Ice_reloc.o" endseg beginseg @@ -1765,50 +1753,43 @@ endseg beginseg name "ovl_Effect_Ss_Fcircle" include "build/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.o" - include "build/data/overlays/effects/z_eff_ss_fcircle.data.o" - include "build/data/overlays/effects/z_eff_ss_fcircle.reloc.o" + include "build/src/overlays/effects/ovl_Effect_Ss_Fcircle/ovl_Effect_Ss_Fcircle_reloc.o" endseg beginseg name "ovl_Effect_Ss_Fhg_Flash" include "build/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.o" - include "build/data/overlays/effects/z_eff_ss_fhg_flash.data.o" - include "build/data/overlays/effects/z_eff_ss_fhg_flash.reloc.o" + include "build/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/ovl_Effect_Ss_Fhg_Flash_reloc.o" endseg beginseg name "ovl_Effect_Ss_Fire_Tail" include "build/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.o" - include "build/data/overlays/effects/z_eff_ss_fire_tail.data.o" - include "build/data/overlays/effects/z_eff_ss_fire_tail.reloc.o" + include "build/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/ovl_Effect_Ss_Fire_Tail_reloc.o" endseg beginseg name "ovl_Effect_Ss_G_Fire" include "build/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.o" - include "build/data/overlays/effects/z_eff_ss_g_fire.data.o" - include "build/data/overlays/effects/z_eff_ss_g_fire.reloc.o" + include "build/src/overlays/effects/ovl_Effect_Ss_G_Fire/ovl_Effect_Ss_G_Fire_reloc.o" endseg beginseg name "ovl_Effect_Ss_G_Magma" include "build/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.o" - include "build/data/overlays/effects/z_eff_ss_g_magma.data.o" - include "build/data/overlays/effects/z_eff_ss_g_magma.reloc.o" + include "build/src/overlays/effects/ovl_Effect_Ss_G_Magma/ovl_Effect_Ss_G_Magma_reloc.o" endseg beginseg name "ovl_Effect_Ss_G_Magma2" include "build/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.o" - include "build/data/overlays/effects/z_eff_ss_g_magma2.data.o" - include "build/data/overlays/effects/z_eff_ss_g_magma2.reloc.o" + include "build/src/overlays/effects/ovl_Effect_Ss_G_Magma2/ovl_Effect_Ss_G_Magma2_reloc.o" endseg beginseg name "ovl_Effect_Ss_G_Ripple" include "build/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.o" - include "build/data/overlays/effects/z_eff_ss_g_ripple.data.o" - include "build/data/overlays/effects/z_eff_ss_g_ripple.reloc.o" + include "build/src/overlays/effects/ovl_Effect_Ss_G_Ripple/ovl_Effect_Ss_G_Ripple_reloc.o" endseg beginseg @@ -1820,78 +1801,67 @@ endseg beginseg name "ovl_Effect_Ss_G_Splash" include "build/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.o" - include "build/data/overlays/effects/z_eff_ss_g_splash.data.o" - include "build/data/overlays/effects/z_eff_ss_g_splash.reloc.o" + include "build/src/overlays/effects/ovl_Effect_Ss_G_Splash/ovl_Effect_Ss_G_Splash_reloc.o" endseg beginseg name "ovl_Effect_Ss_Hahen" include "build/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.o" - include "build/data/overlays/effects/z_eff_ss_hahen.data.o" - include "build/data/overlays/effects/z_eff_ss_hahen.reloc.o" + include "build/src/overlays/effects/ovl_Effect_Ss_Hahen/ovl_Effect_Ss_Hahen_reloc.o" endseg beginseg name "ovl_Effect_Ss_HitMark" include "build/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.o" - include "build/data/overlays/effects/z_eff_ss_hitmark.data.o" - include "build/data/overlays/effects/z_eff_ss_hitmark.reloc.o" + include "build/src/overlays/effects/ovl_Effect_Ss_HitMark/ovl_Effect_Ss_HitMark_reloc.o" endseg beginseg name "ovl_Effect_Ss_Ice_Piece" include "build/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.o" - include "build/data/overlays/effects/z_eff_ss_ice_piece.data.o" - include "build/data/overlays/effects/z_eff_ss_ice_piece.reloc.o" + include "build/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/ovl_Effect_Ss_Ice_Piece_reloc.o" endseg beginseg name "ovl_Effect_Ss_Ice_Smoke" include "build/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.o" - include "build/data/overlays/effects/z_eff_ss_ice_smoke.data.o" - include "build/data/overlays/effects/z_eff_ss_ice_smoke.reloc.o" + include "build/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/ovl_Effect_Ss_Ice_Smoke_reloc.o" endseg beginseg name "ovl_Effect_Ss_K_Fire" include "build/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.o" - include "build/data/overlays/effects/z_eff_ss_k_fire.data.o" - include "build/data/overlays/effects/z_eff_ss_k_fire.reloc.o" + include "build/src/overlays/effects/ovl_Effect_Ss_K_Fire/ovl_Effect_Ss_K_Fire_reloc.o" endseg beginseg name "ovl_Effect_Ss_Kakera" include "build/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.o" - include "build/data/overlays/effects/z_eff_ss_kakera.data.o" - include "build/data/overlays/effects/z_eff_ss_kakera.reloc.o" + include "build/src/overlays/effects/ovl_Effect_Ss_Kakera/ovl_Effect_Ss_Kakera_reloc.o" endseg beginseg name "ovl_Effect_Ss_KiraKira" include "build/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.o" - include "build/data/overlays/effects/z_eff_ss_kirakira.data.o" - include "build/data/overlays/effects/z_eff_ss_kirakira.reloc.o" + include "build/src/overlays/effects/ovl_Effect_Ss_KiraKira/ovl_Effect_Ss_KiraKira_reloc.o" endseg beginseg name "ovl_Effect_Ss_Lightning" include "build/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.o" - include "build/data/overlays/effects/z_eff_ss_lightning.data.o" - include "build/data/overlays/effects/z_eff_ss_lightning.reloc.o" + include "build/src/overlays/effects/ovl_Effect_Ss_Lightning/ovl_Effect_Ss_Lightning_reloc.o" endseg beginseg name "ovl_Effect_Ss_Sibuki" include "build/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.o" - include "build/data/overlays/effects/z_eff_ss_sibuki.data.o" - include "build/data/overlays/effects/z_eff_ss_sibuki.reloc.o" + include "build/src/overlays/effects/ovl_Effect_Ss_Sibuki/ovl_Effect_Ss_Sibuki_reloc.o" endseg beginseg name "ovl_Effect_Ss_Sibuki2" include "build/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.o" - include "build/data/overlays/effects/z_eff_ss_sibuki2.data.o" - include "build/data/overlays/effects/z_eff_ss_sibuki2.reloc.o" + include "build/src/overlays/effects/ovl_Effect_Ss_Sibuki2/ovl_Effect_Ss_Sibuki2_reloc.o" endseg beginseg @@ -1903,15 +1873,13 @@ endseg beginseg name "ovl_Effect_Ss_Stick" include "build/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.o" - include "build/data/overlays/effects/z_eff_ss_stick.data.o" - include "build/data/overlays/effects/z_eff_ss_stick.reloc.o" + include "build/src/overlays/effects/ovl_Effect_Ss_Stick/ovl_Effect_Ss_Stick_reloc.o" endseg beginseg name "ovl_Effect_Ss_Stone1" include "build/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.o" - include "build/data/overlays/effects/z_eff_ss_stone1.data.o" - include "build/data/overlays/effects/z_eff_ss_stone1.reloc.o" + include "build/src/overlays/effects/ovl_Effect_Ss_Stone1/ovl_Effect_Ss_Stone1_reloc.o" endseg beginseg @@ -2483,8 +2451,7 @@ endseg beginseg name "ovl_En_Goroiwa" include "build/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.o" - include "build/data/overlays/actors/z_en_goroiwa.data.o" - include "build/data/overlays/actors/z_en_goroiwa.reloc.o" + include "build/src/overlays/actors/ovl_En_Goroiwa/ovl_En_Goroiwa_reloc.o" endseg beginseg diff --git a/src/code/PreRender.c b/src/code/PreRender.c index bc577353df..c0d0eb9232 100644 --- a/src/code/PreRender.c +++ b/src/code/PreRender.c @@ -70,11 +70,11 @@ void func_800C0F28(PreRenderContext* this, Gfx** gfxp, void* buf, void* bufSave) lrt = (ult + add) - 1; if (1) {} - gDPLoadTextureTile(gfx++, buf, G_IM_FMT_RGBA, G_IM_SIZ_16b, this->width, this->height, uls, ult, lrs, lrt, - 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, - G_TX_NOLOD, G_TX_NOLOD); - gSPTextureRectangle(gfx++, uls << 2, ult << 2, lrs << 2, lrt << 2, G_TX_RENDERTILE, uls << 5, ult << 5, - 4 << 10, 1 << 10); + gDPLoadTextureTile(gfx++, buf, G_IM_FMT_RGBA, G_IM_SIZ_16b, this->width, this->height, uls, ult, lrs, lrt, 0, + G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, + G_TX_NOLOD); + gSPTextureRectangle(gfx++, uls << 2, ult << 2, lrs << 2, lrt << 2, G_TX_RENDERTILE, uls << 5, ult << 5, 4 << 10, + 1 << 10); x -= add; x2 += add; @@ -125,8 +125,8 @@ void func_800C1258(PreRenderContext* this, Gfx** gfxp) { gDPLoadTextureTile(gfx++, this->fbufSave, G_IM_FMT_RGBA, G_IM_SIZ_16b, this->widthSave, this->height - 1, this->ulxSave, ult, this->lrxSave, lrt, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gSPTextureRectangle(gfx++, this->ulx << 2, uly << 2, this->lrx << 2, (uly + add - 1) << 2, - G_TX_RENDERTILE, this->ulxSave << 5, ult << 5, 4 << 10, 1 << 10); + gSPTextureRectangle(gfx++, this->ulx << 2, uly << 2, this->lrx << 2, (uly + add - 1) << 2, G_TX_RENDERTILE, + this->ulxSave << 5, ult << 5, 4 << 10, 1 << 10); y -= add; y2 += add; @@ -180,9 +180,9 @@ void func_800C170C(PreRenderContext* this, Gfx** gfxp, void* fbuf, void* fbufSav ult = x2; lrt = (x2 + add - 1); - gDPLoadTextureTile(gfx++, fbuf, G_IM_FMT_RGBA, G_IM_SIZ_16b, this->width, this->height, uls, ult, lrs, - lrt, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, - G_TX_NOLOD, G_TX_NOLOD); + gDPLoadTextureTile(gfx++, fbuf, G_IM_FMT_RGBA, G_IM_SIZ_16b, this->width, this->height, uls, ult, lrs, lrt, 0, + G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, + G_TX_NOLOD); if (1) {} gSPTextureRectangle(gfx++, uls << 2, ult << 2, (lrs + 1) << 2, (lrt + 1) << 2, G_TX_RENDERTILE, uls << 5, ult << 5, 1 << 10, 1 << 10); @@ -237,9 +237,9 @@ void func_800C1B24(PreRenderContext* this, Gfx** gfxp, void* fbuf, void* cvgSave ult = x2; lrt = (x2 + add) - 1; - gDPLoadTextureTile(gfx++, fbuf, G_IM_FMT_IA, G_IM_SIZ_16b, this->width, this->height, uls, ult, lrs, lrt, - 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, - G_TX_NOLOD, G_TX_NOLOD); + gDPLoadTextureTile(gfx++, fbuf, G_IM_FMT_IA, G_IM_SIZ_16b, this->width, this->height, uls, ult, lrs, lrt, 0, + G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, + G_TX_NOLOD); if (1) {} gSPTextureRectangle(gfx++, uls << 2, ult << 2, (lrs + 1) << 2, (lrt + 1) << 2, G_TX_RENDERTILE, uls << 5, ult << 5, 1 << 10, 1 << 10); @@ -356,9 +356,9 @@ void func_800C213C(PreRenderContext* this, Gfx** gfxp) { gDPLoadMultiTile(gfx++, this->fbufSave, 0x0000, G_TX_RENDERTILE, G_IM_FMT_RGBA, G_IM_SIZ_16b, this->width, this->height, uls, ult, lrx, lry, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gDPLoadMultiTile(gfx++, this->cvgSave, 0x0160, 1, G_IM_FMT_I, G_IM_SIZ_8b, this->width, this->height, uls, - ult, lrx, lry, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, - G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); + gDPLoadMultiTile(gfx++, this->cvgSave, 0x0160, 1, G_IM_FMT_I, G_IM_SIZ_8b, this->width, this->height, uls, ult, + lrx, lry, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, + G_TX_NOLOD, G_TX_NOLOD); gSPTextureRectangle(gfx++, uls << 2, ult << 2, (lrx + 1) << 2, (lry + 1) << 2, G_TX_RENDERTILE, uls << 5, ult << 5, 1 << 10, 1 << 10); diff --git a/src/code/sys_math3d.c b/src/code/sys_math3d.c index 296135b840..141b27fd4f 100644 --- a/src/code/sys_math3d.c +++ b/src/code/sys_math3d.c @@ -212,7 +212,7 @@ s32 Math3D_PlaneVsPlaneVsLineClosestPoint(f32 planeAA, f32 planeAB, f32 planeAC, * Finds a point on the line from starting point `v0`, and directional vector `dir` * which is `dist` length from the starting point. Result is placed in `ret` */ -void Math3D_PointOnInfinteLine(Vec3f* v0, Vec3f* dir, f32 dist, Vec3f* ret) { +void Math3D_PointOnInfiniteLine(Vec3f* v0, Vec3f* dir, f32 dist, Vec3f* ret) { ret->x = (dir->x * dist) + v0->x; ret->y = (dir->y * dist) + v0->y; ret->z = (dir->z * dist) + v0->z; @@ -226,7 +226,7 @@ void Math3D_LineSplitRatio(Vec3f* v0, Vec3f* v1, f32 ratio, Vec3f* ret) { Vec3f diff; Math_Vec3f_Diff(v1, v0, &diff); - Math3D_PointOnInfinteLine(v0, &diff, ratio, ret); + Math3D_PointOnInfiniteLine(v0, &diff, ratio, ret); } /** @@ -1922,8 +1922,8 @@ s32 Math3D_CylTriVsIntersect(Cylinder16* cyl, TriNorm* tri, Vec3f* intersect) { } radiusTodistFromCylYIntersectTov0v1 = cyl->radius / distFromCylYIntersectTov0v1; - Math3D_PointOnInfinteLine(&cylIntersectCenter, &diffMidpointIntersect, radiusTodistFromCylYIntersectTov0v1, - intersect); + Math3D_PointOnInfiniteLine(&cylIntersectCenter, &diffMidpointIntersect, radiusTodistFromCylYIntersectTov0v1, + intersect); return true; } diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 3db868799d..118f226d87 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -1210,7 +1210,7 @@ void func_8002E4B4(GlobalContext* globalCtx, Actor* actor, f32 arg2, f32 arg3, f f32 sp58; UNK_TYPE sp54; f32 sp50; - Vec3f sp44; + Vec3f ripplePos; sp74 = actor->posRot.pos.y - actor->pos4.y; @@ -1258,12 +1258,12 @@ void func_8002E4B4(GlobalContext* globalCtx, Actor* actor, f32 arg2, f32 arg3, f if (!(actor->bgCheckFlags & 0x20)) { actor->bgCheckFlags |= 0x40; if (!(arg5 & 0x40)) { - sp44.x = actor->posRot.pos.x; - sp44.y = sp50; - sp44.z = actor->posRot.pos.z; - func_80029444(globalCtx, &sp44, 100, 500, 0); - func_80029444(globalCtx, &sp44, 100, 500, 4); - func_80029444(globalCtx, &sp44, 100, 500, 8); + ripplePos.x = actor->posRot.pos.x; + ripplePos.y = sp50; + ripplePos.z = actor->posRot.pos.z; + EffectSsGRipple_Spawn(globalCtx, &ripplePos, 100, 500, 0); + EffectSsGRipple_Spawn(globalCtx, &ripplePos, 100, 500, 4); + EffectSsGRipple_Spawn(globalCtx, &ripplePos, 100, 500, 8); } } actor->bgCheckFlags |= 0x20; @@ -1850,7 +1850,8 @@ void func_8002FBAC(GlobalContext* globalCtx) { spA4.y = Math_Rand_ZeroOne() * 6.0f + gSaveContext.respawn[RESPAWN_MODE_TOP].pos.y + 80.0f; spA4.z = Math_Rand_CenteredFloat(6.0f) + gSaveContext.respawn[RESPAWN_MODE_TOP].pos.z; - func_80028BB0(globalCtx, &spA4, &D_80116048, &D_80116054, &D_80116060, &D_80116064, 1000, 0x10); + EffectSsKiraKira_SpawnDispersed(globalCtx, &spA4, &D_80116048, &D_80116054, &D_80116060, &D_80116064, 1000, + 16); if (D_8015BC18 == 0.0f) { gSaveContext.respawn[RESPAWN_MODE_TOP] = gSaveContext.respawn[RESPAWN_MODE_DOWN]; @@ -2184,8 +2185,8 @@ void Actor_Draw(GlobalContext* globalCtx, Actor* actor) { gSPSegment(oGfxCtx->polyXlu.p++, 0x06, globalCtx->objectCtx.status[actor->objBankIndex].segment); if (actor->dmgEffectTimer != 0) { - // Must be inline data to match Color_RGBA8 sp2C = { 0, 0, 0, 255 }; + if (actor->dmgEffectParams & 0x8000) { sp2C.r = sp2C.g = sp2C.b = ((actor->dmgEffectParams & 0x1F00) >> 5) | 7; } else if (actor->dmgEffectParams & 0x4000) { @@ -3966,7 +3967,7 @@ void func_8003555C(GlobalContext* globalCtx, Vec3f* arg1, Vec3f* arg2, Vec3f* ar color2.g = 90; color2.b = 50; - func_80028B74(globalCtx, arg1, arg2, arg3, &color1, &color2); + EffectSsKiraKira_SpawnSmall(globalCtx, arg1, arg2, arg3, &color1, &color2); } Vec3f D_80116268 = { 0.0f, -1.5f, 0.0f }; diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c index 2b5b1ccede..36aeadf5f1 100644 --- a/src/code/z_collision_check.c +++ b/src/code/z_collision_check.c @@ -1327,9 +1327,9 @@ void func_8005E10C(GlobalContext* globalCtx, Collider* collider, Vec3f* v) { Effect_Add(globalCtx, &sp24, EFFECT_SPARK, 0, 1, &D_8015DD68); } -void func_8005E26C(GlobalContext* globalCtx, Collider* collider, Vec3f* v) { - func_800299AC(globalCtx, v); - func_80062B80(globalCtx, v); +void func_8005E26C(GlobalContext* globalCtx, Collider* collider, Vec3f* pos) { + EffectSsSibuki_SpawnBurst(globalCtx, pos); + func_80062B80(globalCtx, pos); } void func_8005E2A4(GlobalContext* globalCtx, Collider* collider, Vec3f* v) { @@ -1345,7 +1345,7 @@ void func_8005E2EC(GlobalContext* globalCtx, ColliderBody* colliderBody, Collide flags = colliderBody->toucherFlags & 0x18; if (flags == 0 && collider->type != COLTYPE_METAL_SHIELD) { - func_80029CA4(globalCtx, 0, arg3); + EffectSsHitMark_SpawnFixedScale(globalCtx, 0, arg3); if (collider->actor == NULL) { Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_BOUND, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); return; @@ -1355,7 +1355,7 @@ void func_8005E2EC(GlobalContext* globalCtx, ColliderBody* colliderBody, Collide return; } if (flags == 0) { - func_80029CA4(globalCtx, 3, arg3); + EffectSsHitMark_SpawnFixedScale(globalCtx, 3, arg3); if (collider->actor == NULL) { func_80062D60(globalCtx, arg3); return; @@ -1364,7 +1364,7 @@ void func_8005E2EC(GlobalContext* globalCtx, ColliderBody* colliderBody, Collide return; } if (flags == 8) { - func_80029CA4(globalCtx, 0, arg3); + EffectSsHitMark_SpawnFixedScale(globalCtx, 0, arg3); if (collider->actor == NULL) { Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_BOUND, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); return; @@ -1374,7 +1374,7 @@ void func_8005E2EC(GlobalContext* globalCtx, ColliderBody* colliderBody, Collide return; } if (flags == 0x10) { - func_80029CA4(globalCtx, 1, arg3); + EffectSsHitMark_SpawnFixedScale(globalCtx, 1, arg3); if (collider->actor == NULL) { Audio_PlaySoundGeneral(NA_SE_IT_REFLECTION_WOOD, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); return; @@ -1443,13 +1443,13 @@ void func_8005E604(GlobalContext* globalCtx, Collider* left, ColliderBody* leftB func_80062E14(globalCtx, arg5, &left->actor->projectedPos); } } else if (D_8011DF40[right->type].unk01 != 5) { - func_80029CA4(globalCtx, D_8011DF40[right->type].unk01, arg5); + EffectSsHitMark_SpawnFixedScale(globalCtx, D_8011DF40[right->type].unk01, arg5); if ((rightBody->bumperFlags & 0x20) == 0) { func_8005E4F8(left, rightBody); } } } else { - func_80029CA4(globalCtx, 0, arg5); + EffectSsHitMark_SpawnFixedScale(globalCtx, 0, arg5); if (right->actor == NULL) { Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_BOUND, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); } else { diff --git a/src/code/z_eff_shield_particle.c b/src/code/z_eff_shield_particle.c index 42e3cde6c5..2d6763da15 100644 --- a/src/code/z_eff_shield_particle.c +++ b/src/code/z_eff_shield_particle.c @@ -113,7 +113,7 @@ s32 EffectShieldParticle_Update(void* thisx) { return 0; } -void EffectShieldParticle_GetColors(EffectShieldParticle* this, Color_RGBA8_n* primColor, Color_RGBA8_n* envColor) { +void EffectShieldParticle_GetColors(EffectShieldParticle* this, Color_RGBA8* primColor, Color_RGBA8* envColor) { s32 halfDuration; f32 ratio; @@ -153,8 +153,8 @@ void EffectShieldParticle_GetColors(EffectShieldParticle* this, Color_RGBA8_n* p void EffectShieldParticle_Draw(void* thisx, GraphicsContext* gfxCtx) { EffectShieldParticle* this = (EffectShieldParticle*)thisx; EffectShieldParticleElement* elem; - Color_RGBA8_n primColor; - Color_RGBA8_n envColor; + Color_RGBA8 primColor; + Color_RGBA8 envColor; OPEN_DISPS(gfxCtx, "../z_eff_shield_particle.c", 272); diff --git a/src/code/z_effect_soft_sprite.c b/src/code/z_effect_soft_sprite.c index 6f9a16f89e..4fa2abb885 100644 --- a/src/code/z_effect_soft_sprite.c +++ b/src/code/z_effect_soft_sprite.c @@ -69,7 +69,7 @@ void EffectSs_Delete(EffectSs* effectSs) { } if (effectSs->flags & 4) { - func_800F89E8(&effectSs->unk_2C); + func_800F89E8(&effectSs->vec); } EffectSs_Reset(effectSs); @@ -81,15 +81,15 @@ void EffectSs_Reset(EffectSs* effectSs) { effectSs->type = EFFECT_SS_TYPE_MAX; effectSs->accel.x = effectSs->accel.y = effectSs->accel.z = 0; effectSs->velocity.x = effectSs->velocity.y = effectSs->velocity.z = 0; - effectSs->unk_2C.x = effectSs->unk_2C.y = effectSs->unk_2C.z = 0; + effectSs->vec.x = effectSs->vec.y = effectSs->vec.z = 0; effectSs->pos.x = effectSs->pos.y = effectSs->pos.z = 0; effectSs->life = -1; effectSs->flags = 0; effectSs->priority = 128; effectSs->draw = NULL; effectSs->update = NULL; - effectSs->displayList = NULL; - effectSs->unk_3C = NULL; + effectSs->gfx = NULL; + effectSs->actor = NULL; for (i = 0; i < ARRAY_COUNT(effectSs->regs); i++) { effectSs->regs[i] = 0; diff --git a/src/code/z_effect_soft_sprite_old_init.c b/src/code/z_effect_soft_sprite_old_init.c index 86855420df..4fd31db0fd 100644 --- a/src/code/z_effect_soft_sprite_old_init.c +++ b/src/code/z_effect_soft_sprite_old_init.c @@ -1,38 +1,89 @@ #include #include #include "overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.h" +#include "overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.h" #include "overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.h" #include "overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.h" #include "overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.h" -#include "overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.h" #include "overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.h" -#include "overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h" +#include "overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.h" +#include "overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.h" +#include "overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.h" +#include "overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.h" +#include "overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.h" +#include "overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.h" +#include "overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.h" +#include "overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.h" +#include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" +#include "overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.h" +#include "overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.h" +#include "overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.h" +#include "overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.h" +#include "overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h" +#include "overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h" #include "overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h" +#include "overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.h" +#include "overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h" +#include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" +#include "overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.h" +#include "overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.h" +#include "overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.h" +#include "overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h" +#include "overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.h" +#include "overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.h" +#include "overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.h" +#include "overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.h" +#include "overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.h" #include "overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h" +#include "overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.h" -extern Color_RGBA8 D_801158DC; -extern Color_RGBA8 D_801158E0; -extern Color_RGBA8 D_801158E4; -extern Color_RGBA8 D_801158E8; -extern Color_RGBA8 D_801158EC; -extern Color_RGBA8 D_801158F0; -extern Color_RGBA8 D_801158F4; -extern Color_RGBA8 D_801158F8; +static Vec3f sZeroVec = { 0.0f, 0.0f, 0.0f }; -// sEmptyVec -extern Vec3f D_801158C0; // empty vector that seems to be used as a dummy when a specific field isnt needed +// effects that use this draw function are responsible for making sure their regs line up with the usage here -extern Color_RGBA8_n D_801158CC; -extern Color_RGBA8_n D_801158D0; +void EffectSs_DrawGEffect(GlobalContext* globalCtx, EffectSs* this, void* texture) { + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + f32 scale; + MtxF mfTrans; + MtxF mfScale; + MtxF mfResult; + MtxF mfTrans11DA0; + s32 pad1; + Mtx* mtx; + void* object; -// Draw utility for some G effects + object = globalCtx->objectCtx.status[this->rgObjBankIdx].segment; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80027F80.s") + OPEN_DISPS(gfxCtx, "../z_effect_soft_sprite_old_init.c", 196); + + scale = this->rgScale * 0.0025f; + SkinMatrix_SetTranslate(&mfTrans, this->pos.x, this->pos.y, this->pos.z); + SkinMatrix_SetScale(&mfScale, scale, scale, scale); + SkinMatrix_MtxFMtxFMult(&mfTrans, &globalCtx->mf_11DA0, &mfTrans11DA0); + SkinMatrix_MtxFMtxFMult(&mfTrans11DA0, &mfScale, &mfResult); + gSegments[6] = VIRTUAL_TO_PHYSICAL(object); + gSPSegment(oGfxCtx->polyXlu.p++, 0x06, object); + + mtx = SkinMatrix_MtxFToNewMtx(gfxCtx, &mfResult); + + if (mtx != NULL) { + gSPMatrix(oGfxCtx->polyXlu.p++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(texture)); + func_80094C50(gfxCtx); + gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, this->rgPrimColorR, this->rgPrimColorG, this->rgPrimColorB, + this->rgPrimColorA); + gDPSetEnvColor(oGfxCtx->polyXlu.p++, this->rgEnvColorR, this->rgEnvColorG, this->rgEnvColorB, + this->rgEnvColorA); + gSPDisplayList(oGfxCtx->polyXlu.p++, this->gfx); + } + + CLOSE_DISPS(gfxCtx, "../z_effect_soft_sprite_old_init.c", 243); +} // EffectSsDust Spawn Functions void EffectSsDust_Spawn(GlobalContext* globalCtx, u16 drawFlags, Vec3f* pos, Vec3f* velocity, Vec3f* accel, - Color_RGBA8_n* primColor, Color_RGBA8_n* envColor, s16 scale, s16 scaleStep, s16 life, + Color_RGBA8* primColor, Color_RGBA8* envColor, s16 scale, s16 scaleStep, s16 life, u8 updateMode) { EffectSsDustInitParams initParams; @@ -46,81 +97,86 @@ void EffectSsDust_Spawn(GlobalContext* globalCtx, u16 drawFlags, Vec3f* pos, Vec initParams.scaleStep = scaleStep; initParams.life = life; initParams.updateMode = updateMode; + EffectSs_Spawn(globalCtx, EFFECT_SS_DUST, 128, &initParams); } -void func_8002829C(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8_n* primColor, - Color_RGBA8_n* envColor, s16 scale, s16 scaleStep) { +void func_8002829C(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8* primColor, + Color_RGBA8* envColor, s16 scale, s16 scaleStep) { EffectSsDust_Spawn(globalCtx, 0, pos, velocity, accel, primColor, envColor, scale, scaleStep, 10, 0); } -void func_80028304(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8_n* primColor, - Color_RGBA8_n* envColor, s16 scale, s16 scaleStep) { +void func_80028304(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8* primColor, + Color_RGBA8* envColor, s16 scale, s16 scaleStep) { EffectSsDust_Spawn(globalCtx, 1, pos, velocity, accel, primColor, envColor, scale, scaleStep, 10, 0); } -void func_8002836C(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8_n* primColor, - Color_RGBA8_n* envColor, s16 scale, s16 scaleStep, s16 life) { +void func_8002836C(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8* primColor, + Color_RGBA8* envColor, s16 scale, s16 scaleStep, s16 life) { EffectSsDust_Spawn(globalCtx, 0, pos, velocity, accel, primColor, envColor, scale, scaleStep, life, 0); } -void func_800283D4(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8_n* primColor, - Color_RGBA8_n* envColor, s16 scale, s16 scaleStep, s16 life) { +void func_800283D4(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8* primColor, + Color_RGBA8* envColor, s16 scale, s16 scaleStep, s16 life) { EffectSsDust_Spawn(globalCtx, 1, pos, velocity, accel, primColor, envColor, scale, scaleStep, life, 0); } -void func_8002843C(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8_n* primColor, - Color_RGBA8_n* envColor, s16 scale, s16 scaleStep, s16 life) { +void func_8002843C(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8* primColor, + Color_RGBA8* envColor, s16 scale, s16 scaleStep, s16 life) { EffectSsDust_Spawn(globalCtx, 2, pos, velocity, accel, primColor, envColor, scale, scaleStep, life, 0); } // unused -void func_800284A4(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8_n* primColor, - Color_RGBA8_n* envColor, s16 scale, s16 scaleStep) { +void func_800284A4(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8* primColor, + Color_RGBA8* envColor, s16 scale, s16 scaleStep) { EffectSsDust_Spawn(globalCtx, 0, pos, velocity, accel, primColor, envColor, scale, scaleStep, 10, 1); } // unused -void func_80028510(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8_n* primColor, - Color_RGBA8_n* envColor, s16 scale, s16 scaleStep) { +void func_80028510(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8* primColor, + Color_RGBA8* envColor, s16 scale, s16 scaleStep) { EffectSsDust_Spawn(globalCtx, 1, pos, velocity, accel, primColor, envColor, scale, scaleStep, 10, 1); } +static Color_RGBA8 sDustBrownPrim = { 170, 130, 90, 255 }; +static Color_RGBA8 sDustBrownEnv = { 100, 60, 20, 255 }; + void func_8002857C(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel) { - EffectSsDust_Spawn(globalCtx, 4, pos, velocity, accel, &D_801158CC, &D_801158D0, 100, 5, 10, 0); + EffectSsDust_Spawn(globalCtx, 4, pos, velocity, accel, &sDustBrownPrim, &sDustBrownEnv, 100, 5, 10, 0); } // unused void func_800285EC(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel) { - EffectSsDust_Spawn(globalCtx, 5, pos, velocity, accel, &D_801158CC, &D_801158D0, 100, 5, 10, 0); + EffectSsDust_Spawn(globalCtx, 5, pos, velocity, accel, &sDustBrownPrim, &sDustBrownEnv, 100, 5, 10, 0); } void func_8002865C(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, s16 scaleStep) { - EffectSsDust_Spawn(globalCtx, 4, pos, velocity, accel, &D_801158CC, &D_801158D0, scale, scaleStep, 10, 0); + EffectSsDust_Spawn(globalCtx, 4, pos, velocity, accel, &sDustBrownPrim, &sDustBrownEnv, scale, scaleStep, 10, 0); } void func_800286CC(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, s16 scaleStep) { - EffectSsDust_Spawn(globalCtx, 5, pos, velocity, accel, &D_801158CC, &D_801158D0, scale, scaleStep, 10, 0); + EffectSsDust_Spawn(globalCtx, 5, pos, velocity, accel, &sDustBrownPrim, &sDustBrownEnv, scale, scaleStep, 10, 0); } void func_8002873C(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, s16 scaleStep, s16 life) { - EffectSsDust_Spawn(globalCtx, 4, pos, velocity, accel, &D_801158CC, &D_801158D0, scale, scaleStep, life, 0); + EffectSsDust_Spawn(globalCtx, 4, pos, velocity, accel, &sDustBrownPrim, &sDustBrownEnv, scale, scaleStep, life, 0); } void func_800287AC(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, s16 scaleStep, s16 life) { - EffectSsDust_Spawn(globalCtx, 5, pos, velocity, accel, &D_801158CC, &D_801158D0, scale, scaleStep, life, 0); + EffectSsDust_Spawn(globalCtx, 5, pos, velocity, accel, &sDustBrownPrim, &sDustBrownEnv, scale, scaleStep, life, 0); } -void func_8002881C(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8_n* primColor, - Color_RGBA8_n* envColor) { +// unused +void func_8002881C(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8* primColor, + Color_RGBA8* envColor) { func_8002829C(globalCtx, pos, velocity, accel, primColor, envColor, 100, 5); } // unused -void func_80028858(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8_n* primColor, - Color_RGBA8_n* envColor) { +void func_80028858(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8* primColor, + Color_RGBA8* envColor) { func_80028304(globalCtx, pos, velocity, accel, primColor, envColor, 100, 5); } @@ -171,26 +227,73 @@ void func_80028A54(GlobalContext* globalCtx, f32 randScale, Vec3f* srcPos) { // EffectSsKiraKira Spawn Functions -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028B18.s") +void EffectSsKiraKira_SpawnSmallYellow(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel) { + Color_RGBA8 primColor = { 255, 255, 200, 255 }; + Color_RGBA8 envColor = { 255, 200, 0, 0 }; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028B74.s") + EffectSsKiraKira_SpawnDispersed(globalCtx, pos, velocity, accel, &primColor, &envColor, 1000, 16); +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028BB0.s") +void EffectSsKiraKira_SpawnSmall(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, + Color_RGBA8* primColor, Color_RGBA8* envColor) { + EffectSsKiraKira_SpawnDispersed(globalCtx, pos, velocity, accel, primColor, envColor, 1000, 16); +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028CEC.s") +void EffectSsKiraKira_SpawnDispersed(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, + Color_RGBA8* primColor, Color_RGBA8* envColor, s16 scale, s32 life) { + EffectSsKiraKiraInitParams initParams; + + Math_Vec3f_Copy(&initParams.pos, pos); + Math_Vec3f_Copy(&initParams.velocity, velocity); + initParams.velocity.y = ((Math_Rand_ZeroOne() * initParams.velocity.y) + initParams.velocity.y) * 0.5f; + Math_Vec3f_Copy(&initParams.accel, accel); + initParams.accel.y = ((Math_Rand_ZeroOne() * initParams.accel.y) + initParams.accel.y) * 0.5f; + initParams.life = life; + initParams.updateMode = 0; + initParams.rotSpeed = 0x1518; + initParams.yaw = Math_Rand_ZeroOne() * 16384.0f; + initParams.scale = scale; + initParams.primColor = *primColor; + initParams.envColor = *envColor; + initParams.alphaStep = (-(255.0f / initParams.life)) + (-(255.0f / initParams.life)); + + EffectSs_Spawn(globalCtx, 1, 128, &initParams); +} + +void EffectSsKiraKira_SpawnFocused(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, + Color_RGBA8* primColor, Color_RGBA8* envColor, s16 scale, s32 life) { + EffectSsKiraKiraInitParams initParams; + + Math_Vec3f_Copy(&initParams.pos, pos); + Math_Vec3f_Copy(&initParams.velocity, velocity); + Math_Vec3f_Copy(&initParams.accel, accel); + initParams.life = life; + initParams.updateMode = 1; + initParams.rotSpeed = 0x1518; + initParams.yaw = Math_Rand_ZeroOne() * 16384.0f; + initParams.scale = scale; + Color_RGBA8_Copy(&initParams.primColor, primColor); + Color_RGBA8_Copy(&initParams.envColor, envColor); + initParams.alphaStep = (-(255.0f / initParams.life)) + (-(255.0f / initParams.life)); + + EffectSs_Spawn(globalCtx, 1, 128, &initParams); +} // EffectSsBomb Spawn Functions +// unused void EffectSsBomb_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel) { EffectSsBombInitParams initParams; Math_Vec3f_Copy(&initParams.pos, pos); Math_Vec3f_Copy(&initParams.velocity, velocity); Math_Vec3f_Copy(&initParams.accel, accel); + EffectSs_Spawn(globalCtx, EFFECT_SS_BOMB, 128, &initParams); } // EffectSsBomb2 Spawn Functions + // unused void EffectSsBomb2_SpawnFade(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel) { EffectSsBomb2InitParams initParams; @@ -201,6 +304,7 @@ void EffectSsBomb2_SpawnFade(GlobalContext* globalCtx, Vec3f* pos, Vec3f* veloci initParams.scale = 100; initParams.scaleStep = 0; initParams.drawMode = 0; + EffectSs_Spawn(globalCtx, EFFECT_SS_BOMB2, 10, &initParams); } @@ -214,219 +318,487 @@ void EffectSsBomb2_SpawnLayered(GlobalContext* globalCtx, Vec3f* pos, Vec3f* vel initParams.scale = scale; initParams.scaleStep = scaleStep; initParams.drawMode = 1; + EffectSs_Spawn(globalCtx, EFFECT_SS_BOMB2, 10, &initParams); } // EffectSsBlast Spawn Functions -void EffectSsBlast_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8* envColor, - Color_RGBA8* primColor, s16 radius, s16 radiusStep, s16 radiusStepDecr, s16 life) { +void EffectSsBlast_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8* primColor, + Color_RGBA8* envColor, s16 scale, s16 scaleStep, s16 sclaeStepDecay, s16 life) { EffectSsBlastParams initParams; Math_Vec3f_Copy(&initParams.pos, pos); Math_Vec3f_Copy(&initParams.velocity, velocity); Math_Vec3f_Copy(&initParams.accel, accel); - Color_RGBA8_Copy(&initParams.envColor, envColor); Color_RGBA8_Copy(&initParams.primColor, primColor); - initParams.radius = radius; - initParams.radiusStep = radiusStep; - initParams.radiusStepDecr = radiusStepDecr; + Color_RGBA8_Copy(&initParams.envColor, envColor); + initParams.scale = scale; + initParams.scaleStep = scaleStep; + initParams.sclaeStepDecay = sclaeStepDecay; initParams.life = life; + EffectSs_Spawn(globalCtx, EFFECT_SS_BLAST, 128, &initParams); } -void func_80028F84(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 radius, s16 radiusStep, - s16 life) { - EffectSsBlast_Spawn(globalCtx, pos, velocity, accel, &D_801158DC, &D_801158E0, radius, radiusStep, 35, life); +void EffectSsBlast_SpawnWhiteCustomScale(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, + s16 scaleStep, s16 life) { + static Color_RGBA8 primColor = { 255, 255, 255, 255 }; + static Color_RGBA8 envColor = { 200, 200, 200, 0 }; + + EffectSsBlast_Spawn(globalCtx, pos, velocity, accel, &primColor, &envColor, scale, scaleStep, 35, life); } -void func_80028FD8(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8* envColor, - Color_RGBA8* primColor, s16 life) { - EffectSsBlast_Spawn(globalCtx, pos, velocity, accel, envColor, primColor, 100, 375, 35, life); +void EffectSsBlast_SpawnShockwave(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, + Color_RGBA8* primColor, Color_RGBA8* envColor, s16 life) { + EffectSsBlast_Spawn(globalCtx, pos, velocity, accel, primColor, envColor, 100, 375, 35, life); } -void func_80029024(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel) { - func_80028FD8(globalCtx, pos, velocity, accel, &D_801158E4, &D_801158E8, 10); +void EffectSsBlast_SpawnWhiteShockwave(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel) { + static Color_RGBA8 primColor = { 255, 255, 255, 255 }; + static Color_RGBA8 envColor = { 200, 200, 200, 0 }; + + EffectSsBlast_SpawnShockwave(globalCtx, pos, velocity, accel, &primColor, &envColor, 10); } // EffectSsGSpk Spawn Functions -void func_80029060(GlobalContext* globalCtx, Actor* actor, Vec3f* pos, Vec3f* velocity, Vec3f* accel, - Color_RGBA8* envColor, Color_RGBA8* primColor, s16 scale, s16 scaleStep) { +void EffectSsGSpk_SpawnAccel(GlobalContext* globalCtx, Actor* actor, Vec3f* pos, Vec3f* velocity, Vec3f* accel, + Color_RGBA8* primColor, Color_RGBA8* envColor, s16 scale, s16 scaleStep) { EffectSsGSpkInitParams initParams; Math_Vec3f_Copy(&initParams.pos, pos); Math_Vec3f_Copy(&initParams.velocity, velocity); Math_Vec3f_Copy(&initParams.accel, accel); - Color_RGBA8_Copy(&initParams.primColor, envColor); - Color_RGBA8_Copy(&initParams.envColor, primColor); + Color_RGBA8_Copy(&initParams.primColor, primColor); + Color_RGBA8_Copy(&initParams.envColor, envColor); initParams.actor = actor; initParams.scale = scale; initParams.scaleStep = scaleStep; initParams.updateMode = 0; + EffectSs_Spawn(globalCtx, EFFECT_SS_G_SPK, 128, &initParams); } // unused -void func_800290F0(GlobalContext* globalCtx, Actor* actor, Vec3f* pos, Vec3f* velocity, Vec3f* accel, - Color_RGBA8* envColor, Color_RGBA8* primColor, s16 scale, s16 scaleStep) { +void EffectSsGSpk_SpawnNoAccel(GlobalContext* globalCtx, Actor* actor, Vec3f* pos, Vec3f* velocity, Vec3f* accel, + Color_RGBA8* primColor, Color_RGBA8* envColor, s16 scale, s16 scaleStep) { EffectSsGSpkInitParams initParams; Math_Vec3f_Copy(&initParams.pos, pos); Math_Vec3f_Copy(&initParams.velocity, velocity); Math_Vec3f_Copy(&initParams.accel, accel); - Color_RGBA8_Copy(&initParams.primColor, envColor); - Color_RGBA8_Copy(&initParams.envColor, primColor); + Color_RGBA8_Copy(&initParams.primColor, primColor); + Color_RGBA8_Copy(&initParams.envColor, envColor); initParams.actor = actor; initParams.scale = scale; initParams.scaleStep = scaleStep; initParams.updateMode = 1; + EffectSs_Spawn(globalCtx, EFFECT_SS_G_SPK, 128, &initParams); } -void func_80029184(GlobalContext* globalCtx, Actor* actor, Vec3f* pos, Vec3f* velocity, Vec3f* accel) { - Color_RGBA8 envColor = D_801158EC; // probably inline when data is migrated - Color_RGBA8 primColor = D_801158F0; // probably inline when data is migrated +void EffectSsGSpk_SpawnFuse(GlobalContext* globalCtx, Actor* actor, Vec3f* pos, Vec3f* velocity, Vec3f* accel) { + Color_RGBA8 primColor = { 255, 255, 150, 255 }; + Color_RGBA8 envColor = { 255, 0, 0, 0 }; - func_800292DC(globalCtx, actor, pos, velocity, accel, &envColor, &primColor); + EffectSsGSpk_SpawnSmall(globalCtx, actor, pos, velocity, accel, &primColor, &envColor); } // unused -void func_800291D8(GlobalContext* globalCtx, Actor* actor, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, - s16 scaleStep) { - Color_RGBA8 envColor = D_801158F4; // probably inline when data is migrated - Color_RGBA8 primColor = D_801158F8; // probably inline when data is migrated +void EffectSsGSpk_SpawnRandColor(GlobalContext* globalCtx, Actor* actor, Vec3f* pos, Vec3f* velocity, Vec3f* accel, + s16 scale, s16 scaleStep) { + Color_RGBA8 primColor = { 255, 255, 150, 255 }; + Color_RGBA8 envColor = { 255, 0, 0, 0 }; s32 randOffset; randOffset = (Math_Rand_ZeroOne() * 20.0f) - 10.0f; - envColor.r += randOffset; - envColor.g += randOffset; - envColor.b += randOffset; - envColor.a += randOffset; primColor.r += randOffset; primColor.g += randOffset; primColor.b += randOffset; primColor.a += randOffset; + envColor.r += randOffset; + envColor.g += randOffset; + envColor.b += randOffset; + envColor.a += randOffset; - func_80029060(globalCtx, actor, pos, velocity, accel, &envColor, &primColor, scale, scaleStep); + EffectSsGSpk_SpawnAccel(globalCtx, actor, pos, velocity, accel, &primColor, &envColor, scale, scaleStep); } -void func_800292DC(GlobalContext* globalCtx, Actor* actor, Vec3f* pos, Vec3f* velocity, Vec3f* accel, - Color_RGBA8* envColor, Color_RGBA8* primColor) { - func_80029060(globalCtx, actor, pos, velocity, accel, envColor, primColor, 100, 5); +void EffectSsGSpk_SpawnSmall(GlobalContext* globalCtx, Actor* actor, Vec3f* pos, Vec3f* velocity, Vec3f* accel, + Color_RGBA8* primColor, Color_RGBA8* envColor) { + EffectSsGSpk_SpawnAccel(globalCtx, actor, pos, velocity, accel, primColor, envColor, 100, 5); } // EffectSsDFire Spawn Functions -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029320.s") +void EffectSsDFire_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, s16 scaleStep, + s16 alpha, s16 fadeDelay, s32 life) { + EffectSsDFireInitParams initParams; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800293A0.s") + Math_Vec3f_Copy(&initParams.pos, pos); + Math_Vec3f_Copy(&initParams.velocity, velocity); + Math_Vec3f_Copy(&initParams.accel, accel); + initParams.scale = scale; + initParams.scaleStep = scaleStep; + initParams.alpha = alpha; + initParams.fadeDelay = fadeDelay; + initParams.life = life; + + EffectSs_Spawn(globalCtx, EFFECT_SS_D_FIRE, 128, &initParams); +} + +void EffectSsDFire_SpawnFixedScale(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 alpha, + s16 fadeDelay) { + EffectSsDFire_Spawn(globalCtx, pos, velocity, accel, 100, 35, alpha, fadeDelay, 8); +} // EffectSsBubble Spawn Functions -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800293E4.s") +void EffectSsBubble_Spawn(GlobalContext* globalCtx, Vec3f* pos, f32 yPosOffset, f32 yPosRandScale, f32 xzPosRandScale, + f32 scale) { + EffectSsBubbleInitParams initParams; + + Math_Vec3f_Copy(&initParams.pos, pos); + initParams.yPosOffset = yPosOffset; + initParams.yPosRandScale = yPosRandScale; + initParams.xzPosRandScale = xzPosRandScale; + initParams.scale = scale; + + EffectSs_Spawn(globalCtx, EFFECT_SS_BUBBLE, 128, &initParams); +} // EffectSsGRipple Spawn Functions -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029444.s") +void EffectSsGRipple_Spawn(GlobalContext* globalCtx, Vec3f* pos, s16 radius, s16 radiusMax, s16 life) { + EffectSsGRippleInitParams initParams; + + Math_Vec3f_Copy(&initParams.pos, pos); + initParams.radius = radius; + initParams.radiusMax = radiusMax; + initParams.life = life; + + EffectSs_Spawn(globalCtx, EFFECT_SS_G_RIPPLE, 128, &initParams); +} // EffectSsGSplash Spawn Functions -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002949C.s") +void EffectSsGSplash_Spawn(GlobalContext* globalCtx, Vec3f* pos, Color_RGBA8* primColor, Color_RGBA8* envColor, + s16 type, s16 scale) { + EffectSsGSplashInitParams initParams; + + Math_Vec3f_Copy(&initParams.pos, pos); + initParams.type = type; + initParams.scale = scale; + + if (primColor != NULL) { + initParams.primColor = *primColor; + initParams.envColor = *envColor; + initParams.customColor = true; + } else { + initParams.customColor = false; + } + + EffectSs_Spawn(globalCtx, EFFECT_SS_G_SPLASH, 128, &initParams); +} // EffectSsGMagma Spawn Functions -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029530.s") +void EffectSsGMagma_Spawn(GlobalContext* globalCtx, Vec3f* pos) { + EffectSsGMagmaInitParams initParams; + + Math_Vec3f_Copy(&initParams.pos, pos); + + EffectSs_Spawn(globalCtx, EFFECT_SS_G_MAGMA, 128, &initParams); +} // EffectSsGFire Spawn Functions -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029568.s") +void EffectSsGFire_Spawn(GlobalContext* globalCtx, Vec3f* pos) { + EffectSsGFireInitParams initParams; + + Math_Vec3f_Copy(&initParams.pos, pos); + + EffectSs_Spawn(globalCtx, EFFECT_SS_G_FIRE, 128, &initParams); +} // EffectSsLightning Spawn Functions -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800295A0.s") +void EffectSsLightning_Spawn(GlobalContext* globalCtx, Vec3f* pos, Color_RGBA8* primColor, Color_RGBA8* envColor, + s16 scale, s16 yaw, s16 life, s16 numBolts) { + EffectSsLightningInitParams initParams; + + Math_Vec3f_Copy(&initParams.pos, pos); + Color_RGBA8_Copy(&initParams.primColor, primColor); + Color_RGBA8_Copy(&initParams.envColor, envColor); + initParams.scale = scale; + initParams.yaw = yaw; + initParams.life = life; + initParams.numBolts = numBolts; + + EffectSs_Spawn(globalCtx, EFFECT_SS_LIGHTNING, 128, &initParams); +} // EffectSsDtBubble Spawn Functions -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029618.s") +void EffectSsDtBubble_SpawnColorProfile(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, + s16 life, s16 colorProfile, s16 randXZ) { + EffectSsDtBubbleInitParams initParams; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029694.s") + Math_Vec3f_Copy(&initParams.pos, pos); + Math_Vec3f_Copy(&initParams.velocity, velocity); + Math_Vec3f_Copy(&initParams.accel, accel); + initParams.customColor = false; + initParams.colorProfile = colorProfile; + initParams.scale = scale; + initParams.life = life; + initParams.randXZ = randXZ; + + EffectSs_Spawn(globalCtx, EFFECT_SS_DT_BUBBLE, 128, &initParams); +} + +void EffectSsDtBubble_SpawnCustomColor(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, + Color_RGBA8* primColor, Color_RGBA8* envColor, s16 scale, s16 life, s16 randXZ) { + EffectSsDtBubbleInitParams initParams; + + Math_Vec3f_Copy(&initParams.pos, pos); + Math_Vec3f_Copy(&initParams.velocity, velocity); + Math_Vec3f_Copy(&initParams.accel, accel); + Color_RGBA8_Copy(&initParams.primColor, primColor); + Color_RGBA8_Copy(&initParams.envColor, envColor); + initParams.scale = scale; + initParams.life = life; + initParams.randXZ = randXZ; + initParams.customColor = true; + + EffectSs_Spawn(globalCtx, EFFECT_SS_DT_BUBBLE, 128, &initParams); +} // EffectSsHahen Spawn Functions -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029724.s") +/** + * Spawn a single fragment + * + * Notes: + * - if a display list is not provided, D_0400C0D0 (wilted deku fragment) will be used as default + * - the unused arg does not do anything, any value can be passed here + * - due to how life is implemented it is capped at 200. Any value over 200 is accepted, but the fragment will + * only live for 200 frames + */ +void EffectSsHahen_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 unused, s16 scale, + s16 objId, s16 life, Gfx* dList) { + EffectSsHahenInitParams initParams; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800297A4.s") + Math_Vec3f_Copy(&initParams.pos, pos); + Math_Vec3f_Copy(&initParams.velocity, velocity); + Math_Vec3f_Copy(&initParams.accel, accel); + initParams.dList = dList; + initParams.unused = unused; + initParams.scale = scale; + initParams.objId = objId; + initParams.life = life; + + EffectSs_Spawn(globalCtx, EFFECT_SS_HAHEN, 128, &initParams); +} + +/** + * Spawn a burst of fragments, with the amount of fragments specifed by count and burst speed set by + * + * Notes: + * - if a display list is not provided, D_0400C0D0 (wilted deku fragment) will be used as default + * - the unused arg does not do anything, any value can be passed here + * - due to how life is implemented it is capped at 200. Any value over 200 is accepted, but the fragment will + * only live for 200 frames + */ +void EffectSsHahen_SpawnBurst(GlobalContext* globalCtx, Vec3f* pos, f32 burstScale, s16 unused, s16 scale, + s16 randScaleRange, s16 count, s16 objId, s16 life, Gfx* dList) { + s32 i; + Vec3f velocity; + Vec3f accel; + + accel.y = -0.07f * burstScale; + accel.x = accel.z = 0.0f; + + for (i = 0; i < count; i++) { + velocity.x = (Math_Rand_ZeroOne() - 0.5f) * burstScale; + velocity.z = (Math_Rand_ZeroOne() - 0.5f) * burstScale; + velocity.y = ((Math_Rand_ZeroOne() * 0.5f) + 0.5f) * burstScale; + + EffectSsHahen_Spawn(globalCtx, pos, &velocity, &accel, unused, Math_Rand_S16Offset(scale, randScaleRange), + objId, life, dList); + } +} // EffectSsStick Spawn Functions -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800298EC.s") +/** + * As child, spawn a broken stick fragment + * As adult, spawn a broken sword fragment + */ +void EffectSsStick_Spawn(GlobalContext* globalCtx, Vec3f* pos, s16 yaw) { + EffectSsStickInitParams initParams; + + initParams.pos = *pos; + initParams.yaw = yaw; + + EffectSs_Spawn(globalCtx, EFFECT_SS_STICK, 128, &initParams); +} // EffectSsSibuki Spawn Functions -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002993C.s") +void EffectSsSibuki_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 moveDelay, + s16 direction, s16 scale) { + EffectSsSibukiInitParams initParams; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800299AC.s") + Math_Vec3f_Copy(&initParams.pos, pos); + Math_Vec3f_Copy(&initParams.velocity, velocity); + Math_Vec3f_Copy(&initParams.accel, accel); + initParams.moveDelay = moveDelay; + initParams.direction = direction; + initParams.scale = scale; + + EffectSs_Spawn(globalCtx, EFFECT_SS_SIBUKI, 128, &initParams); +} + +void EffectSsSibuki_SpawnBurst(GlobalContext* globalCtx, Vec3f* pos) { + s16 i; + Vec3f unusedZeroVec1 = { 0.0f, 0.0f, 0.0f }; + Vec3f unusedZeroVec2 = { 0.0f, 0.0f, 0.0f }; + Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; + s16 randDirection = Math_Rand_ZeroOne() * 1.99f; + + for (i = 0; i < KREG(19) + 30; i++) { + EffectSsSibuki_Spawn(globalCtx, pos, &zeroVec, &zeroVec, i / (KREG(27) + 6), randDirection, KREG(18) + 40); + } +} // EffectSsSibuki2 Spawn Functions -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029B30.s") +// unused +void EffectSsSibuki2_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale) { + EffectSsSibuki2InitParams initParams; + + Math_Vec3f_Copy(&initParams.pos, pos); + Math_Vec3f_Copy(&initParams.velocity, velocity); + Math_Vec3f_Copy(&initParams.accel, accel); + initParams.scale = scale; + EffectSs_Spawn(globalCtx, EFFECT_SS_SIBUKI2, 128, &initParams); +} // EffectSsGMagma2 Spawn Functions -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029B90.s") +void EffectSsGMagma2_Spawn(GlobalContext* globalCtx, Vec3f* pos, Color_RGBA8* primColor, Color_RGBA8* envColor, + s16 updateRate, s16 drawMode, s16 scale) { + EffectSsGMagma2InitParams initParams; + + Math_Vec3f_Copy(&initParams.pos, pos); + Color_RGBA8_Copy(&initParams.primColor, primColor); + Color_RGBA8_Copy(&initParams.envColor, envColor); + initParams.updateRate = updateRate; + initParams.drawMode = drawMode; + initParams.scale = scale; + + EffectSs_Spawn(globalCtx, EFFECT_SS_G_MAGMA2, 128, &initParams); +} // EffectSsStone1 Spawn Functions -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029C00.s") +void EffectSsStone1_Spawn(GlobalContext* globalCtx, Vec3f* pos, s32 arg2) { + EffectSsStone1InitParams initParams; + + initParams.pos = *pos; + initParams.unk_C = arg2; + + EffectSs_Spawn(globalCtx, EFFECT_SS_STONE1, 128, &initParams); +} // EffectSsHitMark Spawn Functions -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029C50.s") +void EffectSsHitMark_Spawn(GlobalContext* globalCtx, s32 type, s16 scale, Vec3f* pos) { + EffectSsHitMarkInitParams initParams; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029CA4.s") + initParams.type = type; + initParams.scale = scale; + Math_Vec3f_Copy(&initParams.pos, pos); -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029CC8.s") + EffectSs_Spawn(globalCtx, EFFECT_SS_HITMARK, 128, &initParams); +} -void EffectSsFhgFlash_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 arg4, u8 arg5) { +void EffectSsHitMark_SpawnFixedScale(GlobalContext* globalCtx, s32 type, Vec3f* pos) { + EffectSsHitMark_Spawn(globalCtx, type, 300, pos); +} + +void EffectSsHitMark_SpawnCustomScale(GlobalContext* globalCtx, s32 type, s16 scale, Vec3f* pos) { + EffectSsHitMark_Spawn(globalCtx, type, scale, pos); +} + +// EffectSsFhgFlash Spawn Functions + +/** + * Spawn a light ball effect + * + * param changes the color of the ball. Refer to FhgFlashLightBallParam for the options. + * Note: this type requires OBJECT_FHG to be loaded + */ +void EffectSsFhgFlash_SpawnLightBall(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, + u8 param) { EffectSsFhgFlashInitParams initParams; Math_Vec3f_Copy(&initParams.pos, pos); Math_Vec3f_Copy(&initParams.velocity, velocity); Math_Vec3f_Copy(&initParams.accel, accel); - initParams.unk_24 = arg4; - initParams.unk_26 = arg5; - initParams.unk_2C = 0; + initParams.scale = scale; + initParams.param = param; + initParams.type = FHGFLASH_LIGHTBALL; EffectSs_Spawn(globalCtx, EFFECT_SS_FHG_FLASH, 128, &initParams); } -void EffectSsFhgFlash_Spawn2(GlobalContext* globalCtx, Actor* arg1, Vec3f* pos, s16 arg3, u8 arg4) { +/** + * Spawn a shock effect + * + * param determines where the ligntning should go + * 0: dont attach to any actor. spawns at the position specified by pos + * 1: spawn at one of Player's body parts, chosen at random + * 2: spawn at one of Phantom Ganon's body parts, chosen at random + */ +void EffectSsFhgFlash_SpawnShock(GlobalContext* globalCtx, Actor* actor, Vec3f* pos, s16 scale, u8 param) { EffectSsFhgFlashInitParams initParams; - initParams.unk_28 = arg1; + initParams.actor = actor; Math_Vec3f_Copy(&initParams.pos, pos); - initParams.unk_24 = arg3; - initParams.unk_26 = arg4; - initParams.unk_2C = 1; + initParams.scale = scale; + initParams.param = param; + initParams.type = FHGFLASH_SHOCK; + EffectSs_Spawn(globalCtx, EFFECT_SS_FHG_FLASH, 128, &initParams); } // EffectSsKFire Spawn Functions -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029DBC.s") +void EffectSsKFire_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scaleMax, u8 type) { + EffectSsKFireInitParams initParams; + + Math_Vec3f_Copy(&initParams.pos, pos); + Math_Vec3f_Copy(&initParams.velocity, velocity); + Math_Vec3f_Copy(&initParams.accel, accel); + initParams.scaleMax = scaleMax; + initParams.type = type; + + EffectSs_Spawn(globalCtx, EFFECT_SS_K_FIRE, 128, &initParams); +} // EffectSsSolderSrchBall Spawn Functions -void EffectSsSolderSrchBall_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 arg4, +void EffectSsSolderSrchBall_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 unused, s16* linkDetected) { EffectSsSolderSrchBallInitParams initParams; Math_Vec3f_Copy(&initParams.pos, pos); Math_Vec3f_Copy(&initParams.velocity, velocity); Math_Vec3f_Copy(&initParams.accel, accel); - initParams.unk_24 = arg4; + initParams.unused = unused; initParams.linkDetected = linkDetected; EffectSs_Spawn(globalCtx, EFFECT_SS_SOLDER_SRCH_BALL, 128, &initParams); @@ -434,35 +806,231 @@ void EffectSsSolderSrchBall_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* v // EffectSsKakera Spawn Functions -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029E8C.s") +void EffectSsKakera_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* arg3, s16 gravity, s16 arg5, + s16 arg6, s16 arg7, s16 arg8, s16 scale, s16 arg10, s16 arg11, s32 life, s16 colorIdx, + s16 objId, Gfx* dList) { + EffectSsKakeraInitParams initParams; + + Math_Vec3f_Copy(&initParams.pos, pos); + Math_Vec3f_Copy(&initParams.velocity, velocity); + Math_Vec3f_Copy(&initParams.unk_18, arg3); + initParams.gravity = gravity; + initParams.unk_26 = arg5; + initParams.unk_28 = arg6; + initParams.unk_2A = arg7; + initParams.unk_2C = arg8; + initParams.scale = scale; + initParams.unk_30 = arg10; + initParams.unk_32 = arg11; + initParams.life = life; + initParams.colorIdx = colorIdx; + initParams.objId = objId; + initParams.dList = dList; + + EffectSs_Spawn(globalCtx, EFFECT_SS_KAKERA, 101, &initParams); +} // EffectSsIcePiece Spawn Functions -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029F44.s") +void EffectSsIcePiece_Spawn(GlobalContext* globalCtx, Vec3f* pos, f32 scale, Vec3f* velocity, Vec3f* accel, s32 life) { + EffectSsIcePieceInitParams initParams; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029FAC.s") + Math_Vec3f_Copy(&initParams.pos, pos); + Math_Vec3f_Copy(&initParams.velocity, velocity); + Math_Vec3f_Copy(&initParams.accel, accel); + initParams.scale = scale; + initParams.life = life; + EffectSs_Spawn(globalCtx, 0x1A, 0x80, &initParams); +} + +void EffectSsIcePiece_SpawnBurst(GlobalContext* globalCtx, Vec3f* refPos, f32 scale) { + static Vec3f accel = { 0.0f, 0.0f, 0.0f }; + static Vec3f vecScales[] = { + { 0.0f, 70.0f, 0.0f }, + { 0.0f, 45.0f, 20.0f }, + { 17.320474f, 45.0f, 9.999695f }, + { 17.320474f, 45.0f, -9.999695f }, + { 0.0f, 45.0f, -20.0f }, + { -17.320474f, 45.0f, -9.999695f }, + { -17.320474f, 45.0f, 9.999695f }, + { 0.0f, 20.0f, 20.0f }, + { 17.320474f, 20.0f, -9.999695f }, + { -17.320474f, 20.0f, -9.999695f }, + }; + s32 i; + Vec3f velocity; + Vec3f pos; + f32 velocityScale; + + accel.y = -0.2f; + + for (i = 0; i < ARRAY_COUNT(vecScales); i++) { + pos = *refPos; + velocityScale = Math_Rand_ZeroFloat(1.0f) + 0.5f; + velocity.x = (vecScales[i].x * 0.18f) * velocityScale; + velocity.y = (vecScales[i].y * 0.18f) * velocityScale; + velocity.z = (vecScales[i].z * 0.18f) * velocityScale; + pos.x += vecScales[i].x; + pos.y += vecScales[i].y; + pos.z += vecScales[i].z; + + EffectSsIcePiece_Spawn(globalCtx, &pos, (Math_Rand_ZeroFloat(1.0f) + 0.5f) * ((scale * 1.3f) * 100.0f), + &velocity, &accel, 25); + } +} // EffectSsEnIce Spawn Functions -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A140.s") +void EffectSsEnIce_SpawnFlyingVec3f(GlobalContext* globalCtx, Actor* actor, Vec3f* pos, s16 primR, s16 primG, s16 primB, + s16 primA, s16 envR, s16 envG, s16 envB, f32 scale) { -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A1DC.s") + EffectSsEnIceInitParams initParams; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A2A4.s") + initParams.actor = actor; + Math_Vec3f_Copy(&initParams.pos, pos); + initParams.type = 0; + initParams.primColor.r = primR; + initParams.primColor.g = primG; + initParams.primColor.b = primB; + initParams.primColor.a = primA; + initParams.envColor.r = envR; + initParams.envColor.g = envG; + initParams.envColor.b = envB; + initParams.scale = scale; + + if (actor != NULL) { + Audio_PlayActorSound2(actor, NA_SE_PL_FREEZE_S); + } + + EffectSs_Spawn(globalCtx, EFFECT_SS_EN_ICE, 80, &initParams); +} + +void EffectSsEnIce_SpawnFlyingVec3s(GlobalContext* globalCtx, Actor* actor, Vec3s* pos, s16 primR, s16 primG, s16 primB, + s16 primA, s16 envR, s16 envG, s16 envB, f32 scale) { + + EffectSsEnIceInitParams initParams; + + initParams.actor = actor; + initParams.pos.x = pos->x; + initParams.pos.y = pos->y; + initParams.pos.z = pos->z; + initParams.primColor.r = primR; + initParams.primColor.g = primG; + initParams.primColor.b = primB; + initParams.primColor.a = primA; + initParams.envColor.r = envR; + initParams.envColor.g = envG; + initParams.envColor.b = envB; + initParams.type = 0; + initParams.scale = scale; + + if (actor != NULL) { + Audio_PlayActorSound2(actor, NA_SE_PL_FREEZE_S); + } + + EffectSs_Spawn(globalCtx, EFFECT_SS_EN_ICE, 80, &initParams); +} + +void EffectSsEnIce_Spawn(GlobalContext* globalCtx, Vec3f* pos, f32 scale, Vec3f* velocity, Vec3f* accel, + Color_RGBA8* primColor, Color_RGBA8* envColor, s32 life) { + EffectSsEnIceInitParams initParams; + + Math_Vec3f_Copy(&initParams.pos, pos); + Math_Vec3f_Copy(&initParams.velocity, velocity); + Math_Vec3f_Copy(&initParams.accel, accel); + Color_RGBA8_Copy(&initParams.primColor, primColor); + Color_RGBA8_Copy(&initParams.envColor, envColor); + initParams.scale = scale; + initParams.life = life; + initParams.type = 1; + + EffectSs_Spawn(globalCtx, EFFECT_SS_EN_ICE, 128, &initParams); +} // EffectSsFireTail Spawn Functions -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A32C.s") +void EffectSsFireTail_Spawn(GlobalContext* globalCtx, Actor* actor, Vec3f* pos, f32 scale, Vec3f* arg4, s16 arg5, + Color_RGBA8* primColor, Color_RGBA8* envColor, s16 type, s16 bodyPart, s32 life) { + EffectSsFireTailInitParams initParams; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A3C4.s") + Math_Vec3f_Copy(&initParams.pos, pos); + Math_Vec3f_Copy(&initParams.unk_14, arg4); + Color_RGBA8_Copy(&initParams.primColor, primColor); + Color_RGBA8_Copy(&initParams.envColor, envColor); + initParams.unk_20 = arg5; + initParams.actor = actor; + initParams.scale = scale; + initParams.type = type; + initParams.bodyPart = bodyPart; + initParams.life = life; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A484.s") + EffectSs_Spawn(globalCtx, EFFECT_SS_FIRE_TAIL, 128, &initParams); +} + +void EffectSsFireTail_SpawnFlame(GlobalContext* globalCtx, Actor* actor, Vec3f* pos, f32 arg3, s16 bodyPart, + f32 colorIntensity) { + static Color_RGBA8 primColor = { 255, 255, 0, 255 }; + static Color_RGBA8 envColor = { 255, 0, 0, 255 }; + + primColor.g = (s32)(255.0f * colorIntensity); + primColor.b = 0; + + envColor.g = 0; + envColor.b = 0; + primColor.r = envColor.r = (s32)(255.0f * colorIntensity); + + EffectSsFireTail_Spawn(globalCtx, actor, pos, arg3, &actor->velocity, 15, &primColor, &envColor, + (colorIntensity == 1.0f) ? 0 : 1, bodyPart, 1); +} + +void EffectSsFireTail_SpawnFlameOnPlayer(GlobalContext* globalCtx, f32 scale, s16 bodyPart, f32 colorIntensity) { + Player* player = PLAYER; + + EffectSsFireTail_SpawnFlame(globalCtx, &player->actor, &player->bodyPartsPos[bodyPart], scale, bodyPart, + colorIntensity); +} // EffectSsEnFire Spawn Functions -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A4D4.s") +// note: if bodyPart is greater than -1 the actor MUST have a table of Vec3f positions at offset 0x14C in the instance +void EffectSsEnFire_SpawnVec3f(GlobalContext* globalCtx, Actor* actor, Vec3f* pos, s16 scale, s16 arg4, s16 flags, + s16 bodyPart) { + EffectSsEnFireInitParams initParams; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A54C.s") + Math_Vec3f_Copy(&initParams.pos, pos); + initParams.actor = actor; + initParams.scale = scale; + initParams.unk_12 = arg4; + initParams.flags = flags; + initParams.bodyPart = bodyPart; + + if (actor != NULL) { + Audio_PlayActorSound2(actor, NA_SE_EV_FLAME_IGNITION); + } + + EffectSs_Spawn(globalCtx, EFFECT_SS_EN_FIRE, 128, &initParams); +} + +// note: if bodyPart is greater than -1 the actor MUST have a table of Vec3s positions at offset 0x14C in the instance +void EffectSsEnFire_SpawnVec3s(GlobalContext* globalCtx, Actor* actor, Vec3s* pos, s16 scale, s16 arg4, s16 flags, + s16 bodyPart) { + EffectSsEnFireInitParams initParams; + + initParams.pos.x = pos->x; + initParams.pos.y = pos->y; + initParams.pos.z = pos->z; + initParams.actor = actor; + initParams.scale = scale; + initParams.unk_12 = arg4; + initParams.flags = flags | 0x8000; + initParams.bodyPart = bodyPart; + + if (actor != NULL) { + Audio_PlayActorSound2(actor, NA_SE_EV_FLAME_IGNITION); + } + + EffectSs_Spawn(globalCtx, EFFECT_SS_EN_FIRE, 128, &initParams); +} // EffectSsExtra Spawn Functions @@ -474,28 +1042,111 @@ void EffectSsExtra_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Math_Vec3f_Copy(&initParams.accel, accel); initParams.scale = scale; initParams.scoreIdx = scoreIdx; + EffectSs_Spawn(globalCtx, EFFECT_SS_EXTRA, 100, &initParams); } // EffectSsFCircle Spawn Functions -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A65C.s") +void EffectSsFCircle_Spawn(GlobalContext* globalCtx, Actor* actor, Vec3f* pos, s16 radius, s16 height) { + EffectSsFcircleInitParams initParams; -// EffectSsDeadBb Spawn Functions + Math_Vec3f_Copy(&initParams.pos, pos); + initParams.actor = actor; + initParams.radius = radius; + initParams.height = height; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A6B8.s") + EffectSs_Spawn(globalCtx, EFFECT_SS_FCIRCLE, 128, &initParams); +} + +// EffectSsDeadDb Spawn Functions + +void EffectSsDeadDb_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, s16 scaleStep, + s16 primR, s16 primG, s16 primB, s16 primA, s16 envR, s16 envG, s16 envB, s16 unused, + s32 arg14, s16 playSound) { + EffectSsDeadDbInitParams initParams; + + Math_Vec3f_Copy(&initParams.pos, pos); + Math_Vec3f_Copy(&initParams.velocity, velocity); + Math_Vec3f_Copy(&initParams.accel, accel); + initParams.scale = scale; + initParams.scaleStep = scaleStep; + initParams.primColor.r = primR; + initParams.primColor.g = primG; + initParams.primColor.b = primB; + initParams.primColor.a = primA; + initParams.envColor.r = envR; + initParams.envColor.g = envG; + initParams.envColor.b = envB; + initParams.unused = unused; + initParams.unk_34 = arg14; + initParams.playSound = playSound; + + EffectSs_Spawn(globalCtx, EFFECT_SS_DEAD_DB, 120, &initParams); +} // EffectSsDeadDd Spawn Functions -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A770.s") +void EffectSsDeadDd_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, s16 scaleStep, + s16 primR, s16 primG, s16 primB, s16 alpha, s16 envR, s16 envG, s16 envB, s16 alphaStep, + s32 life) { + EffectSsDeadDdInitParams initParams; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A824.s") + Math_Vec3f_Copy(&initParams.pos, pos); + Math_Vec3f_Copy(&initParams.velocity, velocity); + Math_Vec3f_Copy(&initParams.accel, accel); + initParams.scale = scale; + initParams.type = 0; + initParams.scaleStep = scaleStep; + initParams.primColor.r = primR; + initParams.primColor.g = primG; + initParams.primColor.b = primB; + initParams.alpha = alpha; + initParams.envColor.r = envR; + initParams.envColor.g = envG; + initParams.envColor.b = envB; + initParams.alphaStep = alphaStep; + initParams.life = life; + + EffectSs_Spawn(globalCtx, EFFECT_SS_DEAD_DD, 120, &initParams); +} + +// unused +void EffectSsDeadDd_SpawnRandYellow(GlobalContext* globalCtx, Vec3f* pos, s16 scale, s16 scaleStep, f32 randPosScale, + s32 randIter, s32 life) { + EffectSsDeadDdInitParams initParams; + + Math_Vec3f_Copy(&initParams.pos, pos); + initParams.scale = scale; + initParams.scaleStep = scaleStep; + initParams.randPosScale = randPosScale; + initParams.randIter = randIter; + initParams.life = life; + initParams.type = 1; + + EffectSs_Spawn(globalCtx, EFFECT_SS_DEAD_DD, 120, &initParams); +} // EffectSsDeadDs Spawn Functions -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A894.s") +void EffectSsDeadDs_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, s16 scaleStep, + s16 alpha, s32 life) { + EffectSsDeadDsInitParams initParams; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A90C.s") + Math_Vec3f_Copy(&initParams.pos, pos); + Math_Vec3f_Copy(&initParams.velocity, velocity); + Math_Vec3f_Copy(&initParams.accel, accel); + initParams.scale = scale; + initParams.scaleStep = scaleStep; + initParams.alpha = alpha; + initParams.life = life; + EffectSs_Spawn(globalCtx, EFFECT_SS_DEAD_DS, 100, &initParams); +} + +void EffectSsDeadDs_SpawnStationary(GlobalContext* globalCtx, Vec3f* pos, s16 scale, s16 scaleStep, s16 alpha, + s32 life) { + EffectSsDeadDs_Spawn(globalCtx, pos, &sZeroVec, &sZeroVec, scale, scaleStep, alpha, life); +} // EffectSsDeadSound Spawn Functions @@ -520,9 +1171,23 @@ void EffectSsDeadSound_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* veloci void EffectSsDeadSound_SpawnStationary(GlobalContext* globalCtx, Vec3f* pos, u16 sfxId, s16 lowerPriority, s16 repeatMode, s32 life) { - EffectSsDeadSound_Spawn(globalCtx, pos, &D_801158C0, &D_801158C0, sfxId, lowerPriority, repeatMode, life); + EffectSsDeadSound_Spawn(globalCtx, pos, &sZeroVec, &sZeroVec, sfxId, lowerPriority, repeatMode, life); } // EffectSsIceSmoke Spawn Functions -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002AA44.s") +/** + * Spawn an Ice Smoke effect + * + * Note: this effect requires OBJECT_FZ to be loaded + */ +void EffectSsIceSmoke_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale) { + EffectSsIceSmokeInitParams initParams; + + Math_Vec3f_Copy(&initParams.pos, pos); + Math_Vec3f_Copy(&initParams.velocity, velocity); + Math_Vec3f_Copy(&initParams.accel, accel); + initParams.scale = scale; + + EffectSs_Spawn(globalCtx, EFFECT_SS_ICE_SMOKE, 128, &initParams); +} diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c index 22436eace8..64a8dc4dc5 100644 --- a/src/code/z_en_item00.c +++ b/src/code/z_en_item00.c @@ -1,5 +1,6 @@ #include #include +#include "overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h" #define FLAGS 0x00000000 @@ -336,7 +337,7 @@ void func_8001E1C8(EnItem00* this, GlobalContext* globalCtx) { pos.x = this->actor.posRot.pos.x + Math_Rand_CenteredFloat(10.0f); pos.y = this->actor.posRot.pos.y + Math_Rand_CenteredFloat(10.0f); pos.z = this->actor.posRot.pos.z + Math_Rand_CenteredFloat(10.0f); - func_80028B74(globalCtx, &pos, &D_80115518, &D_80115524, &D_80115510, &D_80115514); + EffectSsKiraKira_SpawnSmall(globalCtx, &pos, &D_80115518, &D_80115524, &D_80115510, &D_80115514); } if (this->actor.bgCheckFlags & 0x0003) { @@ -394,7 +395,7 @@ void func_8001E304(EnItem00* this, GlobalContext* globalCtx) { pos.x = this->actor.posRot.pos.x + (Math_Rand_ZeroOne() - 0.5f) * 10.0f; pos.y = this->actor.posRot.pos.y + (Math_Rand_ZeroOne() - 0.5f) * 10.0f; pos.z = this->actor.posRot.pos.z + (Math_Rand_ZeroOne() - 0.5f) * 10.0f; - func_80028B74(globalCtx, &pos, &D_80115518, &D_80115524, &D_80115510, &D_80115514); + EffectSsKiraKira_SpawnSmall(globalCtx, &pos, &D_80115518, &D_80115524, &D_80115510, &D_80115514); } if (this->actor.bgCheckFlags & 0x0003) { @@ -877,7 +878,8 @@ EnItem00* Item_DropCollectible(GlobalContext* globalCtx, Vec3f* spawnPos, s16 pa // TODO: Prevent the cast to EnItem00 here since this is a different actor (En_Elf) spawnedActor = (EnItem00*)Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ELF, spawnPos->x, spawnPos->y + 40.0f, spawnPos->z, 0, 0, 0, 0x0002); - EffectSsDeadSound_SpawnStationary(globalCtx, spawnPos, NA_SE_EV_BUTTERFRY_TO_FAIRY, 1, 1, 40); + EffectSsDeadSound_SpawnStationary(globalCtx, spawnPos, NA_SE_EV_BUTTERFRY_TO_FAIRY, true, + DEADSOUND_REPEAT_MODE_OFF, 40); } else { if (!param8000) { params = func_8001F404(params & 0x00FF); @@ -920,7 +922,8 @@ EnItem00* Item_DropCollectible2(GlobalContext* globalCtx, Vec3f* spawnPos, s16 p // TODO: Prevent the cast to EnItem00 here since this is a different actor (En_Elf) spawnedActor = (EnItem00*)Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ELF, spawnPos->x, spawnPos->y + 40.0f, spawnPos->z, 0, 0, 0, 0x0002); - EffectSsDeadSound_SpawnStationary(globalCtx, spawnPos, NA_SE_EV_BUTTERFRY_TO_FAIRY, 1, 1, 40); + EffectSsDeadSound_SpawnStationary(globalCtx, spawnPos, NA_SE_EV_BUTTERFRY_TO_FAIRY, true, + DEADSOUND_REPEAT_MODE_OFF, 40); } else { params = func_8001F404(params & 0x00FF); if (params != -1) { @@ -989,7 +992,8 @@ void Item_DropCollectibleRandom(GlobalContext* globalCtx, Actor* fromActor, Vec3 if (gSaveContext.health <= 0x10) { // 1 heart or less Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ELF, spawnPos->x, spawnPos->y + 40.0f, spawnPos->z, 0, 0, 0, 0x0002); - EffectSsDeadSound_SpawnStationary(globalCtx, spawnPos, NA_SE_EV_BUTTERFRY_TO_FAIRY, 1, 1, 40); + EffectSsDeadSound_SpawnStationary(globalCtx, spawnPos, NA_SE_EV_BUTTERFRY_TO_FAIRY, true, + DEADSOUND_REPEAT_MODE_OFF, 40); return; } else if (gSaveContext.health <= 0x30) { // 3 hearts or less params = 0xB * 0x10; diff --git a/src/code/z_fbdemo_fade.c b/src/code/z_fbdemo_fade.c index f93719f20e..74d218caad 100644 --- a/src/code/z_fbdemo_fade.c +++ b/src/code/z_fbdemo_fade.c @@ -82,7 +82,7 @@ void TransitionFade_Update(TransitionFade* this, s32 updateRate) { void TransitionFade_Draw(TransitionFade* this, Gfx** gfxP) { Gfx* gfx; - Color_RGBA8* color; + Color_RGBA8_u32* color; if (this->fadeColor.a > 0) { color = &this->fadeColor; gfx = *gfxP; diff --git a/src/code/z_lights.c b/src/code/z_lights.c index 50e351aa4d..5fc5b1b0d2 100644 --- a/src/code/z_lights.c +++ b/src/code/z_lights.c @@ -142,7 +142,7 @@ void Lights_BindDirectional(Lights* lights, LightParams* params, Vec3f* vec) { } } -/* +/** * For every light in a provided list, try to find a free slot in the provided Lights group and bind * a light to it. Then apply color and positional/directional info for each light * based on the parameters supplied by the node. @@ -216,7 +216,7 @@ void func_8007A698(LightContext* lightCtx, u8 arg1, u8 arg2, u8 arg3, s16 numLig lightCtx->unk_0C = arg5; } -/* +/** * Allocate a new Lights group and initilize the ambient color with that provided by LightContext */ Lights* LightContext_NewLights(LightContext* lightCtx, GraphicsContext* gfxCtx) { @@ -234,7 +234,7 @@ void LightContext_DestroyList(GlobalContext* globalCtx, LightContext* lightCtx) } } -/* +/** * Insert a new light into the list pointed to by LightContext * * Note: Due to the limited number of slots in a Lights group, inserting too many lights in the diff --git a/src/code/z_play.c b/src/code/z_play.c index 20b04d86ce..20c2567bd5 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -9,7 +9,7 @@ Input* D_8012D1F8 = NULL; TransitionUnk sTrnsnUnk; s32 gTrnsnUnkState; VisMono D_80161498; -Color_RGBA8 D_801614B0; +Color_RGBA8_u32 D_801614B0; FaultClient D_801614B8; s16 D_801614C8; u64 D_801614D0[0xA00]; @@ -1158,7 +1158,8 @@ void Gameplay_Draw(GlobalContext* globalCtx) { oGfxCtx->polyOpa.p = sp88; goto Gameplay_Draw_DrawOverlayElements; } else { - PreRender_SetValues(&globalCtx->preRenderCtx, SCREEN_WIDTH, SCREEN_HEIGHT, gfxCtx->curFrameBuffer, gZBuffer); + PreRender_SetValues(&globalCtx->preRenderCtx, SCREEN_WIDTH, SCREEN_HEIGHT, gfxCtx->curFrameBuffer, + gZBuffer); if (R_PAUSE_MENU_MODE == 2) { MsgEvent_SendNullTask(); diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index ba65241a60..7bdacf68b3 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -703,7 +703,7 @@ void func_8008F87C(GlobalContext* globalCtx, Player* this, SkelAnime* skelAnime, s32 thighLimbIndex, s32 shinLimbIndex, s32 footLimbIndex) { Vec3f spA4; Vec3f sp98; - Vec3f sp8C; + Vec3f footprintPos; CollisionPoly* sp88; UNK_TYPE sp84; f32 sp80; @@ -737,12 +737,12 @@ void func_8008F87C(GlobalContext* globalCtx, Player* this, SkelAnime* skelAnime, Matrix_JointPosition(&D_80126038[(void)0, gSaveContext.linkAge], &skelAnime->limbDrawTbl[shinLimbIndex]); Matrix_Translate(D_80126050[(void)0, gSaveContext.linkAge], 0.0f, 0.0f, MTXMODE_APPLY); Matrix_MultVec3f(&D_8012602C, &sp98); - Matrix_MultVec3f(&D_80126070, &sp8C); + Matrix_MultVec3f(&D_80126070, &footprintPos); Matrix_Pull(); - sp8C.y += 15.0f; + footprintPos.y += 15.0f; - sp80 = func_8003C9A4(&globalCtx->colCtx, &sp88, &sp84, &this->actor, &sp8C) + sp74; + sp80 = func_8003C9A4(&globalCtx->colCtx, &sp88, &sp84, &this->actor, &footprintPos) + sp74; if (sp98.y < sp80) { sp70 = sp98.x - spA4.x; @@ -786,8 +786,8 @@ void func_8008F87C(GlobalContext* globalCtx, Player* this, SkelAnime* skelAnime, temp3 = func_80041D4C(&globalCtx->colCtx, sp88, sp84); if ((temp3 >= 2) && (temp3 < 4) && !func_80042108(&globalCtx->colCtx, sp88, sp84)) { - sp8C.y = sp80; - func_80029568(globalCtx, &sp8C); + footprintPos.y = sp80; + EffectSsGFire_Spawn(globalCtx, &footprintPos); } } } diff --git a/src/libultra_boot_O1/osViModePalLan1.c b/src/libultra_boot_O1/osViModePalLan1.c index 770f2ca9b4..30df53a7d2 100644 --- a/src/libultra_boot_O1/osViModePalLan1.c +++ b/src/libultra_boot_O1/osViModePalLan1.c @@ -4,15 +4,15 @@ OSViMode osViModePalLan1 = { 0x10, // type { // comRegs - 0x311E, // ctrl - SCREEN_WIDTH, // width - 0x4541E3A, // burst - 0x271, // vSync - 0x170C69, // hSync - 0xC6F0C6D, // leap - 0x800300, // hStart - 0x200, // xScale - 0 // vCurrent + 0x311E, // ctrl + SCREEN_WIDTH, // width + 0x4541E3A, // burst + 0x271, // vSync + 0x170C69, // hSync + 0xC6F0C6D, // leap + 0x800300, // hStart + 0x200, // xScale + 0 // vCurrent }, { // fldRegs { diff --git a/src/libultra_boot_O2/osViModeFpalLan1.c b/src/libultra_boot_O2/osViModeFpalLan1.c index d7f97d8f0c..357b5837aa 100644 --- a/src/libultra_boot_O2/osViModeFpalLan1.c +++ b/src/libultra_boot_O2/osViModeFpalLan1.c @@ -4,15 +4,15 @@ OSViMode osViModeFpalLan1 = { 0x2C, // type { // comRegs - 0x311E, // ctrl - SCREEN_WIDTH, // width - 0x4541E3A, // burst - 0x271, // vSync - 0x170C69, // hSync - 0xC6F0C6D, // leap - 0x800300, // hStart - 0x200, // xScale - 0 // vCurrent + 0x311E, // ctrl + SCREEN_WIDTH, // width + 0x4541E3A, // burst + 0x271, // vSync + 0x170C69, // hSync + 0xC6F0C6D, // leap + 0x800300, // hStart + 0x200, // xScale + 0 // vCurrent }, { // fldRegs { diff --git a/src/libultra_boot_O2/osViModeMpalLan1.c b/src/libultra_boot_O2/osViModeMpalLan1.c index 09b482c1c8..5e75ea39aa 100644 --- a/src/libultra_boot_O2/osViModeMpalLan1.c +++ b/src/libultra_boot_O2/osViModeMpalLan1.c @@ -4,15 +4,15 @@ OSViMode osViModeMpalLan1 = { 0x1E, // type { // comRegs - 0x311E, // ctrl - SCREEN_WIDTH, // width - 0x4651E39, // burst - 0x20D, // vSync - 0x40C11, // hSync - 0xC190C1A, // leap - 0x6C02EC, // hStart - 0x200, // xScale - 0, // vCurrent + 0x311E, // ctrl + SCREEN_WIDTH, // width + 0x4651E39, // burst + 0x20D, // vSync + 0x40C11, // hSync + 0xC190C1A, // leap + 0x6C02EC, // hStart + 0x200, // xScale + 0, // vCurrent }, { // fldRegs { diff --git a/src/libultra_boot_O2/osViModeNtscLan1.c b/src/libultra_boot_O2/osViModeNtscLan1.c index f0ed3c6cd7..267c5eaf0d 100644 --- a/src/libultra_boot_O2/osViModeNtscLan1.c +++ b/src/libultra_boot_O2/osViModeNtscLan1.c @@ -4,15 +4,15 @@ OSViMode osViModeNtscLan1 = { 2, // type { // comRegs - 0x311E, // ctrl - SCREEN_WIDTH, // width - 0x3E52239, // burst - 0x20D, // vSync - 0xC15, // hSync - 0xC150C15, // leap - 0x6C02EC, // hStart - 0x200, // xScale - 0, // vCurrent + 0x311E, // ctrl + SCREEN_WIDTH, // width + 0x3E52239, // burst + 0x20D, // vSync + 0xC15, // hSync + 0xC150C15, // leap + 0x6C02EC, // hStart + 0x200, // xScale + 0, // vCurrent }, { // fldRegs { diff --git a/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c b/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c index 05197584ce..c62f0b6a3f 100644 --- a/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c +++ b/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c @@ -15,11 +15,12 @@ void BgDdanJd_Destroy(Actor* thisx, GlobalContext* globalCtx); void BgDdanJd_Update(Actor* thisx, GlobalContext* globalCtx); void BgDdanJd_Draw(Actor* thisx, GlobalContext* globalCtx); -void func_80870B88(BgDdanJd* this, GlobalContext* globalCtx); -void func_80870D2C(BgDdanJd* this, GlobalContext* globalCtx); -void func_80870F00(BgDdanJd* this, GlobalContext* globalCtx); +void BgDdanJd_Idle(BgDdanJd* this, GlobalContext* globalCtx); +void BgDdanJd_Move(BgDdanJd* this, GlobalContext* globalCtx); + +extern Gfx D_060037B8[]; +extern ColHeader D_06003CE0; -/* const ActorInit Bg_Ddan_Jd_InitVars = { ACTOR_BG_DDAN_JD, ACTORTYPE_BG, @@ -31,17 +32,152 @@ const ActorInit Bg_Ddan_Jd_InitVars = { (ActorFunc)BgDdanJd_Update, (ActorFunc)BgDdanJd_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/BgDdanJd_Init.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/BgDdanJd_Destroy.s") +static InitChainEntry sInitChain[] = { + ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/func_80870B88.s") +typedef enum { + STATE_GO_BOTTOM, + STATE_GO_MIDDLE_FROM_BOTTOM, + STATE_GO_MIDDLE_FROM_TOP, + STATE_GO_TOP, +} BgDdanJdState; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/func_80870D2C.s") +#define MOVE_HEIGHT_MIDDLE 140.0f +#define MOVE_HEIGHT_TOP 700.0f -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/func_80870F00.s") +#define IDLE_FRAMES 100 -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/BgDdanJd_Update.s") +// Since ySpeed is used to determine if the platform should rise to the top of the dungeon, these must be assigned +// different values in order for the shortcut to work correctly +#define DEFAULT_Y_SPEED 1 +#define SHORTCUT_Y_SPEED 5 -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/BgDdanJd_Draw.s") +void BgDdanJd_Init(Actor* thisx, GlobalContext* globalCtx) { + BgDdanJd* this = THIS; + s32 pad; + ColHeader* colHeader = NULL; + + Actor_ProcessInitChain(thisx, sInitChain); + DynaPolyInfo_SetActorMove(thisx, DPM_PLAYER); + DynaPolyInfo_Alloc(&D_06003CE0, &colHeader); + this->dyna.dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, thisx, colHeader); + this->idleTimer = IDLE_FRAMES; + this->state = STATE_GO_BOTTOM; + + // Missing check for actor.params < 0x40. This will cause inconsistent behavior if params >= 0x40 and the bound + // switch state is turned on while in the same room, as the shortcut behavior won't become enabled until the actor + // is reloaded. + if (Flags_GetSwitch(globalCtx, this->dyna.actor.params)) { + this->ySpeed = SHORTCUT_Y_SPEED; + } else { + this->ySpeed = DEFAULT_Y_SPEED; + } + this->actionFunc = BgDdanJd_Idle; +} + +void BgDdanJd_Destroy(Actor* thisx, GlobalContext* globalCtx) { + BgDdanJd* this = THIS; + + DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); +} + +void BgDdanJd_Idle(BgDdanJd* this, GlobalContext* globalCtx) { + if (this->idleTimer != 0) { + this->idleTimer--; + } + + // if this is the platform that rises all the way to the top, and the switch state has just changed to on + if (this->ySpeed == DEFAULT_Y_SPEED && this->dyna.actor.params < 0x40 && + Flags_GetSwitch(globalCtx, this->dyna.actor.params)) { + this->ySpeed = SHORTCUT_Y_SPEED; + this->state = STATE_GO_MIDDLE_FROM_BOTTOM; + this->idleTimer = 0; + this->dyna.actor.posRot.pos.y = this->dyna.actor.initPosRot.pos.y + MOVE_HEIGHT_MIDDLE; + func_800800F8(globalCtx, 0xBF4, -0x63, &this->dyna.actor, 0); + } + if (this->idleTimer == 0) { + this->idleTimer = IDLE_FRAMES; + if (this->state == STATE_GO_BOTTOM) { + this->state = STATE_GO_MIDDLE_FROM_BOTTOM; + this->targetY = this->dyna.actor.initPosRot.pos.y + MOVE_HEIGHT_MIDDLE; + } else if (this->state == STATE_GO_MIDDLE_FROM_BOTTOM) { + // If the platform has been activated as a shortcut + if (this->ySpeed != DEFAULT_Y_SPEED) { + this->state = STATE_GO_TOP; + this->targetY = this->dyna.actor.initPosRot.pos.y + MOVE_HEIGHT_TOP; + } else { + this->state = STATE_GO_BOTTOM; + this->targetY = this->dyna.actor.initPosRot.pos.y; + } + } else if (this->state == STATE_GO_MIDDLE_FROM_TOP) { + // If the platform has been activated as a shortcut + if (this->ySpeed != DEFAULT_Y_SPEED) { + this->state = STATE_GO_TOP; + this->targetY = this->dyna.actor.initPosRot.pos.y + MOVE_HEIGHT_TOP; + } else { + this->state = STATE_GO_BOTTOM; + this->targetY = this->dyna.actor.initPosRot.pos.y; + } + } else if (this->state == STATE_GO_TOP) { + this->state = STATE_GO_MIDDLE_FROM_TOP; + this->targetY = this->dyna.actor.initPosRot.pos.y + MOVE_HEIGHT_MIDDLE; + } + this->actionFunc = BgDdanJd_Move; + } +} + +// Handles dust particles and sfx when moving +void BgDdanJd_MoveEffects(BgDdanJd* this, GlobalContext* globalCtx) { + Vec3f dustPos; + + // Generate random dust particles at the platform's base. + dustPos.y = this->dyna.actor.initPosRot.pos.y; + if (globalCtx->gameplayFrames & 1) { + dustPos.x = this->dyna.actor.posRot.pos.x + 65.0f; + dustPos.z = Math_Rand_CenteredFloat(110.0f) + this->dyna.actor.posRot.pos.z; + func_80033480(globalCtx, &dustPos, 5.0f, 1, 20, 60, 1); + dustPos.x = this->dyna.actor.posRot.pos.x - 65.0f; + dustPos.z = Math_Rand_CenteredFloat(110.0f) + this->dyna.actor.posRot.pos.z; + func_80033480(globalCtx, &dustPos, 5.0f, 1, 20, 60, 1); + } else { + dustPos.x = Math_Rand_CenteredFloat(110.0f) + this->dyna.actor.posRot.pos.x; + dustPos.z = this->dyna.actor.posRot.pos.z + 65.0f; + func_80033480(globalCtx, &dustPos, 5.0f, 1, 20, 60, 1); + dustPos.x = Math_Rand_CenteredFloat(110.0f) + this->dyna.actor.posRot.pos.x; + dustPos.z = this->dyna.actor.posRot.pos.z - 65.0f; + func_80033480(globalCtx, &dustPos, 5.0f, 1, 20, 60, 1); + } + if (this->ySpeed == SHORTCUT_Y_SPEED) { + func_8002F974(&this->dyna.actor, NA_SE_EV_ELEVATOR_MOVE - SFX_FLAG); + } +} + +// Implements the platform's movement state +void BgDdanJd_Move(BgDdanJd* this, GlobalContext* globalCtx) { + // if this is the platform that rises all the way to the top, and the switch state has just changed to on + if (this->ySpeed == DEFAULT_Y_SPEED && this->dyna.actor.params < 0x40 && + Flags_GetSwitch(globalCtx, this->dyna.actor.params)) { + this->ySpeed = SHORTCUT_Y_SPEED; + this->state = STATE_GO_MIDDLE_FROM_BOTTOM; + this->dyna.actor.posRot.pos.y = this->dyna.actor.initPosRot.pos.y + MOVE_HEIGHT_MIDDLE; + this->idleTimer = 0; + this->actionFunc = BgDdanJd_Idle; + func_800800F8(globalCtx, 0xBF4, -0x63, &this->dyna.actor, 0); + } else if (Math_ApproxF(&this->dyna.actor.posRot.pos.y, this->targetY, this->ySpeed)) { + Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_PILLAR_MOVE_STOP); + this->actionFunc = BgDdanJd_Idle; + } + BgDdanJd_MoveEffects(this, globalCtx); +} + +void BgDdanJd_Update(Actor* thisx, GlobalContext* globalCtx) { + BgDdanJd* this = THIS; + + this->actionFunc(this, globalCtx); +} + +void BgDdanJd_Draw(Actor* thisx, GlobalContext* globalCtx) { + Gfx_DrawDListOpa(globalCtx, D_060037B8); +} diff --git a/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.h b/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.h index 4a90057055..4da8716eaa 100644 --- a/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.h +++ b/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.h @@ -11,7 +11,10 @@ typedef void (*BgDdanJdActionFunc)(struct BgDdanJd*, GlobalContext*); typedef struct BgDdanJd { /* 0x0000 */ DynaPolyActor dyna; /* 0x0164 */ BgDdanJdActionFunc actionFunc; - /* 0x0168 */ char unk_168[0x8]; + /* 0x0168 */ u8 state; + /* 0x0169 */ u8 ySpeed; // also differentiates between normal and shortcut platform behavior + /* 0x016A */ s16 idleTimer; + /* 0x016C */ f32 targetY; } BgDdanJd; // size = 0x0170 extern const ActorInit Bg_Ddan_Jd_InitVars; diff --git a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c index bc3a537f5a..07178bf96d 100644 --- a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c +++ b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c @@ -47,11 +47,28 @@ static ColliderCylinderInit sColCylinderInit1 = { s16 sHasParent = false; -Color_RGBA8_n D_8087259C = { 100, 100, 100, 0 }; -Color_RGBA8_n D_808725A0 = { 40, 40, 40, 0 }; +extern Gfx D_60013500[]; +extern UNK_TYPE D_06001DDC; -static Vec3f sVelocity = { 0.0f, -1.5f, 0.0f }; -static Vec3f sAcceleration = { 0.0f, -0.2f, 0.0f }; +void BgDodoago_SetupAction(BgDodoago* this, BgDodoagoActionFunc actionFunc) { + this->actionFunc = actionFunc; +} + +void BgDodoago_SpawnSparkles(Vec3f* vec, GlobalContext* globalCtx) { + Vec3f pos; + Color_RGBA8 primColor = { 100, 100, 100, 0 }; + Color_RGBA8 envColor = { 40, 40, 40, 0 }; + static Vec3f velocity = { 0.0f, -1.5f, 0.0f }; + static Vec3f acceleration = { 0.0f, -0.2f, 0.0f }; + s32 i; + + for (i = 4; i > 0; i--) { + pos.x = Math_Rand_CenteredFloat(20.0f) + vec->x; + pos.y = Math_Rand_CenteredFloat(10.0f) + vec->y; + pos.z = Math_Rand_CenteredFloat(20.0f) + vec->z; + EffectSsKiraKira_SpawnSmall(globalCtx, &pos, &velocity, &acceleration, &primColor, &envColor); + } +} static InitChainEntry D_808725BC[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), @@ -60,30 +77,10 @@ static InitChainEntry D_808725BC[] = { ICHAIN_F32(uncullZoneDownward, 800, ICHAIN_STOP), }; -extern Gfx D_60013500[]; -extern UNK_TYPE D_06001DDC; - u8 D_808727C0[100]; + s32 D_80872824; -void BgDodoago_SetupAction(BgDodoago* this, BgDodoagoActionFunc actionFunc) { - this->actionFunc = actionFunc; -} - -void func_80871A08(Vec3f* vec, GlobalContext* globalCtx) { - Vec3f pos; - Color_RGBA8_n primColor = D_8087259C; - Color_RGBA8_n envColor = D_808725A0; - s32 i; - - for (i = 4; i > 0; i--) { - pos.x = Math_Rand_CenteredFloat(20.0f) + vec->x; - pos.y = Math_Rand_CenteredFloat(10.0f) + vec->y; - pos.z = Math_Rand_CenteredFloat(20.0f) + vec->z; - func_80028B74(globalCtx, &pos, &sVelocity, &sAcceleration, &primColor, &envColor); - } -} - void BgDodoago_Init(Actor* thisx, GlobalContext* globalCtx) { BgDodoago* this = THIS; s32 pad; @@ -206,13 +203,13 @@ void func_80871FB8(BgDodoago* this, GlobalContext* globalCtx) { currentPos.y = this->dyna.actor.posRot.pos.y - 20.0f; currentPos.z = this->dyna.actor.posRot.pos.z + 100.0f; - func_80871A08(¤tPos, globalCtx); + BgDodoago_SpawnSparkles(¤tPos, globalCtx); currentPos.x = this->dyna.actor.posRot.pos.x - 200.0f; currentPos.y = this->dyna.actor.posRot.pos.y - 20.0f; currentPos.z = this->dyna.actor.posRot.pos.z + 100.0f; - func_80871A08(¤tPos, globalCtx); + BgDodoago_SpawnSparkles(¤tPos, globalCtx); Math_ApproxS(&this->unk_164, 0x64, 3); func_800AA000(500.0f, 0x78, 0x14, 0xA); diff --git a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c index 75925e63cd..98fe199e7b 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c +++ b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c @@ -223,7 +223,7 @@ void func_808801B8(BgHakaTrap* this, GlobalContext* globalCtx) { } void func_808802D8(BgHakaTrap* this, GlobalContext* globalCtx) { - static Vec3f D_8088101C = { 0.0f, 0.0f, 0.0f }; + static Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; Vec3f vector; f32 xScale; s32 i; @@ -243,8 +243,8 @@ void func_808802D8(BgHakaTrap* this, GlobalContext* globalCtx) { vector.y = Math_Rand_ZeroOne() * 10.0f + this->dyna.actor.posRot.pos.y + 30.0f; vector.z = Math_Rand_CenteredFloat(320.0f) + this->dyna.actor.posRot.pos.z; - func_8002A6B8(globalCtx, &vector, &D_8088101C, &D_8088101C, 0x82, 0x14, 0xFF, 0xFF, 0x96, 0xAA, 0xFF, 0, 0, 1, - 9, 0); + EffectSsDeadDb_Spawn(globalCtx, &vector, &zeroVec, &zeroVec, 130, 20, 255, 255, 150, 170, 255, 0, 0, 1, 9, + false); } if (this->timer == 0) { diff --git a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c index 38c1edd8cc..5598b79358 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c +++ b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c @@ -105,7 +105,7 @@ void BgHakaTubo_Idle(BgHakaTubo* this, GlobalContext* globalCtx) { pos.y = this->dyna.actor.posRot.pos.y + 80.0f; EffectSsBomb2_SpawnLayered(globalCtx, &pos, &sZeroVector, &sZeroVector, 100, 45); Audio_PlaySoundAtPosition(globalCtx, &this->dyna.actor.posRot.pos, 50, NA_SE_EV_BOX_BREAK); - func_800297A4(globalCtx, &pos, 20.0f, 0, 350, 100, 50, 105, 40, &D_0400CD80); + EffectSsHahen_SpawnBurst(globalCtx, &pos, 20.0f, 0, 350, 100, 50, OBJECT_HAKA_OBJECTS, 40, &D_0400CD80); this->dropTimer = 5; this->dyna.actor.draw = NULL; Actor_SetScale(&this->dyna.actor, 0.0f); diff --git a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c index 3b84378c81..fc25e47c9b 100644 --- a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c +++ b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c @@ -210,8 +210,8 @@ void BgHeavyBlock_MovePiece(BgHeavyBlock* this, GlobalContext* globalCtx) { void BgHeavyBlock_SpawnDust(GlobalContext* globalCtx, f32 posX, f32 posY, f32 posZ, f32 velX, f32 velY, f32 velZ, u8 dustParams) { - Color_RGBA8_n primColor; - Color_RGBA8_n envColor; + Color_RGBA8 primColor; + Color_RGBA8 envColor; Vec3f eye; Vec3f at; s16 sp6E; diff --git a/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c b/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c index 52c344cc12..a9768a0f88 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c @@ -1,3 +1,9 @@ +/* + * File: z_bg_hidan_dalm.c + * Overlay: ovl_Bg_Hidan_Dalm + * Description: Hammerable Totem Pieces (Fire Temple) + */ + #include "z_bg_hidan_dalm.h" #define FLAGS 0x00000000 @@ -9,7 +15,7 @@ void BgHidanDalm_Destroy(Actor* thisx, GlobalContext* globalCtx); void BgHidanDalm_Update(Actor* thisx, GlobalContext* globalCtx); void BgHidanDalm_Draw(Actor* thisx, GlobalContext* globalCtx); -void BgHidanDalm_WaitInteraction(BgHidanDalm* this, GlobalContext* globalCtx); +void BgHidanDalm_Wait(BgHidanDalm* this, GlobalContext* globalCtx); void BgHidanDalm_Shrink(BgHidanDalm* this, GlobalContext* globalCtx); const ActorInit Bg_Hidan_Dalm_InitVars = { @@ -76,7 +82,7 @@ void BgHidanDalm_Init(Actor* thisx, GlobalContext* globalCtx) { if (Flags_GetSwitch(globalCtx, this->switchFlag)) { Actor_Kill(thisx); } else { - this->actionFunc = BgHidanDalm_WaitInteraction; + this->actionFunc = BgHidanDalm_Wait; } } @@ -87,7 +93,7 @@ void BgHidanDalm_Destroy(Actor* thisx, GlobalContext* globalCtx) { Collider_DestroyTris(globalCtx, &this->collider); } -void BgHidanDalm_WaitInteraction(BgHidanDalm* this, GlobalContext* globalCtx) { +void BgHidanDalm_Wait(BgHidanDalm* this, GlobalContext* globalCtx) { Player* player = PLAYER; if ((this->collider.base.acFlags & 2) && !Player_InCsMode(globalCtx) && @@ -136,7 +142,7 @@ void BgHidanDalm_Shrink(BgHidanDalm* this, GlobalContext* globalCtx) { velocity.x = 5.0f * Math_Sins(this->dyna.actor.posRot.rot.y + 0x8000) + (Math_Rand_ZeroOne() - 0.5f) * 5.0f; velocity.z = 5.0f * Math_Coss(this->dyna.actor.posRot.rot.y + 0x8000) + (Math_Rand_ZeroOne() - 0.5f) * 5.0f; velocity.y = (Math_Rand_ZeroOne() - 0.5f) * 1.5f; - func_80028B18(globalCtx, &pos, &velocity, &accel); + EffectSsKiraKira_SpawnSmallYellow(globalCtx, &pos, &velocity, &accel); } } @@ -180,7 +186,7 @@ void BgHidanDalm_Draw(Actor* thisx, GlobalContext* globalCtx) { Gfx_DrawDListOpa(globalCtx, D_0600BDF0); } - if (this->actionFunc == BgHidanDalm_WaitInteraction) { + if (this->actionFunc == BgHidanDalm_Wait) { BgHidanDalm_UpdateCollider(this); } } diff --git a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c index 240d66f68c..604e17bacf 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c +++ b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c @@ -1,4 +1,5 @@ #include "z_bg_jya_bombiwa.h" +#include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" #include #define FLAGS 0x00000000 @@ -97,47 +98,47 @@ void BgJyaBombiwa_Destroy(Actor* thisx, GlobalContext* globalCtx) { } void BgJyaBombiwa_Break(BgJyaBombiwa* this, GlobalContext* globalCtx) { - Vec3f temp; - Vec3f temp2; - s16 tempS; - s8 rotationSpeed; - s8 burstVelocity; + Vec3f pos; + Vec3f velocity; + s16 arg5; + s8 arg6; + s8 arg7; s32 i; - s16 tScale; + s16 scale; for (i = 0; i < 16; i++) { - temp.x = ((Math_Rand_ZeroOne() * 80.0f) + this->dyna.actor.posRot.pos.x) - 40.0f; - temp.y = (Math_Rand_ZeroOne() * 140.0f) + this->dyna.actor.posRot.pos.y; - temp.z = ((Math_Rand_ZeroOne() * 80.0f) + this->dyna.actor.posRot.pos.z) - 40.0f; - temp2.x = (Math_Rand_ZeroOne() - 0.5f) * 10.0f; - temp2.y = Math_Rand_ZeroOne() * 12.0f; - temp2.z = (Math_Rand_ZeroOne() - 0.5f) * 10.0f; - tScale = (s32)(i * 1.8f) + 3; - if (tScale > 15) { - tempS = 5; + pos.x = ((Math_Rand_ZeroOne() * 80.0f) + this->dyna.actor.posRot.pos.x) - 40.0f; + pos.y = (Math_Rand_ZeroOne() * 140.0f) + this->dyna.actor.posRot.pos.y; + pos.z = ((Math_Rand_ZeroOne() * 80.0f) + this->dyna.actor.posRot.pos.z) - 40.0f; + velocity.x = (Math_Rand_ZeroOne() - 0.5f) * 10.0f; + velocity.y = Math_Rand_ZeroOne() * 12.0f; + velocity.z = (Math_Rand_ZeroOne() - 0.5f) * 10.0f; + scale = (s32)(i * 1.8f) + 3; + if (scale > 15) { + arg5 = 5; } else { - tempS = 1; + arg5 = 1; } if (Math_Rand_ZeroOne() < 0.4f) { - tempS |= 0x40; - rotationSpeed = 0xC; - burstVelocity = 8; + arg5 |= 0x40; + arg6 = 0xC; + arg7 = 8; } else { - tempS |= 0x20; - rotationSpeed = 0xC; - burstVelocity = 8; - if (tScale < 10) { - rotationSpeed = 0x50; - burstVelocity = 80; + arg5 |= 0x20; + arg6 = 0xC; + arg7 = 8; + if (scale < 10) { + arg6 = 0x50; + arg7 = 80; } } - func_80029E8C(globalCtx, &temp, &temp2, &temp, -400, tempS, rotationSpeed, burstVelocity, 0, tScale, 1, 20, 80, - -1, OBJECT_JYA_OBJ, D_0600EDC0); + EffectSsKakera_Spawn(globalCtx, &pos, &velocity, &pos, -400, arg5, arg6, arg7, 0, scale, 1, 20, 80, + KAKERA_COLOR_NONE, OBJECT_JYA_OBJ, D_0600EDC0); } - temp.x = this->dyna.actor.posRot.pos.x; - temp.y = this->dyna.actor.posRot.pos.y + 70.0f; - temp.z = this->dyna.actor.posRot.pos.z; - func_80033480(globalCtx, &temp, 100.0f, 0xA, 0x64, 0xA0, 1); + pos.x = this->dyna.actor.posRot.pos.x; + pos.y = this->dyna.actor.posRot.pos.y + 70.0f; + pos.z = this->dyna.actor.posRot.pos.z; + func_80033480(globalCtx, &pos, 100.0f, 0xA, 0x64, 0xA0, 1); } void BgJyaBombiwa_Update(Actor* thisx, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c b/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c index b90f4f7d58..e2d3308c32 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c +++ b/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c @@ -1,4 +1,5 @@ #include "z_bg_jya_megami.h" +#include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" #define FLAGS 0x00000000 @@ -126,17 +127,17 @@ void BgJyaMegami_InitCollider(BgJyaMegami* this, GlobalContext* globalCtx) { Collider_SetJntSph(globalCtx, &this->collider, &this->dyna.actor, &sJntSphInit, &this->colliderItem); } -void func_8089A1DC(GlobalContext* globalCtx, Vec3f* burstOrigin, Vec3f* burstDepthX, s32 num, s32 arg4) { +void func_8089A1DC(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, s32 num, s32 arg4) { Vec3f spB4; s32 i; for (i = 0; i < num; i++) { s32 idx = ((s16)(Math_Rand_ZeroOne() * 8.0f)) & D_8089B17C[arg4]; - s16 u0 = ((idx < 5) && (Math_Rand_ZeroOne() < 0.7f)) ? 0x40 : 0x20; - func_80029E8C(globalCtx, burstOrigin, burstDepthX, burstOrigin, -90, u0, D_8089B16C[idx], 4, 0, D_8089B14C[idx], - 0, 5, D_8089B15C[idx], -1, OBJECT_JYA_OBJ, D_0600B9F8); + s16 arg5 = ((idx < 5) && (Math_Rand_ZeroOne() < 0.7f)) ? 0x40 : 0x20; + EffectSsKakera_Spawn(globalCtx, pos, velocity, pos, -90, arg5, D_8089B16C[idx], 4, 0, D_8089B14C[idx], 0, 5, + D_8089B15C[idx], KAKERA_COLOR_NONE, OBJECT_JYA_OBJ, D_0600B9F8); if (Math_Rand_ZeroOne() < 0.45f) { - Math_Vec3f_Copy(&spB4, burstOrigin); + Math_Vec3f_Copy(&spB4, pos); spB4.z += 25.0f; func_80033480(globalCtx, &spB4, 60.0f, 0, D_8089B14C[idx] * 4 + 50, D_8089B14C[idx] * 4 + 70, 1); } diff --git a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c index 4b9042ea95..cef037edc1 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c +++ b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c @@ -196,8 +196,8 @@ void BgMoriBigst_SetupStalfosPairFight(BgMoriBigst* this, GlobalContext* globalC BgMoriBigst_SetupAction(this, BgMoriBigst_StalfosPairFight); Flags_UnsetClear(globalCtx, this->dyna.actor.room); - stalfos1 = - Actor_SpawnAsChild(&globalCtx->actorCtx, &this->dyna.actor, globalCtx, ACTOR_EN_TEST, 70.0f, 827.0f, -3383.0f, 0, 0, 0, 5); + stalfos1 = Actor_SpawnAsChild(&globalCtx->actorCtx, &this->dyna.actor, globalCtx, ACTOR_EN_TEST, 70.0f, 827.0f, + -3383.0f, 0, 0, 0, 5); if (stalfos1 != NULL) { this->dyna.actor.child = NULL; this->dyna.actor.initPosRot.rot.z++; @@ -205,8 +205,8 @@ void BgMoriBigst_SetupStalfosPairFight(BgMoriBigst* this, GlobalContext* globalC // Warning: 3-1 Stalfos failure osSyncPrintf("Warning : 第３-1スタルフォス発生失敗\n"); } - stalfos2 = - Actor_SpawnAsChild(&globalCtx->actorCtx, &this->dyna.actor, globalCtx, ACTOR_EN_TEST, 170.0f, 827.0f, -3260.0f, 0, 0, 0, 5); + stalfos2 = Actor_SpawnAsChild(&globalCtx->actorCtx, &this->dyna.actor, globalCtx, ACTOR_EN_TEST, 170.0f, 827.0f, + -3260.0f, 0, 0, 0, 5); if (stalfos2 != NULL) { this->dyna.actor.child = NULL; this->dyna.actor.initPosRot.rot.z++; diff --git a/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c b/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c index 699edc3400..1cc010c078 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c +++ b/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c @@ -1,3 +1,9 @@ +/* + * File: z_bg_mori_hashigo.c + * Overlay: ovl_Bg_Mori_Hashigo + * Description: Falling ladder and clasp that holds it. Unused. + */ + #include "z_bg_mori_hashigo.h" #define FLAGS 0x00000000 @@ -7,8 +13,22 @@ void BgMoriHashigo_Init(Actor* thisx, GlobalContext* globalCtx); void BgMoriHashigo_Destroy(Actor* thisx, GlobalContext* globalCtx); void BgMoriHashigo_Update(Actor* thisx, GlobalContext* globalCtx); +void BgMoriHashigo_Draw(Actor* thisx, GlobalContext* globalCtx); + +void BgMoriHashigo_SetupWaitForMoriTex(BgMoriHashigo* this); +void BgMoriHashigo_WaitForMoriTex(BgMoriHashigo* this, GlobalContext* globalCtx); +void BgMoriHashigo_SetupClasp(BgMoriHashigo* this); +void BgMoriHashigo_Clasp(BgMoriHashigo* this, GlobalContext* globalCtx); +void BgMoriHashigo_SetupLadderWait(BgMoriHashigo* this); +void BgMoriHashigo_LadderWait(BgMoriHashigo* this, GlobalContext* globalCtx); +void BgMoriHashigo_SetupLadderFall(BgMoriHashigo* this); +void BgMoriHashigo_LadderFall(BgMoriHashigo* this, GlobalContext* globalCtx); +void BgMoriHashigo_SetupLadderRest(BgMoriHashigo* this); + +extern ColHeader D_060037D8; +extern Gfx D_060036B0[]; +extern Gfx D_06004770[]; -/* const ActorInit Bg_Mori_Hashigo_InitVars = { ACTOR_BG_MORI_HASHIGO, ACTORTYPE_BG, @@ -20,39 +40,256 @@ const ActorInit Bg_Mori_Hashigo_InitVars = { (ActorFunc)BgMoriHashigo_Update, NULL, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2560.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A25E8.s") +static ColliderJntSphItemInit sJntSphItemsInit[1] = { + { + { 0x04, { 0x00000000, 0x00, 0x00 }, { 0x0001F820, 0x00, 0x00 }, 0x00, 0x01, 0x00 }, + { 0, { { 0, 0, 0 }, 25 }, 100 }, + }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2698.s") +static ColliderJntSphInit sJntSphInit = { + { COLTYPE_UNK10, 0x00, 0x09, 0x00, 0x00, COLSHAPE_JNTSPH }, + 1, + sJntSphItemsInit, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2770.s") +static InitChainEntry sInitChainClasp[] = { + ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneScale, 400, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_CONTINUE), + ICHAIN_U8(unk_1F, 3, ICHAIN_CONTINUE), + ICHAIN_F32(unk_4C, 40, ICHAIN_CONTINUE), + ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A27F8.s") +static InitChainEntry sInitChainLadder[] = { + ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneScale, 400, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_CONTINUE), + ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/BgMoriHashigo_Init.s") +void BgMoriHashigo_InitDynapoly(BgMoriHashigo* this, GlobalContext* globalCtx, ColHeader* collision, s32 moveFlag) { + s32 pad; + ColHeader* colHeader; + s32 pad2; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/BgMoriHashigo_Destroy.s") + colHeader = NULL; + DynaPolyInfo_SetActorMove(&this->dyna, moveFlag); + DynaPolyInfo_Alloc(collision, &colHeader); + this->dyna.dynaPolyId = + DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2978.s") + if (this->dyna.dynaPolyId == 0x32) { + // Warning : move BG login failed + osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_mori_hashigo.c", 164, + this->dyna.actor.id, this->dyna.actor.params); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2988.s") +void BgMoriHashigo_InitCollider(BgMoriHashigo* this, GlobalContext* globalCtx) { + s32 pad; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2A04.s") + Collider_InitJntSph(globalCtx, &this->collider); + Collider_SetJntSph(globalCtx, &this->collider, &this->dyna.actor, &sJntSphInit, this->colliderItems); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2A14.s") + this->collider.list[0].dim.worldSphere.center.x = (s16)this->dyna.actor.posRot.pos.x; + this->collider.list[0].dim.worldSphere.center.y = (s16)this->dyna.actor.posRot.pos.y + 21; + this->collider.list[0].dim.worldSphere.center.z = (s16)this->dyna.actor.posRot.pos.z; + this->collider.list[0].dim.worldSphere.radius = 19; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2A78.s") +s32 BgMoriHashigo_SpawnLadder(BgMoriHashigo* this, GlobalContext* globalCtx) { + f32 sn; + f32 cs; + Vec3f pos; + Actor* ladder; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2A88.s") + cs = Math_Coss(this->dyna.actor.shape.rot.y); + sn = Math_Sins(this->dyna.actor.shape.rot.y); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2ABC.s") + pos.x = 6.0f * sn + this->dyna.actor.posRot.pos.x; + pos.y = -210.0f + this->dyna.actor.posRot.pos.y; + pos.z = 6.0f * cs + this->dyna.actor.posRot.pos.z; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2AF4.s") + ladder = Actor_SpawnAsChild(&globalCtx->actorCtx, &this->dyna.actor, globalCtx, ACTOR_BG_MORI_HASHIGO, pos.x, pos.y, + pos.z, this->dyna.actor.posRot.rot.x, this->dyna.actor.posRot.rot.y, + this->dyna.actor.posRot.rot.z, 0); + if (ladder != NULL) { + return true; + } else { + // Ladder failure + osSyncPrintf("Error : 梯子の発生失敗(%s %d)(arg_data 0x%04x)\n", "../z_bg_mori_hashigo.c", 220, + this->dyna.actor.params); + return false; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2BD0.s") +s32 BgMoriHashigo_InitClasp(BgMoriHashigo* this, GlobalContext* globalCtx) { + Actor_ProcessInitChain(&this->dyna.actor, sInitChainClasp); + this->dyna.actor.flags |= 1; + Actor_SetHeight(&this->dyna.actor, 55.0f); + BgMoriHashigo_InitCollider(this, globalCtx); + if ((this->dyna.actor.params == -1) && !BgMoriHashigo_SpawnLadder(this, globalCtx)) { + return false; + } else { + return true; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/BgMoriHashigo_Update.s") +s32 BgMoriHashigo_InitLadder(BgMoriHashigo* this, GlobalContext* globalCtx) { + BgMoriHashigo_InitDynapoly(this, globalCtx, &D_060037D8, DPM_UNK); + Actor_ProcessInitChain(&this->dyna.actor, sInitChainLadder); + return true; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2C28.s") +void BgMoriHashigo_Init(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + BgMoriHashigo* this = THIS; + + if (this->dyna.actor.params == -1) { + if (!BgMoriHashigo_InitClasp(this, globalCtx)) { + Actor_Kill(&this->dyna.actor); + return; + } + } else if (this->dyna.actor.params == 0) { + if (!BgMoriHashigo_InitLadder(this, globalCtx)) { + Actor_Kill(&this->dyna.actor); + return; + } + } + this->moriTexObjIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_MORI_TEX); + if (this->moriTexObjIndex < 0) { + // Bank danger! + osSyncPrintf("Error : バンク危険！(arg_data 0x%04x)(%s %d)\n", this->dyna.actor.params, + "../z_bg_mori_hashigo.c", 312); + Actor_Kill(&this->dyna.actor); + } else { + BgMoriHashigo_SetupWaitForMoriTex(this); + // (Forest Temple Ladder and its clasp) + osSyncPrintf("(森の神殿 梯子とその留め金)(arg_data 0x%04x)\n", this->dyna.actor.params); + } +} + +void BgMoriHashigo_Destroy(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + BgMoriHashigo* this = THIS; + + if (this->dyna.actor.params == 0) { + DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); + } + if (this->dyna.actor.params == -1) { + Collider_DestroyJntSph(globalCtx, &this->collider); + } +} + +void BgMoriHashigo_SetupWaitForMoriTex(BgMoriHashigo* this) { + this->actionFunc = BgMoriHashigo_WaitForMoriTex; +} + +void BgMoriHashigo_WaitForMoriTex(BgMoriHashigo* this, GlobalContext* globalCtx) { + if (Object_IsLoaded(&globalCtx->objectCtx, this->moriTexObjIndex)) { + if (this->dyna.actor.params == -1) { + BgMoriHashigo_SetupClasp(this); + } else if (this->dyna.actor.params == 0) { + BgMoriHashigo_SetupLadderWait(this); + } + this->dyna.actor.draw = BgMoriHashigo_Draw; + } +} + +void BgMoriHashigo_SetupClasp(BgMoriHashigo* this) { + this->actionFunc = BgMoriHashigo_Clasp; +} + +void BgMoriHashigo_Clasp(BgMoriHashigo* this, GlobalContext* globalCtx) { + if (this->hitTimer <= 0) { + if (this->collider.base.acFlags & 2) { + this->collider.base.acFlags &= ~2; + this->hitTimer = 10; + } else { + CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + } + } +} + +void BgMoriHashigo_SetupLadderWait(BgMoriHashigo* this) { + this->actionFunc = BgMoriHashigo_LadderWait; +} + +void BgMoriHashigo_LadderWait(BgMoriHashigo* this, GlobalContext* globalCtx) { + BgMoriHashigo* clasp = (BgMoriHashigo*)this->dyna.actor.parent; + + if (clasp->hitTimer > 0) { + BgMoriHashigo_SetupLadderFall(this); + } +} + +void BgMoriHashigo_SetupLadderFall(BgMoriHashigo* this) { + this->bounceCounter = 0; + this->actionFunc = BgMoriHashigo_LadderFall; + this->dyna.actor.gravity = -1.0f; + this->dyna.actor.minVelocityY = -10.0f; + this->dyna.actor.velocity.y = 2.0f; +} + +void BgMoriHashigo_LadderFall(BgMoriHashigo* this, GlobalContext* globalCtx) { + static f32 bounceSpeed[3] = { 4.0f, 2.7f, 1.7f }; + Actor* thisx = &this->dyna.actor; + + Actor_MoveForward(thisx); + if ((thisx->bgCheckFlags & 1) && (thisx->velocity.y < 0.0f)) { + if (this->bounceCounter >= ARRAY_COUNT(bounceSpeed)) { + BgMoriHashigo_SetupLadderRest(this); + } else { + func_8002E4B4(globalCtx, thisx, 0.0f, 0.0f, 0.0f, 0x1C); + thisx->velocity.y = bounceSpeed[this->bounceCounter]; + this->bounceCounter++; + } + } else { + func_8002E4B4(globalCtx, thisx, 0.0f, 0.0f, 0.0f, 0x1C); + } +} + +void BgMoriHashigo_SetupLadderRest(BgMoriHashigo* this) { + this->actionFunc = NULL; + this->dyna.actor.gravity = 0.0f; + this->dyna.actor.velocity.y = 0.0f; + this->dyna.actor.posRot.pos.y = this->dyna.actor.groundY; +} + +void BgMoriHashigo_Update(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + BgMoriHashigo* this = THIS; + + if (this->hitTimer > 0) { + this->hitTimer--; + } + if (this->actionFunc != NULL) { + this->actionFunc(this, globalCtx); + } +} + +void BgMoriHashigo_Draw(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + BgMoriHashigo* this = THIS; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_mori_hashigo.c", 516); + func_80093D18(globalCtx->state.gfxCtx); + if (1) {} + gSPSegment(oGfxCtx->polyOpa.p++, 0x08, globalCtx->objectCtx.status[this->moriTexObjIndex].segment); + + gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mori_hashigo.c", 521), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + + switch (this->dyna.actor.params) { + case -1: + gSPDisplayList(oGfxCtx->polyOpa.p++, D_06004770); + break; + case 0: + gSPDisplayList(oGfxCtx->polyOpa.p++, D_060036B0); + break; + } + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_mori_hashigo.c", 531); +} diff --git a/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.h b/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.h index 38fa9053d5..12b6ff4bea 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.h +++ b/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.h @@ -6,9 +6,16 @@ struct BgMoriHashigo; +typedef void (*BgMoriHashigoActionFunc)(struct BgMoriHashigo*, GlobalContext*); + typedef struct BgMoriHashigo { - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x84]; + /* 0x0000 */ DynaPolyActor dyna; + /* 0x0164 */ ColliderJntSph collider; + /* 0x0184 */ ColliderJntSphItem colliderItems[1]; + /* 0x01C4 */ BgMoriHashigoActionFunc actionFunc; + /* 0x01C8 */ s16 hitTimer; + /* 0x01CA */ s16 bounceCounter; + /* 0x01CC */ s8 moriTexObjIndex; } BgMoriHashigo; // size = 0x01D0 extern const ActorInit Bg_Mori_Hashigo_InitVars; diff --git a/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c b/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c index df0102b39a..2d7f3dfd7a 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c +++ b/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c @@ -3,7 +3,7 @@ * Overlay: ovl_Bg_Mori_Hashira4 * Description: Forest Temple gates and rotating pillars */ - + #include "z_bg_mori_hashira4.h" #define FLAGS 0x00000010 diff --git a/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c b/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c index f9899fa54f..fdb4c03342 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c +++ b/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c @@ -1,3 +1,9 @@ +/* + * File: z_bg_mori_idomizu.c + * Overlay: ovl_Bg_Mori_Idomizu + * Description: Square of water in Forest Temple well + */ + #include "z_bg_mori_idomizu.h" #define FLAGS 0x00000030 @@ -7,8 +13,17 @@ void BgMoriIdomizu_Init(Actor* thisx, GlobalContext* globalCtx); void BgMoriIdomizu_Destroy(Actor* thisx, GlobalContext* globalCtx); void BgMoriIdomizu_Update(Actor* thisx, GlobalContext* globalCtx); +void BgMoriIdomizu_Draw(Actor* thisx, GlobalContext* globalCtx); + +void BgMoriIdomizu_SetupWaitForMoriTex(BgMoriIdomizu* this); +void BgMoriIdomizu_WaitForMoriTex(BgMoriIdomizu* this, GlobalContext* globalCtx); +void BgMoriIdomizu_SetupMain(BgMoriIdomizu* this); +void BgMoriIdomizu_Main(BgMoriIdomizu* this, GlobalContext* globalCtx); + +extern Gfx D_060049D0[]; + +static s16 sAlreadyLoaded = false; -/* const ActorInit Bg_Mori_Idomizu_InitVars = { ACTOR_BG_MORI_IDOMIZU, ACTORTYPE_BG, @@ -20,23 +35,152 @@ const ActorInit Bg_Mori_Idomizu_InitVars = { (ActorFunc)BgMoriIdomizu_Update, NULL, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A4640.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A4648.s") +void BgMoriIdomizu_SetupAction(BgMoriIdomizu* this, BgMoriIdomizuActionFunc actionFunc) { + this->actionFunc = actionFunc; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/BgMoriIdomizu_Init.s") +void BgMoriIdomizu_SetWaterLevel(GlobalContext* globalCtx, s16 waterLevel) { + WaterBox* waterBox = globalCtx->colCtx.stat.colHeader->waterBoxes; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/BgMoriIdomizu_Destroy.s") + waterBox[2].unk_02 = waterLevel; + waterBox[3].unk_02 = waterLevel; + waterBox[4].unk_02 = waterLevel; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A47D8.s") +void BgMoriIdomizu_Init(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + BgMoriIdomizu* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A47FC.s") + if (sAlreadyLoaded) { + Actor_Kill(&this->actor); + return; + } + this->actor.scale.x = 1.1f; + this->actor.scale.y = 1.0f; + this->actor.scale.z = 1.0f; + this->actor.posRot.pos.x = 119.0f; + this->actor.posRot.pos.z = -1820.0f; + this->prevSwitchFlagSet = Flags_GetSwitch(globalCtx, this->actor.params & 0x3F); + if (this->prevSwitchFlagSet != 0) { + this->actor.posRot.pos.y = -282.0f; + BgMoriIdomizu_SetWaterLevel(globalCtx, -282); + } else { + this->actor.posRot.pos.y = 184.0f; + BgMoriIdomizu_SetWaterLevel(globalCtx, 184); + } + this->moriTexObjIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_MORI_TEX); + if (this->moriTexObjIndex < 0) { + Actor_Kill(&this->actor); + // Bank danger! + osSyncPrintf("Error : バンク危険！(arg_data 0x%04x)(%s %d)\n", this->actor.params, "../z_bg_mori_idomizu.c", + 202); + return; + } + BgMoriIdomizu_SetupWaitForMoriTex(this); + sAlreadyLoaded = true; + this->isLoaded = true; + this->actor.room = -1; + // Forest Temple well water + osSyncPrintf("(森の神殿 井戸水)(arg_data 0x%04x)\n", this->actor.params); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A4850.s") +void BgMoriIdomizu_Destroy(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + BgMoriIdomizu* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A4874.s") + if (this->isLoaded) { + sAlreadyLoaded = false; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/BgMoriIdomizu_Update.s") +void BgMoriIdomizu_SetupWaitForMoriTex(BgMoriIdomizu* this) { + BgMoriIdomizu_SetupAction(this, BgMoriIdomizu_WaitForMoriTex); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A4A64.s") +void BgMoriIdomizu_WaitForMoriTex(BgMoriIdomizu* this, GlobalContext* globalCtx) { + if (Object_IsLoaded(&globalCtx->objectCtx, this->moriTexObjIndex)) { + BgMoriIdomizu_SetupMain(this); + this->actor.draw = BgMoriIdomizu_Draw; + } +} + +void BgMoriIdomizu_SetupMain(BgMoriIdomizu* this) { + BgMoriIdomizu_SetupAction(this, BgMoriIdomizu_Main); +} + +void BgMoriIdomizu_Main(BgMoriIdomizu* this, GlobalContext* globalCtx) { + s8 roomNum; + Actor* thisx = &this->actor; + s32 switchFlagSet; + + roomNum = globalCtx->roomCtx.curRoom.num; + switchFlagSet = Flags_GetSwitch(globalCtx, thisx->params & 0x3F); + if (switchFlagSet) { + this->targetWaterLevel = -282.0f; + } else { + this->targetWaterLevel = 184.0f; + } + if (switchFlagSet && !this->prevSwitchFlagSet) { + func_800800F8(globalCtx, 0xCA8, 0x46, thisx, 0); + this->drainTimer = 90; + } else if (!switchFlagSet && this->prevSwitchFlagSet) { + func_800800F8(globalCtx, 0xCA8, 0x46, thisx, 0); + this->drainTimer = 90; + thisx->posRot.pos.y = 0.0f; + } + this->drainTimer--; + if ((roomNum == 7) || (roomNum == 8) || (roomNum == 9)) { + if (this->drainTimer < 70) { + Math_ApproxF(&thisx->posRot.pos.y, this->targetWaterLevel, 3.5f); + BgMoriIdomizu_SetWaterLevel(globalCtx, thisx->posRot.pos.y); + if (this->drainTimer > 0) { + if (switchFlagSet) { + func_800788CC(NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG); + } else { + func_800788CC(NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG); + } + } + } + } else { + thisx->posRot.pos.y = this->targetWaterLevel; + BgMoriIdomizu_SetWaterLevel(globalCtx, thisx->posRot.pos.y); + Actor_Kill(thisx); + return; + } + this->prevSwitchFlagSet = switchFlagSet; +} + +void BgMoriIdomizu_Update(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + BgMoriIdomizu* this = THIS; + + if (this->actionFunc != NULL) { + this->actionFunc(this, globalCtx); + } +} + +void BgMoriIdomizu_Draw(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + BgMoriIdomizu* this = THIS; + u32 gameplayFrames = globalCtx->gameplayFrames; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_mori_idomizu.c", 356); + + func_80093D84(globalCtx->state.gfxCtx); + + gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mori_idomizu.c", 360), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + + gSPSegment(oGfxCtx->polyXlu.p++, 0x08, globalCtx->objectCtx.status[this->moriTexObjIndex].segment); + + gDPSetEnvColor(oGfxCtx->polyXlu.p++, 0, 0, 0, 128); + + gSPSegment(oGfxCtx->polyXlu.p++, 0x09, + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0x7F - (gameplayFrames & 0x7F), gameplayFrames % 0x80, 0x20, + 0x20, 1, gameplayFrames & 0x7F, gameplayFrames % 0x80, 0x20, 0x20)); + + gSPDisplayList(oGfxCtx->polyXlu.p++, D_060049D0); + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_mori_idomizu.c", 382); +} diff --git a/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.h b/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.h index ee6d62d5ec..8e5bdda045 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.h +++ b/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.h @@ -6,9 +6,16 @@ struct BgMoriIdomizu; +typedef void (*BgMoriIdomizuActionFunc)(struct BgMoriIdomizu*, GlobalContext*); + typedef struct BgMoriIdomizu { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x14]; + /* 0x014C */ BgMoriIdomizuActionFunc actionFunc; + /* 0x0150 */ f32 targetWaterLevel; + /* 0x0154 */ s32 prevSwitchFlagSet; + /* 0x0158 */ s16 isLoaded; + /* 0x015A */ s16 drainTimer; + /* 0x015C */ s8 moriTexObjIndex; } BgMoriIdomizu; // size = 0x0160 extern const ActorInit Bg_Mori_Idomizu_InitVars; diff --git a/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c index 3cb0e2d962..c7d65c123d 100644 --- a/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c +++ b/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c @@ -5,6 +5,7 @@ */ #include "z_bg_spot08_bakudankabe.h" +#include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" #define FLAGS 0x00400000 @@ -119,8 +120,8 @@ void func_808B0324(BgSpot08Bakudankabe* this, GlobalContext* globalCtx) { rotationSpeed = 33; } - func_80029E8C(globalCtx, &burstDepthY, &burstDepthX, &burstDepthY, gravityInfluence, rotationSpeed, 0x1E, 4, 0, - scale, 1, 3, 80, -1, OBJECT_GAMEPLAY_FIELD_KEEP, D_0500A880); + EffectSsKakera_Spawn(globalCtx, &burstDepthY, &burstDepthX, &burstDepthY, gravityInfluence, rotationSpeed, 0x1E, + 4, 0, scale, 1, 3, 80, KAKERA_COLOR_NONE, OBJECT_GAMEPLAY_FIELD_KEEP, D_0500A880); } for (i = 0; i < ARRAY_COUNT(D_808B08AC); i++) { diff --git a/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c index 5667ea1773..dacf0d9ca6 100644 --- a/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c +++ b/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c @@ -5,6 +5,7 @@ */ #include "z_bg_spot11_bakudankabe.h" +#include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" #define FLAGS 0x00000030 @@ -85,8 +86,8 @@ void func_808B2218(BgSpot11Bakudankabe* this, GlobalContext* globalCtx) { } else { rotationSpeed = 33; } - func_80029E8C(globalCtx, &burstDepthY, &burstDepthX, &burstDepthY, gravityInfluence, rotationSpeed, 0x1E, 4, 0, - scale, 1, 3, 80, -1, OBJECT_GAMEPLAY_FIELD_KEEP, D_0500A880); + EffectSsKakera_Spawn(globalCtx, &burstDepthY, &burstDepthX, &burstDepthY, gravityInfluence, rotationSpeed, 0x1E, + 4, 0, scale, 1, 3, 80, KAKERA_COLOR_NONE, OBJECT_GAMEPLAY_FIELD_KEEP, D_0500A880); } Math_Vec3f_Sum(&thisx->posRot.pos, &D_808B272C, &burstDepthY); func_80033480(globalCtx, &burstDepthY, 70, 4, 110, 160, 1); diff --git a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c index 4996233d44..707b898e6a 100644 --- a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c +++ b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c @@ -1,5 +1,6 @@ #include "z_bg_spot16_bombstone.h" #include "overlays/actors/ovl_En_Bombf/z_en_bombf.h" +#include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" #define FLAGS 0x00000010 @@ -248,7 +249,7 @@ void BgSpot16Bombstone_Destroy(Actor* thisx, GlobalContext* globalCtx) { } } -void func_808B51A8(BgSpot16Bombstone* this, GlobalContext* globalCtx) { +void BgSpot16Bombstone_SpawnDust(BgSpot16Bombstone* this, GlobalContext* globalCtx) { f32 scaleX1 = this->actor.scale.x * 150; s16 scaleX2 = this->actor.scale.x * 250; Vec3f posRot; @@ -290,10 +291,10 @@ void func_808B5240(BgSpot16Bombstone* this, GlobalContext* globalCtx) { } } -void func_808B53A8(BgSpot16Bombstone* this, GlobalContext* globalCtx) { +void BgSpot16Bombstone_SpawnFragments(BgSpot16Bombstone* this, GlobalContext* globalCtx) { f32 velocityYMultiplier = 1.3f; - Vec3f randomPosition; - Vec3f randomVelocity; + Vec3f pos; + Vec3f velocity; s32 index; s16 scale; @@ -307,18 +308,18 @@ void func_808B53A8(BgSpot16Bombstone* this, GlobalContext* globalCtx) { if (index < ARRAY_COUNT(D_808B6074)) { do { - randomPosition.x = ((Math_Rand_ZeroOne() - 0.5f) * 8.0f) + this->actor.posRot.pos.x; - randomPosition.y = ((Math_Rand_ZeroOne() * 5.0f) + this->actor.posRot.pos.y) + 8.0f; - randomPosition.z = ((Math_Rand_ZeroOne() - 0.5f) * 8.0f) + this->actor.posRot.pos.z; + pos.x = ((Math_Rand_ZeroOne() - 0.5f) * 8.0f) + this->actor.posRot.pos.x; + pos.y = ((Math_Rand_ZeroOne() * 5.0f) + this->actor.posRot.pos.y) + 8.0f; + pos.z = ((Math_Rand_ZeroOne() - 0.5f) * 8.0f) + this->actor.posRot.pos.z; - randomVelocity.x = (Math_Rand_ZeroOne() - 0.5f) * 16.0f; - randomVelocity.y = (Math_Rand_ZeroOne() * 14.0) + (fabsf(this->actor.velocity.y) * velocityYMultiplier); - randomVelocity.z = (Math_Rand_ZeroOne() - 0.5f) * 16.0f; + velocity.x = (Math_Rand_ZeroOne() - 0.5f) * 16.0f; + velocity.y = (Math_Rand_ZeroOne() * 14.0) + (fabsf(this->actor.velocity.y) * velocityYMultiplier); + velocity.z = (Math_Rand_ZeroOne() - 0.5f) * 16.0f; scale = D_808B6074[index] * this->actor.scale.x * 3; - func_80029E8C(globalCtx, &randomPosition, &randomVelocity, &this->actor.posRot.pos, -0x1A4, 0x31, 0xF, 0xF, - 0, scale, 2, 0x40, 0xA0, -1, OBJECT_BOMBIWA, D_060009E0); + EffectSsKakera_Spawn(globalCtx, &pos, &velocity, &this->actor.posRot.pos, -420, 0x31, 0xF, 0xF, 0, scale, 2, + 0x40, 160, KAKERA_COLOR_NONE, OBJECT_BOMBIWA, D_060009E0); index += 1; } while (index != ARRAY_COUNT(D_808B6074)); } @@ -484,8 +485,8 @@ void func_808B5B6C(BgSpot16Bombstone* this, GlobalContext* globalCtx) { } if (actor->bgCheckFlags & 8 || (actor->bgCheckFlags & 1 && actor->velocity.y < 0.0f)) { - func_808B53A8(this, globalCtx); - func_808B51A8(this, globalCtx); + BgSpot16Bombstone_SpawnFragments(this, globalCtx); + BgSpot16Bombstone_SpawnDust(this, globalCtx); Audio_PlaySoundAtPosition(globalCtx, &actor->posRot, 20, NA_SE_EV_ROCK_BROKEN); Actor_Kill(actor); return; diff --git a/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c index 0709472f49..5b7545557f 100644 --- a/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c +++ b/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c @@ -5,6 +5,7 @@ */ #include "z_bg_spot17_bakudankabe.h" +#include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" #define FLAGS 0x00000000 @@ -83,8 +84,8 @@ void func_808B6BC0(BgSpot17Bakudankabe* this, GlobalContext* globalCtx) { } else { rotationSpeed = 33; } - func_80029E8C(globalCtx, &burstDepthY, &burstDepthX, &burstDepthY, gravityInfluence, rotationSpeed, 0x1E, 4, 0, - scale, 1, 3, 80, -1, OBJECT_GAMEPLAY_FIELD_KEEP, D_0500A880); + EffectSsKakera_Spawn(globalCtx, &burstDepthY, &burstDepthX, &burstDepthY, gravityInfluence, rotationSpeed, 0x1E, + 4, 0, scale, 1, 3, 80, KAKERA_COLOR_NONE, OBJECT_GAMEPLAY_FIELD_KEEP, D_0500A880); } Math_Vec3f_Copy(&burstDepthY, &this->dyna.actor.posRot.pos); func_80033480(globalCtx, &burstDepthY, 60.0f, 4, 110, 160, 1); diff --git a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c index 580aeb3a79..616c64a9db 100644 --- a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c +++ b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c @@ -5,6 +5,7 @@ */ #include "z_bg_treemouth.h" +#include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" #define FLAGS 0x00000030 @@ -119,7 +120,7 @@ void func_808BC6F8(BgTreemouth* this, GlobalContext* globalCtx) { sp34.x = (Math_Rand_ZeroOne() * 1158.0f) + 3407.0f; sp34.y = 970.0f; sp34.z = (Math_Rand_ZeroOne() * 2026.0f) + -2163.0f; - func_800297A4(globalCtx, &sp34, 0.8f, 0, 50, 30, 1, -1, 10, 0); + EffectSsHahen_SpawnBurst(globalCtx, &sp34, 0.8f, 0, 50, 30, 1, HAHEN_OBJECT_DEFAULT, 10, NULL); } } diff --git a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.h b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.h index 327a8c2448..b0d1fe1fb1 100644 --- a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.h +++ b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.h @@ -8,7 +8,9 @@ struct BossGanondrof; typedef struct BossGanondrof { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x42C]; + /* 0x014C */ char unk_14C[0xCC]; + /* 0x0218 */ Vec3f bodyPartsPos[24]; + /* 0x03C8 */ char unk_3C8[0x1B0]; } BossGanondrof; // size = 0x0578 extern const ActorInit Boss_Ganondrof_InitVars; diff --git a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c index f508434bba..11b0b5f242 100644 --- a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c +++ b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c @@ -174,7 +174,8 @@ s32 func_809B55EC(EnAttackNiw* this, GlobalContext* globalCtx) { Actor_SetHeight(&this->actor, this->unk_2E4); func_8002F374(globalCtx, &this->actor, &sp1E, &sp1C); - if ((this->actor.projectedPos.z < -20.0f) || (sp1E < 0) || (sp1E > SCREEN_WIDTH) || (sp1C < 0) || (sp1C > SCREEN_HEIGHT)) { + if ((this->actor.projectedPos.z < -20.0f) || (sp1E < 0) || (sp1E > SCREEN_WIDTH) || (sp1C < 0) || + (sp1C > SCREEN_HEIGHT)) { return 0; } else { return 1; @@ -345,7 +346,7 @@ void EnAttackNiw_Update(Actor* thisx, GlobalContext* globalCtx) { if ((this->actor.bgCheckFlags & 0x20) && (this->actionFunc != func_809B5C18)) { Math_Vec3f_Copy(&sp30, &this->actor.posRot.pos); sp30.y += this->actor.waterY; - func_8002949C(globalCtx, &sp30, 0, 0, 0, 0x190); + EffectSsGSplash_Spawn(globalCtx, &sp30, 0, 0, 0, 0x190); this->unk_2DC = 0.0f; this->actor.gravity = 0.0f; this->unk_2E0 = 0.0f; diff --git a/src/overlays/actors/ovl_En_Bom/z_en_bom.c b/src/overlays/actors/ovl_En_Bom/z_en_bom.c index 25fcbe8563..1f44c3508e 100644 --- a/src/overlays/actors/ovl_En_Bom/z_en_bom.c +++ b/src/overlays/actors/ovl_En_Bom/z_en_bom.c @@ -5,6 +5,7 @@ */ #include "z_en_bom.h" +#include "overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h" #define FLAGS 0x00000030 @@ -199,7 +200,7 @@ void EnBom_Update(Actor* thisx, GlobalContext* globalCtx) { Vec3f effAccel = { 0.0f, 0.0f, 0.0f }; Vec3f effPos; Vec3f dustAccel = { 0.0f, 0.6f, 0.0f }; - Color_RGBA8_n dustColor = { 255, 255, 255, 255 }; + Color_RGBA8 dustColor = { 255, 255, 255, 255 }; s32 pad[2]; EnBom* this = THIS; @@ -230,13 +231,13 @@ void EnBom_Update(Actor* thisx, GlobalContext* globalCtx) { effPos = thisx->posRot.pos; effPos.y += 17.0f; if ((globalCtx->gameplayFrames % 2) == 0) { - func_80029184(globalCtx, thisx, &effPos, &effVelocity, &effAccel); + EffectSsGSpk_SpawnFuse(globalCtx, thisx, &effPos, &effVelocity, &effAccel); } Audio_PlayActorSound2(thisx, NA_SE_IT_BOMB_IGNIT - SFX_FLAG); effPos.y += 3.0f; - func_8002829C(globalCtx, &effPos, &effVelocity, &dustAccel, &dustColor, &dustColor, 0x32, 5); + func_8002829C(globalCtx, &effPos, &effVelocity, &dustAccel, &dustColor, &dustColor, 50, 5); } if ((this->bombCollider.base.acFlags & 2) || @@ -284,7 +285,7 @@ void EnBom_Update(Actor* thisx, GlobalContext* globalCtx) { effPos.y = thisx->groundY; if (thisx->groundY > -32000.0f) { - func_80029024(globalCtx, &effPos, &effVelocity, &effAccel); + EffectSsBlast_SpawnWhiteShockwave(globalCtx, &effPos, &effVelocity, &effAccel); } Audio_PlayActorSound2(thisx, NA_SE_IT_BOMB_EXPLOSION); @@ -314,7 +315,8 @@ void EnBom_Update(Actor* thisx, GlobalContext* globalCtx) { if ((thisx->scale.x >= 0.01f) && (thisx->params != BOMB_EXPLOSION)) { if (thisx->waterY >= 20.0f) { - EffectSsDeadSound_SpawnStationary(globalCtx, &thisx->projectedPos, NA_SE_IT_BOMB_UNEXPLOSION, 1, 1, 10); + EffectSsDeadSound_SpawnStationary(globalCtx, &thisx->projectedPos, NA_SE_IT_BOMB_UNEXPLOSION, true, + DEADSOUND_REPEAT_MODE_OFF, 10); Actor_Kill(thisx); return; } diff --git a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c index f62dac934f..088e1385a8 100644 --- a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c +++ b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c @@ -5,6 +5,7 @@ */ #include "z_en_bombf.h" +#include "overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h" #define FLAGS 0x00000011 @@ -294,7 +295,7 @@ void EnBombf_Update(Actor* thisx, GlobalContext* globalCtx) { Vec3f effAccel = { 0.0f, 0.0f, 0.0f }; Vec3f effPos; Vec3f dustAccel = { 0.0f, 0.6f, 0.0f }; - Color_RGBA8_n dustColor = { 255, 255, 255, 255 }; + Color_RGBA8 dustColor = { 255, 255, 255, 255 }; s32 pad[2]; EnBombf* this = THIS; @@ -359,7 +360,7 @@ void EnBombf_Update(Actor* thisx, GlobalContext* globalCtx) { if (this->timer < 127) { // spawn spark effect on even frames if ((globalCtx->gameplayFrames % 2) == 0) { - func_80029184(globalCtx, thisx, &effPos, &effVelocity, &effAccel); + EffectSsGSpk_SpawnFuse(globalCtx, thisx, &effPos, &effVelocity, &effAccel); } Audio_PlayActorSound2(thisx, NA_SE_IT_BOMB_IGNIT - SFX_FLAG); @@ -395,7 +396,7 @@ void EnBombf_Update(Actor* thisx, GlobalContext* globalCtx) { effPos.y = thisx->groundY; if (thisx->groundY > -32000.0f) { - func_80029024(globalCtx, &effPos, &effVelocity, &effAccel); + EffectSsBlast_SpawnWhiteShockwave(globalCtx, &effPos, &effVelocity, &effAccel); } Audio_PlayActorSound2(thisx, NA_SE_IT_BOMB_EXPLOSION); @@ -426,7 +427,8 @@ void EnBombf_Update(Actor* thisx, GlobalContext* globalCtx) { if ((thisx->scale.x >= 0.01f) && (thisx->params != BOMBFLOWER_EXPLOSION)) { if (thisx->waterY >= 20.0f) { - EffectSsDeadSound_SpawnStationary(globalCtx, &thisx->projectedPos, NA_SE_IT_BOMB_UNEXPLOSION, 1, 1, 10); + EffectSsDeadSound_SpawnStationary(globalCtx, &thisx->projectedPos, NA_SE_IT_BOMB_UNEXPLOSION, true, + DEADSOUND_REPEAT_MODE_OFF, 10); Actor_Kill(thisx); return; } diff --git a/src/overlays/actors/ovl_En_Bx/z_en_bx.c b/src/overlays/actors/ovl_En_Bx/z_en_bx.c index ef65cf0e71..b70a929248 100644 --- a/src/overlays/actors/ovl_En_Bx/z_en_bx.c +++ b/src/overlays/actors/ovl_En_Bx/z_en_bx.c @@ -41,31 +41,13 @@ static ColliderQuadInit sQuadInit = { { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } }, }; -Vec3f D_809D250C = { 0.015f, 0.015f, 0.015f }; - -Vec3f D_809D2518 = { 0.0f, 0.0f, 0.0f }; - -static InitChainEntry sInitChain[] = { - ICHAIN_F32(unk_4C, 5300, ICHAIN_STOP), -}; - -Vec3f D_809D2528 = { 8000.0f, 15000.0f, 2500.0f }; - -Vec3f D_809D2534 = { 8000.0f, 10000.0f, 2500.0f }; - -Vec3f D_809D2540 = { -8000.0f, 15000.0f, 2500.0f }; - -Vec3f D_809D254C = { -8000.0f, 10000.0f, 2500.0f }; - -Color_RGBA8 D_809D2558 = { 255, 255, 255, 255 }; -Color_RGBA8 D_809D255C = { 200, 255, 255, 255 }; - -UNK_PTR D_809D2560[] = { 0x060024F0, 0x060027F0, 0x060029F0 }; - void EnBx_Init(Actor* thisx, GlobalContext* globalCtx) { EnBx* this = THIS; - Vec3f sp48 = D_809D250C; - Vec3f sp3C = D_809D2518; + Vec3f sp48 = { 0.015f, 0.015f, 0.015f }; + Vec3f sp3C = { 0.0f, 0.0f, 0.0f }; + static InitChainEntry sInitChain[] = { + ICHAIN_F32(unk_4C, 5300, ICHAIN_STOP), + }; s32 i; s32 pad; @@ -104,8 +86,10 @@ void EnBx_Destroy(Actor* thisx, GlobalContext* globalCtx) { } void func_809D1D0C(Actor* thisx, GlobalContext* globalCtx) { - Vec3f sp5C = D_809D2528; - Vec3f sp50 = D_809D2534; + Vec3f sp5C = { 8000.0f, 15000.0f, 2500.0f }; + Vec3f sp50 = { 8000.0f, 10000.0f, 2500.0f }; + static Vec3f D_809D2540 = { -8000.0f, 15000.0f, 2500.0f }; + static Vec3f D_809D254C = { -8000.0f, 10000.0f, 2500.0f }; Vec3f sp44; Vec3f sp38; EnBx* this = THIS; @@ -123,9 +107,6 @@ void EnBx_Update(Actor* thisx, GlobalContext* globalCtx) { s32 i; s16 tmp32; s32 tmp33; - Vec3f sp58; - s16 tmp16; - u32 test; if ((thisx->xzDistFromLink <= 70.0f) || (this->collider.base.atFlags & 2) || (this->collider.base.acFlags & 2) || (this->colliderQuad.base.atFlags & 2)) { @@ -162,12 +143,17 @@ void EnBx_Update(Actor* thisx, GlobalContext* globalCtx) { this->unk_14C--; for (i = 0; i < 4; i++) { if (!((this->unk_14C + (i << 1)) % 4)) { - tmp16 = (s32)Math_Rand_CenteredFloat(12288.0f); - tmp16 = (tmp16 + (i * 16384)) + 0x2000; - sp58.x = Math_Rand_CenteredFloat(5.0f) + thisx->posRot.pos.x; - sp58.y = Math_Rand_CenteredFloat(30.0f) + thisx->posRot.pos.y + 170.0f; - sp58.z = Math_Rand_CenteredFloat(5.0f) + thisx->posRot.pos.z; - func_800295A0(globalCtx, &sp58, &D_809D2558, &D_809D255C, 0xE6, tmp16, 6, 0); + static Color_RGBA8 primColor = { 255, 255, 255, 255 }; + static Color_RGBA8 envColor = { 200, 255, 255, 255 }; + Vec3f pos; + s16 yaw; + + yaw = (s32)Math_Rand_CenteredFloat(12288.0f); + yaw = (yaw + (i * 0x4000)) + 0x2000; + pos.x = Math_Rand_CenteredFloat(5.0f) + thisx->posRot.pos.x; + pos.y = Math_Rand_CenteredFloat(30.0f) + thisx->posRot.pos.y + 170.0f; + pos.z = Math_Rand_CenteredFloat(5.0f) + thisx->posRot.pos.z; + EffectSsLightning_Spawn(globalCtx, &pos, &primColor, &envColor, 230, yaw, 6, 0); } } @@ -183,6 +169,7 @@ void EnBx_Update(Actor* thisx, GlobalContext* globalCtx) { } void EnBx_Draw(Actor* thisx, GlobalContext* globalCtx) { + static UNK_PTR D_809D2560[] = { 0x060024F0, 0x060027F0, 0x060029F0 }; EnBx* this = THIS; s32 pad; Mtx* mtx = Graph_Alloc(globalCtx->state.gfxCtx, 4 * sizeof(Mtx)); diff --git a/src/overlays/actors/ovl_En_Cow/z_en_cow.c b/src/overlays/actors/ovl_En_Cow/z_en_cow.c index 64d8893109..e0f9cc5343 100644 --- a/src/overlays/actors/ovl_En_Cow/z_en_cow.c +++ b/src/overlays/actors/ovl_En_Cow/z_en_cow.c @@ -112,7 +112,7 @@ void EnCow_Init(Actor* thisx, GlobalContext* globalCtx) { func_809DEE9C(this); this->actionFunc = func_809DF96C; if (globalCtx->sceneNum == SCENE_LINK_HOME) { - if (gSaveContext.linkAge != 0) { + if (LINK_IS_CHILD) { Actor_Kill(&this->actor); return; } diff --git a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c index 746f183c60..98e8b88822 100644 --- a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c +++ b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c @@ -90,8 +90,8 @@ void EnDyExtra_Update(Actor* thisx, GlobalContext* globalCtx) { } void EnDyExtra_Draw(Actor* thisx, GlobalContext* globalCtx) { - static Color_RGBA8_n primColors[] = { { 255, 255, 170, 255 }, { 255, 255, 170, 255 } }; - static Color_RGBA8_n envColors[] = { { 255, 100, 255, 255 }, { 100, 255, 255, 255 } }; + static Color_RGBA8 primColors[] = { { 255, 255, 170, 255 }, { 255, 255, 170, 255 } }; + static Color_RGBA8 envColors[] = { { 255, 100, 255, 255 }, { 100, 255, 255, 255 } }; static u8 D_809FFC50[] = { 0x02, 0x01, 0x01, 0x02, 0x00, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x00, 0x01, 0x02 }; EnDyExtra* this = THIS; diff --git a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c index c1a0d55773..454a8d76a6 100644 --- a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c +++ b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c @@ -40,9 +40,6 @@ const ActorInit En_Ex_Ruppy_InitVars = { (ActorFunc)EnExRuppy_Draw, }; -static Vec3f D_80A0B358[] = { { 0.0f, 0.1f, 0.0f }, { 0.0f, 0.0f, 0.0f } }; -static Vec3f D_80A0B370[] = { { 0.0f, 0.01f, 0.0f }, { 0.0f, 0.0f, 0.0f } }; - void EnExRuppy_Init(Actor* thisx, GlobalContext* globalCtx) { EnExRuppy* this = THIS; EnDivingGame* divingGame; @@ -164,41 +161,44 @@ void EnExRuppy_Init(Actor* thisx, GlobalContext* globalCtx) { void EnExRuppy_Destroy(Actor* thisx, GlobalContext* globalCtx) { } -void EnExRuppy_SpawnSparkles(EnExRuppy* this, GlobalContext* globalCtx, s16 arg2, s32 arg3) { - Vec3f sparklePos; - Vec3f sparkleVelocity; - Vec3f sparkleAccel; - Color_RGBA8_n primColor; - Color_RGBA8_n envColor; +void EnExRuppy_SpawnSparkles(EnExRuppy* this, GlobalContext* globalCtx, s16 numSparkles, s32 movementType) { + static Vec3f velocities[] = { { 0.0f, 0.1f, 0.0f }, { 0.0f, 0.0f, 0.0f } }; + static Vec3f accelerations[] = { { 0.0f, 0.01f, 0.0f }, { 0.0f, 0.0f, 0.0f } }; + Vec3f pos; + Vec3f velocity; + Vec3f accel; + Color_RGBA8 primColor; + Color_RGBA8 envColor; s32 i; - s16 sparkleScale; - s16 sparkleLife; + s16 scale; + s16 life; - if (arg2 <= 0) { - arg2 = 1; + if (numSparkles < 1) { + numSparkles = 1; } + primColor.r = 255; primColor.g = 255; primColor.b = 0; envColor.r = 255; envColor.g = 255; envColor.b = 255; - sparkleVelocity = D_80A0B358[arg3]; - sparkleAccel = D_80A0B370[arg3]; - sparkleScale = 3000; - sparkleLife = 16; - for (i = 0; i < arg2; i++) { - if (arg3 == 1) { - sparkleAccel.x = Math_Rand_CenteredFloat(20.0f); - sparkleAccel.z = Math_Rand_CenteredFloat(20.0f); - sparkleScale = 5000; - sparkleLife = 20; + velocity = velocities[movementType]; + accel = accelerations[movementType]; + scale = 3000; + life = 16; + + for (i = 0; i < numSparkles; i++) { + if (movementType == 1) { + accel.x = Math_Rand_CenteredFloat(20.0f); + accel.z = Math_Rand_CenteredFloat(20.0f); + scale = 5000; + life = 20; } - sparklePos.x = (Math_Rand_ZeroOne() - 0.5f) * 10.0f + this->actor.posRot.pos.x; - sparklePos.y = (Math_Rand_ZeroOne() - 0.5f) * 10.0f + (this->actor.posRot.pos.y + this->unk_160 * 600.0f); - sparklePos.z = (Math_Rand_ZeroOne() - 0.5f) * 10.0f + this->actor.posRot.pos.z; - func_80028BB0(globalCtx, &sparklePos, &sparkleVelocity, &sparkleAccel, &primColor, &envColor, sparkleScale, - sparkleLife); + pos.x = (Math_Rand_ZeroOne() - 0.5f) * 10.0f + this->actor.posRot.pos.x; + pos.y = (Math_Rand_ZeroOne() - 0.5f) * 10.0f + (this->actor.posRot.pos.y + this->unk_160 * 600.0f); + pos.z = (Math_Rand_ZeroOne() - 0.5f) * 10.0f + this->actor.posRot.pos.z; + EffectSsKiraKira_SpawnDispersed(globalCtx, &pos, &velocity, &accel, &primColor, &envColor, scale, life); } } @@ -252,7 +252,7 @@ void EnExRuppy_Sink(EnExRuppy* this, GlobalContext* globalCtx) { pos.y += this->actor.waterY; this->actor.velocity.y = -1.0f; this->actor.gravity = -0.2f; - func_8002949C(globalCtx, &pos, 0, 0, 0, 800); + EffectSsGSplash_Spawn(globalCtx, &pos, 0, 0, 0, 800); func_80078914(&this->actor.projectedPos, NA_SE_EV_BOMB_DROP_WATER); this->actionFunc = func_80A0AD88; } @@ -271,7 +271,7 @@ void func_80A0AD88(EnExRuppy* this, GlobalContext* globalCtx) { if (this->timer == 0) { this->timer = 10; - func_800293E4(globalCtx, &this->actor.posRot.pos, 0.0f, 5.0f, 5.0f, Math_Rand_ZeroFloat(0.03f) + 0.07f); + EffectSsBubble_Spawn(globalCtx, &this->actor.posRot.pos, 0.0f, 5.0f, 5.0f, Math_Rand_ZeroFloat(0.03f) + 0.07f); } if (this->actor.parent != NULL) { divingGame = (EnDivingGame*)this->actor.parent; @@ -303,8 +303,8 @@ void func_80A0AEE0(EnExRuppy* this, GlobalContext* globalCtx) { void EnExRuppy_WaitToBlowUp(EnExRuppy* this, GlobalContext* globalCtx) { f32 distToBlowUp; - Vec3f point1Vec = { 0.0f, 0.1f, 0.0f }; - Vec3f zeroVector = { 0.0f, 0.0f, 0.0f }; + Vec3f accel = { 0.0f, 0.1f, 0.0f }; + Vec3f velocity = { 0.0f, 0.0f, 0.0f }; s16 explosionScale; s16 explosionScaleStep; distToBlowUp = 50.0f; @@ -328,7 +328,7 @@ void EnExRuppy_WaitToBlowUp(EnExRuppy* this, GlobalContext* globalCtx) { explosionScale = 20; explosionScaleStep = 6; } - EffectSsBomb2_SpawnLayered(globalCtx, &this->actor.posRot.pos, &zeroVector, &point1Vec, explosionScale, + EffectSsBomb2_SpawnLayered(globalCtx, &this->actor.posRot.pos, &velocity, &accel, explosionScale, explosionScaleStep); func_8002F71C(globalCtx, &this->actor, 2.0f, this->actor.yawTowardsLink, 0.0f); Audio_PlayActorSound2(&this->actor, NA_SE_IT_BOMB_EXPLOSION); diff --git a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c index d08a64b1d4..8a259e5209 100644 --- a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c +++ b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c @@ -5,7 +5,8 @@ */ #include "z_en_fhg_fire.h" -#include "../ovl_En_fHG/z_en_fhg.h" +#include "overlays/actors/ovl_En_fHG/z_en_fhg.h" +#include "overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h" #define FLAGS 0x00000030 @@ -143,8 +144,8 @@ void EnFhgFire_Init(Actor* thisx, GlobalContext* globalCtx) { this->collider.dim.height = 50; this->collider.dim.yShift = -25; this->lightNode = LightContext_InsertLight(globalCtx, &globalCtx->lightCtx, &this->lightInfo); - Lights_PointNoGlowSetInfo(&this->lightInfo, thisx->posRot.pos.x, thisx->posRot.pos.y, thisx->posRot.pos.z, 0xFF, - 0xFF, 0xFF, 0xFF); + Lights_PointNoGlowSetInfo(&this->lightInfo, thisx->posRot.pos.x, thisx->posRot.pos.y, thisx->posRot.pos.z, 255, + 255, 255, 0xFF); } } @@ -163,8 +164,8 @@ void EnFhgFire_Destroy(Actor* thisx, GlobalContext* globalCtx) { void func_80A0F6F8(EnFhgFire* this, GlobalContext* globalCtx) { Camera* camera; s32 pad; - Vec3f randVec; - Vec3f tmpVec; + Vec3f ballVelocity; + Vec3f ballAccel; s16 i; s16 randY; s16* tmp; @@ -192,15 +193,16 @@ void func_80A0F6F8(EnFhgFire* this, GlobalContext* globalCtx) { this->actor.posRot.pos.x, this->actor.posRot.pos.y, this->actor.posRot.pos.z, 500, 0, 0, 0x24); - tmpVec = D_80A117BC; + ballAccel = D_80A117BC; for (i = 0; i < 35; i++) { - randVec.x = Math_Rand_CenteredFloat(30.f); - randVec.y = Math_Rand_ZeroFloat(5.0f) + 3.0f; - randVec.z = Math_Rand_CenteredFloat(30.f); - tmpVec.y = -0.2f; - EffectSsFhgFlash_Spawn(globalCtx, &this->actor.posRot.pos, &randVec, &tmpVec, - (s16)(Math_Rand_ZeroOne() * 100.0f) + 240, 0); + ballVelocity.x = Math_Rand_CenteredFloat(30.f); + ballVelocity.y = Math_Rand_ZeroFloat(5.0f) + 3.0f; + ballVelocity.z = Math_Rand_CenteredFloat(30.f); + ballAccel.y = -0.2f; + EffectSsFhgFlash_SpawnLightBall(globalCtx, &this->actor.posRot.pos, &ballVelocity, &ballAccel, + (s16)(Math_Rand_ZeroOne() * 100.0f) + 240, + FHGFLASH_LIGHTBALL_GREEN); } func_80033E88(&this->actor, globalCtx, 4, 10); @@ -283,7 +285,7 @@ void func_80A0FC48(EnFhgFire* this, GlobalContext* globalCtx) { if (Math_Rand_ZeroOne() < 0.5f) { pos = this->actor.posRot.pos; pos.y -= 20.0f; - EffectSsFhgFlash_Spawn2(globalCtx, &this->actor, &pos, 0xC8, 0); + EffectSsFhgFlash_SpawnShock(globalCtx, &this->actor, &pos, 200, FHGFLASH_SHOCK_NO_ACTOR); } Actor_MoveForward(&this->actor); @@ -369,9 +371,6 @@ void func_80A0FD8C(EnFhgFire* this, GlobalContext* globalCtx) { void func_80A10008(EnFhgFire* this, GlobalContext* globalCtx) { EnfHG* horse; s16 i; - Vec3f sp6C; - Vec3f tmp; - Vec3f sp54; osSyncPrintf("yari hikari 1\n"); horse = (EnfHG*)this->actor.parent; @@ -386,17 +385,20 @@ void func_80A10008(EnFhgFire* this, GlobalContext* globalCtx) { osSyncPrintf("yari hikari 2\n"); if (this->fireMode == 0) { - tmp = D_80A117C8; - sp54 = D_80A117D4; + Vec3f ballPos; + Vec3f ballVelocity = D_80A117C8; + Vec3f ballAccel = D_80A117D4; + osSyncPrintf("FLASH !!\n"); for (i = 0; i < 2; i++) { - sp6C.x = Math_Rand_CenteredFloat(20.0f) + this->actor.posRot.pos.x; - sp6C.y = Math_Rand_CenteredFloat(20.0f) + this->actor.posRot.pos.y; - sp6C.z = Math_Rand_CenteredFloat(20.0f) + this->actor.posRot.pos.z; - sp54.y = -0.08f; + ballPos.x = Math_Rand_CenteredFloat(20.0f) + this->actor.posRot.pos.x; + ballPos.y = Math_Rand_CenteredFloat(20.0f) + this->actor.posRot.pos.y; + ballPos.z = Math_Rand_CenteredFloat(20.0f) + this->actor.posRot.pos.z; + ballAccel.y = -0.08f; - EffectSsFhgFlash_Spawn(globalCtx, &sp6C, &tmp, &sp54, (s16)(Math_Rand_ZeroOne() * 80.0f) + 150, 0); + EffectSsFhgFlash_SpawnLightBall(globalCtx, &ballPos, &ballVelocity, &ballAccel, + (s16)(Math_Rand_ZeroOne() * 80.0f) + 150, FHGFLASH_LIGHTBALL_GREEN); } } diff --git a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c index 31326f4ad1..972d1834de 100644 --- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c +++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c @@ -285,8 +285,8 @@ void EnFloormas_SetupSmDecideAction(EnFloormas* this) { } void EnFloormas_SetupSmShrink(EnFloormas* this, GlobalContext* globalCtx) { - static Vec3f D_80A1A4D0 = { 0.0f, 0.0f, 0.0f }; - static Vec3f D_80A1A4DC = { 0.0f, 0.0f, 0.0f }; + static Vec3f velocity = { 0.0f, 0.0f, 0.0f }; + static Vec3f accel = { 0.0f, 0.0f, 0.0f }; Vec3f pos; this->actor.speedXZ = 0.0f; @@ -294,7 +294,7 @@ void EnFloormas_SetupSmShrink(EnFloormas* this, GlobalContext* globalCtx) { pos.x = this->actor.posRot.pos.x; pos.y = this->actor.posRot.pos.y + 15.0f; pos.z = this->actor.posRot.pos.z; - func_8002A6B8(globalCtx, &pos, &D_80A1A4D0, &D_80A1A4DC, 0x96, -0xA, 0xFF, 0xFF, 0xFF, 0xFF, 0, 0, 0xFF, 1, 9, 1); + EffectSsDeadDb_Spawn(globalCtx, &pos, &velocity, &accel, 150, -10, 255, 255, 255, 255, 0, 0, 255, 1, 9, true); this->actionFunc = EnFloormas_SmShrink; } @@ -977,8 +977,8 @@ void EnFloormas_ColliderCheck(EnFloormas* this, GlobalContext* globalCtx) { } } else { if (this->actor.colChkInfo.damageEffect == 2) { - func_8002A65C(globalCtx, &this->actor, &this->actor.posRot.pos, this->actor.scale.x * 4000.f, - this->actor.scale.x * 4000.f); + EffectSsFCircle_Spawn(globalCtx, &this->actor, &this->actor.posRot.pos, + this->actor.scale.x * 4000.f, this->actor.scale.x * 4000.f); } EnFloormas_SetupTakeDamage(this); } @@ -1071,7 +1071,7 @@ void EnFloormas_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis } } -static Color_RGBA8 sMergeColor = { 0x00, 0xFF, 0x00, 0x00 }; +static Color_RGBA8 sMergeColor = { 0, 255, 0, 0 }; void EnFloormas_Draw(Actor* thisx, GlobalContext* globalCtx) { EnFloormas* this = THIS; diff --git a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c index 89c61fa8fc..54122ebbdd 100644 --- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c +++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c @@ -1,15 +1,37 @@ +/* + * File: z_en_goroiwa.c + * Overlay: ovl_En_Goroiwa + * Description: Rolling boulders + */ + #include "z_en_goroiwa.h" +#include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" + +#include #define FLAGS 0x00000010 #define THIS ((EnGoroiwa*)thisx) +typedef s32 (*EnGoroiwaUnkFunc1)(EnGoroiwa* this, GlobalContext* globalCtx); +typedef void (*EnGoroiwaUnkFunc2)(EnGoroiwa* this); + void EnGoroiwa_Init(Actor* thisx, GlobalContext* globalCtx); void EnGoroiwa_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnGoroiwa_Update(Actor* thisx, GlobalContext* globalCtx); void EnGoroiwa_Draw(Actor* thisx, GlobalContext* globalCtx); -/* +void func_80A4D5E0(EnGoroiwa* this); +void func_80A4D624(EnGoroiwa* this, GlobalContext* globalCtx); +void func_80A4D8CC(EnGoroiwa* this); +void func_80A4D944(EnGoroiwa* this, GlobalContext* globalCtx); +void func_80A4D9DC(EnGoroiwa* this); +void func_80A4DA3C(EnGoroiwa* this, GlobalContext* globalCtx); +void func_80A4DA7C(EnGoroiwa* this); +void func_80A4DAD0(EnGoroiwa* this, GlobalContext* globalCtx); +void func_80A4DB90(EnGoroiwa* this); +void func_80A4DC00(EnGoroiwa* this, GlobalContext* globalCtx); + const ActorInit En_Goroiwa_InitVars = { ACTOR_EN_GOROIWA, ACTORTYPE_PROP, @@ -21,77 +43,688 @@ const ActorInit En_Goroiwa_InitVars = { (ActorFunc)EnGoroiwa_Update, (ActorFunc)EnGoroiwa_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BCA0.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BD04.s") +static ColliderJntSphItemInit sJntSphItemsInit[] = { + { + { 0x00, { 0x20000000, 0x00, 0x04 }, { 0x00000000, 0x00, 0x00 }, 0x01, 0x00, 0x01 }, + { 0, { { 0, 0, 0 }, 58 }, 100 }, + }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BD70.s") +static ColliderJntSphInit sJntSphInit = { + { COLTYPE_UNK10, 0x11, 0x00, 0x39, 0x20, COLSHAPE_JNTSPH }, + 1, + sJntSphItemsInit, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BD8C.s") +static CollisionCheckInfoInit sColChkInfoInit = { 0, 12, 60, 254 }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BE10.s") +// Unused +static f32 D_80A4DEBC[] = { 10.0f, 9.2f }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BE54.s") +extern Gfx D_0400D340[]; +extern Gfx D_060006B0[]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4BF28.s") +void func_80A4BCA0(EnGoroiwa* this) { + static f32 colliderHeightOffset[] = { 0.0f, 59.5f }; + Sphere16* worldSphere = &this->collider.list[0].dim.worldSphere; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C080.s") + worldSphere->center.x = this->actor.posRot.pos.x; + worldSphere->center.y = this->actor.posRot.pos.y + colliderHeightOffset[(this->actor.params >> 10) & 1]; + worldSphere->center.z = this->actor.posRot.pos.z; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C134.s") +void func_80A4BD04(EnGoroiwa* this, GlobalContext* globalCtx) { + s32 pad; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C164.s") + Collider_InitJntSph(globalCtx, &this->collider); + Collider_SetJntSph(globalCtx, &this->collider, &this->actor, &sJntSphInit, this->colliderItems); + func_80A4BCA0(this); + this->collider.list[0].dim.worldSphere.radius = 58; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C188.s") +void func_80A4BD70(EnGoroiwa* this, u8 arg1) { + this->unk_1D3 &= ~3; + this->unk_1D3 |= arg1; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C1C4.s") +s32 EnGoroiwa_Vec3fNormalize(Vec3f* ret, Vec3f* a) { + f32 magnitude = Math3D_Vec3fMagnitude(a); + f32 scale; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C264.s") + if (magnitude < 0.001f) { + return false; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C27C.s") + scale = 1.0f / magnitude; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C3A4.s") + ret->x = a->x * scale; + ret->y = a->y * scale; + ret->z = a->z * scale; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C594.s") + return true; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C6C8.s") +void EnGoroiwa_SetSpeed(EnGoroiwa* this, GlobalContext* globalCtx) { + if (globalCtx->sceneNum == SCENE_SPOT04) { + this->isInKokiri = true; + mREG(12) = 920; + } else { + this->isInKokiri = false; + mREG(12) = 1000; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4C814.s") +void func_80A4BE54(EnGoroiwa* this, GlobalContext* globalCtx) { + Path* path = &globalCtx->setupPathList[this->actor.params & 0xFF]; + Vec3s* nextPos = (Vec3s*)SEGMENTED_TO_VIRTUAL(path->points) + this->nextWaypoint; + Vec3f nextPosF; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4CA50.s") + nextPosF.x = nextPos->x; + nextPosF.y = nextPos->y; + nextPosF.z = nextPos->z; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4CB78.s") + this->actor.posRot.rot.y = Math_Vec3f_Yaw(&this->actor.posRot.pos, &nextPosF); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4CED8.s") +void func_80A4BF28(EnGoroiwa* this, GlobalContext* globalCtx, Vec3f* arg2) { + s16 temp_v0 = (this->actor.params >> 8) & 3; + Path* path = &globalCtx->setupPathList[this->actor.params & 0xFF]; + s16 temp_t0 = this->currentWaypoint - this->pathDirection; + Vec3s* pointPos; + Vec3s* currentPointPos; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D074.s") + if (temp_t0 < 0) { + if (temp_v0 == 0 || temp_v0 == 1) { + temp_t0 = this->endWaypoint; + } else if (temp_v0 == 3) { + temp_t0 = 1; + } + } else if (this->endWaypoint < temp_t0) { + if (temp_v0 == 0 || temp_v0 == 1) { + temp_t0 = 0; + } else if (temp_v0 == 3) { + temp_t0 = this->endWaypoint - 1; + } + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D0FC.s") + currentPointPos = (Vec3s*)SEGMENTED_TO_VIRTUAL(path->points) + this->currentWaypoint; + pointPos = (Vec3s*)SEGMENTED_TO_VIRTUAL(path->points) + temp_t0; + arg2->x = currentPointPos->x - pointPos->x; + arg2->y = currentPointPos->x - pointPos->y; + arg2->z = currentPointPos->x - pointPos->z; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Goroiwa/EnGoroiwa_Init.s") +void func_80A4C080(EnGoroiwa* this) { + s16 temp_v0 = (this->actor.params >> 8) & 3; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Goroiwa/EnGoroiwa_Destroy.s") + if (this->nextWaypoint < 0) { + if (temp_v0 == 0 || temp_v0 == 1) { + this->currentWaypoint = this->endWaypoint; + this->nextWaypoint = this->endWaypoint - 1; + this->pathDirection = -1; + } else if (temp_v0 == 3) { + this->currentWaypoint = 0; + this->nextWaypoint = 1; + this->pathDirection = 1; + } + } else if (this->nextWaypoint > this->endWaypoint) { + if (temp_v0 == 0 || temp_v0 == 1) { + this->currentWaypoint = 0; + this->nextWaypoint = 1; + this->pathDirection = 1; + } else if (temp_v0 == 3) { + this->currentWaypoint = this->endWaypoint; + this->nextWaypoint = this->endWaypoint - 1; + this->pathDirection = -1; + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D5E0.s") +void func_80A4C134(EnGoroiwa* this) { + this->currentWaypoint = this->nextWaypoint; + this->nextWaypoint += this->pathDirection; + func_80A4C080(this); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D624.s") +void func_80A4C164(EnGoroiwa* this) { + this->pathDirection *= -1; + this->currentWaypoint = this->nextWaypoint; + this->nextWaypoint += this->pathDirection; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D8CC.s") +void func_80A4C188(EnGoroiwa* this, GlobalContext* globalCtx) { + this->endWaypoint = globalCtx->setupPathList[this->actor.params & 0xFF].count - 1; + this->currentWaypoint = 0; + this->nextWaypoint = 1; + this->pathDirection = 1; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D944.s") +void func_80A4C1C4(EnGoroiwa* this, GlobalContext* globalCtx, s32 waypoint) { + Path* path = &globalCtx->setupPathList[this->actor.params & 0xFF]; + Vec3s* pointPos = (Vec3s*)SEGMENTED_TO_VIRTUAL(path->points) + waypoint; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D9DC.s") + this->actor.posRot.pos.x = pointPos->x; + this->actor.posRot.pos.y = pointPos->y; + this->actor.posRot.pos.z = pointPos->z; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4DA3C.s") +void func_80A4C264(EnGoroiwa* this) { + this->unk_1B0.x = 1.0f; + this->unk_1C0 = 1.0f; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4DA7C.s") +s32 func_80A4C27C(EnGoroiwa* this, GlobalContext* globalCtx) { + s32 pad; + Path* path = &globalCtx->setupPathList[this->actor.params & 0xFF]; + Vec3s* nextPointPos = (Vec3s*)SEGMENTED_TO_VIRTUAL(path->points) + this->nextWaypoint; + Vec3s* currentPointPos = (Vec3s*)SEGMENTED_TO_VIRTUAL(path->points) + this->currentWaypoint; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4DAD0.s") + if (nextPointPos->x == currentPointPos->x && nextPointPos->z == currentPointPos->z) { + if (nextPointPos->y == currentPointPos->y) { + // Translation: Error: Invalid path data (points overlap) + osSyncPrintf("Error : レールデータ不正(点が重なっている)"); + osSyncPrintf("(%s %d)(arg_data 0x%04x)\n", "../z_en_gr.c", 559, this->actor.params); + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4DB90.s") + if (nextPointPos->y > currentPointPos->y) { + return 1; + } else { + return -1; + } + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4DC00.s") + return 0; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Goroiwa/EnGoroiwa_Update.s") +void EnGoroiwa_SpawnDust(GlobalContext* globalCtx, Vec3f* pos) { + static Vec3f velocity = { 0.0f, 0.0f, 0.0f }; + static Vec3f accel = { 0.0f, 0.3f, 0.0f }; + Vec3f randPos; + s32 i; + s16 angle = 0; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Goroiwa/EnGoroiwa_Draw.s") + for (i = 0; i < 8; i++) { + angle += 0x4E20; + randPos.x = pos->x + ((47.0f * ((Math_Rand_ZeroOne() * 0.5f) + 0.5f)) * Math_Sins(angle)); + randPos.y = pos->y + ((Math_Rand_ZeroOne() - 0.5f) * 40.0f); + randPos.z = pos->z + ((47.0f * ((Math_Rand_ZeroOne() * 0.5f) + 0.5f))) * Math_Coss(angle); + func_800286CC(globalCtx, &randPos, &velocity, &accel, (s16)(Math_Rand_ZeroOne() * 30.0f) + 100, 80); + func_800286CC(globalCtx, &randPos, &velocity, &accel, (s16)(Math_Rand_ZeroOne() * 20.0f) + 80, 80); + } +} + +void EnGoroiwa_SpawnWaterEffects(GlobalContext* globalCtx, Vec3f* contactPos) { + Vec3f splashPos; + s32 i; + s16 angle = 0; + + for (i = 0; i < 11; i++) { + angle += 0x1746; + splashPos.x = contactPos->x + (Math_Sins(angle) * 55.0f); + splashPos.y = contactPos->y; + splashPos.z = contactPos->z + (Math_Coss(angle) * 55.0f); + EffectSsGSplash_Spawn(globalCtx, &splashPos, 0, 0, 0, 350); + } + + EffectSsGRipple_Spawn(globalCtx, contactPos, 300, 700, 0); + EffectSsGRipple_Spawn(globalCtx, contactPos, 500, 900, 4); + EffectSsGRipple_Spawn(globalCtx, contactPos, 500, 1300, 8); +} + +s32 func_80A4C6C8(EnGoroiwa* this, GlobalContext* globalCtx) { + Path* path; + s32 result; + s32 pad; + Vec3s* nextPointPos; + + Math_ApproxF(&this->actor.speedXZ, mREG(12) * 0.01f, 0.3f); + func_8002D868(&this->actor); + path = &globalCtx->setupPathList[this->actor.params & 0xFF]; + nextPointPos = (Vec3s*)SEGMENTED_TO_VIRTUAL(path->points) + this->nextWaypoint; + result = Math_ApproxF(&this->actor.posRot.pos.x, nextPointPos->x, fabsf(this->actor.velocity.x)) & 1; + result &= Math_ApproxF(&this->actor.posRot.pos.z, nextPointPos->z, fabsf(this->actor.velocity.z)); + this->actor.posRot.pos.y += this->actor.velocity.y; + return result; +} + +s32 func_80A4C814(EnGoroiwa* this, GlobalContext* globalCtx) { + Path* path = &globalCtx->setupPathList[this->actor.params & 0xFF]; + s32 pad; + Vec3s* nextPointPos = (Vec3s*)SEGMENTED_TO_VIRTUAL(path->points) + this->nextWaypoint; + Vec3s* currentPointPos = (Vec3s*)SEGMENTED_TO_VIRTUAL(path->points) + this->currentWaypoint; + s32 result; + Vec3f posDiff; + Vec3f nextPointPosF; + + nextPointPosF.x = nextPointPos->x; + nextPointPosF.y = nextPointPos->y; + nextPointPosF.z = nextPointPos->z; + Math_ApproxF(&this->actor.speedXZ, mREG(12) * 0.01f, 0.3f); + if (Math3D_Vec3fDistSq(&nextPointPosF, &this->actor.posRot.pos) < 25.0f) { + Math_Vec3f_Diff(&nextPointPosF, &this->actor.posRot.pos, &posDiff); + } else { + posDiff.x = nextPointPosF.x - currentPointPos->x; + posDiff.y = nextPointPosF.y - currentPointPos->y; + posDiff.z = nextPointPosF.z - currentPointPos->z; + } + EnGoroiwa_Vec3fNormalize(&this->actor.velocity, &posDiff); + this->actor.velocity.x *= this->actor.speedXZ; + this->actor.velocity.y *= this->actor.speedXZ; + this->actor.velocity.z *= this->actor.speedXZ; + result = Math_ApproxF(&this->actor.posRot.pos.x, nextPointPosF.x, fabsf(this->actor.velocity.x)) & 1; + result &= Math_ApproxF(&this->actor.posRot.pos.y, nextPointPosF.y, fabsf(this->actor.velocity.y)); + result &= Math_ApproxF(&this->actor.posRot.pos.z, nextPointPosF.z, fabsf(this->actor.velocity.z)); + return result; +} + +s32 func_80A4CA50(EnGoroiwa* this, GlobalContext* globalCtx) { + s32 pad; + Path* path = &globalCtx->setupPathList[this->actor.params & 0xFF]; + Vec3s* nextPointPos = (Vec3s*)SEGMENTED_TO_VIRTUAL(path->points) + this->nextWaypoint; + + Math_ApproxF(&this->actor.velocity.y, (mREG(12) * 0.01f) * 0.5f, 0.18f); + this->actor.posRot.pos.x = nextPointPos->x; + this->actor.posRot.pos.z = nextPointPos->z; + return Math_ApproxF(&this->actor.posRot.pos.y, nextPointPos->y, fabsf(this->actor.velocity.y)); +} + +s32 func_80A4CB78(EnGoroiwa* this, GlobalContext* globalCtx) { + s32 pad; + Path* path = &globalCtx->setupPathList[this->actor.params & 0xFF]; + Vec3s* nextPointPos = (Vec3s*)SEGMENTED_TO_VIRTUAL(path->points) + this->nextWaypoint; + f32 nextPointY; + f32 thisY; + f32 temp; + s32 quakeIdx; + CollisionPoly* sp68; + Vec3f sp5C; + f32 temp_f0_2; + s32 pad2; + u32 sp50; + Vec3f sp44; + WaterBox* waterBox; + f32 ySurface; + Vec3f sp30; + + nextPointY = nextPointPos->y; + Math_ApproxF(&this->actor.velocity.y, -14.0f, 1.0f); + this->actor.posRot.pos.x = nextPointPos->x; + this->actor.posRot.pos.z = nextPointPos->z; + thisY = this->actor.posRot.pos.y; + if (1) {} + this->actor.posRot.pos.y += this->actor.velocity.y; + if (this->actor.velocity.y < 0.0f && this->actor.posRot.pos.y <= nextPointY) { + if (this->unk_1C6 == 0) { + if (this->actor.xzDistFromLink < 600.0f) { + quakeIdx = Quake_Add(ACTIVE_CAM, 3); + Quake_SetSpeed(quakeIdx, -0x3CB0); + Quake_SetQuakeValues(quakeIdx, 3, 0, 0, 0); + Quake_SetCountdown(quakeIdx, 7); + } + this->unk_1C0 = 0.0f; + if (!(this->unk_1D3 & 0x10)) { + sp5C.x = this->actor.posRot.pos.x; + sp5C.y = this->actor.posRot.pos.y + 50.0f; + sp5C.z = this->actor.posRot.pos.z; + temp_f0_2 = func_8003CA0C(globalCtx, &globalCtx->colCtx, &sp68, &sp50, &this->actor, &sp5C); + // temp needed to match + temp = temp_f0_2 - (this->actor.posRot.pos.y - 59.5f); + if (fabsf(temp) < 15.0f) { + sp44.x = this->actor.posRot.pos.x; + sp44.y = temp_f0_2 + 10.0f; + sp44.z = this->actor.posRot.pos.z; + EnGoroiwa_SpawnDust(globalCtx, &sp44); + } + } + } + if (this->unk_1C6 > 0) { + return true; + } + this->unk_1C6 += 1; + this->actor.velocity.y *= -0.3f; + this->actor.posRot.pos.y = nextPointY - ((this->actor.posRot.pos.y - nextPointY) * 0.3f); + } + if (this->unk_1C6 == 0 && + func_80042244(globalCtx, &globalCtx->colCtx, this->actor.posRot.pos.x, this->actor.posRot.pos.z, &ySurface, + &waterBox) && + this->actor.posRot.pos.y <= ySurface) { + this->unk_1D3 |= 0x10; + if (ySurface < thisY) { + sp30.x = this->actor.posRot.pos.x; + sp30.y = ySurface; + sp30.z = this->actor.posRot.pos.z; + EnGoroiwa_SpawnWaterEffects(globalCtx, &sp30); + this->actor.velocity.y *= 0.2f; + } + if (this->actor.velocity.y < -8.0f) { + this->actor.velocity.y = -8.0f; + } + } + return false; +} + +void func_80A4CED8(EnGoroiwa* this, GlobalContext* globalCtx) { + static Vec3f unitY = { 0.0f, 1.0f, 0.0f }; + s32 pad; + Vec3f* temp; + f32 sp8C; + Vec3f sp80; + Vec3f sp74; + MtxF mtx; + Vec3f sp28; + + if (this->unk_1D3 & 8) { + sp8C = this->unk_1BC; + } else { + this->unk_1BC = Math3D_Vec3f_DistXYZ(&this->actor.posRot.pos, &this->actor.pos4) * 0.016806724f; + sp8C = this->unk_1BC; + } + sp8C *= this->unk_1C0; + // temp assignment needed to match + temp = &sp80; + if (this->unk_1D3 & 8) { + func_80A4BF28(this, globalCtx, &sp28); + Math3D_Vec3f_Cross(&unitY, &this->actor.velocity, temp); + } else { + Math3D_Vec3f_Cross(&unitY, &this->actor.velocity, temp); + } + + if (EnGoroiwa_Vec3fNormalize(&sp74, temp)) { + this->unk_1B0 = sp74; + } else { + sp74 = this->unk_1B0; + } + + func_800D23FC(sp8C, &sp74, 0); + Matrix_RotateY(this->actor.shape.rot.y * (2.0f * M_PI / 0x10000), 1); + Matrix_RotateX(this->actor.shape.rot.x * (2.0f * M_PI / 0x10000), 1); + Matrix_RotateZ(this->actor.shape.rot.z * (2.0f * M_PI / 0x10000), 1); + Matrix_Get(&mtx); + func_800D20CC(&mtx, &this->actor.shape.rot, 0); +} + +void func_80A4D074(EnGoroiwa* this, GlobalContext* globalCtx) { + s16 temp_v0 = (this->actor.params >> 8) & 3; + + func_80A4C134(this); + + if (temp_v0 == 0 || temp_v0 == 1) { + if (this->currentWaypoint == 0 || this->currentWaypoint == this->endWaypoint) { + func_80A4C1C4(this, globalCtx, this->currentWaypoint); + } + } + + func_80A4BE54(this, globalCtx); +} + +void func_80A4D0FC(EnGoroiwa* this, GlobalContext* globalCtx) { + static f32 colliderHeightOffset[] = { 0.0f, 59.5f }; + s16 angle1; + s16 angle2; + s32 pad; + Vec3f* thisPos = &this->actor.posRot.pos; + Vec3f effectPos; + Vec3f fragmentVelocity; + f32 temp_f24; + f32 temp_f22; + f32 temp_f20; + f32 temp_f20_2; + s16 temp_v0 = (this->actor.params >> 10) & 1; + s32 i; + + for (i = 0, angle1 = 0; i < 16; i++, angle1 += 0x4E20) { + temp_f22 = Math_Sins(angle1); + temp_f24 = Math_Coss(angle1); + angle2 = Math_Rand_ZeroOne() * 0xFFFF; + effectPos.x = ((Math_Rand_ZeroOne() * 50.0f) * temp_f22) * Math_Sins(angle2); + temp_f20_2 = Math_Sins(angle2); + effectPos.y = (((Math_Rand_ZeroOne() - 0.5f) * 100.0f) * temp_f20_2) + colliderHeightOffset[temp_v0]; + effectPos.z = ((Math_Rand_ZeroOne() * 50.0f) * temp_f24) * Math_Sins(angle2); + fragmentVelocity.x = effectPos.x * 0.2f; + fragmentVelocity.y = (Math_Rand_ZeroOne() * 15.0f) + 2.0f; + fragmentVelocity.z = effectPos.z * 0.2f; + Math_Vec3f_Sum(&effectPos, thisPos, &effectPos); + EffectSsKakera_Spawn(globalCtx, &effectPos, &fragmentVelocity, &effectPos, -340, 33, 28, 2, 0, + (Math_Rand_ZeroOne() * 7.0f) + 1.0f, 1, 0, 70, KAKERA_COLOR_NONE, 1, D_0400D340); + } + + effectPos.x = thisPos->x; + effectPos.y = thisPos->y + colliderHeightOffset[temp_v0]; + effectPos.z = thisPos->z; + func_80033480(globalCtx, &effectPos, 80.0f, 5, 70, 110, 1); + func_80033480(globalCtx, &effectPos, 90.0f, 5, 110, 160, 1); +} + +static InitChainEntry sInitChain[] = { + ICHAIN_F32_DIV1000(gravity, -860, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(minVelocityY, -15000, ICHAIN_CONTINUE), + ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), ICHAIN_F32(uncullZoneForward, 1500, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneScale, 150, ICHAIN_CONTINUE), ICHAIN_F32(uncullZoneDownward, 1500, ICHAIN_STOP), +}; + +void EnGoroiwa_Init(Actor* thisx, GlobalContext* globalCtx) { + static f32 D_80A4DF10[] = { 0.0f, 595.0f }; + EnGoroiwa* this = THIS; + s32 pathIdx; + + Actor_ProcessInitChain(&this->actor, sInitChain); + func_80A4BD04(this, globalCtx); + pathIdx = this->actor.params & 0xFF; + if (pathIdx == 0xFF) { + // Translation: Error: Invalid arg_data + osSyncPrintf("Ｅｒｒｏｒ : arg_data が不正(%s %d)(arg_data 0x%04x)\n", "../z_en_gr.c", 1033, + this->actor.params); + Actor_Kill(&this->actor); + return; + } + if (globalCtx->setupPathList[pathIdx].count < 2) { + // Translation: Error: Invalid Path Data + osSyncPrintf("Ｅｒｒｏｒ : レールデータ が不正(%s %d)\n", "../z_en_gr.c", 1043); + Actor_Kill(&this->actor); + return; + } + func_80061ED4(&this->actor.colChkInfo, NULL, &sColChkInfoInit); + ActorShape_Init(&this->actor.shape, D_80A4DF10[(this->actor.params >> 10) & 1], ActorShadow_DrawFunc_Circle, 9.4f); + this->actor.shape.unk_14 = 200; + EnGoroiwa_SetSpeed(this, globalCtx); + func_80A4C188(this, globalCtx); + func_80A4C1C4(this, globalCtx, 0); + func_80A4C264(this); + func_80A4BE54(this, globalCtx); + func_80A4D5E0(this); + // Translation: (Goroiwa) + osSyncPrintf("(ごろ岩)(arg 0x%04x)(rail %d)(end %d)(bgc %d)(hit %d)\n", this->actor.params, + this->actor.params & 0xFF, (this->actor.params >> 8) & 3, (this->actor.params >> 10) & 1, + this->actor.initPosRot.rot.z & 1); +} + +void EnGoroiwa_Destroy(Actor* thisx, GlobalContext* globalCtx) { + Collider_DestroyJntSph(globalCtx, &THIS->collider); +} + +void func_80A4D5E0(EnGoroiwa* this) { + this->actionFunc = func_80A4D624; + func_80A4BD70(this, 3); + this->unk_1C0 = 1.0f; +} + +static EnGoroiwaUnkFunc1 D_80A4DF18[] = { func_80A4C814, func_80A4C6C8 }; +static EnGoroiwaUnkFunc2 D_80A4DF20[] = { func_80A4D9DC, func_80A4D8CC }; + +void func_80A4D624(EnGoroiwa* this, GlobalContext* globalCtx) { + s32 temp_v0_5; + s16 yawDiff; + s16 temp_v1_2; + + if (this->collider.base.atFlags & 2) { + this->collider.base.atFlags &= ~2; + this->unk_1D3 &= ~4; + yawDiff = this->actor.yawTowardsLink - this->actor.posRot.rot.y; + if (yawDiff > -0x4000 && yawDiff < 0x4000) { + this->unk_1D3 |= 4; + if ((this->actor.params >> 10) & 1 || (this->actor.initPosRot.rot.z & 1) != 1) { + func_80A4C164(this); + func_80A4BE54(this, globalCtx); + } + } + func_8002F6D4(globalCtx, &this->actor, 2.0f, this->actor.yawTowardsLink, 0.0f, 0); + osSyncPrintf(VT_FGCOL(CYAN)); + // Translation: Player knocked down + osSyncPrintf("Player ぶっ飛ばし\n"); + osSyncPrintf(VT_RST); + D_80A4DF20[(this->actor.params >> 10) & 1](this); + func_8002F7DC(&PLAYER->actor, NA_SE_PL_BODY_HIT); + if ((this->actor.initPosRot.rot.z & 1) == 1) { + this->collisionTimer = 50; + } + } else if (D_80A4DF18[(this->actor.params >> 10) & 1](this, globalCtx)) { + temp_v1_2 = (this->actor.params >> 8) & 3; + if (temp_v1_2 == 1) { + if (this->nextWaypoint == 0 || this->nextWaypoint == this->endWaypoint) { + func_80A4D0FC(this, globalCtx); + } + } + func_80A4D074(this, globalCtx); + if ((temp_v1_2 == 3) && (this->currentWaypoint == 0 || this->currentWaypoint == this->endWaypoint)) { + func_80A4D9DC(this); + } else if (!((this->actor.params >> 10) & 1) && this->currentWaypoint != 0 && + this->currentWaypoint != this->endWaypoint) { + temp_v0_5 = func_80A4C27C(this, globalCtx); + if (temp_v0_5 > 0) { + func_80A4DA7C(this); + } else if (temp_v0_5 < 0) { + func_80A4DB90(this); + } else { + func_80A4D5E0(this); + } + } else { + func_80A4D5E0(this); + } + } + Audio_PlayActorSound2(&this->actor, NA_SE_EV_BIGBALL_ROLL - SFX_FLAG); +} + +void func_80A4D8CC(EnGoroiwa* this) { + this->actionFunc = func_80A4D944; + func_80A4BD70(this, 2); + this->actor.gravity = -0.86f; + this->actor.minVelocityY = -15.0f; + this->actor.speedXZ *= 0.15f; + this->actor.velocity.y = 5.0f; + this->unk_1C0 = 1.0f; +} + +void func_80A4D944(EnGoroiwa* this, GlobalContext* globalCtx) { + func_80A4C6C8(this, globalCtx); + if (this->actor.bgCheckFlags & 1 && this->actor.velocity.y < 0.0f) { + if (this->unk_1D3 & 4 && (this->actor.initPosRot.rot.z & 1) == 1) { + func_80A4C164(this); + func_80A4BE54(this, globalCtx); + } + func_80A4D9DC(this); + } +} + +void func_80A4D9DC(EnGoroiwa* this) { + static s16 waitDurations[] = { 20, 6 }; + + this->actionFunc = func_80A4DA3C; + this->actor.speedXZ = 0.0f; + func_80A4BD70(this, 2); + this->waitTimer = waitDurations[this->actor.initPosRot.rot.z & 1]; + this->unk_1C0 = 0.0f; +} + +void func_80A4DA3C(EnGoroiwa* this, GlobalContext* globalCtx) { + if (this->waitTimer > 0) { + this->waitTimer--; + } else { + this->collider.base.atFlags &= ~2; + func_80A4D5E0(this); + } +} + +void func_80A4DA7C(EnGoroiwa* this) { + this->actionFunc = func_80A4DAD0; + func_80A4BD70(this, 3); + this->unk_1C0 = 0.0f; + this->actor.velocity.y = fabsf(this->actor.speedXZ) * 0.1f; +} + +void func_80A4DAD0(EnGoroiwa* this, GlobalContext* globalCtx) { + if (this->collider.base.atFlags & 2) { + this->collider.base.atFlags &= ~2; + func_8002F6D4(globalCtx, &this->actor, 2.0f, this->actor.yawTowardsLink, 0.0f, 4); + func_8002F7DC(&PLAYER->actor, NA_SE_PL_BODY_HIT); + if ((this->actor.initPosRot.rot.z & 1) == 1) { + this->collisionTimer = 50; + } + } else if (func_80A4CA50(this, globalCtx)) { + func_80A4D074(this, globalCtx); + func_80A4D5E0(this); + this->actor.speedXZ = 0.0f; + } +} + +void func_80A4DB90(EnGoroiwa* this) { + this->actionFunc = func_80A4DC00; + func_80A4BD70(this, 3); + this->unk_1C0 = 0.3f; + this->unk_1C6 = 0; + this->actor.velocity.y = fabsf(this->actor.speedXZ) * -0.3f; + this->unk_1D3 |= 8; + this->unk_1D3 &= ~0x10; +} + +void func_80A4DC00(EnGoroiwa* this, GlobalContext* globalCtx) { + if (this->collider.base.atFlags & 2) { + this->collider.base.atFlags &= ~2; + func_8002F6D4(globalCtx, &this->actor, 2.0f, this->actor.yawTowardsLink, 0.0f, 4); + func_8002F7DC(&PLAYER->actor, NA_SE_PL_BODY_HIT); + if ((this->actor.initPosRot.rot.z & 1) == 1) { + this->collisionTimer = 50; + } + } else if (func_80A4CB78(this, globalCtx)) { + func_80A4D074(this, globalCtx); + func_80A4D5E0(this); + this->unk_1D3 &= ~8; + this->actor.speedXZ = 0.0f; + } +} + +void EnGoroiwa_Update(Actor* thisx, GlobalContext* globalCtx) { + EnGoroiwa* this = THIS; + Player* player = PLAYER; + s32 pad; + UNK_TYPE sp30; + + if (!(player->stateFlags1 & 0x300000C0)) { + if (this->collisionTimer > 0) { + this->collisionTimer--; + } + this->actionFunc(this, globalCtx); + switch ((this->actor.params >> 10) & 1) { + case 1: + func_8002E4B4(globalCtx, &this->actor, 0.0f, 0.0f, 0.0f, 0x1C); + break; + case 0: + this->actor.groundY = func_8003C9A4(&globalCtx->colCtx, &this->actor.floorPoly, &sp30, &this->actor, + &this->actor.posRot.pos); + break; + } + func_80A4CED8(this, globalCtx); + if (this->actor.xzDistFromLink < 300.0f) { + func_80A4BCA0(this); + if (this->unk_1D3 & 1 && this->collisionTimer <= 0) { + CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + } + if (this->unk_1D3 & 2 && this->collisionTimer <= 0) { + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + } + } + } +} + +void EnGoroiwa_Draw(Actor* thisx, GlobalContext* globalCtx) { + Gfx_DrawDListOpa(globalCtx, D_060006B0); +} diff --git a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.h b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.h index db40e3b4c8..246d14eeec 100644 --- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.h +++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.h @@ -6,9 +6,25 @@ struct EnGoroiwa; +typedef void (*EnGoroiwaActionFunc)(struct EnGoroiwa*, GlobalContext*); + typedef struct EnGoroiwa { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x88]; + /* 0x014C */ EnGoroiwaActionFunc actionFunc; + /* 0x0150 */ ColliderJntSph collider; + /* 0x0170 */ ColliderJntSphItem colliderItems[1]; + /* 0x01B0 */ Vec3f unk_1B0; + /* 0x01BC */ f32 unk_1BC; + /* 0x01C0 */ f32 unk_1C0; + /* 0x01C4 */ s16 waitTimer; + /* 0x01C6 */ s16 unk_1C6; + /* 0x01C8 */ s16 collisionTimer; + /* 0x01CA */ s16 endWaypoint; + /* 0x01CC */ s16 currentWaypoint; + /* 0x01CE */ s16 nextWaypoint; + /* 0x01D0 */ s16 pathDirection; + /* 0x01D2 */ u8 isInKokiri; + /* 0x01D3 */ u8 unk_1D3; } EnGoroiwa; // size = 0x01D4 extern const ActorInit En_Goroiwa_InitVars; diff --git a/src/overlays/actors/ovl_En_Insect/z_en_insect.c b/src/overlays/actors/ovl_En_Insect/z_en_insect.c index f23e916672..60958b8b1d 100644 --- a/src/overlays/actors/ovl_En_Insect/z_en_insect.c +++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.c @@ -67,8 +67,6 @@ static InitChainEntry sInitChain[] = { ICHAIN_F32(uncullZoneDownward, 600, ICHAIN_STOP), }; -Vec3f D_80A7DF28[2] = { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } }; - void func_80A7BE20(EnInsect* this) { this->unk_314 = D_80A7DF10[this->actor.params & 3]; } @@ -397,8 +395,10 @@ void func_80A7CBC8(EnInsect* this) { } void func_80A7CC3C(EnInsect* this, GlobalContext* globalCtx) { + static Vec3f accel = { 0.0f, 0.0f, 0.0f }; + static Vec3f unused = { 0.0f, 0.0f, 0.0f }; s32 pad[2]; - Vec3f sp34; + Vec3f velocity; Math_SmoothScaleMaxMinF(&this->actor.speedXZ, 0.0f, 0.1f, 0.5f, 0.0f); Math_ApproxS(&this->actor.shape.rot.x, 10922, 352); @@ -411,11 +411,11 @@ void func_80A7CC3C(EnInsect* this, GlobalContext* globalCtx) { SkelAnime_FrameUpdateMatrix(&this->skelAnime); - if (this->unk_31A >= 21 && Math_Rand_ZeroOne() < 0.1f) { - sp34.x = Math_Sins(this->actor.shape.rot.y) * -0.6f; - sp34.y = Math_Sins(this->actor.shape.rot.x) * 0.6f; - sp34.z = Math_Coss(this->actor.shape.rot.y) * -0.6f; - func_800286CC(globalCtx, &this->actor.posRot.pos, &sp34, D_80A7DF28, Math_Rand_ZeroOne() * 5.0f + 8.0f, + if (this->unk_31A > 20 && Math_Rand_ZeroOne() < 0.1f) { + velocity.x = Math_Sins(this->actor.shape.rot.y) * -0.6f; + velocity.y = Math_Sins(this->actor.shape.rot.x) * 0.6f; + velocity.z = Math_Coss(this->actor.shape.rot.y) * -0.6f; + func_800286CC(globalCtx, &this->actor.posRot.pos, &velocity, &accel, Math_Rand_ZeroOne() * 5.0f + 8.0f, Math_Rand_ZeroOne() * 5.0f + 8.0f); } @@ -497,8 +497,8 @@ void func_80A7CEC0(EnInsect* this, GlobalContext* globalCtx) { sp40.x = this->actor.posRot.pos.x; sp40.y = this->actor.posRot.pos.y + this->actor.waterY; sp40.z = this->actor.posRot.pos.z; - func_80029444(globalCtx, &sp40, 20, 100, 4); - func_80029444(globalCtx, &sp40, 40, 200, 8); + EffectSsGRipple_Spawn(globalCtx, &sp40, 20, 100, 4); + EffectSsGRipple_Spawn(globalCtx, &sp40, 40, 200, 8); } if (this->unk_31A <= 0 || ((this->unk_314 & 4) && this->unk_31C <= 0) || @@ -532,7 +532,8 @@ void func_80A7D26C(EnInsect* this, GlobalContext* globalCtx) { Actor_SetScale(&this->actor, CLAMP_MIN(this->actor.scale.x - 0.00005f, 0.001f)); if (this->actor.waterY > 5.0f && this->actor.waterY < 30.0f && Math_Rand_ZeroOne() < 0.3f) { - func_800293E4(globalCtx, &this->actor.posRot.pos, -5.0f, 5.0f, 5.0f, (Math_Rand_ZeroOne() * 0.04f) + 0.02f); + EffectSsBubble_Spawn(globalCtx, &this->actor.posRot.pos, -5.0f, 5.0f, 5.0f, + (Math_Rand_ZeroOne() * 0.04f) + 0.02f); } if (this->unk_31A <= 0) { diff --git a/src/overlays/actors/ovl_En_Light/z_en_light.c b/src/overlays/actors/ovl_En_Light/z_en_light.c index c46c1054d2..531af5facb 100644 --- a/src/overlays/actors/ovl_En_Light/z_en_light.c +++ b/src/overlays/actors/ovl_En_Light/z_en_light.c @@ -29,7 +29,7 @@ const ActorInit En_Light_InitVars = { }; typedef struct { - /* 0x00 */ Color_RGBA8_n primColor; + /* 0x00 */ Color_RGBA8 primColor; /* 0x04 */ Color_RGB8 envColor; /* 0x07 */ u8 scale; } FlameParams; diff --git a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c index 01a04ca037..480dbbd28d 100644 --- a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c +++ b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c @@ -5,6 +5,7 @@ */ #include "z_en_nutsball.h" +#include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" #define FLAGS 0x00000010 @@ -109,7 +110,7 @@ void func_80ABBBA8(EnNutsball* this, GlobalContext* globalCtx) { sp40.y = this->actor.posRot.pos.y + 4; sp40.z = this->actor.posRot.pos.z; - func_800297A4(globalCtx, &sp40, 6.0f, 0, 7, 3, 15, -1, 10, 0); + EffectSsHahen_SpawnBurst(globalCtx, &sp40, 6.0f, 0, 7, 3, 15, HAHEN_OBJECT_DEFAULT, 10, NULL); Audio_PlaySoundAtPosition(globalCtx, &this->actor.posRot.pos, 20, NA_SE_EN_OCTAROCK_ROCK); Actor_Kill(&this->actor); } else { diff --git a/src/overlays/actors/ovl_En_Rd/z_en_rd.c b/src/overlays/actors/ovl_En_Rd/z_en_rd.c index 22f1744e52..a0740d0577 100644 --- a/src/overlays/actors/ovl_En_Rd/z_en_rd.c +++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.c @@ -62,12 +62,12 @@ static InitChainEntry sInitChain[] = { static Vec3f D_80AE4918 = { 0.0f, 0.0f, 0.0f }; // I'm guessing these are primitive and environment colors that go unused -static Color_RGBA8_n D_80AE4924 = { 200, 200, 255, 255 }; -static Color_RGBA8_n D_80AE4928 = { 0, 0, 255, 0 }; +static Color_RGBA8 D_80AE4924 = { 200, 200, 255, 255 }; +static Color_RGBA8 D_80AE4928 = { 0, 0, 255, 0 }; static Vec3f D_80AE492C = { 0.0f, 0.0f, 0.0f }; -static Color_RGBA8_n D_80AE4938 = { 200, 200, 255, 255 }; -static Color_RGBA8_n D_80AE493C = { 0, 0, 255, 0 }; +static Color_RGBA8 D_80AE4938 = { 200, 200, 255, 255 }; +static Color_RGBA8 D_80AE493C = { 0, 0, 255, 0 }; static Vec3f D_80AE4940 = { 300.0f, 0.0f, 0.0f }; static Vec3f D_80AE494C = { 300.0f, 0.0f, 0.0f }; @@ -277,8 +277,8 @@ void func_80AE2B90(EnRd* this, GlobalContext* globalCtx) { void func_80AE2C1C(EnRd* this, GlobalContext* globalCtx) { Vec3f sp44 = D_80AE4918; - Color_RGBA8_n sp40 = D_80AE4924; - Color_RGBA8_n sp3C = D_80AE4928; + Color_RGBA8 sp40 = D_80AE4924; + Color_RGBA8 sp3C = D_80AE4928; Player* player = PLAYER; s32 pad; s16 sp32 = this->actor.yawTowardsLink - this->actor.shape.rot.y - this->unk_30E - this->unk_310; @@ -518,8 +518,8 @@ void func_80AE37BC(EnRd* this) { void func_80AE3834(EnRd* this, GlobalContext* globalCtx) { Vec3f sp34 = D_80AE492C; - Color_RGBA8_n sp30 = D_80AE4938; - Color_RGBA8_n sp2C = D_80AE493C; + Color_RGBA8 sp30 = D_80AE4938; + Color_RGBA8 sp2C = D_80AE493C; Player* player = PLAYER; s16 temp_v0 = this->actor.yawTowardsLink - this->actor.shape.rot.y - this->unk_30E - this->unk_310; @@ -866,9 +866,9 @@ void EnRd_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec if (idx >= 0) { Matrix_MultVec3f(&sp2C, &destPos); - this->unkFire[idx].x = destPos.x; - this->unkFire[idx].y = destPos.y; - this->unkFire[idx].z = destPos.z; + this->firePos[idx].x = destPos.x; + this->firePos[idx].y = destPos.y; + this->firePos[idx].z = destPos.z; } } } @@ -892,8 +892,8 @@ void EnRd_Draw(Actor* thisx, GlobalContext* globalCtx) { this->actor.dmgEffectTimer++; THIS->unk_31A--; if (this->unk_31A % 4 == 0) { - func_8002A54C(globalCtx, &this->actor, &this->unkFire[this->unk_31A >> 2], 0x4B, 0, 0, - (this->unk_31A >> 2)); + EffectSsEnFire_SpawnVec3s(globalCtx, &this->actor, &this->firePos[this->unk_31A >> 2], 0x4B, 0, 0, + (this->unk_31A >> 2)); } } } else { diff --git a/src/overlays/actors/ovl_En_Rd/z_en_rd.h b/src/overlays/actors/ovl_En_Rd/z_en_rd.h index 71faf98a92..7fcfde0816 100644 --- a/src/overlays/actors/ovl_En_Rd/z_en_rd.h +++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.h @@ -10,7 +10,7 @@ typedef void (*EnRdActionFunc)(struct EnRd*, GlobalContext*); typedef struct EnRd { /* 0x0000 */ Actor actor; - /* 0x014C */ Vec3s unkFire[10]; + /* 0x014C */ Vec3s firePos[10]; /* 0x0188 */ SkelAnime skelAnime; /* 0x01CC */ Vec3s limbDrawTable[26]; /* 0x0268 */ Vec3s transitionDrawTable[26]; diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c index 1929f6b3e2..5a47e1cf75 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c @@ -439,31 +439,28 @@ s32 func_80AEB480(GlobalContext* globalCtx, u16 action) { return func_80AEAFE0(globalCtx, action, 3); } -void func_80AEB4A8(EnRu1* this, GlobalContext* globalCtx, s16 arg2, s16 arg3) { - Vec3f sp24; +void EnRu1_SpawnRipple(EnRu1* this, GlobalContext* globalCtx, s16 radiusMax, s16 life) { + Vec3f pos; Actor* thisx = &this->actor; - sp24.x = thisx->posRot.pos.x; - sp24.y = thisx->posRot.pos.y + thisx->waterY; - sp24.z = thisx->posRot.pos.z; - func_80029444(globalCtx, &sp24, 100, arg2, arg3); + pos.x = thisx->posRot.pos.x; + pos.y = thisx->posRot.pos.y + thisx->waterY; + pos.z = thisx->posRot.pos.z; + EffectSsGRipple_Spawn(globalCtx, &pos, 100, radiusMax, life); } void func_80AEB50C(EnRu1* this, GlobalContext* globalCtx) { this->unk_270 += 1.0f; if (this->unk_270 >= kREG(3) + 10.0f) { - func_80AEB4A8(this, globalCtx, kREG(1) + 500, 0); + EnRu1_SpawnRipple(this, globalCtx, kREG(1) + 500, 0); this->unk_270 = 0.0f; } } void func_80AEB59C(EnRu1* this, GlobalContext* globalCtx) { - f32 temp_f0; - - func_80AEB4A8(this, globalCtx, kREG(2) + 500, 0); - func_80AEB4A8(this, globalCtx, kREG(2) + 500, kREG(3) + 10.0f); - temp_f0 = kREG(3) + 10.0f; - func_80AEB4A8(this, globalCtx, kREG(2) + 500, temp_f0 + temp_f0); + EnRu1_SpawnRipple(this, globalCtx, kREG(2) + 500, 0); + EnRu1_SpawnRipple(this, globalCtx, kREG(2) + 500, kREG(3) + 10.0f); + EnRu1_SpawnRipple(this, globalCtx, kREG(2) + 500, (kREG(3) + 10.0f) * 2.0f); } void func_80AEB680(EnRu1* this, GlobalContext* globalCtx) { @@ -474,7 +471,7 @@ void func_80AEB680(EnRu1* this, GlobalContext* globalCtx) { pos.y = thisx->posRot.pos.y + thisx->waterY; pos.z = thisx->posRot.pos.z; - func_8002949C(globalCtx, &pos, 0, 0, 1, 0); + EffectSsGSplash_Spawn(globalCtx, &pos, 0, 0, 1, 0); } void func_80AEB6E0(EnRu1* this, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_En_Sb/z_en_sb.c b/src/overlays/actors/ovl_En_Sb/z_en_sb.c index fb4dfa9704..da4772846b 100644 --- a/src/overlays/actors/ovl_En_Sb/z_en_sb.c +++ b/src/overlays/actors/ovl_En_Sb/z_en_sb.c @@ -109,7 +109,7 @@ void EnSb_SpawnBubbles(GlobalContext* globalCtx, EnSb* this) { if (this->actor.waterY > 0) { for (i = 0; i < 10; i++) { - func_800293E4(globalCtx, &this->actor.posRot.pos, 10.0f, 10.0f, 30.0f, 0.25f); + EffectSsBubble_Spawn(globalCtx, &this->actor.posRot.pos, 10.0f, 10.0f, 30.0f, 0.25f); } } } @@ -470,7 +470,7 @@ void EnSb_Draw(Actor* thisx, GlobalContext* globalCtx) { flamePos.x = Math_Rand_CenteredFloat(5.0f) + (this->actor.posRot.pos.x + offset->x); flamePos.y = Math_Rand_CenteredFloat(5.0f) + (this->actor.posRot.pos.y + offset->y); flamePos.z = Math_Rand_CenteredFloat(5.0f) + (this->actor.posRot.pos.z + offset->z); - func_8002A4D4(globalCtx, this, &flamePos, 0x64, 0, 0, -1); + EffectSsEnFire_SpawnVec3f(globalCtx, this, &flamePos, 100, 0, 0, -1); } } } diff --git a/src/overlays/actors/ovl_En_St/z_en_st.c b/src/overlays/actors/ovl_En_St/z_en_st.c index 2a656883c9..2356f10ec7 100644 --- a/src/overlays/actors/ovl_En_St/z_en_st.c +++ b/src/overlays/actors/ovl_En_St/z_en_st.c @@ -95,11 +95,11 @@ void EnSt_SetupAction(EnSt* this, EnStActionFunc actionFunc) { /** * Spawns `dustCnt` dust particles in a random pattern around the skulltulla */ -void EnSt_SpawnDustEffects(EnSt* this, GlobalContext* globalCtx, s32 dustCnt) { - Color_RGBA8_n primColor = { 170, 130, 90, 255 }; - Color_RGBA8_n envColor = { 100, 60, 20, 0 }; +void EnSt_SpawnDust(EnSt* this, GlobalContext* globalCtx, s32 dustCnt) { + Color_RGBA8 primColor = { 170, 130, 90, 255 }; + Color_RGBA8 envColor = { 100, 60, 20, 0 }; Vec3f dustVel = { 0.0f, 0.0f, 0.0f }; - Vec3f initialYAccel = { 0.0f, 0.3f, 0.0f }; + Vec3f dustAccel = { 0.0f, 0.3f, 0.0f }; Vec3f dustPos; s16 yAngle; s32 i; @@ -107,11 +107,11 @@ void EnSt_SpawnDustEffects(EnSt* this, GlobalContext* globalCtx, s32 dustCnt) { yAngle = (Math_Rand_ZeroOne() - 0.5f) * 65536.0f; dustPos.y = this->actor.groundY; for (i = dustCnt; i >= 0; i--, yAngle += (s16)(0x10000 / dustCnt)) { - initialYAccel.x = (Math_Rand_ZeroOne() - 0.5f) * 4.0f; - initialYAccel.z = (Math_Rand_ZeroOne() - 0.5f) * 4.0f; + dustAccel.x = (Math_Rand_ZeroOne() - 0.5f) * 4.0f; + dustAccel.z = (Math_Rand_ZeroOne() - 0.5f) * 4.0f; dustPos.x = this->actor.posRot.pos.x + (Math_Sins(yAngle) * 22.0f); dustPos.z = this->actor.posRot.pos.z + (Math_Coss(yAngle) * 22.0f); - func_8002836C(globalCtx, &dustPos, &dustVel, &initialYAccel, &primColor, &envColor, 120, 40, 10); + func_8002836C(globalCtx, &dustPos, &dustVel, &dustAccel, &primColor, &envColor, 120, 40, 10); } } @@ -123,17 +123,17 @@ void EnSt_SpawnBlastEffect(EnSt* this, GlobalContext* globalCtx) { blastPos.y = this->actor.groundY; blastPos.z = this->actor.posRot.pos.z; - func_80028F84(globalCtx, &blastPos, &zeroVec, &zeroVec, 100, 220, 8); + EffectSsBlast_SpawnWhiteCustomScale(globalCtx, &blastPos, &zeroVec, &zeroVec, 100, 220, 8); } void EnSt_SpawnDeadEffect(EnSt* this, GlobalContext* globalCtx) { Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; - Vec3f deadPos; + Vec3f firePos; - deadPos.x = this->actor.posRot.pos.x + ((Math_Rand_ZeroOne() - 0.5f) * 60.0f); - deadPos.y = (this->actor.posRot.pos.y + 10.0f) + ((Math_Rand_ZeroOne() - 0.5f) * 45.0f); - deadPos.z = this->actor.posRot.pos.z + ((Math_Rand_ZeroOne() - 0.5f) * 60.0f); - func_8002A6B8(globalCtx, &deadPos, &zeroVec, &zeroVec, 100, 0, 255, 255, 255, 255, 255, 0, 0, 1, 9, 1); + firePos.x = this->actor.posRot.pos.x + ((Math_Rand_ZeroOne() - 0.5f) * 60.0f); + firePos.y = (this->actor.posRot.pos.y + 10.0f) + ((Math_Rand_ZeroOne() - 0.5f) * 45.0f); + firePos.z = this->actor.posRot.pos.z + ((Math_Rand_ZeroOne() - 0.5f) * 60.0f); + EffectSsDeadDb_Spawn(globalCtx, &firePos, &zeroVec, &zeroVec, 100, 0, 255, 255, 255, 255, 255, 0, 0, 1, 9, true); } s32 EnSt_CreateBlureEffect(GlobalContext* globalCtx) { @@ -622,7 +622,7 @@ s32 EnSt_IsDoneBouncing(EnSt* this, GlobalContext* globalCtx) { } Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_M_GND); - EnSt_SpawnDustEffects(this, globalCtx, 10); + EnSt_SpawnDust(this, globalCtx, 10); // creates an elastic bouncing effect, boucing up less for each hit on the ground. this->actor.velocity.y = 6.0f / (4 - this->groundBounces); this->groundBounces--; @@ -967,7 +967,7 @@ void EnSt_StartOnCeilingOrGround(EnSt* this, GlobalContext* globalCtx) { void EnSt_Update(Actor* thisx, GlobalContext* globalCtx) { EnSt* this = THIS; s32 pad; - Color_RGBA8_n color = { 0, 0, 0, 0 }; + Color_RGBA8 color = { 0, 0, 0, 0 }; if (this->actor.flags & 0x8000) { SkelAnime_FrameUpdateMatrix(&this->skelAnime); diff --git a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c index 45efeac4a5..750eaa35b4 100644 --- a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c +++ b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c @@ -212,8 +212,8 @@ void func_80B11DEC(EnSyatekiNiw* this, GlobalContext* globalCtx) { void func_80B11E78(EnSyatekiNiw* this, GlobalContext* globalCtx) { Vec3f dustVelocity = { 0.0f, 0.0f, 0.0f }; Vec3f dustAccel = { 0.0f, 0.2f, 0.0f }; - Color_RGBA8_n dustPrimColor = { 0, 0, 0, 255 }; - Color_RGBA8_n dustEnvColor = { 0, 0, 0, 255 }; + Color_RGBA8 dustPrimColor = { 0, 0, 0, 255 }; + Color_RGBA8 dustEnvColor = { 0, 0, 0, 255 }; Vec3f dustPos; f32 tmpf2; f32 sp4C; @@ -335,7 +335,7 @@ void func_80B11E78(EnSyatekiNiw* this, GlobalContext* globalCtx) { dustVelocity.y = Math_Rand_CenteredFloat(5.0f); dustAccel.y = 0.2f; dustPos = this->actor.posRot.pos; - func_8002836C(globalCtx, &dustPos, &dustVelocity, &dustAccel, &dustPrimColor, &dustEnvColor, 0x258, 0x28, 0x1E); + func_8002836C(globalCtx, &dustPos, &dustVelocity, &dustAccel, &dustPrimColor, &dustEnvColor, 600, 40, 30); } } @@ -514,8 +514,8 @@ void func_80B129EC(EnSyatekiNiw* this, GlobalContext* globalCtx) { Actor_SetHeight(&this->actor, this->unk_2D4); func_8002F374(globalCtx, &this->actor, &sp2E, &sp2C); - if ((this->unk_25E == 0) || (this->actor.projectedPos.z < -70.0f) || (sp2E < 0) || (sp2E > SCREEN_WIDTH) || (sp2C < 0) || - (sp2C > SCREEN_HEIGHT)) { + if ((this->unk_25E == 0) || (this->actor.projectedPos.z < -70.0f) || (sp2E < 0) || (sp2E > SCREEN_WIDTH) || + (sp2C < 0) || (sp2C > SCREEN_HEIGHT)) { Actor_Kill(&this->actor); return; } diff --git a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c index d005fa074a..fd96567ebc 100644 --- a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c +++ b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c @@ -5,6 +5,7 @@ */ #include "z_en_tubo_trap.h" +#include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" #include @@ -69,88 +70,90 @@ void EnTuboTrap_DropCollectible(EnTuboTrap* this, GlobalContext* globalCtx) { } } -void EnTuboTrap_SpawnFragments(EnTuboTrap* this, GlobalContext* globalCtx) { +void EnTuboTrap_SpawnEffectsOnLand(EnTuboTrap* this, GlobalContext* globalCtx) { f32 rand; f32 cos; f32 sin; - Vec3f spC8; - Vec3f spBC; + Vec3f pos; + Vec3f velocity; s16 var; - s32 temp; + s32 arg5; s32 i; Vec3f* actorPos = &this->actor.posRot.pos; for (i = 0, var = 0; i < 15; i++, var += 20000) { sin = Math_Sins(var); cos = Math_Coss(var); - spC8.x = sin * 8.0f; - spC8.y = (Math_Rand_ZeroOne() * 5.0f) + 2.0f; - spC8.z = cos * 8.0f; + pos.x = sin * 8.0f; + pos.y = (Math_Rand_ZeroOne() * 5.0f) + 2.0f; + pos.z = cos * 8.0f; - spBC.x = spC8.x * 0.23f; - spBC.y = (Math_Rand_ZeroOne() * 5.0f) + 2.0f; - spBC.z = spC8.z * 0.23f; + velocity.x = pos.x * 0.23f; + velocity.y = (Math_Rand_ZeroOne() * 5.0f) + 2.0f; + velocity.z = pos.z * 0.23f; - spC8.x += actorPos->x; - spC8.y += actorPos->y; - spC8.z += actorPos->z; + pos.x += actorPos->x; + pos.y += actorPos->y; + pos.z += actorPos->z; rand = Math_Rand_ZeroOne(); if (rand < 0.2f) { - temp = 96; + arg5 = 96; } else if (rand < 0.6f) { - temp = 64; + arg5 = 64; } else { - temp = 32; + arg5 = 32; } - func_80029E8C(globalCtx, &spC8, &spBC, actorPos, -240, temp, 10, 10, 0, (Math_Rand_ZeroOne() * 65.0f) + 15.0f, - 0, 32, 60, -1, 3, &D_05017A60); + EffectSsKakera_Spawn(globalCtx, &pos, &velocity, actorPos, -240, arg5, 10, 10, 0, + (Math_Rand_ZeroOne() * 65.0f) + 15.0f, 0, 32, 60, KAKERA_COLOR_NONE, + OBJECT_GAMEPLAY_DANGEON_KEEP, &D_05017A60); } func_80033480(globalCtx, actorPos, 30.0f, 4, 20, 50, 0); } -void EnTuboTrap_SpawnWaterFragments(EnTuboTrap* this, GlobalContext* globalCtx) { +void EnTuboTrap_SpawnEffectsInWater(EnTuboTrap* this, GlobalContext* globalCtx) { f32 rand; f32 cos; f32 sin; - Vec3f spC8; - Vec3f spBC; + Vec3f pos; + Vec3f velocity; s16 var; - s32 temp; + s32 arg5; s32 i; Vec3f* actorPos = &this->actor.posRot.pos; - spC8 = *actorPos; - spC8.y += this->actor.waterY; + pos = *actorPos; + pos.y += this->actor.waterY; - func_8002949C(globalCtx, &spC8, 0, 0, 0, 400); + EffectSsGSplash_Spawn(globalCtx, &pos, 0, 0, 0, 400); for (i = 0, var = 0; i < 15; i++, var += 20000) { sin = Math_Sins(var); cos = Math_Coss(var); - spC8.x = sin * 8.0f; - spC8.y = (Math_Rand_ZeroOne() * 5.0f) + 2.0f; - spC8.z = cos * 8.0f; + pos.x = sin * 8.0f; + pos.y = (Math_Rand_ZeroOne() * 5.0f) + 2.0f; + pos.z = cos * 8.0f; - spBC.x = spC8.x * 0.20f; - spBC.y = (Math_Rand_ZeroOne() * 4.0f) + 2.0f; - spBC.z = spC8.z * 0.20f; + velocity.x = pos.x * 0.20f; + velocity.y = (Math_Rand_ZeroOne() * 4.0f) + 2.0f; + velocity.z = pos.z * 0.20f; - spC8.x += actorPos->x; - spC8.y += actorPos->y; - spC8.z += actorPos->z; + pos.x += actorPos->x; + pos.y += actorPos->y; + pos.z += actorPos->z; rand = Math_Rand_ZeroOne(); if (rand < 0.2f) { - temp = 64; + arg5 = 64; } else { - temp = 32; + arg5 = 32; } - func_80029E8C(globalCtx, &spC8, &spBC, actorPos, -180, temp, 30, 30, 0, (Math_Rand_ZeroOne() * 65.0f) + 15.0f, - 0, 32, 70, -1, 3, &D_05017A60); + EffectSsKakera_Spawn(globalCtx, &pos, &velocity, actorPos, -180, arg5, 30, 30, 0, + (Math_Rand_ZeroOne() * 65.0f) + 15.0f, 0, 32, 70, KAKERA_COLOR_NONE, + OBJECT_GAMEPLAY_DANGEON_KEEP, &D_05017A60); } } @@ -160,7 +163,7 @@ void EnTuboTrap_HandleImpact(EnTuboTrap* this, GlobalContext* globalCtx) { Player* player = PLAYER; if ((this->actor.bgCheckFlags & 0x20) && (this->actor.waterY > 15.0f)) { - EnTuboTrap_SpawnWaterFragments(this, globalCtx); + EnTuboTrap_SpawnEffectsInWater(this, globalCtx); Audio_PlaySoundAtPosition(globalCtx, &this->actor.posRot.pos, 40, NA_SE_EV_BOMB_DROP_WATER); EnTuboTrap_DropCollectible(this, globalCtx); Actor_Kill(&this->actor); @@ -169,7 +172,7 @@ void EnTuboTrap_HandleImpact(EnTuboTrap* this, GlobalContext* globalCtx) { if (this->collider.base.atFlags & 4) { this->collider.base.atFlags &= ~4; - EnTuboTrap_SpawnFragments(this, globalCtx); + EnTuboTrap_SpawnEffectsOnLand(this, globalCtx); Audio_PlaySoundAtPosition(globalCtx, &this->actor.posRot.pos, 40, NA_SE_IT_SHIELD_REFLECT_SW); Audio_PlaySoundAtPosition(globalCtx, &this->actor.posRot.pos, 40, NA_SE_EV_POT_BROKEN); EnTuboTrap_DropCollectible(this, globalCtx); @@ -179,7 +182,7 @@ void EnTuboTrap_HandleImpact(EnTuboTrap* this, GlobalContext* globalCtx) { if (this->collider.base.acFlags & 2) { this->collider.base.acFlags &= ~2; - EnTuboTrap_SpawnFragments(this, globalCtx); + EnTuboTrap_SpawnEffectsOnLand(this, globalCtx); Audio_PlaySoundAtPosition(globalCtx, &this->actor.posRot.pos, 40, NA_SE_EV_EXPLOSION); Audio_PlaySoundAtPosition(globalCtx, &this->actor.posRot.pos, 40, NA_SE_EV_POT_BROKEN); EnTuboTrap_DropCollectible(this, globalCtx); @@ -190,7 +193,7 @@ void EnTuboTrap_HandleImpact(EnTuboTrap* this, GlobalContext* globalCtx) { if (this->collider.base.atFlags & 2) { this->collider.base.atFlags &= ~2; if (this->collider.base.at == &player->actor) { - EnTuboTrap_SpawnFragments(this, globalCtx); + EnTuboTrap_SpawnEffectsOnLand(this, globalCtx); Audio_PlaySoundAtPosition(globalCtx, &this->actor.posRot.pos, 40, NA_SE_EV_POT_BROKEN); Audio_PlaySoundAtPosition(globalCtx, &player->actor.posRot.pos, 40, NA_SE_PL_BODY_HIT); EnTuboTrap_DropCollectible(this, globalCtx); @@ -200,7 +203,7 @@ void EnTuboTrap_HandleImpact(EnTuboTrap* this, GlobalContext* globalCtx) { } if ((this->actor.bgCheckFlags & 8) || (this->actor.bgCheckFlags & 1)) { - EnTuboTrap_SpawnFragments(this, globalCtx); + EnTuboTrap_SpawnEffectsOnLand(this, globalCtx); Audio_PlaySoundAtPosition(globalCtx, &this->actor.posRot.pos, 40, NA_SE_EV_POT_BROKEN); EnTuboTrap_DropCollectible(this, globalCtx); Actor_Kill(&this->actor); diff --git a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c index 2232a84de5..a8a164bae3 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c @@ -215,12 +215,12 @@ void EnWallmas_SetupCooldown(EnWallmas* this) { } void EnWallmas_SetupDie(EnWallmas* this, GlobalContext* globalCtx) { - static Vec3f D_80B30D70 = { 0.0f, 0.0f, 0.0f }; + static Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; this->actor.speedXZ = 0.0f; this->actor.velocity.y = 0.0f; - func_8002A6B8(globalCtx, &this->actor.posRot.pos, &D_80B30D70, &D_80B30D70, 0xFA, -0xA, 0xFF, 0xFF, 0xFF, 0xFF, 0, - 0, 0xFF, 1, 9, 1); + EffectSsDeadDb_Spawn(globalCtx, &this->actor.posRot.pos, &zeroVec, &zeroVec, 250, -10, 255, 255, 255, 255, 0, 0, + 255, 1, 9, true); Item_DropCollectibleRandom(globalCtx, &this->actor, &this->actor.posRot.pos, 0xC0); this->actionFunc = EnWallmas_Die; @@ -497,7 +497,7 @@ void EnWallmas_ColUpdate(EnWallmas* this, GlobalContext* globalCtx) { } } else { if (this->actor.colChkInfo.damageEffect == DAMAGE_EFFECT_BURN) { - func_8002A65C(globalCtx, &this->actor, &this->actor.posRot.pos, 0x28, 0x28); + EffectSsFCircle_Spawn(globalCtx, &this->actor, &this->actor.posRot.pos, 40, 40); } EnWallmas_SetupTakeDamage(this); diff --git a/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c b/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c index 8792814d5e..670ef8c9aa 100644 --- a/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c +++ b/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c @@ -96,8 +96,9 @@ void func_80B43B6C(EnYukabyun* this, GlobalContext* globalCtx) { func_8002F974(&this->actor, NA_SE_EN_YUKABYUN_FLY - SFX_FLAG); } -void func_80B43BCC(EnYukabyun* this, GlobalContext* globalCtx) { - func_800297A4(globalCtx, &this->actor.posRot.pos, 8.0f, 0, 0x514, 0x12C, 0xF, 0x5F, 0xA, &D_06000A60); +void EnYukabyun_Break(EnYukabyun* this, GlobalContext* globalCtx) { + EffectSsHahen_SpawnBurst(globalCtx, &this->actor.posRot.pos, 8.0f, 0, 1300, 300, 15, OBJECT_YUKABYUN, 10, + &D_06000A60); Actor_Kill(&this->actor); } @@ -113,13 +114,13 @@ void EnYukabyun_Update(Actor* thisx, GlobalContext* globalCtx) { this->collider.base.maskA &= ~0x2; this->actor.flags &= ~0x5; Audio_PlaySoundAtPosition(globalCtx, &this->actor.posRot.pos, 30, NA_SE_EN_OCTAROCK_ROCK); - this->actionfunc = func_80B43BCC; + this->actionfunc = EnYukabyun_Break; } this->actionfunc(this, globalCtx); Actor_MoveForward(&this->actor); - if (!(this->actionfunc == func_80B43A94 || this->actionfunc == func_80B43BCC)) { + if (!(this->actionfunc == func_80B43A94 || this->actionfunc == EnYukabyun_Break)) { func_8002E4B4(globalCtx, &this->actor, 5.0f, 20.0f, 8.0f, 5); Collider_CylinderUpdate(&this->actor, &this->collider); diff --git a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c index c2567242c3..92cad046e3 100644 --- a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c +++ b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c @@ -19,7 +19,7 @@ void ItemEtcetera_Draw(Actor* thisx, GlobalContext* globalCtx); void func_80B857D0(ItemEtcetera* this, GlobalContext* globalCtx); void func_80B85824(ItemEtcetera* this, GlobalContext* globalCtx); void func_80B858B4(ItemEtcetera* this, GlobalContext* globalCtx); -void func_80B8598C(ItemEtcetera* this, GlobalContext* globalCtx); +void ItemEtcetera_SpawnSparkles(ItemEtcetera* this, GlobalContext* globalCtx); void ItemEtcetera_MoveFireArrowDown(ItemEtcetera* this, GlobalContext* globalCtx); void func_80B85B28(ItemEtcetera* this, GlobalContext* globalCtx); void ItemEtcetera_UpdateFireArrow(ItemEtcetera* this, GlobalContext* globalCtx); @@ -139,36 +139,33 @@ void func_80B858B4(ItemEtcetera* this, GlobalContext* globalCtx) { if (0) {} // Necessary to match func_8002F434(&this->actor, globalCtx, this->getItemId, 30.0f, 50.0f); if ((globalCtx->gameplayFrames & 0xD) == 0) { - func_800293E4(globalCtx, &this->actor.posRot.pos, 0.0f, 0.0f, 10.0f, 0.13f); + EffectSsBubble_Spawn(globalCtx, &this->actor.posRot.pos, 0.0f, 0.0f, 10.0f, 0.13f); } } } -void func_80B8598C(ItemEtcetera* this, GlobalContext* globalCtx) { +void ItemEtcetera_SpawnSparkles(ItemEtcetera* this, GlobalContext* globalCtx) { + static Vec3f velocity = { 0.0f, 0.2f, 0.0f }; + static Vec3f accel = { 0.0f, 0.05f, 0.0f }; + static Color_RGB8 primColor = { 255, 255, 255 }; + static Color_RGB8 envColor = { 255, 50, 50 }; + Vec3f pos; - static Vec3f D_80B85D74 = { 0.0f, 0.2f, 0.0f }; - static Vec3f D_80B85D80 = { 0.0f, 0.05f, 0.0f }; - - static Color_RGB8 D_80B85D8C = { 255, 255, 255 }; - static Color_RGB8 D_80B85D90 = { 255, 50, 50 }; - - Vec3f vec; - - D_80B85D74.x = Math_Rand_CenteredFloat(3.0f); - D_80B85D74.z = Math_Rand_CenteredFloat(3.0f); - D_80B85D74.y = -0.05f; - D_80B85D80.y = -0.025f; - vec.x = Math_Rand_CenteredFloat(12.0f) + this->actor.posRot.pos.x; - vec.y = (Math_Rand_ZeroOne() * 6.0f) + this->actor.posRot.pos.y; - vec.z = Math_Rand_CenteredFloat(12.0f) + this->actor.posRot.pos.z; - func_80028BB0(globalCtx, &vec, &D_80B85D74, &D_80B85D80, &D_80B85D8C, &D_80B85D90, 0x1388, 0x10); + velocity.x = Math_Rand_CenteredFloat(3.0f); + velocity.z = Math_Rand_CenteredFloat(3.0f); + velocity.y = -0.05f; + accel.y = -0.025f; + pos.x = Math_Rand_CenteredFloat(12.0f) + this->actor.posRot.pos.x; + pos.y = (Math_Rand_ZeroOne() * 6.0f) + this->actor.posRot.pos.y; + pos.z = Math_Rand_CenteredFloat(12.0f) + this->actor.posRot.pos.z; + EffectSsKiraKira_SpawnDispersed(globalCtx, &pos, &velocity, &accel, &primColor, &envColor, 5000, 16); } void ItemEtcetera_MoveFireArrowDown(ItemEtcetera* this, GlobalContext* globalCtx) { func_8002E4B4(globalCtx, &this->actor, 10.0f, 10.0f, 0.0f, 5); Actor_MoveForward(&this->actor); if (!(this->actor.bgCheckFlags & 1)) { - func_80B8598C(this, globalCtx); + ItemEtcetera_SpawnSparkles(this, globalCtx); } this->actor.shape.rot.y += 0x400; func_80B85824(this, globalCtx); diff --git a/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c b/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c index e1d18e55af..b884593995 100644 --- a/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c +++ b/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c @@ -103,8 +103,8 @@ void ItemOcarina_Fly(ItemOcarina* this, GlobalContext* globalCtx) { } if (globalCtx->csCtx.frames == 897) { - func_80029444(globalCtx, &this->actor.posRot.pos, 100, 500, 0); - func_8002949C(globalCtx, &this->actor.posRot.pos, 0, 0, 1, 0); + EffectSsGRipple_Spawn(globalCtx, &this->actor.posRot.pos, 100, 500, 0); + EffectSsGSplash_Spawn(globalCtx, &this->actor.posRot.pos, 0, 0, 1, 0); this->actor.velocity.x = 0.0f; this->actor.velocity.y = 0.0f; this->actor.velocity.z = 0.0f; @@ -119,7 +119,7 @@ void ItemOcarina_Fly(ItemOcarina* this, GlobalContext* globalCtx) { ripplePos.x = 274.0f; ripplePos.y = -60.0f; ripplePos.z = 907.0f; - func_80029444(globalCtx, &ripplePos, 100, 500, 0); + EffectSsGRipple_Spawn(globalCtx, &ripplePos, 100, 500, 0); } } @@ -186,7 +186,7 @@ void ItemOcarina_WaitInWater(ItemOcarina* this, GlobalContext* globalCtx) { func_8002F434(&this->actor, globalCtx, GI_OCARINA_OOT, 30.0f, 50.0f); if ((globalCtx->gameplayFrames & 13) == 0) { - func_800293E4(globalCtx, &this->actor.posRot.pos, 0.0f, 0.0f, 10.0f, 0.13f); + EffectSsBubble_Spawn(globalCtx, &this->actor.posRot.pos, 0.0f, 0.0f, 10.0f, 0.13f); } } } diff --git a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c index d7ba3e8ff7..f7510b1971 100644 --- a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c +++ b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c @@ -5,6 +5,7 @@ */ #include "z_obj_bombiwa.h" +#include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" #define FLAGS 0x00000000 @@ -86,25 +87,25 @@ void ObjBombiwa_Destroy(Actor* thisx, GlobalContext* globalCtx) { } void ObjBombiwa_Break(ObjBombiwa* this, GlobalContext* globalCtx) { - Vec3f temp_s2; - Vec3f temp_s3; + Vec3f pos; + Vec3f velocity; Gfx** dlist; - s16 u0; + s16 arg5; s16 scale; s32 i; dlist = D_060009E0; for (i = 0; i < ARRAY_COUNT(sEffectScales); i++) { - temp_s2.x = ((Math_Rand_ZeroOne() - 0.5f) * 10.0f) + this->actor.initPosRot.pos.x; - temp_s2.y = ((Math_Rand_ZeroOne() * 5.0f) + this->actor.initPosRot.pos.y) + 8.0f; - temp_s2.z = ((Math_Rand_ZeroOne() - 0.5f) * 10.0f) + this->actor.initPosRot.pos.z; - temp_s3.x = (Math_Rand_ZeroOne() - 0.5f) * 15.0f; - temp_s3.y = (Math_Rand_ZeroOne() * 16.0f) + 5.0f; - temp_s3.z = (Math_Rand_ZeroOne() - 0.5f) * 15.0f; + pos.x = ((Math_Rand_ZeroOne() - 0.5f) * 10.0f) + this->actor.initPosRot.pos.x; + pos.y = ((Math_Rand_ZeroOne() * 5.0f) + this->actor.initPosRot.pos.y) + 8.0f; + pos.z = ((Math_Rand_ZeroOne() - 0.5f) * 10.0f) + this->actor.initPosRot.pos.z; + velocity.x = (Math_Rand_ZeroOne() - 0.5f) * 15.0f; + velocity.y = (Math_Rand_ZeroOne() * 16.0f) + 5.0f; + velocity.z = (Math_Rand_ZeroOne() - 0.5f) * 15.0f; scale = sEffectScales[i]; - u0 = (scale >= 11) ? 37 : 33; - func_80029E8C(globalCtx, &temp_s2, &temp_s3, &temp_s2, -400, u0, 10, 2, 0, scale, 1, 0, 80, -1, OBJECT_BOMBIWA, - dlist); + arg5 = (scale >= 11) ? 37 : 33; + EffectSsKakera_Spawn(globalCtx, &pos, &velocity, &pos, -400, arg5, 10, 2, 0, scale, 1, 0, 80, KAKERA_COLOR_NONE, + OBJECT_BOMBIWA, dlist); } func_80033480(globalCtx, &this->actor.posRot.pos, 60.0f, 8, 100, 160, 1); } diff --git a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c index 65288d6943..e07a96fb43 100644 --- a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c +++ b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c @@ -5,6 +5,7 @@ */ #include "z_obj_comb.h" +#include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" #define FLAGS 0x00000000 @@ -57,14 +58,14 @@ extern Gfx D_05009940[]; void ObjComb_Break(ObjComb* this, GlobalContext* globalCtx) { Vec3f pos1; - Vec3f posSum; - Vec3f pos2; + Vec3f pos; + Vec3f velocity; Gfx** dlist = D_05009940; s16 scale; s16 angle = 0; - s16 gravityInfluence; - u8 u0; - u8 rotSpeed; + s16 gravity; + u8 arg5; + u8 arg6; f32 rand1; f32 rand2; s32 i; @@ -77,40 +78,43 @@ void ObjComb_Break(ObjComb* this, GlobalContext* globalCtx) { pos1.y = (i - 15) * 0.7f; pos1.z = Math_Coss(angle) * rand1; - Math_Vec3f_Sum(&pos1, &this->actor.posRot.pos, &posSum); + Math_Vec3f_Sum(&pos1, &this->actor.posRot.pos, &pos); - pos2.x = (Math_Rand_ZeroOne() - 0.5f) + pos1.x * 0.5f; - pos2.y = (Math_Rand_ZeroOne() - 0.5f) + pos1.y * 0.6f; - pos2.z = (Math_Rand_ZeroOne() - 0.5f) + pos1.z * 0.5f; + velocity.x = (Math_Rand_ZeroOne() - 0.5f) + pos1.x * 0.5f; + velocity.y = (Math_Rand_ZeroOne() - 0.5f) + pos1.y * 0.6f; + velocity.z = (Math_Rand_ZeroOne() - 0.5f) + pos1.z * 0.5f; scale = Math_Rand_ZeroOne() * 72.0f + 25.0f; + if (scale < 40) { - gravityInfluence = -200; - rotSpeed = 40; + gravity = -200; + arg6 = 40; } else if (scale < 70) { - gravityInfluence = -280; - rotSpeed = 30; + gravity = -280; + arg6 = 30; } else { - gravityInfluence = -340; - rotSpeed = 20; + gravity = -340; + arg6 = 20; } rand2 = Math_Rand_ZeroOne(); + if (rand2 < 0.1f) { - u0 = 96; + arg5 = 96; } else if (rand2 < 0.8f) { - u0 = 64; + arg5 = 64; } else { - u0 = 32; + arg5 = 32; } - func_80029E8C(globalCtx, &posSum, &pos2, &posSum, gravityInfluence, u0, rotSpeed, 4, 0, scale, 0, 0, 80, -1, 2, - dlist); + + EffectSsKakera_Spawn(globalCtx, &pos, &velocity, &pos, gravity, arg5, arg6, 4, 0, scale, 0, 0, 80, + KAKERA_COLOR_NONE, OBJECT_GAMEPLAY_FIELD_KEEP, dlist); } - posSum.x = this->actor.posRot.pos.x; - posSum.y = this->actor.posRot.pos.y - 10.0f; - posSum.z = this->actor.posRot.pos.z; - func_80033480(globalCtx, &posSum, 40.0f, 6, 70, 60, 1); + pos.x = this->actor.posRot.pos.x; + pos.y = this->actor.posRot.pos.y - 10.0f; + pos.z = this->actor.posRot.pos.z; + func_80033480(globalCtx, &pos, 40.0f, 6, 70, 60, 1); } void ObjComb_ChooseItemDrop(ObjComb* this, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c index a25f295a15..b4eadca98b 100644 --- a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c +++ b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c @@ -12,8 +12,8 @@ #define THIS ((ObjLightswitch*)thisx) typedef enum { - /* 0x00 */ FACE_EYES_CLOSED, - /* 0x01 */ FACE_EYES_OPEN, + /* 0x00 */ FACE_EYES_CLOSED, + /* 0x01 */ FACE_EYES_OPEN, /* 0x02 */ FACE_EYES_OPEN_SMILING } FaceTextureIndex; @@ -145,7 +145,8 @@ void ObjLightswitch_SpawnDisappearEffects(ObjLightswitch* this, GlobalContext* g pos.x = this->actor.posRot.pos.x + ((z * s) + (x * c)); pos.y = this->actor.posRot.pos.y + y + 10.0f; pos.z = this->actor.posRot.pos.z + ((z * c) - (x * s)); - func_8002A6B8(globalCtx, &pos, &D_80B97F74, &D_80B97F74, 0x64, 0, 0xFF, 0xFF, 0xA0, 0xA0, 0xFF, 0, 0, 1, 9, 1); + EffectSsDeadDb_Spawn(globalCtx, &pos, &D_80B97F74, &D_80B97F74, 100, 0, 255, 255, 160, 160, 255, 0, 0, 1, 9, + true); } } diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c index 591501a446..43c4109f8e 100644 --- a/src/overlays/actors/ovl_player_actor/z_player.c +++ b/src/overlays/actors/ovl_player_actor/z_player.c @@ -13,6 +13,7 @@ #include "overlays/actors/ovl_En_Box/z_en_box.h" #include "overlays/actors/ovl_En_Door/z_en_door.h" #include "overlays/actors/ovl_En_Horse/z_en_horse.h" +#include "overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h" #define THIS ((Player*)thisx) @@ -5448,22 +5449,22 @@ void func_8083CF5C(Player* this, GlobalContext* globalCtx) { } } -s32 func_8083CFA8(GlobalContext* globalCtx, Player* this, f32 arg2, s32 arg3) { +s32 func_8083CFA8(GlobalContext* globalCtx, Player* this, f32 arg2, s32 splashScale) { f32 sp3C = fabsf(arg2); UNK_TYPE sp38; f32 sp34; - Vec3f sp28; - s32 temp; + Vec3f splashPos; + s32 splashType; if (sp3C > 2.0f) { - sp28.x = this->bodyPartsPos[0].x; - sp28.z = this->bodyPartsPos[0].z; + splashPos.x = this->bodyPartsPos[0].x; + splashPos.z = this->bodyPartsPos[0].z; sp34 = this->actor.posRot.pos.y; - if (func_8004213C(globalCtx, &globalCtx->colCtx, sp28.x, sp28.z, &sp34, &sp38)) { + if (func_8004213C(globalCtx, &globalCtx->colCtx, splashPos.x, splashPos.z, &sp34, &sp38)) { if ((sp34 - this->actor.posRot.pos.y) < 100.0f) { - temp = (sp3C <= 10.0f) ? 0 : 1; - sp28.y = sp34; - func_8002949C(globalCtx, &sp28, 0, 0, temp, arg3); + splashType = (sp3C <= 10.0f) ? 0 : 1; + splashPos.y = sp34; + EffectSsGSplash_Spawn(globalCtx, &splashPos, NULL, NULL, splashType, splashScale); return 1; } } @@ -5609,7 +5610,7 @@ void func_8083D53C(GlobalContext* globalCtx, Player* this) { } void func_8083D6EC(GlobalContext* globalCtx, Player* this) { - Vec3f sp5C; + Vec3f ripplePos; f32 temp1; f32 temp2; f32 temp3; @@ -5670,10 +5671,10 @@ void func_8083D6EC(GlobalContext* globalCtx, Player* this) { if (this->unk_854 > 15.0f) { this->unk_854 = 0.0f; - sp5C.x = (Math_Rand_ZeroOne() * 10.0f) + this->actor.posRot.pos.x; - sp5C.y = this->actor.posRot.pos.y + this->actor.waterY; - sp5C.z = (Math_Rand_ZeroOne() * 10.0f) + this->actor.posRot.pos.z; - func_80029444(globalCtx, &sp5C, 100, 500, 0); + ripplePos.x = (Math_Rand_ZeroOne() * 10.0f) + this->actor.posRot.pos.x; + ripplePos.y = this->actor.posRot.pos.y + this->actor.waterY; + ripplePos.z = (Math_Rand_ZeroOne() * 10.0f) + this->actor.posRot.pos.z; + EffectSsGRipple_Spawn(globalCtx, &ripplePos, 100, 500, 0); if ((this->linearVelocity > 4.0f) && !func_808332B8(this) && ((this->actor.posRot.pos.y + this->actor.waterY) < this->bodyPartsPos[0].y)) { @@ -5684,19 +5685,19 @@ void func_8083D6EC(GlobalContext* globalCtx, Player* this) { } if (this->actor.waterY > 40.0f) { - s32 sp48 = 0; + s32 numBubbles = 0; s32 i; if ((this->actor.velocity.y > -1.0f) || (this->actor.bgCheckFlags & 1)) { if (Math_Rand_ZeroOne() < 0.2f) { - sp48 = 1; + numBubbles = 1; } } else { - sp48 = this->actor.velocity.y * -2.0f; + numBubbles = this->actor.velocity.y * -2.0f; } - for (i = 0; i < sp48; i++) { - func_800293E4(globalCtx, &this->actor.posRot.pos, 20.0f, 10.0f, 20.0f, 0.13f); + for (i = 0; i < numBubbles; i++) { + EffectSsBubble_Spawn(globalCtx, &this->actor.posRot.pos, 20.0f, 10.0f, 20.0f, 0.13f); } } } @@ -7489,7 +7490,7 @@ void func_80842A88(GlobalContext* globalCtx, Player* this) { s32 func_80842AC4(GlobalContext* globalCtx, Player* this) { if ((this->heldItemActionParam == PLAYER_AP_STICK) && (this->unk_85C > 0.5f)) { if (AMMO(ITEM_STICK) != 0) { - func_800298EC(globalCtx, &this->bodyPartsPos[15], this->actor.shape.rot.y + 0x8000); + EffectSsStick_Spawn(globalCtx, &this->bodyPartsPos[15], this->actor.shape.rot.y + 0x8000); this->unk_85C = 0.5f; func_80842A88(globalCtx, this); func_8002F7DC(&this->actor, NA_SE_IT_WOODSTICK_BROKEN); @@ -7505,7 +7506,7 @@ s32 func_80842B7C(GlobalContext* globalCtx, Player* this) { if (this->heldItemActionParam == PLAYER_AP_SWORD_BGS) { if ((gSaveContext.bgsFlag == 0) && (gSaveContext.swordHealth > 0.0f)) { if ((gSaveContext.swordHealth -= 1.0f) <= 0.0f) { - func_800298EC(globalCtx, &this->bodyPartsPos[15], this->actor.shape.rot.y + 0x8000); + EffectSsStick_Spawn(globalCtx, &this->bodyPartsPos[15], this->actor.shape.rot.y + 0x8000); func_800849EC(globalCtx); func_8002F7DC(&this->actor, NA_SE_IT_MAJIN_SWORD_BROKEN); } @@ -9735,8 +9736,8 @@ void func_808486A8(GlobalContext* globalCtx, Player* this) { Vec3f D_808547A4 = { 0.0f, 0.5f, 0.0f }; Vec3f D_808547B0 = { 0.0f, 0.5f, 0.0f }; -Color_RGBA8_n D_808547BC = { 255, 255, 100, 255 }; -Color_RGBA8_n D_808547C0 = { 255, 50, 0, 0 }; +Color_RGBA8 D_808547BC = { 255, 255, 100, 255 }; +Color_RGBA8 D_808547C0 = { 255, 50, 0, 0 }; void func_80848A04(GlobalContext* globalCtx, Player* this) { f32 temp; @@ -9764,28 +9765,27 @@ void func_80848A04(GlobalContext* globalCtx, Player* this) { } void func_80848B44(GlobalContext* globalCtx, Player* this) { - Vec3f sp3C; - Vec3f* sp38; - s32 sp34; + Vec3f shockPos; + Vec3f* randBodyPart; + s32 shockScale; this->shockTimer--; this->unk_892 += this->shockTimer; if (this->unk_892 > 20) { - sp34 = this->shockTimer * 2; - + shockScale = this->shockTimer * 2; this->unk_892 -= 20; - if (sp34 > 40) { - sp34 = 40; + if (shockScale > 40) { + shockScale = 40; } - sp38 = this->bodyPartsPos + (s32)Math_Rand_ZeroFloat(17.9f); - sp3C.x = (Math_Rand_CenteredFloat(5.0f) + sp38->x) - this->actor.posRot.pos.x; - sp3C.y = (Math_Rand_CenteredFloat(5.0f) + sp38->y) - this->actor.posRot.pos.y; - sp3C.z = (Math_Rand_CenteredFloat(5.0f) + sp38->z) - this->actor.posRot.pos.z; + randBodyPart = this->bodyPartsPos + (s32)Math_Rand_ZeroFloat(17.9f); + shockPos.x = (Math_Rand_CenteredFloat(5.0f) + randBodyPart->x) - this->actor.posRot.pos.x; + shockPos.y = (Math_Rand_CenteredFloat(5.0f) + randBodyPart->y) - this->actor.posRot.pos.y; + shockPos.z = (Math_Rand_CenteredFloat(5.0f) + randBodyPart->z) - this->actor.posRot.pos.z; - EffectSsFhgFlash_Spawn2(globalCtx, &this->actor, &sp3C, sp34, 1); + EffectSsFhgFlash_SpawnShock(globalCtx, &this->actor, &shockPos, shockScale, FHGFLASH_SHOCK_PLAYER); func_8002F8F0(&this->actor, NA_SE_PL_SPARK - SFX_FLAG); } } @@ -9836,7 +9836,7 @@ void func_80848C74(GlobalContext* globalCtx, Player* this) { flameIntensity = (*timerPtr - 25.0f) * 0.02f; flameIntensity = CLAMP(flameIntensity, 0.0f, 1.0f); - func_8002A484(globalCtx, flameScale, i, flameIntensity); + EffectSsFireTail_SpawnFlameOnPlayer(globalCtx, flameScale, i, flameIntensity); } if (1) {} @@ -10115,7 +10115,8 @@ void Player_UpdateCommon(Player* this, GlobalContext* globalCtx, Input* input) { func_80837B9C(this, globalCtx); } else if ((this->actor.bgCheckFlags & 1) || (this->stateFlags1 & 0x8000000)) { func_80836448(globalCtx, this, - func_808332B8(this) ? &D_04003310 : (this->shockTimer != 0) ? &D_04002F08 : &D_04002878); + func_808332B8(this) ? &D_04003310 + : (this->shockTimer != 0) ? &D_04002F08 : &D_04002878); } } else { if ((this->actor.parent == NULL) && @@ -12495,7 +12496,7 @@ void func_8084FB10(Player* this, GlobalContext* globalCtx) { if (func_80832594(this, 1, 100)) { this->unk_84F = -1; - func_80029FAC(globalCtx, &this->actor.posRot.pos, this->actor.scale.x); + EffectSsIcePiece_SpawnBurst(globalCtx, &this->actor.posRot.pos, this->actor.scale.x); func_8002F7DC(&this->actor, NA_SE_PL_ICE_BROKEN); } else { this->stateFlags2 |= 0x4000; @@ -12675,7 +12676,6 @@ s32 func_80850224(Player* this, GlobalContext* globalCtx) { } Vec3f D_80854A40 = { 0.0f, 40.0f, 45.0f }; -Vec3f D_80854A4C = { 0.0f, 0.0f, 0.0f }; void func_808502D0(Player* this, GlobalContext* globalCtx) { struct_80854190* sp44 = &D_80854190[this->swordAnimation]; @@ -12723,11 +12723,12 @@ void func_808502D0(Player* this, GlobalContext* globalCtx) { } } else if (this->heldItemActionParam == PLAYER_AP_HAMMER) { if ((this->swordAnimation == 0x16) || (this->swordAnimation == 0x13)) { - Vec3f sp30; + static Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; + Vec3f shockwavePos; f32 sp2C; - sp30.y = func_8083973C(globalCtx, this, &D_80854A40, &sp30); - sp2C = this->actor.posRot.pos.y - sp30.y; + shockwavePos.y = func_8083973C(globalCtx, this, &D_80854A40, &shockwavePos); + sp2C = this->actor.posRot.pos.y - shockwavePos.y; Math_ApproxUpdateScaledS(&this->actor.posRot2.rot.x, atan2s(45.0f, sp2C), 800); func_80836AB8(this, 1); @@ -12736,7 +12737,7 @@ void func_808502D0(Player* this, GlobalContext* globalCtx) { ((this->swordAnimation == 0x13) && func_800A4530(&this->skelAnime, 2.0f))) && (sp2C > -40.0f) && (sp2C < 40.0f)) { func_80842A28(globalCtx, this); - func_80029024(globalCtx, &sp30, &D_80854A4C, &D_80854A4C); + EffectSsBlast_SpawnWhiteShockwave(globalCtx, &shockwavePos, &zeroVec, &zeroVec); } } } @@ -13707,14 +13708,12 @@ Vec3s D_80855210[2][2] = { { { -200, 500, 0 }, { 600, 400, 600 } }, }; -Vec3f D_80855228 = { 0.0f, 0.0f, 0.0f }; - -Color_RGB8 D_80855234 = { 255, 255, 255 }; -Color_RGB8 D_80855238 = { 0, 128, 128 }; - void func_808526EC(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { + static Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; + static Color_RGB8 primColor = { 255, 255, 255 }; + static Color_RGB8 envColor = { 0, 128, 128 }; s32 age = gSaveContext.linkAge; - Vec3f sp40; + Vec3f sparklePos; Vec3f sp34; Vec3s* ptr; @@ -13731,9 +13730,9 @@ void func_808526EC(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg sp34.y = ptr[0].y + Math_Rand_CenteredFloat(ptr[1].y); sp34.z = ptr[0].z + Math_Rand_CenteredFloat(ptr[1].z); - SkinMatrix_Vec3fMtxFMultXYZ(&this->shieldMf, &sp34, &sp40); + SkinMatrix_Vec3fMtxFMultXYZ(&this->shieldMf, &sp34, &sparklePos); - func_80028BB0(globalCtx, &sp40, &D_80855228, &D_80855228, &D_80855234, &D_80855238, 600, -10); + EffectSsKiraKira_SpawnDispersed(globalCtx, &sparklePos, &zeroVec, &zeroVec, &primColor, &envColor, 600, -10); } void func_8085283C(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) { diff --git a/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c b/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c index 8175c1208b..02d838cb3e 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c +++ b/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c @@ -6,20 +6,18 @@ #include "z_eff_ss_blast.h" -typedef enum { - /* 0x00 */ SS_BLAST_ENV_R, - /* 0x01 */ SS_BLAST_ENV_G, - /* 0x02 */ SS_BLAST_ENV_B, - /* 0x03 */ SS_BLAST_ENV_A, - /* 0x04 */ SS_BLAST_PRIM_R, - /* 0x05 */ SS_BLAST_PRIM_G, - /* 0x06 */ SS_BLAST_PRIM_B, - /* 0x07 */ SS_BLAST_PRIM_A, - /* 0x08 */ SS_BLAST_ALPHA_STEP, - /* 0x09 */ SS_BLAST_RADIUS, - /* 0x0A */ SS_BLAST_RADIUS_STEP, - /* 0x0B */ SS_BLAST_RADIUS_STEP_DECR, -} EffectSsBlastRegs; +#define rPrimColorR regs[0] +#define rPrimColorG regs[1] +#define rPrimColorB regs[2] +#define rPrimColorA regs[3] +#define rEnvColorR regs[4] +#define rEnvColorG regs[5] +#define rEnvColorB regs[6] +#define rEnvColorA regs[7] +#define rAlphaTarget regs[8] +#define rScale regs[9] +#define rScaleStep regs[10] +#define rScaleStepDecay regs[11] u32 EffectSsBlast_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); void EffectSsBlast_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); @@ -39,54 +37,54 @@ u32 EffectSsBlast_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void this->pos.y += 5.0f; this->velocity = initParams->velocity; this->accel = initParams->accel; - this->displayList = SEGMENTED_TO_VIRTUAL(D_0401A0B0); + this->gfx = SEGMENTED_TO_VIRTUAL(D_0401A0B0); this->life = initParams->life; this->draw = EffectSsBlast_Draw; this->update = EffectSsBlast_Update; - this->regs[SS_BLAST_ENV_R] = initParams->envColor.r; - this->regs[SS_BLAST_ENV_G] = initParams->envColor.g; - this->regs[SS_BLAST_ENV_B] = initParams->envColor.b; - this->regs[SS_BLAST_ENV_A] = initParams->envColor.a; - this->regs[SS_BLAST_PRIM_R] = initParams->primColor.r; - this->regs[SS_BLAST_PRIM_G] = initParams->primColor.g; - this->regs[SS_BLAST_PRIM_B] = initParams->primColor.b; - this->regs[SS_BLAST_PRIM_A] = initParams->primColor.a; - this->regs[SS_BLAST_ALPHA_STEP] = initParams->envColor.a / initParams->life; - this->regs[SS_BLAST_RADIUS] = initParams->radius; - this->regs[SS_BLAST_RADIUS_STEP] = initParams->radiusStep; - this->regs[SS_BLAST_RADIUS_STEP_DECR] = initParams->radiusStepDecr; + this->rPrimColorR = initParams->primColor.r; + this->rPrimColorG = initParams->primColor.g; + this->rPrimColorB = initParams->primColor.b; + this->rPrimColorA = initParams->primColor.a; + this->rEnvColorR = initParams->envColor.r; + this->rEnvColorG = initParams->envColor.g; + this->rEnvColorB = initParams->envColor.b; + this->rEnvColorA = initParams->envColor.a; + this->rAlphaTarget = initParams->primColor.a / initParams->life; + this->rScale = initParams->scale; + this->rScaleStep = initParams->scaleStep; + this->rScaleStepDecay = initParams->sclaeStepDecay; return 1; } void EffectSsBlast_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - MtxF mtx; + MtxF mf; s32 pad; - f32 scale; + f32 radius; OPEN_DISPS(gfxCtx, "../z_eff_ss_blast.c", 170); - scale = this->regs[SS_BLAST_RADIUS] * 0.0025f; + radius = this->rScale * 0.0025f; func_80093D84(globalCtx->state.gfxCtx); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, this->regs[SS_BLAST_PRIM_R], this->regs[SS_BLAST_PRIM_G], - this->regs[SS_BLAST_PRIM_B], this->regs[SS_BLAST_PRIM_A]); - func_800BFCB8(globalCtx, &mtx, &this->pos); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, this->regs[SS_BLAST_ENV_R], this->regs[SS_BLAST_ENV_G], - this->regs[SS_BLAST_ENV_B], this->regs[SS_BLAST_ENV_A]); - Matrix_Put(&mtx); - Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); + gDPSetEnvColor(oGfxCtx->polyXlu.p++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, this->rEnvColorA); + func_800BFCB8(globalCtx, &mf, &this->pos); + gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, + this->rPrimColorA); + Matrix_Put(&mf); + Matrix_Scale(radius, radius, radius, MTXMODE_APPLY); gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(gfxCtx, "../z_eff_ss_blast.c", 199), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(oGfxCtx->polyXlu.p++, this->displayList); + gSPDisplayList(oGfxCtx->polyXlu.p++, this->gfx); + CLOSE_DISPS(gfxCtx, "../z_eff_ss_blast.c", 204); } void EffectSsBlast_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { - Math_ApproxS(&this->regs[SS_BLAST_ENV_A], 0, this->regs[SS_BLAST_ALPHA_STEP]); - this->regs[SS_BLAST_RADIUS] += this->regs[SS_BLAST_RADIUS_STEP]; + Math_ApproxS(&this->rPrimColorA, 0, this->rAlphaTarget); + this->rScale += this->rScaleStep; - if (this->regs[SS_BLAST_RADIUS_STEP] != 0) { - this->regs[SS_BLAST_RADIUS_STEP] -= this->regs[SS_BLAST_RADIUS_STEP_DECR]; + if (this->rScaleStep != 0) { + this->rScaleStep -= this->rScaleStepDecay; } } diff --git a/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.h b/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.h index 47ab3ce3b5..0f92fdcc9d 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.h +++ b/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.h @@ -8,11 +8,11 @@ typedef struct { /* 0x00 */ Vec3f pos; /* 0x0C */ Vec3f velocity; /* 0x18 */ Vec3f accel; - /* 0x24 */ Color_RGBA8 envColor; - /* 0x28 */ Color_RGBA8 primColor; - /* 0x2C */ s16 radius; - /* 0x2E */ s16 radiusStep; - /* 0x30 */ s16 radiusStepDecr; + /* 0x24 */ Color_RGBA8 primColor; + /* 0x28 */ Color_RGBA8 envColor; + /* 0x2C */ s16 scale; + /* 0x2E */ s16 scaleStep; + /* 0x30 */ s16 sclaeStepDecay; /* 0x32 */ s16 life; } EffectSsBlastParams; // size = 0x34 diff --git a/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c b/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c index 84245841f9..0a25635f9c 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c +++ b/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c @@ -6,10 +6,8 @@ #include "z_eff_ss_bomb.h" -typedef enum { - /* 0x00 */ SS_BOMB_SCALE, - /* 0x01 */ SS_BOMB_TEX_IDX, -} EffectSsBombRegs; +#define rScale regs[0] +#define rTexIdx regs[1] u32 EffectSsBomb_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); void EffectSsBomb_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); @@ -20,13 +18,6 @@ EffectSsInit Effect_Ss_Bomb_InitVars = { EffectSsBomb_Init, }; -static UNK_PTR D_8099F588[] = { - 0x04007F80, - 0x04008780, - 0x04008F80, - 0x04009780, -}; - extern Gfx D_0400BF80[]; u32 EffectSsBomb_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) { @@ -35,22 +26,29 @@ u32 EffectSsBomb_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* Math_Vec3f_Copy(&this->pos, &initParams->pos); Math_Vec3f_Copy(&this->velocity, &initParams->velocity); Math_Vec3f_Copy(&this->accel, &initParams->accel); - this->displayList = SEGMENTED_TO_VIRTUAL(D_0400BF80); + this->gfx = SEGMENTED_TO_VIRTUAL(D_0400BF80); this->life = 20; this->draw = EffectSsBomb_Draw; this->update = EffectSsBomb_Update; - this->regs[SS_BOMB_SCALE] = 100; - this->regs[SS_BOMB_TEX_IDX] = 0; + this->rScale = 100; + this->rTexIdx = 0; return 1; } +static void* sTextures[] = { + 0x04007F80, + 0x04008780, + 0x04008F80, + 0x04009780, +}; + void EffectSsBomb_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - MtxF sp12C; - MtxF spEC; - MtxF spAC; - MtxF sp6C; + MtxF mfTrans; + MtxF mfScale; + MtxF mfResult; + MtxF mfTrans11DA0; Mtx* mtx; s32 pad; f32 scale; @@ -60,26 +58,26 @@ void EffectSsBomb_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { OPEN_DISPS(gfxCtx, "../z_eff_ss_bomb.c", 168); - scale = this->regs[SS_BOMB_SCALE] / 100.0f; + scale = this->rScale / 100.0f; - SkinMatrix_SetTranslate(&sp12C, this->pos.x, this->pos.y, this->pos.z); - SkinMatrix_SetScale(&spEC, scale, scale, 1.0f); - SkinMatrix_MtxFMtxFMult(&sp12C, &globalCtx->mf_11DA0, &sp6C); - SkinMatrix_MtxFMtxFMult(&sp6C, &spEC, &spAC); + SkinMatrix_SetTranslate(&mfTrans, this->pos.x, this->pos.y, this->pos.z); + SkinMatrix_SetScale(&mfScale, scale, scale, 1.0f); + SkinMatrix_MtxFMtxFMult(&mfTrans, &globalCtx->mf_11DA0, &mfTrans11DA0); + SkinMatrix_MtxFMtxFMult(&mfTrans11DA0, &mfScale, &mfResult); gSPMatrix(oGfxCtx->polyXlu.p++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - mtx = SkinMatrix_MtxFToNewMtx(gfxCtx, &spAC); + mtx = SkinMatrix_MtxFToNewMtx(gfxCtx, &mfResult); if (mtx != NULL) { gSPMatrix(oGfxCtx->polyXlu.p++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8099F588[this->regs[SS_BOMB_TEX_IDX]])); + gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(sTextures[this->rTexIdx])); gDPPipeSync(oGfxCtx->polyXlu.p++); func_80094C50(gfxCtx); color = this->life * 12.75f; gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, color, color, color, color); gDPPipeSync(oGfxCtx->polyXlu.p++); - gSPDisplayList(oGfxCtx->polyXlu.p++, this->displayList); + gSPDisplayList(oGfxCtx->polyXlu.p++, this->gfx); gDPPipeSync(oGfxCtx->polyXlu.p++); } @@ -87,11 +85,11 @@ void EffectSsBomb_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { } void EffectSsBomb_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { - if ((this->life < 21) && (this->life >= 17)) { - this->regs[SS_BOMB_TEX_IDX] = (20 - this->life); + if ((this->life < 21) && (this->life > 16)) { + this->rTexIdx = (20 - this->life); } else { - this->regs[SS_BOMB_SCALE] += 0; - this->regs[SS_BOMB_TEX_IDX] = 3; + this->rScale += 0; + this->rTexIdx = 3; } this->accel.x = ((Math_Rand_ZeroOne() * 0.4f) - 0.2f); diff --git a/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c b/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c index a1ce614ec3..50df0e4265 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c +++ b/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c @@ -6,19 +6,17 @@ #include "z_eff_ss_bomb2.h" -typedef enum { - /* 0x00 */ SS_BOMB2_SCALE, - /* 0x01 */ SS_BOMB2_TEX_IDX, - /* 0x02 */ SS_BOMB2_PRIM_R, - /* 0x03 */ SS_BOMB2_PRIM_G, - /* 0x04 */ SS_BOMB2_PRIM_B, - /* 0x05 */ SS_BOMB2_PRIM_A, - /* 0x06 */ SS_BOMB2_ENV_R, - /* 0x07 */ SS_BOMB2_ENV_G, - /* 0x08 */ SS_BOMB2_ENV_B, - /* 0x09 */ SS_BOMB2_SCALE_STEP, - /* 0x0A */ SS_BOMB2_A -} EffectSsBomb2Regs; +#define rScale regs[0] +#define rTexIdx regs[1] +#define rPrimColorR regs[2] +#define rPrimColorG regs[3] +#define rPrimColorB regs[4] +#define rPrimColorA regs[5] +#define rEnvColorR regs[6] +#define rEnvColorG regs[7] +#define rEnvColorB regs[8] +#define rScaleStep regs[9] +#define rDepth regs[10] u32 EffectSsBomb2_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); void EffectSsBomb2_DrawFade(GlobalContext* globalCtx, u32 index, EffectSs* this); @@ -30,170 +28,172 @@ EffectSsInit Effect_Ss_Bomb2_InitVars = { EffectSsBomb2_Init, }; -static void* sDrawFuncs[] = { +static EffectSsDrawFunc sDrawFuncs[] = { EffectSsBomb2_DrawFade, EffectSsBomb2_DrawLayered, }; -static UNK_PTR D_8099FEE0[] = { - 0x04007F80, 0x04008780, 0x04008F80, 0x04009780, 0x04009F80, 0x0400A780, 0x0400AF80, 0x0400B780, -}; - -static UNK_PTR D_8099FF00[] = { - 0x04007F80, 0x04008780, 0x04008F80, 0x04009780, 0x04009F80, 0x0400A780, 0x0400AF80, 0x0400B780, -}; - extern Gfx D_0400BF80[]; extern Gfx D_0400BFE8[]; extern Gfx D_0400C040[]; u32 EffectSsBomb2_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) { + EffectSsBomb2InitParams* initParams = (EffectSsBomb2InitParams*)initParamsx; Math_Vec3f_Copy(&this->pos, &initParams->pos); Math_Vec3f_Copy(&this->velocity, &initParams->velocity); Math_Vec3f_Copy(&this->accel, &initParams->accel); - this->displayList = SEGMENTED_TO_VIRTUAL(&D_0400BF80); + this->gfx = SEGMENTED_TO_VIRTUAL(D_0400BF80); this->life = 24; this->update = EffectSsBomb2_Update; this->draw = sDrawFuncs[initParams->drawMode]; - this->regs[SS_BOMB2_SCALE] = initParams->scale; - this->regs[SS_BOMB2_SCALE_STEP] = initParams->scaleStep; - this->regs[SS_BOMB2_PRIM_R] = 255; - this->regs[SS_BOMB2_PRIM_G] = 255; - this->regs[SS_BOMB2_PRIM_B] = 255; - this->regs[SS_BOMB2_PRIM_A] = 255; - this->regs[SS_BOMB2_ENV_R] = 0; - this->regs[SS_BOMB2_ENV_G] = 0; - this->regs[SS_BOMB2_ENV_B] = 200; + this->rScale = initParams->scale; + this->rScaleStep = initParams->scaleStep; + this->rPrimColorR = 255; + this->rPrimColorG = 255; + this->rPrimColorB = 255; + this->rPrimColorA = 255; + this->rEnvColorR = 0; + this->rEnvColorG = 0; + this->rEnvColorB = 200; return 1; } // unused in the original game. looks like EffectSsBomb but with color void EffectSsBomb2_DrawFade(GlobalContext* globalCtx, u32 index, EffectSs* this) { + static void* textures[] = { + 0x04007F80, 0x04008780, 0x04008F80, 0x04009780, 0x04009F80, 0x0400A780, 0x0400AF80, 0x0400B780, + }; GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - MtxF sp11C; - MtxF spDC; - MtxF sp9C; - MtxF sp5C; + MtxF mfTrans; + MtxF mfScale; + MtxF mfResult; + MtxF mfTrans11DA0; Mtx* mtx; s32 pad; f32 scale; OPEN_DISPS(gfxCtx, "../z_eff_ss_bomb2.c", 298); - scale = this->regs[SS_BOMB2_SCALE] * 0.01f; - SkinMatrix_SetTranslate(&sp11C, this->pos.x, this->pos.y, this->pos.z); - SkinMatrix_SetScale(&spDC, scale, scale, 1.0f); - SkinMatrix_MtxFMtxFMult(&sp11C, &globalCtx->mf_11DA0, &sp5C); + scale = this->rScale * 0.01f; + SkinMatrix_SetTranslate(&mfTrans, this->pos.x, this->pos.y, this->pos.z); + SkinMatrix_SetScale(&mfScale, scale, scale, 1.0f); + SkinMatrix_MtxFMtxFMult(&mfTrans, &globalCtx->mf_11DA0, &mfTrans11DA0); + SkinMatrix_MtxFMtxFMult(&mfTrans11DA0, &mfScale, &mfResult); - SkinMatrix_MtxFMtxFMult(&sp5C, &spDC, &sp9C); - mtx = SkinMatrix_MtxFToNewMtx(gfxCtx, &sp9C); + mtx = SkinMatrix_MtxFToNewMtx(gfxCtx, &mfResult); if (mtx != NULL) { gSPMatrix(oGfxCtx->polyXlu.p++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); func_80094BC4(gfxCtx); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, this->regs[SS_BOMB2_PRIM_R], this->regs[SS_BOMB2_PRIM_G], - this->regs[SS_BOMB2_PRIM_B], this->regs[SS_BOMB2_PRIM_A]); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, this->regs[SS_BOMB2_ENV_R], this->regs[SS_BOMB2_ENV_G], - this->regs[SS_BOMB2_ENV_B], 0); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8099FEE0[this->regs[SS_BOMB2_TEX_IDX]])); - gSPDisplayList(oGfxCtx->polyXlu.p++, this->displayList); - if (1) {} - if (1) {} + gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, + this->rPrimColorA); + gDPSetEnvColor(oGfxCtx->polyXlu.p++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, 0); + gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(textures[this->rTexIdx])); + gSPDisplayList(oGfxCtx->polyXlu.p++, this->gfx); } + if (1) {} + if (1) {} + CLOSE_DISPS(gfxCtx, "../z_eff_ss_bomb2.c", 345); } void EffectSsBomb2_DrawLayered(GlobalContext* globalCtx, u32 index, EffectSs* this) { + static void* textures[] = { + 0x04007F80, 0x04008780, 0x04008F80, 0x04009780, 0x04009F80, 0x0400A780, 0x0400AF80, 0x0400B780, + }; GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - MtxF sp1B4; - MtxF sp174; - MtxF sp134; - MtxF spF4; - MtxF spB4; + MtxF mfTrans; + MtxF mfScale; + MtxF mfResult; + MtxF mfTrans11DA0; + MtxF mtx2F; Mtx* mtx2; Mtx* mtx; s32 pad[3]; f32 scale; - f32 temp_f24; - f32 mtxScale = 0.925f; + f32 depth; + f32 layer2Scale = 0.925f; s32 i; OPEN_DISPS(gfxCtx, "../z_eff_ss_bomb2.c", 386); - temp_f24 = this->regs[SS_BOMB2_A]; - scale = this->regs[SS_BOMB2_SCALE] * 0.01f; - SkinMatrix_SetTranslate(&sp1B4, this->pos.x, this->pos.y, this->pos.z); - SkinMatrix_SetScale(&sp174, scale, scale, 1.0f); - SkinMatrix_MtxFMtxFMult(&sp1B4, &globalCtx->mf_11DA0, &spF4); - SkinMatrix_MtxFMtxFMult(&spF4, &sp174, &sp134); - mtx = SkinMatrix_MtxFToNewMtx(gfxCtx, &sp134); + depth = this->rDepth; + scale = this->rScale * 0.01f; + SkinMatrix_SetTranslate(&mfTrans, this->pos.x, this->pos.y, this->pos.z); + SkinMatrix_SetScale(&mfScale, scale, scale, 1.0f); + SkinMatrix_MtxFMtxFMult(&mfTrans, &globalCtx->mf_11DA0, &mfTrans11DA0); + SkinMatrix_MtxFMtxFMult(&mfTrans11DA0, &mfScale, &mfResult); + + mtx = SkinMatrix_MtxFToNewMtx(gfxCtx, &mfResult); if (mtx != NULL) { gSPMatrix(oGfxCtx->polyXlu.p++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - mtx2 = SkinMatrix_MtxFToNewMtx(gfxCtx, &sp134); + + mtx2 = SkinMatrix_MtxFToNewMtx(gfxCtx, &mfResult); if (mtx2 != NULL) { func_80094BC4(gfxCtx); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, this->regs[SS_BOMB2_PRIM_R], this->regs[SS_BOMB2_PRIM_G], - this->regs[SS_BOMB2_PRIM_B], this->regs[SS_BOMB2_PRIM_A]); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, this->regs[SS_BOMB2_ENV_R], this->regs[SS_BOMB2_ENV_G], - this->regs[SS_BOMB2_ENV_B], 0); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8099FF00[this->regs[SS_BOMB2_TEX_IDX]])); + gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, + this->rPrimColorA); + gDPSetEnvColor(oGfxCtx->polyXlu.p++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, 0); + gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(textures[this->rTexIdx])); gSPDisplayList(oGfxCtx->polyXlu.p++, D_0400BFE8); gSPDisplayList(oGfxCtx->polyXlu.p++, D_0400C040); - Matrix_MtxToMtxF(mtx2, &spB4); - Matrix_Put(&spB4); + Matrix_MtxToMtxF(mtx2, &mtx2F); + Matrix_Put(&mtx2F); + for (i = 1; i >= 0; i--) { - Matrix_Translate(0.0f, 0.0f, temp_f24, MTXMODE_APPLY); + Matrix_Translate(0.0f, 0.0f, depth, MTXMODE_APPLY); Matrix_RotateZ((this->life * 0.02f) + 180.0f, MTXMODE_APPLY); - Matrix_Scale(mtxScale, mtxScale, mtxScale, MTXMODE_APPLY); + Matrix_Scale(layer2Scale, layer2Scale, layer2Scale, MTXMODE_APPLY); gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_eff_ss_bomb2.c", 448), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(oGfxCtx->polyXlu.p++, D_0400C040); - mtxScale -= 0.15f; + layer2Scale -= 0.15f; } } - - if (1) {} - if (1) {} } + + if (1) {} + if (1) {} + CLOSE_DISPS(gfxCtx, "../z_eff_ss_bomb2.c", 456); } void EffectSsBomb2_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { s32 divisor; - this->regs[SS_BOMB2_TEX_IDX] = (23 - this->life) / 3; - this->regs[SS_BOMB2_SCALE] += this->regs[SS_BOMB2_SCALE_STEP]; + this->rTexIdx = (23 - this->life) / 3; + this->rScale += this->rScaleStep; - if (this->regs[SS_BOMB2_SCALE_STEP] == 30) { - this->regs[SS_BOMB2_A] += 4.0f; + if (this->rScaleStep == 30) { + this->rDepth += 4.0f; } else { - this->regs[SS_BOMB2_A] += 2.0f; + this->rDepth += 2.0f; } - if ((this->life < 23) && (this->life >= 14)) { + if ((this->life < 23) && (this->life > 13)) { divisor = this->life - 13; - this->regs[SS_BOMB2_PRIM_R] = func_80027DD4(this->regs[SS_BOMB2_PRIM_R], 255, divisor); - this->regs[SS_BOMB2_PRIM_G] = func_80027DD4(this->regs[SS_BOMB2_PRIM_G], 255, divisor); - this->regs[SS_BOMB2_PRIM_B] = func_80027DD4(this->regs[SS_BOMB2_PRIM_B], 150, divisor); - this->regs[SS_BOMB2_PRIM_A] = func_80027DD4(this->regs[SS_BOMB2_PRIM_A], 255, divisor); - this->regs[SS_BOMB2_ENV_R] = func_80027DD4(this->regs[SS_BOMB2_ENV_R], 150, divisor); - this->regs[SS_BOMB2_ENV_G] = func_80027DD4(this->regs[SS_BOMB2_ENV_G], 0, divisor); - this->regs[SS_BOMB2_ENV_B] = func_80027DD4(this->regs[SS_BOMB2_ENV_B], 0, divisor); - } else if ((this->life < 14) && (this->life >= 0)) { + this->rPrimColorR = func_80027DD4(this->rPrimColorR, 255, divisor); + this->rPrimColorG = func_80027DD4(this->rPrimColorG, 255, divisor); + this->rPrimColorB = func_80027DD4(this->rPrimColorB, 150, divisor); + this->rPrimColorA = func_80027DD4(this->rPrimColorA, 255, divisor); + this->rEnvColorR = func_80027DD4(this->rEnvColorR, 150, divisor); + this->rEnvColorG = func_80027DD4(this->rEnvColorG, 0, divisor); + this->rEnvColorB = func_80027DD4(this->rEnvColorB, 0, divisor); + } else if ((this->life < 14) && (this->life > -1)) { divisor = this->life + 1; - this->regs[SS_BOMB2_PRIM_R] = func_80027DD4(this->regs[SS_BOMB2_PRIM_R], 50, divisor); - this->regs[SS_BOMB2_PRIM_G] = func_80027DD4(this->regs[SS_BOMB2_PRIM_G], 50, divisor); - this->regs[SS_BOMB2_PRIM_B] = func_80027DD4(this->regs[SS_BOMB2_PRIM_B], 50, divisor); - this->regs[SS_BOMB2_PRIM_A] = func_80027DD4(this->regs[SS_BOMB2_PRIM_A], 150, divisor); - this->regs[SS_BOMB2_ENV_R] = func_80027DD4(this->regs[SS_BOMB2_ENV_R], 10, divisor); - this->regs[SS_BOMB2_ENV_G] = func_80027DD4(this->regs[SS_BOMB2_ENV_G], 10, divisor); - this->regs[SS_BOMB2_ENV_B] = func_80027DD4(this->regs[SS_BOMB2_ENV_B], 10, divisor); + this->rPrimColorR = func_80027DD4(this->rPrimColorR, 50, divisor); + this->rPrimColorG = func_80027DD4(this->rPrimColorG, 50, divisor); + this->rPrimColorB = func_80027DD4(this->rPrimColorB, 50, divisor); + this->rPrimColorA = func_80027DD4(this->rPrimColorA, 150, divisor); + this->rEnvColorR = func_80027DD4(this->rEnvColorR, 10, divisor); + this->rEnvColorG = func_80027DD4(this->rEnvColorG, 10, divisor); + this->rEnvColorB = func_80027DD4(this->rEnvColorB, 10, divisor); } } diff --git a/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c b/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c index af991d86df..88b9edd2a6 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c +++ b/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c @@ -6,35 +6,83 @@ #include "z_eff_ss_bubble.h" -typedef enum { - /* 0x00 */ SS_BUBBLE_0, - /* 0x01 */ SS_BUBBLE_1, - /* 0x02 */ SS_BUBBLE_2, - /* 0x03 */ SS_BUBBLE_3, - /* 0x04 */ SS_BUBBLE_4, - /* 0x05 */ SS_BUBBLE_5, - /* 0x06 */ SS_BUBBLE_6, - /* 0x07 */ SS_BUBBLE_7, - /* 0x08 */ SS_BUBBLE_8, - /* 0x09 */ SS_BUBBLE_9, - /* 0x0A */ SS_BUBBLE_A, - /* 0x0B */ SS_BUBBLE_B, - /* 0x0C */ SS_BUBBLE_C, -} EffectSsBubbleRegs; +#define rScale regs[0] u32 EffectSsBubble_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); void EffectSsBubble_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); void EffectSsBubble_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); -/* EffectSsInit Effect_Ss_Bubble_InitVars = { EFFECT_SS_BUBBLE, EffectSsBubble_Init, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/EffectSsBubble_Init.s") +extern void* D_04055DB0; +extern void* D_04055EB0; +extern Gfx D_0401A160[]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/func_809A01CC.s") +u32 EffectSsBubble_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) { + EffectSsBubbleInitParams* initParams = (EffectSsBubbleInitParams*)initParamsx; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/func_809A0360.s") + // @bug Math_Rand_ZeroOne in the macro means a random number is generated for both parts of the macro. + // In the base game this works out because both addresses are segment 4, but it may break if + // the addresses were changed to refer to different segments + this->gfx = SEGMENTED_TO_VIRTUAL(Math_Rand_ZeroOne() < 0.5f ? &D_04055DB0 : &D_04055EB0); + this->pos.x = ((Math_Rand_ZeroOne() - 0.5f) * initParams->xzPosRandScale) + initParams->pos.x; + this->pos.y = + (((Math_Rand_ZeroOne() - 0.5f) * initParams->yPosRandScale) + initParams->yPosOffset) + initParams->pos.y; + this->pos.z = ((Math_Rand_ZeroOne() - 0.5f) * initParams->xzPosRandScale) + initParams->pos.z; + Math_Vec3f_Copy(&this->vec, &this->pos); + this->life = 1; + this->rScale = (((Math_Rand_ZeroOne() * 0.5f) + 1.0f) * initParams->scale) * 100; + this->draw = EffectSsBubble_Draw; + this->update = EffectSsBubble_Update; + + return 1; +} + +void EffectSsBubble_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + f32 scale = this->rScale / 100.0f; + + OPEN_DISPS(gfxCtx, "../z_eff_ss_bubble.c", 154); + + Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW); + Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); + gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(gfxCtx, "../z_eff_ss_bubble.c", 167), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + func_80093D18(gfxCtx); + gDPSetPrimColor(oGfxCtx->polyOpa.p++, 0, 0, 255, 255, 255, 255); + gDPSetEnvColor(oGfxCtx->polyOpa.p++, 150, 150, 150, 0); + gSPSegment(oGfxCtx->polyOpa.p++, 0x08, this->gfx); + gSPDisplayList(oGfxCtx->polyOpa.p++, SEGMENTED_TO_VIRTUAL(D_0401A160)); + + CLOSE_DISPS(gfxCtx, "../z_eff_ss_bubble.c", 179); +} + +void EffectSsBubble_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { + WaterBox* waterBox; + f32 waterSurfaceY; + Vec3f ripplePos; + + waterSurfaceY = this->pos.y; + + // kill bubble if its out of range of a water box + if (!func_8004213C(globalCtx, &globalCtx->colCtx, this->pos.x, this->pos.z, &waterSurfaceY, &waterBox)) { + this->life = -1; + return; + } + + if (waterSurfaceY < this->pos.y) { + ripplePos.x = this->pos.x; + ripplePos.y = waterSurfaceY; + ripplePos.z = this->pos.z; + EffectSsGRipple_Spawn(globalCtx, &ripplePos, 0, 80, 0); + this->life = -1; + } else { + this->life++; + this->pos.x = ((Math_Rand_ZeroOne() * 0.5f) - 0.25f) + this->vec.x; + this->accel.y = (Math_Rand_ZeroOne() - 0.3f) * 0.2f; + this->pos.z = ((Math_Rand_ZeroOne() * 0.5f) - 0.25f) + this->vec.z; + } +} diff --git a/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.h b/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.h index d9710fec1c..d1410d4e56 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.h +++ b/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.h @@ -6,8 +6,10 @@ typedef struct { /* 0x00 */ Vec3f pos; - /* 0x0C */ Vec3f velocity; - /* 0x18 */ Vec3f accel; -} EffectSsBubbleInitParams; // size = 0x + /* 0x0C */ f32 yPosOffset; + /* 0x10 */ f32 yPosRandScale; + /* 0x14 */ f32 xzPosRandScale; + /* 0x18 */ f32 scale; +} EffectSsBubbleInitParams; // size = 0x1C #endif diff --git a/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c b/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c index 0ed4a214b1..3ca719a40d 100644 --- a/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c +++ b/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c @@ -1,40 +1,127 @@ /* * File: z_eff_ss_d_fire.c * Overlay: ovl_Effect_Ss_D_Fire - * Description: + * Description: Dodongo Fire */ #include "z_eff_ss_d_fire.h" -typedef enum { - /* 0x00 */ SS_D_FIRE_0, - /* 0x01 */ SS_D_FIRE_1, - /* 0x02 */ SS_D_FIRE_2, - /* 0x03 */ SS_D_FIRE_3, - /* 0x04 */ SS_D_FIRE_4, - /* 0x05 */ SS_D_FIRE_5, - /* 0x06 */ SS_D_FIRE_6, - /* 0x07 */ SS_D_FIRE_7, - /* 0x08 */ SS_D_FIRE_8, - /* 0x09 */ SS_D_FIRE_9, - /* 0x0A */ SS_D_FIRE_A, - /* 0x0B */ SS_D_FIRE_B, - /* 0x0C */ SS_D_FIRE_C, -} EffectSsD_FireRegs; +#define rScale regs[0] +#define rTexIdx regs[1] +#define rPrimColorR regs[2] +#define rPrimColorG regs[3] +#define rPrimColorB regs[4] +#define rPrimColorA regs[5] +#define rFadeDelay regs[6] +#define rScaleStep regs[9] +#define rObjBankIdx regs[10] +#define rYAccelStep regs[11] // has no effect due to how its implemented u32 EffectSsDFire_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); void EffectSsDFire_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); void EffectSsDFire_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); -/* EffectSsInit Effect_Ss_D_Fire_InitVars = { EFFECT_SS_D_FIRE, EffectSsDFire_Init, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/EffectSsDFire_Init.s") +extern Gfx D_060098A0[]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/func_809A0698.s") +u32 EffectSsDFire_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) { + EffectSsDFireInitParams* initParams = (EffectSsDFireInitParams*)initParamsx; + s32 objBankIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_DODONGO); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/func_809A090C.s") + if (objBankIndex >= 0) { + this->pos = initParams->pos; + this->velocity = initParams->velocity; + this->accel = initParams->accel; + this->gfx = SEGMENTED_TO_VIRTUAL(D_060098A0); + this->life = initParams->life; + this->rScale = initParams->scale; + this->rScaleStep = initParams->scaleStep; + this->rYAccelStep = 0; + this->rObjBankIdx = objBankIndex; + this->draw = EffectSsDFire_Draw; + this->update = EffectSsDFire_Update; + this->rTexIdx = ((s16)(globalCtx->state.frames % 4) ^ 3); + this->rPrimColorR = 255; + this->rPrimColorG = 255; + this->rPrimColorB = 50; + this->rPrimColorA = initParams->alpha; + this->rFadeDelay = initParams->fadeDelay; + + return 1; + } + + return 0; +} + +static void* sTextures[] = { 0x060090A0, 0x060092A0, 0x060094A0, 0x060096A0 }; + +void EffectSsDFire_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + MtxF mfTrans; + MtxF mfScale; + MtxF mfResult; + MtxF mfTrans11DA0; + s32 pad; + void* object; + Mtx* mtx; + f32 scale; + + object = globalCtx->objectCtx.status[this->rObjBankIdx].segment; + + OPEN_DISPS(gfxCtx, "../z_eff_ss_d_fire.c", 276); + + if (Object_GetIndex(&globalCtx->objectCtx, OBJECT_DODONGO) > -1) { + gSegments[6] = VIRTUAL_TO_PHYSICAL(object); + gSPSegment(oGfxCtx->polyXlu.p++, 0x06, object); + scale = this->rScale / 100.0f; + SkinMatrix_SetTranslate(&mfTrans, this->pos.x, this->pos.y, this->pos.z); + SkinMatrix_SetScale(&mfScale, scale, scale, 1.0f); + SkinMatrix_MtxFMtxFMult(&mfTrans, &globalCtx->mf_11DA0, &mfTrans11DA0); + SkinMatrix_MtxFMtxFMult(&mfTrans11DA0, &mfScale, &mfResult); + + mtx = SkinMatrix_MtxFToNewMtx(gfxCtx, &mfResult); + + if (mtx != NULL) { + gSPMatrix(oGfxCtx->polyXlu.p++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + func_80094BC4(gfxCtx); + gDPSetEnvColor(oGfxCtx->polyXlu.p++, 255, 0, 0, 0); + gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, + this->rPrimColorA); + gSegments[6] = VIRTUAL_TO_PHYSICAL(object); + gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(sTextures[this->rTexIdx])); + gSPDisplayList(oGfxCtx->polyXlu.p++, this->gfx); + } + } + + CLOSE_DISPS(gfxCtx, "../z_eff_ss_d_fire.c", 330); +} + +void EffectSsDFire_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { + this->rTexIdx++; + this->rTexIdx &= 3; + this->rScale += this->rScaleStep; + + if (this->rFadeDelay >= this->life) { + this->rPrimColorA -= 5; + if (this->rPrimColorA < 0) { + this->rPrimColorA = 0; + } + } else { + this->rPrimColorA += 15; + if (this->rPrimColorA > 255) { + this->rPrimColorA = 255; + } + } + + if (this->accel.y < 0.0f) { + this->accel.y += this->rYAccelStep * 0.01f; + } + + if (this->life <= 0) { + this->rYAccelStep += 0; + } +} diff --git a/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.h b/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.h index 36bfa9eeae..07204b018b 100644 --- a/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.h +++ b/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.h @@ -8,6 +8,11 @@ typedef struct { /* 0x00 */ Vec3f pos; /* 0x0C */ Vec3f velocity; /* 0x18 */ Vec3f accel; -} EffectSsDFireInitParams; // size = 0x + /* 0x24 */ s16 scale; + /* 0x26 */ s16 scaleStep; + /* 0x28 */ s16 alpha; + /* 0x2A */ s16 fadeDelay; + /* 0x2C */ s32 life; +} EffectSsDFireInitParams; // size = 0x30 #endif diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c b/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c index 0d2bc6c02c..f51cbaede0 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c @@ -1,40 +1,137 @@ /* * File: z_eff_ss_dead_db.c * Overlay: ovl_Effect_Ss_Dead_Db - * Description: + * Description: Flames and sound used when an enemy dies */ #include "z_eff_ss_dead_db.h" -typedef enum { - /* 0x00 */ SS_DEAD_DB_0, - /* 0x01 */ SS_DEAD_DB_1, - /* 0x02 */ SS_DEAD_DB_2, - /* 0x03 */ SS_DEAD_DB_3, - /* 0x04 */ SS_DEAD_DB_4, - /* 0x05 */ SS_DEAD_DB_5, - /* 0x06 */ SS_DEAD_DB_6, - /* 0x07 */ SS_DEAD_DB_7, - /* 0x08 */ SS_DEAD_DB_8, - /* 0x09 */ SS_DEAD_DB_9, - /* 0x0A */ SS_DEAD_DB_A, - /* 0x0B */ SS_DEAD_DB_B, - /* 0x0C */ SS_DEAD_DB_C, -} EffectSsDead_DbRegs; +#define rScale regs[0] +#define rTextIdx regs[1] +#define rPrimColorR regs[2] +#define rPrimColorG regs[3] +#define rPrimColorB regs[4] +#define rPrimColorA regs[5] +#define rEnvColorR regs[6] +#define rEnvColorG regs[7] +#define rEnvColorB regs[8] +#define rScaleStep regs[9] +#define rPlaySound regs[10] +#define rReg11 regs[11] u32 EffectSsDeadDb_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); void EffectSsDeadDb_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); void EffectSsDeadDb_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); -/* EffectSsInit Effect_Ss_Dead_Db_InitVars = { EFFECT_SS_DEAD_DB, EffectSsDeadDb_Init, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/EffectSsDeadDb_Init.s") +extern Gfx D_04031FE0[]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/func_809A0BB8.s") +u32 EffectSsDeadDb_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) { + EffectSsDeadDbInitParams* initParams = (EffectSsDeadDbInitParams*)initParamsx; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/func_809A0DB4.s") + this->pos = initParams->pos; + this->velocity = initParams->velocity; + this->accel = initParams->accel; + this->gfx = SEGMENTED_TO_VIRTUAL(D_04031FE0); + this->life = initParams->unk_34; + this->flags = 4; + this->rScaleStep = initParams->scaleStep; + this->rReg11 = initParams->unk_34; + this->draw = EffectSsDeadDb_Draw; + this->update = EffectSsDeadDb_Update; + this->rScale = initParams->scale; + this->rTextIdx = 0; + this->rPlaySound = initParams->playSound; + this->rPrimColorR = initParams->primColor.r; + this->rPrimColorG = initParams->primColor.g; + this->rPrimColorB = initParams->primColor.b; + this->rPrimColorA = initParams->primColor.a; + this->rEnvColorR = initParams->envColor.r; + this->rEnvColorG = initParams->envColor.g; + this->rEnvColorB = initParams->envColor.b; + + return 1; +} + +static void* sTextures[] = { + 0x0402CFE0, 0x0402D7E0, 0x0402DFE0, 0x0402E7E0, 0x0402EFE0, + 0x0402F7E0, 0x0402FFE0, 0x040307E0, 0x04030FE0, 0x040317E0, +}; + +void EffectSsDeadDb_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + MtxF mfTrans; + MtxF mfScale; + MtxF mfResult; + Mtx* mtx; + f32 scale; + + OPEN_DISPS(gfxCtx, "../z_eff_ss_dead_db.c", 201); + + scale = this->rScale * 0.01f; + + SkinMatrix_SetTranslate(&mfTrans, this->pos.x, this->pos.y, this->pos.z); + SkinMatrix_SetScale(&mfScale, scale, scale, scale); + SkinMatrix_MtxFMtxFMult(&mfTrans, &mfScale, &mfResult); + + mtx = SkinMatrix_MtxFToNewMtx(gfxCtx, &mfResult); + + if (mtx != NULL) { + gSPMatrix(oGfxCtx->polyXlu.p++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + func_80094BC4(gfxCtx); + gDPSetEnvColor(oGfxCtx->polyXlu.p++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, 0); + gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, + this->rPrimColorA); + gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(sTextures[this->rTextIdx])); + gSPDisplayList(oGfxCtx->polyXlu.p++, this->gfx); + } + + CLOSE_DISPS(gfxCtx, "../z_eff_ss_dead_db.c", 247); +} + +void EffectSsDeadDb_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { + f32 w; + f32 pad; + + this->rTextIdx = (f32)((this->rReg11 - this->life) * 9) / this->rReg11; + this->rScale += this->rScaleStep; + + this->rPrimColorR -= 10; + if (this->rPrimColorR < 0) { + this->rPrimColorR = 0; + } + + this->rPrimColorG -= 10; + if (this->rPrimColorG < 0) { + this->rPrimColorG = 0; + } + + this->rPrimColorB -= 10; + if (this->rPrimColorB < 0) { + this->rPrimColorB = 0; + } + + this->rEnvColorR -= 10; + if (this->rEnvColorR < 0) { + this->rEnvColorR = 0; + } + + this->rEnvColorG -= 10; + if (this->rEnvColorG < 0) { + this->rEnvColorG = 0; + } + + this->rEnvColorB -= 10; + if (this->rEnvColorB < 0) { + this->rEnvColorB = 0; + } + + if (this->rPlaySound && (this->rTextIdx == 1)) { + SkinMatrix_Vec3fMtxFMultXYZW(&globalCtx->mf_11D60, &this->pos, &this->vec, &w); + Audio_PlaySoundGeneral(NA_SE_EN_EXTINCT, &this->vec, 4, &D_801333E0, &D_801333E0, &D_801333E8); + } +} diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.h b/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.h index e180a20779..dad1b3731e 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.h +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.h @@ -8,6 +8,13 @@ typedef struct { /* 0x00 */ Vec3f pos; /* 0x0C */ Vec3f velocity; /* 0x18 */ Vec3f accel; -} EffectSsDeadDbInitParams; // size = 0x + /* 0x24 */ s16 scale; + /* 0x26 */ s16 scaleStep; + /* 0x28 */ Color_RGBA8 primColor; + /* 0x2C */ Color_RGBA8 envColor; + /* 0x30 */ s16 unused; + /* 0x34 */ s32 unk_34; + /* 0x38 */ s16 playSound; +} EffectSsDeadDbInitParams; // size = 0x3C #endif diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c b/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c index e8770367d3..7c518d2904 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c @@ -6,35 +6,140 @@ #include "z_eff_ss_dead_dd.h" -typedef enum { - /* 0x00 */ SS_DEAD_DD_0, - /* 0x01 */ SS_DEAD_DD_1, - /* 0x02 */ SS_DEAD_DD_2, - /* 0x03 */ SS_DEAD_DD_3, - /* 0x04 */ SS_DEAD_DD_4, - /* 0x05 */ SS_DEAD_DD_5, - /* 0x06 */ SS_DEAD_DD_6, - /* 0x07 */ SS_DEAD_DD_7, - /* 0x08 */ SS_DEAD_DD_8, - /* 0x09 */ SS_DEAD_DD_9, - /* 0x0A */ SS_DEAD_DD_A, - /* 0x0B */ SS_DEAD_DD_B, - /* 0x0C */ SS_DEAD_DD_C, -} EffectSsDead_DdRegs; +#define rScale regs[0] +#define rPrimColorR regs[2] +#define rPrimColorG regs[3] +#define rPrimColorB regs[4] +#define rAlpha regs[5] +#define rEnvColorR regs[6] +#define rEnvColorG regs[7] +#define rEnvColorB regs[8] +#define rScaleStep regs[9] +#define rAlphaStep regs[10] +#define rAlphaMode regs[11] // if mode is 0 alpha decreases over time, otherwise it increases u32 EffectSsDeadDd_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); void EffectSsDeadDd_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); void EffectSsDeadDd_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); -/* EffectSsInit Effect_Ss_Dead_Dd_InitVars = { EFFECT_SS_DEAD_DD, EffectSsDeadDd_Init, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Dd/EffectSsDeadDd_Init.s") +extern Mtx D_01000000; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Dd/func_809A12B4.s") +u32 EffectSsDeadDd_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) { + s32 i; + EffectSsDeadDdInitParams* initParams = (EffectSsDeadDdInitParams*)initParamsx; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Dd/func_809A14B0.s") + if (initParams->type == 0) { + this->pos = initParams->pos; + this->velocity = initParams->velocity; + this->accel = initParams->accel; + this->life = initParams->life; + this->rScaleStep = initParams->scaleStep; + this->rAlphaMode = initParams->alphaStep; + + if (initParams->alphaStep != 0) { + this->rAlphaStep = initParams->alphaStep; + } else { + this->rAlphaStep = initParams->alpha / initParams->life; + } + + this->draw = EffectSsDeadDd_Draw; + this->update = EffectSsDeadDd_Update; + this->rScale = initParams->scale; + this->rPrimColorR = initParams->primColor.r; + this->rPrimColorG = initParams->primColor.g; + this->rPrimColorB = initParams->primColor.b; + this->rAlpha = initParams->alpha; + this->rEnvColorR = initParams->envColor.r; + this->rEnvColorG = initParams->envColor.g; + this->rEnvColorB = initParams->envColor.b; + + } else if (initParams->type == 1) { + this->life = initParams->life; + this->rScaleStep = initParams->scaleStep; + this->rAlphaMode = 0; + this->rAlphaStep = 155 / initParams->life; + this->rScale = initParams->scale; + this->rPrimColorR = 255; + this->rPrimColorG = 255; + this->rPrimColorB = 155; + this->rAlpha = 155; + this->rEnvColorR = 250; + this->rEnvColorG = 180; + this->rEnvColorB = 0; + this->draw = EffectSsDeadDd_Draw; + this->update = EffectSsDeadDd_Update; + + for (i = initParams->randIter; i > 0; i--) { + this->pos.x = ((Math_Rand_ZeroOne() - 0.5f) * initParams->randPosScale) + initParams->pos.x; + this->pos.y = ((Math_Rand_ZeroOne() - 0.5f) * initParams->randPosScale) + initParams->pos.y; + this->pos.z = ((Math_Rand_ZeroOne() - 0.5f) * initParams->randPosScale) + initParams->pos.z; + this->accel.x = this->velocity.x = (Math_Rand_ZeroOne() - 0.5f) * 2.0f; + this->accel.y = this->velocity.y = (Math_Rand_ZeroOne() - 0.5f) * 2.0f; + this->accel.z = this->velocity.z = (Math_Rand_ZeroOne() - 0.5f) * 2.0f; + } + } else { + osSyncPrintf("Effect_SS_Dd_disp_mode():mode_swが変です。\n"); + return 0; + } + + return 1; +} + +void EffectSsDeadDd_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + MtxF mfTrans; + MtxF mfScale; + MtxF mfResult; + Mtx* mtx; + f32 scale; + + OPEN_DISPS(gfxCtx, "../z_eff_ss_dead_dd.c", 214); + + scale = this->rScale * 0.01f; + SkinMatrix_SetTranslate(&mfTrans, this->pos.x, this->pos.y, this->pos.z); + SkinMatrix_SetScale(&mfScale, scale, scale, scale); + SkinMatrix_MtxFMtxFMult(&mfTrans, &mfScale, &mfResult); + + mtx = SkinMatrix_MtxFToNewMtx(gfxCtx, &mfResult); + + if (mtx != NULL) { + func_80094BC4(gfxCtx); + gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, + this->rAlpha); + gDPSetEnvColor(oGfxCtx->polyXlu.p++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, this->rAlpha); + gSPMatrix(oGfxCtx->polyXlu.p++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(oGfxCtx->polyXlu.p++, &D_01000000, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gDPSetCombineLERP(oGfxCtx->polyXlu.p++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, + 0, PRIMITIVE, 0); + gSPDisplayList(oGfxCtx->polyXlu.p++, D_04037730); + } + + CLOSE_DISPS(gfxCtx, "../z_eff_ss_dead_dd.c", 259); +} + +void EffectSsDeadDd_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { + + this->rScale += this->rScaleStep; + + if (this->rScale < 0) { + this->rScale = 0; + } + + if (this->rAlphaMode != 0) { + this->rAlpha += this->rAlphaStep; + if (this->rAlpha > 255) { + this->rAlpha = 255; + } + } else { + if (this->rAlpha < this->rAlphaStep) { + this->rAlpha = 0; + } else { + this->rAlpha -= this->rAlphaStep; + } + } +} diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.h b/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.h index 66a8a85e8a..8759565e9a 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.h +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.h @@ -8,6 +8,16 @@ typedef struct { /* 0x00 */ Vec3f pos; /* 0x0C */ Vec3f velocity; /* 0x18 */ Vec3f accel; -} EffectSsDeadDdInitParams; // size = 0x + /* 0x24 */ s16 scale; + /* 0x26 */ s16 scaleStep; + /* 0x28 */ Color_RGB8 primColor; + /* 0x2A */ u8 alpha; + /* 0x2C */ Color_RGB8 envColor; + /* 0x30 */ s16 alphaStep; + /* 0x34 */ s32 life; + /* 0x38 */ f32 randPosScale; + /* 0x3C */ s32 randIter; + /* 0x40 */ u8 type; +} EffectSsDeadDdInitParams; // size = 0x44 #endif diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c b/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c index 6171df8087..c7bf7d1bf7 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c @@ -1,40 +1,125 @@ /* * File: z_eff_ss_dead_ds.c * Overlay: ovl_Effect_Ss_Dead_Ds - * Description: + * Description: Burn mark on the floor */ #include "z_eff_ss_dead_ds.h" -typedef enum { - /* 0x00 */ SS_DEAD_DS_0, - /* 0x01 */ SS_DEAD_DS_1, - /* 0x02 */ SS_DEAD_DS_2, - /* 0x03 */ SS_DEAD_DS_3, - /* 0x04 */ SS_DEAD_DS_4, - /* 0x05 */ SS_DEAD_DS_5, - /* 0x06 */ SS_DEAD_DS_6, - /* 0x07 */ SS_DEAD_DS_7, - /* 0x08 */ SS_DEAD_DS_8, - /* 0x09 */ SS_DEAD_DS_9, - /* 0x0A */ SS_DEAD_DS_A, - /* 0x0B */ SS_DEAD_DS_B, - /* 0x0C */ SS_DEAD_DS_C, -} EffectSsDead_DsRegs; +#define rScale regs[0] +#define rTimer regs[1] +#define rRoll regs[2] +#define rPitch regs[3] +#define rYaw regs[4] +#define rAlpha regs[5] +#define rScaleStep regs[9] +#define rAlphaStep regs[10] +#define rHalfOfLife regs[11] u32 EffectSsDeadDs_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); void EffectSsDeadDs_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); void EffectSsDeadDs_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); -/* EffectSsInit Effect_Ss_Dead_Ds_InitVars = { EFFECT_SS_DEAD_DS, EffectSsDeadDs_Init, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/EffectSsDeadDs_Init.s") +extern Gfx D_04037730[]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/func_809A16F4.s") +u32 EffectSsDeadDs_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) { + EffectSsDeadDsInitParams* initParams = (EffectSsDeadDsInitParams*)initParamsx; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/func_809A1A08.s") + this->pos = initParams->pos; + this->velocity = initParams->velocity; + this->accel = initParams->accel; + this->life = initParams->life; + this->rScaleStep = initParams->scaleStep; + this->rHalfOfLife = initParams->life / 2; + this->rAlphaStep = initParams->alpha / this->rHalfOfLife; + this->draw = EffectSsDeadDs_Draw; + this->update = EffectSsDeadDs_Update; + this->rScale = initParams->scale; + this->rAlpha = initParams->alpha; + this->rTimer = 0; + + return 1; +} + +void EffectSsDeadDs_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { + s32 pad; + f32 scale; + s32 pad1; + s32 pad2; + MtxF mf; + f32 temp; + Vec3f pos; + CollisionPoly* floorPoly; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_eff_ss_dead_ds.c", 157); + + scale = this->rScale * 0.01f; + func_80094BC4(globalCtx->state.gfxCtx); + gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, 0, 0, 0, this->rAlpha); + gDPSetEnvColor(oGfxCtx->polyXlu.p++, 0, 0, 0, 0); + pos = this->pos; + + if (this->rTimer == 0) { + Vec3s rpy; + Vec3f sp44; + + sp44.x = pos.x - this->velocity.x; + sp44.y = pos.y - this->velocity.y; + sp44.z = pos.z - this->velocity.z; + + if (func_8003D464(&globalCtx->colCtx, &this->pos, &pos, &sp44, 1.5f, &floorPoly, 1.0f)) { + func_80038A28(floorPoly, this->pos.x, this->pos.y, this->pos.z, &mf); + Matrix_Put(&mf); + } else { + pos.y++; + temp = func_8003C890(&globalCtx->colCtx, &floorPoly, &pos); + + if (floorPoly != NULL) { + func_80038A28(floorPoly, this->pos.x, temp + 1.5f, this->pos.z, &mf); + Matrix_Put(&mf); + } else { + Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW); + Matrix_Get(&mf); + } + } + + func_800D2264(&mf, &rpy, 0); + this->rRoll = rpy.x; + this->rPitch = rpy.y; + this->rYaw = rpy.z; + this->pos.y = mf.wy; + this->rTimer++; + } + + Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW); + Matrix_RotateRPY(this->rRoll, this->rPitch, this->rYaw, MTXMODE_APPLY); + Matrix_RotateX(1.57f, MTXMODE_APPLY); + Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); + gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_eff_ss_dead_ds.c", 246), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gDPSetCombineLERP(oGfxCtx->polyXlu.p++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, + PRIMITIVE, 0); + gSPDisplayList(oGfxCtx->polyXlu.p++, D_04037730); + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_eff_ss_dead_ds.c", 255); +} + +void EffectSsDeadDs_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { + if (this->life < this->rHalfOfLife) { + + this->rScale += this->rScaleStep; + if (this->rScale < 0) { + this->rScale = 0; + } + + this->rAlpha -= this->rAlphaStep; + if (this->rAlpha < 0) { + this->rAlpha = 0; + } + } +} diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.h b/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.h index 95064ff01b..c2111284d6 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.h +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.h @@ -8,6 +8,10 @@ typedef struct { /* 0x00 */ Vec3f pos; /* 0x0C */ Vec3f velocity; /* 0x18 */ Vec3f accel; -} EffectSsDeadDsInitParams; // size = 0x + /* 0x24 */ s16 scale; + /* 0x26 */ s16 scaleStep; + /* 0x28 */ s16 alpha; + /* 0x2C */ s32 life; +} EffectSsDeadDsInitParams; // size = 0x30 #endif diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.c b/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.c index c4e6f67c94..2f780c3af5 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.c @@ -1,21 +1,13 @@ /* * File: z_eff_ss_dead_sound.c * Overlay: ovl_Effect_Ss_Dead_Sound - * Description: Plays a sound effect. - * - * If repeat mode is on, the sound is replayed every update for the duration of life. - * Repeat mode is unused in the original game. + * Description: Plays a sound effect */ #include "z_eff_ss_dead_sound.h" -typedef enum { - /* 0x0A */ SS_DEADSOUND_SFX_ID = 10, - /* 0x0B */ SS_DEADSOUND_REPEAT_MODE, -} EffectSsDeadSoundRegs; - -#define REPEAT_MODE_OFF 1 -#define REPEAT_MODE_ON 2 +#define rSfxId regs[10] +#define rRepeatMode regs[11] // sound is replayed every update. unused in the original game u32 EffectSsDeadSound_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); void EffectSsDeadSound_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); @@ -27,6 +19,7 @@ EffectSsInit Effect_Ss_Dead_Sound_InitVars = { u32 EffectSsDeadSound_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) { EffectSsDeadSoundInitParams* initParams = (EffectSsDeadSoundInitParams*)initParamsx; + this->pos = initParams->pos; this->velocity = initParams->velocity; this->accel = initParams->accel; @@ -34,22 +27,24 @@ u32 EffectSsDeadSound_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, this->life = initParams->life; this->draw = NULL; this->update = EffectSsDeadSound_Update; - this->regs[SS_DEADSOUND_REPEAT_MODE] = initParams->repeatMode; - this->regs[SS_DEADSOUND_SFX_ID] = initParams->sfxId; + this->rRepeatMode = initParams->repeatMode; + this->rSfxId = initParams->sfxId; // "constructor 3" osSyncPrintf("コンストラクター3\n"); + return 1; } void EffectSsDeadSound_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { - switch (this->regs[SS_DEADSOUND_REPEAT_MODE]) { - case REPEAT_MODE_OFF: - this->regs[SS_DEADSOUND_REPEAT_MODE]--; + switch (this->rRepeatMode) { + case DEADSOUND_REPEAT_MODE_OFF: + this->rRepeatMode--; // decrement to 0 so sound only plays once break; - case REPEAT_MODE_ON: + case DEADSOUND_REPEAT_MODE_ON: break; default: return; } - Audio_PlaySoundGeneral(this->regs[SS_DEADSOUND_SFX_ID], &this->pos, 4, &D_801333E0, &D_801333E0, &D_801333E8); + + Audio_PlaySoundGeneral(this->rSfxId, &this->pos, 4, &D_801333E0, &D_801333E0, &D_801333E8); } diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h b/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h index 905a615c8c..22314e3e3f 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h @@ -15,4 +15,7 @@ typedef struct { /* 0x2C */ s32 life; } EffectSsDeadSoundInitParams; // size = 0x30 +#define DEADSOUND_REPEAT_MODE_OFF 1 +#define DEADSOUND_REPEAT_MODE_ON 2 + #endif diff --git a/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c b/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c index 0f4cf4e97d..fb4946774b 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c @@ -1,40 +1,110 @@ /* * File: z_eff_ss_dt_bubble.c * Overlay: ovl_Effect_Ss_Dt_Bubble - * Description: + * Description: Bubbles (a random mix of translucent and opaque) */ #include "z_eff_ss_dt_bubble.h" -typedef enum { - /* 0x00 */ SS_DT_BUBBLE_0, - /* 0x01 */ SS_DT_BUBBLE_1, - /* 0x02 */ SS_DT_BUBBLE_2, - /* 0x03 */ SS_DT_BUBBLE_3, - /* 0x04 */ SS_DT_BUBBLE_4, - /* 0x05 */ SS_DT_BUBBLE_5, - /* 0x06 */ SS_DT_BUBBLE_6, - /* 0x07 */ SS_DT_BUBBLE_7, - /* 0x08 */ SS_DT_BUBBLE_8, - /* 0x09 */ SS_DT_BUBBLE_9, - /* 0x0A */ SS_DT_BUBBLE_A, - /* 0x0B */ SS_DT_BUBBLE_B, - /* 0x0C */ SS_DT_BUBBLE_C, -} EffectSsDt_BubbleRegs; +#define rPrimColorR regs[0] +#define rPrimColorG regs[1] +#define rPrimColorB regs[2] +#define rPrimColorA regs[3] +#define rEnvColorR regs[4] +#define rEnvColorG regs[5] +#define rEnvColorB regs[6] +#define rEnvColorA regs[7] +#define rRandXZ regs[8] +#define rScale regs[9] +#define rLifespan regs[10] u32 EffectSsDtBubble_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); void EffectSsDtBubble_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); void EffectSsDtBubble_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); -/* +static Color_RGBA8 sPrimColors[] = { { 255, 255, 100, 255 }, { 150, 255, 255, 255 }, { 100, 255, 255, 255 } }; +static Color_RGBA8 sEnvColors[] = { { 170, 0, 0, 255 }, { 0, 100, 0, 255 }, { 0, 0, 255, 255 } }; + EffectSsInit Effect_Ss_Dt_Bubble_InitVars = { EFFECT_SS_DT_BUBBLE, EffectSsDtBubble_Init, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/EffectSsDtBubble_Init.s") +extern void* D_04055DB0; +extern void* D_04055EB0; +extern Gfx D_0401A160[]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/func_809A1F04.s") +u32 EffectSsDtBubble_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) { + EffectSsDtBubbleInitParams* initParams = (EffectSsDtBubbleInitParams*)initParamsx; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/func_809A2180.s") + // @bug Math_Rand_ZeroOne in the macro means a random number is generated for both parts of the macro. + // In the base game this works out because both addresses are segment 4, but it may break if + // the addresses were changed to refer to different segments + this->gfx = SEGMENTED_TO_VIRTUAL(Math_Rand_ZeroOne() < 0.5f ? &D_04055DB0 : &D_04055EB0); + this->pos = initParams->pos; + this->velocity = initParams->velocity; + this->accel = initParams->accel; + this->life = initParams->life; + + if (!initParams->customColor) { + this->rPrimColorR = sPrimColors[initParams->colorProfile].r; + this->rPrimColorG = sPrimColors[initParams->colorProfile].g; + this->rPrimColorB = sPrimColors[initParams->colorProfile].b; + this->rPrimColorA = sPrimColors[initParams->colorProfile].a; + this->rEnvColorR = sEnvColors[initParams->colorProfile].r; + this->rEnvColorG = sEnvColors[initParams->colorProfile].g; + this->rEnvColorB = sEnvColors[initParams->colorProfile].b; + this->rEnvColorA = sEnvColors[initParams->colorProfile].a; + } else { + this->rPrimColorR = initParams->primColor.r; + this->rPrimColorG = initParams->primColor.g; + this->rPrimColorB = initParams->primColor.b; + this->rPrimColorA = initParams->primColor.a; + this->rEnvColorR = initParams->envColor.r; + this->rEnvColorG = initParams->envColor.g; + this->rEnvColorB = initParams->envColor.b; + this->rEnvColorA = initParams->envColor.a; + } + + this->rRandXZ = initParams->randXZ; + this->rScale = initParams->scale; + this->rLifespan = initParams->life; + this->draw = EffectSsDtBubble_Draw; + this->update = EffectSsDtBubble_Update; + + return 1; +} + +void EffectSsDtBubble_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + f32 scale; + + OPEN_DISPS(gfxCtx, "../z_eff_ss_dt_bubble.c", 201); + + scale = this->rScale * 0.004f; + Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW); + Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); + gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(gfxCtx, "../z_eff_ss_dt_bubble.c", 213), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + func_80093C14(gfxCtx); + gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, + (this->rPrimColorA * this->life) / this->rLifespan); + gDPSetEnvColor(oGfxCtx->polyXlu.p++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, + (this->rEnvColorA * this->life) / this->rLifespan); + gSPSegment(oGfxCtx->polyXlu.p++, 0x08, this->gfx); + gSPDisplayList(oGfxCtx->polyXlu.p++, SEGMENTED_TO_VIRTUAL(D_0401A160)); + + CLOSE_DISPS(gfxCtx, "../z_eff_ss_dt_bubble.c", 236); +} + +void EffectSsDtBubble_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { + f32 rand; + + if (this->rRandXZ == 1) { + rand = Math_Rand_ZeroOne(); + this->pos.x += (rand * 2.0f) - 1.0f; + + rand = Math_Rand_ZeroOne(); + this->pos.z += (rand * 2.0f) - 1.0f; + } +} diff --git a/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.h b/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.h index 29e04550e8..c1c0a0db20 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.h +++ b/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.h @@ -8,6 +8,13 @@ typedef struct { /* 0x00 */ Vec3f pos; /* 0x0C */ Vec3f velocity; /* 0x18 */ Vec3f accel; -} EffectSsDtBubbleInitParams; // size = 0x + /* 0x24 */ Color_RGBA8 primColor; + /* 0x28 */ Color_RGBA8 envColor; + /* 0x2C */ s16 scale; + /* 0x2E */ s16 life; + /* 0x30 */ s16 colorProfile; + /* 0x32 */ s16 randXZ; // randomly moves in the xz plane if true + /* 0x34 */ u8 customColor; +} EffectSsDtBubbleInitParams; // size = 0x3C #endif diff --git a/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c b/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c index 8f8cf06dba..20a442dc64 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c @@ -6,21 +6,19 @@ #include "z_eff_ss_dust.h" -typedef enum { - /* 0x00 */ SS_DUST_PRIM_R, - /* 0x01 */ SS_DUST_PRIM_G, - /* 0x02 */ SS_DUST_PRIM_B, - /* 0x03 */ SS_DUST_PRIM_A, - /* 0x04 */ SS_DUST_ENV_R, - /* 0x05 */ SS_DUST_ENV_G, - /* 0x06 */ SS_DUST_ENV_B, - /* 0x07 */ SS_DUST_ENV_A, - /* 0x08 */ SS_DUST_TEX_IDX, // this reg is also used to set specific colors in the fire update function - /* 0x09 */ SS_DUST_SCALE, - /* 0x0A */ SS_DUST_SCALE_STEP, - /* 0x0B */ SS_DUST_DRAW_FLAGS, - /* 0x0C */ SS_DUST_LIFE_START -} EffectSsDustRegs; +#define rPrimColorR regs[0] +#define rPrimColorG regs[1] +#define rPrimColorB regs[2] +#define rPrimColorA regs[3] +#define rEnvColorR regs[4] +#define rEnvColorG regs[5] +#define rEnvColorB regs[6] +#define rEnvColorA regs[7] +#define rTexIdx regs[8] // this reg is also used to set specific colors in the fire update function +#define rScale regs[9] +#define rScaleStep regs[10] +#define rDrawFlags regs[11] +#define rLifespan regs[12] u32 EffectSsDust_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); void EffectSsDust_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); @@ -32,10 +30,10 @@ EffectSsInit Effect_Ss_Dust_InitVars = { EffectSsDust_Init, }; -static void* sUpdateFuncs[] = { EffectSsDust_Update, EffectSsBlast_UpdateFire }; - -static UNK_PTR D_809A2A50[] = { 0x04051DB0, 0x040521B0, 0x040525B0, 0x040529B0, - 0x04052DB0, 0x040531B0, 0x040535B0, 0x040539B0 }; +static EffectSsUpdateFunc sUpdateFuncs[] = { + EffectSsDust_Update, + EffectSsBlast_UpdateFire, +}; extern Gfx D_04010050[]; @@ -46,74 +44,77 @@ u32 EffectSsDust_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* Math_Vec3f_Copy(&this->pos, &initParams->pos); Math_Vec3f_Copy(&this->velocity, &initParams->velocity); Math_Vec3f_Copy(&this->accel, &initParams->accel); - this->displayList = SEGMENTED_TO_VIRTUAL(&D_04010050); + this->gfx = SEGMENTED_TO_VIRTUAL(D_04010050); this->life = initParams->life; this->update = sUpdateFuncs[initParams->updateMode]; this->draw = EffectSsDust_Draw; if (initParams->drawFlags & 4) { randColorOffset = Math_Rand_ZeroOne() * 20.0f - 10.0f; - this->regs[SS_DUST_PRIM_R] = initParams->primColor.r + randColorOffset; - this->regs[SS_DUST_PRIM_G] = initParams->primColor.g + randColorOffset; - this->regs[SS_DUST_PRIM_B] = initParams->primColor.b + randColorOffset; - this->regs[SS_DUST_ENV_R] = initParams->envColor.r + randColorOffset; - this->regs[SS_DUST_ENV_G] = initParams->envColor.g + randColorOffset; - this->regs[SS_DUST_ENV_B] = initParams->envColor.b + randColorOffset; + this->rPrimColorR = initParams->primColor.r + randColorOffset; + this->rPrimColorG = initParams->primColor.g + randColorOffset; + this->rPrimColorB = initParams->primColor.b + randColorOffset; + this->rEnvColorR = initParams->envColor.r + randColorOffset; + this->rEnvColorG = initParams->envColor.g + randColorOffset; + this->rEnvColorB = initParams->envColor.b + randColorOffset; } else { - this->regs[SS_DUST_PRIM_R] = initParams->primColor.r; - this->regs[SS_DUST_PRIM_G] = initParams->primColor.g; - this->regs[SS_DUST_PRIM_B] = initParams->primColor.b; - this->regs[SS_DUST_ENV_R] = initParams->envColor.r; - this->regs[SS_DUST_ENV_G] = initParams->envColor.g; - this->regs[SS_DUST_ENV_B] = initParams->envColor.b; + this->rPrimColorR = initParams->primColor.r; + this->rPrimColorG = initParams->primColor.g; + this->rPrimColorB = initParams->primColor.b; + this->rEnvColorR = initParams->envColor.r; + this->rEnvColorG = initParams->envColor.g; + this->rEnvColorB = initParams->envColor.b; } - this->regs[SS_DUST_PRIM_A] = initParams->primColor.a; - this->regs[SS_DUST_ENV_A] = initParams->envColor.a; - this->regs[SS_DUST_TEX_IDX] = 0; - this->regs[SS_DUST_SCALE] = initParams->scale; - this->regs[SS_DUST_SCALE_STEP] = initParams->scaleStep; - this->regs[SS_DUST_LIFE_START] = initParams->life; - this->regs[SS_DUST_DRAW_FLAGS] = initParams->drawFlags; + this->rPrimColorA = initParams->primColor.a; + this->rEnvColorA = initParams->envColor.a; + this->rTexIdx = 0; + this->rScale = initParams->scale; + this->rScaleStep = initParams->scaleStep; + this->rLifespan = initParams->life; + this->rDrawFlags = initParams->drawFlags; return 1; } +static UNK_PTR sTextures[] = { + 0x04051DB0, 0x040521B0, 0x040525B0, 0x040529B0, 0x04052DB0, 0x040531B0, 0x040535B0, 0x040539B0, +}; + void EffectSsDust_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - MtxF sp144; - MtxF sp104; - MtxF spC4; - MtxF sp84; + MtxF mfTrans; + MtxF mfScale; + MtxF mfResult; + MtxF mfTrans11DA0; s32 pad; Mtx* mtx; f32 scale; OPEN_DISPS(gfxCtx, "../z_eff_ss_dust.c", 321); - scale = this->regs[SS_DUST_SCALE] * 0.0025f; - - SkinMatrix_SetTranslate(&sp144, this->pos.x, this->pos.y, this->pos.z); - SkinMatrix_SetScale(&sp104, scale, scale, 1.0f); - SkinMatrix_MtxFMtxFMult(&sp144, &globalCtx->mf_11DA0, &sp84); - SkinMatrix_MtxFMtxFMult(&sp84, &sp104, &spC4); - + scale = this->rScale * 0.0025f; + SkinMatrix_SetTranslate(&mfTrans, this->pos.x, this->pos.y, this->pos.z); + SkinMatrix_SetScale(&mfScale, scale, scale, 1.0f); + SkinMatrix_MtxFMtxFMult(&mfTrans, &globalCtx->mf_11DA0, &mfTrans11DA0); + SkinMatrix_MtxFMtxFMult(&mfTrans11DA0, &mfScale, &mfResult); gSPMatrix(oGfxCtx->polyXlu.p++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - mtx = SkinMatrix_MtxFToNewMtx(gfxCtx, &spC4); + + mtx = SkinMatrix_MtxFToNewMtx(gfxCtx, &mfResult); if (mtx != NULL) { gSPMatrix(oGfxCtx->polyXlu.p++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPPipeSync(oGfxCtx->polyXlu.p++); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_809A2A50[this->regs[SS_DUST_TEX_IDX]])); + gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(sTextures[this->rTexIdx])); oGfxCtx->polyXlu.p = Gfx_CallSetupDL(oGfxCtx->polyXlu.p, 0); gDPPipeSync(oGfxCtx->polyXlu.p++); - if (this->regs[SS_DUST_DRAW_FLAGS] & 1) { + if (this->rDrawFlags & 1) { gDPSetCombineLERP(oGfxCtx->polyXlu.p++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, PRIMITIVE, 0, TEXEL0, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED); gDPSetRenderMode(oGfxCtx->polyXlu.p++, G_RM_FOG_SHADE_A, G_RM_ZB_CLD_SURF2); gSPSetGeometryMode(oGfxCtx->polyXlu.p++, G_FOG | G_LIGHTING); - } else if (this->regs[SS_DUST_DRAW_FLAGS] & 2) { + } else if (this->rDrawFlags & 2) { gDPSetRenderMode(oGfxCtx->polyXlu.p++, G_RM_PASS, G_RM_ZB_CLD_SURF2); gSPClearGeometryMode(oGfxCtx->polyXlu.p++, G_FOG | G_LIGHTING); } else { @@ -121,11 +122,9 @@ void EffectSsDust_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { } gDPPipeSync(oGfxCtx->polyXlu.p++); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, this->regs[SS_DUST_PRIM_R], this->regs[SS_DUST_PRIM_G], - this->regs[SS_DUST_PRIM_B], 255); - gDPSetEnvColor(oGfxCtx->polyXlu.p++, this->regs[SS_DUST_ENV_R], this->regs[SS_DUST_ENV_G], - this->regs[SS_DUST_ENV_B], this->regs[SS_DUST_ENV_A]); - gSPDisplayList(oGfxCtx->polyXlu.p++, this->displayList); + gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, 255); + gDPSetEnvColor(oGfxCtx->polyXlu.p++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, this->rEnvColorA); + gSPDisplayList(oGfxCtx->polyXlu.p++, this->gfx); } CLOSE_DISPS(gfxCtx, "../z_eff_ss_dust.c", 389); @@ -135,17 +134,17 @@ void EffectSsDust_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { this->accel.x = (Math_Rand_ZeroOne() * 0.4f) - 0.2f; this->accel.z = (Math_Rand_ZeroOne() * 0.4f) - 0.2f; - if ((this->regs[SS_DUST_LIFE_START] >= this->life) && (this->life >= (this->regs[SS_DUST_LIFE_START] - 7))) { - if (this->regs[SS_DUST_LIFE_START] >= 5) { - this->regs[SS_DUST_TEX_IDX] = this->regs[SS_DUST_LIFE_START] - this->life; + if ((this->life <= this->rLifespan) && (this->life >= (this->rLifespan - 7))) { + if (this->rLifespan >= 5) { + this->rTexIdx = this->rLifespan - this->life; } else { - this->regs[SS_DUST_TEX_IDX] = - ((this->regs[SS_DUST_LIFE_START] - this->life) * (8 / this->regs[SS_DUST_LIFE_START])); + this->rTexIdx = ((this->rLifespan - this->life) * (8 / this->rLifespan)); } } else { - this->regs[SS_DUST_TEX_IDX] = 7; + this->rTexIdx = 7; } - this->regs[SS_DUST_SCALE] += this->regs[SS_DUST_SCALE_STEP]; + + this->rScale += this->rScaleStep; } // this update mode is unused in the original game @@ -153,41 +152,40 @@ void EffectSsBlast_UpdateFire(GlobalContext* globalCtx, u32 index, EffectSs* thi this->accel.x = (Math_Rand_ZeroOne() * 0.4f) - 0.2f; this->accel.z = (Math_Rand_ZeroOne() * 0.4f) - 0.2f; - switch (this->regs[SS_DUST_TEX_IDX]) { + switch (this->rTexIdx) { case 0: - this->regs[SS_DUST_PRIM_R] = 255; - this->regs[SS_DUST_PRIM_G] = 150; - this->regs[SS_DUST_PRIM_B] = 0; - this->regs[SS_DUST_ENV_R] = 150; - this->regs[SS_DUST_ENV_G] = 50; - this->regs[SS_DUST_ENV_B] = 0; + this->rPrimColorR = 255; + this->rPrimColorG = 150; + this->rPrimColorB = 0; + this->rEnvColorR = 150; + this->rEnvColorG = 50; + this->rEnvColorB = 0; break; case 1: - this->regs[SS_DUST_PRIM_R] = 200; - this->regs[SS_DUST_PRIM_G] = 50; - this->regs[SS_DUST_PRIM_B] = 0; - this->regs[SS_DUST_ENV_R] = 100; - this->regs[SS_DUST_ENV_G] = 0; - this->regs[SS_DUST_ENV_B] = 0; + this->rPrimColorR = 200; + this->rPrimColorG = 50; + this->rPrimColorB = 0; + this->rEnvColorR = 100; + this->rEnvColorG = 0; + this->rEnvColorB = 0; break; case 2: - this->regs[SS_DUST_PRIM_R] = 50; - this->regs[SS_DUST_PRIM_G] = 0; - this->regs[SS_DUST_PRIM_B] = 0; - this->regs[SS_DUST_ENV_R] = 0; - this->regs[SS_DUST_ENV_G] = 0; - this->regs[SS_DUST_ENV_B] = 0; + this->rPrimColorR = 50; + this->rPrimColorG = 0; + this->rPrimColorB = 0; + this->rEnvColorR = 0; + this->rEnvColorG = 0; + this->rEnvColorB = 0; break; case 3: - this->regs[SS_DUST_PRIM_R] = 50; - this->regs[SS_DUST_ENV_R] = this->regs[SS_DUST_PRIM_G] = this->regs[SS_DUST_ENV_G] = - this->regs[SS_DUST_PRIM_B] = this->regs[SS_DUST_ENV_B] = 0; + this->rPrimColorR = 50; + this->rEnvColorR = this->rPrimColorG = this->rEnvColorG = this->rPrimColorB = this->rEnvColorB = 0; break; } - if (this->regs[SS_DUST_TEX_IDX] < 7) { - this->regs[SS_DUST_TEX_IDX]++; + if (this->rTexIdx < 7) { + this->rTexIdx++; } - this->regs[SS_DUST_SCALE] += this->regs[SS_DUST_SCALE_STEP]; + this->rScale += this->rScaleStep; } diff --git a/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.h b/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.h index 56ebf3d8ce..d92f6d5bb2 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.h +++ b/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.h @@ -8,8 +8,8 @@ typedef struct { /* 0x00 */ Vec3f pos; /* 0x0C */ Vec3f velocity; /* 0x18 */ Vec3f accel; - /* 0x24 */ Color_RGBA8_n primColor; - /* 0x28 */ Color_RGBA8_n envColor; + /* 0x24 */ Color_RGBA8 primColor; + /* 0x28 */ Color_RGBA8 envColor; /* 0x2C */ s16 scale; /* 0x2E */ s16 scaleStep; /* 0x30 */ s16 life; diff --git a/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c b/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c index 229e1e3d2c..b5713057d6 100644 --- a/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c +++ b/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c @@ -6,35 +6,147 @@ #include "z_eff_ss_en_fire.h" -typedef enum { - /* 0x00 */ SS_EN_FIRE_0, - /* 0x01 */ SS_EN_FIRE_1, - /* 0x02 */ SS_EN_FIRE_2, - /* 0x03 */ SS_EN_FIRE_3, - /* 0x04 */ SS_EN_FIRE_4, - /* 0x05 */ SS_EN_FIRE_5, - /* 0x06 */ SS_EN_FIRE_6, - /* 0x07 */ SS_EN_FIRE_7, - /* 0x08 */ SS_EN_FIRE_8, - /* 0x09 */ SS_EN_FIRE_9, - /* 0x0A */ SS_EN_FIRE_A, - /* 0x0B */ SS_EN_FIRE_B, - /* 0x0C */ SS_EN_FIRE_C, -} EffectSsEn_FireRegs; +#define rScaleMax regs[0] +#define rScale regs[1] +#define rLifespan regs[2] +#define rUnused regs[3] +#define rPitch regs[4] +#define rYaw regs[5] +#define rReg6 regs[6] +#define rBodyPart regs[7] +#define rFlags regs[8] +#define rScroll regs[9] u32 EffectSsEnFire_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); void EffectSsEnFire_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); void EffectSsEnFire_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); -/* EffectSsInit Effect_Ss_En_Fire_InitVars = { EFFECT_SS_EN_FIRE, EffectSsEnFire_Init, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/EffectSsEnFire_Init.s") +extern Gfx D_0404D5A0[]; +extern Gfx D_0404D4E0[]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/func_809A2D28.s") +u32 EffectSsEnFire_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) { + EffectSsEnFireInitParams* initParams = (EffectSsEnFireInitParams*)initParamsx; + Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/func_809A3060.s") + this->pos = initParams->pos; + this->velocity = this->accel = zeroVec; + this->life = 20; + this->rLifespan = this->life; + this->actor = initParams->actor; + this->rScroll = Math_Rand_ZeroOne() * 20.0f; + this->draw = EffectSsEnFire_Draw; + this->update = EffectSsEnFire_Update; + this->rUnused = -15; + + if (initParams->bodyPart < 0) { + this->rYaw = Math_Vec3f_Yaw(&initParams->actor->posRot.pos, &initParams->pos) - initParams->actor->shape.rot.y; + this->rPitch = + Math_Vec3f_Pitch(&initParams->actor->posRot.pos, &initParams->pos) - initParams->actor->shape.rot.x; + this->vec.z = Math_Vec3f_DistXYZ(&initParams->pos, &initParams->actor->posRot.pos); + } + + this->rScaleMax = initParams->scale; + + if ((initParams->unk_12 & 0x8000) != 0) { + this->rScale = initParams->scale; + } else { + this->rScale = 0; + } + + this->rReg6 = initParams->unk_12 & 0x7FFF; + this->rBodyPart = initParams->bodyPart; + this->rFlags = initParams->flags; + + return 1; +} + +void EffectSsEnFire_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + f32 scale; + s16 camYaw; + s32 pad[3]; + s16 redGreen; + + OPEN_DISPS(gfxCtx, "../z_eff_en_fire.c", 169); + + Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW); + camYaw = (func_8005A9F4(ACTIVE_CAM) + 0x8000); + Matrix_RotateY(camYaw * 0.0000958738f, MTXMODE_APPLY); + + scale = Math_Sins(this->life * 0x333) * (this->rScale * 0.00005f); + Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); + gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_eff_en_fire.c", 180), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + + redGreen = this->life - 5; + + if (redGreen < 0) { + redGreen = 0; + } + + func_80093D84(globalCtx->state.gfxCtx); + gDPSetEnvColor(oGfxCtx->polyXlu.p++, redGreen * 12.7f, 0, 0, 0); + gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0x0, 0x80, redGreen * 12.7f, redGreen * 12.7f, 0, 255); + gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 0x20, 0x40, 1, 0, (this->rScroll * -0x14) & 0x1FF, + 0x20, 0x80)); + + if (((this->rFlags & 0x7FFF) != 0) || (this->life < 18)) { + gSPDisplayList(oGfxCtx->polyXlu.p++, D_0404D5A0); + } else { + gSPDisplayList(oGfxCtx->polyXlu.p++, D_0404D4E0); + } + + CLOSE_DISPS(gfxCtx, "../z_eff_en_fire.c", 213); +} + +typedef struct { + /* 0x000 */ Actor actor; + /* 0x14C */ Vec3f firePos[10]; +} FireActorF; + +typedef struct { + /* 0x000 */ Actor actor; + /* 0x14C */ Vec3s firePos[10]; +} FireActorS; + +void EffectSsEnFire_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { + + this->rScroll++; + + if (this->actor != NULL) { + if (this->actor->dmgEffectTimer >= 22) { + this->life++; + } + if (this->actor->update != NULL) { + Math_SmoothScaleMaxMinS(&this->rScale, this->rScaleMax, 1, this->rScaleMax >> 3, 0); + + if (this->rBodyPart < 0) { + Matrix_Translate(this->actor->posRot.pos.x, this->actor->posRot.pos.y, this->actor->posRot.pos.z, + MTXMODE_NEW); + Matrix_RotateY((this->rYaw + this->actor->shape.rot.y) * 0.0000958738f, MTXMODE_APPLY); + Matrix_RotateX((this->rPitch + this->actor->shape.rot.x) * 0.0000958738f, MTXMODE_APPLY); + Matrix_MultVec3f(&this->vec, &this->pos); + } else { + if ((this->rFlags & 0x8000)) { + this->pos.x = ((FireActorS*)this->actor)->firePos[this->rBodyPart].x; + this->pos.y = ((FireActorS*)this->actor)->firePos[this->rBodyPart].y; + this->pos.z = ((FireActorS*)this->actor)->firePos[this->rBodyPart].z; + } else { + this->pos.x = ((FireActorF*)this->actor)->firePos[this->rBodyPart].x; + this->pos.y = ((FireActorF*)this->actor)->firePos[this->rBodyPart].y; + this->pos.z = ((FireActorF*)this->actor)->firePos[this->rBodyPart].z; + } + } + } else if (this->rReg6 != 0) { + this->life = 0; + } else { + this->actor = NULL; + } + } +} diff --git a/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h b/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h index 4d30723391..b5395f0802 100644 --- a/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h +++ b/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h @@ -5,9 +5,12 @@ #include typedef struct { - /* 0x00 */ Vec3f pos; - /* 0x0C */ Vec3f velocity; - /* 0x18 */ Vec3f accel; -} EffectSsEnFireInitParams; // size = 0x + /* 0x00 */ Actor* actor; + /* 0x04 */ Vec3f pos; + /* 0x10 */ s16 scale; + /* 0x12 */ s16 unk_12; + /* 0x14 */ s16 flags; + /* 0x16 */ s16 bodyPart; +} EffectSsEnFireInitParams; // size = 0x18 #endif diff --git a/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c b/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c index 96489a1973..96efce864b 100644 --- a/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c +++ b/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c @@ -1,42 +1,168 @@ /* * File: z_eff_ss_en_ice.c * Overlay: ovl_Effect_Ss_En_Ice - * Description: + * Description: Ice clumps */ #include "z_eff_ss_en_ice.h" -typedef enum { - /* 0x00 */ SS_EN_ICE_0, - /* 0x01 */ SS_EN_ICE_1, - /* 0x02 */ SS_EN_ICE_2, - /* 0x03 */ SS_EN_ICE_3, - /* 0x04 */ SS_EN_ICE_4, - /* 0x05 */ SS_EN_ICE_5, - /* 0x06 */ SS_EN_ICE_6, - /* 0x07 */ SS_EN_ICE_7, - /* 0x08 */ SS_EN_ICE_8, - /* 0x09 */ SS_EN_ICE_9, - /* 0x0A */ SS_EN_ICE_A, - /* 0x0B */ SS_EN_ICE_B, - /* 0x0C */ SS_EN_ICE_C, -} EffectSsEn_IceRegs; +#define rLifespan regs[0] +#define rYaw regs[1] +#define rPitch regs[2] +#define rRotSpeed regs[3] +#define rPrimColorR regs[4] +#define rPrimColorG regs[5] +#define rPrimColorB regs[6] +#define rPrimColorA regs[7] +#define rEnvColorR regs[8] +#define rEnvColorG regs[9] +#define rEnvColorB regs[10] +#define rAlphaMode regs[11] +#define rScale regs[12] u32 EffectSsEnIce_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); void EffectSsEnIce_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); void EffectSsEnIce_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); +void EffectSsEnIce_UpdateFlying(GlobalContext* globalCtx, u32 index, EffectSs* this); -/* EffectSsInit Effect_Ss_En_Ice_InitVars = { EFFECT_SS_EN_ICE, EffectSsEnIce_Init, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/EffectSsEnIce_Init.s") +extern Gfx D_04033818[]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A35DC.s") +u32 EffectSsEnIce_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) { + EffectSsEnIceInitParams* initParams = (EffectSsEnIceInitParams*)initParamsx; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A3988.s") + if (initParams->type == 0) { + Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A3B60.s") + this->pos = initParams->pos; + this->vec.x = this->pos.x - initParams->actor->posRot.pos.x; + this->vec.y = this->pos.y - initParams->actor->posRot.pos.y; + this->vec.z = this->pos.z - initParams->actor->posRot.pos.z; + this->velocity = zeroVec; + this->accel = zeroVec; + this->life = 10; + this->actor = initParams->actor; + this->draw = EffectSsEnIce_Draw; + this->update = EffectSsEnIce_UpdateFlying; + this->rScale = initParams->scale * 100.0f; + this->rPrimColorR = initParams->primColor.r; + this->rPrimColorG = initParams->primColor.g; + this->rPrimColorB = initParams->primColor.b; + this->rPrimColorA = initParams->primColor.a; + this->rEnvColorR = initParams->envColor.r; + this->rEnvColorG = initParams->envColor.g; + this->rEnvColorB = initParams->envColor.b; + this->rAlphaMode = 1; + this->rPitch = Math_Rand_CenteredFloat(65536.0f); + } else if (initParams->type == 1) { + this->pos = initParams->pos; + this->vec = initParams->pos; + this->velocity = initParams->velocity; + this->accel = initParams->accel; + this->life = initParams->life; + this->draw = EffectSsEnIce_Draw; + this->update = EffectSsEnIce_Update; + this->rLifespan = initParams->life; + this->rScale = initParams->scale * 100.0f; + this->rYaw = atan2s(initParams->velocity.z, initParams->velocity.x); + this->rPitch = 0; + this->rPrimColorR = initParams->primColor.r; + this->rPrimColorG = initParams->primColor.g; + this->rPrimColorB = initParams->primColor.b; + this->rPrimColorA = initParams->primColor.a; + this->rEnvColorR = initParams->envColor.r; + this->rEnvColorG = initParams->envColor.g; + this->rEnvColorB = initParams->envColor.b; + this->rAlphaMode = 0; + } else { + osSyncPrintf("Effect_Ss_En_Ice_ct():pid->mode_swがエラーです。\n"); + return 0; + } + + return 1; +} + +void EffectSsEnIce_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + s32 pad; + f32 scale; + Vec3f hiliteLightDir; + u32 gameplayFrames; + f32 alpha; + + scale = this->rScale * 0.01f; + gameplayFrames = globalCtx->gameplayFrames; + + OPEN_DISPS(gfxCtx, "../z_eff_en_ice.c", 235); + + if (this->rAlphaMode != 0) { + alpha = this->life * 12; + } else { + if ((this->rLifespan > 0) && (this->life < (this->rLifespan >> 1))) { + alpha = ((this->life * 2.0f) / this->rLifespan); + alpha *= 255.0f; + } else { + alpha = 255.0f; + } + } + + Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW); + Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); + Matrix_RotateY(this->rYaw * 0.0000958738f, MTXMODE_APPLY); + Matrix_RotateX(this->rPitch * 0.0000958738f, MTXMODE_APPLY); + gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(gfxCtx, "../z_eff_en_ice.c", 261), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + + hiliteLightDir.x = 89.8f; + hiliteLightDir.y = 0.0f; + hiliteLightDir.z = 89.8f; + + func_80093D84(globalCtx->state.gfxCtx); + func_8002EB44(&this->pos, &globalCtx->view.eye, &hiliteLightDir, globalCtx->state.gfxCtx); + gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, gameplayFrames & 0xFF, 0x20, 0x10, 1, 0, + (gameplayFrames * 2) & 0xFF, 0x40, 0x20)); + gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0x80, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, + this->rPrimColorA); + gDPSetEnvColor(oGfxCtx->polyXlu.p++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, (u32)alpha); + gSPDisplayList(oGfxCtx->polyXlu.p++, D_04033818); + + CLOSE_DISPS(gfxCtx, "../z_eff_en_ice.c", 294); +} + +void EffectSsEnIce_UpdateFlying(GlobalContext* globalCtx, u32 index, EffectSs* this) { + s16 rand; + + if ((this->actor != NULL) && (this->actor->update != NULL)) { + if ((this->life >= 9) && (this->actor->dmgEffectTimer != 0) && (!(this->actor->dmgEffectParams & 0xC000))) { + this->pos.x = this->actor->posRot.pos.x + this->vec.x; + this->pos.y = this->actor->posRot.pos.y + this->vec.y; + this->pos.z = this->actor->posRot.pos.z + this->vec.z; + this->life++; + } else if (this->life == 9) { + this->accel.x = + Math_Sins(Math_Vec3f_Yaw(&this->actor->posRot.pos, &this->pos)) * (Math_Rand_ZeroOne() + 1.0f); + this->accel.z = + Math_Coss(Math_Vec3f_Yaw(&this->actor->posRot.pos, &this->pos)) * (Math_Rand_ZeroOne() + 1.0f); + this->accel.y = -1.5f; + this->velocity.y = 5.0f; + } + } else { + if (this->life >= 9) { + rand = Math_Rand_CenteredFloat(65535.0f); + this->accel.x = Math_Sins(rand) * (Math_Rand_ZeroOne() + 1.0f); + this->accel.z = Math_Coss(rand) * (Math_Rand_ZeroOne() + 1.0f); + this->life = 8; + this->accel.y = -1.5f; + this->velocity.y = 5.0f; + } + } +} + +void EffectSsEnIce_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { + this->rPitch += this->rRotSpeed; // rRotSpeed is not initialized so this does nothing +} diff --git a/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.h b/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.h index 5ca6a9e4d9..798d44664a 100644 --- a/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.h +++ b/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.h @@ -5,9 +5,15 @@ #include typedef struct { - /* 0x00 */ Vec3f pos; - /* 0x0C */ Vec3f velocity; - /* 0x18 */ Vec3f accel; -} EffectSsEnIceInitParams; // size = 0x + /* 0x00 */ Actor* actor; + /* 0x04 */ Vec3f pos; + /* 0x10 */ f32 scale; + /* 0x14 */ Vec3f velocity; + /* 0x20 */ Vec3f accel; + /* 0x2C */ Color_RGBA8 primColor; + /* 0x30 */ Color_RGBA8 envColor; + /* 0x34 */ s32 life; + /* 0x38 */ s16 type; +} EffectSsEnIceInitParams; // size = 0x3C #endif diff --git a/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c b/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c index dd6a54fca1..6700549c94 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c +++ b/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c @@ -6,12 +6,10 @@ #include "z_eff_ss_extra.h" -typedef enum { - /* 0x00 */ SS_EXTRA_OBJ_IDX, - /* 0x01 */ SS_EXTRA_TIMER, - /* 0x02 */ SS_EXTRA_SCORE_IDX, - /* 0x03 */ SS_EXTRA_SCALE -} EffectSsExtraRegs; +#define rObjBankIdx regs[0] +#define rTimer regs[1] +#define rScoreIdx regs[2] +#define rScale regs[3] u32 EffectSsExtra_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); void EffectSsExtra_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); @@ -24,8 +22,6 @@ EffectSsInit Effect_Ss_Extra_InitVars = { EffectSsExtra_Init, }; -static UNK_PTR D_809A4070[] = { 0x06000000, 0x06000480, 0x06000900 }; - extern Gfx D_06000DC0[]; u32 EffectSsExtra_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) { @@ -45,23 +41,27 @@ u32 EffectSsExtra_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void this->draw = EffectSsExtra_Draw; this->update = EffectSsExtra_Update; this->life = 50; - this->regs[SS_EXTRA_SCORE_IDX] = initParams->scoreIdx; - this->regs[SS_EXTRA_SCALE] = initParams->scale; - this->regs[SS_EXTRA_TIMER] = 5; - this->regs[SS_EXTRA_OBJ_IDX] = objBankIndex; + this->rScoreIdx = initParams->scoreIdx; + this->rScale = initParams->scale; + this->rTimer = 5; + this->rObjBankIdx = objBankIndex; gSegments[6] = oldSeg6; + return 1; } return 0; } +static void* sTextures[] = { 0x06000000, 0x06000480, 0x06000900 }; + void EffectSsExtra_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { s32 pad; - f32 scale = this->regs[SS_EXTRA_SCALE] / 100.0f; - void* object = globalCtx->objectCtx.status[this->regs[SS_EXTRA_OBJ_IDX]].segment; + f32 scale = this->rScale / 100.0f; + void* object = globalCtx->objectCtx.status[this->rObjBankIdx].segment; OPEN_DISPS(globalCtx->state.gfxCtx, "../z_eff_ss_extra.c", 168); + gSegments[6] = VIRTUAL_TO_PHYSICAL(object); gSPSegment(oGfxCtx->polyXlu.p++, 0x06, object); Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW); @@ -70,18 +70,20 @@ void EffectSsExtra_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { func_800D1FD4(&globalCtx->mf_11DA0); gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_eff_ss_extra.c", 186), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_809A4070[this->regs[SS_EXTRA_SCORE_IDX]])); + gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(sTextures[this->rScoreIdx])); gSPDisplayList(oGfxCtx->polyXlu.p++, SEGMENTED_TO_VIRTUAL(D_06000DC0)); + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_eff_ss_extra.c", 194); } void EffectSsExtra_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { - if (this->regs[SS_EXTRA_TIMER] != 0) { - this->regs[SS_EXTRA_TIMER] -= 1; + if (this->rTimer != 0) { + this->rTimer -= 1; } else { this->velocity.y = 0.0f; } - if (this->regs[SS_EXTRA_TIMER] == 1) { - globalCtx->interfaceCtx.unk_23C = sScores[this->regs[SS_EXTRA_SCORE_IDX]]; + + if (this->rTimer == 1) { + globalCtx->interfaceCtx.unk_23C = sScores[this->rScoreIdx]; } } diff --git a/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.h b/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.h index 1ba601288d..3c5e893279 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.h +++ b/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.h @@ -12,4 +12,10 @@ typedef struct { /* 0x26 */ s16 scoreIdx; } EffectSsExtraInitParams; // size = 0x28 +typedef enum { + /* 0 */ EXTRA_SCORE_30, + /* 1 */ EXTRA_SCORE_60, + /* 2 */ EXTRA_SCORE_100 +} ExtraScoreIdx; + #endif diff --git a/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c b/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c index 116933f26b..023702c69e 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c +++ b/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c @@ -1,40 +1,96 @@ /* * File: z_eff_ss_fcircle.c * Overlay: ovl_Effect_Ss_Fcircle - * Description: + * Description: Fire Circle */ #include "z_eff_ss_fcircle.h" -typedef enum { - /* 0x00 */ SS_FCIRCLE_0, - /* 0x01 */ SS_FCIRCLE_1, - /* 0x02 */ SS_FCIRCLE_2, - /* 0x03 */ SS_FCIRCLE_3, - /* 0x04 */ SS_FCIRCLE_4, - /* 0x05 */ SS_FCIRCLE_5, - /* 0x06 */ SS_FCIRCLE_6, - /* 0x07 */ SS_FCIRCLE_7, - /* 0x08 */ SS_FCIRCLE_8, - /* 0x09 */ SS_FCIRCLE_9, - /* 0x0A */ SS_FCIRCLE_A, - /* 0x0B */ SS_FCIRCLE_B, - /* 0x0C */ SS_FCIRCLE_C, -} EffectSsFcircleRegs; +#define rUnused regs[3] // probably supposed to be an alpha +#define rRadius regs[8] +#define rHeight regs[9] +#define rYaw regs[10] +#define rScale regs[11] u32 EffectSsFcircle_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); void EffectSsFcircle_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); void EffectSsFcircle_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); -/* EffectSsInit Effect_Ss_Fcircle_InitVars = { EFFECT_SS_FCIRCLE, EffectSsFcircle_Init, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fcircle/EffectSsFcircle_Init.s") +extern Gfx D_040184B0[]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fcircle/func_809A41DC.s") +u32 EffectSsFcircle_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) { + EffectSsFcircleInitParams* initParams = (EffectSsFcircleInitParams*)initParamsx; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fcircle/func_809A44E0.s") + this->pos = initParams->pos; + this->actor = initParams->actor; + this->vec.x = initParams->pos.x - initParams->actor->posRot.pos.x; + this->vec.y = initParams->pos.y - initParams->actor->posRot.pos.y; + this->vec.z = initParams->pos.z - initParams->actor->posRot.pos.z; + this->gfx = D_040184B0; + this->life = 20; + this->draw = EffectSsFcircle_Draw; + this->update = EffectSsFcircle_Update; + this->rUnused = 255; + this->rRadius = initParams->radius; + this->rHeight = initParams->height; + this->rYaw = initParams->actor->shape.rot.y; + + return 1; +} + +void EffectSsFcircle_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + s32 pad; + f32 yScale; + f32 xzScale; + f32 scale; + + OPEN_DISPS(gfxCtx, "../z_eff_fcircle.c", 149); + + scale = (this->rScale * (0.5f + (this->life * 0.025f))) * 0.01f; + yScale = (this->rHeight * 0.001f) * scale; + xzScale = (this->rRadius * 0.001f) * scale; + + Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW); + Matrix_Scale(xzScale, yScale, xzScale, MTXMODE_APPLY); + Matrix_RotateY(this->rYaw * 0.0000958738f, MTXMODE_APPLY); + gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(gfxCtx, "../z_eff_fcircle.c", 163), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + func_80093D84(globalCtx->state.gfxCtx); + gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, globalCtx->gameplayFrames % 128, 0, 32, 64, 1, 0, + ((globalCtx->gameplayFrames) * -0xF) % 256, 32, 64)); + gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0x80, 0x80, 255, 220, 0, (this->life * 12.75f)); + gDPSetEnvColor(oGfxCtx->polyXlu.p++, 255, 0, 0, 0); + gSPDisplayList(oGfxCtx->polyXlu.p++, this->gfx); + + CLOSE_DISPS(gfxCtx, "../z_eff_fcircle.c", 186); +} + +void EffectSsFcircle_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { + Actor* actor = this->actor; + + if (actor != NULL) { + if (actor->update != NULL) { + this->pos.x = actor->posRot.pos.x + this->vec.x; + this->pos.y = actor->posRot.pos.y + this->vec.y; + this->pos.z = actor->posRot.pos.z + this->vec.z; + this->rYaw = actor->shape.rot.y; + + if (actor->dmgEffectTimer > 20) { + this->life = 20; + } else { + this->life = actor->dmgEffectTimer; + } + + Math_ApproxS(&this->rScale, 100, 20); + } else { + this->actor = NULL; + } + } +} diff --git a/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.h b/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.h index ded270d029..8a3cf008b8 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.h +++ b/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.h @@ -5,9 +5,10 @@ #include typedef struct { - /* 0x00 */ Vec3f pos; - /* 0x0C */ Vec3f velocity; - /* 0x18 */ Vec3f accel; -} EffectSsFcircleInitParams; // size = 0x + /* 0x00 */ Actor* actor; + /* 0x04 */ Vec3f pos; + /* 0x10 */ s16 radius; + /* 0x12 */ s16 height; +} EffectSsFcircleInitParams; // size = 0x14 #endif diff --git a/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c b/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c index 4273e6ef8f..7c81621502 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c +++ b/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c @@ -1,44 +1,255 @@ /* * File: z_eff_ss_fhg_flash.c * Overlay: ovl_Effect_Ss_Fhg_Flash - * Description: + * Description: Shock and Light Ball Effect */ #include "z_eff_ss_fhg_flash.h" +#include "overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.h" -typedef enum { - /* 0x00 */ SS_FHG_FLASH_0, - /* 0x01 */ SS_FHG_FLASH_1, - /* 0x02 */ SS_FHG_FLASH_2, - /* 0x03 */ SS_FHG_FLASH_3, - /* 0x04 */ SS_FHG_FLASH_4, - /* 0x05 */ SS_FHG_FLASH_5, - /* 0x06 */ SS_FHG_FLASH_6, - /* 0x07 */ SS_FHG_FLASH_7, - /* 0x08 */ SS_FHG_FLASH_8, - /* 0x09 */ SS_FHG_FLASH_9, - /* 0x0A */ SS_FHG_FLASH_A, - /* 0x0B */ SS_FHG_FLASH_B, - /* 0x0C */ SS_FHG_FLASH_C, -} EffectSsFhg_FlashRegs; +#define rAlpha regs[0] +#define rObjBankIdx regs[2] +#define rXZRot regs[3] +#define rParam regs[4] +#define rScale regs[8] u32 EffectSsFhgFlash_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); -void EffectSsFhgFlash_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); -void EffectSsFhgFlash_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); +void EffectSsFhgFlash_DrawLightBall(GlobalContext* globalCtx, u32 index, EffectSs* this); +void EffectSsFhgFlash_UpdateLightBall(GlobalContext* globalCtx, u32 index, EffectSs* this); +void EffectSsFhgFlash_DrawShock(GlobalContext* globalCtx, u32 index, EffectSs* this); +void EffectSsFhgFlash_UpdateShock(GlobalContext* globalCtx, u32 index, EffectSs* this); -/* EffectSsInit Effect_Ss_Fhg_Flash_InitVars = { EFFECT_SS_FHG_FLASH, EffectSsFhgFlash_Init, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/EffectSsFhgFlash_Init.s") +UNK_TYPE D_809A5178[]; +Gfx D_809A5100[]; +extern Gfx D_06012160[]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A49B8.s") +u32 EffectSsFhgFlash_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) { + EffectSsFhgFlashInitParams* initParams = (EffectSsFhgFlashInitParams*)initParamsx; + s32 pad; + s32 objBankIdx; + Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; + Vec3f sp34 = { 0.0f, -1000.0f, 0.0f }; + void* oldSeg6; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4BE8.s") + if (initParams->type == FHGFLASH_LIGHTBALL) { + objBankIdx = Object_GetIndex(&globalCtx->objectCtx, OBJECT_FHG); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4E28.s") + if ((objBankIdx > -1) && Object_IsLoaded(&globalCtx->objectCtx, objBankIdx)) { + oldSeg6 = gSegments[6]; + gSegments[6] = VIRTUAL_TO_PHYSICAL(globalCtx->objectCtx.status[objBankIdx].segment); + this->rObjBankIdx = objBankIdx; + this->pos = initParams->pos; + this->velocity = initParams->velocity; + this->accel = initParams->accel; + this->rParam = initParams->param; + this->life = 100; + this->rScale = initParams->scale; + this->rAlpha = 255; + this->draw = EffectSsFhgFlash_DrawLightBall; + this->update = EffectSsFhgFlash_UpdateLightBall; + this->gfx = SEGMENTED_TO_VIRTUAL(D_06012160); + gSegments[6] = oldSeg6; + } else { + osSyncPrintf("Effect_Ss_Fhg_Flash_ct():pffd->modeエラー\n"); + return 0; + } + } else { + this->actor = initParams->actor; + this->velocity = this->accel = zeroVec; + this->life = (s16)(Math_Rand_ZeroOne() * 10.0f) + 111; + this->rScale = (s16)Math_Rand_ZeroFloat(initParams->scale) + initParams->scale; + this->rAlpha = 255; + this->draw = EffectSsFhgFlash_DrawShock; + this->update = EffectSsFhgFlash_UpdateShock; + this->rParam = initParams->param; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4EC0.s") + if (initParams->param != FHGFLASH_SHOCK_NO_ACTOR) { + this->pos = sp34; + this->gfx = SEGMENTED_TO_VIRTUAL(D_809A5100); + } else { + this->pos = initParams->pos; + this->gfx = SEGMENTED_TO_VIRTUAL(D_809A5100); + } + } + return 1; +} + +static Color_RGB8 sColors[] = { + { 165, 255, 61 }, { 0, 255, 255 }, { 255, 40, 0 }, { 255, 255, 0 }, { 0, 0, 255 }, + { 255, 0, 255 }, { 255, 150, 0 }, { 0, 0, 0 }, { 0, 0, 0 }, +}; + +void EffectSsFhgFlash_DrawLightBall(GlobalContext* globalCtx, u32 index, EffectSs* this) { + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + s32 pad; + f32 scale; + void* object; + + scale = this->rScale / 100.0f; + object = globalCtx->objectCtx.status[this->rObjBankIdx].segment; + + OPEN_DISPS(gfxCtx, "../z_eff_fhg_flash.c", 268); + + Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, 0); + Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); + gSegments[6] = VIRTUAL_TO_PHYSICAL(object); + gSPSegment(oGfxCtx->polyXlu.p++, 0x06, object); + func_80093D84(globalCtx->state.gfxCtx); + gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, 255, 255, 255, this->rAlpha); + gDPSetEnvColor(oGfxCtx->polyXlu.p++, sColors[this->rParam].r, sColors[this->rParam].g, sColors[this->rParam].b, 0); + gDPPipeSync(oGfxCtx->polyXlu.p++); + func_800D1FD4(&globalCtx->mf_11DA0); + Matrix_RotateZ((this->rXZRot / 32768.0f) * 3.1416f, MTXMODE_APPLY); + gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(gfxCtx, "../z_eff_fhg_flash.c", 326), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(oGfxCtx->polyXlu.p++, this->gfx); + + CLOSE_DISPS(gfxCtx, "../z_eff_fhg_flash.c", 330); +} + +void EffectSsFhgFlash_DrawShock(GlobalContext* globalCtx, u32 index, EffectSs* this) { + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + s32 pad; + f32 scale; + + scale = this->rScale / 100.0f; + + OPEN_DISPS(gfxCtx, "../z_eff_fhg_flash.c", 346); + + Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW); + Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); + + if (this->rParam != FHGFLASH_SHOCK_NO_ACTOR) { + func_80094044(globalCtx->state.gfxCtx); + Matrix_RotateX((this->rXZRot / 32768.0f) * 1.1416f, MTXMODE_APPLY); + gDPSetRenderMode(oGfxCtx->polyXlu.p++, G_RM_PASS, G_RM_AA_ZB_XLU_DECAL2); + } else { + func_80093D84(globalCtx->state.gfxCtx); + func_800D1FD4(&globalCtx->mf_11DA0); + gDPSetRenderMode(oGfxCtx->polyXlu.p++, G_RM_PASS, G_RM_AA_ZB_XLU_SURF2); + } + + gDPPipeSync(oGfxCtx->polyXlu.p++); + gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, 255, 255, 255, this->rAlpha); + gDPSetEnvColor(oGfxCtx->polyXlu.p++, 0, 255, 155, 0); + Matrix_RotateZ((this->rXZRot / 32768.0f) * 3.1416f, MTXMODE_APPLY); + gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(gfxCtx, "../z_eff_fhg_flash.c", 395), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(oGfxCtx->polyXlu.p++, this->gfx); + + CLOSE_DISPS(gfxCtx, "../z_eff_fhg_flash.c", 399); +} + +void EffectSsFhgFlash_UpdateLightBall(GlobalContext* globalCtx, u32 index, EffectSs* this) { + s16 rand = (Math_Rand_ZeroOne() * 20000.0f); + + this->rXZRot = (this->rXZRot + rand) + 0x4000; + + if (this->rScale > 0) { + this->rScale -= 10; + + if (this->rScale <= 0) { + this->rScale = 0; + this->life = 0; + } + } + + if (this->rAlpha > 0) { + this->rAlpha -= 10; + + if (this->rAlpha <= 0) { + this->rAlpha = 0; + } + } +} + +void EffectSsFhgFlash_UpdateShock(GlobalContext* globalCtx, u32 index, EffectSs* this) { + s16 randBodypart; + Player* player; + BossGanondrof* phantomGanon; + s16 rand; + + rand = (Math_Rand_ZeroOne() * 20000.0f); + this->rXZRot = (this->rXZRot + rand) + 0x4000; + + if (this->rParam == FHGFLASH_SHOCK_PLAYER) { + player = PLAYER; + randBodypart = Math_Rand_ZeroFloat(17.9f); + this->pos.x = player->bodyPartsPos[randBodypart].x + Math_Rand_CenteredFloat(10.0f); + this->pos.y = player->bodyPartsPos[randBodypart].y + Math_Rand_CenteredFloat(15.0f); + this->pos.z = player->bodyPartsPos[randBodypart].z + Math_Rand_CenteredFloat(10.0f); + } else if (this->rParam == FHGFLASH_SHOCK_PG) { + phantomGanon = (BossGanondrof*)this->actor; + randBodypart = Math_Rand_ZeroFloat(23.9f); + this->pos.x = phantomGanon->bodyPartsPos[randBodypart].x + Math_Rand_CenteredFloat(15.0f); + this->pos.y = phantomGanon->bodyPartsPos[randBodypart].y + Math_Rand_CenteredFloat(20.0f); + this->pos.z = phantomGanon->bodyPartsPos[randBodypart].z + Math_Rand_CenteredFloat(15.0f); + } + + if (this->life < 100) { + this->rAlpha -= 50; + + if (this->rAlpha < 0) { + this->rAlpha = 0; + this->life = 0; + } + } +} + +Vtx D_809A50C0[] = { + VTX(-10, -10, 0, 0, 1024, 0xFF, 0xFF, 0xFF, 0xFF), + VTX(10, -10, 0, 1024, 1024, 0xFF, 0xFF, 0xFF, 0xFF), + VTX(10, 10, 0, 1024, 0, 0xFF, 0xFF, 0xFF, 0xFF), + VTX(-10, 10, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF), +}; + +Gfx D_809A5100[] = { + gsDPPipeSync(), + gsDPSetTextureLUT(G_TT_NONE), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPLoadTextureBlock(D_809A5178, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_MIRROR | G_TX_WRAP, + G_TX_MIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, COMBINED, 0, 0, 0, + COMBINED), + gsSPClearGeometryMode(G_CULL_BACK | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR), + gsSPVertex(D_809A50C0, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +UNK_TYPE D_809A5178[] = { + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x005B3000, 0x00000000, 0x00000000, + 0x00000000, 0x000B0000, 0x07000000, 0x00000000, 0x00000000, 0x005BB64B, 0x3A000000, 0x00000000, 0x00000000, + 0x005B0000, 0x00000000, 0x00000000, 0x00000000, 0x001E00B6, 0xFF5B0000, 0x00000000, 0x00000000, 0x00251F0C, + 0x07000000, 0x0A000000, 0x00000000, 0x00000000, 0xB6FF0000, 0x00000000, 0x00000000, 0x00255B00, 0x071F1E14, + 0x0A000000, 0x00000000, 0x00000000, 0x00457350, 0x00000000, 0x00000000, 0x00295B8C, 0x5B5B0000, 0x00000000, + 0x00000000, 0x00000000, 0x00455C39, 0x0F000000, 0x00000000, 0x0000A1FF, 0x5B000000, 0x00000000, 0x00000000, + 0x00000000, 0x005B5B00, 0x00000000, 0x00000000, 0x005B311C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x5BB60000, 0x00000000, 0x00000000, 0x5BB63100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFB60000, + 0x00000000, 0x00000046, 0xEA310000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0072B646, 0x00000000, + 0x0000B6A1, 0x81000000, 0x00000000, 0x00000000, 0x00000000, 0x000C0000, 0x00172E19, 0xBDAB5D41, 0x366BEAEA, + 0x81000000, 0x00000000, 0x00000000, 0x00000000, 0x06000000, 0x00000074, 0xFFFF0500, 0x0A2342B6, 0xFF000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x005B0000, 0x03030100, 0x00FF0700, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020503, 0x00000000, 0x00466200, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00076200, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00002962, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00003EA1, 0x62000000, 0x00000000, 0x00000000, 0x0000002E, 0xB6350000, + 0x00000000, 0x00000000, 0x000000EA, 0x46000000, 0x00000000, 0x00000000, 0x00002EFF, 0xFF5A0000, 0x00000000, + 0x00000000, 0x000000FF, 0xFF001700, 0x00000000, 0x00000000, 0x01015BFF, 0xA1A10000, 0x00000000, 0x00000000, + 0x00030046, 0x97732100, 0x00000000, 0x00000000, 0x040CB65E, 0x4A5B4600, 0x00000000, 0x00000003, 0x0C0E8C46, + 0x1C035C00, 0x00000000, 0x00000017, 0x134F5B00, 0x00000046, 0x46000000, 0x00000000, 0x34D20000, 0x0401005B, + 0x00000000, 0x00000000, 0x5BB60000, 0x00000000, 0x30FCB600, 0x0000A1E7, 0x00000001, 0x0100141E, 0x5B000000, + 0x00000000, 0x00000000, 0x00000000, 0x0000A1FF, 0x5B46FF00, 0x00000100, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x000000FC, 0xFFA13100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0xB6000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +}; diff --git a/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h b/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h index f3f355a358..7e280c202b 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h +++ b/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h @@ -8,10 +8,35 @@ typedef struct { /* 0x00 */ Vec3f pos; /* 0x0C */ Vec3f velocity; /* 0x18 */ Vec3f accel; - /* 0x24 */ s16 unk_24; - /* 0x26 */ u8 unk_26; - /* 0x28 */ Actor* unk_28; - /* 0x2C */ u8 unk_2C; -} EffectSsFhgFlashInitParams; + /* 0x24 */ s16 scale; + /* 0x26 */ u8 param; + /* 0x28 */ Actor* actor; + /* 0x2C */ u8 type; +} EffectSsFhgFlashInitParams; // size = 0x30 + +typedef enum { + /* 0x00 */ FHGFLASH_LIGHTBALL, + /* 0x01 */ FHGFLASH_SHOCK +} FhgFlashType; + +typedef enum { + /* 0x00 */ FHGFLASH_LIGHTBALL_GREEN, + /* 0x01 */ FHGFLASH_LIGHTBALL_LIGHTBLUE, + /* 0x02 */ FHGFLASH_LIGHTBALL_RED, + /* 0x03 */ FHGFLASH_LIGHTBALL_YELLOW, + /* 0x04 */ FHGFLASH_LIGHTBALL_BLUE, + /* 0x05 */ FHGFLASH_LIGHTBALL_PURPLE, + /* 0x06 */ FHGFLASH_LIGHTBALL_ORANGE, + /* 0x07 */ FHGFLASH_LIGHTBALL_WHITE1, + /* 0x08 */ FHGFLASH_LIGHTBALL_WHITE2 +} FhgFlashLightBallParam; + +typedef enum { + /* 0x00 */ FHGFLASH_SHOCK_NO_ACTOR, + /* 0x01 */ FHGFLASH_SHOCK_PLAYER, + /* 0x02 */ FHGFLASH_SHOCK_PG +} FhgFlashLightningParam; + + #endif diff --git a/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c b/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c index dd21cbdc50..fe1d8222db 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c +++ b/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c @@ -1,40 +1,142 @@ /* * File: z_eff_ss_fire_tail.c * Overlay: ovl_Effect_Ss_Fire_Tail - * Description: + * Description: Fire (burned by something) */ #include "z_eff_ss_fire_tail.h" -typedef enum { - /* 0x00 */ SS_FIRE_TAIL_0, - /* 0x01 */ SS_FIRE_TAIL_1, - /* 0x02 */ SS_FIRE_TAIL_2, - /* 0x03 */ SS_FIRE_TAIL_3, - /* 0x04 */ SS_FIRE_TAIL_4, - /* 0x05 */ SS_FIRE_TAIL_5, - /* 0x06 */ SS_FIRE_TAIL_6, - /* 0x07 */ SS_FIRE_TAIL_7, - /* 0x08 */ SS_FIRE_TAIL_8, - /* 0x09 */ SS_FIRE_TAIL_9, - /* 0x0A */ SS_FIRE_TAIL_A, - /* 0x0B */ SS_FIRE_TAIL_B, - /* 0x0C */ SS_FIRE_TAIL_C, -} EffectSsFire_TailRegs; +#define rScale regs[0] +#define rLifespan regs[1] +#define rReg2 regs[2] +#define rReg3 regs[3] +#define rPrimColorR regs[4] +#define rPrimColorG regs[5] +#define rPrimColorB regs[6] +#define rEnvColorR regs[7] +#define rEnvColorG regs[8] +#define rEnvColorB regs[9] +#define rReg10 regs[10] +#define rBodyPart regs[11] +#define rType regs[12] u32 EffectSsFireTail_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); void EffectSsFireTail_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); void EffectSsFireTail_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); -/* EffectSsInit Effect_Ss_Fire_Tail_InitVars = { EFFECT_SS_FIRE_TAIL, EffectSsFireTail_Init, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/EffectSsFireTail_Init.s") +extern Gfx D_0404D5A0[]; +extern Gfx D_0404D4E0[]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/func_809A5858.s") +u32 EffectSsFireTail_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) { + EffectSsFireTailInitParams* initParams = (EffectSsFireTailInitParams*)initParamsx; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/func_809A5D98.s") + this->pos = initParams->pos; + this->vec = initParams->unk_14; + this->velocity.x = 0.0f; + this->velocity.y = 0.0f; + this->velocity.z = 0.0f; + this->accel.x = 0.0f; + this->accel.y = 0.0f; + this->accel.z = 0.0f; + this->life = initParams->life; + this->actor = initParams->actor; + this->draw = EffectSsFireTail_Draw; + this->update = EffectSsFireTail_Update; + this->rScale = initParams->scale * 1000.0f; + this->rLifespan = initParams->life; + this->rReg2 = -0xA; + this->rReg3 = -0xF; + if (initParams->unk_20 == 0) { + initParams->unk_20 = 1; + } + this->rReg10 = initParams->unk_20; + this->rPrimColorR = initParams->primColor.r; + this->rPrimColorG = initParams->primColor.g; + this->rPrimColorB = initParams->primColor.b; + this->rEnvColorR = initParams->envColor.r; + this->rEnvColorG = initParams->envColor.g; + this->rEnvColorB = initParams->envColor.b; + this->rBodyPart = initParams->bodyPart; + this->rType = initParams->type; + + return 1; +} + +void EffectSsFireTail_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + s32 pad; + s16 yaw; + Vec3f scale; + f32 temp1; + f32 temp2; + f32 dist; + + OPEN_DISPS(gfxCtx, "../z_eff_fire_tail.c", 182); + + scale.x = scale.y = scale.z = 0.0f; + + if (this->actor != NULL) { + + this->vec = this->actor->velocity; + + if (this->rBodyPart < 0) { + Matrix_Translate(this->pos.x + this->actor->posRot.pos.x, this->pos.y + this->actor->posRot.pos.y, + this->pos.z + this->actor->posRot.pos.z, MTXMODE_NEW); + } else { + Player* player = PLAYER; + s16 bodyPart = this->rBodyPart; + + this->pos.x = player->bodyPartsPos[bodyPart].x - (Math_Sins(func_8005A9F4(ACTIVE_CAM)) * 5.0f); + this->pos.y = player->bodyPartsPos[bodyPart].y; + this->pos.z = player->bodyPartsPos[bodyPart].z - (Math_Coss(func_8005A9F4(ACTIVE_CAM)) * 5.0f); + + Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW); + } + } else { + Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW); + } + + yaw = Math_Vec3f_Yaw(&scale, &this->vec) - func_8005A9F4(ACTIVE_CAM); + temp1 = fabsf(Math_Coss(yaw)); + temp2 = Math_Sins(yaw); + dist = Math_Vec3f_DistXZ(&scale, &this->vec) / (this->rReg10 * 0.1f); + Matrix_RotateY((s16)(func_8005A9F4(ACTIVE_CAM) + 0x8000) * 0.0000958738f, MTXMODE_APPLY); + Matrix_RotateZ(temp2 * this->rReg2 * dist * 0.017453292f, MTXMODE_APPLY); + temp2 = 1.0f - ((f32)(this->life + 1) / this->rLifespan); + temp2 = 1.0f - SQ(temp2); + scale.x = scale.y = scale.z = temp2 * (this->rScale * 0.000010000001f); + Matrix_Scale(scale.x, scale.y, scale.z, MTXMODE_APPLY); + temp1 = (this->rReg3 * 0.01f * temp1 * dist) + 1.0f; + + if (temp1 < 0.1f) { + temp1 = 0.1f; + } + + Matrix_Scale(1.0f, temp1, 1.0f / temp1, MTXMODE_APPLY); + + gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_eff_fire_tail.c", 238), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + func_80093D84(globalCtx->state.gfxCtx); + gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0x80, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, 255); + gDPSetEnvColor(oGfxCtx->polyXlu.p++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, 0); + gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 64, 1, 0, + (globalCtx->state.frames * -0x14) & 0x1FF, 32, 128)); + + if (this->rType != 0) { + gSPDisplayList(oGfxCtx->polyXlu.p++, D_0404D5A0); + } else { + gSPDisplayList(oGfxCtx->polyXlu.p++, D_0404D4E0); + } + + CLOSE_DISPS(gfxCtx, "../z_eff_fire_tail.c", 273); +} + +void EffectSsFireTail_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { + this->rScale *= 0.9f; +} diff --git a/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.h b/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.h index a1c8b6c289..5368760edb 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.h +++ b/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.h @@ -5,9 +5,16 @@ #include typedef struct { - /* 0x00 */ Vec3f pos; - /* 0x0C */ Vec3f velocity; - /* 0x18 */ Vec3f accel; + /* 0x00 */ Actor* actor; + /* 0x04 */ Vec3f pos; + /* 0x10 */ f32 scale; + /* 0x14 */ Vec3f unk_14; + /* 0x20 */ s16 unk_20; + /* 0x22 */ Color_RGBA8 primColor; + /* 0x26 */ Color_RGBA8 envColor; + /* 0x2A */ s16 type; + /* 0x2C */ s16 bodyPart; + /* 0x30 */ s32 life; } EffectSsFireTailInitParams; // size = 0x #endif diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.c b/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.c index de412f969b..407744e121 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.c @@ -1,40 +1,57 @@ /* * File: z_eff_ss_g_fire.c * Overlay: ovl_Effect_Ss_G_Fire - * Description: + * Description: Flame Footprints */ #include "z_eff_ss_g_fire.h" -typedef enum { - /* 0x00 */ SS_G_FIRE_0, - /* 0x01 */ SS_G_FIRE_1, - /* 0x02 */ SS_G_FIRE_2, - /* 0x03 */ SS_G_FIRE_3, - /* 0x04 */ SS_G_FIRE_4, - /* 0x05 */ SS_G_FIRE_5, - /* 0x06 */ SS_G_FIRE_6, - /* 0x07 */ SS_G_FIRE_7, - /* 0x08 */ SS_G_FIRE_8, - /* 0x09 */ SS_G_FIRE_9, - /* 0x0A */ SS_G_FIRE_A, - /* 0x0B */ SS_G_FIRE_B, - /* 0x0C */ SS_G_FIRE_C, -} EffectSsG_FireRegs; - u32 EffectSsGFire_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); void EffectSsGFire_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); void EffectSsGFire_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); -/* EffectSsInit Effect_Ss_G_Fire_InitVars = { EFFECT_SS_G_FIRE, EffectSsGFire_Init, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Fire/EffectSsGFire_Init.s") +extern Gfx D_0401C220[]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Fire/func_809A6010.s") +u32 EffectSsGFire_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) { + EffectSsGFireInitParams* initParams = (EffectSsGFireInitParams*)initParamsx; + Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Fire/func_809A60B4.s") + this->velocity = this->accel = zeroVec; + this->pos = initParams->pos; + this->draw = EffectSsGFire_Draw; + this->update = EffectSsGFire_Update; + this->gfx = SEGMENTED_TO_VIRTUAL(D_0401C220); + this->life = 8; + this->flags = 0; + this->rgScale = 200; + this->rgTexIdx = 0; + this->rgTexIdxStep = 50; + this->rgPrimColorR = 255; + this->rgPrimColorG = 220; + this->rgPrimColorB = 80; + this->rgPrimColorA = 255; + this->rgEnvColorR = 130; + this->rgEnvColorG = 30; + this->rgEnvColorB = 0; + this->rgEnvColorA = 0; + + return 1; +} + +void EffectSsGFire_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { + void* textures[] = { + 0x0401A220, 0x0401A620, 0x0401AA20, 0x0401AE20, 0x0401B220, 0x0401B620, 0x0401BA20, 0x0401BE20, + }; + s16 texIdx = (this->rgTexIdx / 100) % 7; + + EffectSs_DrawGEffect(globalCtx, this, textures[texIdx]); +} + +void EffectSsGFire_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { + this->rgTexIdx += this->rgTexIdxStep; +} diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.h b/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.h index e4bf699af4..827b543cce 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.h +++ b/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.h @@ -6,8 +6,6 @@ typedef struct { /* 0x00 */ Vec3f pos; - /* 0x0C */ Vec3f velocity; - /* 0x18 */ Vec3f accel; -} EffectSsGFireInitParams; // size = 0x +} EffectSsGFireInitParams; // size = 0xC #endif diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c b/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c index 45bc5d790d..b4e2ba1482 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c @@ -1,40 +1,60 @@ /* * File: z_eff_ss_g_magma.c * Overlay: ovl_Effect_Ss_G_Magma - * Description: + * Description: Magma Bubbles */ #include "z_eff_ss_g_magma.h" -typedef enum { - /* 0x00 */ SS_G_MAGMA_0, - /* 0x01 */ SS_G_MAGMA_1, - /* 0x02 */ SS_G_MAGMA_2, - /* 0x03 */ SS_G_MAGMA_3, - /* 0x04 */ SS_G_MAGMA_4, - /* 0x05 */ SS_G_MAGMA_5, - /* 0x06 */ SS_G_MAGMA_6, - /* 0x07 */ SS_G_MAGMA_7, - /* 0x08 */ SS_G_MAGMA_8, - /* 0x09 */ SS_G_MAGMA_9, - /* 0x0A */ SS_G_MAGMA_A, - /* 0x0B */ SS_G_MAGMA_B, - /* 0x0C */ SS_G_MAGMA_C, -} EffectSsG_MagmaRegs; - u32 EffectSsGMagma_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); void EffectSsGMagma_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); void EffectSsGMagma_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); -/* EffectSsInit Effect_Ss_G_Magma_InitVars = { EFFECT_SS_G_MAGMA, EffectSsGMagma_Init, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma/EffectSsGMagma_Init.s") +extern Gfx D_04024410[]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma/func_809A62A8.s") +u32 EffectSsGMagma_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) { + EffectSsGMagmaInitParams* initParams = (EffectSsGMagmaInitParams*)initParamsx; + Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma/func_809A6300.s") + this->velocity = this->accel = zeroVec; + this->pos = initParams->pos; + this->draw = EffectSsGMagma_Draw; + this->update = EffectSsGMagma_Update; + this->gfx = SEGMENTED_TO_VIRTUAL(D_04024410); + this->life = 16; + this->rgScale = (s16)(Math_Rand_ZeroOne() * 100.0f) + 200; + this->rgTexIdx = 0; + this->rgTexIdxStep = 50; + this->rgPrimColorR = 255; + this->rgPrimColorG = 255; + this->rgPrimColorB = 0; + this->rgPrimColorA = 255; + this->rgEnvColorR = 255; + this->rgEnvColorG = 0; + this->rgEnvColorB = 0; + this->rgEnvColorA = 0; + + return 1; +} + +static void* sTextures[] = { 0x04023810, 0x04023990, 0x04023B10, 0x04023C90, + 0x04023E10, 0x04023F90, 0x04024110, 0x04024290 }; + +void EffectSsGMagma_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { + s16 texIdx = this->rgTexIdx / 100; + + if (texIdx > 7) { + texIdx = 7; + } + + EffectSs_DrawGEffect(globalCtx, this, sTextures[texIdx]); +} + +void EffectSsGMagma_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { + this->rgTexIdx += this->rgTexIdxStep; +} diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.h b/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.h index cda7afd11a..4191a88b0e 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.h +++ b/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.h @@ -6,8 +6,6 @@ typedef struct { /* 0x00 */ Vec3f pos; - /* 0x0C */ Vec3f velocity; - /* 0x18 */ Vec3f accel; -} EffectSsGMagmaInitParams; // size = 0x +} EffectSsGMagmaInitParams; // size = 0xC #endif diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c b/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c index f5ed4510c1..e1b769f37c 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c @@ -6,35 +6,124 @@ #include "z_eff_ss_g_magma2.h" -typedef enum { - /* 0x00 */ SS_G_MAGMA2_0, - /* 0x01 */ SS_G_MAGMA2_1, - /* 0x02 */ SS_G_MAGMA2_2, - /* 0x03 */ SS_G_MAGMA2_3, - /* 0x04 */ SS_G_MAGMA2_4, - /* 0x05 */ SS_G_MAGMA2_5, - /* 0x06 */ SS_G_MAGMA2_6, - /* 0x07 */ SS_G_MAGMA2_7, - /* 0x08 */ SS_G_MAGMA2_8, - /* 0x09 */ SS_G_MAGMA2_9, - /* 0x0A */ SS_G_MAGMA2_A, - /* 0x0B */ SS_G_MAGMA2_B, - /* 0x0C */ SS_G_MAGMA2_C, -} EffectSsG_Magma2Regs; +#define rPrimColorR regs[0] +#define rPrimColorG regs[1] +#define rPrimColorA regs[2] +#define rEnvColorR regs[3] +#define rEnvColorG regs[4] +#define rEnvColorA regs[5] +#define rTexIdx regs[6] +#define rTimer regs[7] +#define rUpdateRate regs[8] +#define rDrawMode regs[9] +#define rObjBankIdx regs[10] +#define rScale regs[11] u32 EffectSsGMagma2_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); void EffectSsGMagma2_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); void EffectSsGMagma2_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); -/* +static void* sTextures[] = { + 0x0602E4E0, 0x0602E8E0, 0x0602ECE0, 0x0602F0E0, 0x0602F4E0, 0x0602F8E0, 0x0602FCE0, + 0x060300E0, 0x060304E0, 0x060308E0, 0x060308E0, 0x060308E0, 0x060308E0, +}; + EffectSsInit Effect_Ss_G_Magma2_InitVars = { EFFECT_SS_G_MAGMA2, EffectSsGMagma2_Init, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/EffectSsGMagma2_Init.s") +extern Gfx D_06025A90[]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/func_809A6568.s") +u32 EffectSsGMagma2_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) { + s32 objBankIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_KINGDODONGO); + s32 pad; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/func_809A67C0.s") + if ((objBankIndex >= 0) && Object_IsLoaded(&globalCtx->objectCtx, objBankIndex)) { + Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; + EffectSsGMagma2InitParams* initParams = (EffectSsGMagma2InitParams*)initParamsx; + + gSegments[6] = VIRTUAL_TO_PHYSICAL(globalCtx->objectCtx.status[objBankIndex].segment); + this->rObjBankIdx = objBankIndex; + this->pos = initParams->pos; + this->velocity = zeroVec; + this->accel = zeroVec; + this->life = 100; + this->draw = EffectSsGMagma2_Draw; + this->update = EffectSsGMagma2_Update; + this->gfx = SEGMENTED_TO_VIRTUAL(D_06025A90); + this->rTexIdx = 0; + this->rDrawMode = initParams->drawMode; + this->rUpdateRate = initParams->updateRate; + this->rScale = initParams->scale; + this->rPrimColorR = initParams->primColor.r; + this->rPrimColorG = initParams->primColor.g; + this->rPrimColorA = initParams->primColor.a; + this->rEnvColorR = initParams->envColor.r; + this->rEnvColorG = initParams->envColor.g; + this->rEnvColorA = initParams->envColor.a; + + return 1; + } + + return 0; +} + +void EffectSsGMagma2_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + s32 pad; + f32 scale; + void* object; + + scale = this->rScale / 100.0f; + object = globalCtx->objectCtx.status[this->rObjBankIdx].segment; + + OPEN_DISPS(gfxCtx, "../z_eff_ss_g_magma2.c", 261); + + Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW); + Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); + gSegments[6] = VIRTUAL_TO_PHYSICAL(object); + gSPSegment(oGfxCtx->polyXlu.p++, 0x06, object); + gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(gfxCtx, "../z_eff_ss_g_magma2.c", 282), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + + if (this->rDrawMode == 0) { + oGfxCtx->polyXlu.p = Gfx_CallSetupDL(gfxCtx->polyXlu.p, 0x3D); + } else { + oGfxCtx->polyXlu.p = Gfx_CallSetupDL(gfxCtx->polyXlu.p, 0); + } + + gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, this->rPrimColorR, this->rPrimColorG, 0, this->rPrimColorA); + gDPSetEnvColor(oGfxCtx->polyXlu.p++, this->rEnvColorR, this->rEnvColorG, 0, this->rEnvColorA); + gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(sTextures[this->rTexIdx])); + gSPDisplayList(oGfxCtx->polyXlu.p++, this->gfx); + + CLOSE_DISPS(gfxCtx, "../z_eff_ss_g_magma2.c", 311); +} + +void EffectSsGMagma2_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { + this->rTimer += this->rUpdateRate; + + if (this->rTimer >= 10) { + this->rTimer -= 10; + this->rTexIdx++; + + if (this->rTexIdx >= 10) { + this->life = 0; + } + + if (this->rDrawMode == 0) { + this->rPrimColorG -= 26; + + if (this->rPrimColorG <= 0) { + this->rPrimColorG = 0; + } + + this->rEnvColorR -= 26; + + if (this->rEnvColorR <= 0) { + this->rEnvColorR = 0; + } + } + } +} diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.h b/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.h index c96c27ac1f..8e77df9e1e 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.h +++ b/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.h @@ -6,8 +6,11 @@ typedef struct { /* 0x00 */ Vec3f pos; - /* 0x0C */ Vec3f velocity; - /* 0x18 */ Vec3f accel; -} EffectSsGMagma2InitParams; // size = 0x + /* 0x0C */ Color_RGBA8 primColor; + /* 0x10 */ Color_RGBA8 envColor; + /* 0x14 */ s16 updateRate; + /* 0x16 */ s16 drawMode; + /* 0x18 */ s16 scale; +} EffectSsGMagma2InitParams; // size = 0x1C #endif diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c b/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c index bd8e0bb3eb..82db2da224 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c @@ -1,42 +1,131 @@ /* * File: z_eff_ss_g_ripple.c * Overlay: ovl_Effect_Ss_G_Ripple - * Description: + * Description: Water Ripple */ #include "z_eff_ss_g_ripple.h" -typedef enum { - /* 0x00 */ SS_G_RIPPLE_0, - /* 0x01 */ SS_G_RIPPLE_1, - /* 0x02 */ SS_G_RIPPLE_2, - /* 0x03 */ SS_G_RIPPLE_3, - /* 0x04 */ SS_G_RIPPLE_4, - /* 0x05 */ SS_G_RIPPLE_5, - /* 0x06 */ SS_G_RIPPLE_6, - /* 0x07 */ SS_G_RIPPLE_7, - /* 0x08 */ SS_G_RIPPLE_8, - /* 0x09 */ SS_G_RIPPLE_9, - /* 0x0A */ SS_G_RIPPLE_A, - /* 0x0B */ SS_G_RIPPLE_B, - /* 0x0C */ SS_G_RIPPLE_C, -} EffectSsG_RippleRegs; +#define rWaterBoxNum regs[0] +#define rRadius regs[1] +#define rRadiusMax regs[2] +#define rPrimColorR regs[3] +#define rPrimColorG regs[4] +#define rPrimColorB regs[5] +#define rPrimColorA regs[6] +#define rEnvColorR regs[7] +#define rEnvColorG regs[8] +#define rEnvColorB regs[9] +#define rEnvColorA regs[10] +#define rLifespan regs[11] u32 EffectSsGRipple_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); void EffectSsGRipple_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); void EffectSsGRipple_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); -/* EffectSsInit Effect_Ss_G_Ripple_InitVars = { EFFECT_SS_G_RIPPLE, EffectSsGRipple_Init, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/EffectSsGRipple_Init.s") +extern Gfx D_040254B0[]; +extern Gfx D_040244B0[]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/func_809A6AD8.s") +u32 EffectSsGRipple_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) { + s32 pad; + Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; + WaterBox* waterBox; + EffectSsGRippleInitParams* initParams = (EffectSsGRippleInitParams*)initParamsx; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/func_809A6D08.s") + waterBox = NULL; + this->velocity = this->accel = zeroVec; + this->pos = initParams->pos; + this->gfx = SEGMENTED_TO_VIRTUAL(D_040254B0); + this->life = initParams->life + 20; + this->flags = 0; + this->draw = EffectSsGRipple_Draw; + this->update = EffectSsGRipple_Update; + this->rRadius = initParams->radius; + this->rRadiusMax = initParams->radiusMax; + this->rLifespan = initParams->life; + this->rPrimColorR = 255; + this->rPrimColorG = 255; + this->rPrimColorB = 255; + this->rPrimColorA = 255; + this->rEnvColorR = 255; + this->rEnvColorG = 255; + this->rEnvColorB = 255; + this->rEnvColorA = 255; + this->rWaterBoxNum = func_8004239C(globalCtx, &globalCtx->colCtx, &initParams->pos, 3.0f, &waterBox); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/func_809A6D40.s") + return 1; +} + +void EffectSsGRipple_DrawRipple(GlobalContext* globalCtx, EffectSs* this, UNK_PTR segment) { + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + f32 radius; + s32 pad; + MtxF mfTrans; + MtxF mfScale; + MtxF mfResult; + Mtx* mtx; + f32 yPos; + + OPEN_DISPS(gfxCtx, "../z_eff_ss_g_ripple.c", 199); + + if (globalCtx) {} + + radius = this->rRadius * 0.0025f; + + if ((this->rWaterBoxNum != -1) && (this->rWaterBoxNum < globalCtx->colCtx.stat.colHeader->nbWaterBoxes)) { + yPos = (this->rWaterBoxNum + globalCtx->colCtx.stat.colHeader->waterBoxes)->unk_02; + } else { + yPos = this->pos.y; + } + + SkinMatrix_SetTranslate(&mfTrans, this->pos.x, yPos, this->pos.z); + SkinMatrix_SetScale(&mfScale, radius, radius, radius); + SkinMatrix_MtxFMtxFMult(&mfTrans, &mfScale, &mfResult); + + mtx = SkinMatrix_MtxFToNewMtx(gfxCtx, &mfResult); + + if (mtx != NULL) { + gSPMatrix(oGfxCtx->polyXlu.p++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + func_80094BC4(gfxCtx); + gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, + this->rPrimColorA); + gDPSetEnvColor(oGfxCtx->polyXlu.p++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, this->rEnvColorA); + gDPSetAlphaDither(oGfxCtx->polyXlu.p++, G_AD_NOISE); + gDPSetColorDither(oGfxCtx->polyXlu.p++, G_CD_NOISE); + gSPDisplayList(oGfxCtx->polyXlu.p++, this->gfx); + } + + CLOSE_DISPS(gfxCtx, "../z_eff_ss_g_ripple.c", 247); +} + +void EffectSsGRipple_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { + if (this->rLifespan == 0) { + EffectSsGRipple_DrawRipple(globalCtx, this, D_040244B0); + } +} + +void EffectSsGRipple_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { + f32 radius; + f32 primAlpha; + f32 envAlpha; + + if (DECR(this->rLifespan) == 0) { + radius = this->rRadius; + Math_SmoothScaleMaxMinF(&radius, this->rRadiusMax, 0.2f, 30.0f, 1.0f); + this->rRadius = radius; + + primAlpha = this->rPrimColorA; + envAlpha = this->rEnvColorA; + + Math_SmoothScaleMaxMinF(&primAlpha, 0.0f, 0.2f, 15.0f, 7.0f); + Math_SmoothScaleMaxMinF(&envAlpha, 0.0f, 0.2f, 15.0f, 7.0f); + + this->rPrimColorA = primAlpha; + this->rEnvColorA = envAlpha; + } +} diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.h b/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.h index f0231b087d..a98f270910 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.h +++ b/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.h @@ -6,8 +6,9 @@ typedef struct { /* 0x00 */ Vec3f pos; - /* 0x0C */ Vec3f velocity; - /* 0x18 */ Vec3f accel; -} EffectSsGRippleInitParams; // size = 0x + /* 0x0C */ s16 radius; + /* 0x0E */ s16 radiusMax; + /* 0x10 */ s16 life; +} EffectSsGRippleInitParams; // size = 0x14 #endif diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c b/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c index d3173c3c43..50e9035d51 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c @@ -1,26 +1,22 @@ /* * File: z_eff_ss_g_spk.c * Overlay: ovl_Effect_Ss_G_Spk - * Description: Fuse Sparks + * Description: Sparks */ #include "z_eff_ss_g_spk.h" -typedef enum { - /* 0x00 */ SS_G_SPK_PRIM_R, - /* 0x01 */ SS_G_SPK_PRIM_G, - /* 0x02 */ SS_G_SPK_PRIM_B, - /* 0x03 */ SS_G_SPK_PRIM_A, - /* 0x04 */ SS_G_SPK_ENV_R, - /* 0x05 */ SS_G_SPK_ENV_G, - /* 0x06 */ SS_G_SPK_ENV_B, - /* 0x07 */ SS_G_SPK_ENV_A, - /* 0x08 */ SS_G_SPK_TEX_IDX, - /* 0x09 */ SS_G_SPK_SCALE, - /* 0x0A */ SS_G_SPK_SCALE_STEP, -} EffectSsGSpkRegs; - -#define SPARK_SOURCE ((Actor*)this->unk_3C) +#define rPrimColorR regs[0] +#define rPrimColorG regs[1] +#define rPrimColorB regs[2] +#define rPrimColorA regs[3] +#define rEnvColorR regs[4] +#define rEnvColorG regs[5] +#define rEnvColorB regs[6] +#define rEnvColorA regs[7] +#define rTexIdx regs[8] +#define rScale regs[9] +#define rScaleStep regs[10] u32 EffectSsGSpk_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); void EffectSsGSpk_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); @@ -32,13 +28,6 @@ EffectSsInit Effect_Ss_G_Spk_InitVars = { EffectSsGSpk_Init, }; -static UNK_PTR D_809A7498[] = { - 0x04055FB0, - 0x040561B0, - 0x040563B0, - 0x040565B0, -}; - extern Gfx D_04025550[]; u32 EffectSsGSpk_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) { @@ -47,13 +36,13 @@ u32 EffectSsGSpk_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* Math_Vec3f_Copy(&this->pos, &initParams->pos); Math_Vec3f_Copy(&this->velocity, &initParams->velocity); Math_Vec3f_Copy(&this->accel, &initParams->accel); - this->displayList = SEGMENTED_TO_VIRTUAL(&D_04025550); + this->gfx = SEGMENTED_TO_VIRTUAL(D_04025550); if (initParams->updateMode == 0) { this->life = 10; - this->unk_2C.x = initParams->pos.x - initParams->actor->posRot.pos.x; - this->unk_2C.y = initParams->pos.y - initParams->actor->posRot.pos.y; - this->unk_2C.z = initParams->pos.z - initParams->actor->posRot.pos.z; + this->vec.x = initParams->pos.x - initParams->actor->posRot.pos.x; + this->vec.y = initParams->pos.y - initParams->actor->posRot.pos.y; + this->vec.z = initParams->pos.z - initParams->actor->posRot.pos.z; this->update = EffectSsGSpk_Update; } else { this->life = 5; @@ -61,54 +50,56 @@ u32 EffectSsGSpk_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* } this->draw = EffectSsGSpk_Draw; - this->regs[SS_G_SPK_PRIM_R] = initParams->primColor.r; - this->regs[SS_G_SPK_PRIM_G] = initParams->primColor.g; - this->regs[SS_G_SPK_PRIM_B] = initParams->primColor.b; - this->regs[SS_G_SPK_PRIM_A] = initParams->primColor.a; - this->regs[SS_G_SPK_ENV_R] = initParams->envColor.r; - this->regs[SS_G_SPK_ENV_G] = initParams->envColor.g; - this->regs[SS_G_SPK_ENV_B] = initParams->envColor.b; - this->regs[SS_G_SPK_ENV_A] = initParams->envColor.a; - this->regs[SS_G_SPK_TEX_IDX] = 0; - this->regs[SS_G_SPK_SCALE] = initParams->scale; - this->regs[SS_G_SPK_SCALE_STEP] = initParams->scaleStep; - this->unk_3C = initParams->actor; + this->rPrimColorR = initParams->primColor.r; + this->rPrimColorG = initParams->primColor.g; + this->rPrimColorB = initParams->primColor.b; + this->rPrimColorA = initParams->primColor.a; + this->rEnvColorR = initParams->envColor.r; + this->rEnvColorG = initParams->envColor.g; + this->rEnvColorB = initParams->envColor.b; + this->rEnvColorA = initParams->envColor.a; + this->rTexIdx = 0; + this->rScale = initParams->scale; + this->rScaleStep = initParams->scaleStep; + this->actor = initParams->actor; return 1; } +static void* sTextures[] = { + 0x04055FB0, + 0x040561B0, + 0x040563B0, + 0x040565B0, +}; + void EffectSsGSpk_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - MtxF sp11C; - MtxF spDC; - MtxF sp9C; - MtxF sp5C; + MtxF mfTrans; + MtxF mfScale; + MtxF mfResult; + MtxF mfTrans11DA0; Mtx* mtx; f32 scale; s32 pad; OPEN_DISPS(gfxCtx, "../z_eff_ss_g_spk.c", 208); - scale = this->regs[SS_G_SPK_SCALE] * 0.0025f; + scale = this->rScale * 0.0025f; + SkinMatrix_SetTranslate(&mfTrans, this->pos.x, this->pos.y, this->pos.z); + SkinMatrix_SetScale(&mfScale, scale, scale, 1.0f); + SkinMatrix_MtxFMtxFMult(&mfTrans, &globalCtx->mf_11DA0, &mfTrans11DA0); + SkinMatrix_MtxFMtxFMult(&mfTrans11DA0, &mfScale, &mfResult); - SkinMatrix_SetTranslate(&sp11C, this->pos.x, this->pos.y, this->pos.z); - SkinMatrix_SetScale(&spDC, scale, scale, 1.0f); - SkinMatrix_MtxFMtxFMult(&sp11C, &globalCtx->mf_11DA0, &sp5C); - SkinMatrix_MtxFMtxFMult(&sp5C, &spDC, &sp9C); - - mtx = SkinMatrix_MtxFToNewMtx(gfxCtx, &sp9C); + mtx = SkinMatrix_MtxFToNewMtx(gfxCtx, &mfResult); if (mtx != NULL) { gSPMatrix(oGfxCtx->polyXlu.p++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_809A7498[this->regs[SS_G_SPK_TEX_IDX]])); - + gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(sTextures[this->rTexIdx])); func_80094BC4(gfxCtx); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, this->regs[SS_G_SPK_PRIM_R], this->regs[SS_G_SPK_PRIM_G], - this->regs[SS_G_SPK_PRIM_B], 255); - - gDPSetEnvColor(oGfxCtx->polyXlu.p++, this->regs[SS_G_SPK_ENV_R], this->regs[SS_G_SPK_ENV_G], - this->regs[SS_G_SPK_ENV_B], this->regs[SS_G_SPK_ENV_A]); - gSPDisplayList(oGfxCtx->polyXlu.p++, this->displayList); + gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, 255); + gDPSetEnvColor(oGfxCtx->polyXlu.p++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, this->rEnvColorA); + gSPDisplayList(oGfxCtx->polyXlu.p++, this->gfx); } if (1) {} @@ -122,33 +113,33 @@ void EffectSsGSpk_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { this->accel.x = (Math_Rand_ZeroOne() - 0.5f) * 3.0f; this->accel.z = (Math_Rand_ZeroOne() - 0.5f) * 3.0f; - if (SPARK_SOURCE != NULL) { - if ((SPARK_SOURCE->type == ACTORTYPE_EXPLOSIVES) && (SPARK_SOURCE->update != NULL)) { - this->pos.x = SPARK_SOURCE->posRot.pos.x + this->unk_2C.x; - this->pos.y = SPARK_SOURCE->posRot.pos.y + this->unk_2C.y; - this->pos.z = SPARK_SOURCE->posRot.pos.z + this->unk_2C.z; + if (this->actor != NULL) { + if ((this->actor->type == ACTORTYPE_EXPLOSIVES) && (this->actor->update != NULL)) { + this->pos.x = this->actor->posRot.pos.x + this->vec.x; + this->pos.y = this->actor->posRot.pos.y + this->vec.y; + this->pos.z = this->actor->posRot.pos.z + this->vec.z; } } - this->unk_2C.x += this->accel.x; - this->unk_2C.z += this->accel.z; + this->vec.x += this->accel.x; + this->vec.z += this->accel.z; - this->regs[SS_G_SPK_TEX_IDX]++; - this->regs[SS_G_SPK_TEX_IDX] &= 3; - this->regs[SS_G_SPK_SCALE] += this->regs[SS_G_SPK_SCALE_STEP]; + this->rTexIdx++; + this->rTexIdx &= 3; + this->rScale += this->rScaleStep; } // this update mode is unused in the original game // with this update mode, the sparks dont move randomly in the xz plane, appearing to be on top of each other void EffectSsGSpk_UpdateNoAccel(GlobalContext* globalCtx, u32 index, EffectSs* this) { - if (SPARK_SOURCE != NULL) { - if ((SPARK_SOURCE->type == ACTORTYPE_EXPLOSIVES) && (SPARK_SOURCE->update != NULL)) { - this->pos.x += (Math_Sins(SPARK_SOURCE->posRot.rot.y) * SPARK_SOURCE->speedXZ); - this->pos.z += (Math_Coss(SPARK_SOURCE->posRot.rot.y) * SPARK_SOURCE->speedXZ); + if (this->actor != NULL) { + if ((this->actor->type == ACTORTYPE_EXPLOSIVES) && (this->actor->update != NULL)) { + this->pos.x += (Math_Sins(this->actor->posRot.rot.y) * this->actor->speedXZ); + this->pos.z += (Math_Coss(this->actor->posRot.rot.y) * this->actor->speedXZ); } } - this->regs[SS_G_SPK_TEX_IDX]++; - this->regs[SS_G_SPK_TEX_IDX] &= 3; - this->regs[SS_G_SPK_SCALE] += this->regs[SS_G_SPK_SCALE_STEP]; + this->rTexIdx++; + this->rTexIdx &= 3; + this->rScale += this->rScaleStep; } diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.c b/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.c index f78b751285..e871a57651 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.c @@ -1,40 +1,140 @@ /* * File: z_eff_ss_g_splash.c * Overlay: ovl_Effect_Ss_G_Splash - * Description: + * Description: Splash */ #include "z_eff_ss_g_splash.h" -typedef enum { - /* 0x00 */ SS_G_SPLASH_0, - /* 0x01 */ SS_G_SPLASH_1, - /* 0x02 */ SS_G_SPLASH_2, - /* 0x03 */ SS_G_SPLASH_3, - /* 0x04 */ SS_G_SPLASH_4, - /* 0x05 */ SS_G_SPLASH_5, - /* 0x06 */ SS_G_SPLASH_6, - /* 0x07 */ SS_G_SPLASH_7, - /* 0x08 */ SS_G_SPLASH_8, - /* 0x09 */ SS_G_SPLASH_9, - /* 0x0A */ SS_G_SPLASH_A, - /* 0x0B */ SS_G_SPLASH_B, - /* 0x0C */ SS_G_SPLASH_C, -} EffectSsG_SplashRegs; +//! @bug the reuse of regs[11] means that EffectSs_DrawGEffect will treat the type as an object bank index +// this ends up having no effect because the texture provided does not use segment 6 +#define rType regs[11] -u32 EffectSsGSplash_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); +u32 EffectSsGSplash_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParams); void EffectSsGSplash_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); void EffectSsGSplash_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); -/* EffectSsInit Effect_Ss_G_Splash_InitVars = { EFFECT_SS_G_SPLASH, EffectSsGSplash_Init, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Splash/EffectSsGSplash_Init.s") +extern Gfx D_04027DF0[]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Splash/func_809A7760.s") +u32 EffectSsGSplash_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) { + EffectSsGSplashInitParams* initParams = (EffectSsGSplashInitParams*)initParamsx; + Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Splash/func_809A7864.s") + this->velocity = this->accel = zeroVec; + this->pos = initParams->pos; + this->draw = EffectSsGSplash_Draw; + this->update = EffectSsGSplash_Update; + + if (initParams->scale == 0) { + initParams->scale = 600; + } + + this->gfx = SEGMENTED_TO_VIRTUAL(D_04027DF0); + this->life = 8; + this->rgScale = initParams->scale; + this->rgTexIdx = 0; + this->rgTexIdxStep = 100; + + if (initParams->customColor) { + this->rgPrimColorR = initParams->primColor.r; + this->rgPrimColorG = initParams->primColor.g; + this->rgPrimColorB = initParams->primColor.b; + this->rgPrimColorA = initParams->primColor.a; + this->rgEnvColorR = initParams->envColor.r; + this->rgEnvColorG = initParams->envColor.g; + this->rgEnvColorB = initParams->envColor.b; + this->rgEnvColorA = initParams->envColor.a; + this->rType = initParams->type; + } else { + switch (initParams->type) { + case 0: + this->rgPrimColorR = 255; + this->rgPrimColorG = 255; + this->rgPrimColorB = 255; + this->rgPrimColorA = 200; + this->rgEnvColorR = 255; + this->rgEnvColorG = 255; + this->rgEnvColorB = 255; + this->rgEnvColorA = 200; + this->rType = 0; + break; + case 1: + this->rgPrimColorR = 255; + this->rgPrimColorG = 255; + this->rgPrimColorB = 255; + this->rgPrimColorA = 255; + this->rgEnvColorR = 255; + this->rgEnvColorG = 255; + this->rgEnvColorB = 255; + this->rgEnvColorA = 255; + this->rType = 1; + break; + case 2: + this->rgPrimColorR = 255; + this->rgPrimColorG = 255; + this->rgPrimColorB = 255; + this->rgPrimColorA = 200; + this->rgEnvColorR = 255; + this->rgEnvColorG = 255; + this->rgEnvColorB = 255; + this->rgEnvColorA = 200; + this->rType = 2; + break; + } + } + return 1; +} + +static void* sTextures[] = { + 0x040255F0, 0x04025AF0, 0x04025FF0, 0x040264F0, 0x040269F0, 0x04026EF0, 0x040273F0, 0x040278F0, +}; + +void EffectSsGSplash_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { + s16 texIdx; + + switch (this->rType) { + case 0: + texIdx = this->rgTexIdx / 100; + if (texIdx > 7) { + texIdx = 7; + } + EffectSs_DrawGEffect(globalCtx, this, sTextures[texIdx]); + break; + + case 1: + texIdx = this->rgTexIdx / 100; + if (texIdx > 7) { + texIdx = 7; + } + EffectSs_DrawGEffect(globalCtx, this, sTextures[texIdx]); + break; + + case 2: + texIdx = this->rgTexIdx / 100; + if (texIdx > 7) { + texIdx = 7; + } + EffectSs_DrawGEffect(globalCtx, this, sTextures[texIdx]); + break; + + default: + break; + } +} + +void EffectSsGSplash_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { + Vec3f newSplashPos; + + if ((this->rType == 1) && (this->life == 5)) { + newSplashPos = this->pos; + newSplashPos.y += ((this->rgScale * 20) * 0.002f); + EffectSsGSplash_Spawn(globalCtx, &newSplashPos, 0, 0, 2, this->rgScale / 2); + } + + this->rgTexIdx += this->rgTexIdxStep; +} diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.h b/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.h index 9116d22f06..eef432a958 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.h +++ b/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.h @@ -6,8 +6,11 @@ typedef struct { /* 0x00 */ Vec3f pos; - /* 0x0C */ Vec3f velocity; - /* 0x18 */ Vec3f accel; -} EffectSsGSplashInitParams; // size = 0x + /* 0x0C */ u8 type; + /* 0x0D */ u8 customColor; + /* 0x0E */ s16 scale; + /* 0x10 */ Color_RGBA8 primColor; + /* 0x14 */ Color_RGBA8 envColor; +} EffectSsGSplashInitParams; // size = 0x18 #endif diff --git a/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c b/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c index d9b254f6ac..1f69376fe1 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c +++ b/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c @@ -1,44 +1,134 @@ /* * File: z_eff_ss_hahen.c * Overlay: ovl_Effect_Ss_Hahen - * Description: + * Description: Fragments */ #include "z_eff_ss_hahen.h" -typedef enum { - /* 0x00 */ SS_HAHEN_0, - /* 0x01 */ SS_HAHEN_1, - /* 0x02 */ SS_HAHEN_2, - /* 0x03 */ SS_HAHEN_3, - /* 0x04 */ SS_HAHEN_4, - /* 0x05 */ SS_HAHEN_5, - /* 0x06 */ SS_HAHEN_6, - /* 0x07 */ SS_HAHEN_7, - /* 0x08 */ SS_HAHEN_8, - /* 0x09 */ SS_HAHEN_9, - /* 0x0A */ SS_HAHEN_A, - /* 0x0B */ SS_HAHEN_B, - /* 0x0C */ SS_HAHEN_C, -} EffectSsHahenRegs; +#define rPitch regs[0] +#define rYaw regs[1] +#define rUnused regs[2] +#define rScale regs[3] +#define rObjId regs[4] +#define rObjBankIdx regs[5] +#define rMinLife regs[6] u32 EffectSsHahen_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); +void EffectSsHahen_DrawGray(GlobalContext* globalCtx, u32 index, EffectSs* this); void EffectSsHahen_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); void EffectSsHahen_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); -/* EffectSsInit Effect_Ss_Hahen_InitVars = { EFFECT_SS_HAHEN, EffectSsHahen_Init, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A79F0.s") +extern Gfx D_0400C0D0[]; +extern Gfx D_0400CD80[]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/EffectSsHahen_Init.s") +void EffectSsHahen_CheckForObject(EffectSs* this, GlobalContext* globalCtx) { + if (((this->rObjBankIdx = Object_GetIndex(&globalCtx->objectCtx, this->rObjId)) < 0) || + !Object_IsLoaded(&globalCtx->objectCtx, this->rObjBankIdx)) { + this->life = -1; + this->draw = NULL; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7BFC.s") +u32 EffectSsHahen_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) { + EffectSsHahenInitParams* initParams = (EffectSsHahenInitParams*)initParamsx; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7D9C.s") + this->pos = initParams->pos; + this->velocity = initParams->velocity; + this->accel = initParams->accel; + this->life = 200; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7F84.s") + if (initParams->dList != NULL) { + this->gfx = initParams->dList; + this->rObjId = initParams->objId; + EffectSsHahen_CheckForObject(this, globalCtx); + } else { + this->gfx = SEGMENTED_TO_VIRTUAL(D_0400C0D0); + this->rObjId = -1; + } + + if ((this->rObjId == OBJECT_HAKA_OBJECTS) && (this->gfx == D_0400CD80)) { + this->draw = EffectSsHahen_DrawGray; + } else { + this->draw = EffectSsHahen_Draw; + } + + this->update = EffectSsHahen_Update; + this->rUnused = initParams->unused; + this->rScale = initParams->scale; + this->rPitch = Math_Rand_ZeroOne() * 314.0f; + this->rYaw = Math_Rand_ZeroOne() * 314.0f; + this->rMinLife = 200 - initParams->life; + + return 1; +} + +void EffectSsHahen_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + s32 pad; + f32 scale = this->rScale * 0.001f; + + OPEN_DISPS(gfxCtx, "../z_eff_hahen.c", 208); + + if (this->rObjId != -1) { + gSPSegment(oGfxCtx->polyOpa.p++, 0x06, globalCtx->objectCtx.status[this->rObjBankIdx].segment); + } + + Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW); + Matrix_RotateY(this->rYaw * 0.01f, MTXMODE_APPLY); + Matrix_RotateX(this->rPitch * 0.01f, MTXMODE_APPLY); + Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); + gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(gfxCtx, "../z_eff_hahen.c", 228), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + func_80093D18(globalCtx->state.gfxCtx); + gSPDisplayList(oGfxCtx->polyOpa.p++, this->gfx); + + CLOSE_DISPS(gfxCtx, "../z_eff_hahen.c", 236); +} + +// in the original game this function is hardcoded to be used only by the skull pots in Shadow Temple +void EffectSsHahen_DrawGray(GlobalContext* globalCtx, u32 index, EffectSs* this) { + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + s32 pad; + f32 scale = this->rScale * 0.001f; + + OPEN_DISPS(gfxCtx, "../z_eff_hahen.c", 253); + + if (this->rObjId != -1) { + gSPSegment(oGfxCtx->polyOpa.p++, 0x06, globalCtx->objectCtx.status[this->rObjBankIdx].segment); + } + + Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW); + Matrix_RotateY(this->rYaw * 0.01f, MTXMODE_APPLY); + Matrix_RotateX(this->rPitch * 0.01f, MTXMODE_APPLY); + Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); + gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(gfxCtx, "../z_eff_hahen.c", 271), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + func_80093D18(globalCtx->state.gfxCtx); + gDPSetCombineLERP(oGfxCtx->polyOpa.p++, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, + SHADE, 0, PRIMITIVE, 0); + gDPSetPrimColor(oGfxCtx->polyOpa.p++, 0x0, 0x01, 100, 100, 120, 255); + gSPDisplayList(oGfxCtx->polyOpa.p++, this->gfx); + + CLOSE_DISPS(gfxCtx, "../z_eff_hahen.c", 288); +} + +void EffectSsHahen_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { + Player* player = PLAYER; + + this->rPitch += 55; + this->rYaw += 10; + + if ((this->pos.y <= player->actor.groundY) && (this->life < this->rMinLife)) { + this->life = 0; + } + + if (this->rObjId != -1) { + EffectSsHahen_CheckForObject(this, globalCtx); + } +} diff --git a/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h b/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h index 6f79985f17..53bd9e3d61 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h +++ b/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h @@ -8,6 +8,13 @@ typedef struct { /* 0x00 */ Vec3f pos; /* 0x0C */ Vec3f velocity; /* 0x18 */ Vec3f accel; -} EffectSsHahenInitParams; // size = 0x + /* 0x24 */ Gfx* dList; + /* 0x28 */ s16 unused; + /* 0x2A */ s16 scale; + /* 0x2C */ s16 objId; + /* 0x2C */ s16 life; +} EffectSsHahenInitParams; // size = 0x30 + +#define HAHEN_OBJECT_DEFAULT -1 #endif diff --git a/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c b/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c index 5086175d28..3e5cebd09f 100644 --- a/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c +++ b/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c @@ -1,40 +1,119 @@ /* * File: z_eff_ss_hitmark.c * Overlay: ovl_Effect_Ss_HitMark - * Description: + * Description: Hit Marks */ #include "z_eff_ss_hitmark.h" -typedef enum { - /* 0x00 */ SS_HITMARK_0, - /* 0x01 */ SS_HITMARK_1, - /* 0x02 */ SS_HITMARK_2, - /* 0x03 */ SS_HITMARK_3, - /* 0x04 */ SS_HITMARK_4, - /* 0x05 */ SS_HITMARK_5, - /* 0x06 */ SS_HITMARK_6, - /* 0x07 */ SS_HITMARK_7, - /* 0x08 */ SS_HITMARK_8, - /* 0x09 */ SS_HITMARK_9, - /* 0x0A */ SS_HITMARK_A, - /* 0x0B */ SS_HITMARK_B, - /* 0x0C */ SS_HITMARK_C, -} EffectSsHitMarkRegs; +#define rTexIdx regs[0] +#define rType regs[1] +#define rPrimColorR regs[2] +#define rPrimColorG regs[3] +#define rPrimColorB regs[4] +#define rEnvColorR regs[5] +#define rEnvColorG regs[6] +#define rEnvColorB regs[7] +#define rScale regs[8] u32 EffectSsHitMark_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); void EffectSsHitMark_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); void EffectSsHitMark_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); -/* +static Color_RGB8 sColors[] = { + { 255, 255, 255 }, { 255, 255, 0 }, { 255, 255, 255 }, { 255, 0, 0 }, { 255, 200, 100 }, { 200, 150, 0 }, + { 150, 100, 0 }, { 100, 50, 0 }, { 255, 255, 255 }, { 255, 0, 0 }, { 255, 255, 0 }, { 255, 0, 0 }, + { 255, 255, 255 }, { 0, 255, 200 }, { 255, 255, 255 }, { 150, 0, 255 }, +}; + +static void* sTextures[] = { + 0x0401F370, 0x0401F4F0, 0x0401F670, 0x0401F7F0, 0x0401F970, 0x0401FAF0, 0x0401FC70, 0x0401FDF0, + 0x0401FF70, 0x040200F0, 0x04020270, 0x040203F0, 0x04020570, 0x040206F0, 0x04020870, 0x040209F0, + 0x04020B70, 0x04020CF0, 0x04020E70, 0x04020FF0, 0x04021170, 0x040212F0, 0x04021470, 0x040215F0, + 0x0401F370, 0x0401F4F0, 0x0401F670, 0x0401F7F0, 0x0401F970, 0x0401FAF0, 0x0401FC70, 0x0401FDF0, +}; + EffectSsInit Effect_Ss_HitMark_InitVars = { EFFECT_SS_HITMARK, EffectSsHitMark_Init, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/EffectSsHitMark_Init.s") +u32 EffectSsHitMark_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) { + s32 colorIdx; + EffectSsHitMarkInitParams* initParams = (EffectSsHitMarkInitParams*)initParamsx; + this->pos = initParams->pos; + this->gfx = SEGMENTED_TO_VIRTUAL(D_04021770); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/func_809A824C.s") + if (initParams->type == 1) { + this->life = 16; + } else { + this->life = 8; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/func_809A8484.s") + this->draw = EffectSsHitMark_Draw; + this->update = EffectSsHitMark_Update; + colorIdx = initParams->type * 4; + this->rTexIdx = 0; + this->rType = initParams->type; + this->rPrimColorR = sColors[colorIdx].r; + this->rPrimColorG = sColors[colorIdx].g; + this->rPrimColorB = sColors[colorIdx].b; + this->rEnvColorR = sColors[colorIdx + 1].r; + this->rEnvColorG = sColors[colorIdx + 1].g; + this->rEnvColorB = sColors[colorIdx + 1].b; + this->rScale = initParams->scale; + + return 1; +} + +void EffectSsHitMark_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + MtxF mfTrans; + MtxF mfScale; + MtxF mfResult; + MtxF mfTrans11DA0; + Mtx* mtx; + f32 scale; + s32 pad; + + OPEN_DISPS(gfxCtx, "../z_eff_ss_hitmark.c", 297); + + SkinMatrix_SetTranslate(&mfTrans, this->pos.x, this->pos.y, this->pos.z); + scale = this->rScale / 100.0f; + SkinMatrix_SetScale(&mfScale, scale, scale, 1.0f); + SkinMatrix_MtxFMtxFMult(&mfTrans, &globalCtx->mf_11DA0, &mfTrans11DA0); + SkinMatrix_MtxFMtxFMult(&mfTrans11DA0, &mfScale, &mfResult); + gSPMatrix(oGfxCtx->polyXlu.p++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + + mtx = SkinMatrix_MtxFToNewMtx(gfxCtx, &mfResult); + + if (mtx != NULL) { + gSPMatrix(oGfxCtx->polyXlu.p++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(sTextures[(this->rType * 8) + (this->rTexIdx)])); + func_80094C50(gfxCtx); + gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, 255); + gDPSetEnvColor(oGfxCtx->polyXlu.p++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, 0); + gSPDisplayList(oGfxCtx->polyXlu.p++, this->gfx); + } + CLOSE_DISPS(gfxCtx, "../z_eff_ss_hitmark.c", 341); +} + +void EffectSsHitMark_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { + s32 colorIdx; + + if (this->rType == 1) { + this->rTexIdx = (15 - this->life) / 2; + } else { + this->rTexIdx = 7 - this->life; + } + + if (this->rTexIdx != 0) { + colorIdx = this->rType * 4 + 2; + this->rPrimColorR = func_80027DD4(this->rPrimColorR, sColors[colorIdx].r, this->life + 1); + this->rPrimColorG = func_80027DD4(this->rPrimColorG, sColors[colorIdx].g, this->life + 1); + this->rPrimColorB = func_80027DD4(this->rPrimColorB, sColors[colorIdx].b, this->life + 1); + this->rEnvColorR = func_80027DD4(this->rEnvColorR, sColors[colorIdx + 1].r, this->life + 1); + this->rEnvColorG = func_80027DD4(this->rEnvColorG, sColors[colorIdx + 1].g, this->life + 1); + this->rEnvColorB = func_80027DD4(this->rEnvColorB, sColors[colorIdx + 1].b, this->life + 1); + } +} diff --git a/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h b/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h index c7bd65b72c..a30ff596ba 100644 --- a/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h +++ b/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h @@ -5,9 +5,9 @@ #include typedef struct { - /* 0x00 */ Vec3f pos; - /* 0x0C */ Vec3f velocity; - /* 0x18 */ Vec3f accel; -} EffectSsHitMarkInitParams; // size = 0x + /* 0x00 */ s32 type; + /* 0x04 */ s16 scale; + /* 0x08 */ Vec3f pos; +} EffectSsHitMarkInitParams; // size = 0x14 #endif diff --git a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c b/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c index ed209cfff0..d3b69f287e 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c +++ b/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c @@ -1,40 +1,87 @@ /* * File: z_eff_ss_ice_piece.c * Overlay: ovl_Effect_Ss_Ice_Piece - * Description: + * Description: Ice Shards */ #include "z_eff_ss_ice_piece.h" -typedef enum { - /* 0x00 */ SS_ICE_PIECE_0, - /* 0x01 */ SS_ICE_PIECE_1, - /* 0x02 */ SS_ICE_PIECE_2, - /* 0x03 */ SS_ICE_PIECE_3, - /* 0x04 */ SS_ICE_PIECE_4, - /* 0x05 */ SS_ICE_PIECE_5, - /* 0x06 */ SS_ICE_PIECE_6, - /* 0x07 */ SS_ICE_PIECE_7, - /* 0x08 */ SS_ICE_PIECE_8, - /* 0x09 */ SS_ICE_PIECE_9, - /* 0x0A */ SS_ICE_PIECE_A, - /* 0x0B */ SS_ICE_PIECE_B, - /* 0x0C */ SS_ICE_PIECE_C, -} EffectSsIce_PieceRegs; +#define rLifespan regs[0] +#define rYaw regs[1] +#define rPitch regs[2] +#define rRotSpeed regs[3] +#define rScale regs[4] u32 EffectSsIcePiece_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); void EffectSsIcePiece_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); void EffectSsIcePiece_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); -/* EffectSsInit Effect_Ss_Ice_Piece_InitVars = { EFFECT_SS_ICE_PIECE, EffectSsIcePiece_Init, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/EffectSsIcePiece_Init.s") +extern Gfx D_04033720[]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/func_809A8850.s") +u32 EffectSsIcePiece_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) { + EffectSsIcePieceInitParams* initParams = (EffectSsIcePieceInitParams*)initParamsx; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/func_809A8AC0.s") + this->pos = initParams->pos; + this->vec = initParams->pos; + this->velocity = initParams->velocity; + this->accel = initParams->accel; + this->life = initParams->life; + this->draw = EffectSsIcePiece_Draw; + this->update = EffectSsIcePiece_Update; + this->rLifespan = initParams->life; + this->rScale = initParams->scale * 100.0f; + this->rYaw = atan2s(initParams->velocity.z, initParams->velocity.x); + this->rPitch = 0; + this->rRotSpeed = + ((fabsf(initParams->velocity.x) + fabsf(initParams->velocity.y)) * 100.0f) * (Math_Rand_ZeroFloat(1.0f) + 0.5f); + + return 1; +} + +void EffectSsIcePiece_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + s32 pad; + f32 scale; + u32 frames; + f32 alpha; + + scale = this->rScale * 0.01f; + frames = globalCtx->state.frames; + + OPEN_DISPS(gfxCtx, "../z_eff_ice_piece.c", 161); + + if ((this->rLifespan > 0) && (this->life < (this->rLifespan >> 1))) { + alpha = ((this->life * 2.0f) / this->rLifespan); + alpha *= 255.0f; + } else { + alpha = 255.0f; + } + + Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW); + Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); + Matrix_RotateY(this->rYaw * 0.0000958738f, MTXMODE_APPLY); + Matrix_RotateX(this->rPitch * 0.0000958738f, MTXMODE_APPLY); + gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(gfxCtx, "../z_eff_ice_piece.c", 185), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + func_80093D84(globalCtx->state.gfxCtx); + gDPSetEnvColor(oGfxCtx->polyXlu.p++, 0, 50, 100, (s32)alpha & 0xFF); + func_8003435C(&this->pos, globalCtx); + gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (1 * frames) % 256, 0x20, 0x10, 1, 0, (2 * frames) % 256, + 0x40, 0x20)); + gSPDisplayList(oGfxCtx->polyXlu.p++, D_04033720); + + CLOSE_DISPS(gfxCtx, "../z_eff_ice_piece.c", 209); +} + +void EffectSsIcePiece_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { + this->rPitch += this->rRotSpeed; + this->velocity.x = this->velocity.x * 0.85f; + this->velocity.y = this->velocity.y * 0.85f; + this->velocity.z = this->velocity.z * 0.85f; +} diff --git a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.h b/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.h index 6982716077..50b156d520 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.h +++ b/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.h @@ -6,8 +6,10 @@ typedef struct { /* 0x00 */ Vec3f pos; - /* 0x0C */ Vec3f velocity; - /* 0x18 */ Vec3f accel; -} EffectSsIcePieceInitParams; // size = 0x + /* 0x0C */ f32 scale; + /* 0x10 */ Vec3f velocity; + /* 0x1C */ Vec3f accel; + /* 0x28 */ s32 life; +} EffectSsIcePieceInitParams; // size = 0xC #endif diff --git a/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c b/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c index 728940461f..e2bf275a6f 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c +++ b/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c @@ -1,40 +1,109 @@ /* * File: z_eff_ss_ice_smoke.c * Overlay: ovl_Effect_Ss_Ice_Smoke - * Description: + * Description: Ice Smoke */ #include "z_eff_ss_ice_smoke.h" -typedef enum { - /* 0x00 */ SS_ICE_SMOKE_0, - /* 0x01 */ SS_ICE_SMOKE_1, - /* 0x02 */ SS_ICE_SMOKE_2, - /* 0x03 */ SS_ICE_SMOKE_3, - /* 0x04 */ SS_ICE_SMOKE_4, - /* 0x05 */ SS_ICE_SMOKE_5, - /* 0x06 */ SS_ICE_SMOKE_6, - /* 0x07 */ SS_ICE_SMOKE_7, - /* 0x08 */ SS_ICE_SMOKE_8, - /* 0x09 */ SS_ICE_SMOKE_9, - /* 0x0A */ SS_ICE_SMOKE_A, - /* 0x0B */ SS_ICE_SMOKE_B, - /* 0x0C */ SS_ICE_SMOKE_C, -} EffectSsIce_SmokeRegs; +#define rObjBankIdx regs[0] +#define rAlpha regs[1] +#define rScale regs[2] u32 EffectSsIceSmoke_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); void EffectSsIceSmoke_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); void EffectSsIceSmoke_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); -/* EffectSsInit Effect_Ss_Ice_Smoke_InitVars = { EFFECT_SS_ICE_SMOKE, EffectSsIceSmoke_Init, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/EffectSsIceSmoke_Init.s") +extern Gfx D_060030A0[]; +extern Gfx D_06003158[]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A8D18.s") +u32 EffectSsIceSmoke_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) { + EffectSsIceSmokeInitParams* initParams = (EffectSsIceSmokeInitParams*)initParamsx; + s32 pad; + s32 objBankIdx; + void* oldSeg6; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A9030.s") + objBankIdx = Object_GetIndex(&globalCtx->objectCtx, OBJECT_FZ); + + if ((objBankIdx > -1) && Object_IsLoaded(&globalCtx->objectCtx, objBankIdx)) { + oldSeg6 = gSegments[6]; + gSegments[6] = VIRTUAL_TO_PHYSICAL(globalCtx->objectCtx.status[objBankIdx].segment); + Math_Vec3f_Copy(&this->pos, &initParams->pos); + Math_Vec3f_Copy(&this->velocity, &initParams->velocity); + Math_Vec3f_Copy(&this->accel, &initParams->accel); + this->rObjBankIdx = objBankIdx; + this->rAlpha = 0; + this->rScale = initParams->scale; + this->life = 50; + this->draw = EffectSsIceSmoke_Draw; + this->update = EffectSsIceSmoke_Update; + gSegments[6] = oldSeg6; + + return 1; + } + + osSyncPrintf("Effect_SS_Ice_Smoke_ct():バンク Object_Bank_Fzが有りません。\n"); + + return 0; +} + +void EffectSsIceSmoke_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { + s32 pad; + void* object; + Mtx* mtx; + f32 scale; + s32 objBankIdx; + + object = globalCtx->objectCtx.status[this->rObjBankIdx].segment; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_eff_ss_ice_smoke.c", 155); + + objBankIdx = Object_GetIndex(&globalCtx->objectCtx, OBJECT_FZ); + + if ((objBankIdx > -1) && Object_IsLoaded(&globalCtx->objectCtx, objBankIdx)) { + gDPPipeSync(oGfxCtx->polyXlu.p++); + func_80093D84(globalCtx->state.gfxCtx); + gSegments[6] = VIRTUAL_TO_PHYSICAL(object); + gSPSegment(oGfxCtx->polyXlu.p++, 0x06, object); + gSPDisplayList(oGfxCtx->polyXlu.p++, SEGMENTED_TO_VIRTUAL(D_060030A0)); + gDPPipeSync(oGfxCtx->polyXlu.p++); + gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, 195, 235, 235, this->rAlpha); + gSPSegment( + oGfxCtx->polyXlu.p++, 0x08, + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, this->life * 3, this->life * 15, 32, 64, 1, 0, 0, 32, 32)); + Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW); + func_800D1FD4(&globalCtx->mf_11DA0); + scale = this->rScale * 0.0001f; + Matrix_Scale(scale, scale, 1.0f, MTXMODE_APPLY); + + mtx = Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_eff_ss_ice_smoke.c", 196); + + if (mtx != NULL) { + gSPMatrix(oGfxCtx->polyXlu.p++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(oGfxCtx->polyXlu.p++, SEGMENTED_TO_VIRTUAL(D_06003158)); + } + } else { + this->life = -1; + } + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_eff_ss_ice_smoke.c", 210); +} + +void EffectSsIceSmoke_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { + s32 objBankIdx; + + objBankIdx = Object_GetIndex(&globalCtx->objectCtx, OBJECT_FZ); + + if ((objBankIdx > -1) && Object_IsLoaded(&globalCtx->objectCtx, objBankIdx)) { + if (this->rAlpha < 100) { + this->rAlpha += 10; + } + } else { + this->life = -1; + } +} diff --git a/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.h b/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.h index 5b77bca96a..f0ae42da4a 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.h +++ b/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.h @@ -8,6 +8,7 @@ typedef struct { /* 0x00 */ Vec3f pos; /* 0x0C */ Vec3f velocity; /* 0x18 */ Vec3f accel; -} EffectSsIceSmokeInitParams; // size = 0x + /* 0x24 */ s16 scale; +} EffectSsIceSmokeInitParams; // size = 0x28 #endif diff --git a/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c b/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c index eea951f084..bafc33b8bd 100644 --- a/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c +++ b/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c @@ -6,35 +6,106 @@ #include "z_eff_ss_k_fire.h" -typedef enum { - /* 0x00 */ SS_K_FIRE_0, - /* 0x01 */ SS_K_FIRE_1, - /* 0x02 */ SS_K_FIRE_2, - /* 0x03 */ SS_K_FIRE_3, - /* 0x04 */ SS_K_FIRE_4, - /* 0x05 */ SS_K_FIRE_5, - /* 0x06 */ SS_K_FIRE_6, - /* 0x07 */ SS_K_FIRE_7, - /* 0x08 */ SS_K_FIRE_8, - /* 0x09 */ SS_K_FIRE_9, - /* 0x0A */ SS_K_FIRE_A, - /* 0x0B */ SS_K_FIRE_B, - /* 0x0C */ SS_K_FIRE_C, -} EffectSsK_FireRegs; +#define rAlpha regs[0] +#define rScroll regs[2] +#define rType regs[3] +#define rYScale regs[4] +#define rXZScale regs[5] +#define rScaleMax regs[6] u32 EffectSsKFire_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); void EffectSsKFire_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); void EffectSsKFire_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); -/* EffectSsInit Effect_Ss_K_Fire_InitVars = { EFFECT_SS_K_FIRE, EffectSsKFire_Init, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_K_Fire/EffectSsKFire_Init.s") +extern Gfx D_0404D4E0[]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_K_Fire/func_809A9280.s") +u32 EffectSsKFire_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) { + EffectSsKFireInitParams* initParams = (EffectSsKFireInitParams*)initParamsx; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_K_Fire/func_809A951C.s") + this->pos = initParams->pos; + this->velocity = initParams->velocity; + this->accel = initParams->accel; + this->life = 100; + this->rScaleMax = initParams->scaleMax; + this->rAlpha = 255; + this->rScroll = (s16)Math_Rand_ZeroFloat(5.0f) - 0x19; + this->rType = initParams->type; + this->draw = EffectSsKFire_Draw; + this->update = EffectSsKFire_Update; + + return 1; +} + +void EffectSsKFire_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + s32 pad; + f32 xzScale; + f32 yScale; + + xzScale = this->rXZScale / 10000.0f; + yScale = this->rYScale / 10000.0f; + + OPEN_DISPS(gfxCtx, "../z_eff_k_fire.c", 152); + + Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW); + Matrix_Scale(xzScale, yScale, xzScale, MTXMODE_APPLY); + func_80093D84(globalCtx->state.gfxCtx); + gSPSegment(oGfxCtx->polyXlu.p++, 0x08, + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 0x20, 0x40, 1, 0, + globalCtx->state.frames * this->rScroll, 0x20, 0x80)); + + if (this->rType >= 100) { + gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0x80, 0x80, 255, 255, 0, this->rAlpha); + gDPSetEnvColor(oGfxCtx->polyXlu.p++, 255, 10, 0, 0); + } else { + gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0x80, 0x80, 255, 255, 255, this->rAlpha); + gDPSetEnvColor(oGfxCtx->polyXlu.p++, 0, 255, 255, 0); + } + + if (1) {} + + gDPPipeSync(oGfxCtx->polyXlu.p++); + func_800D1FD4(&globalCtx->mf_11DA0); + + if ((index & 1) != 0) { + Matrix_RotateY(M_PI, MTXMODE_APPLY); + } + + gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_eff_k_fire.c", 215), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(oGfxCtx->polyXlu.p++, D_0404D4E0); + + CLOSE_DISPS(gfxCtx, "../z_eff_k_fire.c", 220); +} + +void EffectSsKFire_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { + if (this->rXZScale < this->rScaleMax) { + this->rXZScale += 4; + this->rYScale += 4; + + if (this->rXZScale > this->rScaleMax) { + this->rXZScale = this->rScaleMax; + + if (this->rType != 3) { + this->rYScale = this->rScaleMax; + } + } + } else { + if (this->rAlpha > 0) { + this->rAlpha -= 10; + if (this->rAlpha <= 0) { + this->rAlpha = 0; + this->life = 0; + } + } + } + + if (this->rType == 3) { + this->rYScale++; + } +} diff --git a/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.h b/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.h index b21a83473d..2324f0f4b5 100644 --- a/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.h +++ b/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.h @@ -8,6 +8,8 @@ typedef struct { /* 0x00 */ Vec3f pos; /* 0x0C */ Vec3f velocity; /* 0x18 */ Vec3f accel; -} EffectSsKFireInitParams; // size = 0x + /* 0x24 */ s16 scaleMax; + /* 0x26 */ u8 type; +} EffectSsKFireInitParams; // size = 0x28 #endif diff --git a/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c b/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c index 044c5e0357..b82e71b404 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c +++ b/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c @@ -1,70 +1,423 @@ /* * File: z_eff_ss_kakera.c * Overlay: ovl_Effect_Ss_Kakera - * Description: + * Description: Fragments. Appearance is determined by the supplied display list. */ #include "z_eff_ss_kakera.h" -typedef enum { - /* 0x00 */ SS_KAKERA_0, - /* 0x01 */ SS_KAKERA_1, - /* 0x02 */ SS_KAKERA_2, - /* 0x03 */ SS_KAKERA_3, - /* 0x04 */ SS_KAKERA_4, - /* 0x05 */ SS_KAKERA_5, - /* 0x06 */ SS_KAKERA_6, - /* 0x07 */ SS_KAKERA_7, - /* 0x08 */ SS_KAKERA_8, - /* 0x09 */ SS_KAKERA_9, - /* 0x0A */ SS_KAKERA_A, - /* 0x0B */ SS_KAKERA_B, - /* 0x0C */ SS_KAKERA_C, -} EffectSsKakeraRegs; +#define rReg0 regs[0] +#define rGravity regs[1] +#define rPitch regs[2] +#define rYaw regs[3] +#define rReg4 regs[4] +#define rReg5 regs[5] +#define rReg6 regs[6] +#define rScale regs[7] +#define rReg8 regs[8] +#define rReg9 regs[9] +#define rObjId regs[10] +#define rObjBankIdx regs[11] +#define rColorIdx regs[12] u32 EffectSsKakera_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); void EffectSsKakera_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); void EffectSsKakera_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); -/* +void func_809A9BA8(EffectSs* this, GlobalContext* globalCtx); + EffectSsInit Effect_Ss_Kakera_InitVars = { EFFECT_SS_KAKERA, EffectSsKakera_Init, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/EffectSsKakera_Init.s") +u32 EffectSsKakera_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) { + EffectSsKakeraInitParams* initParams = (EffectSsKakeraInitParams*)initParamsx; + s32 objId; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9818.s") + this->pos = initParams->pos; + this->velocity = initParams->velocity; + this->life = initParams->life; + this->priority = 101; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9874.s") + if (initParams->dList != NULL) { + this->gfx = initParams->dList; + objId = initParams->objId; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9BA8.s") + if (objId == OBJECT_GAMEPLAY_KEEP || objId == OBJECT_GAMEPLAY_FIELD_KEEP || + objId == OBJECT_GAMEPLAY_DANGEON_KEEP) { + this->rObjId = KAKERA_OBJECT_DEFAULT; + } else { + this->rObjId = initParams->objId; + func_809A9BA8(this, globalCtx); + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9C10.s") + } else { + osSyncPrintf("shape_modelがNULL\n"); + LogUtils_HungupThread("../z_eff_kakera.c", 178); + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9DC0.s") + this->draw = EffectSsKakera_Draw; + this->update = EffectSsKakera_Update; + this->vec = initParams->unk_18; + this->rReg0 = initParams->unk_2C; + this->rGravity = initParams->gravity; + this->rPitch = Math_Rand_ZeroOne() * 32767.0f; + this->rYaw = Math_Rand_ZeroOne() * 32767.0f; + this->rReg4 = initParams->unk_26; + this->rReg5 = initParams->unk_28; + this->rReg6 = initParams->unk_2A; + this->rScale = initParams->scale; + this->rReg8 = initParams->unk_30; + this->rReg9 = initParams->unk_32; + this->rColorIdx = initParams->colorIdx; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9DD8.s") + return 1; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9DEC.s") +f32 func_809A9818(f32 arg0, f32 arg1) { + f32 temp_f2; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9E28.s") + if (arg1 < 0.0f) { + osSyncPrintf("範囲がマイナス！！(randomD_sectionUniformity)\n"); + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9E68.s") + temp_f2 = Math_Rand_ZeroOne() * arg1; + return ((temp_f2 * 2.0f) - arg1) + arg0; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9E88.s") +void EffectSsKakera_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { + static Color_RGB8 colors[] = { { 255, 255, 255 }, { 235, 170, 130 } }; + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + s32 pad; + f32 scale; + s32 colorIdx; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9F10.s") + scale = this->rScale * 0.00390625f; + colorIdx = this->rColorIdx; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9F4C.s") + OPEN_DISPS(gfxCtx, "../z_eff_kakera.c", 241); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9FD8.s") + if (this->rObjId != KAKERA_OBJECT_DEFAULT) { + if ((((this->rReg4 >> 7) & 1) << 7) == 0x80) { + gSPSegment(oGfxCtx->polyXlu.p++, 0x06, globalCtx->objectCtx.status[this->rObjBankIdx].segment); + } else { + gSPSegment(oGfxCtx->polyOpa.p++, 0x06, globalCtx->objectCtx.status[this->rObjBankIdx].segment); + } + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809AA0B8.s") + Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW); + Matrix_RotateY(this->rYaw * 0.01f, MTXMODE_APPLY); + Matrix_RotateX(this->rPitch * 0.01f, MTXMODE_APPLY); + Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809AA0EC.s") + if ((((this->rReg4 >> 7) & 1) << 7) == 0x80) { + gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(gfxCtx, "../z_eff_kakera.c", 268), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + func_80093D84(globalCtx->state.gfxCtx); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809AA230.s") + if (colorIdx >= 0) { + gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, colors[colorIdx].r, colors[colorIdx].g, colors[colorIdx].b, + 255); + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809AA430.s") + gSPDisplayList(oGfxCtx->polyXlu.p++, this->gfx); + } else { + gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(gfxCtx, "../z_eff_kakera.c", 286), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + func_80093D18(globalCtx->state.gfxCtx); + + if (colorIdx >= 0) { + gDPSetPrimColor(oGfxCtx->polyOpa.p++, 0, 0, colors[colorIdx].r, colors[colorIdx].g, colors[colorIdx].b, + 255); + } + + gSPDisplayList(oGfxCtx->polyOpa.p++, this->gfx); + } + + CLOSE_DISPS(gfxCtx, "../z_eff_kakera.c", 302); +} + +void func_809A9BA8(EffectSs* this, GlobalContext* globalCtx) { + this->rObjBankIdx = Object_GetIndex(&globalCtx->objectCtx, this->rObjId); + + if ((this->rObjBankIdx < 0) || !Object_IsLoaded(&globalCtx->objectCtx, this->rObjBankIdx)) { + this->life = 0; + this->draw = NULL; + } +} + +void func_809A9C10(EffectSs* this) { + f32 temp_f14; + f32 temp_f12; + f32 temp_f16; + f32 temp_f2; + f32 temp_f18; + f32 temp_f20; + f32 temp_f0; + + temp_f18 = this->rReg5 * 0.0009765625f; + temp_f20 = this->rReg6 * 0.0009765625f; + temp_f14 = (this->rReg9 * 0.0009765625f) * 4.0f; + + temp_f2 = this->velocity.x - func_809A9818(0.0f, temp_f14); + temp_f16 = this->velocity.y - func_809A9818(0.0f, temp_f14); + temp_f12 = this->velocity.z - func_809A9818(0.0f, temp_f14); + + if (temp_f2 > 0.0f) { + this->velocity.x -= ((temp_f2 * temp_f18) + (SQ(temp_f2) * temp_f20)); + } else { + this->velocity.x -= ((temp_f2 * temp_f18) - (SQ(temp_f2) * temp_f20)); + } + + if (temp_f16 > 0.0f) { + temp_f0 = temp_f16 * temp_f18; + temp_f2 = SQ(temp_f16) * temp_f20; + this->velocity.y -= (temp_f0 + temp_f2); + } else { + temp_f0 = temp_f16 * temp_f18; + temp_f2 = SQ(temp_f16) * temp_f20; + this->velocity.y -= (temp_f0 - temp_f2); + } + + if (temp_f12 > 0.0f) { + this->velocity.z -= (temp_f0 + temp_f2); + } else { + this->velocity.z -= (temp_f0 - temp_f2); + } +} + +void func_809A9DC0(EffectSs* this) { + this->accel.x = this->accel.y = this->accel.z = 0.0f; +} + +f32 func_809A9DD8(f32 arg0, s32 arg1) { + return 1.0f; +} + +static f32 D_809AA530[] = { + 1.0f, 100.0f, 40.0f, 5.0f, 100.0f, 40.0f, 5.0f, 100.0f, 40.0f, 5.0f, +}; + +f32 func_809A9DEC(f32 arg0, s32 arg1) { + if (D_809AA530[arg1] < arg0) { + return D_809AA530[arg1] / arg0; + } else { + return 1.0f; + } +} + +f32 func_809A9E28(f32 arg0, s32 arg1) { + f32 temp = SQ(arg0); + + if (D_809AA530[arg1] < temp) { + return D_809AA530[arg1] / temp; + } else { + return 1.0f; + } +} + +f32 func_809A9E68(f32 arg0, s32 arg1) { + return func_809A9E28(arg0, arg1); +} + +s32 func_809A9E88(EffectSs* this, Vec3f* diff, f32 dist) { + static f32 D_809AA558[] = { 0.05f, 1.0f }; + s32 temp_v0; + f32 phi_f0; + + temp_v0 = this->rReg0 & 3; + + if (temp_v0 != 0) { + + if (dist > 1.0f) { + phi_f0 = 1.0f / dist; + } else { + phi_f0 = 1.0f; + } + + this->accel.x += ((D_809AA558[temp_v0 - 1] * diff->z) * phi_f0); + this->accel.z -= ((D_809AA558[temp_v0 - 1] * diff->x) * phi_f0); + } + + return 1; +} + +s32 func_809A9F10(EffectSs* this, Vec3f* diff, f32 dist) { + static f32 D_809AA560[] = { 4.0f, 0.1f, 0.3f, 0.9f, -0.1f, -0.3f, -0.9f }; + s32 temp_v0; + + temp_v0 = (this->rReg0 >> 2) & 7; + + if (temp_v0 != 0) { + this->accel.y += D_809AA560[temp_v0]; + } + + return 1; +} + +s32 func_809A9F4C(EffectSs* this, Vec3f* diff, f32 dist) { + static f32 D_809AA57C[] = { 0.1f, 1.0f, 6.0f }; + s32 temp_v0; + f32 phi_f0; + + temp_v0 = (this->rReg0 >> 5) & 3; + + if (temp_v0 != 0) { + + if (dist > 1.0f) { + phi_f0 = 1.0f / dist; + } else { + phi_f0 = 1.0f; + } + + this->accel.x -= ((diff->x * D_809AA57C[temp_v0 - 1]) * phi_f0); + this->accel.z -= ((diff->z * D_809AA57C[temp_v0 - 1]) * phi_f0); + } + + return 1; +} + +s32 func_809A9FD8(EffectSs* this, Vec3f* diff, f32 dist) { + static f32 (*D_809AA588[])(f32 dist, s32 arg1) = { + func_809A9DD8, func_809A9DEC, func_809A9DEC, func_809A9DEC, func_809A9E28, + func_809A9E28, func_809A9E28, func_809A9E68, func_809A9E68, func_809A9E68, + }; + f32 temp_f0; + s32 temp_a1; + + temp_a1 = (this->rReg0 >> 7) & 0xF; + temp_f0 = D_809AA588[temp_a1](dist, temp_a1); + temp_f0 = func_809A9818(temp_f0, (this->rReg9 * temp_f0) * 0.0009765625f); + + this->accel.x *= temp_f0; + this->accel.y *= temp_f0; + this->accel.z *= temp_f0; + + this->accel.x += temp_f0 * 0.01f; + this->accel.y += temp_f0 * 0.01f; + this->accel.z += temp_f0 * 0.01f; + + return 1; +} + +s32 func_809AA0B8(EffectSs* this, Vec3f* diff, f32 dist) { + this->accel.y += this->rGravity * 0.00390625f; + + return 1; +} + +s32 func_809AA0EC(EffectSs* this) { + Vec3f diff; + f32 dist; + + func_809A9DC0(this); + + diff.x = this->pos.x - this->vec.x; + diff.y = this->pos.y - this->vec.y; + diff.z = this->pos.z - this->vec.z; + + dist = sqrtf(SQ(diff.x) + SQ(diff.y) + SQ(diff.z)); + + if (dist > 1000.0f) { + return 0; + } + + if (this->rReg0 != 0) { + if (!func_809A9E88(this, &diff, dist)) { + return false; + } + + if (!func_809A9F10(this, &diff, dist)) { + return false; + } + + if (!func_809A9F4C(this, &diff, dist)) { + return false; + } + + if (!func_809A9FD8(this, &diff, dist)) { + return false; + } + } + + if (!func_809AA0B8(this, &diff, dist)) { + return false; + } + + return true; +} + +void func_809AA230(EffectSs* this, GlobalContext* globalCtx) { + static f32 D_809AA5B0[] = { 10.0f, 20.0f, 40.0f }; + Player* player = PLAYER; + + if (this->rReg8 == 0) { + if ((((this->rReg4 >> 4) & 1) * 0x10) == 0x10) { + if (this->pos.y <= (player->actor.groundY - ((this->rReg4 >> 2) & 3))) { + this->rReg9 = 0; + this->rReg0 = 0; + this->rReg4 &= ~0x60; + this->accel.x = this->accel.y = this->accel.z = 0.0f; + this->velocity.x = this->velocity.y = this->velocity.z = 0.0f; + this->rReg5 = this->rReg9; + this->rGravity = this->rReg9; + } + } else { + if (this->pos.y <= ((player->actor.groundY - ((this->rReg4 >> 2) & 3)) - 600.0f)) { + this->life = 0; + } + } + } else { + switch (this->rReg4 & 3) { + case 0: + this->rReg8 = 0; + break; + case 1: + if (this->velocity.y < 0.0f) { + if (func_8003E30C(&globalCtx->colCtx, &this->pos, D_809AA5B0[(this->rReg4 >> 2) & 3])) { + this->velocity.x *= func_809A9818(0.9f, 0.2f); + this->velocity.y *= -0.8f; + this->velocity.z *= func_809A9818(0.9f, 0.2f); + + if (this->rReg8 > 0) { + this->rReg8 -= 1; + } + } + } + break; + case 2: + if (func_8003E30C(&globalCtx->colCtx, &this->pos, D_809AA5B0[(this->rReg4 >> 2) & 3])) {} + break; + } + } +} + +void EffectSsKakera_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { + switch (((this->rReg4 >> 5) & 3) << 5) { + case 0x20: + this->rPitch += 0xB; + this->rYaw += 3; + break; + case 0x40: + this->rPitch += 0x41; + this->rYaw += 0xB; + break; + case 0x60: + this->rPitch += 0x9B; + this->rYaw += 0x1F; + break; + } + + func_809A9C10(this); + + if (!func_809AA0EC(this)) { + this->life = 0; + } + + func_809AA230(this, globalCtx); + + if (this->rObjId != KAKERA_OBJECT_DEFAULT) { + func_809A9BA8(this, globalCtx); + } +} diff --git a/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h b/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h index 304c06e0db..1727d5efb9 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h +++ b/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h @@ -7,7 +7,27 @@ typedef struct { /* 0x00 */ Vec3f pos; /* 0x0C */ Vec3f velocity; - /* 0x18 */ Vec3f accel; -} EffectSsKakeraInitParams; // size = 0x + /* 0x18 */ Vec3f unk_18; + /* 0x24 */ s16 gravity; + /* 0x26 */ s16 unk_26; + /* 0x28 */ s16 unk_28; + /* 0x2A */ s16 unk_2A; + /* 0x2C */ s16 unk_2C; + /* 0x2E */ s16 scale; + /* 0x30 */ s16 unk_30; + /* 0x32 */ s16 unk_32; + /* 0x34 */ s32 life; + /* 0x38 */ s16 colorIdx; + /* 0x3A */ s16 objId; + /* 0x3C */ Gfx* dList; +} EffectSsKakeraInitParams; // size = 0x40 + +#define KAKERA_OBJECT_DEFAULT -1 + +typedef enum { + /* -1 */ KAKERA_COLOR_NONE = -1, + /* 0 */ KAKERA_COLOR_WHITE, + /* 1 */ KAKERA_COLOR_BROWN +} KakeraColorIndex; #endif diff --git a/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c b/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c index 57c07f77bb..6458987b1f 100644 --- a/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c +++ b/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c @@ -1,44 +1,153 @@ /* * File: z_eff_ss_kirakira.c * Overlay: ovl_Effect_Ss_KiraKira - * Description: + * Description: Sparkles */ #include "z_eff_ss_kirakira.h" -typedef enum { - /* 0x00 */ SS_KIRAKIRA_0, - /* 0x01 */ SS_KIRAKIRA_1, - /* 0x02 */ SS_KIRAKIRA_2, - /* 0x03 */ SS_KIRAKIRA_3, - /* 0x04 */ SS_KIRAKIRA_4, - /* 0x05 */ SS_KIRAKIRA_5, - /* 0x06 */ SS_KIRAKIRA_6, - /* 0x07 */ SS_KIRAKIRA_7, - /* 0x08 */ SS_KIRAKIRA_8, - /* 0x09 */ SS_KIRAKIRA_9, - /* 0x0A */ SS_KIRAKIRA_A, - /* 0x0B */ SS_KIRAKIRA_B, - /* 0x0C */ SS_KIRAKIRA_C, -} EffectSsKiraKiraRegs; +#define rRotSpeed regs[0] +#define rYaw regs[1] +#define rPrimColorR regs[2] +#define rPrimColorG regs[3] +#define rPrimColorB regs[4] +#define rPrimColorA regs[5] +#define rEnvColorR regs[6] +#define rEnvColorG regs[7] +#define rEnvColorB regs[8] +#define rEnvColorA regs[9] +#define rAlphaStep regs[10] +#define rScale regs[11] +#define rLifespan regs[12] u32 EffectSsKiraKira_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); void EffectSsKiraKira_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); -void EffectSsKiraKira_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); +void func_809AABF0(GlobalContext* globalCtx, u32 index, EffectSs* this); +void func_809AACAC(GlobalContext* globalCtx, u32 index, EffectSs* this); +void func_809AAD6C(GlobalContext* globalCtx, u32 index, EffectSs* this); -/* EffectSsInit Effect_Ss_KiraKira_InitVars = { EFFECT_SS_KIRAKIRA, EffectSsKiraKira_Init, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/EffectSsKiraKira_Init.s") +extern Gfx D_04037880[]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AA9AC.s") +u32 EffectSsKiraKira_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) { + EffectSsKiraKiraInitParams* initParams = (EffectSsKiraKiraInitParams*)initParamsx; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AABF0.s") + this->pos = initParams->pos; + this->velocity = initParams->velocity; + this->accel = initParams->accel; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AACAC.s") + if ((this->life = initParams->life) < 0) { + this->life = -this->life; + this->gfx = SEGMENTED_TO_VIRTUAL(D_04037880); + this->update = func_809AAD6C; + this->rEnvColorA = initParams->scale; + this->rScale = 0; + } else { + this->gfx = SEGMENTED_TO_VIRTUAL(D_04037880); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AAD6C.s") + if (initParams->updateMode == 0) { + this->update = func_809AABF0; + } else { + this->update = func_809AACAC; + } + + this->rEnvColorA = initParams->envColor.a; + this->rScale = initParams->scale; + } + + this->draw = EffectSsKiraKira_Draw; + this->rRotSpeed = initParams->rotSpeed; + this->rYaw = initParams->yaw; + this->rPrimColorR = initParams->primColor.r; + this->rPrimColorG = initParams->primColor.g; + this->rPrimColorB = initParams->primColor.b; + this->rPrimColorA = initParams->primColor.a; + this->rEnvColorR = initParams->envColor.r; + this->rEnvColorG = initParams->envColor.g; + this->rEnvColorB = initParams->envColor.b; + this->rAlphaStep = initParams->alphaStep; + this->rLifespan = initParams->life; + + return 1; +} + +void EffectSsKiraKira_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { + GraphicsContext* gfxCtx; + f32 scale; + s32 pad; + MtxF mfTrans; + MtxF mfRotY; + MtxF mfScale; + MtxF mfTrans11DA0; + MtxF mfTrans11DA0RotY; + MtxF mfResult; + Mtx* mtx; + + scale = this->rScale / 10000.0f; + gfxCtx = globalCtx->state.gfxCtx; + + OPEN_DISPS(gfxCtx, "../z_eff_ss_kirakira.c", 257); + + SkinMatrix_SetTranslate(&mfTrans, this->pos.x, this->pos.y, this->pos.z); + SkinMatrix_SetRotateRPY(&mfRotY, 0, 0, this->rYaw); + SkinMatrix_SetScale(&mfScale, scale, scale, 1.0f); + SkinMatrix_MtxFMtxFMult(&mfTrans, &globalCtx->mf_11DA0, &mfTrans11DA0); + SkinMatrix_MtxFMtxFMult(&mfTrans11DA0, &mfRotY, &mfTrans11DA0RotY); + SkinMatrix_MtxFMtxFMult(&mfTrans11DA0RotY, &mfScale, &mfResult); + gSPMatrix(oGfxCtx->polyXlu.p++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + + mtx = SkinMatrix_MtxFToNewMtx(gfxCtx, &mfResult); + + if (mtx != NULL) { + gSPMatrix(oGfxCtx->polyXlu.p++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + func_80093C14(gfxCtx); + gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0x80, 0x80, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, + (((s8)((55.0f / this->rLifespan) * this->life) + 200))); + gDPSetEnvColor(oGfxCtx->polyXlu.p++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, this->rEnvColorA); + gSPDisplayList(oGfxCtx->polyXlu.p++, this->gfx); + } + + CLOSE_DISPS(gfxCtx, "../z_eff_ss_kirakira.c", 301); +} + +void func_809AABF0(GlobalContext* globalCtx, u32 index, EffectSs* this) { + this->accel.x = (Math_Rand_ZeroOne() * 0.4f) - 0.2f; + this->accel.z = (Math_Rand_ZeroOne() * 0.4f) - 0.2f; + this->rEnvColorA += this->rAlphaStep; + + if (this->rEnvColorA < 0) { + this->rEnvColorA = 0; + this->rAlphaStep = -this->rAlphaStep; + } else if (this->rEnvColorA > 255) { + this->rEnvColorA = 255; + this->rAlphaStep = -this->rAlphaStep; + } + + this->rYaw += this->rRotSpeed; +} + +void func_809AACAC(GlobalContext* globalCtx, u32 index, EffectSs* this) { + this->velocity.x *= 0.95f; + this->velocity.z *= 0.95f; + this->accel.x = Math_Rand_CenteredFloat(0.2f); + this->accel.z = Math_Rand_CenteredFloat(0.2f); + this->rEnvColorA += this->rAlphaStep; + + if (this->rEnvColorA < 0) { + this->rEnvColorA = 0; + this->rAlphaStep = -this->rAlphaStep; + } else if (this->rEnvColorA > 255) { + this->rEnvColorA = 255; + this->rAlphaStep = -this->rAlphaStep; + } + + this->rYaw += this->rRotSpeed; +} + +void func_809AAD6C(GlobalContext* globalCtx, u32 index, EffectSs* this) { + this->rScale = this->rEnvColorA * Math_Sins((32768.0f / this->rLifespan) * this->life); +} diff --git a/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.h b/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.h index 9ee7283988..a8fe4c24d2 100644 --- a/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.h +++ b/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.h @@ -8,6 +8,14 @@ typedef struct { /* 0x00 */ Vec3f pos; /* 0x0C */ Vec3f velocity; /* 0x18 */ Vec3f accel; -} EffectSsKiraKiraInitParams; // size = 0x + /* 0x24 */ Color_RGBA8 primColor; + /* 0x28 */ Color_RGBA8 envColor; + /* 0x2C */ s16 alphaStep; + /* 0x2E */ s16 scale; + /* 0x30 */ s32 life; + /* 0x34 */ s16 rotSpeed; + /* 0x36 */ s16 yaw; + /* 0x38 */ u8 updateMode; +} EffectSsKiraKiraInitParams; // size = 0x3C #endif diff --git a/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c b/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c index 6945ebac8d..573857d672 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c +++ b/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c @@ -1,42 +1,144 @@ /* * File: z_eff_ss_lightning.c * Overlay: ovl_Effect_Ss_Lightning - * Description: + * Description: Lightning */ #include "z_eff_ss_lightning.h" -typedef enum { - /* 0x00 */ SS_LIGHTNING_0, - /* 0x01 */ SS_LIGHTNING_1, - /* 0x02 */ SS_LIGHTNING_2, - /* 0x03 */ SS_LIGHTNING_3, - /* 0x04 */ SS_LIGHTNING_4, - /* 0x05 */ SS_LIGHTNING_5, - /* 0x06 */ SS_LIGHTNING_6, - /* 0x07 */ SS_LIGHTNING_7, - /* 0x08 */ SS_LIGHTNING_8, - /* 0x09 */ SS_LIGHTNING_9, - /* 0x0A */ SS_LIGHTNING_A, - /* 0x0B */ SS_LIGHTNING_B, - /* 0x0C */ SS_LIGHTNING_C, -} EffectSsLightningRegs; +#define rPrimColorR regs[0] +#define rPrimColorG regs[1] +#define rPrimColorB regs[2] +#define rPrimColorA regs[3] +#define rEnvColorR regs[4] +#define rEnvColorG regs[5] +#define rEnvColorB regs[6] +#define rEnvColorA regs[7] +#define rNumBolts regs[8] +#define rScale regs[9] +#define rYaw regs[10] +#define rLifespan regs[11] u32 EffectSsLightning_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); void EffectSsLightning_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); void EffectSsLightning_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); -/* EffectSsInit Effect_Ss_Lightning_InitVars = { EFFECT_SS_LIGHTNING, EffectSsLightning_Init, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/EffectSsLightning_Init.s") +extern Gfx D_0402CF30[]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AAFD4.s") +u32 EffectSsLightning_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) { + EffectSsLightningInitParams* initParams = (EffectSsLightningInitParams*)initParamsx; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AB078.s") + this->pos = initParams->pos; + this->gfx = SEGMENTED_TO_VIRTUAL(D_0402CF30); + this->life = initParams->life; + this->draw = EffectSsLightning_Draw; + this->update = EffectSsLightning_Update; + this->rPrimColorR = initParams->primColor.r; + this->rPrimColorG = initParams->primColor.g; + this->rPrimColorB = initParams->primColor.b; + this->rPrimColorA = initParams->primColor.a; + this->rEnvColorR = initParams->envColor.r; + this->rEnvColorG = initParams->envColor.g; + this->rEnvColorB = initParams->envColor.b; + this->rEnvColorA = initParams->envColor.a; + this->rNumBolts = initParams->numBolts; + this->rScale = initParams->scale; + this->rYaw = initParams->yaw; + this->rLifespan = initParams->life; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AB338.s") + return 1; +} + +void EffectSsLightning_NewLightning(GlobalContext* globalCtx, Vec3f* pos, s16 yaw, EffectSs* this) { + EffectSs newLightning; + + EffectSs_Delete(&newLightning); + newLightning = *this; + newLightning.pos = *pos; + newLightning.rNumBolts--; + newLightning.rYaw = yaw; + newLightning.life = newLightning.rLifespan; + + EffectSs_Insert(globalCtx, &newLightning); +} + +static void* sTextures[] = { + 0x04029F30, 0x0402A530, 0x0402AB30, 0x0402B130, 0x0402B730, 0x0402BD30, 0x0402C330, 0x0402C930, +}; + +void EffectSsLightning_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + MtxF mfResult; + MtxF mfTrans; + MtxF mfScale; + MtxF mfRotate; + MtxF mfTrans11DA0; + MtxF mfTrans11DA0Rotate; + Mtx* mtx; + f32 yScale; + s16 texIdx; + f32 xzScale; + + OPEN_DISPS(gfxCtx, "../z_eff_ss_lightning.c", 233); + + yScale = this->rScale * 0.01f; + texIdx = this->rLifespan - this->life; + + if (texIdx > 7) { + texIdx = 7; + } + + SkinMatrix_SetTranslate(&mfTrans, this->pos.x, this->pos.y, this->pos.z); + xzScale = yScale * 0.6f; + SkinMatrix_SetScale(&mfScale, xzScale, yScale, xzScale); + SkinMatrix_SetRotateRPY(&mfRotate, this->vec.x, this->vec.y, this->rYaw); + SkinMatrix_MtxFMtxFMult(&mfTrans, &globalCtx->mf_11DA0, &mfTrans11DA0); + SkinMatrix_MtxFMtxFMult(&mfTrans11DA0, &mfRotate, &mfTrans11DA0Rotate); + SkinMatrix_MtxFMtxFMult(&mfTrans11DA0Rotate, &mfScale, &mfResult); + + gSPMatrix(oGfxCtx->polyXlu.p++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + + mtx = SkinMatrix_MtxFToNewMtx(gfxCtx, &mfResult); + + if (mtx != NULL) { + gSPMatrix(oGfxCtx->polyXlu.p++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + func_80094C50(gfxCtx); + gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(sTextures[texIdx])); + gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, + this->rPrimColorA); + gDPSetEnvColor(oGfxCtx->polyXlu.p++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, this->rEnvColorA); + gSPDisplayList(oGfxCtx->polyXlu.p++, this->gfx); + } + + CLOSE_DISPS(gfxCtx, "../z_eff_ss_lightning.c", 281); +} + +void EffectSsLightning_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { + s32 pad; + Vec3f pos; + s16 yaw; + f32 scale; + + if ((this->rNumBolts != 0) && ((this->life + 1) == this->rLifespan)) { + + yaw = this->rYaw + (((Math_Rand_ZeroOne() < 0.5f) ? -1 : 1) * ((s16)((Math_Rand_ZeroOne() * 3640.0f)) + 0xE38)); + + scale = (this->rScale * 0.01f) * 80.0f; + pos.y = this->pos.y + (Math_Sins(this->rYaw - 0x4000) * scale); + + scale = Math_Coss(this->rYaw - 0x4000) * scale; + pos.x = this->pos.x - (Math_Coss(func_8005A948(ACTIVE_CAM)) * scale); + pos.z = this->pos.z + (Math_Sins(func_8005A948(ACTIVE_CAM)) * scale); + + EffectSsLightning_NewLightning(globalCtx, &pos, yaw, this); + + if (Math_Rand_ZeroOne() < 0.1f) { + EffectSsLightning_NewLightning(globalCtx, &pos, (this->rYaw * 2) - yaw, this); + } + } +} diff --git a/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.h b/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.h index 22b5e6c9e2..6732075053 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.h +++ b/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.h @@ -6,8 +6,12 @@ typedef struct { /* 0x00 */ Vec3f pos; - /* 0x0C */ Vec3f velocity; - /* 0x18 */ Vec3f accel; -} EffectSsLightningInitParams; // size = 0x + /* 0x0C */ Color_RGBA8 primColor; + /* 0x10 */ Color_RGBA8 envColor; + /* 0x14 */ s16 scale; + /* 0x16 */ s16 yaw; + /* 0x18 */ s16 life; + /* 0x1A */ s16 numBolts; +} EffectSsLightningInitParams; // size = 0x1C #endif diff --git a/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c b/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c index 2dfe3b2b9e..e9370732ec 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c +++ b/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c @@ -1,40 +1,124 @@ /* * File: z_eff_ss_sibuki.c * Overlay: ovl_Effect_Ss_Sibuki - * Description: + * Description: Bubbles (only used by gohma and gohmalings in the original game) */ #include "z_eff_ss_sibuki.h" -typedef enum { - /* 0x00 */ SS_SIBUKI_0, - /* 0x01 */ SS_SIBUKI_1, - /* 0x02 */ SS_SIBUKI_2, - /* 0x03 */ SS_SIBUKI_3, - /* 0x04 */ SS_SIBUKI_4, - /* 0x05 */ SS_SIBUKI_5, - /* 0x06 */ SS_SIBUKI_6, - /* 0x07 */ SS_SIBUKI_7, - /* 0x08 */ SS_SIBUKI_8, - /* 0x09 */ SS_SIBUKI_9, - /* 0x0A */ SS_SIBUKI_A, - /* 0x0B */ SS_SIBUKI_B, - /* 0x0C */ SS_SIBUKI_C, -} EffectSsSibukiRegs; +#define rPrimColorR regs[0] +#define rPrimColorG regs[1] +#define rPrimColorB regs[2] +#define rPrimColorA regs[3] +#define rEnvColorR regs[4] +#define rEnvColorG regs[5] +#define rEnvColorB regs[6] +#define rEnvColorA regs[7] +#define rMoveDelay regs[8] +#define rDirection regs[9] +#define rScale regs[10] u32 EffectSsSibuki_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); void EffectSsSibuki_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); void EffectSsSibuki_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); -/* EffectSsInit Effect_Ss_Sibuki_InitVars = { EFFECT_SS_SIBUKI, EffectSsSibuki_Init, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/EffectSsSibuki_Init.s") +extern void* D_04055EB0; +extern void* D_04055DB0; +extern Gfx D_0401A160[]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB7EC.s") +u32 EffectSsSibuki_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) { + EffectSsSibukiInitParams* initParams = (EffectSsSibukiInitParams*)initParamsx; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB9DC.s") + this->pos = initParams->pos; + this->velocity = initParams->velocity; + this->accel = initParams->accel; + + if (KREG(2) != 0) { + this->gfx = SEGMENTED_TO_VIRTUAL(&D_04055EB0); + } else { + this->gfx = SEGMENTED_TO_VIRTUAL(&D_04055DB0); + } + + this->life = ((s16)((Math_Rand_ZeroOne() * (500.0f + KREG(64))) * 0.01f)) + KREG(65) + 10; + this->rMoveDelay = initParams->moveDelay + 1; + this->draw = EffectSsSibuki_Draw; + this->update = EffectSsSibuki_Update; + this->rDirection = initParams->direction; + this->rScale = initParams->scale; + this->rPrimColorR = 100; + this->rPrimColorG = 100; + this->rPrimColorB = 100; + this->rPrimColorA = 100; + this->rEnvColorR = 255; + this->rEnvColorG = 255; + this->rEnvColorB = 255; + this->rEnvColorA = 255; + + return 1; +} + +void EffectSsSibuki_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + f32 scale = this->rScale / 100.0f; + + OPEN_DISPS(gfxCtx, "../z_eff_ss_sibuki.c", 163); + + Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW); + Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); + gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(gfxCtx, "../z_eff_ss_sibuki.c", 176), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + func_80093D18(gfxCtx); + gDPSetPrimColor(oGfxCtx->polyOpa.p++, 0, 0, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, + this->rPrimColorA); + gDPSetEnvColor(oGfxCtx->polyOpa.p++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, this->rEnvColorA); + gSPSegment(oGfxCtx->polyOpa.p++, 0x08, this->gfx); + gSPDisplayList(oGfxCtx->polyOpa.p++, SEGMENTED_TO_VIRTUAL(D_0401A160)); + + CLOSE_DISPS(gfxCtx, "../z_eff_ss_sibuki.c", 198); +} + +void EffectSsSibuki_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { + s32 pad[3]; + f32 xzVelScale; + s16 yaw; + Player* player = PLAYER; + + if (this->pos.y <= player->actor.groundY) { + this->life = 0; + } + + if (this->rMoveDelay != 0) { + this->rMoveDelay--; + + if (this->rMoveDelay == 0) { + yaw = func_8005A948(Gameplay_GetCamera(globalCtx, 0)); + xzVelScale = ((200.0f + KREG(20)) * 0.01f) + ((0.1f * Math_Rand_ZeroOne()) * (KREG(23) + 20.0f)); + + if (this->rDirection != 0) { + xzVelScale *= -1.0f; + } + + this->velocity.x = Math_Coss(yaw) * xzVelScale; + this->velocity.z = -Math_Sins(yaw) * xzVelScale; + + this->velocity.y = ((700.0f + KREG(21)) * 0.01f) + ((0.1f * Math_Rand_ZeroOne()) * (KREG(24) + 20.0f)); + this->accel.y = ((-100.0f + KREG(22)) * 0.01f) + ((0.1f * Math_Rand_ZeroOne()) * KREG(25)); + + if (KREG(3) != 0) { + this->velocity.x *= (KREG(3) * 0.01f); + this->velocity.y *= (KREG(3) * 0.01f); + this->velocity.z *= (KREG(3) * 0.01f); + this->accel.y *= (KREG(4) * 0.01f); + } + } + } else { + if (this->rScale != 0) { + this->rScale = (this->rScale - KREG(26)) - 3; + } + } +} diff --git a/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.h b/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.h index 4778c010cf..d95736a3ae 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.h +++ b/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.h @@ -8,6 +8,9 @@ typedef struct { /* 0x00 */ Vec3f pos; /* 0x0C */ Vec3f velocity; /* 0x18 */ Vec3f accel; -} EffectSsSibukiInitParams; // size = 0x + /* 0x24 */ s16 moveDelay; + /* 0x26 */ s16 direction; + /* 0x28 */ s16 scale; +} EffectSsSibukiInitParams; // size = 0x2C #endif diff --git a/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c b/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c index 1ad49398a2..a3bba3b6af 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c +++ b/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c @@ -1,40 +1,82 @@ /* * File: z_eff_ss_sibuki2.c * Overlay: ovl_Effect_Ss_Sibuki2 - * Description: + * Description: Unfinished and unused bubble effect */ #include "z_eff_ss_sibuki2.h" -typedef enum { - /* 0x00 */ SS_SIBUKI2_0, - /* 0x01 */ SS_SIBUKI2_1, - /* 0x02 */ SS_SIBUKI2_2, - /* 0x03 */ SS_SIBUKI2_3, - /* 0x04 */ SS_SIBUKI2_4, - /* 0x05 */ SS_SIBUKI2_5, - /* 0x06 */ SS_SIBUKI2_6, - /* 0x07 */ SS_SIBUKI2_7, - /* 0x08 */ SS_SIBUKI2_8, - /* 0x09 */ SS_SIBUKI2_9, - /* 0x0A */ SS_SIBUKI2_A, - /* 0x0B */ SS_SIBUKI2_B, - /* 0x0C */ SS_SIBUKI2_C, -} EffectSsSibuki2Regs; +#define rPrimColorR regs[0] +#define rPrimColorG regs[1] +#define rPrimColorB regs[2] +#define rPrimColorA regs[3] +#define rEnvColorR regs[4] +#define rEnvColorG regs[5] +#define rEnvColorB regs[6] +#define rEnvColorA regs[7] +#define rTexIdx regs[8] +#define rScale regs[9] u32 EffectSsSibuki2_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); void EffectSsSibuki2_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); void EffectSsSibuki2_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); -/* EffectSsInit Effect_Ss_Sibuki2_InitVars = { EFFECT_SS_SIBUKI2, EffectSsSibuki2_Init, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki2/EffectSsSibuki2_Init.s") +extern Gfx D_0401E2C0[]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki2/func_809ABE0C.s") +u32 EffectSsSibuki2_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) { + EffectSsSibuki2InitParams* initParams = (EffectSsSibuki2InitParams*)initParamsx; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki2/func_809AC030.s") + this->pos = initParams->pos; + this->velocity = initParams->velocity; + this->accel = initParams->accel; + this->life = 10; + this->draw = EffectSsSibuki2_Draw; + this->update = EffectSsSibuki2_Update; + this->rScale = initParams->scale; + this->rPrimColorR = 255; + this->rPrimColorG = 255; + this->rPrimColorB = 255; + this->rPrimColorA = 255; + this->rEnvColorR = 100; + this->rEnvColorG = 100; + this->rEnvColorB = 100; + this->rEnvColorA = 255; + this->rTexIdx = 0; + + return 1; +} + +static void* sTextures[] = { + 0x0401C2C0, 0x0401C2C0, 0x0401C6C0, 0x0401CAC0, 0x0401CEC0, 0x0401D2C0, 0x0401D6C0, 0x0401DAC0, 0x0401DEC0, +}; + +void EffectSsSibuki2_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + f32 scale = this->rScale / 100.0f; + + OPEN_DISPS(gfxCtx, "../z_eff_ss_sibuki2.c", 158); + + Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW); + Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); + gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(gfxCtx, "../z_eff_ss_sibuki2.c", 171), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + func_80093D18(gfxCtx); + gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, + this->rPrimColorA); + gDPSetEnvColor(oGfxCtx->polyXlu.p++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, this->rEnvColorA); + gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(sTextures[this->rTexIdx])); + gSPDisplayList(oGfxCtx->polyXlu.p++, SEGMENTED_TO_VIRTUAL(D_0401E2C0)); + + CLOSE_DISPS(gfxCtx, "../z_eff_ss_sibuki2.c", 198); +} + +void EffectSsSibuki2_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { + if (this->rTexIdx < 8) { + this->rTexIdx++; + } +} diff --git a/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.h b/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.h index 0df7d93f64..f35c531048 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.h +++ b/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.h @@ -8,6 +8,7 @@ typedef struct { /* 0x00 */ Vec3f pos; /* 0x0C */ Vec3f velocity; /* 0x18 */ Vec3f accel; -} EffectSsSibuki2InitParams; // size = 0x + /* 0x24 */ s16 scale; +} EffectSsSibuki2InitParams; // size = 0x28 #endif diff --git a/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c b/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c index fd309b7339..53b54bb692 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c +++ b/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c @@ -6,6 +6,8 @@ #include "z_eff_ss_solder_srch_ball.h" +#define rUnused regs[1] + u32 EffectSsSolderSrchBall_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); void EffectSsSolderSrchBall_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); @@ -22,8 +24,8 @@ u32 EffectSsSolderSrchBall_Init(GlobalContext* globalCtx, u32 index, EffectSs* t this->accel = initParams->accel; this->update = EffectSsSolderSrchBall_Update; this->life = 100; - this->regs[1] = initParams->unk_24; - this->unk_3C = initParams->linkDetected; + this->rUnused = initParams->unused; + this->actor = initParams->linkDetected; // actor field was incorrectly used as a pointer to something else return 1; } @@ -35,7 +37,7 @@ void EffectSsSolderSrchBall_Update(GlobalContext* globalCtx, u32 index, EffectSs s16* linkDetected; Player* player = PLAYER; - linkDetected = this->unk_3C; + linkDetected = this->actor; playerPosDiffX = player->actor.posRot.pos.x - this->pos.x; playerPosDiffY = player->actor.posRot.pos.y - this->pos.y; diff --git a/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h b/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h index aba123fefa..5e8ba8ecd7 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h +++ b/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h @@ -8,7 +8,7 @@ typedef struct { /* 0x00 */ Vec3f pos; /* 0x0C */ Vec3f velocity; /* 0x18 */ Vec3f accel; - /* 0x24 */ s16 unk_24; + /* 0x24 */ s16 unused; /* 0x28 */ s16* linkDetected; } EffectSsSolderSrchBallInitParams; diff --git a/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c b/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c index 17bcdd4a8b..137768b36f 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c +++ b/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c @@ -1,40 +1,76 @@ /* * File: z_eff_ss_stick.c * Overlay: ovl_Effect_Ss_Stick - * Description: + * Description: Broken stick as child, broken sword as adult */ #include "z_eff_ss_stick.h" -typedef enum { - /* 0x00 */ SS_STICK_0, - /* 0x01 */ SS_STICK_1, - /* 0x02 */ SS_STICK_2, - /* 0x03 */ SS_STICK_3, - /* 0x04 */ SS_STICK_4, - /* 0x05 */ SS_STICK_5, - /* 0x06 */ SS_STICK_6, - /* 0x07 */ SS_STICK_7, - /* 0x08 */ SS_STICK_8, - /* 0x09 */ SS_STICK_9, - /* 0x0A */ SS_STICK_A, - /* 0x0B */ SS_STICK_B, - /* 0x0C */ SS_STICK_C, -} EffectSsStickRegs; +#define rObjBankIdx regs[0] +#define rYaw regs[1] u32 EffectSsStick_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); void EffectSsStick_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); void EffectSsStick_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); -/* EffectSsInit Effect_Ss_Stick_InitVars = { EFFECT_SS_STICK, EffectSsStick_Init, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/EffectSsStick_Init.s") +typedef struct { + /* 0x00 */ s16 objectID; + /* 0x04 */ Gfx* displayList; +} StickDrawInfo; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC42C.s") +u32 EffectSsStick_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) { + StickDrawInfo drawInfo[] = { + { OBJECT_LINK_BOY, 0x0602BA38 }, // adult, broken sword + { OBJECT_LINK_CHILD, 0x06006CC0 }, // child, broken stick + }; + StickDrawInfo* ageInfoEntry = gSaveContext.linkAge + drawInfo; + EffectSsStickInitParams* initParams = (EffectSsStickInitParams*)initParamsx; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC604.s") + this->rObjBankIdx = Object_GetIndex(&globalCtx->objectCtx, ageInfoEntry->objectID); + this->gfx = ageInfoEntry->displayList; + this->vec = this->pos = initParams->pos; + this->rYaw = initParams->yaw; + this->velocity.x = Math_Sins(initParams->yaw) * 6.0f; + this->velocity.z = Math_Coss(initParams->yaw) * 6.0f; + this->life = 20; + this->draw = EffectSsStick_Draw; + this->update = EffectSsStick_Update; + this->velocity.y = 26.0f; + this->accel.y = -4.0f; + + return 1; +} + +void EffectSsStick_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + s32 pad; + + OPEN_DISPS(gfxCtx, "../z_eff_ss_stick.c", 153); + + Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW); + + if (LINK_IS_CHILD) { + Matrix_Scale(0.01f, 0.0025f, 0.01f, MTXMODE_APPLY); + Matrix_RotateRPY(0, this->rYaw, 0, MTXMODE_APPLY); + } else { + Matrix_Scale(0.01f, 0.01f, 0.01f, MTXMODE_APPLY); + Matrix_RotateRPY(0, this->rYaw, globalCtx->state.frames * 10000, MTXMODE_APPLY); + } + + gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(gfxCtx, "../z_eff_ss_stick.c", 176), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + func_80093D18(gfxCtx); + gSPSegment(oGfxCtx->polyOpa.p++, 0x06, globalCtx->objectCtx.status[this->rObjBankIdx].segment); + gSPSegment(oGfxCtx->polyOpa.p++, 0x0C, gCullBackDList); + gSPDisplayList(oGfxCtx->polyOpa.p++, this->gfx); + + CLOSE_DISPS(gfxCtx, "../z_eff_ss_stick.c", 188); +} + +void EffectSsStick_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { +} diff --git a/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.h b/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.h index 52a5726b89..0e2b88dcd7 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.h +++ b/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.h @@ -6,8 +6,7 @@ typedef struct { /* 0x00 */ Vec3f pos; - /* 0x0C */ Vec3f velocity; - /* 0x18 */ Vec3f accel; -} EffectSsStickInitParams; // size = 0x + /* 0x0C */ s16 yaw; +} EffectSsStickInitParams; // size = 0x10 #endif diff --git a/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c b/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c index fed1e60e49..91d9c491b9 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c +++ b/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c @@ -6,35 +6,77 @@ #include "z_eff_ss_stone1.h" -typedef enum { - /* 0x00 */ SS_STONE1_0, - /* 0x01 */ SS_STONE1_1, - /* 0x02 */ SS_STONE1_2, - /* 0x03 */ SS_STONE1_3, - /* 0x04 */ SS_STONE1_4, - /* 0x05 */ SS_STONE1_5, - /* 0x06 */ SS_STONE1_6, - /* 0x07 */ SS_STONE1_7, - /* 0x08 */ SS_STONE1_8, - /* 0x09 */ SS_STONE1_9, - /* 0x0A */ SS_STONE1_A, - /* 0x0B */ SS_STONE1_B, - /* 0x0C */ SS_STONE1_C, -} EffectSsStone1Regs; +#define rReg0 regs[0] u32 EffectSsStone1_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx); void EffectSsStone1_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this); void EffectSsStone1_Update(GlobalContext* globalCtx, u32 index, EffectSs* this); -/* EffectSsInit Effect_Ss_Stone1_InitVars = { EFFECT_SS_STONE1, EffectSsStone1_Init, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/EffectSsStone1_Init.s") +typedef struct { + /* 0x00 */ void* texture; + /* 0x04 */ Color_RGBA8 primColor; + /* 0x08 */ Color_RGBA8 envColor; +} EffStoneDrawInfo; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/func_809AC78C.s") +static EffStoneDrawInfo sDrawInfo[] = { + { 0x04029A90, { 200, 0, 0, 255 }, { 0, 0, 0, 255 } }, + { 0x04029690, { 255, 100, 0, 255 }, { 100, 0, 0, 255 } }, + { 0x04029290, { 255, 200, 0, 255 }, { 200, 0, 0, 255 } }, + { 0x04028E90, { 255, 255, 0, 255 }, { 255, 0, 0, 255 } }, + { 0x04028A90, { 255, 255, 150, 255 }, { 255, 150, 0, 255 } }, + { 0x04028690, { 255, 255, 255, 255 }, { 255, 255, 0, 255 } }, + { 0x04028290, { 255, 255, 255, 255 }, { 0, 255, 0, 255 } }, + { 0x04027E90, { 255, 255, 255, 255 }, { 0, 255, 255, 255 } }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/func_809AC9C0.s") +extern Gfx D_04029E90[]; + +u32 EffectSsStone1_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) { + EffectSsStone1InitParams* initParams = (EffectSsStone1InitParams*)initParamsx; + Vec3f pos = initParams->pos; + + this->pos = pos; + this->vec = pos; + this->life = 8; + this->rReg0 = initParams->unk_C; + this->draw = EffectSsStone1_Draw; + this->update = EffectSsStone1_Update; + + return 1; +} + +void EffectSsStone1_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + EffStoneDrawInfo* drawParams = &sDrawInfo[this->life]; + Vec3f mfVec; + f32 mfW; + f32 scale; + + OPEN_DISPS(gfxCtx, "../z_eff_ss_stone1.c", 154); + + SkinMatrix_Vec3fMtxFMultXYZW(&globalCtx->mf_11D60, &this->pos, &mfVec, &mfW); + scale = (mfW < 1500.0f) ? 3.0f : (mfW / 1500.0f) * 3.0f; + Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW); + Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); + gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(gfxCtx, "../z_eff_ss_stone1.c", 168), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + func_80094C50(gfxCtx); + gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(drawParams->texture)); + gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, drawParams->primColor.r, drawParams->primColor.g, + drawParams->primColor.b, 255); + gDPSetEnvColor(oGfxCtx->polyXlu.p++, drawParams->envColor.r, drawParams->envColor.g, drawParams->envColor.b, 255); + gSPDisplayList(oGfxCtx->polyXlu.p++, D_04029E90); + + CLOSE_DISPS(gfxCtx, "../z_eff_ss_stone1.c", 183); +} + +void EffectSsStone1_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { + if ((this->life == 6) && (this->rReg0 != 0)) { + iREG(50) = 0; + } +} diff --git a/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h b/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h index e14927a931..12933eab7b 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h +++ b/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h @@ -6,8 +6,7 @@ typedef struct { /* 0x00 */ Vec3f pos; - /* 0x0C */ Vec3f velocity; - /* 0x18 */ Vec3f accel; + /* 0x00 */ s32 unk_C; } EffectSsStone1InitParams; // size = 0x #endif diff --git a/undefined_syms.txt b/undefined_syms.txt index efaf91cb3c..2159cc4deb 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -226,8 +226,10 @@ D_0400CB70 = 0x0400CB70; D_04010130 = 0x04010130; D_04015720 = 0x04015720; D_04015760 = 0x04015760; +D_040184B0 = 0x040184B0; D_0401A0B0 = 0x0401A0B0; D_0401E370 = 0x0401E370; +D_04021770 = 0x04021770; D_0402CF30 = 0x0402CF30; D_04033EE0 = 0x04033EE0; D_04037730 = 0x04037730; @@ -971,6 +973,9 @@ D_06003128 = 0x06003128; D_060042AC = 0x060042AC; D_060059B0 = 0x060059B0; +// z_en_goroiwa +D_0400D340 = 0x0400D340; + // z_en_heishi1 D_06005880 = 0x06005880; D_06005C30 = 0x06005C30; @@ -1016,6 +1021,76 @@ D_0400BF80 = 0x0400BF80; D_0400BFE8 = 0x0400BFE8; D_0400C040 = 0x0400C040; +// z_eff_ss_bubble +D_04055EB0 = 0x04055EB0; +D_04055DB0 = 0x04055DB0; +D_0401A160 = 0x0401A160; + +// z_eff_ss_lightning +D_0402CF30 = 0x0402CF30; + +// z_eff_ss_d_fire +D_060098A0 = 0x060098A0; + +// z_eff_ss_g_magma +D_04024410 = 0x04024410; + +// z_eff_ss_g_fire +D_0401C220 = 0x0401C220; + +// z_eff_ss_g_magma2 +D_06025A90 = 0x06025A90; + +// z_eff_ss_dead_dd +D_01000000 = 0x01000000; + +// z_eff_ss_fire_tail +D_0404D5A0 = 0x0404D5A0; +D_0404D4E0 = 0x0404D4E0; + +// z_eff_ss_stone1 +D_04029E90 = 0x04029E90; + +// z_eff_ss_sibuki +D_04055EB0 = 0x04055EB0; +D_04055DB0 = 0x04055DB0; +D_0401A160 = 0x0401A160; + +// z_eff_ss_sibuki2 +D_0401E2C0 = 0x0401E2C0; + +// z_eff_ss_dt_bubble +D_04055DB0 = 0x04055DB0; +D_04055EB0 = 0x04055EB0; +D_0401A160 = 0x0401A160; + +// z_eff_ss_dead_db +D_04031FE0 = 0x04031FE0; + +// z_eff_ss_dead_ds +D_04037730 = 0x04037730; + +// z_eff_ss_ice_smoke +D_060030A0 = 0x060030A0; +D_06003158 = 0x06003158; + +// z_eff_ss_hahen +D_0400C0D0 = 0x0400C0D0; +D_0400CD80 = 0x0400CD80; + +// z_eff_ss_k_fire +D_0404D4E0 = 0x0404D4E0; + +// z_eff_ss_en_fire +D_0404D5A0 = 0x0404D5A0; +D_0404D4E0 = 0x0404D4E0; + +// z_eff_ss_ice_piece +D_04033720 = 0x04033720; + +// z_eff_ss_en_ice +D_04033818 = 0x04033818; + // z_en_fhg_fire D_0600FAA0 = 0x0600FAA0; D_0600FCF8 = 0x0600FCF8; @@ -1123,6 +1198,14 @@ D_06000498 = 0x06000498; // z_bg_menkuri_eye D_06002D20 = 0x06002D20; +// z_bg_mori_idomizu +D_060049D0 = 0x060049D0; + +// z_bg_mori_hashigo +D_060037D8 = 0x060037D8; +D_060036B0 = 0x060036B0; +D_06004770 = 0x06004770; + // z_bg_mori_bigst D_0600221C = 0x0600221C; D_06001E50 = 0x06001E50; @@ -1130,3 +1213,7 @@ D_06001E50 = 0x06001E50; // z_bg_mori_hashira4 D_06001AF8 = 0x06001AF8; D_060089E0 = 0x060089E0; + +// z_bg_ddan_jd +D_06003CE0 = 0x06003CE0; +D_060037B8 = 0x060037B8;