diff --git a/asm/non_matchings/code/game/GameState_Draw.s b/asm/non_matchings/code/game/GameState_Draw.s deleted file mode 100644 index 096e834b4f..0000000000 --- a/asm/non_matchings/code/game/GameState_Draw.s +++ /dev/null @@ -1,142 +0,0 @@ -.rdata - -glabel D_80144D50 - .asciz "../game.c" - .balign 4 - -glabel D_80144D5C - .asciz "ハイラル滅亡まであと %08x バイト(game_alloc)\n" - # EUC-JP: ハイラル滅亡まであと %08x バイト(game_alloc) | % 08x bytes (game_alloc) remaining until Hailal's demise - .balign 4 - -glabel D_80144D8C - .asciz "../game.c" - .balign 4 - -.text -glabel GameState_Draw -/* B3B88C 800C46EC 27BDFF80 */ addiu $sp, $sp, -0x80 -/* B3B890 800C46F0 AFBF0014 */ sw $ra, 0x14($sp) -/* B3B894 800C46F4 AFA40080 */ sw $a0, 0x80($sp) -/* B3B898 800C46F8 3C068014 */ lui $a2, %hi(D_80144D50) # $a2, 0x8014 -/* B3B89C 800C46FC AFA50084 */ sw $a1, 0x84($sp) -/* B3B8A0 800C4700 24C64D50 */ addiu $a2, %lo(D_80144D50) # addiu $a2, $a2, 0x4d50 -/* B3B8A4 800C4704 27A40064 */ addiu $a0, $sp, 0x64 -/* B3B8A8 800C4708 0C031AB1 */ jal Graph_OpenDisps -/* B3B8AC 800C470C 240702EA */ li $a3, 746 -/* B3B8B0 800C4710 8FAE0084 */ lw $t6, 0x84($sp) -/* B3B8B4 800C4714 8DC402C0 */ lw $a0, 0x2c0($t6) -/* B3B8B8 800C4718 0C031B08 */ jal Graph_GfxPlusOne -/* B3B8BC 800C471C AFA40078 */ sw $a0, 0x78($sp) -/* B3B8C0 800C4720 8FAF0084 */ lw $t7, 0x84($sp) -/* B3B8C4 800C4724 AFA2007C */ sw $v0, 0x7c($sp) -/* B3B8C8 800C4728 3C19DE00 */ lui $t9, 0xde00 -/* B3B8CC 800C472C 8DE302B0 */ lw $v1, 0x2b0($t7) -/* B3B8D0 800C4730 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 -/* B3B8D4 800C4734 24010001 */ li $at, 1 -/* B3B8D8 800C4738 24780008 */ addiu $t8, $v1, 8 -/* B3B8DC 800C473C ADF802B0 */ sw $t8, 0x2b0($t7) -/* B3B8E0 800C4740 AC790000 */ sw $t9, ($v1) -/* B3B8E4 800C4744 8FA8007C */ lw $t0, 0x7c($sp) -/* B3B8E8 800C4748 AC680004 */ sw $t0, 4($v1) -/* B3B8EC 800C474C 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* B3B8F0 800C4750 84490184 */ lh $t1, 0x184($v0) -/* B3B8F4 800C4754 55210006 */ bnel $t1, $at, .L800C4770 -/* B3B8F8 800C4758 8FAA0080 */ lw $t2, 0x80($sp) -/* B3B8FC 800C475C 0C03107C */ jal GameState_SetFBFilter -/* B3B900 800C4760 27A4007C */ addiu $a0, $sp, 0x7c -/* B3B904 800C4764 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 -/* B3B908 800C4768 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* B3B90C 800C476C 8FAA0080 */ lw $t2, 0x80($sp) -.L800C4770: -/* B3B910 800C4770 3C038016 */ lui $v1, %hi(sLastButtonPressed) # $v1, 0x8016 -/* B3B914 800C4774 246365C0 */ addiu $v1, %lo(sLastButtonPressed) # addiu $v1, $v1, 0x65c0 -/* B3B918 800C4778 954B0014 */ lhu $t3, 0x14($t2) -/* B3B91C 800C477C 954C0020 */ lhu $t4, 0x20($t2) -/* B3B920 800C4780 016C6825 */ or $t5, $t3, $t4 -/* B3B924 800C4784 A46D0000 */ sh $t5, ($v1) -/* B3B928 800C4788 844E1032 */ lh $t6, 0x1032($v0) -/* B3B92C 800C478C 31A4FFFF */ andi $a0, $t5, 0xffff -/* B3B930 800C4790 55C00006 */ bnezl $t6, .L800C47AC -/* B3B934 800C4794 8458011C */ lh $t8, 0x11c($v0) -/* B3B938 800C4798 0C031156 */ jal GameState_DrawInputDisplay -/* B3B93C 800C479C 27A5007C */ addiu $a1, $sp, 0x7c -/* B3B940 800C47A0 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 -/* B3B944 800C47A4 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* B3B948 800C47A8 8458011C */ lh $t8, 0x11c($v0) -.L800C47AC: -/* B3B94C 800C47AC 330F0001 */ andi $t7, $t8, 1 -/* B3B950 800C47B0 51E00010 */ beql $t7, $zero, .L800C47F4 -/* B3B954 800C47B4 845900D4 */ lh $t9, 0xd4($v0) -/* B3B958 800C47B8 0C03EEE3 */ jal GfxPrint_Ctor -/* B3B95C 800C47BC 27A4002C */ addiu $a0, $sp, 0x2c -/* B3B960 800C47C0 27A4002C */ addiu $a0, $sp, 0x2c -/* B3B964 800C47C4 0C03EF07 */ jal GfxPrint_Open -/* B3B968 800C47C8 8FA5007C */ lw $a1, 0x7c($sp) -/* B3B96C 800C47CC 0C03BA94 */ jal func_800EEA50 -/* B3B970 800C47D0 27A4002C */ addiu $a0, $sp, 0x2c -/* B3B974 800C47D4 0C03EF19 */ jal GfxPrint_Close -/* B3B978 800C47D8 27A4002C */ addiu $a0, $sp, 0x2c -/* B3B97C 800C47DC AFA2007C */ sw $v0, 0x7c($sp) -/* B3B980 800C47E0 0C03EF05 */ jal GfxPrint_Dtor -/* B3B984 800C47E4 27A4002C */ addiu $a0, $sp, 0x2c -/* B3B988 800C47E8 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 -/* B3B98C 800C47EC 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* B3B990 800C47F0 845900D4 */ lh $t9, 0xd4($v0) -.L800C47F4: -/* B3B994 800C47F4 07230010 */ bgezl $t9, .L800C4838 -/* B3B998 800C47F8 8FA9007C */ lw $t1, 0x7c($sp) -/* B3B99C 800C47FC 0C034F7E */ jal DebugArena_Display -/* B3B9A0 800C4800 00000000 */ nop -/* B3B9A4 800C4804 0C03F616 */ jal SystemArena_Display -/* B3B9A8 800C4808 00000000 */ nop -/* B3B9AC 800C480C 8FA40080 */ lw $a0, 0x80($sp) -/* B3B9B0 800C4810 0C030EE2 */ jal THA_GetSize -/* B3B9B4 800C4814 24840074 */ addiu $a0, $a0, 0x74 -/* B3B9B8 800C4818 3C048014 */ lui $a0, %hi(D_80144D5C) # $a0, 0x8014 -/* B3B9BC 800C481C 24844D5C */ addiu $a0, %lo(D_80144D5C) # addiu $a0, $a0, 0x4d5c -/* B3B9C0 800C4820 0C00084C */ jal osSyncPrintf -/* B3B9C4 800C4824 00402825 */ move $a1, $v0 -/* B3B9C8 800C4828 3C088016 */ lui $t0, %hi(gGameInfo) # $t0, 0x8016 -/* B3B9CC 800C482C 8D08FA90 */ lw $t0, %lo(gGameInfo)($t0) -/* B3B9D0 800C4830 A50000D4 */ sh $zero, 0xd4($t0) -/* B3B9D4 800C4834 8FA9007C */ lw $t1, 0x7c($sp) -.L800C4838: -/* B3B9D8 800C4838 3C0BDF00 */ lui $t3, 0xdf00 -/* B3B9DC 800C483C 252A0008 */ addiu $t2, $t1, 8 -/* B3B9E0 800C4840 AFAA007C */ sw $t2, 0x7c($sp) -/* B3B9E4 800C4844 AD200004 */ sw $zero, 4($t1) -/* B3B9E8 800C4848 AD2B0000 */ sw $t3, ($t1) -/* B3B9EC 800C484C 8FA5007C */ lw $a1, 0x7c($sp) -/* B3B9F0 800C4850 0C031B0A */ jal Graph_BranchDlist -/* B3B9F4 800C4854 8FA40078 */ lw $a0, 0x78($sp) -/* B3B9F8 800C4858 8FAC007C */ lw $t4, 0x7c($sp) -/* B3B9FC 800C485C 8FAD0084 */ lw $t5, 0x84($sp) -/* B3BA00 800C4860 3C068014 */ lui $a2, %hi(D_80144D8C) # $a2, 0x8014 -/* B3BA04 800C4864 24C64D8C */ addiu $a2, %lo(D_80144D8C) # addiu $a2, $a2, 0x4d8c -/* B3BA08 800C4868 ADAC02C0 */ sw $t4, 0x2c0($t5) -/* B3BA0C 800C486C 8FA50084 */ lw $a1, 0x84($sp) -/* B3BA10 800C4870 27A40064 */ addiu $a0, $sp, 0x64 -/* B3BA14 800C4874 0C031AD5 */ jal Graph_CloseDisps -/* B3BA18 800C4878 24070320 */ li $a3, 800 -/* B3BA1C 800C487C 0C018F5F */ jal func_80063D7C -/* B3BA20 800C4880 8FA40084 */ lw $a0, 0x84($sp) -/* B3BA24 800C4884 3C0E8016 */ lui $t6, %hi(gGameInfo) # $t6, 0x8016 -/* B3BA28 800C4888 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* B3BA2C 800C488C 3C048016 */ lui $a0, %hi(D_801664D0) # $a0, 0x8016 -/* B3BA30 800C4890 248464D0 */ addiu $a0, %lo(D_801664D0) # addiu $a0, $a0, 0x64d0 -/* B3BA34 800C4894 85D800D4 */ lh $t8, 0xd4($t6) -/* B3BA38 800C4898 53000009 */ beql $t8, $zero, .L800C48C0 -/* B3BA3C 800C489C 8FBF0014 */ lw $ra, 0x14($sp) -/* B3BA40 800C48A0 0C032671 */ jal SpeedMeter_DrawTimeEntries -/* B3BA44 800C48A4 8FA50084 */ lw $a1, 0x84($sp) -/* B3BA48 800C48A8 3C048016 */ lui $a0, %hi(D_801664D0) # $a0, 0x8016 -/* B3BA4C 800C48AC 248464D0 */ addiu $a0, %lo(D_801664D0) # addiu $a0, $a0, 0x64d0 -/* B3BA50 800C48B0 8FA50084 */ lw $a1, 0x84($sp) -/* B3BA54 800C48B4 0C032841 */ jal SpeedMeter_DrawAllocEntries -/* B3BA58 800C48B8 8FA60080 */ lw $a2, 0x80($sp) -/* B3BA5C 800C48BC 8FBF0014 */ lw $ra, 0x14($sp) -.L800C48C0: -/* B3BA60 800C48C0 27BD0080 */ addiu $sp, $sp, 0x80 -/* B3BA64 800C48C4 03E00008 */ jr $ra -/* B3BA68 800C48C8 00000000 */ nop diff --git a/asm/non_matchings/code/z_eff_blure/func_800214D0.s b/asm/non_matchings/code/z_eff_blure/EffectBlure_DrawElemHermiteInterpolation.s similarity index 99% rename from asm/non_matchings/code/z_eff_blure/func_800214D0.s rename to asm/non_matchings/code/z_eff_blure/EffectBlure_DrawElemHermiteInterpolation.s index c8d2e0c464..68afd2c37b 100644 --- a/asm/non_matchings/code/z_eff_blure/func_800214D0.s +++ b/asm/non_matchings/code/z_eff_blure/EffectBlure_DrawElemHermiteInterpolation.s @@ -29,7 +29,7 @@ glabel D_801352B8 .balign 4 .text -glabel func_800214D0 +glabel EffectBlure_DrawElemHermiteInterpolation /* A98670 800214D0 27BDFE08 */ addiu $sp, $sp, -0x1f8 /* A98674 800214D4 AFB40060 */ sw $s4, 0x60($sp) /* A98678 800214D8 00A0A025 */ move $s4, $a1 @@ -79,7 +79,7 @@ glabel func_800214D0 /* A98724 80021584 02403825 */ move $a3, $s2 /* A98728 80021588 AFB30010 */ sw $s3, 0x10($sp) /* A9872C 8002158C 44060000 */ mfc1 $a2, $f0 -/* A98730 80021590 0C008294 */ jal func_80020A50 +/* A98730 80021590 0C008294 */ jal EffectBlure_GetComputedValues /* A98734 80021594 00000000 */ nop /* A98738 80021598 27A401CC */ addiu $a0, $sp, 0x1cc /* A9873C 8002159C 0C01DF97 */ jal Math_Vec3s_ToVec3f @@ -110,7 +110,7 @@ glabel func_800214D0 /* A9879C 800215FC AFB30010 */ sw $s3, 0x10($sp) /* A987A0 80021600 24A50001 */ addiu $a1, $a1, 1 /* A987A4 80021604 44060000 */ mfc1 $a2, $f0 -/* A987A8 80021608 0C008294 */ jal func_80020A50 +/* A987A8 80021608 0C008294 */ jal EffectBlure_GetComputedValues /* A987AC 8002160C 00000000 */ nop /* A987B0 80021610 27A4018C */ addiu $a0, $sp, 0x18c /* A987B4 80021614 0C01DF97 */ jal Math_Vec3s_ToVec3f @@ -166,7 +166,7 @@ glabel func_800214D0 /* A98870 800216D0 02403825 */ move $a3, $s2 /* A98874 800216D4 AFB30010 */ sw $s3, 0x10($sp) /* A98878 800216D8 44060000 */ mfc1 $a2, $f0 -/* A9887C 800216DC 0C008294 */ jal func_80020A50 +/* A9887C 800216DC 0C008294 */ jal EffectBlure_GetComputedValues /* A98880 800216E0 00000000 */ nop /* A98884 800216E4 27B00118 */ addiu $s0, $sp, 0x118 /* A98888 800216E8 02002025 */ move $a0, $s0 @@ -246,7 +246,7 @@ glabel func_800214D0 /* A989A0 80021800 02403825 */ move $a3, $s2 /* A989A4 80021804 AFB30010 */ sw $s3, 0x10($sp) /* A989A8 80021808 44060000 */ mfc1 $a2, $f0 -/* A989AC 8002180C 0C008294 */ jal func_80020A50 +/* A989AC 8002180C 0C008294 */ jal EffectBlure_GetComputedValues /* A989B0 80021810 00000000 */ nop /* A989B4 80021814 27B00100 */ addiu $s0, $sp, 0x100 /* A989B8 80021818 02002025 */ move $a0, $s0 diff --git a/asm/non_matchings/code/z_eff_blure/EffectBlure_DrawSimple.s b/asm/non_matchings/code/z_eff_blure/EffectBlure_DrawSimple.s new file mode 100644 index 0000000000..2b04d6321d --- /dev/null +++ b/asm/non_matchings/code/z_eff_blure/EffectBlure_DrawSimple.s @@ -0,0 +1,345 @@ +.rdata +glabel D_801353B8 + .asciz "ブラ─表示:頂点確保できず。強制終了\n" + # EUC-JP: ブラ─表示:頂点確保できず。強制終了 | Blure display: Vertex cannot be secured. forced termination + .balign 4 + +.text +glabel EffectBlure_DrawSimple +/* A99BB0 80022A10 27BDFF68 */ addiu $sp, $sp, -0x98 +/* A99BB4 80022A14 AFBF004C */ sw $ra, 0x4c($sp) +/* A99BB8 80022A18 AFBE0048 */ sw $fp, 0x48($sp) +/* A99BBC 80022A1C AFB70044 */ sw $s7, 0x44($sp) +/* A99BC0 80022A20 AFB60040 */ sw $s6, 0x40($sp) +/* A99BC4 80022A24 AFB5003C */ sw $s5, 0x3c($sp) +/* A99BC8 80022A28 AFB40038 */ sw $s4, 0x38($sp) +/* A99BCC 80022A2C AFB30034 */ sw $s3, 0x34($sp) +/* A99BD0 80022A30 AFB20030 */ sw $s2, 0x30($sp) +/* A99BD4 80022A34 AFB1002C */ sw $s1, 0x2c($sp) +/* A99BD8 80022A38 AFB00028 */ sw $s0, 0x28($sp) +/* A99BDC 80022A3C AFA5009C */ sw $a1, 0x9c($sp) +/* A99BE0 80022A40 9082019E */ lbu $v0, 0x19e($a0) +/* A99BE4 80022A44 0080A025 */ move $s4, $a0 +/* A99BE8 80022A48 0080B025 */ move $s6, $a0 +/* A99BEC 80022A4C 28410002 */ slti $at, $v0, 2 +/* A99BF0 80022A50 14200127 */ bnez $at, .L80022EF0 +/* A99BF4 80022A54 0002B880 */ sll $s7, $v0, 2 +/* A99BF8 80022A58 00A02025 */ move $a0, $a1 +/* A99BFC 80022A5C 0C031A73 */ jal Graph_Alloc +/* A99C00 80022A60 00172900 */ sll $a1, $s7, 4 +/* A99C04 80022A64 14400006 */ bnez $v0, .L80022A80 +/* A99C08 80022A68 0040A825 */ move $s5, $v0 +/* A99C0C 80022A6C 3C048013 */ lui $a0, %hi(D_801353B8) # $a0, 0x8013 +/* A99C10 80022A70 0C00084C */ jal osSyncPrintf +/* A99C14 80022A74 248453B8 */ addiu $a0, %lo(D_801353B8) # addiu $a0, $a0, 0x53b8 +/* A99C18 80022A78 1000011E */ b .L80022EF4 +/* A99C1C 80022A7C 8FBF004C */ lw $ra, 0x4c($sp) +.L80022A80: +/* A99C20 80022A80 3C0E8011 */ lui $t6, %hi(D_8011578C) # $t6, 0x8011 +/* A99C24 80022A84 25CE578C */ addiu $t6, %lo(D_8011578C) # addiu $t6, $t6, 0x578c +/* A99C28 80022A88 89D80000 */ lwl $t8, ($t6) +/* A99C2C 80022A8C 99D80003 */ lwr $t8, 3($t6) +/* A99C30 80022A90 3C198011 */ lui $t9, %hi(D_8011578C+0x10) # $t9, 0x8011 +/* A99C34 80022A94 2739579C */ addiu $t9, %lo(D_8011578C+0x10) # addiu $t9, $t9, 0x579c +/* A99C38 80022A98 A8580000 */ swl $t8, ($v0) +/* A99C3C 80022A9C B8580003 */ swr $t8, 3($v0) +/* A99C40 80022AA0 89CF0004 */ lwl $t7, 4($t6) +/* A99C44 80022AA4 99CF0007 */ lwr $t7, 7($t6) +/* A99C48 80022AA8 00401825 */ move $v1, $v0 +/* A99C4C 80022AAC 3C0B8011 */ lui $t3, %hi(D_8011578C+0x20) # $t3, 0x8011 +/* A99C50 80022AB0 A84F0004 */ swl $t7, 4($v0) +/* A99C54 80022AB4 B84F0007 */ swr $t7, 7($v0) +/* A99C58 80022AB8 89D80008 */ lwl $t8, 8($t6) +/* A99C5C 80022ABC 99D8000B */ lwr $t8, 0xb($t6) +/* A99C60 80022AC0 256B57AC */ addiu $t3, %lo(D_8011578C+0x20) # addiu $t3, $t3, 0x57ac +/* A99C64 80022AC4 24630040 */ addiu $v1, $v1, 0x40 +/* A99C68 80022AC8 A8580008 */ swl $t8, 8($v0) +/* A99C6C 80022ACC B858000B */ swr $t8, 0xb($v0) +/* A99C70 80022AD0 89CF000C */ lwl $t7, 0xc($t6) +/* A99C74 80022AD4 99CF000F */ lwr $t7, 0xf($t6) +/* A99C78 80022AD8 3C0E8011 */ lui $t6, %hi(D_8011578C+0x30) # $t6, 0x8011 +/* A99C7C 80022ADC 25CE57BC */ addiu $t6, %lo(D_8011578C+0x30) # addiu $t6, $t6, 0x57bc +/* A99C80 80022AE0 A84F000C */ swl $t7, 0xc($v0) +/* A99C84 80022AE4 B84F000F */ swr $t7, 0xf($v0) +/* A99C88 80022AE8 8B2A0000 */ lwl $t2, ($t9) +/* A99C8C 80022AEC 9B2A0003 */ lwr $t2, 3($t9) +/* A99C90 80022AF0 24080018 */ li $t0, 24 +/* A99C94 80022AF4 2410FFFE */ li $s0, -2 +/* A99C98 80022AF8 A86AFFD0 */ swl $t2, -0x30($v1) +/* A99C9C 80022AFC B86AFFD3 */ swr $t2, -0x2d($v1) +/* A99CA0 80022B00 8B290004 */ lwl $t1, 4($t9) +/* A99CA4 80022B04 9B290007 */ lwr $t1, 7($t9) +/* A99CA8 80022B08 2412FFFF */ li $s2, -1 +/* A99CAC 80022B0C 02809825 */ move $s3, $s4 +/* A99CB0 80022B10 A869FFD4 */ swl $t1, -0x2c($v1) +/* A99CB4 80022B14 B869FFD7 */ swr $t1, -0x29($v1) +/* A99CB8 80022B18 8B2A0008 */ lwl $t2, 8($t9) +/* A99CBC 80022B1C 9B2A000B */ lwr $t2, 0xb($t9) +/* A99CC0 80022B20 A86AFFD8 */ swl $t2, -0x28($v1) +/* A99CC4 80022B24 B86AFFDB */ swr $t2, -0x25($v1) +/* A99CC8 80022B28 8B29000C */ lwl $t1, 0xc($t9) +/* A99CCC 80022B2C 9B29000F */ lwr $t1, 0xf($t9) +/* A99CD0 80022B30 A869FFDC */ swl $t1, -0x24($v1) +/* A99CD4 80022B34 B869FFDF */ swr $t1, -0x21($v1) +/* A99CD8 80022B38 896D0000 */ lwl $t5, ($t3) +/* A99CDC 80022B3C 996D0003 */ lwr $t5, 3($t3) +/* A99CE0 80022B40 A86DFFE0 */ swl $t5, -0x20($v1) +/* A99CE4 80022B44 B86DFFE3 */ swr $t5, -0x1d($v1) +/* A99CE8 80022B48 896C0004 */ lwl $t4, 4($t3) +/* A99CEC 80022B4C 996C0007 */ lwr $t4, 7($t3) +/* A99CF0 80022B50 A86CFFE4 */ swl $t4, -0x1c($v1) +/* A99CF4 80022B54 B86CFFE7 */ swr $t4, -0x19($v1) +/* A99CF8 80022B58 896D0008 */ lwl $t5, 8($t3) +/* A99CFC 80022B5C 996D000B */ lwr $t5, 0xb($t3) +/* A99D00 80022B60 A86DFFE8 */ swl $t5, -0x18($v1) +/* A99D04 80022B64 B86DFFEB */ swr $t5, -0x15($v1) +/* A99D08 80022B68 896C000C */ lwl $t4, 0xc($t3) +/* A99D0C 80022B6C 996C000F */ lwr $t4, 0xf($t3) +/* A99D10 80022B70 A86CFFEC */ swl $t4, -0x14($v1) +/* A99D14 80022B74 B86CFFEF */ swr $t4, -0x11($v1) +/* A99D18 80022B78 89D80000 */ lwl $t8, ($t6) +/* A99D1C 80022B7C 99D80003 */ lwr $t8, 3($t6) +/* A99D20 80022B80 A878FFF0 */ swl $t8, -0x10($v1) +/* A99D24 80022B84 B878FFF3 */ swr $t8, -0xd($v1) +/* A99D28 80022B88 89CF0004 */ lwl $t7, 4($t6) +/* A99D2C 80022B8C 99CF0007 */ lwr $t7, 7($t6) +/* A99D30 80022B90 A86FFFF4 */ swl $t7, -0xc($v1) +/* A99D34 80022B94 B86FFFF7 */ swr $t7, -9($v1) +/* A99D38 80022B98 89D80008 */ lwl $t8, 8($t6) +/* A99D3C 80022B9C 99D8000B */ lwr $t8, 0xb($t6) +/* A99D40 80022BA0 A878FFF8 */ swl $t8, -8($v1) +/* A99D44 80022BA4 B878FFFB */ swr $t8, -5($v1) +/* A99D48 80022BA8 89CF000C */ lwl $t7, 0xc($t6) +/* A99D4C 80022BAC 99CF000F */ lwr $t7, 0xf($t6) +/* A99D50 80022BB0 A86FFFFC */ swl $t7, -4($v1) +/* A99D54 80022BB4 B86FFFFF */ swr $t7, -1($v1) +/* A99D58 80022BB8 9284019E */ lbu $a0, 0x19e($s4) +/* A99D5C 80022BBC 28810002 */ slti $at, $a0, 2 +/* A99D60 80022BC0 1420005C */ bnez $at, .L80022D34 +/* A99D64 80022BC4 00801025 */ move $v0, $a0 +/* A99D68 80022BC8 00880019 */ multu $a0, $t0 +/* A99D6C 80022BCC 3C048011 */ lui $a0, %hi(D_801157CC+0x10) # $a0, 0x8011 +/* A99D70 80022BD0 3C068011 */ lui $a2, %hi(D_801157CC+0x30) # $a2, 0x8011 +/* A99D74 80022BD4 3C058011 */ lui $a1, %hi(D_801157CC+0x20) # $a1, 0x8011 +/* A99D78 80022BD8 24A557EC */ addiu $a1, %lo(D_801157CC+0x20) # addiu $a1, $a1, 0x57ec +/* A99D7C 80022BDC 24C657FC */ addiu $a2, %lo(D_801157CC+0x30) # addiu $a2, $a2, 0x57fc +/* A99D80 80022BE0 248457DC */ addiu $a0, %lo(D_801157CC+0x10) # addiu $a0, $a0, 0x57dc +/* A99D84 80022BE4 02803825 */ move $a3, $s4 +/* A99D88 80022BE8 0000C812 */ mflo $t9 +/* A99D8C 80022BEC 02994821 */ addu $t1, $s4, $t9 +/* A99D90 80022BF0 252AFFD0 */ addiu $t2, $t1, -0x30 +/* A99D94 80022BF4 028A082B */ sltu $at, $s4, $t2 +/* A99D98 80022BF8 1020004E */ beqz $at, .L80022D34 +/* A99D9C 80022BFC 00000000 */ nop +/* A99DA0 80022C00 3C028011 */ lui $v0, %hi(D_801157CC) # 0.000000 +/* A99DA4 80022C04 244257CC */ addiu $v0, %lo(D_801157CC) # addiu $v0, $v0, 0x57cc +/* A99DA8 80022C08 884C0000 */ lwl $t4, ($v0) +.L80022C0C: +/* A99DAC 80022C0C 984C0003 */ lwr $t4, 3($v0) +/* A99DB0 80022C10 24E70018 */ addiu $a3, $a3, 0x18 +/* A99DB4 80022C14 24630040 */ addiu $v1, $v1, 0x40 +/* A99DB8 80022C18 A86CFFC0 */ swl $t4, -0x40($v1) +/* A99DBC 80022C1C B86CFFC3 */ swr $t4, -0x3d($v1) +/* A99DC0 80022C20 884B0004 */ lwl $t3, 4($v0) +/* A99DC4 80022C24 984B0007 */ lwr $t3, 7($v0) +/* A99DC8 80022C28 A86BFFC4 */ swl $t3, -0x3c($v1) +/* A99DCC 80022C2C B86BFFC7 */ swr $t3, -0x39($v1) +/* A99DD0 80022C30 884C0008 */ lwl $t4, 8($v0) +/* A99DD4 80022C34 984C000B */ lwr $t4, 0xb($v0) +/* A99DD8 80022C38 A86CFFC8 */ swl $t4, -0x38($v1) +/* A99DDC 80022C3C B86CFFCB */ swr $t4, -0x35($v1) +/* A99DE0 80022C40 884B000C */ lwl $t3, 0xc($v0) +/* A99DE4 80022C44 984B000F */ lwr $t3, 0xf($v0) +/* A99DE8 80022C48 A86BFFCC */ swl $t3, -0x34($v1) +/* A99DEC 80022C4C B86BFFCF */ swr $t3, -0x31($v1) +/* A99DF0 80022C50 888E0000 */ lwl $t6, ($a0) +/* A99DF4 80022C54 988E0003 */ lwr $t6, 3($a0) +/* A99DF8 80022C58 A86EFFD0 */ swl $t6, -0x30($v1) +/* A99DFC 80022C5C B86EFFD3 */ swr $t6, -0x2d($v1) +/* A99E00 80022C60 888D0004 */ lwl $t5, 4($a0) +/* A99E04 80022C64 988D0007 */ lwr $t5, 7($a0) +/* A99E08 80022C68 A86DFFD4 */ swl $t5, -0x2c($v1) +/* A99E0C 80022C6C B86DFFD7 */ swr $t5, -0x29($v1) +/* A99E10 80022C70 888E0008 */ lwl $t6, 8($a0) +/* A99E14 80022C74 988E000B */ lwr $t6, 0xb($a0) +/* A99E18 80022C78 A86EFFD8 */ swl $t6, -0x28($v1) +/* A99E1C 80022C7C B86EFFDB */ swr $t6, -0x25($v1) +/* A99E20 80022C80 888D000C */ lwl $t5, 0xc($a0) +/* A99E24 80022C84 988D000F */ lwr $t5, 0xf($a0) +/* A99E28 80022C88 A86DFFDC */ swl $t5, -0x24($v1) +/* A99E2C 80022C8C B86DFFDF */ swr $t5, -0x21($v1) +/* A99E30 80022C90 88B80000 */ lwl $t8, ($a1) +/* A99E34 80022C94 98B80003 */ lwr $t8, 3($a1) +/* A99E38 80022C98 A878FFE0 */ swl $t8, -0x20($v1) +/* A99E3C 80022C9C B878FFE3 */ swr $t8, -0x1d($v1) +/* A99E40 80022CA0 88AF0004 */ lwl $t7, 4($a1) +/* A99E44 80022CA4 98AF0007 */ lwr $t7, 7($a1) +/* A99E48 80022CA8 A86FFFE4 */ swl $t7, -0x1c($v1) +/* A99E4C 80022CAC B86FFFE7 */ swr $t7, -0x19($v1) +/* A99E50 80022CB0 88B80008 */ lwl $t8, 8($a1) +/* A99E54 80022CB4 98B8000B */ lwr $t8, 0xb($a1) +/* A99E58 80022CB8 A878FFE8 */ swl $t8, -0x18($v1) +/* A99E5C 80022CBC B878FFEB */ swr $t8, -0x15($v1) +/* A99E60 80022CC0 88AF000C */ lwl $t7, 0xc($a1) +/* A99E64 80022CC4 98AF000F */ lwr $t7, 0xf($a1) +/* A99E68 80022CC8 A86FFFEC */ swl $t7, -0x14($v1) +/* A99E6C 80022CCC B86FFFEF */ swr $t7, -0x11($v1) +/* A99E70 80022CD0 88C90000 */ lwl $t1, ($a2) +/* A99E74 80022CD4 98C90003 */ lwr $t1, 3($a2) +/* A99E78 80022CD8 A869FFF0 */ swl $t1, -0x10($v1) +/* A99E7C 80022CDC B869FFF3 */ swr $t1, -0xd($v1) +/* A99E80 80022CE0 88D90004 */ lwl $t9, 4($a2) +/* A99E84 80022CE4 98D90007 */ lwr $t9, 7($a2) +/* A99E88 80022CE8 A879FFF4 */ swl $t9, -0xc($v1) +/* A99E8C 80022CEC B879FFF7 */ swr $t9, -9($v1) +/* A99E90 80022CF0 88C90008 */ lwl $t1, 8($a2) +/* A99E94 80022CF4 98C9000B */ lwr $t1, 0xb($a2) +/* A99E98 80022CF8 A869FFF8 */ swl $t1, -8($v1) +/* A99E9C 80022CFC B869FFFB */ swr $t1, -5($v1) +/* A99EA0 80022D00 88D9000C */ lwl $t9, 0xc($a2) +/* A99EA4 80022D04 98D9000F */ lwr $t9, 0xf($a2) +/* A99EA8 80022D08 A879FFFC */ swl $t9, -4($v1) +/* A99EAC 80022D0C B879FFFF */ swr $t9, -1($v1) +/* A99EB0 80022D10 92CA019E */ lbu $t2, 0x19e($s6) +/* A99EB4 80022D14 01480019 */ multu $t2, $t0 +/* A99EB8 80022D18 00005812 */ mflo $t3 +/* A99EBC 80022D1C 02CB6021 */ addu $t4, $s6, $t3 +/* A99EC0 80022D20 258DFFD0 */ addiu $t5, $t4, -0x30 +/* A99EC4 80022D24 00ED082B */ sltu $at, $a3, $t5 +/* A99EC8 80022D28 5420FFB8 */ bnezl $at, .L80022C0C +/* A99ECC 80022D2C 884C0000 */ lwl $t4, ($v0) +/* A99ED0 80022D30 9282019E */ lbu $v0, 0x19e($s4) +.L80022D34: +/* A99ED4 80022D34 1840006A */ blez $v0, .L80022EE0 +/* A99ED8 80022D38 00008825 */ move $s1, $zero +/* A99EDC 80022D3C 27BE0074 */ addiu $fp, $sp, 0x74 +.L80022D40: +/* A99EE0 80022D40 8E6E0004 */ lw $t6, 4($s3) +/* A99EE4 80022D44 928F019F */ lbu $t7, 0x19f($s4) +/* A99EE8 80022D48 3C014F80 */ li $at, 0x4F800000 # 0.000000 +/* A99EEC 80022D4C 448E2000 */ mtc1 $t6, $f4 +/* A99EF0 80022D50 448F4000 */ mtc1 $t7, $f8 +/* A99EF4 80022D54 468021A0 */ cvt.s.w $f6, $f4 +/* A99EF8 80022D58 05E10004 */ bgez $t7, .L80022D6C +/* A99EFC 80022D5C 468042A0 */ cvt.s.w $f10, $f8 +/* A99F00 80022D60 44818000 */ mtc1 $at, $f16 +/* A99F04 80022D64 00000000 */ nop +/* A99F08 80022D68 46105280 */ add.s $f10, $f10, $f16 +.L80022D6C: +/* A99F0C 80022D6C 460A3003 */ div.s $f0, $f6, $f10 +/* A99F10 80022D70 27B8006C */ addiu $t8, $sp, 0x6c +/* A99F14 80022D74 27B90064 */ addiu $t9, $sp, 0x64 +/* A99F18 80022D78 27A90060 */ addiu $t1, $sp, 0x60 +/* A99F1C 80022D7C AFA90018 */ sw $t1, 0x18($sp) +/* A99F20 80022D80 AFB90014 */ sw $t9, 0x14($sp) +/* A99F24 80022D84 AFB80010 */ sw $t8, 0x10($sp) +/* A99F28 80022D88 02802025 */ move $a0, $s4 +/* A99F2C 80022D8C 02202825 */ move $a1, $s1 +/* A99F30 80022D90 03C03825 */ move $a3, $fp +/* A99F34 80022D94 44060000 */ mfc1 $a2, $f0 +/* A99F38 80022D98 0C008294 */ jal EffectBlure_GetComputedValues +/* A99F3C 80022D9C 00000000 */ nop +/* A99F40 80022DA0 06000011 */ bltz $s0, .L80022DE8 +/* A99F44 80022DA4 26310001 */ addiu $s1, $s1, 1 +/* A99F48 80022DA8 87AB0074 */ lh $t3, 0x74($sp) +/* A99F4C 80022DAC 00105100 */ sll $t2, $s0, 4 +/* A99F50 80022DB0 02AA1021 */ addu $v0, $s5, $t2 +/* A99F54 80022DB4 A44B0000 */ sh $t3, ($v0) +/* A99F58 80022DB8 87AC0076 */ lh $t4, 0x76($sp) +/* A99F5C 80022DBC A44C0002 */ sh $t4, 2($v0) +/* A99F60 80022DC0 87AD0078 */ lh $t5, 0x78($sp) +/* A99F64 80022DC4 A44D0004 */ sh $t5, 4($v0) +/* A99F68 80022DC8 93AE0064 */ lbu $t6, 0x64($sp) +/* A99F6C 80022DCC A04E000C */ sb $t6, 0xc($v0) +/* A99F70 80022DD0 93AF0065 */ lbu $t7, 0x65($sp) +/* A99F74 80022DD4 A04F000D */ sb $t7, 0xd($v0) +/* A99F78 80022DD8 93B80066 */ lbu $t8, 0x66($sp) +/* A99F7C 80022DDC A058000E */ sb $t8, 0xe($v0) +/* A99F80 80022DE0 93B90067 */ lbu $t9, 0x67($sp) +/* A99F84 80022DE4 A059000F */ sb $t9, 0xf($v0) +.L80022DE8: +/* A99F88 80022DE8 06400011 */ bltz $s2, .L80022E30 +/* A99F8C 80022DEC 02401825 */ move $v1, $s2 +/* A99F90 80022DF0 87AA006C */ lh $t2, 0x6c($sp) +/* A99F94 80022DF4 00034900 */ sll $t1, $v1, 4 +/* A99F98 80022DF8 02A91021 */ addu $v0, $s5, $t1 +/* A99F9C 80022DFC A44A0000 */ sh $t2, ($v0) +/* A99FA0 80022E00 87AB006E */ lh $t3, 0x6e($sp) +/* A99FA4 80022E04 A44B0002 */ sh $t3, 2($v0) +/* A99FA8 80022E08 87AC0070 */ lh $t4, 0x70($sp) +/* A99FAC 80022E0C A44C0004 */ sh $t4, 4($v0) +/* A99FB0 80022E10 93AD0060 */ lbu $t5, 0x60($sp) +/* A99FB4 80022E14 A04D000C */ sb $t5, 0xc($v0) +/* A99FB8 80022E18 93AE0061 */ lbu $t6, 0x61($sp) +/* A99FBC 80022E1C A04E000D */ sb $t6, 0xd($v0) +/* A99FC0 80022E20 93AF0062 */ lbu $t7, 0x62($sp) +/* A99FC4 80022E24 A04F000E */ sb $t7, 0xe($v0) +/* A99FC8 80022E28 93B80063 */ lbu $t8, 0x63($sp) +/* A99FCC 80022E2C A058000F */ sb $t8, 0xf($v0) +.L80022E30: +/* A99FD0 80022E30 24630001 */ addiu $v1, $v1, 1 +/* A99FD4 80022E34 02E3082A */ slt $at, $s7, $v1 +/* A99FD8 80022E38 14200010 */ bnez $at, .L80022E7C +/* A99FDC 80022E3C 87A90074 */ lh $t1, 0x74($sp) +/* A99FE0 80022E40 0003C900 */ sll $t9, $v1, 4 +/* A99FE4 80022E44 02B91021 */ addu $v0, $s5, $t9 +/* A99FE8 80022E48 A4490000 */ sh $t1, ($v0) +/* A99FEC 80022E4C 87AA0076 */ lh $t2, 0x76($sp) +/* A99FF0 80022E50 A44A0002 */ sh $t2, 2($v0) +/* A99FF4 80022E54 87AB0078 */ lh $t3, 0x78($sp) +/* A99FF8 80022E58 A44B0004 */ sh $t3, 4($v0) +/* A99FFC 80022E5C 93AC0064 */ lbu $t4, 0x64($sp) +/* A9A000 80022E60 A04C000C */ sb $t4, 0xc($v0) +/* A9A004 80022E64 93AD0065 */ lbu $t5, 0x65($sp) +/* A9A008 80022E68 A04D000D */ sb $t5, 0xd($v0) +/* A9A00C 80022E6C 93AE0066 */ lbu $t6, 0x66($sp) +/* A9A010 80022E70 A04E000E */ sb $t6, 0xe($v0) +/* A9A014 80022E74 93AF0067 */ lbu $t7, 0x67($sp) +/* A9A018 80022E78 A04F000F */ sb $t7, 0xf($v0) +.L80022E7C: +/* A9A01C 80022E7C 24630001 */ addiu $v1, $v1, 1 +/* A9A020 80022E80 02E3082A */ slt $at, $s7, $v1 +/* A9A024 80022E84 14200010 */ bnez $at, .L80022EC8 +/* A9A028 80022E88 87B9006C */ lh $t9, 0x6c($sp) +/* A9A02C 80022E8C 0003C100 */ sll $t8, $v1, 4 +/* A9A030 80022E90 02B81021 */ addu $v0, $s5, $t8 +/* A9A034 80022E94 A4590000 */ sh $t9, ($v0) +/* A9A038 80022E98 87A9006E */ lh $t1, 0x6e($sp) +/* A9A03C 80022E9C A4490002 */ sh $t1, 2($v0) +/* A9A040 80022EA0 87AA0070 */ lh $t2, 0x70($sp) +/* A9A044 80022EA4 A44A0004 */ sh $t2, 4($v0) +/* A9A048 80022EA8 93AB0060 */ lbu $t3, 0x60($sp) +/* A9A04C 80022EAC A04B000C */ sb $t3, 0xc($v0) +/* A9A050 80022EB0 93AC0061 */ lbu $t4, 0x61($sp) +/* A9A054 80022EB4 A04C000D */ sb $t4, 0xd($v0) +/* A9A058 80022EB8 93AD0062 */ lbu $t5, 0x62($sp) +/* A9A05C 80022EBC A04D000E */ sb $t5, 0xe($v0) +/* A9A060 80022EC0 93AE0063 */ lbu $t6, 0x63($sp) +/* A9A064 80022EC4 A04E000F */ sb $t6, 0xf($v0) +.L80022EC8: +/* A9A068 80022EC8 92CF019E */ lbu $t7, 0x19e($s6) +/* A9A06C 80022ECC 26100004 */ addiu $s0, $s0, 4 +/* A9A070 80022ED0 26520004 */ addiu $s2, $s2, 4 +/* A9A074 80022ED4 022F082A */ slt $at, $s1, $t7 +/* A9A078 80022ED8 1420FF99 */ bnez $at, .L80022D40 +/* A9A07C 80022EDC 26730018 */ addiu $s3, $s3, 0x18 +.L80022EE0: +/* A9A080 80022EE0 8FA4009C */ lw $a0, 0x9c($sp) +/* A9A084 80022EE4 02802825 */ move $a1, $s4 +/* A9A088 80022EE8 0C00893D */ jal EffectBlure_DrawSimpleVertices +/* A9A08C 80022EEC 02A03025 */ move $a2, $s5 +.L80022EF0: +/* A9A090 80022EF0 8FBF004C */ lw $ra, 0x4c($sp) +.L80022EF4: +/* A9A094 80022EF4 8FB00028 */ lw $s0, 0x28($sp) +/* A9A098 80022EF8 8FB1002C */ lw $s1, 0x2c($sp) +/* A9A09C 80022EFC 8FB20030 */ lw $s2, 0x30($sp) +/* A9A0A0 80022F00 8FB30034 */ lw $s3, 0x34($sp) +/* A9A0A4 80022F04 8FB40038 */ lw $s4, 0x38($sp) +/* A9A0A8 80022F08 8FB5003C */ lw $s5, 0x3c($sp) +/* A9A0AC 80022F0C 8FB60040 */ lw $s6, 0x40($sp) +/* A9A0B0 80022F10 8FB70044 */ lw $s7, 0x44($sp) +/* A9A0B4 80022F14 8FBE0048 */ lw $fp, 0x48($sp) +/* A9A0B8 80022F18 03E00008 */ jr $ra +/* A9A0BC 80022F1C 27BD0098 */ addiu $sp, $sp, 0x98 + diff --git a/asm/non_matchings/code/z_eff_blure/EffectBlure_DrawSmooth.s b/asm/non_matchings/code/z_eff_blure/EffectBlure_DrawSmooth.s new file mode 100644 index 0000000000..d9b9e990c6 --- /dev/null +++ b/asm/non_matchings/code/z_eff_blure/EffectBlure_DrawSmooth.s @@ -0,0 +1,223 @@ +.rdata +glabel D_801352CC + .asciz "../z_eff_blure.c" + .balign 4 + +glabel D_801352E0 + .asciz "../z_eff_blure.c" + .balign 4 + +.late_rodata +glabel D_80135448 + .float 0.1 + +.text +glabel EffectBlure_DrawSmooth +/* A990A0 80021F00 27BDFED8 */ addiu $sp, $sp, -0x128 +/* A990A4 80021F04 AFB40024 */ sw $s4, 0x24($sp) +/* A990A8 80021F08 AFB30020 */ sw $s3, 0x20($sp) +/* A990AC 80021F0C 0080A025 */ move $s4, $a0 +/* A990B0 80021F10 AFBF002C */ sw $ra, 0x2c($sp) +/* A990B4 80021F14 AFB50028 */ sw $s5, 0x28($sp) +/* A990B8 80021F18 00809825 */ move $s3, $a0 +/* A990BC 80021F1C 3C068013 */ lui $a2, %hi(D_801352CC) # $a2, 0x8013 +/* A990C0 80021F20 00A0A825 */ move $s5, $a1 +/* A990C4 80021F24 AFB2001C */ sw $s2, 0x1c($sp) +/* A990C8 80021F28 AFB10018 */ sw $s1, 0x18($sp) +/* A990CC 80021F2C AFB00014 */ sw $s0, 0x14($sp) +/* A990D0 80021F30 24C652CC */ addiu $a2, %lo(D_801352CC) # addiu $a2, $a2, 0x52cc +/* A990D4 80021F34 27A40044 */ addiu $a0, $sp, 0x44 +/* A990D8 80021F38 0C031AB1 */ jal Graph_OpenDisps +/* A990DC 80021F3C 240704B1 */ li $a3, 1201 +/* A990E0 80021F40 9284019E */ lbu $a0, 0x19e($s4) +/* A990E4 80021F44 24120018 */ li $s2, 24 +/* A990E8 80021F48 28810002 */ slti $at, $a0, 2 +/* A990EC 80021F4C 142000A2 */ bnez $at, .L800221D8 +/* A990F0 80021F50 00801825 */ move $v1, $a0 +/* A990F4 80021F54 00920019 */ multu $a0, $s2 +/* A990F8 80021F58 968E0014 */ lhu $t6, 0x14($s4) +/* A990FC 80021F5C 26900018 */ addiu $s0, $s4, 0x18 +/* A99100 80021F60 2411FFFC */ li $s1, -4 +/* A99104 80021F64 31D8FFFC */ andi $t8, $t6, 0xfffc +/* A99108 80021F68 A6980014 */ sh $t8, 0x14($s4) +/* A9910C 80021F6C 37190002 */ ori $t9, $t8, 2 +/* A99110 80021F70 A6990014 */ sh $t9, 0x14($s4) +/* A99114 80021F74 00004012 */ mflo $t0 +/* A99118 80021F78 02884821 */ addu $t1, $s4, $t0 +/* A9911C 80021F7C 252AFFE8 */ addiu $t2, $t1, -0x18 +/* A99120 80021F80 020A082B */ sltu $at, $s0, $t2 +/* A99124 80021F84 5020000E */ beql $at, $zero, .L80021FC0 +/* A99128 80021F88 24060018 */ li $a2, 24 +.L80021F8C: +/* A9912C 80021F8C 0C008238 */ jal EffectBlure_UpdateFlags +/* A99130 80021F90 02002025 */ move $a0, $s0 +/* A99134 80021F94 926B019E */ lbu $t3, 0x19e($s3) +/* A99138 80021F98 26100018 */ addiu $s0, $s0, 0x18 +/* A9913C 80021F9C 01720019 */ multu $t3, $s2 +/* A99140 80021FA0 00006012 */ mflo $t4 +/* A99144 80021FA4 026C6821 */ addu $t5, $s3, $t4 +/* A99148 80021FA8 25AEFFE8 */ addiu $t6, $t5, -0x18 +/* A9914C 80021FAC 020E082B */ sltu $at, $s0, $t6 +/* A99150 80021FB0 1420FFF6 */ bnez $at, .L80021F8C +/* A99154 80021FB4 00000000 */ nop +/* A99158 80021FB8 9283019E */ lbu $v1, 0x19e($s4) +/* A9915C 80021FBC 24060018 */ li $a2, 24 +.L80021FC0: +/* A99160 80021FC0 00660019 */ multu $v1, $a2 +/* A99164 80021FC4 02802025 */ move $a0, $s4 +/* A99168 80021FC8 02A02825 */ move $a1, $s5 +/* A9916C 80021FCC 00007812 */ mflo $t7 +/* A99170 80021FD0 028F1021 */ addu $v0, $s4, $t7 +/* A99174 80021FD4 9458FFFC */ lhu $t8, -4($v0) +/* A99178 80021FD8 0311C824 */ and $t9, $t8, $s1 +/* A9917C 80021FDC A459FFFC */ sh $t9, -4($v0) +/* A99180 80021FE0 9288019E */ lbu $t0, 0x19e($s4) +/* A99184 80021FE4 01060019 */ multu $t0, $a2 +/* A99188 80021FE8 00004812 */ mflo $t1 +/* A9918C 80021FEC 02891021 */ addu $v0, $s4, $t1 +/* A99190 80021FF0 944AFFFC */ lhu $t2, -4($v0) +/* A99194 80021FF4 354B0002 */ ori $t3, $t2, 2 +/* A99198 80021FF8 0C0083D8 */ jal EffectBlure_SetupSmooth +/* A9919C 80021FFC A44BFFFC */ sh $t3, -4($v0) +/* A991A0 80022000 868C000E */ lh $t4, 0xe($s4) +/* A991A4 80022004 868D0010 */ lh $t5, 0x10($s4) +/* A991A8 80022008 868E0012 */ lh $t6, 0x12($s4) +/* A991AC 8002200C 448C2000 */ mtc1 $t4, $f4 +/* A991B0 80022010 448D3000 */ mtc1 $t5, $f6 +/* A991B4 80022014 448E4000 */ mtc1 $t6, $f8 +/* A991B8 80022018 46802120 */ cvt.s.w $f4, $f4 +/* A991BC 8002201C 27B000DC */ addiu $s0, $sp, 0xdc +/* A991C0 80022020 02002025 */ move $a0, $s0 +/* A991C4 80022024 468031A0 */ cvt.s.w $f6, $f6 +/* A991C8 80022028 44052000 */ mfc1 $a1, $f4 +/* A991CC 8002202C 46804220 */ cvt.s.w $f8, $f8 +/* A991D0 80022030 44063000 */ mfc1 $a2, $f6 +/* A991D4 80022034 44074000 */ mfc1 $a3, $f8 +/* A991D8 80022038 0C029E89 */ jal func_800A7A24 +/* A991DC 8002203C 00000000 */ nop +/* A991E0 80022040 3C018013 */ lui $at, %hi(D_80135448) +/* A991E4 80022044 C4205448 */ lwc1 $f0, %lo(D_80135448)($at) +/* A991E8 80022048 27B1009C */ addiu $s1, $sp, 0x9c +/* A991EC 8002204C 02202025 */ move $a0, $s1 +/* A991F0 80022050 44050000 */ mfc1 $a1, $f0 +/* A991F4 80022054 44060000 */ mfc1 $a2, $f0 +/* A991F8 80022058 44070000 */ mfc1 $a3, $f0 +/* A991FC 8002205C 0C029DA9 */ jal func_800A76A4 +/* A99200 80022060 00000000 */ nop +/* A99204 80022064 02002025 */ move $a0, $s0 +/* A99208 80022068 02202825 */ move $a1, $s1 +/* A9920C 8002206C 0C029BE8 */ jal func_800A6FA0 +/* A99210 80022070 27A6005C */ addiu $a2, $sp, 0x5c +/* A99214 80022074 02A02025 */ move $a0, $s5 +/* A99218 80022078 0C029F9C */ jal func_800A7E70 +/* A9921C 8002207C 27A5005C */ addiu $a1, $sp, 0x5c +/* A99220 80022080 50400056 */ beql $v0, $zero, .L800221DC +/* A99224 80022084 8FBF002C */ lw $ra, 0x2c($sp) +/* A99228 80022088 8EA402D0 */ lw $a0, 0x2d0($s5) +/* A9922C 8002208C 3C18DA38 */ lui $t8, (0xDA380003 >> 16) # lui $t8, 0xda38 +/* A99230 80022090 37180003 */ ori $t8, (0xDA380003 & 0xFFFF) # ori $t8, $t8, 3 +/* A99234 80022094 248F0008 */ addiu $t7, $a0, 8 +/* A99238 80022098 AEAF02D0 */ sw $t7, 0x2d0($s5) +/* A9923C 8002209C AC820004 */ sw $v0, 4($a0) +/* A99240 800220A0 AC980000 */ sw $t8, ($a0) +/* A99244 800220A4 9299019E */ lbu $t9, 0x19e($s4) +/* A99248 800220A8 00008825 */ move $s1, $zero +/* A9924C 800220AC 02808025 */ move $s0, $s4 +/* A99250 800220B0 03320019 */ multu $t9, $s2 +/* A99254 800220B4 24120002 */ li $s2, 2 +/* A99258 800220B8 00004012 */ mflo $t0 +/* A9925C 800220BC 02884821 */ addu $t1, $s4, $t0 +/* A99260 800220C0 252AFFE8 */ addiu $t2, $t1, -0x18 +/* A99264 800220C4 028A082B */ sltu $at, $s4, $t2 +/* A99268 800220C8 1020003D */ beqz $at, .L800221C0 +/* A9926C 800220CC 00000000 */ nop +.L800220D0: +/* A99270 800220D0 8E0B0000 */ lw $t3, ($s0) +/* A99274 800220D4 51600005 */ beql $t3, $zero, .L800220EC +/* A99278 800220D8 926D019E */ lbu $t5, 0x19e($s3) +/* A9927C 800220DC 8E0C0018 */ lw $t4, 0x18($s0) +/* A99280 800220E0 55800009 */ bnezl $t4, .L80022108 +/* A99284 800220E4 96020014 */ lhu $v0, 0x14($s0) +/* A99288 800220E8 926D019E */ lbu $t5, 0x19e($s3) +.L800220EC: +/* A9928C 800220EC 000D7080 */ sll $t6, $t5, 2 +/* A99290 800220F0 01CD7023 */ subu $t6, $t6, $t5 +/* A99294 800220F4 000E70C0 */ sll $t6, $t6, 3 +/* A99298 800220F8 026E1021 */ addu $v0, $s3, $t6 +/* A9929C 800220FC 1000002C */ b .L800221B0 +/* A992A0 80022100 2442FFE8 */ addiu $v0, $v0, -0x18 +/* A992A4 80022104 96020014 */ lhu $v0, 0x14($s0) +.L80022108: +/* A992A8 80022108 30420003 */ andi $v0, $v0, 3 +/* A992AC 8002210C 14400005 */ bnez $v0, .L80022124 +/* A992B0 80022110 00000000 */ nop +/* A992B4 80022114 960F002C */ lhu $t7, 0x2c($s0) +/* A992B8 80022118 31F80003 */ andi $t8, $t7, 3 +/* A992BC 8002211C 53000014 */ beql $t8, $zero, .L80022170 +/* A992C0 80022120 02802025 */ move $a0, $s4 +.L80022124: +/* A992C4 80022124 16420005 */ bne $s2, $v0, .L8002213C +/* A992C8 80022128 00000000 */ nop +/* A992CC 8002212C 9619002C */ lhu $t9, 0x2c($s0) +/* A992D0 80022130 33280003 */ andi $t0, $t9, 3 +/* A992D4 80022134 5100000E */ beql $t0, $zero, .L80022170 +/* A992D8 80022138 02802025 */ move $a0, $s4 +.L8002213C: +/* A992DC 8002213C 14400005 */ bnez $v0, .L80022154 +/* A992E0 80022140 00000000 */ nop +/* A992E4 80022144 9609002C */ lhu $t1, 0x2c($s0) +/* A992E8 80022148 312A0003 */ andi $t2, $t1, 3 +/* A992EC 8002214C 524A0008 */ beql $s2, $t2, .L80022170 +/* A992F0 80022150 02802025 */ move $a0, $s4 +.L80022154: +/* A992F4 80022154 1642000C */ bne $s2, $v0, .L80022188 +/* A992F8 80022158 02802025 */ move $a0, $s4 +/* A992FC 8002215C 960B002C */ lhu $t3, 0x2c($s0) +/* A99300 80022160 316C0003 */ andi $t4, $t3, 3 +/* A99304 80022164 564C0009 */ bnel $s2, $t4, .L8002218C +/* A99308 80022168 02002825 */ move $a1, $s0 +/* A9930C 8002216C 02802025 */ move $a0, $s4 +.L80022170: +/* A99310 80022170 02002825 */ move $a1, $s0 +/* A99314 80022174 02203025 */ move $a2, $s1 +/* A99318 80022178 0C0083F0 */ jal EffectBlure_DrawElemNoInterpolation +/* A9931C 8002217C 02A03825 */ move $a3, $s5 +/* A99320 80022180 10000006 */ b .L8002219C +/* A99324 80022184 926D019E */ lbu $t5, 0x19e($s3) +.L80022188: +/* A99328 80022188 02002825 */ move $a1, $s0 +.L8002218C: +/* A9932C 8002218C 02203025 */ move $a2, $s1 +/* A99330 80022190 0C008534 */ jal EffectBlure_DrawElemHermiteInterpolation +/* A99334 80022194 02A03825 */ move $a3, $s5 +/* A99338 80022198 926D019E */ lbu $t5, 0x19e($s3) +.L8002219C: +/* A9933C 8002219C 000D7080 */ sll $t6, $t5, 2 +/* A99340 800221A0 01CD7023 */ subu $t6, $t6, $t5 +/* A99344 800221A4 000E70C0 */ sll $t6, $t6, 3 +/* A99348 800221A8 026E1021 */ addu $v0, $s3, $t6 +/* A9934C 800221AC 2442FFE8 */ addiu $v0, $v0, -0x18 +.L800221B0: +/* A99350 800221B0 26100018 */ addiu $s0, $s0, 0x18 +/* A99354 800221B4 0202082B */ sltu $at, $s0, $v0 +/* A99358 800221B8 1420FFC5 */ bnez $at, .L800220D0 +/* A9935C 800221BC 26310001 */ addiu $s1, $s1, 1 +.L800221C0: +/* A99360 800221C0 3C068013 */ lui $a2, %hi(D_801352E0) # $a2, 0x8013 +/* A99364 800221C4 24C652E0 */ addiu $a2, %lo(D_801352E0) # addiu $a2, $a2, 0x52e0 +/* A99368 800221C8 27A40044 */ addiu $a0, $sp, 0x44 +/* A9936C 800221CC 02A02825 */ move $a1, $s5 +/* A99370 800221D0 0C031AD5 */ jal Graph_CloseDisps +/* A99374 800221D4 240704EF */ li $a3, 1263 +.L800221D8: +/* A99378 800221D8 8FBF002C */ lw $ra, 0x2c($sp) +.L800221DC: +/* A9937C 800221DC 8FB00014 */ lw $s0, 0x14($sp) +/* A99380 800221E0 8FB10018 */ lw $s1, 0x18($sp) +/* A99384 800221E4 8FB2001C */ lw $s2, 0x1c($sp) +/* A99388 800221E8 8FB30020 */ lw $s3, 0x20($sp) +/* A9938C 800221EC 8FB40024 */ lw $s4, 0x24($sp) +/* A99390 800221F0 8FB50028 */ lw $s5, 0x28($sp) +/* A99394 800221F4 03E00008 */ jr $ra +/* A99398 800221F8 27BD0128 */ addiu $sp, $sp, 0x128 + diff --git a/asm/non_matchings/code/z_eff_blure/func_80020A50.s b/asm/non_matchings/code/z_eff_blure/EffectBlure_GetComputedValues.s similarity index 99% rename from asm/non_matchings/code/z_eff_blure/func_80020A50.s rename to asm/non_matchings/code/z_eff_blure/EffectBlure_GetComputedValues.s index 7116fc4a1c..5748cb934c 100644 --- a/asm/non_matchings/code/z_eff_blure/func_80020A50.s +++ b/asm/non_matchings/code/z_eff_blure/EffectBlure_GetComputedValues.s @@ -7,7 +7,7 @@ glabel jtbl_80135434 .word L80020C34 .text -glabel func_80020A50 +glabel EffectBlure_GetComputedValues /* A97BF0 80020A50 27BDFFC8 */ addiu $sp, $sp, -0x38 /* A97BF4 80020A54 AFBF002C */ sw $ra, 0x2c($sp) /* A97BF8 80020A58 AFB20028 */ sw $s2, 0x28($sp) diff --git a/asm/non_matchings/code/z_eff_blure/func_80020184.s b/asm/non_matchings/code/z_eff_blure/EffectBlure_Update.s similarity index 59% rename from asm/non_matchings/code/z_eff_blure/func_80020184.s rename to asm/non_matchings/code/z_eff_blure/EffectBlure_Update.s index cec0ae52d8..f2e999e0e9 100644 --- a/asm/non_matchings/code/z_eff_blure/func_80020184.s +++ b/asm/non_matchings/code/z_eff_blure/EffectBlure_Update.s @@ -1,205 +1,4 @@ -glabel func_80020184 -/* A97324 80020184 A080019E */ sb $zero, 0x19e($a0) -/* A97328 80020188 00801825 */ move $v1, $a0 -/* A9732C 8002018C 24040002 */ li $a0, 2 -/* A97330 80020190 00001025 */ move $v0, $zero -/* A97334 80020194 24050010 */ li $a1, 16 -.L80020198: -/* A97338 80020198 24420004 */ addiu $v0, $v0, 4 -/* A9733C 8002019C AC640018 */ sw $a0, 0x18($v1) -/* A97340 800201A0 A4600020 */ sh $zero, 0x20($v1) -/* A97344 800201A4 A4600022 */ sh $zero, 0x22($v1) -/* A97348 800201A8 A4600024 */ sh $zero, 0x24($v1) -/* A9734C 800201AC A4600026 */ sh $zero, 0x26($v1) -/* A97350 800201B0 A4600028 */ sh $zero, 0x28($v1) -/* A97354 800201B4 A460002A */ sh $zero, 0x2a($v1) -/* A97358 800201B8 AC60001C */ sw $zero, 0x1c($v1) -/* A9735C 800201BC A460002C */ sh $zero, 0x2c($v1) -/* A97360 800201C0 AC640030 */ sw $a0, 0x30($v1) -/* A97364 800201C4 A4600038 */ sh $zero, 0x38($v1) -/* A97368 800201C8 A460003A */ sh $zero, 0x3a($v1) -/* A9736C 800201CC A460003C */ sh $zero, 0x3c($v1) -/* A97370 800201D0 A460003E */ sh $zero, 0x3e($v1) -/* A97374 800201D4 A4600040 */ sh $zero, 0x40($v1) -/* A97378 800201D8 A4600042 */ sh $zero, 0x42($v1) -/* A9737C 800201DC AC600034 */ sw $zero, 0x34($v1) -/* A97380 800201E0 A4600044 */ sh $zero, 0x44($v1) -/* A97384 800201E4 AC640048 */ sw $a0, 0x48($v1) -/* A97388 800201E8 A4600050 */ sh $zero, 0x50($v1) -/* A9738C 800201EC A4600052 */ sh $zero, 0x52($v1) -/* A97390 800201F0 A4600054 */ sh $zero, 0x54($v1) -/* A97394 800201F4 A4600056 */ sh $zero, 0x56($v1) -/* A97398 800201F8 A4600058 */ sh $zero, 0x58($v1) -/* A9739C 800201FC A460005A */ sh $zero, 0x5a($v1) -/* A973A0 80020200 AC60004C */ sw $zero, 0x4c($v1) -/* A973A4 80020204 A460005C */ sh $zero, 0x5c($v1) -/* A973A8 80020208 24630060 */ addiu $v1, $v1, 0x60 -/* A973AC 8002020C AC64FFA0 */ sw $a0, -0x60($v1) -/* A973B0 80020210 A460FFA8 */ sh $zero, -0x58($v1) -/* A973B4 80020214 A460FFAA */ sh $zero, -0x56($v1) -/* A973B8 80020218 A460FFAC */ sh $zero, -0x54($v1) -/* A973BC 8002021C A460FFAE */ sh $zero, -0x52($v1) -/* A973C0 80020220 A460FFB0 */ sh $zero, -0x50($v1) -/* A973C4 80020224 A460FFB2 */ sh $zero, -0x4e($v1) -/* A973C8 80020228 AC60FFA4 */ sw $zero, -0x5c($v1) -/* A973CC 8002022C 1445FFDA */ bne $v0, $a1, .L80020198 -/* A973D0 80020230 A460FFB4 */ sh $zero, -0x4c($v1) -/* A973D4 80020234 03E00008 */ jr $ra -/* A973D8 80020238 00000000 */ nop - -/* A973DC 8002023C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A973E0 80020240 1080003D */ beqz $a0, .L80020338 -/* A973E4 80020244 AFBF0014 */ sw $ra, 0x14($sp) -/* A973E8 80020248 50A0003C */ beql $a1, $zero, .L8002033C -/* A973EC 8002024C 8FBF0014 */ lw $ra, 0x14($sp) -/* A973F0 80020250 AFA40018 */ sw $a0, 0x18($sp) -/* A973F4 80020254 0C008061 */ jal func_80020184 -/* A973F8 80020258 AFA5001C */ sw $a1, 0x1c($sp) -/* A973FC 8002025C 8FA5001C */ lw $a1, 0x1c($sp) -/* A97400 80020260 8FA40018 */ lw $a0, 0x18($sp) -/* A97404 80020264 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* A97408 80020268 90AE0184 */ lbu $t6, 0x184($a1) -/* A9740C 8002026C 44812000 */ mtc1 $at, $f4 -/* A97410 80020270 A08E018E */ sb $t6, 0x18e($a0) -/* A97414 80020274 90AF0188 */ lbu $t7, 0x188($a1) -/* A97418 80020278 A08F0192 */ sb $t7, 0x192($a0) -/* A9741C 8002027C 90B8018C */ lbu $t8, 0x18c($a1) -/* A97420 80020280 A0980196 */ sb $t8, 0x196($a0) -/* A97424 80020284 90B90190 */ lbu $t9, 0x190($a1) -/* A97428 80020288 A099019A */ sb $t9, 0x19a($a0) -/* A9742C 8002028C 90A80185 */ lbu $t0, 0x185($a1) -/* A97430 80020290 A088018F */ sb $t0, 0x18f($a0) -/* A97434 80020294 90A90189 */ lbu $t1, 0x189($a1) -/* A97438 80020298 A0890193 */ sb $t1, 0x193($a0) -/* A9743C 8002029C 90AA018D */ lbu $t2, 0x18d($a1) -/* A97440 800202A0 A08A0197 */ sb $t2, 0x197($a0) -/* A97444 800202A4 90AB0191 */ lbu $t3, 0x191($a1) -/* A97448 800202A8 A08B019B */ sb $t3, 0x19b($a0) -/* A9744C 800202AC 90AC0186 */ lbu $t4, 0x186($a1) -/* A97450 800202B0 A08C0190 */ sb $t4, 0x190($a0) -/* A97454 800202B4 90AD018A */ lbu $t5, 0x18a($a1) -/* A97458 800202B8 A08D0194 */ sb $t5, 0x194($a0) -/* A9745C 800202BC 90AE018E */ lbu $t6, 0x18e($a1) -/* A97460 800202C0 A08E0198 */ sb $t6, 0x198($a0) -/* A97464 800202C4 90AF0192 */ lbu $t7, 0x192($a1) -/* A97468 800202C8 A08F019C */ sb $t7, 0x19c($a0) -/* A9746C 800202CC 90B80187 */ lbu $t8, 0x187($a1) -/* A97470 800202D0 A0980191 */ sb $t8, 0x191($a0) -/* A97474 800202D4 90B9018B */ lbu $t9, 0x18b($a1) -/* A97478 800202D8 A0990195 */ sb $t9, 0x195($a0) -/* A9747C 800202DC 90A8018F */ lbu $t0, 0x18f($a1) -/* A97480 800202E0 A0880199 */ sb $t0, 0x199($a0) -/* A97484 800202E4 90A90193 */ lbu $t1, 0x193($a1) -/* A97488 800202E8 A089019D */ sb $t1, 0x19d($a0) -/* A9748C 800202EC 8CAA0194 */ lw $t2, 0x194($a1) -/* A97490 800202F0 A08A019F */ sb $t2, 0x19f($a0) -/* A97494 800202F4 8CAB0198 */ lw $t3, 0x198($a1) -/* A97498 800202F8 A08B01A0 */ sb $t3, 0x1a0($a0) -/* A9749C 800202FC 8CAC019C */ lw $t4, 0x19c($a1) -/* A974A0 80020300 A4800188 */ sh $zero, 0x188($a0) -/* A974A4 80020304 A480018A */ sh $zero, 0x18a($a0) -/* A974A8 80020308 A480018C */ sh $zero, 0x18c($a0) -/* A974AC 8002030C A08001A1 */ sb $zero, 0x1a1($a0) -/* A974B0 80020310 A08001A2 */ sb $zero, 0x1a2($a0) -/* A974B4 80020314 A08001A3 */ sb $zero, 0x1a3($a0) -/* A974B8 80020318 A08001A4 */ sb $zero, 0x1a4($a0) -/* A974BC 8002031C A08001A5 */ sb $zero, 0x1a5($a0) -/* A974C0 80020320 A08001A6 */ sb $zero, 0x1a6($a0) -/* A974C4 80020324 A08001A7 */ sb $zero, 0x1a7($a0) -/* A974C8 80020328 A08001A8 */ sb $zero, 0x1a8($a0) -/* A974CC 8002032C A08001A9 */ sb $zero, 0x1a9($a0) -/* A974D0 80020330 E4840184 */ swc1 $f4, 0x184($a0) -/* A974D4 80020334 AC8C0180 */ sw $t4, 0x180($a0) -.L80020338: -/* A974D8 80020338 8FBF0014 */ lw $ra, 0x14($sp) -.L8002033C: -/* A974DC 8002033C 27BD0018 */ addiu $sp, $sp, 0x18 -/* A974E0 80020340 03E00008 */ jr $ra -/* A974E4 80020344 00000000 */ nop - -/* A974E8 80020348 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A974EC 8002034C 10800046 */ beqz $a0, .L80020468 -/* A974F0 80020350 AFBF0014 */ sw $ra, 0x14($sp) -/* A974F4 80020354 50A00045 */ beql $a1, $zero, .L8002046C -/* A974F8 80020358 8FBF0014 */ lw $ra, 0x14($sp) -/* A974FC 8002035C AFA40018 */ sw $a0, 0x18($sp) -/* A97500 80020360 0C008061 */ jal func_80020184 -/* A97504 80020364 AFA5001C */ sw $a1, 0x1c($sp) -/* A97508 80020368 8FA5001C */ lw $a1, 0x1c($sp) -/* A9750C 8002036C 8FA40018 */ lw $a0, 0x18($sp) -/* A97510 80020370 3C014F80 */ li $at, 0x4F800000 # 0.000000 -/* A97514 80020374 90AE0008 */ lbu $t6, 8($a1) -/* A97518 80020378 A08E018E */ sb $t6, 0x18e($a0) -/* A9751C 8002037C 90AF000C */ lbu $t7, 0xc($a1) -/* A97520 80020380 A08F0192 */ sb $t7, 0x192($a0) -/* A97524 80020384 90B80010 */ lbu $t8, 0x10($a1) -/* A97528 80020388 A0980196 */ sb $t8, 0x196($a0) -/* A9752C 8002038C 90B90014 */ lbu $t9, 0x14($a1) -/* A97530 80020390 A099019A */ sb $t9, 0x19a($a0) -/* A97534 80020394 90A80009 */ lbu $t0, 9($a1) -/* A97538 80020398 A088018F */ sb $t0, 0x18f($a0) -/* A9753C 8002039C 90A9000D */ lbu $t1, 0xd($a1) -/* A97540 800203A0 A0890193 */ sb $t1, 0x193($a0) -/* A97544 800203A4 90AA0011 */ lbu $t2, 0x11($a1) -/* A97548 800203A8 A08A0197 */ sb $t2, 0x197($a0) -/* A9754C 800203AC 90AB0015 */ lbu $t3, 0x15($a1) -/* A97550 800203B0 A08B019B */ sb $t3, 0x19b($a0) -/* A97554 800203B4 90AC000A */ lbu $t4, 0xa($a1) -/* A97558 800203B8 A08C0190 */ sb $t4, 0x190($a0) -/* A9755C 800203BC 90AD000E */ lbu $t5, 0xe($a1) -/* A97560 800203C0 A08D0194 */ sb $t5, 0x194($a0) -/* A97564 800203C4 90AE0012 */ lbu $t6, 0x12($a1) -/* A97568 800203C8 A08E0198 */ sb $t6, 0x198($a0) -/* A9756C 800203CC 90AF0016 */ lbu $t7, 0x16($a1) -/* A97570 800203D0 A08F019C */ sb $t7, 0x19c($a0) -/* A97574 800203D4 90B8000B */ lbu $t8, 0xb($a1) -/* A97578 800203D8 A0980191 */ sb $t8, 0x191($a0) -/* A9757C 800203DC 90B9000F */ lbu $t9, 0xf($a1) -/* A97580 800203E0 A0990195 */ sb $t9, 0x195($a0) -/* A97584 800203E4 90A80013 */ lbu $t0, 0x13($a1) -/* A97588 800203E8 A0880199 */ sb $t0, 0x199($a0) -/* A9758C 800203EC 90A90017 */ lbu $t1, 0x17($a1) -/* A97590 800203F0 A089019D */ sb $t1, 0x19d($a0) -/* A97594 800203F4 90AA0018 */ lbu $t2, 0x18($a1) -/* A97598 800203F8 A08A019F */ sb $t2, 0x19f($a0) -/* A9759C 800203FC 90AB0019 */ lbu $t3, 0x19($a1) -/* A975A0 80020400 A08B01A0 */ sb $t3, 0x1a0($a0) -/* A975A4 80020404 8CAC0000 */ lw $t4, ($a1) -/* A975A8 80020408 AC8C0180 */ sw $t4, 0x180($a0) -/* A975AC 8002040C 94AD0004 */ lhu $t5, 4($a1) -/* A975B0 80020410 A48D0188 */ sh $t5, 0x188($a0) -/* A975B4 80020414 90AE001A */ lbu $t6, 0x1a($a1) -/* A975B8 80020418 A08E01A1 */ sb $t6, 0x1a1($a0) -/* A975BC 8002041C 84AF0006 */ lh $t7, 6($a1) -/* A975C0 80020420 A480018C */ sh $zero, 0x18c($a0) -/* A975C4 80020424 A48F018A */ sh $t7, 0x18a($a0) -/* A975C8 80020428 90B8001B */ lbu $t8, 0x1b($a1) -/* A975CC 8002042C 44982000 */ mtc1 $t8, $f4 -/* A975D0 80020430 07010004 */ bgez $t8, .L80020444 -/* A975D4 80020434 468021A0 */ cvt.s.w $f6, $f4 -/* A975D8 80020438 44814000 */ mtc1 $at, $f8 -/* A975DC 8002043C 00000000 */ nop -/* A975E0 80020440 46083180 */ add.s $f6, $f6, $f8 -.L80020444: -/* A975E4 80020444 E4860184 */ swc1 $f6, 0x184($a0) -/* A975E8 80020448 88A8001C */ lwl $t0, 0x1c($a1) -/* A975EC 8002044C 98A8001F */ lwr $t0, 0x1f($a1) -/* A975F0 80020450 A88801A2 */ swl $t0, 0x1a2($a0) -/* A975F4 80020454 B88801A5 */ swr $t0, 0x1a5($a0) -/* A975F8 80020458 88AA0020 */ lwl $t2, 0x20($a1) -/* A975FC 8002045C 98AA0023 */ lwr $t2, 0x23($a1) -/* A97600 80020460 A88A01A6 */ swl $t2, 0x1a6($a0) -/* A97604 80020464 B88A01A9 */ swr $t2, 0x1a9($a0) -.L80020468: -/* A97608 80020468 8FBF0014 */ lw $ra, 0x14($sp) -.L8002046C: -/* A9760C 8002046C 27BD0018 */ addiu $sp, $sp, 0x18 -/* A97610 80020470 03E00008 */ jr $ra -/* A97614 80020474 00000000 */ nop - -/* A97618 80020478 03E00008 */ jr $ra -/* A9761C 8002047C AFA40000 */ sw $a0, ($sp) - +glabel EffectBlure_Update /* A97620 80020480 27BDFFF8 */ addiu $sp, $sp, -8 /* A97624 80020484 14800003 */ bnez $a0, .L80020494 /* A97628 80020488 AFB00004 */ sw $s0, 4($sp) diff --git a/asm/non_matchings/code/z_eff_blure/func_8001FDF0.s b/asm/non_matchings/code/z_eff_blure/func_8001FDF0.s deleted file mode 100644 index d16b1cdb86..0000000000 --- a/asm/non_matchings/code/z_eff_blure/func_8001FDF0.s +++ /dev/null @@ -1,257 +0,0 @@ -.rdata -glabel D_80135130 - .asciz "ブラ─頂点追加処理:テーブルオーバー %d\n" - # EUC-JP: ブラ─頂点追加処理:テーブルオーバー | Bra vertex addition processing: table over - .balign 4 - -glabel D_80135158 - .asciz "ブラ─空白追加処理:テーブルオーバー %d\n" - # EUC-JP: ブラ─空白追加処理:テーブルオーバー %d | Black space addition processing: Table over% d - .balign 4 - -.late_rodata -glabel D_8013542C - .float 0.008 - -.text -glabel func_8001FDF0 -/* A96F90 8001FDF0 27BDFE80 */ addiu $sp, $sp, -0x180 -/* A96F94 8001FDF4 AFB30028 */ sw $s3, 0x28($sp) -/* A96F98 8001FDF8 AFB20024 */ sw $s2, 0x24($sp) -/* A96F9C 8001FDFC AFB10020 */ sw $s1, 0x20($sp) -/* A96FA0 8001FE00 00808825 */ move $s1, $a0 -/* A96FA4 8001FE04 00A09025 */ move $s2, $a1 -/* A96FA8 8001FE08 00C09825 */ move $s3, $a2 -/* A96FAC 8001FE0C AFBF002C */ sw $ra, 0x2c($sp) -/* A96FB0 8001FE10 108000BC */ beqz $a0, .L80020104 -/* A96FB4 8001FE14 AFB0001C */ sw $s0, 0x1c($sp) -/* A96FB8 8001FE18 9085019E */ lbu $a1, 0x19e($a0) -/* A96FBC 8001FE1C 3C048013 */ lui $a0, %hi(D_80135130) -/* A96FC0 8001FE20 240F0001 */ li $t7, 1 -/* A96FC4 8001FE24 28A10010 */ slti $at, $a1, 0x10 -/* A96FC8 8001FE28 14200005 */ bnez $at, .L8001FE40 -/* A96FCC 8001FE2C 00057080 */ sll $t6, $a1, 2 -/* A96FD0 8001FE30 0C00084C */ jal osSyncPrintf -/* A96FD4 8001FE34 24845130 */ addiu $a0, %lo(D_80135130) # addiu $a0, $a0, 0x5130 -/* A96FD8 8001FE38 100000B3 */ b .L80020108 -/* A96FDC 8001FE3C 8FBF002C */ lw $ra, 0x2c($sp) -.L8001FE40: -/* A96FE0 8001FE40 01C57023 */ subu $t6, $t6, $a1 -/* A96FE4 8001FE44 000E70C0 */ sll $t6, $t6, 3 -/* A96FE8 8001FE48 022E8021 */ addu $s0, $s1, $t6 -/* A96FEC 8001FE4C AE0F0000 */ sw $t7, ($s0) -/* A96FF0 8001FE50 96380188 */ lhu $t8, 0x188($s1) -/* A96FF4 8001FE54 33190002 */ andi $t9, $t8, 2 -/* A96FF8 8001FE58 57200020 */ bnezl $t9, .L8001FEDC -/* A96FFC 8001FE5C 860AFFF6 */ lh $t2, -0xa($s0) -/* A97000 8001FE60 C6440000 */ lwc1 $f4, ($s2) -/* A97004 8001FE64 4600218D */ trunc.w.s $f6, $f4 -/* A97008 8001FE68 44093000 */ mfc1 $t1, $f6 -/* A9700C 8001FE6C 00000000 */ nop -/* A97010 8001FE70 A6090008 */ sh $t1, 8($s0) -/* A97014 8001FE74 C6480004 */ lwc1 $f8, 4($s2) -/* A97018 8001FE78 4600428D */ trunc.w.s $f10, $f8 -/* A9701C 8001FE7C 440B5000 */ mfc1 $t3, $f10 -/* A97020 8001FE80 00000000 */ nop -/* A97024 8001FE84 A60B000A */ sh $t3, 0xa($s0) -/* A97028 8001FE88 C6500008 */ lwc1 $f16, 8($s2) -/* A9702C 8001FE8C 4600848D */ trunc.w.s $f18, $f16 -/* A97030 8001FE90 440D9000 */ mfc1 $t5, $f18 -/* A97034 8001FE94 00000000 */ nop -/* A97038 8001FE98 A60D000C */ sh $t5, 0xc($s0) -/* A9703C 8001FE9C C6640000 */ lwc1 $f4, ($s3) -/* A97040 8001FEA0 4600218D */ trunc.w.s $f6, $f4 -/* A97044 8001FEA4 440F3000 */ mfc1 $t7, $f6 -/* A97048 8001FEA8 00000000 */ nop -/* A9704C 8001FEAC A60F000E */ sh $t7, 0xe($s0) -/* A97050 8001FEB0 C6680004 */ lwc1 $f8, 4($s3) -/* A97054 8001FEB4 4600428D */ trunc.w.s $f10, $f8 -/* A97058 8001FEB8 44195000 */ mfc1 $t9, $f10 -/* A9705C 8001FEBC 00000000 */ nop -/* A97060 8001FEC0 A6190010 */ sh $t9, 0x10($s0) -/* A97064 8001FEC4 C6700008 */ lwc1 $f16, 8($s3) -/* A97068 8001FEC8 4600848D */ trunc.w.s $f18, $f16 -/* A9706C 8001FECC 44099000 */ mfc1 $t1, $f18 -/* A97070 8001FED0 10000087 */ b .L800200F0 -/* A97074 8001FED4 A6090012 */ sh $t1, 0x12($s0) -/* A97078 8001FED8 860AFFF6 */ lh $t2, -0xa($s0) -.L8001FEDC: -/* A9707C 8001FEDC 860BFFF0 */ lh $t3, -0x10($s0) -/* A97080 8001FEE0 3C013F00 */ li $at, 0x3F000000 # 0.000000 -/* A97084 8001FEE4 448A2000 */ mtc1 $t2, $f4 -/* A97088 8001FEE8 448B4000 */ mtc1 $t3, $f8 -/* A9708C 8001FEEC 44810000 */ mtc1 $at, $f0 -/* A97090 8001FEF0 468021A0 */ cvt.s.w $f6, $f4 -/* A97094 8001FEF4 27A40160 */ addiu $a0, $sp, 0x160 -/* A97098 8001FEF8 27A5016C */ addiu $a1, $sp, 0x16c -/* A9709C 8001FEFC 27A60154 */ addiu $a2, $sp, 0x154 -/* A970A0 8001FF00 468042A0 */ cvt.s.w $f10, $f8 -/* A970A4 8001FF04 460A3400 */ add.s $f16, $f6, $f10 -/* A970A8 8001FF08 46008482 */ mul.s $f18, $f16, $f0 -/* A970AC 8001FF0C E7B2016C */ swc1 $f18, 0x16c($sp) -/* A970B0 8001FF10 860DFFF2 */ lh $t5, -0xe($s0) -/* A970B4 8001FF14 860CFFF8 */ lh $t4, -8($s0) -/* A970B8 8001FF18 448D3000 */ mtc1 $t5, $f6 -/* A970BC 8001FF1C 448C2000 */ mtc1 $t4, $f4 -/* A970C0 8001FF20 468032A0 */ cvt.s.w $f10, $f6 -/* A970C4 8001FF24 46802220 */ cvt.s.w $f8, $f4 -/* A970C8 8001FF28 460A4400 */ add.s $f16, $f8, $f10 -/* A970CC 8001FF2C 46008482 */ mul.s $f18, $f16, $f0 -/* A970D0 8001FF30 E7B20170 */ swc1 $f18, 0x170($sp) -/* A970D4 8001FF34 860FFFF4 */ lh $t7, -0xc($s0) -/* A970D8 8001FF38 860EFFFA */ lh $t6, -6($s0) -/* A970DC 8001FF3C 448F4000 */ mtc1 $t7, $f8 -/* A970E0 8001FF40 448E2000 */ mtc1 $t6, $f4 -/* A970E4 8001FF44 468042A0 */ cvt.s.w $f10, $f8 -/* A970E8 8001FF48 468021A0 */ cvt.s.w $f6, $f4 -/* A970EC 8001FF4C 460A3400 */ add.s $f16, $f6, $f10 -/* A970F0 8001FF50 46008482 */ mul.s $f18, $f16, $f0 -/* A970F4 8001FF54 E7B20174 */ swc1 $f18, 0x174($sp) -/* A970F8 8001FF58 C6680000 */ lwc1 $f8, ($s3) -/* A970FC 8001FF5C C6440000 */ lwc1 $f4, ($s2) -/* A97100 8001FF60 46082180 */ add.s $f6, $f4, $f8 -/* A97104 8001FF64 46003282 */ mul.s $f10, $f6, $f0 -/* A97108 8001FF68 E7AA0160 */ swc1 $f10, 0x160($sp) -/* A9710C 8001FF6C C6720004 */ lwc1 $f18, 4($s3) -/* A97110 8001FF70 C6500004 */ lwc1 $f16, 4($s2) -/* A97114 8001FF74 46128100 */ add.s $f4, $f16, $f18 -/* A97118 8001FF78 46002202 */ mul.s $f8, $f4, $f0 -/* A9711C 8001FF7C E7A80164 */ swc1 $f8, 0x164($sp) -/* A97120 8001FF80 C66A0008 */ lwc1 $f10, 8($s3) -/* A97124 8001FF84 C6460008 */ lwc1 $f6, 8($s2) -/* A97128 8001FF88 460A3400 */ add.s $f16, $f6, $f10 -/* A9712C 8001FF8C 46008482 */ mul.s $f18, $f16, $f0 -/* A97130 8001FF90 0C01DFB4 */ jal Math_Vec3f_Diff -/* A97134 8001FF94 E7B20168 */ swc1 $f18, 0x168($sp) -/* A97138 8001FF98 0C032D8A */ jal Math3D_Vec3fMagnitude -/* A9713C 8001FF9C 27A40154 */ addiu $a0, $sp, 0x154 -/* A97140 8001FFA0 3C018013 */ lui $at, %hi(D_8013542C) -/* A97144 8001FFA4 C424542C */ lwc1 $f4, %lo(D_8013542C)($at) -/* A97148 8001FFA8 46000086 */ mov.s $f2, $f0 -/* A9714C 8001FFAC 46000005 */ abs.s $f0, $f0 -/* A97150 8001FFB0 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* A97154 8001FFB4 4604003C */ c.lt.s $f0, $f4 -/* A97158 8001FFB8 00000000 */ nop -/* A9715C 8001FFBC 4503004D */ bc1tl .L800200F4 -/* A97160 8001FFC0 24080001 */ li $t0, 1 -/* A97164 8001FFC4 44814000 */ mtc1 $at, $f8 -/* A97168 8001FFC8 27A40154 */ addiu $a0, $sp, 0x154 -/* A9716C 8001FFCC 46024083 */ div.s $f2, $f8, $f2 -/* A97170 8001FFD0 44051000 */ mfc1 $a1, $f2 -/* A97174 8001FFD4 0C01DFD7 */ jal Math_Vec3f_Scale -/* A97178 8001FFD8 00000000 */ nop -/* A9717C 8001FFDC 27A40110 */ addiu $a0, $sp, 0x110 -/* A97180 8001FFE0 8FA50160 */ lw $a1, 0x160($sp) -/* A97184 8001FFE4 8FA60164 */ lw $a2, 0x164($sp) -/* A97188 8001FFE8 0C029E89 */ jal func_800A7A24 -/* A9718C 8001FFEC 8FA70168 */ lw $a3, 0x168($sp) -/* A97190 8001FFF0 C7A6015C */ lwc1 $f6, 0x15c($sp) -/* A97194 8001FFF4 8625018C */ lh $a1, 0x18c($s1) -/* A97198 8001FFF8 27A400D0 */ addiu $a0, $sp, 0xd0 -/* A9719C 8001FFFC 8FA60154 */ lw $a2, 0x154($sp) -/* A971A0 80020000 8FA70158 */ lw $a3, 0x158($sp) -/* A971A4 80020004 0C029FB0 */ jal func_800A7EC0 -/* A971A8 80020008 E7A60010 */ swc1 $f6, 0x10($sp) -/* A971AC 8002000C 27A40110 */ addiu $a0, $sp, 0x110 -/* A971B0 80020010 27A500D0 */ addiu $a1, $sp, 0xd0 -/* A971B4 80020014 0C029BE8 */ jal func_800A6FA0 -/* A971B8 80020018 27A60090 */ addiu $a2, $sp, 0x90 -/* A971BC 8002001C C7AA0160 */ lwc1 $f10, 0x160($sp) -/* A971C0 80020020 C7B20164 */ lwc1 $f18, 0x164($sp) -/* A971C4 80020024 C7A80168 */ lwc1 $f8, 0x168($sp) -/* A971C8 80020028 46005407 */ neg.s $f16, $f10 -/* A971CC 8002002C 46009107 */ neg.s $f4, $f18 -/* A971D0 80020030 46004187 */ neg.s $f6, $f8 -/* A971D4 80020034 44062000 */ mfc1 $a2, $f4 -/* A971D8 80020038 44073000 */ mfc1 $a3, $f6 -/* A971DC 8002003C 44058000 */ mfc1 $a1, $f16 -/* A971E0 80020040 0C029E89 */ jal func_800A7A24 -/* A971E4 80020044 27A40110 */ addiu $a0, $sp, 0x110 -/* A971E8 80020048 27A40090 */ addiu $a0, $sp, 0x90 -/* A971EC 8002004C 27A50110 */ addiu $a1, $sp, 0x110 -/* A971F0 80020050 0C029BE8 */ jal func_800A6FA0 -/* A971F4 80020054 27A60050 */ addiu $a2, $sp, 0x50 -/* A971F8 80020058 27A40050 */ addiu $a0, $sp, 0x50 -/* A971FC 8002005C 02402825 */ move $a1, $s2 -/* A97200 80020060 0C029BBD */ jal func_800A6EF4 -/* A97204 80020064 27A60038 */ addiu $a2, $sp, 0x38 -/* A97208 80020068 27A40050 */ addiu $a0, $sp, 0x50 -/* A9720C 8002006C 02602825 */ move $a1, $s3 -/* A97210 80020070 0C029BBD */ jal func_800A6EF4 -/* A97214 80020074 27A60044 */ addiu $a2, $sp, 0x44 -/* A97218 80020078 C7AA0038 */ lwc1 $f10, 0x38($sp) -/* A9721C 8002007C 4600540D */ trunc.w.s $f16, $f10 -/* A97220 80020080 44198000 */ mfc1 $t9, $f16 -/* A97224 80020084 00000000 */ nop -/* A97228 80020088 A6190008 */ sh $t9, 8($s0) -/* A9722C 8002008C C7B2003C */ lwc1 $f18, 0x3c($sp) -/* A97230 80020090 4600910D */ trunc.w.s $f4, $f18 -/* A97234 80020094 44092000 */ mfc1 $t1, $f4 -/* A97238 80020098 00000000 */ nop -/* A9723C 8002009C A609000A */ sh $t1, 0xa($s0) -/* A97240 800200A0 C7A80040 */ lwc1 $f8, 0x40($sp) -/* A97244 800200A4 4600418D */ trunc.w.s $f6, $f8 -/* A97248 800200A8 440B3000 */ mfc1 $t3, $f6 -/* A9724C 800200AC 00000000 */ nop -/* A97250 800200B0 A60B000C */ sh $t3, 0xc($s0) -/* A97254 800200B4 C7AA0044 */ lwc1 $f10, 0x44($sp) -/* A97258 800200B8 4600540D */ trunc.w.s $f16, $f10 -/* A9725C 800200BC 440D8000 */ mfc1 $t5, $f16 -/* A97260 800200C0 00000000 */ nop -/* A97264 800200C4 A60D000E */ sh $t5, 0xe($s0) -/* A97268 800200C8 C7B20048 */ lwc1 $f18, 0x48($sp) -/* A9726C 800200CC 4600910D */ trunc.w.s $f4, $f18 -/* A97270 800200D0 440F2000 */ mfc1 $t7, $f4 -/* A97274 800200D4 00000000 */ nop -/* A97278 800200D8 A60F0010 */ sh $t7, 0x10($s0) -/* A9727C 800200DC C7A8004C */ lwc1 $f8, 0x4c($sp) -/* A97280 800200E0 4600418D */ trunc.w.s $f6, $f8 -/* A97284 800200E4 44193000 */ mfc1 $t9, $f6 -/* A97288 800200E8 00000000 */ nop -/* A9728C 800200EC A6190012 */ sh $t9, 0x12($s0) -.L800200F0: -/* A97290 800200F0 24080001 */ li $t0, 1 -.L800200F4: -/* A97294 800200F4 AE080004 */ sw $t0, 4($s0) -/* A97298 800200F8 9229019E */ lbu $t1, 0x19e($s1) -/* A9729C 800200FC 252A0001 */ addiu $t2, $t1, 1 -/* A972A0 80020100 A22A019E */ sb $t2, 0x19e($s1) -.L80020104: -/* A972A4 80020104 8FBF002C */ lw $ra, 0x2c($sp) -.L80020108: -/* A972A8 80020108 8FB0001C */ lw $s0, 0x1c($sp) -/* A972AC 8002010C 8FB10020 */ lw $s1, 0x20($sp) -/* A972B0 80020110 8FB20024 */ lw $s2, 0x24($sp) -/* A972B4 80020114 8FB30028 */ lw $s3, 0x28($sp) -/* A972B8 80020118 03E00008 */ jr $ra -/* A972BC 8002011C 27BD0180 */ addiu $sp, $sp, 0x180 -glabel func_80020120 -/* A972C0 80020120 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A972C4 80020124 10800013 */ beqz $a0, .L80020174 -/* A972C8 80020128 AFBF0014 */ sw $ra, 0x14($sp) -/* A972CC 8002012C 9085019E */ lbu $a1, 0x19e($a0) -/* A972D0 80020130 240F0001 */ li $t7, 1 -/* A972D4 80020134 28A10010 */ slti $at, $a1, 0x10 -/* A972D8 80020138 14200006 */ bnez $at, .L80020154 -/* A972DC 8002013C 00057080 */ sll $t6, $a1, 2 -/* A972E0 80020140 3C048013 */ lui $a0, %hi(D_80135158) # $a0, 0x8013 -/* A972E4 80020144 0C00084C */ jal osSyncPrintf -/* A972E8 80020148 24845158 */ addiu $a0, %lo(D_80135158) # addiu $a0, $a0, 0x5158 -/* A972EC 8002014C 1000000A */ b .L80020178 -/* A972F0 80020150 8FBF0014 */ lw $ra, 0x14($sp) -.L80020154: -/* A972F4 80020154 01C57023 */ subu $t6, $t6, $a1 -/* A972F8 80020158 000E70C0 */ sll $t6, $t6, 3 -/* A972FC 8002015C 008E1021 */ addu $v0, $a0, $t6 -/* A97300 80020160 AC400000 */ sw $zero, ($v0) -/* A97304 80020164 AC4F0004 */ sw $t7, 4($v0) -/* A97308 80020168 9098019E */ lbu $t8, 0x19e($a0) -/* A9730C 8002016C 27190001 */ addiu $t9, $t8, 1 -/* A97310 80020170 A099019E */ sb $t9, 0x19e($a0) -.L80020174: -/* A97314 80020174 8FBF0014 */ lw $ra, 0x14($sp) -.L80020178: -/* A97318 80020178 27BD0018 */ addiu $sp, $sp, 0x18 -/* A9731C 8002017C 03E00008 */ jr $ra -/* A97320 80020180 00000000 */ nop - diff --git a/asm/non_matchings/code/z_eff_blure/func_800208E0.s b/asm/non_matchings/code/z_eff_blure/func_800208E0.s deleted file mode 100644 index 029e6e0707..0000000000 --- a/asm/non_matchings/code/z_eff_blure/func_800208E0.s +++ /dev/null @@ -1,106 +0,0 @@ -.late_rodata -glabel D_80135430 - .float 0.7071 - -.text -glabel func_800208E0 -/* A97A80 800208E0 27BDFF90 */ addiu $sp, $sp, -0x70 -/* A97A84 800208E4 AFBF001C */ sw $ra, 0x1c($sp) -/* A97A88 800208E8 AFB00018 */ sw $s0, 0x18($sp) -/* A97A8C 800208EC 8C8EFFE8 */ lw $t6, -0x18($a0) -/* A97A90 800208F0 00808025 */ move $s0, $a0 -/* A97A94 800208F4 51C00007 */ beql $t6, $zero, .L80020914 -/* A97A98 800208F8 96180014 */ lhu $t8, 0x14($s0) -/* A97A9C 800208FC 8C8F0018 */ lw $t7, 0x18($a0) -/* A97AA0 80020900 27A40064 */ addiu $a0, $sp, 0x64 -/* A97AA4 80020904 26050008 */ addiu $a1, $s0, 8 -/* A97AA8 80020908 15E00007 */ bnez $t7, .L80020928 -/* A97AAC 8002090C 2602FFE8 */ addiu $v0, $s0, -0x18 -/* A97AB0 80020910 96180014 */ lhu $t8, 0x14($s0) -.L80020914: -/* A97AB4 80020914 3308FFFC */ andi $t0, $t8, 0xfffc -/* A97AB8 80020918 A6080014 */ sh $t0, 0x14($s0) -/* A97ABC 8002091C 35090002 */ ori $t1, $t0, 2 -/* A97AC0 80020920 10000046 */ b .L80020A3C -/* A97AC4 80020924 A6090014 */ sh $t1, 0x14($s0) -.L80020928: -/* A97AC8 80020928 24460008 */ addiu $a2, $v0, 8 -/* A97ACC 8002092C AFA20028 */ sw $v0, 0x28($sp) -/* A97AD0 80020930 0C01DFC1 */ jal Math_Vec3s_DiffToVec3f -/* A97AD4 80020934 AFA50024 */ sw $a1, 0x24($sp) -/* A97AD8 80020938 8FA20028 */ lw $v0, 0x28($sp) -/* A97ADC 8002093C 2605000E */ addiu $a1, $s0, 0xe -/* A97AE0 80020940 AFA50020 */ sw $a1, 0x20($sp) -/* A97AE4 80020944 27A40058 */ addiu $a0, $sp, 0x58 -/* A97AE8 80020948 0C01DFC1 */ jal Math_Vec3s_DiffToVec3f -/* A97AEC 8002094C 2446000E */ addiu $a2, $v0, 0xe -/* A97AF0 80020950 26020018 */ addiu $v0, $s0, 0x18 -/* A97AF4 80020954 24450008 */ addiu $a1, $v0, 8 -/* A97AF8 80020958 AFA20028 */ sw $v0, 0x28($sp) -/* A97AFC 8002095C 27A4004C */ addiu $a0, $sp, 0x4c -/* A97B00 80020960 0C01DFC1 */ jal Math_Vec3s_DiffToVec3f -/* A97B04 80020964 8FA60024 */ lw $a2, 0x24($sp) -/* A97B08 80020968 8FA20028 */ lw $v0, 0x28($sp) -/* A97B0C 8002096C 27A40040 */ addiu $a0, $sp, 0x40 -/* A97B10 80020970 8FA60020 */ lw $a2, 0x20($sp) -/* A97B14 80020974 0C01DFC1 */ jal Math_Vec3s_DiffToVec3f -/* A97B18 80020978 2445000E */ addiu $a1, $v0, 0xe -/* A97B1C 8002097C 27A40064 */ addiu $a0, $sp, 0x64 -/* A97B20 80020980 27A5004C */ addiu $a1, $sp, 0x4c -/* A97B24 80020984 0C032C04 */ jal func_800CB010 -/* A97B28 80020988 27A60034 */ addiu $a2, $sp, 0x34 -/* A97B2C 8002098C 1440000B */ bnez $v0, .L800209BC -/* A97B30 80020990 27A40058 */ addiu $a0, $sp, 0x58 -/* A97B34 80020994 27A50040 */ addiu $a1, $sp, 0x40 -/* A97B38 80020998 0C032C04 */ jal func_800CB010 -/* A97B3C 8002099C 27A60030 */ addiu $a2, $sp, 0x30 -/* A97B40 800209A0 14400006 */ bnez $v0, .L800209BC -/* A97B44 800209A4 27A4004C */ addiu $a0, $sp, 0x4c -/* A97B48 800209A8 27A50040 */ addiu $a1, $sp, 0x40 -/* A97B4C 800209AC 0C032C04 */ jal func_800CB010 -/* A97B50 800209B0 27A6002C */ addiu $a2, $sp, 0x2c -/* A97B54 800209B4 10400006 */ beqz $v0, .L800209D0 -/* A97B58 800209B8 3C01BF00 */ li $at, 0xBF000000 # 0.000000 -.L800209BC: -/* A97B5C 800209BC 960A0014 */ lhu $t2, 0x14($s0) -/* A97B60 800209C0 314CFFFC */ andi $t4, $t2, 0xfffc -/* A97B64 800209C4 A60C0014 */ sh $t4, 0x14($s0) -/* A97B68 800209C8 1000001C */ b .L80020A3C -/* A97B6C 800209CC A60C0014 */ sh $t4, 0x14($s0) -.L800209D0: -/* A97B70 800209D0 44810000 */ mtc1 $at, $f0 -/* A97B74 800209D4 C7A40034 */ lwc1 $f4, 0x34($sp) -/* A97B78 800209D8 C7A60030 */ lwc1 $f6, 0x30($sp) -/* A97B7C 800209DC 4600203E */ c.le.s $f4, $f0 -/* A97B80 800209E0 00000000 */ nop -/* A97B84 800209E4 4503000C */ bc1tl .L80020A18 -/* A97B88 800209E8 960D0014 */ lhu $t5, 0x14($s0) -/* A97B8C 800209EC 4600303E */ c.le.s $f6, $f0 -/* A97B90 800209F0 3C018013 */ lui $at, %hi(D_80135430) -/* A97B94 800209F4 C7AA002C */ lwc1 $f10, 0x2c($sp) -/* A97B98 800209F8 45030007 */ bc1tl .L80020A18 -/* A97B9C 800209FC 960D0014 */ lhu $t5, 0x14($s0) -/* A97BA0 80020A00 C4285430 */ lwc1 $f8, %lo(D_80135430)($at) -/* A97BA4 80020A04 4608503E */ c.le.s $f10, $f8 -/* A97BA8 80020A08 00000000 */ nop -/* A97BAC 80020A0C 45020007 */ bc1fl .L80020A2C -/* A97BB0 80020A10 96180014 */ lhu $t8, 0x14($s0) -/* A97BB4 80020A14 960D0014 */ lhu $t5, 0x14($s0) -.L80020A18: -/* A97BB8 80020A18 31AFFFFC */ andi $t7, $t5, 0xfffc -/* A97BBC 80020A1C A60F0014 */ sh $t7, 0x14($s0) -/* A97BC0 80020A20 10000006 */ b .L80020A3C -/* A97BC4 80020A24 A60F0014 */ sh $t7, 0x14($s0) -/* A97BC8 80020A28 96180014 */ lhu $t8, 0x14($s0) -.L80020A2C: -/* A97BCC 80020A2C 3308FFFC */ andi $t0, $t8, 0xfffc -/* A97BD0 80020A30 A6080014 */ sh $t0, 0x14($s0) -/* A97BD4 80020A34 35090001 */ ori $t1, $t0, 1 -/* A97BD8 80020A38 A6090014 */ sh $t1, 0x14($s0) -.L80020A3C: -/* A97BDC 80020A3C 8FBF001C */ lw $ra, 0x1c($sp) -/* A97BE0 80020A40 8FB00018 */ lw $s0, 0x18($sp) -/* A97BE4 80020A44 27BD0070 */ addiu $sp, $sp, 0x70 -/* A97BE8 80020A48 03E00008 */ jr $ra -/* A97BEC 80020A4C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_eff_blure/func_80020FC0.s b/asm/non_matchings/code/z_eff_blure/func_80020FC0.s deleted file mode 100644 index f218f0b4e3..0000000000 --- a/asm/non_matchings/code/z_eff_blure/func_80020FC0.s +++ /dev/null @@ -1,353 +0,0 @@ -.rdata -glabel D_80135180 - .asciz "../z_eff_blure.c" - .balign 4 - -glabel D_80135194 - .asciz "../z_eff_blure.c" - .balign 4 - -glabel D_801351A8 - .asciz "../z_eff_blure.c" - .balign 4 - -glabel D_801351BC - .asciz "z_eff_blure.c::SQ_NoInterpolate_disp() 頂点確保できず。\n" - # EUC-JP: 頂点確保できず。 | The vertex cannot be secured. - .balign 4 - -glabel D_801351F8 - .asciz "../z_eff_blure.c" - .balign 4 - -.text -glabel func_80020FC0 -/* A98160 80020FC0 27BDFF68 */ addiu $sp, $sp, -0x98 -/* A98164 80020FC4 AFB10028 */ sw $s1, 0x28($sp) -/* A98168 80020FC8 AFA5009C */ sw $a1, 0x9c($sp) -/* A9816C 80020FCC AFA600A0 */ sw $a2, 0xa0($sp) -/* A98170 80020FD0 00E08825 */ move $s1, $a3 -/* A98174 80020FD4 AFBF002C */ sw $ra, 0x2c($sp) -/* A98178 80020FD8 AFA40098 */ sw $a0, 0x98($sp) -/* A9817C 80020FDC 3C068013 */ lui $a2, %hi(D_801351A8) # $a2, 0x8013 -/* A98180 80020FE0 00E02825 */ move $a1, $a3 -/* A98184 80020FE4 AFB00024 */ sw $s0, 0x24($sp) -/* A98188 80020FE8 24070346 */ li $a3, 838 -/* A9818C 80020FEC 24C651A8 */ addiu $a2, %lo(D_801351A8) # addiu $a2, $a2, 0x51a8 -/* A98190 80020FF0 0C031AB1 */ jal Graph_OpenDisps -/* A98194 80020FF4 27A40040 */ addiu $a0, $sp, 0x40 -/* A98198 80020FF8 8FA50098 */ lw $a1, 0x98($sp) -/* A9819C 80020FFC 27A4006C */ addiu $a0, $sp, 0x6c -/* A981A0 80021000 0C01DF97 */ jal Math_Vec3s_ToVec3f -/* A981A4 80021004 24A5000E */ addiu $a1, $a1, 0xe -/* A981A8 80021008 02202025 */ move $a0, $s1 -/* A981AC 8002100C 0C031A73 */ jal Graph_Alloc -/* A981B0 80021010 24050040 */ li $a1, 64 -/* A981B4 80021014 14400006 */ bnez $v0, .L80021030 -/* A981B8 80021018 00408025 */ move $s0, $v0 -/* A981BC 8002101C 3C048013 */ lui $a0, %hi(D_801351BC) # $a0, 0x8013 -/* A981C0 80021020 0C00084C */ jal osSyncPrintf -/* A981C4 80021024 248451BC */ addiu $a0, %lo(D_801351BC) # addiu $a0, $a0, 0x51bc -/* A981C8 80021028 1000011E */ b .L800214A4 -/* A981CC 8002102C 00000000 */ nop -.L80021030: -/* A981D0 80021030 3C028011 */ lui $v0, %hi(D_80115760) # $v0, 0x8011 -/* A981D4 80021034 24425760 */ addiu $v0, %lo(D_80115760) # addiu $v0, $v0, 0x5760 -/* A981D8 80021038 8C4F0000 */ lw $t7, ($v0) -/* A981DC 8002103C 8FA40098 */ lw $a0, 0x98($sp) -/* A981E0 80021040 AA0F0000 */ swl $t7, ($s0) -/* A981E4 80021044 BA0F0003 */ swr $t7, 3($s0) -/* A981E8 80021048 8C4E0004 */ lw $t6, 4($v0) -/* A981EC 8002104C AA0E0004 */ swl $t6, 4($s0) -/* A981F0 80021050 BA0E0007 */ swr $t6, 7($s0) -/* A981F4 80021054 8C4F0008 */ lw $t7, 8($v0) -/* A981F8 80021058 AA0F0008 */ swl $t7, 8($s0) -/* A981FC 8002105C BA0F000B */ swr $t7, 0xb($s0) -/* A98200 80021060 8C4E000C */ lw $t6, 0xc($v0) -/* A98204 80021064 AA0E000C */ swl $t6, 0xc($s0) -/* A98208 80021068 BA0E000F */ swr $t6, 0xf($s0) -/* A9820C 8002106C 8C590000 */ lw $t9, ($v0) -/* A98210 80021070 AA190010 */ swl $t9, 0x10($s0) -/* A98214 80021074 BA190013 */ swr $t9, 0x13($s0) -/* A98218 80021078 8C580004 */ lw $t8, 4($v0) -/* A9821C 8002107C AA180014 */ swl $t8, 0x14($s0) -/* A98220 80021080 BA180017 */ swr $t8, 0x17($s0) -/* A98224 80021084 8C590008 */ lw $t9, 8($v0) -/* A98228 80021088 AA190018 */ swl $t9, 0x18($s0) -/* A9822C 8002108C BA19001B */ swr $t9, 0x1b($s0) -/* A98230 80021090 8C58000C */ lw $t8, 0xc($v0) -/* A98234 80021094 AA18001C */ swl $t8, 0x1c($s0) -/* A98238 80021098 BA18001F */ swr $t8, 0x1f($s0) -/* A9823C 8002109C 8C490000 */ lw $t1, ($v0) -/* A98240 800210A0 AA090020 */ swl $t1, 0x20($s0) -/* A98244 800210A4 BA090023 */ swr $t1, 0x23($s0) -/* A98248 800210A8 8C480004 */ lw $t0, 4($v0) -/* A9824C 800210AC AA080024 */ swl $t0, 0x24($s0) -/* A98250 800210B0 BA080027 */ swr $t0, 0x27($s0) -/* A98254 800210B4 8C490008 */ lw $t1, 8($v0) -/* A98258 800210B8 AA090028 */ swl $t1, 0x28($s0) -/* A9825C 800210BC BA09002B */ swr $t1, 0x2b($s0) -/* A98260 800210C0 8C48000C */ lw $t0, 0xc($v0) -/* A98264 800210C4 AA08002C */ swl $t0, 0x2c($s0) -/* A98268 800210C8 BA08002F */ swr $t0, 0x2f($s0) -/* A9826C 800210CC 8C4B0000 */ lw $t3, ($v0) -/* A98270 800210D0 AA0B0030 */ swl $t3, 0x30($s0) -/* A98274 800210D4 BA0B0033 */ swr $t3, 0x33($s0) -/* A98278 800210D8 8C4A0004 */ lw $t2, 4($v0) -/* A9827C 800210DC AA0A0034 */ swl $t2, 0x34($s0) -/* A98280 800210E0 BA0A0037 */ swr $t2, 0x37($s0) -/* A98284 800210E4 8C4B0008 */ lw $t3, 8($v0) -/* A98288 800210E8 AA0B0038 */ swl $t3, 0x38($s0) -/* A9828C 800210EC BA0B003B */ swr $t3, 0x3b($s0) -/* A98290 800210F0 8C4A000C */ lw $t2, 0xc($v0) -/* A98294 800210F4 AA0A003C */ swl $t2, 0x3c($s0) -/* A98298 800210F8 BA0A003F */ swr $t2, 0x3f($s0) -/* A9829C 800210FC 8FAC009C */ lw $t4, 0x9c($sp) -/* A982A0 80021100 908E019F */ lbu $t6, 0x19f($a0) -/* A982A4 80021104 8D8D0004 */ lw $t5, 4($t4) -/* A982A8 80021108 448E4000 */ mtc1 $t6, $f8 -/* A982AC 8002110C 448D2000 */ mtc1 $t5, $f4 -/* A982B0 80021110 468042A0 */ cvt.s.w $f10, $f8 -/* A982B4 80021114 05C10005 */ bgez $t6, .L8002112C -/* A982B8 80021118 468021A0 */ cvt.s.w $f6, $f4 -/* A982BC 8002111C 3C014F80 */ li $at, 0x4F800000 # 0.000000 -/* A982C0 80021120 44818000 */ mtc1 $at, $f16 -/* A982C4 80021124 00000000 */ nop -/* A982C8 80021128 46105280 */ add.s $f10, $f10, $f16 -.L8002112C: -/* A982CC 8002112C 460A3003 */ div.s $f0, $f6, $f10 -/* A982D0 80021130 27AF0084 */ addiu $t7, $sp, 0x84 -/* A982D4 80021134 27B8007C */ addiu $t8, $sp, 0x7c -/* A982D8 80021138 27B90078 */ addiu $t9, $sp, 0x78 -/* A982DC 8002113C AFB90018 */ sw $t9, 0x18($sp) -/* A982E0 80021140 AFB80014 */ sw $t8, 0x14($sp) -/* A982E4 80021144 AFAF0010 */ sw $t7, 0x10($sp) -/* A982E8 80021148 8FA500A0 */ lw $a1, 0xa0($sp) -/* A982EC 8002114C 27A7008C */ addiu $a3, $sp, 0x8c -/* A982F0 80021150 44060000 */ mfc1 $a2, $f0 -/* A982F4 80021154 0C008294 */ jal func_80020A50 -/* A982F8 80021158 00000000 */ nop -/* A982FC 8002115C 87A80084 */ lh $t0, 0x84($sp) -/* A98300 80021160 87A90086 */ lh $t1, 0x86($sp) -/* A98304 80021164 87AA0088 */ lh $t2, 0x88($sp) -/* A98308 80021168 44889000 */ mtc1 $t0, $f18 -/* A9830C 8002116C 44894000 */ mtc1 $t1, $f8 -/* A98310 80021170 448A3000 */ mtc1 $t2, $f6 -/* A98314 80021174 46809120 */ cvt.s.w $f4, $f18 -/* A98318 80021178 27A40060 */ addiu $a0, $sp, 0x60 -/* A9831C 8002117C 27A5006C */ addiu $a1, $sp, 0x6c -/* A98320 80021180 27A60054 */ addiu $a2, $sp, 0x54 -/* A98324 80021184 46804420 */ cvt.s.w $f16, $f8 -/* A98328 80021188 E7A40060 */ swc1 $f4, 0x60($sp) -/* A9832C 8002118C 468032A0 */ cvt.s.w $f10, $f6 -/* A98330 80021190 E7B00064 */ swc1 $f16, 0x64($sp) -/* A98334 80021194 0C01DFB4 */ jal Math_Vec3f_Diff -/* A98338 80021198 E7AA0068 */ swc1 $f10, 0x68($sp) -/* A9833C 8002119C 27A40054 */ addiu $a0, $sp, 0x54 -/* A98340 800211A0 0C01DFD7 */ jal Math_Vec3f_Scale -/* A98344 800211A4 3C054120 */ lui $a1, 0x4120 -/* A98348 800211A8 C7B20054 */ lwc1 $f18, 0x54($sp) -/* A9834C 800211AC 27A40060 */ addiu $a0, $sp, 0x60 -/* A98350 800211B0 27A5006C */ addiu $a1, $sp, 0x6c -/* A98354 800211B4 4600910D */ trunc.w.s $f4, $f18 -/* A98358 800211B8 27A60054 */ addiu $a2, $sp, 0x54 -/* A9835C 800211BC 440C2000 */ mfc1 $t4, $f4 -/* A98360 800211C0 00000000 */ nop -/* A98364 800211C4 A60C0000 */ sh $t4, ($s0) -/* A98368 800211C8 C7A80058 */ lwc1 $f8, 0x58($sp) -/* A9836C 800211CC 4600440D */ trunc.w.s $f16, $f8 -/* A98370 800211D0 440E8000 */ mfc1 $t6, $f16 -/* A98374 800211D4 00000000 */ nop -/* A98378 800211D8 A60E0002 */ sh $t6, 2($s0) -/* A9837C 800211DC C7A6005C */ lwc1 $f6, 0x5c($sp) -/* A98380 800211E0 4600328D */ trunc.w.s $f10, $f6 -/* A98384 800211E4 44185000 */ mfc1 $t8, $f10 -/* A98388 800211E8 00000000 */ nop -/* A9838C 800211EC A6180004 */ sh $t8, 4($s0) -/* A98390 800211F0 93B90078 */ lbu $t9, 0x78($sp) -/* A98394 800211F4 A219000C */ sb $t9, 0xc($s0) -/* A98398 800211F8 93A80079 */ lbu $t0, 0x79($sp) -/* A9839C 800211FC A208000D */ sb $t0, 0xd($s0) -/* A983A0 80021200 93A9007A */ lbu $t1, 0x7a($sp) -/* A983A4 80021204 A209000E */ sb $t1, 0xe($s0) -/* A983A8 80021208 93AA007B */ lbu $t2, 0x7b($sp) -/* A983AC 8002120C A20A000F */ sb $t2, 0xf($s0) -/* A983B0 80021210 87AB008C */ lh $t3, 0x8c($sp) -/* A983B4 80021214 87AC008E */ lh $t4, 0x8e($sp) -/* A983B8 80021218 87AD0090 */ lh $t5, 0x90($sp) -/* A983BC 8002121C 448B9000 */ mtc1 $t3, $f18 -/* A983C0 80021220 448C4000 */ mtc1 $t4, $f8 -/* A983C4 80021224 448D3000 */ mtc1 $t5, $f6 -/* A983C8 80021228 46809120 */ cvt.s.w $f4, $f18 -/* A983CC 8002122C 46804420 */ cvt.s.w $f16, $f8 -/* A983D0 80021230 E7A40060 */ swc1 $f4, 0x60($sp) -/* A983D4 80021234 468032A0 */ cvt.s.w $f10, $f6 -/* A983D8 80021238 E7B00064 */ swc1 $f16, 0x64($sp) -/* A983DC 8002123C 0C01DFB4 */ jal Math_Vec3f_Diff -/* A983E0 80021240 E7AA0068 */ swc1 $f10, 0x68($sp) -/* A983E4 80021244 27A40054 */ addiu $a0, $sp, 0x54 -/* A983E8 80021248 0C01DFD7 */ jal Math_Vec3f_Scale -/* A983EC 8002124C 3C054120 */ lui $a1, 0x4120 -/* A983F0 80021250 C7B20054 */ lwc1 $f18, 0x54($sp) -/* A983F4 80021254 3C014F80 */ li $at, 0x4F800000 # 0.000000 -/* A983F8 80021258 4600910D */ trunc.w.s $f4, $f18 -/* A983FC 8002125C 440F2000 */ mfc1 $t7, $f4 -/* A98400 80021260 00000000 */ nop -/* A98404 80021264 A60F0010 */ sh $t7, 0x10($s0) -/* A98408 80021268 C7A80058 */ lwc1 $f8, 0x58($sp) -/* A9840C 8002126C 4600440D */ trunc.w.s $f16, $f8 -/* A98410 80021270 44198000 */ mfc1 $t9, $f16 -/* A98414 80021274 00000000 */ nop -/* A98418 80021278 A6190012 */ sh $t9, 0x12($s0) -/* A9841C 8002127C C7A6005C */ lwc1 $f6, 0x5c($sp) -/* A98420 80021280 4600328D */ trunc.w.s $f10, $f6 -/* A98424 80021284 44095000 */ mfc1 $t1, $f10 -/* A98428 80021288 00000000 */ nop -/* A9842C 8002128C A6090014 */ sh $t1, 0x14($s0) -/* A98430 80021290 93AA007C */ lbu $t2, 0x7c($sp) -/* A98434 80021294 A20A001C */ sb $t2, 0x1c($s0) -/* A98438 80021298 93AB007D */ lbu $t3, 0x7d($sp) -/* A9843C 8002129C A20B001D */ sb $t3, 0x1d($s0) -/* A98440 800212A0 93AC007E */ lbu $t4, 0x7e($sp) -/* A98444 800212A4 A20C001E */ sb $t4, 0x1e($s0) -/* A98448 800212A8 93AD007F */ lbu $t5, 0x7f($sp) -/* A9844C 800212AC A20D001F */ sb $t5, 0x1f($s0) -/* A98450 800212B0 8FB80098 */ lw $t8, 0x98($sp) -/* A98454 800212B4 8FAE009C */ lw $t6, 0x9c($sp) -/* A98458 800212B8 9319019F */ lbu $t9, 0x19f($t8) -/* A9845C 800212BC 8DCF001C */ lw $t7, 0x1c($t6) -/* A98460 800212C0 44994000 */ mtc1 $t9, $f8 -/* A98464 800212C4 448F9000 */ mtc1 $t7, $f18 -/* A98468 800212C8 46804420 */ cvt.s.w $f16, $f8 -/* A9846C 800212CC 07210004 */ bgez $t9, .L800212E0 -/* A98470 800212D0 46809120 */ cvt.s.w $f4, $f18 -/* A98474 800212D4 44813000 */ mtc1 $at, $f6 -/* A98478 800212D8 00000000 */ nop -/* A9847C 800212DC 46068400 */ add.s $f16, $f16, $f6 -.L800212E0: -/* A98480 800212E0 46102003 */ div.s $f0, $f4, $f16 -/* A98484 800212E4 8FA500A0 */ lw $a1, 0xa0($sp) -/* A98488 800212E8 27A80084 */ addiu $t0, $sp, 0x84 -/* A9848C 800212EC 27A9007C */ addiu $t1, $sp, 0x7c -/* A98490 800212F0 27AA0078 */ addiu $t2, $sp, 0x78 -/* A98494 800212F4 AFAA0018 */ sw $t2, 0x18($sp) -/* A98498 800212F8 AFA90014 */ sw $t1, 0x14($sp) -/* A9849C 800212FC AFA80010 */ sw $t0, 0x10($sp) -/* A984A0 80021300 03002025 */ move $a0, $t8 -/* A984A4 80021304 27A7008C */ addiu $a3, $sp, 0x8c -/* A984A8 80021308 24A50001 */ addiu $a1, $a1, 1 -/* A984AC 8002130C 44060000 */ mfc1 $a2, $f0 -/* A984B0 80021310 0C008294 */ jal func_80020A50 -/* A984B4 80021314 00000000 */ nop -/* A984B8 80021318 87AB008C */ lh $t3, 0x8c($sp) -/* A984BC 8002131C 87AC008E */ lh $t4, 0x8e($sp) -/* A984C0 80021320 87AD0090 */ lh $t5, 0x90($sp) -/* A984C4 80021324 448B5000 */ mtc1 $t3, $f10 -/* A984C8 80021328 448C4000 */ mtc1 $t4, $f8 -/* A984CC 8002132C 448D2000 */ mtc1 $t5, $f4 -/* A984D0 80021330 468054A0 */ cvt.s.w $f18, $f10 -/* A984D4 80021334 27A40060 */ addiu $a0, $sp, 0x60 -/* A984D8 80021338 27A5006C */ addiu $a1, $sp, 0x6c -/* A984DC 8002133C 27A60054 */ addiu $a2, $sp, 0x54 -/* A984E0 80021340 468041A0 */ cvt.s.w $f6, $f8 -/* A984E4 80021344 E7B20060 */ swc1 $f18, 0x60($sp) -/* A984E8 80021348 46802420 */ cvt.s.w $f16, $f4 -/* A984EC 8002134C E7A60064 */ swc1 $f6, 0x64($sp) -/* A984F0 80021350 0C01DFB4 */ jal Math_Vec3f_Diff -/* A984F4 80021354 E7B00068 */ swc1 $f16, 0x68($sp) -/* A984F8 80021358 27A40054 */ addiu $a0, $sp, 0x54 -/* A984FC 8002135C 0C01DFD7 */ jal Math_Vec3f_Scale -/* A98500 80021360 3C054120 */ lui $a1, 0x4120 -/* A98504 80021364 C7AA0054 */ lwc1 $f10, 0x54($sp) -/* A98508 80021368 27A40060 */ addiu $a0, $sp, 0x60 -/* A9850C 8002136C 27A5006C */ addiu $a1, $sp, 0x6c -/* A98510 80021370 4600548D */ trunc.w.s $f18, $f10 -/* A98514 80021374 27A60054 */ addiu $a2, $sp, 0x54 -/* A98518 80021378 440F9000 */ mfc1 $t7, $f18 -/* A9851C 8002137C 00000000 */ nop -/* A98520 80021380 A60F0020 */ sh $t7, 0x20($s0) -/* A98524 80021384 C7A80058 */ lwc1 $f8, 0x58($sp) -/* A98528 80021388 4600418D */ trunc.w.s $f6, $f8 -/* A9852C 8002138C 44183000 */ mfc1 $t8, $f6 -/* A98530 80021390 00000000 */ nop -/* A98534 80021394 A6180022 */ sh $t8, 0x22($s0) -/* A98538 80021398 C7A4005C */ lwc1 $f4, 0x5c($sp) -/* A9853C 8002139C 4600240D */ trunc.w.s $f16, $f4 -/* A98540 800213A0 44098000 */ mfc1 $t1, $f16 -/* A98544 800213A4 00000000 */ nop -/* A98548 800213A8 A6090024 */ sh $t1, 0x24($s0) -/* A9854C 800213AC 93AA007C */ lbu $t2, 0x7c($sp) -/* A98550 800213B0 A20A002C */ sb $t2, 0x2c($s0) -/* A98554 800213B4 93AB007D */ lbu $t3, 0x7d($sp) -/* A98558 800213B8 A20B002D */ sb $t3, 0x2d($s0) -/* A9855C 800213BC 93AC007E */ lbu $t4, 0x7e($sp) -/* A98560 800213C0 A20C002E */ sb $t4, 0x2e($s0) -/* A98564 800213C4 93AD007F */ lbu $t5, 0x7f($sp) -/* A98568 800213C8 A20D002F */ sb $t5, 0x2f($s0) -/* A9856C 800213CC 87AE0084 */ lh $t6, 0x84($sp) -/* A98570 800213D0 87AF0086 */ lh $t7, 0x86($sp) -/* A98574 800213D4 87B90088 */ lh $t9, 0x88($sp) -/* A98578 800213D8 448E5000 */ mtc1 $t6, $f10 -/* A9857C 800213DC 448F4000 */ mtc1 $t7, $f8 -/* A98580 800213E0 44992000 */ mtc1 $t9, $f4 -/* A98584 800213E4 468054A0 */ cvt.s.w $f18, $f10 -/* A98588 800213E8 468041A0 */ cvt.s.w $f6, $f8 -/* A9858C 800213EC E7B20060 */ swc1 $f18, 0x60($sp) -/* A98590 800213F0 46802420 */ cvt.s.w $f16, $f4 -/* A98594 800213F4 E7A60064 */ swc1 $f6, 0x64($sp) -/* A98598 800213F8 0C01DFB4 */ jal Math_Vec3f_Diff -/* A9859C 800213FC E7B00068 */ swc1 $f16, 0x68($sp) -/* A985A0 80021400 27A40054 */ addiu $a0, $sp, 0x54 -/* A985A4 80021404 0C01DFD7 */ jal Math_Vec3f_Scale -/* A985A8 80021408 3C054120 */ lui $a1, 0x4120 -/* A985AC 8002140C C7AA0054 */ lwc1 $f10, 0x54($sp) -/* A985B0 80021410 240B0406 */ li $t3, 1030 -/* A985B4 80021414 4600548D */ trunc.w.s $f18, $f10 -/* A985B8 80021418 44089000 */ mfc1 $t0, $f18 -/* A985BC 8002141C 00000000 */ nop -/* A985C0 80021420 A6080030 */ sh $t0, 0x30($s0) -/* A985C4 80021424 C7A80058 */ lwc1 $f8, 0x58($sp) -/* A985C8 80021428 3C080100 */ lui $t0, (0x01004008 >> 16) # lui $t0, 0x100 -/* A985CC 8002142C 35084008 */ ori $t0, (0x01004008 & 0xFFFF) # ori $t0, $t0, 0x4008 -/* A985D0 80021430 4600418D */ trunc.w.s $f6, $f8 -/* A985D4 80021434 440A3000 */ mfc1 $t2, $f6 -/* A985D8 80021438 00000000 */ nop -/* A985DC 8002143C A60A0032 */ sh $t2, 0x32($s0) -/* A985E0 80021440 C7A4005C */ lwc1 $f4, 0x5c($sp) -/* A985E4 80021444 3C0A0600 */ lui $t2, (0x06000204 >> 16) # lui $t2, 0x600 -/* A985E8 80021448 354A0204 */ ori $t2, (0x06000204 & 0xFFFF) # ori $t2, $t2, 0x204 -/* A985EC 8002144C 4600240D */ trunc.w.s $f16, $f4 -/* A985F0 80021450 440C8000 */ mfc1 $t4, $f16 -/* A985F4 80021454 00000000 */ nop -/* A985F8 80021458 A60C0034 */ sh $t4, 0x34($s0) -/* A985FC 8002145C 93AD0078 */ lbu $t5, 0x78($sp) -/* A98600 80021460 A20D003C */ sb $t5, 0x3c($s0) -/* A98604 80021464 93AE0079 */ lbu $t6, 0x79($sp) -/* A98608 80021468 A20E003D */ sb $t6, 0x3d($s0) -/* A9860C 8002146C 93AF007A */ lbu $t7, 0x7a($sp) -/* A98610 80021470 A20F003E */ sb $t7, 0x3e($s0) -/* A98614 80021474 93B9007B */ lbu $t9, 0x7b($sp) -/* A98618 80021478 A219003F */ sb $t9, 0x3f($s0) -/* A9861C 8002147C 8E2302D0 */ lw $v1, 0x2d0($s1) -/* A98620 80021480 24780008 */ addiu $t8, $v1, 8 -/* A98624 80021484 AE3802D0 */ sw $t8, 0x2d0($s1) -/* A98628 80021488 AC700004 */ sw $s0, 4($v1) -/* A9862C 8002148C AC680000 */ sw $t0, ($v1) -/* A98630 80021490 8E2302D0 */ lw $v1, 0x2d0($s1) -/* A98634 80021494 24690008 */ addiu $t1, $v1, 8 -/* A98638 80021498 AE2902D0 */ sw $t1, 0x2d0($s1) -/* A9863C 8002149C AC6B0004 */ sw $t3, 4($v1) -/* A98640 800214A0 AC6A0000 */ sw $t2, ($v1) -.L800214A4: -/* A98644 800214A4 3C068013 */ lui $a2, %hi(D_801351F8) # $a2, 0x8013 -/* A98648 800214A8 24C651F8 */ addiu $a2, %lo(D_801351F8) # addiu $a2, $a2, 0x51f8 -/* A9864C 800214AC 27A40040 */ addiu $a0, $sp, 0x40 -/* A98650 800214B0 02202825 */ move $a1, $s1 -/* A98654 800214B4 0C031AD5 */ jal Graph_CloseDisps -/* A98658 800214B8 240703A4 */ li $a3, 932 -/* A9865C 800214BC 8FBF002C */ lw $ra, 0x2c($sp) -/* A98660 800214C0 8FB00024 */ lw $s0, 0x24($sp) -/* A98664 800214C4 8FB10028 */ lw $s1, 0x28($sp) -/* A98668 800214C8 03E00008 */ jr $ra -/* A9866C 800214CC 27BD0098 */ addiu $sp, $sp, 0x98 - diff --git a/asm/non_matchings/code/z_eff_blure/func_80021F00.s b/asm/non_matchings/code/z_eff_blure/func_80021F00.s deleted file mode 100644 index 3c56e25f21..0000000000 --- a/asm/non_matchings/code/z_eff_blure/func_80021F00.s +++ /dev/null @@ -1,431 +0,0 @@ -.rdata -glabel D_801352CC - .asciz "../z_eff_blure.c" - .balign 4 - -glabel D_801352E0 - .asciz "../z_eff_blure.c" - .balign 4 - -glabel D_801352F4 - .asciz "../z_eff_blure.c" - .balign 4 - -glabel D_80135308 - .asciz "../z_eff_blure.c" - .balign 4 - -glabel D_8013531C - .asciz "../z_eff_blure.c" - .balign 4 - -glabel D_80135330 - .asciz "../z_eff_blure.c" - .balign 4 - -.late_rodata -glabel D_80135448 - .float 0.1 - -.text -glabel func_80021F00 -/* A990A0 80021F00 27BDFED8 */ addiu $sp, $sp, -0x128 -/* A990A4 80021F04 AFB40024 */ sw $s4, 0x24($sp) -/* A990A8 80021F08 AFB30020 */ sw $s3, 0x20($sp) -/* A990AC 80021F0C 0080A025 */ move $s4, $a0 -/* A990B0 80021F10 AFBF002C */ sw $ra, 0x2c($sp) -/* A990B4 80021F14 AFB50028 */ sw $s5, 0x28($sp) -/* A990B8 80021F18 00809825 */ move $s3, $a0 -/* A990BC 80021F1C 3C068013 */ lui $a2, %hi(D_801352CC) # $a2, 0x8013 -/* A990C0 80021F20 00A0A825 */ move $s5, $a1 -/* A990C4 80021F24 AFB2001C */ sw $s2, 0x1c($sp) -/* A990C8 80021F28 AFB10018 */ sw $s1, 0x18($sp) -/* A990CC 80021F2C AFB00014 */ sw $s0, 0x14($sp) -/* A990D0 80021F30 24C652CC */ addiu $a2, %lo(D_801352CC) # addiu $a2, $a2, 0x52cc -/* A990D4 80021F34 27A40044 */ addiu $a0, $sp, 0x44 -/* A990D8 80021F38 0C031AB1 */ jal Graph_OpenDisps -/* A990DC 80021F3C 240704B1 */ li $a3, 1201 -/* A990E0 80021F40 9284019E */ lbu $a0, 0x19e($s4) -/* A990E4 80021F44 24120018 */ li $s2, 24 -/* A990E8 80021F48 28810002 */ slti $at, $a0, 2 -/* A990EC 80021F4C 142000A2 */ bnez $at, .L800221D8 -/* A990F0 80021F50 00801825 */ move $v1, $a0 -/* A990F4 80021F54 00920019 */ multu $a0, $s2 -/* A990F8 80021F58 968E0014 */ lhu $t6, 0x14($s4) -/* A990FC 80021F5C 26900018 */ addiu $s0, $s4, 0x18 -/* A99100 80021F60 2411FFFC */ li $s1, -4 -/* A99104 80021F64 31D8FFFC */ andi $t8, $t6, 0xfffc -/* A99108 80021F68 A6980014 */ sh $t8, 0x14($s4) -/* A9910C 80021F6C 37190002 */ ori $t9, $t8, 2 -/* A99110 80021F70 A6990014 */ sh $t9, 0x14($s4) -/* A99114 80021F74 00004012 */ mflo $t0 -/* A99118 80021F78 02884821 */ addu $t1, $s4, $t0 -/* A9911C 80021F7C 252AFFE8 */ addiu $t2, $t1, -0x18 -/* A99120 80021F80 020A082B */ sltu $at, $s0, $t2 -/* A99124 80021F84 5020000E */ beql $at, $zero, .L80021FC0 -/* A99128 80021F88 24060018 */ li $a2, 24 -.L80021F8C: -/* A9912C 80021F8C 0C008238 */ jal func_800208E0 -/* A99130 80021F90 02002025 */ move $a0, $s0 -/* A99134 80021F94 926B019E */ lbu $t3, 0x19e($s3) -/* A99138 80021F98 26100018 */ addiu $s0, $s0, 0x18 -/* A9913C 80021F9C 01720019 */ multu $t3, $s2 -/* A99140 80021FA0 00006012 */ mflo $t4 -/* A99144 80021FA4 026C6821 */ addu $t5, $s3, $t4 -/* A99148 80021FA8 25AEFFE8 */ addiu $t6, $t5, -0x18 -/* A9914C 80021FAC 020E082B */ sltu $at, $s0, $t6 -/* A99150 80021FB0 1420FFF6 */ bnez $at, .L80021F8C -/* A99154 80021FB4 00000000 */ nop -/* A99158 80021FB8 9283019E */ lbu $v1, 0x19e($s4) -/* A9915C 80021FBC 24060018 */ li $a2, 24 -.L80021FC0: -/* A99160 80021FC0 00660019 */ multu $v1, $a2 -/* A99164 80021FC4 02802025 */ move $a0, $s4 -/* A99168 80021FC8 02A02825 */ move $a1, $s5 -/* A9916C 80021FCC 00007812 */ mflo $t7 -/* A99170 80021FD0 028F1021 */ addu $v0, $s4, $t7 -/* A99174 80021FD4 9458FFFC */ lhu $t8, -4($v0) -/* A99178 80021FD8 0311C824 */ and $t9, $t8, $s1 -/* A9917C 80021FDC A459FFFC */ sh $t9, -4($v0) -/* A99180 80021FE0 9288019E */ lbu $t0, 0x19e($s4) -/* A99184 80021FE4 01060019 */ multu $t0, $a2 -/* A99188 80021FE8 00004812 */ mflo $t1 -/* A9918C 80021FEC 02891021 */ addu $v0, $s4, $t1 -/* A99190 80021FF0 944AFFFC */ lhu $t2, -4($v0) -/* A99194 80021FF4 354B0002 */ ori $t3, $t2, 2 -/* A99198 80021FF8 0C0083D8 */ jal func_80020F60 -/* A9919C 80021FFC A44BFFFC */ sh $t3, -4($v0) -/* A991A0 80022000 868C000E */ lh $t4, 0xe($s4) -/* A991A4 80022004 868D0010 */ lh $t5, 0x10($s4) -/* A991A8 80022008 868E0012 */ lh $t6, 0x12($s4) -/* A991AC 8002200C 448C2000 */ mtc1 $t4, $f4 -/* A991B0 80022010 448D3000 */ mtc1 $t5, $f6 -/* A991B4 80022014 448E4000 */ mtc1 $t6, $f8 -/* A991B8 80022018 46802120 */ cvt.s.w $f4, $f4 -/* A991BC 8002201C 27B000DC */ addiu $s0, $sp, 0xdc -/* A991C0 80022020 02002025 */ move $a0, $s0 -/* A991C4 80022024 468031A0 */ cvt.s.w $f6, $f6 -/* A991C8 80022028 44052000 */ mfc1 $a1, $f4 -/* A991CC 8002202C 46804220 */ cvt.s.w $f8, $f8 -/* A991D0 80022030 44063000 */ mfc1 $a2, $f6 -/* A991D4 80022034 44074000 */ mfc1 $a3, $f8 -/* A991D8 80022038 0C029E89 */ jal func_800A7A24 -/* A991DC 8002203C 00000000 */ nop -/* A991E0 80022040 3C018013 */ lui $at, %hi(D_80135448) -/* A991E4 80022044 C4205448 */ lwc1 $f0, %lo(D_80135448)($at) -/* A991E8 80022048 27B1009C */ addiu $s1, $sp, 0x9c -/* A991EC 8002204C 02202025 */ move $a0, $s1 -/* A991F0 80022050 44050000 */ mfc1 $a1, $f0 -/* A991F4 80022054 44060000 */ mfc1 $a2, $f0 -/* A991F8 80022058 44070000 */ mfc1 $a3, $f0 -/* A991FC 8002205C 0C029DA9 */ jal func_800A76A4 -/* A99200 80022060 00000000 */ nop -/* A99204 80022064 02002025 */ move $a0, $s0 -/* A99208 80022068 02202825 */ move $a1, $s1 -/* A9920C 8002206C 0C029BE8 */ jal func_800A6FA0 -/* A99210 80022070 27A6005C */ addiu $a2, $sp, 0x5c -/* A99214 80022074 02A02025 */ move $a0, $s5 -/* A99218 80022078 0C029F9C */ jal func_800A7E70 -/* A9921C 8002207C 27A5005C */ addiu $a1, $sp, 0x5c -/* A99220 80022080 50400056 */ beql $v0, $zero, .L800221DC -/* A99224 80022084 8FBF002C */ lw $ra, 0x2c($sp) -/* A99228 80022088 8EA402D0 */ lw $a0, 0x2d0($s5) -/* A9922C 8002208C 3C18DA38 */ lui $t8, (0xDA380003 >> 16) # lui $t8, 0xda38 -/* A99230 80022090 37180003 */ ori $t8, (0xDA380003 & 0xFFFF) # ori $t8, $t8, 3 -/* A99234 80022094 248F0008 */ addiu $t7, $a0, 8 -/* A99238 80022098 AEAF02D0 */ sw $t7, 0x2d0($s5) -/* A9923C 8002209C AC820004 */ sw $v0, 4($a0) -/* A99240 800220A0 AC980000 */ sw $t8, ($a0) -/* A99244 800220A4 9299019E */ lbu $t9, 0x19e($s4) -/* A99248 800220A8 00008825 */ move $s1, $zero -/* A9924C 800220AC 02808025 */ move $s0, $s4 -/* A99250 800220B0 03320019 */ multu $t9, $s2 -/* A99254 800220B4 24120002 */ li $s2, 2 -/* A99258 800220B8 00004012 */ mflo $t0 -/* A9925C 800220BC 02884821 */ addu $t1, $s4, $t0 -/* A99260 800220C0 252AFFE8 */ addiu $t2, $t1, -0x18 -/* A99264 800220C4 028A082B */ sltu $at, $s4, $t2 -/* A99268 800220C8 1020003D */ beqz $at, .L800221C0 -/* A9926C 800220CC 00000000 */ nop -.L800220D0: -/* A99270 800220D0 8E0B0000 */ lw $t3, ($s0) -/* A99274 800220D4 51600005 */ beql $t3, $zero, .L800220EC -/* A99278 800220D8 926D019E */ lbu $t5, 0x19e($s3) -/* A9927C 800220DC 8E0C0018 */ lw $t4, 0x18($s0) -/* A99280 800220E0 55800009 */ bnezl $t4, .L80022108 -/* A99284 800220E4 96020014 */ lhu $v0, 0x14($s0) -/* A99288 800220E8 926D019E */ lbu $t5, 0x19e($s3) -.L800220EC: -/* A9928C 800220EC 000D7080 */ sll $t6, $t5, 2 -/* A99290 800220F0 01CD7023 */ subu $t6, $t6, $t5 -/* A99294 800220F4 000E70C0 */ sll $t6, $t6, 3 -/* A99298 800220F8 026E1021 */ addu $v0, $s3, $t6 -/* A9929C 800220FC 1000002C */ b .L800221B0 -/* A992A0 80022100 2442FFE8 */ addiu $v0, $v0, -0x18 -/* A992A4 80022104 96020014 */ lhu $v0, 0x14($s0) -.L80022108: -/* A992A8 80022108 30420003 */ andi $v0, $v0, 3 -/* A992AC 8002210C 14400005 */ bnez $v0, .L80022124 -/* A992B0 80022110 00000000 */ nop -/* A992B4 80022114 960F002C */ lhu $t7, 0x2c($s0) -/* A992B8 80022118 31F80003 */ andi $t8, $t7, 3 -/* A992BC 8002211C 53000014 */ beql $t8, $zero, .L80022170 -/* A992C0 80022120 02802025 */ move $a0, $s4 -.L80022124: -/* A992C4 80022124 16420005 */ bne $s2, $v0, .L8002213C -/* A992C8 80022128 00000000 */ nop -/* A992CC 8002212C 9619002C */ lhu $t9, 0x2c($s0) -/* A992D0 80022130 33280003 */ andi $t0, $t9, 3 -/* A992D4 80022134 5100000E */ beql $t0, $zero, .L80022170 -/* A992D8 80022138 02802025 */ move $a0, $s4 -.L8002213C: -/* A992DC 8002213C 14400005 */ bnez $v0, .L80022154 -/* A992E0 80022140 00000000 */ nop -/* A992E4 80022144 9609002C */ lhu $t1, 0x2c($s0) -/* A992E8 80022148 312A0003 */ andi $t2, $t1, 3 -/* A992EC 8002214C 524A0008 */ beql $s2, $t2, .L80022170 -/* A992F0 80022150 02802025 */ move $a0, $s4 -.L80022154: -/* A992F4 80022154 1642000C */ bne $s2, $v0, .L80022188 -/* A992F8 80022158 02802025 */ move $a0, $s4 -/* A992FC 8002215C 960B002C */ lhu $t3, 0x2c($s0) -/* A99300 80022160 316C0003 */ andi $t4, $t3, 3 -/* A99304 80022164 564C0009 */ bnel $s2, $t4, .L8002218C -/* A99308 80022168 02002825 */ move $a1, $s0 -/* A9930C 8002216C 02802025 */ move $a0, $s4 -.L80022170: -/* A99310 80022170 02002825 */ move $a1, $s0 -/* A99314 80022174 02203025 */ move $a2, $s1 -/* A99318 80022178 0C0083F0 */ jal func_80020FC0 -/* A9931C 8002217C 02A03825 */ move $a3, $s5 -/* A99320 80022180 10000006 */ b .L8002219C -/* A99324 80022184 926D019E */ lbu $t5, 0x19e($s3) -.L80022188: -/* A99328 80022188 02002825 */ move $a1, $s0 -.L8002218C: -/* A9932C 8002218C 02203025 */ move $a2, $s1 -/* A99330 80022190 0C008534 */ jal func_800214D0 -/* A99334 80022194 02A03825 */ move $a3, $s5 -/* A99338 80022198 926D019E */ lbu $t5, 0x19e($s3) -.L8002219C: -/* A9933C 8002219C 000D7080 */ sll $t6, $t5, 2 -/* A99340 800221A0 01CD7023 */ subu $t6, $t6, $t5 -/* A99344 800221A4 000E70C0 */ sll $t6, $t6, 3 -/* A99348 800221A8 026E1021 */ addu $v0, $s3, $t6 -/* A9934C 800221AC 2442FFE8 */ addiu $v0, $v0, -0x18 -.L800221B0: -/* A99350 800221B0 26100018 */ addiu $s0, $s0, 0x18 -/* A99354 800221B4 0202082B */ sltu $at, $s0, $v0 -/* A99358 800221B8 1420FFC5 */ bnez $at, .L800220D0 -/* A9935C 800221BC 26310001 */ addiu $s1, $s1, 1 -.L800221C0: -/* A99360 800221C0 3C068013 */ lui $a2, %hi(D_801352E0) # $a2, 0x8013 -/* A99364 800221C4 24C652E0 */ addiu $a2, %lo(D_801352E0) # addiu $a2, $a2, 0x52e0 -/* A99368 800221C8 27A40044 */ addiu $a0, $sp, 0x44 -/* A9936C 800221CC 02A02825 */ move $a1, $s5 -/* A99370 800221D0 0C031AD5 */ jal Graph_CloseDisps -/* A99374 800221D4 240704EF */ li $a3, 1263 -.L800221D8: -/* A99378 800221D8 8FBF002C */ lw $ra, 0x2c($sp) -.L800221DC: -/* A9937C 800221DC 8FB00014 */ lw $s0, 0x14($sp) -/* A99380 800221E0 8FB10018 */ lw $s1, 0x18($sp) -/* A99384 800221E4 8FB2001C */ lw $s2, 0x1c($sp) -/* A99388 800221E8 8FB30020 */ lw $s3, 0x20($sp) -/* A9938C 800221EC 8FB40024 */ lw $s4, 0x24($sp) -/* A99390 800221F0 8FB50028 */ lw $s5, 0x28($sp) -/* A99394 800221F4 03E00008 */ jr $ra -/* A99398 800221F8 27BD0128 */ addiu $sp, $sp, 0x128 - -/* A9939C 800221FC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* A993A0 80022200 AFA60038 */ sw $a2, 0x38($sp) -/* A993A4 80022204 AFBF0014 */ sw $ra, 0x14($sp) -/* A993A8 80022208 AFA40030 */ sw $a0, 0x30($sp) -/* A993AC 8002220C AFA50034 */ sw $a1, 0x34($sp) -/* A993B0 80022210 3C068013 */ lui $a2, %hi(D_801352F4) # $a2, 0x8013 -/* A993B4 80022214 24C652F4 */ addiu $a2, %lo(D_801352F4) # addiu $a2, $a2, 0x52f4 -/* A993B8 80022218 8FA50030 */ lw $a1, 0x30($sp) -/* A993BC 8002221C 27A4001C */ addiu $a0, $sp, 0x1c -/* A993C0 80022220 0C031AB1 */ jal Graph_OpenDisps -/* A993C4 80022224 24070500 */ li $a3, 1280 -/* A993C8 80022228 8FAE0030 */ lw $t6, 0x30($sp) -/* A993CC 8002222C 24050026 */ li $a1, 38 -/* A993D0 80022230 0C024DDD */ jal Gfx_CallSetupDL -/* A993D4 80022234 8DC402D0 */ lw $a0, 0x2d0($t6) -/* A993D8 80022238 8FA50030 */ lw $a1, 0x30($sp) -/* A993DC 8002223C 3C068013 */ lui $a2, %hi(D_80135308) # $a2, 0x8013 -/* A993E0 80022240 24C65308 */ addiu $a2, %lo(D_80135308) # addiu $a2, $a2, 0x5308 -/* A993E4 80022244 27A4001C */ addiu $a0, $sp, 0x1c -/* A993E8 80022248 24070505 */ li $a3, 1285 -/* A993EC 8002224C 0C031AD5 */ jal Graph_CloseDisps -/* A993F0 80022250 ACA202D0 */ sw $v0, 0x2d0($a1) -/* A993F4 80022254 8FBF0014 */ lw $ra, 0x14($sp) -/* A993F8 80022258 27BD0030 */ addiu $sp, $sp, 0x30 -/* A993FC 8002225C 03E00008 */ jr $ra -/* A99400 80022260 00000000 */ nop - -/* A99404 80022264 27BDFF80 */ addiu $sp, $sp, -0x80 -/* A99408 80022268 AFB00018 */ sw $s0, 0x18($sp) -/* A9940C 8002226C AFA60088 */ sw $a2, 0x88($sp) -/* A99410 80022270 00808025 */ move $s0, $a0 -/* A99414 80022274 AFBF001C */ sw $ra, 0x1c($sp) -/* A99418 80022278 AFA50084 */ sw $a1, 0x84($sp) -/* A9941C 8002227C 3C068013 */ lui $a2, %hi(D_8013531C) # $a2, 0x8013 -/* A99420 80022280 24C6531C */ addiu $a2, %lo(D_8013531C) # addiu $a2, $a2, 0x531c -/* A99424 80022284 02002825 */ move $a1, $s0 -/* A99428 80022288 27A4006C */ addiu $a0, $sp, 0x6c -/* A9942C 8002228C 0C031AB1 */ jal Graph_OpenDisps -/* A99430 80022290 2407050E */ li $a3, 1294 -/* A99434 80022294 8E0202D0 */ lw $v0, 0x2d0($s0) -/* A99438 80022298 3C07E700 */ lui $a3, 0xe700 -/* A9943C 8002229C 24050026 */ li $a1, 38 -/* A99440 800222A0 244E0008 */ addiu $t6, $v0, 8 -/* A99444 800222A4 AE0E02D0 */ sw $t6, 0x2d0($s0) -/* A99448 800222A8 AC400004 */ sw $zero, 4($v0) -/* A9944C 800222AC AC470000 */ sw $a3, ($v0) -/* A99450 800222B0 0C024DDD */ jal Gfx_CallSetupDL -/* A99454 800222B4 8E0402D0 */ lw $a0, 0x2d0($s0) -/* A99458 800222B8 8FA60084 */ lw $a2, 0x84($sp) -/* A9945C 800222BC AE0202D0 */ sw $v0, 0x2d0($s0) -/* A99460 800222C0 244F0008 */ addiu $t7, $v0, 8 -/* A99464 800222C4 AE0F02D0 */ sw $t7, 0x2d0($s0) -/* A99468 800222C8 3C18E300 */ lui $t8, (0xE3000A01 >> 16) # lui $t8, 0xe300 -/* A9946C 800222CC 37180A01 */ ori $t8, (0xE3000A01 & 0xFFFF) # ori $t8, $t8, 0xa01 -/* A99470 800222D0 3C190010 */ lui $t9, 0x10 -/* A99474 800222D4 AC590004 */ sw $t9, 4($v0) -/* A99478 800222D8 AC580000 */ sw $t8, ($v0) -/* A9947C 800222DC 8E0202D0 */ lw $v0, 0x2d0($s0) -/* A99480 800222E0 3C09E300 */ lui $t1, (0xE3001001 >> 16) # lui $t1, 0xe300 -/* A99484 800222E4 35291001 */ ori $t1, (0xE3001001 & 0xFFFF) # ori $t1, $t1, 0x1001 -/* A99488 800222E8 24480008 */ addiu $t0, $v0, 8 -/* A9948C 800222EC AE0802D0 */ sw $t0, 0x2d0($s0) -/* A99490 800222F0 AC400004 */ sw $zero, 4($v0) -/* A99494 800222F4 AC490000 */ sw $t1, ($v0) -/* A99498 800222F8 8E0202D0 */ lw $v0, 0x2d0($s0) -/* A9949C 800222FC 3C0BD700 */ lui $t3, (0xD7000002 >> 16) # lui $t3, 0xd700 -/* A994A0 80022300 356B0002 */ ori $t3, (0xD7000002 & 0xFFFF) # ori $t3, $t3, 2 -/* A994A4 80022304 244A0008 */ addiu $t2, $v0, 8 -/* A994A8 80022308 AE0A02D0 */ sw $t2, 0x2d0($s0) -/* A994AC 8002230C 240CFFFF */ li $t4, -1 -/* A994B0 80022310 AC4C0004 */ sw $t4, 4($v0) -/* A994B4 80022314 AC4B0000 */ sw $t3, ($v0) -/* A994B8 80022318 8E0202D0 */ lw $v0, 0x2d0($s0) -/* A994BC 8002231C 3C0F0400 */ lui $t7, %hi(D_04006020) # $t7, 0x400 -/* A994C0 80022320 25EF6020 */ addiu $t7, %lo(D_04006020) # addiu $t7, $t7, 0x6020 -/* A994C4 80022324 244D0008 */ addiu $t5, $v0, 8 -/* A994C8 80022328 AE0D02D0 */ sw $t5, 0x2d0($s0) -/* A994CC 8002232C 3C0EFD90 */ lui $t6, 0xfd90 -/* A994D0 80022330 AC4E0000 */ sw $t6, ($v0) -/* A994D4 80022334 AC4F0004 */ sw $t7, 4($v0) -/* A994D8 80022338 8E0202D0 */ lw $v0, 0x2d0($s0) -/* A994DC 8002233C 3C080701 */ lui $t0, (0x07014260 >> 16) # lui $t0, 0x701 -/* A994E0 80022340 35084260 */ ori $t0, (0x07014260 & 0xFFFF) # ori $t0, $t0, 0x4260 -/* A994E4 80022344 24580008 */ addiu $t8, $v0, 8 -/* A994E8 80022348 AE1802D0 */ sw $t8, 0x2d0($s0) -/* A994EC 8002234C 3C19F590 */ lui $t9, 0xf590 -/* A994F0 80022350 AC590000 */ sw $t9, ($v0) -/* A994F4 80022354 AC480004 */ sw $t0, 4($v0) -/* A994F8 80022358 8E0202D0 */ lw $v0, 0x2d0($s0) -/* A994FC 8002235C 3C0AE600 */ lui $t2, 0xe600 -/* A99500 80022360 3C0D073F */ lui $t5, (0x073FF100 >> 16) # lui $t5, 0x73f -/* A99504 80022364 24490008 */ addiu $t1, $v0, 8 -/* A99508 80022368 AE0902D0 */ sw $t1, 0x2d0($s0) -/* A9950C 8002236C AC400004 */ sw $zero, 4($v0) -/* A99510 80022370 AC4A0000 */ sw $t2, ($v0) -/* A99514 80022374 8E0202D0 */ lw $v0, 0x2d0($s0) -/* A99518 80022378 35ADF100 */ ori $t5, (0x073FF100 & 0xFFFF) # ori $t5, $t5, 0xf100 -/* A9951C 8002237C 3C0CF300 */ lui $t4, 0xf300 -/* A99520 80022380 244B0008 */ addiu $t3, $v0, 8 -/* A99524 80022384 AE0B02D0 */ sw $t3, 0x2d0($s0) -/* A99528 80022388 AC4D0004 */ sw $t5, 4($v0) -/* A9952C 8002238C AC4C0000 */ sw $t4, ($v0) -/* A99530 80022390 8E0202D0 */ lw $v0, 0x2d0($s0) -/* A99534 80022394 3C07E700 */ lui $a3, 0xe700 -/* A99538 80022398 3C190001 */ lui $t9, (0x00014260 >> 16) # lui $t9, 1 -/* A9953C 8002239C 244E0008 */ addiu $t6, $v0, 8 -/* A99540 800223A0 AE0E02D0 */ sw $t6, 0x2d0($s0) -/* A99544 800223A4 AC400004 */ sw $zero, 4($v0) -/* A99548 800223A8 AC470000 */ sw $a3, ($v0) -/* A9954C 800223AC 8E0202D0 */ lw $v0, 0x2d0($s0) -/* A99550 800223B0 3C18F588 */ lui $t8, (0xF5881000 >> 16) # lui $t8, 0xf588 -/* A99554 800223B4 37181000 */ ori $t8, (0xF5881000 & 0xFFFF) # ori $t8, $t8, 0x1000 -/* A99558 800223B8 244F0008 */ addiu $t7, $v0, 8 -/* A9955C 800223BC AE0F02D0 */ sw $t7, 0x2d0($s0) -/* A99560 800223C0 37394260 */ ori $t9, (0x00014260 & 0xFFFF) # ori $t9, $t9, 0x4260 -/* A99564 800223C4 AC590004 */ sw $t9, 4($v0) -/* A99568 800223C8 AC580000 */ sw $t8, ($v0) -/* A9956C 800223CC 8E0202D0 */ lw $v0, 0x2d0($s0) -/* A99570 800223D0 3C0A000F */ lui $t2, (0x000FC07C >> 16) # lui $t2, 0xf -/* A99574 800223D4 354AC07C */ ori $t2, (0x000FC07C & 0xFFFF) # ori $t2, $t2, 0xc07c -/* A99578 800223D8 24480008 */ addiu $t0, $v0, 8 -/* A9957C 800223DC AE0802D0 */ sw $t0, 0x2d0($s0) -/* A99580 800223E0 3C09F200 */ lui $t1, 0xf200 -/* A99584 800223E4 AC490000 */ sw $t1, ($v0) -/* A99588 800223E8 AC4A0004 */ sw $t2, 4($v0) -/* A9958C 800223EC 8E0202D0 */ lw $v0, 0x2d0($s0) -/* A99590 800223F0 3C0CFC17 */ lui $t4, (0xFC171660 >> 16) # lui $t4, 0xfc17 -/* A99594 800223F4 3C0D35FC */ lui $t5, (0x35FCFF78 >> 16) # lui $t5, 0x35fc -/* A99598 800223F8 244B0008 */ addiu $t3, $v0, 8 -/* A9959C 800223FC AE0B02D0 */ sw $t3, 0x2d0($s0) -/* A995A0 80022400 35ADFF78 */ ori $t5, (0x35FCFF78 & 0xFFFF) # ori $t5, $t5, 0xff78 -/* A995A4 80022404 358C1660 */ ori $t4, (0xFC171660 & 0xFFFF) # ori $t4, $t4, 0x1660 -/* A995A8 80022408 AC4C0000 */ sw $t4, ($v0) -/* A995AC 8002240C AC4D0004 */ sw $t5, 4($v0) -/* A995B0 80022410 8E0202D0 */ lw $v0, 0x2d0($s0) -/* A995B4 80022414 3C180C18 */ lui $t8, (0x0C184B50 >> 16) # lui $t8, 0xc18 -/* A995B8 80022418 3C0FE200 */ lui $t7, (0xE200001C >> 16) # lui $t7, 0xe200 -/* A995BC 8002241C 244E0008 */ addiu $t6, $v0, 8 -/* A995C0 80022420 AE0E02D0 */ sw $t6, 0x2d0($s0) -/* A995C4 80022424 35EF001C */ ori $t7, (0xE200001C & 0xFFFF) # ori $t7, $t7, 0x1c -/* A995C8 80022428 37184B50 */ ori $t8, (0x0C184B50 & 0xFFFF) # ori $t8, $t8, 0x4b50 -/* A995CC 8002242C AC580004 */ sw $t8, 4($v0) -/* A995D0 80022430 AC4F0000 */ sw $t7, ($v0) -/* A995D4 80022434 8E0202D0 */ lw $v0, 0x2d0($s0) -/* A995D8 80022438 3C08D9F0 */ lui $t0, (0xD9F0FFFF >> 16) # lui $t0, 0xd9f0 -/* A995DC 8002243C 3508FFFF */ ori $t0, (0xD9F0FFFF & 0xFFFF) # ori $t0, $t0, 0xffff -/* A995E0 80022440 24590008 */ addiu $t9, $v0, 8 -/* A995E4 80022444 AE1902D0 */ sw $t9, 0x2d0($s0) -/* A995E8 80022448 AC400004 */ sw $zero, 4($v0) -/* A995EC 8002244C AC480000 */ sw $t0, ($v0) -/* A995F0 80022450 8E0202D0 */ lw $v0, 0x2d0($s0) -/* A995F4 80022454 3C0B0020 */ lui $t3, (0x00200005 >> 16) # lui $t3, 0x20 -/* A995F8 80022458 3C0AD9FF */ lui $t2, (0xD9FFFFFF >> 16) # lui $t2, 0xd9ff -/* A995FC 8002245C 24490008 */ addiu $t1, $v0, 8 -/* A99600 80022460 AE0902D0 */ sw $t1, 0x2d0($s0) -/* A99604 80022464 354AFFFF */ ori $t2, (0xD9FFFFFF & 0xFFFF) # ori $t2, $t2, 0xffff -/* A99608 80022468 356B0005 */ ori $t3, (0x00200005 & 0xFFFF) # ori $t3, $t3, 5 -/* A9960C 8002246C AC4B0004 */ sw $t3, 4($v0) -/* A99610 80022470 AC4A0000 */ sw $t2, ($v0) -/* A99614 80022474 8E0202D0 */ lw $v0, 0x2d0($s0) -/* A99618 80022478 3C0EFB00 */ lui $t6, 0xfb00 -/* A9961C 8002247C 27A4006C */ addiu $a0, $sp, 0x6c -/* A99620 80022480 244C0008 */ addiu $t4, $v0, 8 -/* A99624 80022484 AE0C02D0 */ sw $t4, 0x2d0($s0) -/* A99628 80022488 AC400004 */ sw $zero, 4($v0) -/* A9962C 8002248C AC470000 */ sw $a3, ($v0) -/* A99630 80022490 8E0202D0 */ lw $v0, 0x2d0($s0) -/* A99634 80022494 24070531 */ li $a3, 1329 -/* A99638 80022498 02002825 */ move $a1, $s0 -/* A9963C 8002249C 244D0008 */ addiu $t5, $v0, 8 -/* A99640 800224A0 AE0D02D0 */ sw $t5, 0x2d0($s0) -/* A99644 800224A4 AC4E0000 */ sw $t6, ($v0) -/* A99648 800224A8 90C901A7 */ lbu $t1, 0x1a7($a2) -/* A9964C 800224AC 90D801A6 */ lbu $t8, 0x1a6($a2) -/* A99650 800224B0 90CD01A8 */ lbu $t5, 0x1a8($a2) -/* A99654 800224B4 90C801A9 */ lbu $t0, 0x1a9($a2) -/* A99658 800224B8 00095400 */ sll $t2, $t1, 0x10 -/* A9965C 800224BC 0018CE00 */ sll $t9, $t8, 0x18 -/* A99660 800224C0 032A5825 */ or $t3, $t9, $t2 -/* A99664 800224C4 000D7200 */ sll $t6, $t5, 8 -/* A99668 800224C8 016E7825 */ or $t7, $t3, $t6 -/* A9966C 800224CC 3C068013 */ lui $a2, %hi(D_80135330) # $a2, 0x8013 -/* A99670 800224D0 01E84825 */ or $t1, $t7, $t0 -/* A99674 800224D4 24C65330 */ addiu $a2, %lo(D_80135330) # addiu $a2, $a2, 0x5330 -/* A99678 800224D8 0C031AD5 */ jal Graph_CloseDisps -/* A9967C 800224DC AC490004 */ sw $t1, 4($v0) -/* A99680 800224E0 8FBF001C */ lw $ra, 0x1c($sp) -/* A99684 800224E4 8FB00018 */ lw $s0, 0x18($sp) -/* A99688 800224E8 27BD0080 */ addiu $sp, $sp, 0x80 -/* A9968C 800224EC 03E00008 */ jr $ra -/* A99690 800224F0 00000000 */ nop - diff --git a/asm/non_matchings/code/z_eff_blure/func_800224F4.s b/asm/non_matchings/code/z_eff_blure/func_800224F4.s deleted file mode 100644 index 03bc2dcf3f..0000000000 --- a/asm/non_matchings/code/z_eff_blure/func_800224F4.s +++ /dev/null @@ -1,359 +0,0 @@ -.rdata -glabel D_80135344 - .asciz "../z_eff_blure.c" - .balign 4 - -glabel D_80135358 - .asciz "EffectBlureInfo2_disp_makeDisplayList()マトリックス取れないので,強制終了\n" - # EUC-JP: マトリックス取れないので,強制終了 | Forced termination because matrix cannot be taken - .balign 4 - -glabel D_801353A4 - .asciz "../z_eff_blure.c" - .balign 4 - -.late_rodata -glabel D_8013544C - .float 0.0005 - -.text -glabel func_800224F4 -/* A99694 800224F4 27BDFE28 */ addiu $sp, $sp, -0x1d8 -/* A99698 800224F8 AFB10034 */ sw $s1, 0x34($sp) -/* A9969C 800224FC AFB00030 */ sw $s0, 0x30($sp) -/* A996A0 80022500 AFA601E0 */ sw $a2, 0x1e0($sp) -/* A996A4 80022504 00808025 */ move $s0, $a0 -/* A996A8 80022508 00A08825 */ move $s1, $a1 -/* A996AC 8002250C AFBF0054 */ sw $ra, 0x54($sp) -/* A996B0 80022510 3C068013 */ lui $a2, %hi(D_80135344) # $a2, 0x8013 -/* A996B4 80022514 AFBE0050 */ sw $fp, 0x50($sp) -/* A996B8 80022518 AFB7004C */ sw $s7, 0x4c($sp) -/* A996BC 8002251C AFB60048 */ sw $s6, 0x48($sp) -/* A996C0 80022520 AFB50044 */ sw $s5, 0x44($sp) -/* A996C4 80022524 AFB40040 */ sw $s4, 0x40($sp) -/* A996C8 80022528 AFB3003C */ sw $s3, 0x3c($sp) -/* A996CC 8002252C AFB20038 */ sw $s2, 0x38($sp) -/* A996D0 80022530 F7B60028 */ sdc1 $f22, 0x28($sp) -/* A996D4 80022534 F7B40020 */ sdc1 $f20, 0x20($sp) -/* A996D8 80022538 24C65344 */ addiu $a2, %lo(D_80135344) # addiu $a2, $a2, 0x5344 -/* A996DC 8002253C 02002825 */ move $a1, $s0 -/* A996E0 80022540 27A401C0 */ addiu $a0, $sp, 0x1c0 -/* A996E4 80022544 0C031AB1 */ jal Graph_OpenDisps -/* A996E8 80022548 2407054C */ li $a3, 1356 -/* A996EC 8002254C 922E01A1 */ lbu $t6, 0x1a1($s1) -/* A996F0 80022550 3C198011 */ lui $t9, %hi(D_80115780) -/* A996F4 80022554 02002025 */ move $a0, $s0 -/* A996F8 80022558 000E7880 */ sll $t7, $t6, 2 -/* A996FC 8002255C 032FC821 */ addu $t9, $t9, $t7 -/* A99700 80022560 8F395780 */ lw $t9, %lo(D_80115780)($t9) -/* A99704 80022564 02202825 */ move $a1, $s1 -/* A99708 80022568 8FA601E0 */ lw $a2, 0x1e0($sp) -/* A9970C 8002256C 0320F809 */ jalr $t9 -/* A99710 80022570 00000000 */ nop -/* A99714 80022574 8E0302D0 */ lw $v1, 0x2d0($s0) -/* A99718 80022578 3C08E700 */ lui $t0, 0xe700 -/* A9971C 8002257C 00009025 */ move $s2, $zero -/* A99720 80022580 24780008 */ addiu $t8, $v1, 8 -/* A99724 80022584 AE1802D0 */ sw $t8, 0x2d0($s0) -/* A99728 80022588 AC600004 */ sw $zero, 4($v1) -/* A9972C 8002258C AC680000 */ sw $t0, ($v1) -/* A99730 80022590 9229019E */ lbu $t1, 0x19e($s1) -/* A99734 80022594 8FB501E0 */ lw $s5, 0x1e0($sp) -/* A99738 80022598 3C013F80 */ lui $at, 0x3f80 -/* A9973C 8002259C 252AFFFF */ addiu $t2, $t1, -1 -/* A99740 800225A0 19400107 */ blez $t2, .L800229C0 -/* A99744 800225A4 3C170600 */ li $s7, 0x06000000 # 0.000000 -/* A99748 800225A8 4481B000 */ mtc1 $at, $f22 -/* A9974C 800225AC 3C013F00 */ li $at, 0x3F000000 # 0.000000 -/* A99750 800225B0 3C160100 */ li $s6, 0x01000000 # 0.000000 -/* A99754 800225B4 4481A000 */ mtc1 $at, $f20 -/* A99758 800225B8 36D64008 */ ori $s6, $s6, 0x4008 -/* A9975C 800225BC 241E0604 */ li $fp, 1540 -/* A99760 800225C0 36F70206 */ ori $s7, $s7, 0x206 -/* A99764 800225C4 27B40154 */ addiu $s4, $sp, 0x154 -/* A99768 800225C8 922B01A1 */ lbu $t3, 0x1a1($s1) -.L800225CC: -/* A9976C 800225CC 24010001 */ li $at, 1 -/* A99770 800225D0 00126080 */ sll $t4, $s2, 2 -/* A99774 800225D4 15610051 */ bne $t3, $at, .L8002271C -/* A99778 800225D8 01926023 */ subu $t4, $t4, $s2 -/* A9977C 800225DC 000C60C0 */ sll $t4, $t4, 3 -/* A99780 800225E0 022C6821 */ addu $t5, $s1, $t4 -/* A99784 800225E4 8DAE0004 */ lw $t6, 4($t5) -/* A99788 800225E8 922F019F */ lbu $t7, 0x19f($s1) -/* A9978C 800225EC 3C014F80 */ li $at, 0x4F800000 # 0.000000 -/* A99790 800225F0 448E2000 */ mtc1 $t6, $f4 -/* A99794 800225F4 448F4000 */ mtc1 $t7, $f8 -/* A99798 800225F8 468021A0 */ cvt.s.w $f6, $f4 -/* A9979C 800225FC 05E10004 */ bgez $t7, .L80022610 -/* A997A0 80022600 468042A0 */ cvt.s.w $f10, $f8 -/* A997A4 80022604 44819000 */ mtc1 $at, $f18 -/* A997A8 80022608 00000000 */ nop -/* A997AC 8002260C 46125280 */ add.s $f10, $f10, $f18 -.L80022610: -/* A997B0 80022610 8E0202D0 */ lw $v0, 0x2d0($s0) -/* A997B4 80022614 3C18FA00 */ lui $t8, (0xFA000080 >> 16) # lui $t8, 0xfa00 -/* A997B8 80022618 37180080 */ ori $t8, (0xFA000080 & 0xFFFF) # ori $t8, $t8, 0x80 -/* A997BC 8002261C 24590008 */ addiu $t9, $v0, 8 -/* A997C0 80022620 AE1902D0 */ sw $t9, 0x2d0($s0) -/* A997C4 80022624 AC580000 */ sw $t8, ($v0) -/* A997C8 80022628 922901A2 */ lbu $t1, 0x1a2($s1) -/* A997CC 8002262C 922C01A3 */ lbu $t4, 0x1a3($s1) -/* A997D0 80022630 923901A4 */ lbu $t9, 0x1a4($s1) -/* A997D4 80022634 00095600 */ sll $t2, $t1, 0x18 -/* A997D8 80022638 922901A5 */ lbu $t1, 0x1a5($s1) -/* A997DC 8002263C 000C6C00 */ sll $t5, $t4, 0x10 -/* A997E0 80022640 014D7025 */ or $t6, $t2, $t5 -/* A997E4 80022644 44892000 */ mtc1 $t1, $f4 -/* A997E8 80022648 0019C200 */ sll $t8, $t9, 8 -/* A997EC 8002264C 460A3003 */ div.s $f0, $f6, $f10 -/* A997F0 80022650 01D84025 */ or $t0, $t6, $t8 -/* A997F4 80022654 3C014F80 */ li $at, 0x4F800000 # 0.000000 -/* A997F8 80022658 05210004 */ bgez $t1, .L8002266C -/* A997FC 8002265C 46802220 */ cvt.s.w $f8, $f4 -/* A99800 80022660 44819000 */ mtc1 $at, $f18 -/* A99804 80022664 00000000 */ nop -/* A99808 80022668 46124200 */ add.s $f8, $f8, $f18 -.L8002266C: -/* A9980C 8002266C 4600B181 */ sub.s $f6, $f22, $f0 -/* A99810 80022670 240C0001 */ li $t4, 1 -/* A99814 80022674 3C014F00 */ li $at, 0x4F000000 # 0.000000 -/* A99818 80022678 46064282 */ mul.s $f10, $f8, $f6 -/* A9981C 8002267C 444BF800 */ cfc1 $t3, $31 -/* A99820 80022680 44CCF800 */ ctc1 $t4, $31 -/* A99824 80022684 00000000 */ nop -/* A99828 80022688 46005124 */ cvt.w.s $f4, $f10 -/* A9982C 8002268C 444CF800 */ cfc1 $t4, $31 -/* A99830 80022690 00000000 */ nop -/* A99834 80022694 318C0078 */ andi $t4, $t4, 0x78 -/* A99838 80022698 51800013 */ beql $t4, $zero, .L800226E8 -/* A9983C 8002269C 440C2000 */ mfc1 $t4, $f4 -/* A99840 800226A0 44812000 */ mtc1 $at, $f4 -/* A99844 800226A4 240C0001 */ li $t4, 1 -/* A99848 800226A8 46045101 */ sub.s $f4, $f10, $f4 -/* A9984C 800226AC 44CCF800 */ ctc1 $t4, $31 -/* A99850 800226B0 00000000 */ nop -/* A99854 800226B4 46002124 */ cvt.w.s $f4, $f4 -/* A99858 800226B8 444CF800 */ cfc1 $t4, $31 -/* A9985C 800226BC 00000000 */ nop -/* A99860 800226C0 318C0078 */ andi $t4, $t4, 0x78 -/* A99864 800226C4 15800005 */ bnez $t4, .L800226DC -/* A99868 800226C8 00000000 */ nop -/* A9986C 800226CC 440C2000 */ mfc1 $t4, $f4 -/* A99870 800226D0 3C018000 */ lui $at, 0x8000 -/* A99874 800226D4 10000007 */ b .L800226F4 -/* A99878 800226D8 01816025 */ or $t4, $t4, $at -.L800226DC: -/* A9987C 800226DC 10000005 */ b .L800226F4 -/* A99880 800226E0 240CFFFF */ li $t4, -1 -/* A99884 800226E4 440C2000 */ mfc1 $t4, $f4 -.L800226E8: -/* A99888 800226E8 00000000 */ nop -/* A9988C 800226EC 0580FFFB */ bltz $t4, .L800226DC -/* A99890 800226F0 00000000 */ nop -.L800226F4: -/* A99894 800226F4 318A00FF */ andi $t2, $t4, 0xff -/* A99898 800226F8 010A6825 */ or $t5, $t0, $t2 -/* A9989C 800226FC AC4D0004 */ sw $t5, 4($v0) -/* A998A0 80022700 8E0302D0 */ lw $v1, 0x2d0($s0) -/* A998A4 80022704 44CBF800 */ ctc1 $t3, $31 -/* A998A8 80022708 3C19E700 */ lui $t9, 0xe700 -/* A998AC 8002270C 246F0008 */ addiu $t7, $v1, 8 -/* A998B0 80022710 AE0F02D0 */ sw $t7, 0x2d0($s0) -/* A998B4 80022714 AC600004 */ sw $zero, 4($v1) -/* A998B8 80022718 AC790000 */ sw $t9, ($v1) -.L8002271C: -/* A998BC 8002271C 8E0302D0 */ lw $v1, 0x2d0($s0) -/* A998C0 80022720 00125180 */ sll $t2, $s2, 6 -/* A998C4 80022724 02A09825 */ move $s3, $s5 -/* A998C8 80022728 246E0008 */ addiu $t6, $v1, 8 -/* A998CC 8002272C AE0E02D0 */ sw $t6, 0x2d0($s0) -/* A998D0 80022730 AC750004 */ sw $s5, 4($v1) -/* A998D4 80022734 AC760000 */ sw $s6, ($v1) -/* A998D8 80022738 8E0302D0 */ lw $v1, 0x2d0($s0) -/* A998DC 8002273C 24780008 */ addiu $t8, $v1, 8 -/* A998E0 80022740 AE1802D0 */ sw $t8, 0x2d0($s0) -/* A998E4 80022744 AC7E0004 */ sw $fp, 4($v1) -/* A998E8 80022748 AC770000 */ sw $s7, ($v1) -/* A998EC 8002274C 96290188 */ lhu $t1, 0x188($s1) -/* A998F0 80022750 8FAC01E0 */ lw $t4, 0x1e0($sp) -/* A998F4 80022754 312B0004 */ andi $t3, $t1, 4 -/* A998F8 80022758 11600092 */ beqz $t3, .L800229A4 -/* A998FC 8002275C 018A1021 */ addu $v0, $t4, $t2 -/* A99900 80022760 844D0010 */ lh $t5, 0x10($v0) -/* A99904 80022764 844F0000 */ lh $t7, ($v0) -/* A99908 80022768 27A401A4 */ addiu $a0, $sp, 0x1a4 -/* A9990C 8002276C 448D9000 */ mtc1 $t5, $f18 -/* A99910 80022770 448F3000 */ mtc1 $t7, $f6 -/* A99914 80022774 27A501B0 */ addiu $a1, $sp, 0x1b0 -/* A99918 80022778 46809220 */ cvt.s.w $f8, $f18 -/* A9991C 8002277C 27A60198 */ addiu $a2, $sp, 0x198 -/* A99920 80022780 468032A0 */ cvt.s.w $f10, $f6 -/* A99924 80022784 460A4100 */ add.s $f4, $f8, $f10 -/* A99928 80022788 46142482 */ mul.s $f18, $f4, $f20 -/* A9992C 8002278C E7B201B0 */ swc1 $f18, 0x1b0($sp) -/* A99930 80022790 844E0002 */ lh $t6, 2($v0) -/* A99934 80022794 84590012 */ lh $t9, 0x12($v0) -/* A99938 80022798 448E5000 */ mtc1 $t6, $f10 -/* A9993C 8002279C 44993000 */ mtc1 $t9, $f6 -/* A99940 800227A0 46805120 */ cvt.s.w $f4, $f10 -/* A99944 800227A4 46803220 */ cvt.s.w $f8, $f6 -/* A99948 800227A8 46044480 */ add.s $f18, $f8, $f4 -/* A9994C 800227AC 46149182 */ mul.s $f6, $f18, $f20 -/* A99950 800227B0 E7A601B4 */ swc1 $f6, 0x1b4($sp) -/* A99954 800227B4 84490004 */ lh $t1, 4($v0) -/* A99958 800227B8 84580014 */ lh $t8, 0x14($v0) -/* A9995C 800227BC 44892000 */ mtc1 $t1, $f4 -/* A99960 800227C0 44985000 */ mtc1 $t8, $f10 -/* A99964 800227C4 468024A0 */ cvt.s.w $f18, $f4 -/* A99968 800227C8 46805220 */ cvt.s.w $f8, $f10 -/* A9996C 800227CC 46124180 */ add.s $f6, $f8, $f18 -/* A99970 800227D0 46143282 */ mul.s $f10, $f6, $f20 -/* A99974 800227D4 E7AA01B8 */ swc1 $f10, 0x1b8($sp) -/* A99978 800227D8 84480020 */ lh $t0, 0x20($v0) -/* A9997C 800227DC 844B0030 */ lh $t3, 0x30($v0) -/* A99980 800227E0 44889000 */ mtc1 $t0, $f18 -/* A99984 800227E4 448B2000 */ mtc1 $t3, $f4 -/* A99988 800227E8 468091A0 */ cvt.s.w $f6, $f18 -/* A9998C 800227EC 46802220 */ cvt.s.w $f8, $f4 -/* A99990 800227F0 46064280 */ add.s $f10, $f8, $f6 -/* A99994 800227F4 46145102 */ mul.s $f4, $f10, $f20 -/* A99998 800227F8 E7A401A4 */ swc1 $f4, 0x1a4($sp) -/* A9999C 800227FC 844A0022 */ lh $t2, 0x22($v0) -/* A999A0 80022800 844C0032 */ lh $t4, 0x32($v0) -/* A999A4 80022804 448A3000 */ mtc1 $t2, $f6 -/* A999A8 80022808 448C9000 */ mtc1 $t4, $f18 -/* A999AC 8002280C 468032A0 */ cvt.s.w $f10, $f6 -/* A999B0 80022810 46809220 */ cvt.s.w $f8, $f18 -/* A999B4 80022814 460A4100 */ add.s $f4, $f8, $f10 -/* A999B8 80022818 46142482 */ mul.s $f18, $f4, $f20 -/* A999BC 8002281C E7B201A8 */ swc1 $f18, 0x1a8($sp) -/* A999C0 80022820 844F0024 */ lh $t7, 0x24($v0) -/* A999C4 80022824 844D0034 */ lh $t5, 0x34($v0) -/* A999C8 80022828 448F5000 */ mtc1 $t7, $f10 -/* A999CC 8002282C 448D3000 */ mtc1 $t5, $f6 -/* A999D0 80022830 46805120 */ cvt.s.w $f4, $f10 -/* A999D4 80022834 46803220 */ cvt.s.w $f8, $f6 -/* A999D8 80022838 46044480 */ add.s $f18, $f8, $f4 -/* A999DC 8002283C 46149182 */ mul.s $f6, $f18, $f20 -/* A999E0 80022840 0C01DFB4 */ jal Math_Vec3f_Diff -/* A999E4 80022844 E7A601AC */ swc1 $f6, 0x1ac($sp) -/* A999E8 80022848 C7AC0198 */ lwc1 $f12, 0x198($sp) -/* A999EC 8002284C C7AE019C */ lwc1 $f14, 0x19c($sp) -/* A999F0 80022850 C7B001A0 */ lwc1 $f16, 0x1a0($sp) -/* A999F4 80022854 460C6282 */ mul.s $f10, $f12, $f12 -/* A999F8 80022858 3C018013 */ lui $at, %hi(D_8013544C) -/* A999FC 8002285C C426544C */ lwc1 $f6, %lo(D_8013544C)($at) -/* A99A00 80022860 460E7202 */ mul.s $f8, $f14, $f14 -/* A99A04 80022864 27A40198 */ addiu $a0, $sp, 0x198 -/* A99A08 80022868 46108482 */ mul.s $f18, $f16, $f16 -/* A99A0C 8002286C 46085100 */ add.s $f4, $f10, $f8 -/* A99A10 80022870 46122000 */ add.s $f0, $f4, $f18 -/* A99A14 80022874 46000084 */ sqrt.s $f2, $f0 -/* A99A18 80022878 46001005 */ abs.s $f0, $f2 -/* A99A1C 8002287C 4600303C */ c.lt.s $f6, $f0 -/* A99A20 80022880 00000000 */ nop -/* A99A24 80022884 45020048 */ bc1fl .L800229A8 -/* A99A28 80022888 922C019E */ lbu $t4, 0x19e($s1) -/* A99A2C 8002288C 4602B083 */ div.s $f2, $f22, $f2 -/* A99A30 80022890 44051000 */ mfc1 $a1, $f2 -/* A99A34 80022894 0C01DFD7 */ jal Math_Vec3f_Scale -/* A99A38 80022898 00000000 */ nop -/* A99A3C 8002289C 02802025 */ move $a0, $s4 -/* A99A40 800228A0 8FA501B0 */ lw $a1, 0x1b0($sp) -/* A99A44 800228A4 8FA601B4 */ lw $a2, 0x1b4($sp) -/* A99A48 800228A8 0C029E89 */ jal func_800A7A24 -/* A99A4C 800228AC 8FA701B8 */ lw $a3, 0x1b8($sp) -/* A99A50 800228B0 C7AC0198 */ lwc1 $f12, 0x198($sp) -/* A99A54 800228B4 C7AE019C */ lwc1 $f14, 0x19c($sp) -/* A99A58 800228B8 C7B001A0 */ lwc1 $f16, 0x1a0($sp) -/* A99A5C 800228BC 44066000 */ mfc1 $a2, $f12 -/* A99A60 800228C0 44077000 */ mfc1 $a3, $f14 -/* A99A64 800228C4 27A40114 */ addiu $a0, $sp, 0x114 -/* A99A68 800228C8 24053FFF */ li $a1, 16383 -/* A99A6C 800228CC 0C029FB0 */ jal func_800A7EC0 -/* A99A70 800228D0 E7B00010 */ swc1 $f16, 0x10($sp) -/* A99A74 800228D4 02802025 */ move $a0, $s4 -/* A99A78 800228D8 27A50114 */ addiu $a1, $sp, 0x114 -/* A99A7C 800228DC 0C029BE8 */ jal func_800A6FA0 -/* A99A80 800228E0 27A600D4 */ addiu $a2, $sp, 0xd4 -/* A99A84 800228E4 C7AA01B0 */ lwc1 $f10, 0x1b0($sp) -/* A99A88 800228E8 C7A401B4 */ lwc1 $f4, 0x1b4($sp) -/* A99A8C 800228EC C7A601B8 */ lwc1 $f6, 0x1b8($sp) -/* A99A90 800228F0 46005207 */ neg.s $f8, $f10 -/* A99A94 800228F4 46002487 */ neg.s $f18, $f4 -/* A99A98 800228F8 46003287 */ neg.s $f10, $f6 -/* A99A9C 800228FC 44069000 */ mfc1 $a2, $f18 -/* A99AA0 80022900 44075000 */ mfc1 $a3, $f10 -/* A99AA4 80022904 44054000 */ mfc1 $a1, $f8 -/* A99AA8 80022908 0C029E89 */ jal func_800A7A24 -/* A99AAC 8002290C 02802025 */ move $a0, $s4 -/* A99AB0 80022910 27A400D4 */ addiu $a0, $sp, 0xd4 -/* A99AB4 80022914 02802825 */ move $a1, $s4 -/* A99AB8 80022918 0C029BE8 */ jal func_800A6FA0 -/* A99ABC 8002291C 27A60094 */ addiu $a2, $sp, 0x94 -/* A99AC0 80022920 02002025 */ move $a0, $s0 -/* A99AC4 80022924 0C029F9C */ jal func_800A7E70 -/* A99AC8 80022928 27A50094 */ addiu $a1, $sp, 0x94 -/* A99ACC 8002292C 14400005 */ bnez $v0, .L80022944 -/* A99AD0 80022930 3C048013 */ lui $a0, %hi(D_80135358) # $a0, 0x8013 -/* A99AD4 80022934 0C00084C */ jal osSyncPrintf -/* A99AD8 80022938 24845358 */ addiu $a0, %lo(D_80135358) # addiu $a0, $a0, 0x5358 -/* A99ADC 8002293C 10000020 */ b .L800229C0 -/* A99AE0 80022940 00000000 */ nop -.L80022944: -/* A99AE4 80022944 8E0302D0 */ lw $v1, 0x2d0($s0) -/* A99AE8 80022948 3C0EDA38 */ lui $t6, (0xDA380003 >> 16) # lui $t6, 0xda38 -/* A99AEC 8002294C 35CE0003 */ ori $t6, (0xDA380003 & 0xFFFF) # ori $t6, $t6, 3 -/* A99AF0 80022950 24790008 */ addiu $t9, $v1, 8 -/* A99AF4 80022954 AE1902D0 */ sw $t9, 0x2d0($s0) -/* A99AF8 80022958 AC620004 */ sw $v0, 4($v1) -/* A99AFC 8002295C AC6E0000 */ sw $t6, ($v1) -/* A99B00 80022960 8E0302D0 */ lw $v1, 0x2d0($s0) -/* A99B04 80022964 3C058013 */ lui $a1, %hi(gMtxClear) # $a1, 0x8013 -/* A99B08 80022968 24A5DB20 */ addiu $a1, %lo(gMtxClear) # addiu $a1, $a1, -0x24e0 -/* A99B0C 8002296C 24780008 */ addiu $t8, $v1, 8 -/* A99B10 80022970 AE1802D0 */ sw $t8, 0x2d0($s0) -/* A99B14 80022974 AC730004 */ sw $s3, 4($v1) -/* A99B18 80022978 AC760000 */ sw $s6, ($v1) -/* A99B1C 8002297C 8E0302D0 */ lw $v1, 0x2d0($s0) -/* A99B20 80022980 24690008 */ addiu $t1, $v1, 8 -/* A99B24 80022984 AE0902D0 */ sw $t1, 0x2d0($s0) -/* A99B28 80022988 AC7E0004 */ sw $fp, 4($v1) -/* A99B2C 8002298C AC770000 */ sw $s7, ($v1) -/* A99B30 80022990 8E0302D0 */ lw $v1, 0x2d0($s0) -/* A99B34 80022994 246B0008 */ addiu $t3, $v1, 8 -/* A99B38 80022998 AE0B02D0 */ sw $t3, 0x2d0($s0) -/* A99B3C 8002299C AC650004 */ sw $a1, 4($v1) -/* A99B40 800229A0 AC6E0000 */ sw $t6, ($v1) -.L800229A4: -/* A99B44 800229A4 922C019E */ lbu $t4, 0x19e($s1) -.L800229A8: -/* A99B48 800229A8 26520001 */ addiu $s2, $s2, 1 -/* A99B4C 800229AC 26B50040 */ addiu $s5, $s5, 0x40 -/* A99B50 800229B0 258AFFFF */ addiu $t2, $t4, -1 -/* A99B54 800229B4 024A082A */ slt $at, $s2, $t2 -/* A99B58 800229B8 5420FF04 */ bnezl $at, .L800225CC -/* A99B5C 800229BC 922B01A1 */ lbu $t3, 0x1a1($s1) -.L800229C0: -/* A99B60 800229C0 3C068013 */ lui $a2, %hi(D_801353A4) # $a2, 0x8013 -/* A99B64 800229C4 24C653A4 */ addiu $a2, %lo(D_801353A4) # addiu $a2, $a2, 0x53a4 -/* A99B68 800229C8 27A401C0 */ addiu $a0, $sp, 0x1c0 -/* A99B6C 800229CC 02002825 */ move $a1, $s0 -/* A99B70 800229D0 0C031AD5 */ jal Graph_CloseDisps -/* A99B74 800229D4 240705AC */ li $a3, 1452 -/* A99B78 800229D8 8FBF0054 */ lw $ra, 0x54($sp) -/* A99B7C 800229DC D7B40020 */ ldc1 $f20, 0x20($sp) -/* A99B80 800229E0 D7B60028 */ ldc1 $f22, 0x28($sp) -/* A99B84 800229E4 8FB00030 */ lw $s0, 0x30($sp) -/* A99B88 800229E8 8FB10034 */ lw $s1, 0x34($sp) -/* A99B8C 800229EC 8FB20038 */ lw $s2, 0x38($sp) -/* A99B90 800229F0 8FB3003C */ lw $s3, 0x3c($sp) -/* A99B94 800229F4 8FB40040 */ lw $s4, 0x40($sp) -/* A99B98 800229F8 8FB50044 */ lw $s5, 0x44($sp) -/* A99B9C 800229FC 8FB60048 */ lw $s6, 0x48($sp) -/* A99BA0 80022A00 8FB7004C */ lw $s7, 0x4c($sp) -/* A99BA4 80022A04 8FBE0050 */ lw $fp, 0x50($sp) -/* A99BA8 80022A08 03E00008 */ jr $ra -/* A99BAC 80022A0C 27BD01D8 */ addiu $sp, $sp, 0x1d8 - diff --git a/asm/non_matchings/code/z_eff_blure/func_80022A10.s b/asm/non_matchings/code/z_eff_blure/func_80022A10.s deleted file mode 100644 index b4013d92c6..0000000000 --- a/asm/non_matchings/code/z_eff_blure/func_80022A10.s +++ /dev/null @@ -1,707 +0,0 @@ -.rdata -glabel D_801353B8 - .asciz "ブラ─表示:頂点確保できず。強制終了\n" - # EUC-JP: ブラ─表示:頂点確保できず。強制終了 | Blue display: Vertex cannot be secured. forced termination - .balign 4 - -glabel D_801353E0 - .asciz "../z_eff_blure.c" - .balign 4 - -glabel D_801353F4 - .asciz "ブラ─表示:頂点テーブル確保できず\n" - # EUC-JP: ブラ─表示:頂点テーブル確保できず | Bra display: Vertex table could not be secured - .balign 4 - -glabel D_80135418 - .asciz "../z_eff_blure.c" - .balign 4 - -.text -glabel func_80022A10 -/* A99BB0 80022A10 27BDFF68 */ addiu $sp, $sp, -0x98 -/* A99BB4 80022A14 AFBF004C */ sw $ra, 0x4c($sp) -/* A99BB8 80022A18 AFBE0048 */ sw $fp, 0x48($sp) -/* A99BBC 80022A1C AFB70044 */ sw $s7, 0x44($sp) -/* A99BC0 80022A20 AFB60040 */ sw $s6, 0x40($sp) -/* A99BC4 80022A24 AFB5003C */ sw $s5, 0x3c($sp) -/* A99BC8 80022A28 AFB40038 */ sw $s4, 0x38($sp) -/* A99BCC 80022A2C AFB30034 */ sw $s3, 0x34($sp) -/* A99BD0 80022A30 AFB20030 */ sw $s2, 0x30($sp) -/* A99BD4 80022A34 AFB1002C */ sw $s1, 0x2c($sp) -/* A99BD8 80022A38 AFB00028 */ sw $s0, 0x28($sp) -/* A99BDC 80022A3C AFA5009C */ sw $a1, 0x9c($sp) -/* A99BE0 80022A40 9082019E */ lbu $v0, 0x19e($a0) -/* A99BE4 80022A44 0080A025 */ move $s4, $a0 -/* A99BE8 80022A48 0080B025 */ move $s6, $a0 -/* A99BEC 80022A4C 28410002 */ slti $at, $v0, 2 -/* A99BF0 80022A50 14200127 */ bnez $at, .L80022EF0 -/* A99BF4 80022A54 0002B880 */ sll $s7, $v0, 2 -/* A99BF8 80022A58 00A02025 */ move $a0, $a1 -/* A99BFC 80022A5C 0C031A73 */ jal Graph_Alloc -/* A99C00 80022A60 00172900 */ sll $a1, $s7, 4 -/* A99C04 80022A64 14400006 */ bnez $v0, .L80022A80 -/* A99C08 80022A68 0040A825 */ move $s5, $v0 -/* A99C0C 80022A6C 3C048013 */ lui $a0, %hi(D_801353B8) # $a0, 0x8013 -/* A99C10 80022A70 0C00084C */ jal osSyncPrintf -/* A99C14 80022A74 248453B8 */ addiu $a0, %lo(D_801353B8) # addiu $a0, $a0, 0x53b8 -/* A99C18 80022A78 1000011E */ b .L80022EF4 -/* A99C1C 80022A7C 8FBF004C */ lw $ra, 0x4c($sp) -.L80022A80: -/* A99C20 80022A80 3C0E8011 */ lui $t6, %hi(D_8011578C) # $t6, 0x8011 -/* A99C24 80022A84 25CE578C */ addiu $t6, %lo(D_8011578C) # addiu $t6, $t6, 0x578c -/* A99C28 80022A88 89D80000 */ lwl $t8, ($t6) -/* A99C2C 80022A8C 99D80003 */ lwr $t8, 3($t6) -/* A99C30 80022A90 3C198011 */ lui $t9, %hi(D_8011579C) # $t9, 0x8011 -/* A99C34 80022A94 2739579C */ addiu $t9, %lo(D_8011579C) # addiu $t9, $t9, 0x579c -/* A99C38 80022A98 A8580000 */ swl $t8, ($v0) -/* A99C3C 80022A9C B8580003 */ swr $t8, 3($v0) -/* A99C40 80022AA0 89CF0004 */ lwl $t7, 4($t6) -/* A99C44 80022AA4 99CF0007 */ lwr $t7, 7($t6) -/* A99C48 80022AA8 00401825 */ move $v1, $v0 -/* A99C4C 80022AAC 3C0B8011 */ lui $t3, %hi(D_801157AC) # $t3, 0x8011 -/* A99C50 80022AB0 A84F0004 */ swl $t7, 4($v0) -/* A99C54 80022AB4 B84F0007 */ swr $t7, 7($v0) -/* A99C58 80022AB8 89D80008 */ lwl $t8, 8($t6) -/* A99C5C 80022ABC 99D8000B */ lwr $t8, 0xb($t6) -/* A99C60 80022AC0 256B57AC */ addiu $t3, %lo(D_801157AC) # addiu $t3, $t3, 0x57ac -/* A99C64 80022AC4 24630040 */ addiu $v1, $v1, 0x40 -/* A99C68 80022AC8 A8580008 */ swl $t8, 8($v0) -/* A99C6C 80022ACC B858000B */ swr $t8, 0xb($v0) -/* A99C70 80022AD0 89CF000C */ lwl $t7, 0xc($t6) -/* A99C74 80022AD4 99CF000F */ lwr $t7, 0xf($t6) -/* A99C78 80022AD8 3C0E8011 */ lui $t6, %hi(D_801157BC) # $t6, 0x8011 -/* A99C7C 80022ADC 25CE57BC */ addiu $t6, %lo(D_801157BC) # addiu $t6, $t6, 0x57bc -/* A99C80 80022AE0 A84F000C */ swl $t7, 0xc($v0) -/* A99C84 80022AE4 B84F000F */ swr $t7, 0xf($v0) -/* A99C88 80022AE8 8B2A0000 */ lwl $t2, ($t9) -/* A99C8C 80022AEC 9B2A0003 */ lwr $t2, 3($t9) -/* A99C90 80022AF0 24080018 */ li $t0, 24 -/* A99C94 80022AF4 2410FFFE */ li $s0, -2 -/* A99C98 80022AF8 A86AFFD0 */ swl $t2, -0x30($v1) -/* A99C9C 80022AFC B86AFFD3 */ swr $t2, -0x2d($v1) -/* A99CA0 80022B00 8B290004 */ lwl $t1, 4($t9) -/* A99CA4 80022B04 9B290007 */ lwr $t1, 7($t9) -/* A99CA8 80022B08 2412FFFF */ li $s2, -1 -/* A99CAC 80022B0C 02809825 */ move $s3, $s4 -/* A99CB0 80022B10 A869FFD4 */ swl $t1, -0x2c($v1) -/* A99CB4 80022B14 B869FFD7 */ swr $t1, -0x29($v1) -/* A99CB8 80022B18 8B2A0008 */ lwl $t2, 8($t9) -/* A99CBC 80022B1C 9B2A000B */ lwr $t2, 0xb($t9) -/* A99CC0 80022B20 A86AFFD8 */ swl $t2, -0x28($v1) -/* A99CC4 80022B24 B86AFFDB */ swr $t2, -0x25($v1) -/* A99CC8 80022B28 8B29000C */ lwl $t1, 0xc($t9) -/* A99CCC 80022B2C 9B29000F */ lwr $t1, 0xf($t9) -/* A99CD0 80022B30 A869FFDC */ swl $t1, -0x24($v1) -/* A99CD4 80022B34 B869FFDF */ swr $t1, -0x21($v1) -/* A99CD8 80022B38 896D0000 */ lwl $t5, ($t3) -/* A99CDC 80022B3C 996D0003 */ lwr $t5, 3($t3) -/* A99CE0 80022B40 A86DFFE0 */ swl $t5, -0x20($v1) -/* A99CE4 80022B44 B86DFFE3 */ swr $t5, -0x1d($v1) -/* A99CE8 80022B48 896C0004 */ lwl $t4, 4($t3) -/* A99CEC 80022B4C 996C0007 */ lwr $t4, 7($t3) -/* A99CF0 80022B50 A86CFFE4 */ swl $t4, -0x1c($v1) -/* A99CF4 80022B54 B86CFFE7 */ swr $t4, -0x19($v1) -/* A99CF8 80022B58 896D0008 */ lwl $t5, 8($t3) -/* A99CFC 80022B5C 996D000B */ lwr $t5, 0xb($t3) -/* A99D00 80022B60 A86DFFE8 */ swl $t5, -0x18($v1) -/* A99D04 80022B64 B86DFFEB */ swr $t5, -0x15($v1) -/* A99D08 80022B68 896C000C */ lwl $t4, 0xc($t3) -/* A99D0C 80022B6C 996C000F */ lwr $t4, 0xf($t3) -/* A99D10 80022B70 A86CFFEC */ swl $t4, -0x14($v1) -/* A99D14 80022B74 B86CFFEF */ swr $t4, -0x11($v1) -/* A99D18 80022B78 89D80000 */ lwl $t8, ($t6) -/* A99D1C 80022B7C 99D80003 */ lwr $t8, 3($t6) -/* A99D20 80022B80 A878FFF0 */ swl $t8, -0x10($v1) -/* A99D24 80022B84 B878FFF3 */ swr $t8, -0xd($v1) -/* A99D28 80022B88 89CF0004 */ lwl $t7, 4($t6) -/* A99D2C 80022B8C 99CF0007 */ lwr $t7, 7($t6) -/* A99D30 80022B90 A86FFFF4 */ swl $t7, -0xc($v1) -/* A99D34 80022B94 B86FFFF7 */ swr $t7, -9($v1) -/* A99D38 80022B98 89D80008 */ lwl $t8, 8($t6) -/* A99D3C 80022B9C 99D8000B */ lwr $t8, 0xb($t6) -/* A99D40 80022BA0 A878FFF8 */ swl $t8, -8($v1) -/* A99D44 80022BA4 B878FFFB */ swr $t8, -5($v1) -/* A99D48 80022BA8 89CF000C */ lwl $t7, 0xc($t6) -/* A99D4C 80022BAC 99CF000F */ lwr $t7, 0xf($t6) -/* A99D50 80022BB0 A86FFFFC */ swl $t7, -4($v1) -/* A99D54 80022BB4 B86FFFFF */ swr $t7, -1($v1) -/* A99D58 80022BB8 9284019E */ lbu $a0, 0x19e($s4) -/* A99D5C 80022BBC 28810002 */ slti $at, $a0, 2 -/* A99D60 80022BC0 1420005C */ bnez $at, .L80022D34 -/* A99D64 80022BC4 00801025 */ move $v0, $a0 -/* A99D68 80022BC8 00880019 */ multu $a0, $t0 -/* A99D6C 80022BCC 3C048011 */ lui $a0, %hi(D_801157DC) # $a0, 0x8011 -/* A99D70 80022BD0 3C068011 */ lui $a2, %hi(D_801157FC) # $a2, 0x8011 -/* A99D74 80022BD4 3C058011 */ lui $a1, %hi(D_801157EC) # $a1, 0x8011 -/* A99D78 80022BD8 24A557EC */ addiu $a1, %lo(D_801157EC) # addiu $a1, $a1, 0x57ec -/* A99D7C 80022BDC 24C657FC */ addiu $a2, %lo(D_801157FC) # addiu $a2, $a2, 0x57fc -/* A99D80 80022BE0 248457DC */ addiu $a0, %lo(D_801157DC) # addiu $a0, $a0, 0x57dc -/* A99D84 80022BE4 02803825 */ move $a3, $s4 -/* A99D88 80022BE8 0000C812 */ mflo $t9 -/* A99D8C 80022BEC 02994821 */ addu $t1, $s4, $t9 -/* A99D90 80022BF0 252AFFD0 */ addiu $t2, $t1, -0x30 -/* A99D94 80022BF4 028A082B */ sltu $at, $s4, $t2 -/* A99D98 80022BF8 1020004E */ beqz $at, .L80022D34 -/* A99D9C 80022BFC 00000000 */ nop -/* A99DA0 80022C00 3C028011 */ lui $v0, %hi(D_801157CC) # 0.000000 -/* A99DA4 80022C04 244257CC */ addiu $v0, %lo(D_801157CC) # addiu $v0, $v0, 0x57cc -/* A99DA8 80022C08 884C0000 */ lwl $t4, ($v0) -.L80022C0C: -/* A99DAC 80022C0C 984C0003 */ lwr $t4, 3($v0) -/* A99DB0 80022C10 24E70018 */ addiu $a3, $a3, 0x18 -/* A99DB4 80022C14 24630040 */ addiu $v1, $v1, 0x40 -/* A99DB8 80022C18 A86CFFC0 */ swl $t4, -0x40($v1) -/* A99DBC 80022C1C B86CFFC3 */ swr $t4, -0x3d($v1) -/* A99DC0 80022C20 884B0004 */ lwl $t3, 4($v0) -/* A99DC4 80022C24 984B0007 */ lwr $t3, 7($v0) -/* A99DC8 80022C28 A86BFFC4 */ swl $t3, -0x3c($v1) -/* A99DCC 80022C2C B86BFFC7 */ swr $t3, -0x39($v1) -/* A99DD0 80022C30 884C0008 */ lwl $t4, 8($v0) -/* A99DD4 80022C34 984C000B */ lwr $t4, 0xb($v0) -/* A99DD8 80022C38 A86CFFC8 */ swl $t4, -0x38($v1) -/* A99DDC 80022C3C B86CFFCB */ swr $t4, -0x35($v1) -/* A99DE0 80022C40 884B000C */ lwl $t3, 0xc($v0) -/* A99DE4 80022C44 984B000F */ lwr $t3, 0xf($v0) -/* A99DE8 80022C48 A86BFFCC */ swl $t3, -0x34($v1) -/* A99DEC 80022C4C B86BFFCF */ swr $t3, -0x31($v1) -/* A99DF0 80022C50 888E0000 */ lwl $t6, ($a0) -/* A99DF4 80022C54 988E0003 */ lwr $t6, 3($a0) -/* A99DF8 80022C58 A86EFFD0 */ swl $t6, -0x30($v1) -/* A99DFC 80022C5C B86EFFD3 */ swr $t6, -0x2d($v1) -/* A99E00 80022C60 888D0004 */ lwl $t5, 4($a0) -/* A99E04 80022C64 988D0007 */ lwr $t5, 7($a0) -/* A99E08 80022C68 A86DFFD4 */ swl $t5, -0x2c($v1) -/* A99E0C 80022C6C B86DFFD7 */ swr $t5, -0x29($v1) -/* A99E10 80022C70 888E0008 */ lwl $t6, 8($a0) -/* A99E14 80022C74 988E000B */ lwr $t6, 0xb($a0) -/* A99E18 80022C78 A86EFFD8 */ swl $t6, -0x28($v1) -/* A99E1C 80022C7C B86EFFDB */ swr $t6, -0x25($v1) -/* A99E20 80022C80 888D000C */ lwl $t5, 0xc($a0) -/* A99E24 80022C84 988D000F */ lwr $t5, 0xf($a0) -/* A99E28 80022C88 A86DFFDC */ swl $t5, -0x24($v1) -/* A99E2C 80022C8C B86DFFDF */ swr $t5, -0x21($v1) -/* A99E30 80022C90 88B80000 */ lwl $t8, ($a1) -/* A99E34 80022C94 98B80003 */ lwr $t8, 3($a1) -/* A99E38 80022C98 A878FFE0 */ swl $t8, -0x20($v1) -/* A99E3C 80022C9C B878FFE3 */ swr $t8, -0x1d($v1) -/* A99E40 80022CA0 88AF0004 */ lwl $t7, 4($a1) -/* A99E44 80022CA4 98AF0007 */ lwr $t7, 7($a1) -/* A99E48 80022CA8 A86FFFE4 */ swl $t7, -0x1c($v1) -/* A99E4C 80022CAC B86FFFE7 */ swr $t7, -0x19($v1) -/* A99E50 80022CB0 88B80008 */ lwl $t8, 8($a1) -/* A99E54 80022CB4 98B8000B */ lwr $t8, 0xb($a1) -/* A99E58 80022CB8 A878FFE8 */ swl $t8, -0x18($v1) -/* A99E5C 80022CBC B878FFEB */ swr $t8, -0x15($v1) -/* A99E60 80022CC0 88AF000C */ lwl $t7, 0xc($a1) -/* A99E64 80022CC4 98AF000F */ lwr $t7, 0xf($a1) -/* A99E68 80022CC8 A86FFFEC */ swl $t7, -0x14($v1) -/* A99E6C 80022CCC B86FFFEF */ swr $t7, -0x11($v1) -/* A99E70 80022CD0 88C90000 */ lwl $t1, ($a2) -/* A99E74 80022CD4 98C90003 */ lwr $t1, 3($a2) -/* A99E78 80022CD8 A869FFF0 */ swl $t1, -0x10($v1) -/* A99E7C 80022CDC B869FFF3 */ swr $t1, -0xd($v1) -/* A99E80 80022CE0 88D90004 */ lwl $t9, 4($a2) -/* A99E84 80022CE4 98D90007 */ lwr $t9, 7($a2) -/* A99E88 80022CE8 A879FFF4 */ swl $t9, -0xc($v1) -/* A99E8C 80022CEC B879FFF7 */ swr $t9, -9($v1) -/* A99E90 80022CF0 88C90008 */ lwl $t1, 8($a2) -/* A99E94 80022CF4 98C9000B */ lwr $t1, 0xb($a2) -/* A99E98 80022CF8 A869FFF8 */ swl $t1, -8($v1) -/* A99E9C 80022CFC B869FFFB */ swr $t1, -5($v1) -/* A99EA0 80022D00 88D9000C */ lwl $t9, 0xc($a2) -/* A99EA4 80022D04 98D9000F */ lwr $t9, 0xf($a2) -/* A99EA8 80022D08 A879FFFC */ swl $t9, -4($v1) -/* A99EAC 80022D0C B879FFFF */ swr $t9, -1($v1) -/* A99EB0 80022D10 92CA019E */ lbu $t2, 0x19e($s6) -/* A99EB4 80022D14 01480019 */ multu $t2, $t0 -/* A99EB8 80022D18 00005812 */ mflo $t3 -/* A99EBC 80022D1C 02CB6021 */ addu $t4, $s6, $t3 -/* A99EC0 80022D20 258DFFD0 */ addiu $t5, $t4, -0x30 -/* A99EC4 80022D24 00ED082B */ sltu $at, $a3, $t5 -/* A99EC8 80022D28 5420FFB8 */ bnezl $at, .L80022C0C -/* A99ECC 80022D2C 884C0000 */ lwl $t4, ($v0) -/* A99ED0 80022D30 9282019E */ lbu $v0, 0x19e($s4) -.L80022D34: -/* A99ED4 80022D34 1840006A */ blez $v0, .L80022EE0 -/* A99ED8 80022D38 00008825 */ move $s1, $zero -/* A99EDC 80022D3C 27BE0074 */ addiu $fp, $sp, 0x74 -.L80022D40: -/* A99EE0 80022D40 8E6E0004 */ lw $t6, 4($s3) -/* A99EE4 80022D44 928F019F */ lbu $t7, 0x19f($s4) -/* A99EE8 80022D48 3C014F80 */ li $at, 0x4F800000 # 0.000000 -/* A99EEC 80022D4C 448E2000 */ mtc1 $t6, $f4 -/* A99EF0 80022D50 448F4000 */ mtc1 $t7, $f8 -/* A99EF4 80022D54 468021A0 */ cvt.s.w $f6, $f4 -/* A99EF8 80022D58 05E10004 */ bgez $t7, .L80022D6C -/* A99EFC 80022D5C 468042A0 */ cvt.s.w $f10, $f8 -/* A99F00 80022D60 44818000 */ mtc1 $at, $f16 -/* A99F04 80022D64 00000000 */ nop -/* A99F08 80022D68 46105280 */ add.s $f10, $f10, $f16 -.L80022D6C: -/* A99F0C 80022D6C 460A3003 */ div.s $f0, $f6, $f10 -/* A99F10 80022D70 27B8006C */ addiu $t8, $sp, 0x6c -/* A99F14 80022D74 27B90064 */ addiu $t9, $sp, 0x64 -/* A99F18 80022D78 27A90060 */ addiu $t1, $sp, 0x60 -/* A99F1C 80022D7C AFA90018 */ sw $t1, 0x18($sp) -/* A99F20 80022D80 AFB90014 */ sw $t9, 0x14($sp) -/* A99F24 80022D84 AFB80010 */ sw $t8, 0x10($sp) -/* A99F28 80022D88 02802025 */ move $a0, $s4 -/* A99F2C 80022D8C 02202825 */ move $a1, $s1 -/* A99F30 80022D90 03C03825 */ move $a3, $fp -/* A99F34 80022D94 44060000 */ mfc1 $a2, $f0 -/* A99F38 80022D98 0C008294 */ jal func_80020A50 -/* A99F3C 80022D9C 00000000 */ nop -/* A99F40 80022DA0 06000011 */ bltz $s0, .L80022DE8 -/* A99F44 80022DA4 26310001 */ addiu $s1, $s1, 1 -/* A99F48 80022DA8 87AB0074 */ lh $t3, 0x74($sp) -/* A99F4C 80022DAC 00105100 */ sll $t2, $s0, 4 -/* A99F50 80022DB0 02AA1021 */ addu $v0, $s5, $t2 -/* A99F54 80022DB4 A44B0000 */ sh $t3, ($v0) -/* A99F58 80022DB8 87AC0076 */ lh $t4, 0x76($sp) -/* A99F5C 80022DBC A44C0002 */ sh $t4, 2($v0) -/* A99F60 80022DC0 87AD0078 */ lh $t5, 0x78($sp) -/* A99F64 80022DC4 A44D0004 */ sh $t5, 4($v0) -/* A99F68 80022DC8 93AE0064 */ lbu $t6, 0x64($sp) -/* A99F6C 80022DCC A04E000C */ sb $t6, 0xc($v0) -/* A99F70 80022DD0 93AF0065 */ lbu $t7, 0x65($sp) -/* A99F74 80022DD4 A04F000D */ sb $t7, 0xd($v0) -/* A99F78 80022DD8 93B80066 */ lbu $t8, 0x66($sp) -/* A99F7C 80022DDC A058000E */ sb $t8, 0xe($v0) -/* A99F80 80022DE0 93B90067 */ lbu $t9, 0x67($sp) -/* A99F84 80022DE4 A059000F */ sb $t9, 0xf($v0) -.L80022DE8: -/* A99F88 80022DE8 06400011 */ bltz $s2, .L80022E30 -/* A99F8C 80022DEC 02401825 */ move $v1, $s2 -/* A99F90 80022DF0 87AA006C */ lh $t2, 0x6c($sp) -/* A99F94 80022DF4 00034900 */ sll $t1, $v1, 4 -/* A99F98 80022DF8 02A91021 */ addu $v0, $s5, $t1 -/* A99F9C 80022DFC A44A0000 */ sh $t2, ($v0) -/* A99FA0 80022E00 87AB006E */ lh $t3, 0x6e($sp) -/* A99FA4 80022E04 A44B0002 */ sh $t3, 2($v0) -/* A99FA8 80022E08 87AC0070 */ lh $t4, 0x70($sp) -/* A99FAC 80022E0C A44C0004 */ sh $t4, 4($v0) -/* A99FB0 80022E10 93AD0060 */ lbu $t5, 0x60($sp) -/* A99FB4 80022E14 A04D000C */ sb $t5, 0xc($v0) -/* A99FB8 80022E18 93AE0061 */ lbu $t6, 0x61($sp) -/* A99FBC 80022E1C A04E000D */ sb $t6, 0xd($v0) -/* A99FC0 80022E20 93AF0062 */ lbu $t7, 0x62($sp) -/* A99FC4 80022E24 A04F000E */ sb $t7, 0xe($v0) -/* A99FC8 80022E28 93B80063 */ lbu $t8, 0x63($sp) -/* A99FCC 80022E2C A058000F */ sb $t8, 0xf($v0) -.L80022E30: -/* A99FD0 80022E30 24630001 */ addiu $v1, $v1, 1 -/* A99FD4 80022E34 02E3082A */ slt $at, $s7, $v1 -/* A99FD8 80022E38 14200010 */ bnez $at, .L80022E7C -/* A99FDC 80022E3C 87A90074 */ lh $t1, 0x74($sp) -/* A99FE0 80022E40 0003C900 */ sll $t9, $v1, 4 -/* A99FE4 80022E44 02B91021 */ addu $v0, $s5, $t9 -/* A99FE8 80022E48 A4490000 */ sh $t1, ($v0) -/* A99FEC 80022E4C 87AA0076 */ lh $t2, 0x76($sp) -/* A99FF0 80022E50 A44A0002 */ sh $t2, 2($v0) -/* A99FF4 80022E54 87AB0078 */ lh $t3, 0x78($sp) -/* A99FF8 80022E58 A44B0004 */ sh $t3, 4($v0) -/* A99FFC 80022E5C 93AC0064 */ lbu $t4, 0x64($sp) -/* A9A000 80022E60 A04C000C */ sb $t4, 0xc($v0) -/* A9A004 80022E64 93AD0065 */ lbu $t5, 0x65($sp) -/* A9A008 80022E68 A04D000D */ sb $t5, 0xd($v0) -/* A9A00C 80022E6C 93AE0066 */ lbu $t6, 0x66($sp) -/* A9A010 80022E70 A04E000E */ sb $t6, 0xe($v0) -/* A9A014 80022E74 93AF0067 */ lbu $t7, 0x67($sp) -/* A9A018 80022E78 A04F000F */ sb $t7, 0xf($v0) -.L80022E7C: -/* A9A01C 80022E7C 24630001 */ addiu $v1, $v1, 1 -/* A9A020 80022E80 02E3082A */ slt $at, $s7, $v1 -/* A9A024 80022E84 14200010 */ bnez $at, .L80022EC8 -/* A9A028 80022E88 87B9006C */ lh $t9, 0x6c($sp) -/* A9A02C 80022E8C 0003C100 */ sll $t8, $v1, 4 -/* A9A030 80022E90 02B81021 */ addu $v0, $s5, $t8 -/* A9A034 80022E94 A4590000 */ sh $t9, ($v0) -/* A9A038 80022E98 87A9006E */ lh $t1, 0x6e($sp) -/* A9A03C 80022E9C A4490002 */ sh $t1, 2($v0) -/* A9A040 80022EA0 87AA0070 */ lh $t2, 0x70($sp) -/* A9A044 80022EA4 A44A0004 */ sh $t2, 4($v0) -/* A9A048 80022EA8 93AB0060 */ lbu $t3, 0x60($sp) -/* A9A04C 80022EAC A04B000C */ sb $t3, 0xc($v0) -/* A9A050 80022EB0 93AC0061 */ lbu $t4, 0x61($sp) -/* A9A054 80022EB4 A04C000D */ sb $t4, 0xd($v0) -/* A9A058 80022EB8 93AD0062 */ lbu $t5, 0x62($sp) -/* A9A05C 80022EBC A04D000E */ sb $t5, 0xe($v0) -/* A9A060 80022EC0 93AE0063 */ lbu $t6, 0x63($sp) -/* A9A064 80022EC4 A04E000F */ sb $t6, 0xf($v0) -.L80022EC8: -/* A9A068 80022EC8 92CF019E */ lbu $t7, 0x19e($s6) -/* A9A06C 80022ECC 26100004 */ addiu $s0, $s0, 4 -/* A9A070 80022ED0 26520004 */ addiu $s2, $s2, 4 -/* A9A074 80022ED4 022F082A */ slt $at, $s1, $t7 -/* A9A078 80022ED8 1420FF99 */ bnez $at, .L80022D40 -/* A9A07C 80022EDC 26730018 */ addiu $s3, $s3, 0x18 -.L80022EE0: -/* A9A080 80022EE0 8FA4009C */ lw $a0, 0x9c($sp) -/* A9A084 80022EE4 02802825 */ move $a1, $s4 -/* A9A088 80022EE8 0C00893D */ jal func_800224F4 -/* A9A08C 80022EEC 02A03025 */ move $a2, $s5 -.L80022EF0: -/* A9A090 80022EF0 8FBF004C */ lw $ra, 0x4c($sp) -.L80022EF4: -/* A9A094 80022EF4 8FB00028 */ lw $s0, 0x28($sp) -/* A9A098 80022EF8 8FB1002C */ lw $s1, 0x2c($sp) -/* A9A09C 80022EFC 8FB20030 */ lw $s2, 0x30($sp) -/* A9A0A0 80022F00 8FB30034 */ lw $s3, 0x34($sp) -/* A9A0A4 80022F04 8FB40038 */ lw $s4, 0x38($sp) -/* A9A0A8 80022F08 8FB5003C */ lw $s5, 0x3c($sp) -/* A9A0AC 80022F0C 8FB60040 */ lw $s6, 0x40($sp) -/* A9A0B0 80022F10 8FB70044 */ lw $s7, 0x44($sp) -/* A9A0B4 80022F14 8FBE0048 */ lw $fp, 0x48($sp) -/* A9A0B8 80022F18 03E00008 */ jr $ra -/* A9A0BC 80022F1C 27BD0098 */ addiu $sp, $sp, 0x98 - -/* A9A0C0 80022F20 27BDFF60 */ addiu $sp, $sp, -0xa0 -/* A9A0C4 80022F24 AFB60034 */ sw $s6, 0x34($sp) -/* A9A0C8 80022F28 AFB20024 */ sw $s2, 0x24($sp) -/* A9A0CC 80022F2C 00809025 */ move $s2, $a0 -/* A9A0D0 80022F30 AFBF003C */ sw $ra, 0x3c($sp) -/* A9A0D4 80022F34 AFB70038 */ sw $s7, 0x38($sp) -/* A9A0D8 80022F38 0080B025 */ move $s6, $a0 -/* A9A0DC 80022F3C 3C068013 */ lui $a2, %hi(D_801353E0) # $a2, 0x8013 -/* A9A0E0 80022F40 00A0B825 */ move $s7, $a1 -/* A9A0E4 80022F44 AFB50030 */ sw $s5, 0x30($sp) -/* A9A0E8 80022F48 AFB4002C */ sw $s4, 0x2c($sp) -/* A9A0EC 80022F4C AFB30028 */ sw $s3, 0x28($sp) -/* A9A0F0 80022F50 AFB10020 */ sw $s1, 0x20($sp) -/* A9A0F4 80022F54 AFB0001C */ sw $s0, 0x1c($sp) -/* A9A0F8 80022F58 F7B40010 */ sdc1 $f20, 0x10($sp) -/* A9A0FC 80022F5C 24C653E0 */ addiu $a2, %lo(D_801353E0) # addiu $a2, $a2, 0x53e0 -/* A9A100 80022F60 27A40074 */ addiu $a0, $sp, 0x74 -/* A9A104 80022F64 0C031AB1 */ jal Graph_OpenDisps -/* A9A108 80022F68 2407063C */ li $a3, 1596 -/* A9A10C 80022F6C 8EE602D0 */ lw $a2, 0x2d0($s7) -/* A9A110 80022F70 3C0FDA38 */ lui $t7, (0xDA380003 >> 16) # lui $t7, 0xda38 -/* A9A114 80022F74 3C188013 */ lui $t8, %hi(gMtxClear) # $t8, 0x8013 -/* A9A118 80022F78 24CE0008 */ addiu $t6, $a2, 8 -/* A9A11C 80022F7C AEEE02D0 */ sw $t6, 0x2d0($s7) -/* A9A120 80022F80 2718DB20 */ addiu $t8, %lo(gMtxClear) # addiu $t8, $t8, -0x24e0 -/* A9A124 80022F84 35EF0003 */ ori $t7, (0xDA380003 & 0xFFFF) # ori $t7, $t7, 3 -/* A9A128 80022F88 ACCF0000 */ sw $t7, ($a2) -/* A9A12C 80022F8C ACD80004 */ sw $t8, 4($a2) -/* A9A130 80022F90 9259019E */ lbu $t9, 0x19e($s2) -/* A9A134 80022F94 13200119 */ beqz $t9, .L800233FC -/* A9A138 80022F98 00000000 */ nop -/* A9A13C 80022F9C 964C0188 */ lhu $t4, 0x188($s2) -/* A9A140 80022FA0 5580010B */ bnezl $t4, .L800233D0 -/* A9A144 80022FA4 925801A1 */ lbu $t8, 0x1a1($s2) -/* A9A148 80022FA8 0C0250BC */ jal func_800942F0 -/* A9A14C 80022FAC 02E02025 */ move $a0, $s7 -/* A9A150 80022FB0 8EE602D0 */ lw $a2, 0x2d0($s7) -/* A9A154 80022FB4 3C0EE700 */ lui $t6, 0xe700 -/* A9A158 80022FB8 02E02025 */ move $a0, $s7 -/* A9A15C 80022FBC 24CD0008 */ addiu $t5, $a2, 8 -/* A9A160 80022FC0 AEED02D0 */ sw $t5, 0x2d0($s7) -/* A9A164 80022FC4 24050200 */ li $a1, 512 -/* A9A168 80022FC8 ACC00004 */ sw $zero, 4($a2) -/* A9A16C 80022FCC 0C031A73 */ jal Graph_Alloc -/* A9A170 80022FD0 ACCE0000 */ sw $t6, ($a2) -/* A9A174 80022FD4 14400006 */ bnez $v0, .L80022FF0 -/* A9A178 80022FD8 AFA20098 */ sw $v0, 0x98($sp) -/* A9A17C 80022FDC 3C048013 */ lui $a0, %hi(D_801353F4) -/* A9A180 80022FE0 0C00084C */ jal osSyncPrintf -/* A9A184 80022FE4 248453F4 */ addiu $a0, %lo(D_801353F4) # addiu $a0, $a0, 0x53f4 -/* A9A188 80022FE8 10000104 */ b .L800233FC -/* A9A18C 80022FEC 00000000 */ nop -.L80022FF0: -/* A9A190 80022FF0 924F019E */ lbu $t7, 0x19e($s2) -/* A9A194 80022FF4 00009825 */ move $s3, $zero -/* A9A198 80022FF8 0000A025 */ move $s4, $zero -/* A9A19C 80022FFC 19E000B2 */ blez $t7, .L800232C8 -/* A9A1A0 80023000 02408825 */ move $s1, $s2 -/* A9A1A4 80023004 24150001 */ li $s5, 1 -/* A9A1A8 80023008 8E380000 */ lw $t8, ($s1) -.L8002300C: -/* A9A1AC 8002300C 8FAD0098 */ lw $t5, 0x98($sp) -/* A9A1B0 80023010 56B800A7 */ bnel $s5, $t8, .L800232B0 -/* A9A1B4 80023014 92CF019E */ lbu $t7, 0x19e($s6) -/* A9A1B8 80023018 8E390004 */ lw $t9, 4($s1) -/* A9A1BC 8002301C 924C019F */ lbu $t4, 0x19f($s2) -/* A9A1C0 80023020 3C014F80 */ li $at, 0x4F800000 # 0.000000 -/* A9A1C4 80023024 44992000 */ mtc1 $t9, $f4 -/* A9A1C8 80023028 448C4000 */ mtc1 $t4, $f8 -/* A9A1CC 8002302C 468021A0 */ cvt.s.w $f6, $f4 -/* A9A1D0 80023030 05810004 */ bgez $t4, .L80023044 -/* A9A1D4 80023034 468042A0 */ cvt.s.w $f10, $f8 -/* A9A1D8 80023038 44818000 */ mtc1 $at, $f16 -/* A9A1DC 8002303C 00000000 */ nop -/* A9A1E0 80023040 46105280 */ add.s $f10, $f10, $f16 -.L80023044: -/* A9A1E4 80023044 8E420180 */ lw $v0, 0x180($s2) -/* A9A1E8 80023048 00137100 */ sll $t6, $s3, 4 -/* A9A1EC 8002304C 460A3503 */ div.s $f20, $f6, $f10 -/* A9A1F0 80023050 10400059 */ beqz $v0, .L800231B8 -/* A9A1F4 80023054 01AE8021 */ addu $s0, $t5, $t6 -/* A9A1F8 80023058 10550007 */ beq $v0, $s5, .L80023078 -/* A9A1FC 8002305C 24010002 */ li $at, 2 -/* A9A200 80023060 1041001B */ beq $v0, $at, .L800230D0 -/* A9A204 80023064 24010003 */ li $at, 3 -/* A9A208 80023068 50410030 */ beql $v0, $at, .L8002312C -/* A9A20C 8002306C 3C013F00 */ lui $at, 0x3f00 -/* A9A210 80023070 10000052 */ b .L800231BC -/* A9A214 80023074 862F0008 */ lh $t7, 8($s1) -.L80023078: -/* A9A218 80023078 4406A000 */ mfc1 $a2, $f20 -/* A9A21C 8002307C 86240008 */ lh $a0, 8($s1) -/* A9A220 80023080 0C009F8D */ jal func_80027E34 -/* A9A224 80023084 8625000E */ lh $a1, 0xe($s1) -/* A9A228 80023088 A6020000 */ sh $v0, ($s0) -/* A9A22C 8002308C 4406A000 */ mfc1 $a2, $f20 -/* A9A230 80023090 86250010 */ lh $a1, 0x10($s1) -/* A9A234 80023094 0C009F8D */ jal func_80027E34 -/* A9A238 80023098 8624000A */ lh $a0, 0xa($s1) -/* A9A23C 8002309C A6020002 */ sh $v0, 2($s0) -/* A9A240 800230A0 4406A000 */ mfc1 $a2, $f20 -/* A9A244 800230A4 86250012 */ lh $a1, 0x12($s1) -/* A9A248 800230A8 0C009F8D */ jal func_80027E34 -/* A9A24C 800230AC 8624000C */ lh $a0, 0xc($s1) -/* A9A250 800230B0 A6020004 */ sh $v0, 4($s0) -/* A9A254 800230B4 862F000E */ lh $t7, 0xe($s1) -/* A9A258 800230B8 A60F0010 */ sh $t7, 0x10($s0) -/* A9A25C 800230BC 86380010 */ lh $t8, 0x10($s1) -/* A9A260 800230C0 A6180012 */ sh $t8, 0x12($s0) -/* A9A264 800230C4 86390012 */ lh $t9, 0x12($s1) -/* A9A268 800230C8 10000047 */ b .L800231E8 -/* A9A26C 800230CC A6190014 */ sh $t9, 0x14($s0) -.L800230D0: -/* A9A270 800230D0 862C0008 */ lh $t4, 8($s1) -/* A9A274 800230D4 4406A000 */ mfc1 $a2, $f20 -/* A9A278 800230D8 A60C0000 */ sh $t4, ($s0) -/* A9A27C 800230DC 862D000A */ lh $t5, 0xa($s1) -/* A9A280 800230E0 A60D0002 */ sh $t5, 2($s0) -/* A9A284 800230E4 862E000C */ lh $t6, 0xc($s1) -/* A9A288 800230E8 A60E0004 */ sh $t6, 4($s0) -/* A9A28C 800230EC 86250008 */ lh $a1, 8($s1) -/* A9A290 800230F0 0C009F8D */ jal func_80027E34 -/* A9A294 800230F4 8624000E */ lh $a0, 0xe($s1) -/* A9A298 800230F8 A6020010 */ sh $v0, 0x10($s0) -/* A9A29C 800230FC 4406A000 */ mfc1 $a2, $f20 -/* A9A2A0 80023100 8625000A */ lh $a1, 0xa($s1) -/* A9A2A4 80023104 0C009F8D */ jal func_80027E34 -/* A9A2A8 80023108 86240010 */ lh $a0, 0x10($s1) -/* A9A2AC 8002310C A6020012 */ sh $v0, 0x12($s0) -/* A9A2B0 80023110 4406A000 */ mfc1 $a2, $f20 -/* A9A2B4 80023114 8625000C */ lh $a1, 0xc($s1) -/* A9A2B8 80023118 0C009F8D */ jal func_80027E34 -/* A9A2BC 8002311C 86240012 */ lh $a0, 0x12($s1) -/* A9A2C0 80023120 10000031 */ b .L800231E8 -/* A9A2C4 80023124 A6020014 */ sh $v0, 0x14($s0) -/* A9A2C8 80023128 3C013F00 */ li $at, 0x3F000000 # 0.000000 -.L8002312C: -/* A9A2CC 8002312C 44819000 */ mtc1 $at, $f18 -/* A9A2D0 80023130 86240008 */ lh $a0, 8($s1) -/* A9A2D4 80023134 8625000E */ lh $a1, 0xe($s1) -/* A9A2D8 80023138 4612A502 */ mul.s $f20, $f20, $f18 -/* A9A2DC 8002313C 4406A000 */ mfc1 $a2, $f20 -/* A9A2E0 80023140 0C009F8D */ jal func_80027E34 -/* A9A2E4 80023144 00000000 */ nop -/* A9A2E8 80023148 A6020000 */ sh $v0, ($s0) -/* A9A2EC 8002314C 4406A000 */ mfc1 $a2, $f20 -/* A9A2F0 80023150 86250010 */ lh $a1, 0x10($s1) -/* A9A2F4 80023154 0C009F8D */ jal func_80027E34 -/* A9A2F8 80023158 8624000A */ lh $a0, 0xa($s1) -/* A9A2FC 8002315C A6020002 */ sh $v0, 2($s0) -/* A9A300 80023160 4406A000 */ mfc1 $a2, $f20 -/* A9A304 80023164 86250012 */ lh $a1, 0x12($s1) -/* A9A308 80023168 0C009F8D */ jal func_80027E34 -/* A9A30C 8002316C 8624000C */ lh $a0, 0xc($s1) -/* A9A310 80023170 A6020004 */ sh $v0, 4($s0) -/* A9A314 80023174 4406A000 */ mfc1 $a2, $f20 -/* A9A318 80023178 86250008 */ lh $a1, 8($s1) -/* A9A31C 8002317C 0C009F8D */ jal func_80027E34 -/* A9A320 80023180 8624000E */ lh $a0, 0xe($s1) -/* A9A324 80023184 A6020010 */ sh $v0, 0x10($s0) -/* A9A328 80023188 4406A000 */ mfc1 $a2, $f20 -/* A9A32C 8002318C 8625000A */ lh $a1, 0xa($s1) -/* A9A330 80023190 0C009F8D */ jal func_80027E34 -/* A9A334 80023194 86240010 */ lh $a0, 0x10($s1) -/* A9A338 80023198 A6020012 */ sh $v0, 0x12($s0) -/* A9A33C 8002319C 4406A000 */ mfc1 $a2, $f20 -/* A9A340 800231A0 8625000C */ lh $a1, 0xc($s1) -/* A9A344 800231A4 0C009F8D */ jal func_80027E34 -/* A9A348 800231A8 86240012 */ lh $a0, 0x12($s1) -/* A9A34C 800231AC A6020014 */ sh $v0, 0x14($s0) -/* A9A350 800231B0 1000000D */ b .L800231E8 -/* A9A354 800231B4 4614A500 */ add.s $f20, $f20, $f20 -.L800231B8: -/* A9A358 800231B8 862F0008 */ lh $t7, 8($s1) -.L800231BC: -/* A9A35C 800231BC A60F0000 */ sh $t7, ($s0) -/* A9A360 800231C0 8638000A */ lh $t8, 0xa($s1) -/* A9A364 800231C4 A6180002 */ sh $t8, 2($s0) -/* A9A368 800231C8 8639000C */ lh $t9, 0xc($s1) -/* A9A36C 800231CC A6190004 */ sh $t9, 4($s0) -/* A9A370 800231D0 862C000E */ lh $t4, 0xe($s1) -/* A9A374 800231D4 A60C0010 */ sh $t4, 0x10($s0) -/* A9A378 800231D8 862D0010 */ lh $t5, 0x10($s1) -/* A9A37C 800231DC A60D0012 */ sh $t5, 0x12($s0) -/* A9A380 800231E0 862E0012 */ lh $t6, 0x12($s1) -/* A9A384 800231E4 A60E0014 */ sh $t6, 0x14($s0) -.L800231E8: -/* A9A388 800231E8 A6000006 */ sh $zero, 6($s0) -/* A9A38C 800231EC A6000008 */ sh $zero, 8($s0) -/* A9A390 800231F0 A600000A */ sh $zero, 0xa($s0) -/* A9A394 800231F4 4406A000 */ mfc1 $a2, $f20 -/* A9A398 800231F8 92450196 */ lbu $a1, 0x196($s2) -/* A9A39C 800231FC 0C009FA1 */ jal func_80027E84 -/* A9A3A0 80023200 9244018E */ lbu $a0, 0x18e($s2) -/* A9A3A4 80023204 A202000C */ sb $v0, 0xc($s0) -/* A9A3A8 80023208 4406A000 */ mfc1 $a2, $f20 -/* A9A3AC 8002320C 92450197 */ lbu $a1, 0x197($s2) -/* A9A3B0 80023210 0C009FA1 */ jal func_80027E84 -/* A9A3B4 80023214 9244018F */ lbu $a0, 0x18f($s2) -/* A9A3B8 80023218 A202000D */ sb $v0, 0xd($s0) -/* A9A3BC 8002321C 4406A000 */ mfc1 $a2, $f20 -/* A9A3C0 80023220 92450198 */ lbu $a1, 0x198($s2) -/* A9A3C4 80023224 0C009FA1 */ jal func_80027E84 -/* A9A3C8 80023228 92440190 */ lbu $a0, 0x190($s2) -/* A9A3CC 8002322C A202000E */ sb $v0, 0xe($s0) -/* A9A3D0 80023230 4406A000 */ mfc1 $a2, $f20 -/* A9A3D4 80023234 92450199 */ lbu $a1, 0x199($s2) -/* A9A3D8 80023238 0C009FA1 */ jal func_80027E84 -/* A9A3DC 8002323C 92440191 */ lbu $a0, 0x191($s2) -/* A9A3E0 80023240 A202000F */ sb $v0, 0xf($s0) -/* A9A3E4 80023244 A6000016 */ sh $zero, 0x16($s0) -/* A9A3E8 80023248 A6000018 */ sh $zero, 0x18($s0) -/* A9A3EC 8002324C A600001A */ sh $zero, 0x1a($s0) -/* A9A3F0 80023250 4406A000 */ mfc1 $a2, $f20 -/* A9A3F4 80023254 26730001 */ addiu $s3, $s3, 1 -/* A9A3F8 80023258 26100010 */ addiu $s0, $s0, 0x10 -/* A9A3FC 8002325C 9245019A */ lbu $a1, 0x19a($s2) -/* A9A400 80023260 0C009FA1 */ jal func_80027E84 -/* A9A404 80023264 92440192 */ lbu $a0, 0x192($s2) -/* A9A408 80023268 A202000C */ sb $v0, 0xc($s0) -/* A9A40C 8002326C 4406A000 */ mfc1 $a2, $f20 -/* A9A410 80023270 9245019B */ lbu $a1, 0x19b($s2) -/* A9A414 80023274 0C009FA1 */ jal func_80027E84 -/* A9A418 80023278 92440193 */ lbu $a0, 0x193($s2) -/* A9A41C 8002327C A202000D */ sb $v0, 0xd($s0) -/* A9A420 80023280 4406A000 */ mfc1 $a2, $f20 -/* A9A424 80023284 9245019C */ lbu $a1, 0x19c($s2) -/* A9A428 80023288 0C009FA1 */ jal func_80027E84 -/* A9A42C 8002328C 92440194 */ lbu $a0, 0x194($s2) -/* A9A430 80023290 A202000E */ sb $v0, 0xe($s0) -/* A9A434 80023294 4406A000 */ mfc1 $a2, $f20 -/* A9A438 80023298 9245019D */ lbu $a1, 0x19d($s2) -/* A9A43C 8002329C 0C009FA1 */ jal func_80027E84 -/* A9A440 800232A0 92440195 */ lbu $a0, 0x195($s2) -/* A9A444 800232A4 A202000F */ sb $v0, 0xf($s0) -/* A9A448 800232A8 26730001 */ addiu $s3, $s3, 1 -/* A9A44C 800232AC 92CF019E */ lbu $t7, 0x19e($s6) -.L800232B0: -/* A9A450 800232B0 26940001 */ addiu $s4, $s4, 1 -/* A9A454 800232B4 26310018 */ addiu $s1, $s1, 0x18 -/* A9A458 800232B8 028F082A */ slt $at, $s4, $t7 -/* A9A45C 800232BC 5420FF53 */ bnezl $at, .L8002300C -/* A9A460 800232C0 8E380000 */ lw $t8, ($s1) -/* A9A464 800232C4 00009825 */ move $s3, $zero -.L800232C8: -/* A9A468 800232C8 8EE602D0 */ lw $a2, 0x2d0($s7) -/* A9A46C 800232CC 3C190102 */ lui $t9, (0x01020040 >> 16) # lui $t9, 0x102 -/* A9A470 800232D0 37390040 */ ori $t9, (0x01020040 & 0xFFFF) # ori $t9, $t9, 0x40 -/* A9A474 800232D4 24D80008 */ addiu $t8, $a2, 8 -/* A9A478 800232D8 AEF802D0 */ sw $t8, 0x2d0($s7) -/* A9A47C 800232DC ACD90000 */ sw $t9, ($a2) -/* A9A480 800232E0 8FAC0098 */ lw $t4, 0x98($sp) -/* A9A484 800232E4 24150001 */ li $s5, 1 -/* A9A488 800232E8 00005025 */ move $t2, $zero -/* A9A48C 800232EC ACCC0004 */ sw $t4, 4($a2) -/* A9A490 800232F0 924D019E */ lbu $t5, 0x19e($s2) -/* A9A494 800232F4 02408825 */ move $s1, $s2 -/* A9A498 800232F8 3C0B0700 */ lui $t3, 0x700 -/* A9A49C 800232FC 19A0003F */ blez $t5, .L800233FC -/* A9A4A0 80023300 00000000 */ nop -/* A9A4A4 80023304 8E2E0000 */ lw $t6, ($s1) -.L80023308: -/* A9A4A8 80023308 26310018 */ addiu $s1, $s1, 0x18 -/* A9A4AC 8002330C 15C00008 */ bnez $t6, .L80023330 -/* A9A4B0 80023310 00000000 */ nop -/* A9A4B4 80023314 92C2019E */ lbu $v0, 0x19e($s6) -/* A9A4B8 80023318 00005025 */ move $t2, $zero -/* A9A4BC 8002331C 00027880 */ sll $t7, $v0, 2 -/* A9A4C0 80023320 01E27823 */ subu $t7, $t7, $v0 -/* A9A4C4 80023324 000F78C0 */ sll $t7, $t7, 3 -/* A9A4C8 80023328 10000023 */ b .L800233B8 -/* A9A4CC 8002332C 01F21821 */ addu $v1, $t7, $s2 -.L80023330: -/* A9A4D0 80023330 15400003 */ bnez $t2, .L80023340 -/* A9A4D4 80023334 00132840 */ sll $a1, $s3, 1 -/* A9A4D8 80023338 10000019 */ b .L800233A0 -/* A9A4DC 8002333C 02A05025 */ move $t2, $s5 -.L80023340: -/* A9A4E0 80023340 8EE602D0 */ lw $a2, 0x2d0($s7) -/* A9A4E4 80023344 24A7FFFC */ addiu $a3, $a1, -4 -/* A9A4E8 80023348 24A8FFFE */ addiu $t0, $a1, -2 -/* A9A4EC 8002334C 311900FF */ andi $t9, $t0, 0xff -/* A9A4F0 80023350 30E300FF */ andi $v1, $a3, 0xff -/* A9A4F4 80023354 24A90002 */ addiu $t1, $a1, 2 -/* A9A4F8 80023358 312400FF */ andi $a0, $t1, 0xff -/* A9A4FC 8002335C 00031C00 */ sll $v1, $v1, 0x10 -/* A9A500 80023360 00196200 */ sll $t4, $t9, 8 -/* A9A504 80023364 24D80008 */ addiu $t8, $a2, 8 -/* A9A508 80023368 AEF802D0 */ sw $t8, 0x2d0($s7) -/* A9A50C 8002336C 006C6825 */ or $t5, $v1, $t4 -/* A9A510 80023370 01A47025 */ or $t6, $t5, $a0 -/* A9A514 80023374 0004C200 */ sll $t8, $a0, 8 -/* A9A518 80023378 0078C825 */ or $t9, $v1, $t8 -/* A9A51C 8002337C 30AC00FF */ andi $t4, $a1, 0xff -/* A9A520 80023380 032C6825 */ or $t5, $t9, $t4 -/* A9A524 80023384 01CB7825 */ or $t7, $t6, $t3 -/* A9A528 80023388 ACCF0000 */ sw $t7, ($a2) -/* A9A52C 8002338C ACCD0004 */ sw $t5, 4($a2) -/* A9A530 80023390 924E01A0 */ lbu $t6, 0x1a0($s2) -/* A9A534 80023394 56AE0003 */ bnel $s5, $t6, .L800233A4 -/* A9A538 80023398 92C2019E */ lbu $v0, 0x19e($s6) -/* A9A53C 8002339C 00005025 */ move $t2, $zero -.L800233A0: -/* A9A540 800233A0 92C2019E */ lbu $v0, 0x19e($s6) -.L800233A4: -/* A9A544 800233A4 26730002 */ addiu $s3, $s3, 2 -/* A9A548 800233A8 00027880 */ sll $t7, $v0, 2 -/* A9A54C 800233AC 01E27823 */ subu $t7, $t7, $v0 -/* A9A550 800233B0 000F78C0 */ sll $t7, $t7, 3 -/* A9A554 800233B4 01F21821 */ addu $v1, $t7, $s2 -.L800233B8: -/* A9A558 800233B8 0223082B */ sltu $at, $s1, $v1 -/* A9A55C 800233BC 5420FFD2 */ bnezl $at, .L80023308 -/* A9A560 800233C0 8E2E0000 */ lw $t6, ($s1) -/* A9A564 800233C4 1000000D */ b .L800233FC -/* A9A568 800233C8 00000000 */ nop -/* A9A56C 800233CC 925801A1 */ lbu $t8, 0x1a1($s2) -.L800233D0: -/* A9A570 800233D0 02E02825 */ move $a1, $s7 -/* A9A574 800233D4 02402025 */ move $a0, $s2 -/* A9A578 800233D8 2B010002 */ slti $at, $t8, 2 -/* A9A57C 800233DC 10200005 */ beqz $at, .L800233F4 -/* A9A580 800233E0 00000000 */ nop -/* A9A584 800233E4 0C008A84 */ jal func_80022A10 -/* A9A588 800233E8 02402025 */ move $a0, $s2 -/* A9A58C 800233EC 10000003 */ b .L800233FC -/* A9A590 800233F0 00000000 */ nop -.L800233F4: -/* A9A594 800233F4 0C0087C0 */ jal func_80021F00 -/* A9A598 800233F8 02E02825 */ move $a1, $s7 -.L800233FC: -/* A9A59C 800233FC 3C068013 */ lui $a2, %hi(D_80135418) # $a2, 0x8013 -/* A9A5A0 80023400 24C65418 */ addiu $a2, %lo(D_80135418) # addiu $a2, $a2, 0x5418 -/* A9A5A4 80023404 27A40074 */ addiu $a0, $sp, 0x74 -/* A9A5A8 80023408 02E02825 */ move $a1, $s7 -/* A9A5AC 8002340C 0C031AD5 */ jal Graph_CloseDisps -/* A9A5B0 80023410 2407071F */ li $a3, 1823 -/* A9A5B4 80023414 8FBF003C */ lw $ra, 0x3c($sp) -/* A9A5B8 80023418 D7B40010 */ ldc1 $f20, 0x10($sp) -/* A9A5BC 8002341C 8FB0001C */ lw $s0, 0x1c($sp) -/* A9A5C0 80023420 8FB10020 */ lw $s1, 0x20($sp) -/* A9A5C4 80023424 8FB20024 */ lw $s2, 0x24($sp) -/* A9A5C8 80023428 8FB30028 */ lw $s3, 0x28($sp) -/* A9A5CC 8002342C 8FB4002C */ lw $s4, 0x2c($sp) -/* A9A5D0 80023430 8FB50030 */ lw $s5, 0x30($sp) -/* A9A5D4 80023434 8FB60034 */ lw $s6, 0x34($sp) -/* A9A5D8 80023438 8FB70038 */ lw $s7, 0x38($sp) -/* A9A5DC 8002343C 03E00008 */ jr $ra -/* A9A5E0 80023440 27BD00A0 */ addiu $sp, $sp, 0xa0 diff --git a/asm/non_matchings/code/z_eff_shield_particle/func_80023450.s b/asm/non_matchings/code/z_eff_shield_particle/func_80023450.s deleted file mode 100644 index df2bea67de..0000000000 --- a/asm/non_matchings/code/z_eff_shield_particle/func_80023450.s +++ /dev/null @@ -1,180 +0,0 @@ -.rdata -glabel D_80135450 - .asciz "\x1b[31m" - .balign 4 - -glabel D_80135458 - .asciz "EffectShieldParticle_ct():パーティクル数がオーバしてます。\n" - # EUC-JP: パーティクル数がオーバしてます。 | The number of particles is over - .balign 4 - -glabel D_80135494 - .asciz "\x1b[m" - .balign 4 - -.late_rodata -glabel D_801354D0 - .float 65534 - -.text -glabel func_80023450 -/* A9A5F0 80023450 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* A9A5F4 80023454 AFB3003C */ sw $s3, 0x3c($sp) -/* A9A5F8 80023458 AFB20038 */ sw $s2, 0x38($sp) -/* A9A5FC 8002345C AFB10034 */ sw $s1, 0x34($sp) -/* A9A600 80023460 00808825 */ move $s1, $a0 -/* A9A604 80023464 00A09825 */ move $s3, $a1 -/* A9A608 80023468 AFBF0044 */ sw $ra, 0x44($sp) -/* A9A60C 8002346C AFB40040 */ sw $s4, 0x40($sp) -/* A9A610 80023470 AFB00030 */ sw $s0, 0x30($sp) -/* A9A614 80023474 F7B80028 */ sdc1 $f24, 0x28($sp) -/* A9A618 80023478 F7B60020 */ sdc1 $f22, 0x20($sp) -/* A9A61C 8002347C F7B40018 */ sdc1 $f20, 0x18($sp) -/* A9A620 80023480 10800081 */ beqz $a0, .L80023688 -/* A9A624 80023484 00809025 */ move $s2, $a0 -/* A9A628 80023488 50A00080 */ beql $a1, $zero, .L8002368C -/* A9A62C 8002348C 8FBF0044 */ lw $ra, 0x44($sp) -/* A9A630 80023490 90AE0000 */ lbu $t6, ($a1) -/* A9A634 80023494 31CF00FF */ andi $t7, $t6, 0xff -/* A9A638 80023498 29E10011 */ slti $at, $t7, 0x11 -/* A9A63C 8002349C 1420000C */ bnez $at, .L800234D0 -/* A9A640 800234A0 A08E0180 */ sb $t6, 0x180($a0) -/* A9A644 800234A4 3C048013 */ lui $a0, %hi(D_80135450) # $a0, 0x8013 -/* A9A648 800234A8 0C00084C */ jal osSyncPrintf -/* A9A64C 800234AC 24845450 */ addiu $a0, %lo(D_80135450) # addiu $a0, $a0, 0x5450 -/* A9A650 800234B0 3C048013 */ lui $a0, %hi(D_80135458) # $a0, 0x8013 -/* A9A654 800234B4 0C00084C */ jal osSyncPrintf -/* A9A658 800234B8 24845458 */ addiu $a0, %lo(D_80135458) # addiu $a0, $a0, 0x5458 -/* A9A65C 800234BC 3C048013 */ lui $a0, %hi(D_80135494) # $a0, 0x8013 -/* A9A660 800234C0 0C00084C */ jal osSyncPrintf -/* A9A664 800234C4 24845494 */ addiu $a0, %lo(D_80135494) # addiu $a0, $a0, 0x5494 -/* A9A668 800234C8 10000070 */ b .L8002368C -/* A9A66C 800234CC 8FBF0044 */ lw $ra, 0x44($sp) -.L800234D0: -/* A9A670 800234D0 8A790002 */ lwl $t9, 2($s3) -/* A9A674 800234D4 9A790005 */ lwr $t9, 5($s3) -/* A9A678 800234D8 24140018 */ li $s4, 24 -/* A9A67C 800234DC 02208025 */ move $s0, $s1 -/* A9A680 800234E0 AA390182 */ swl $t9, 0x182($s1) -/* A9A684 800234E4 BA390185 */ swr $t9, 0x185($s1) -/* A9A688 800234E8 96790006 */ lhu $t9, 6($s3) -/* A9A68C 800234EC A6390186 */ sh $t9, 0x186($s1) -/* A9A690 800234F0 8A690008 */ lwl $t1, 8($s3) -/* A9A694 800234F4 9A69000B */ lwr $t1, 0xb($s3) -/* A9A698 800234F8 AA290188 */ swl $t1, 0x188($s1) -/* A9A69C 800234FC BA29018B */ swr $t1, 0x18b($s1) -/* A9A6A0 80023500 8A6B000C */ lwl $t3, 0xc($s3) -/* A9A6A4 80023504 9A6B000F */ lwr $t3, 0xf($s3) -/* A9A6A8 80023508 AA2B018C */ swl $t3, 0x18c($s1) -/* A9A6AC 8002350C BA2B018F */ swr $t3, 0x18f($s1) -/* A9A6B0 80023510 8A6D0010 */ lwl $t5, 0x10($s3) -/* A9A6B4 80023514 9A6D0013 */ lwr $t5, 0x13($s3) -/* A9A6B8 80023518 922B0180 */ lbu $t3, 0x180($s1) -/* A9A6BC 8002351C AA2D0190 */ swl $t5, 0x190($s1) -/* A9A6C0 80023520 BA2D0193 */ swr $t5, 0x193($s1) -/* A9A6C4 80023524 8A6F0014 */ lwl $t7, 0x14($s3) -/* A9A6C8 80023528 9A6F0017 */ lwr $t7, 0x17($s3) -/* A9A6CC 8002352C 01740019 */ multu $t3, $s4 -/* A9A6D0 80023530 AA2F0194 */ swl $t7, 0x194($s1) -/* A9A6D4 80023534 BA2F0197 */ swr $t7, 0x197($s1) -/* A9A6D8 80023538 8A790018 */ lwl $t9, 0x18($s3) -/* A9A6DC 8002353C 9A79001B */ lwr $t9, 0x1b($s3) -/* A9A6E0 80023540 AA390198 */ swl $t9, 0x198($s1) -/* A9A6E4 80023544 BA39019B */ swr $t9, 0x19b($s1) -/* A9A6E8 80023548 8A69001C */ lwl $t1, 0x1c($s3) -/* A9A6EC 8002354C 9A69001F */ lwr $t1, 0x1f($s3) -/* A9A6F0 80023550 00006012 */ mflo $t4 -/* A9A6F4 80023554 022C6821 */ addu $t5, $s1, $t4 -/* A9A6F8 80023558 AA29019C */ swl $t1, 0x19c($s1) -/* A9A6FC 8002355C BA29019F */ swr $t1, 0x19f($s1) -/* A9A700 80023560 C6640020 */ lwc1 $f4, 0x20($s3) -/* A9A704 80023564 022D082B */ sltu $at, $s1, $t5 -/* A9A708 80023568 E62401A0 */ swc1 $f4, 0x1a0($s1) -/* A9A70C 8002356C C6660024 */ lwc1 $f6, 0x24($s3) -/* A9A710 80023570 E62601A8 */ swc1 $f6, 0x1a8($s1) -/* A9A714 80023574 C6680028 */ lwc1 $f8, 0x28($s3) -/* A9A718 80023578 E62801AC */ swc1 $f8, 0x1ac($s1) -/* A9A71C 8002357C 926A002C */ lbu $t2, 0x2c($s3) -/* A9A720 80023580 A22001B1 */ sb $zero, 0x1b1($s1) -/* A9A724 80023584 10200025 */ beqz $at, .L8002361C -/* A9A728 80023588 A22A01B0 */ sb $t2, 0x1b0($s1) -/* A9A72C 8002358C 3C013F00 */ li $at, 0x3F000000 # 0.000000 -/* A9A730 80023590 4481C000 */ mtc1 $at, $f24 -/* A9A734 80023594 3C018013 */ lui $at, %hi(D_801354D0) -/* A9A738 80023598 4480A000 */ mtc1 $zero, $f20 -/* A9A73C 8002359C C43654D0 */ lwc1 $f22, %lo(D_801354D0)($at) -.L800235A0: -/* A9A740 800235A0 0C03F66B */ jal Math_Rand_ZeroOne -/* A9A744 800235A4 00000000 */ nop -/* A9A748 800235A8 C62A01A8 */ lwc1 $f10, 0x1a8($s1) -/* A9A74C 800235AC E6140008 */ swc1 $f20, 8($s0) -/* A9A750 800235B0 E614000C */ swc1 $f20, 0xc($s0) -/* A9A754 800235B4 46185082 */ mul.s $f2, $f10, $f24 -/* A9A758 800235B8 E6140010 */ swc1 $f20, 0x10($s0) -/* A9A75C 800235BC 46020402 */ mul.s $f16, $f0, $f2 -/* A9A760 800235C0 46028480 */ add.s $f18, $f16, $f2 -/* A9A764 800235C4 E6120000 */ swc1 $f18, ($s0) -/* A9A768 800235C8 C6040000 */ lwc1 $f4, ($s0) -/* A9A76C 800235CC 0C03F66B */ jal Math_Rand_ZeroOne -/* A9A770 800235D0 E6040004 */ swc1 $f4, 4($s0) -/* A9A774 800235D4 46160182 */ mul.s $f6, $f0, $f22 -/* A9A778 800235D8 4600320D */ trunc.w.s $f8, $f6 -/* A9A77C 800235DC 440F4000 */ mfc1 $t7, $f8 -/* A9A780 800235E0 0C03F66B */ jal Math_Rand_ZeroOne -/* A9A784 800235E4 A60F0014 */ sh $t7, 0x14($s0) -/* A9A788 800235E8 46160282 */ mul.s $f10, $f0, $f22 -/* A9A78C 800235EC 26100018 */ addiu $s0, $s0, 0x18 -/* A9A790 800235F0 4600540D */ trunc.w.s $f16, $f10 -/* A9A794 800235F4 44198000 */ mfc1 $t9, $f16 -/* A9A798 800235F8 00000000 */ nop -/* A9A79C 800235FC A619FFFE */ sh $t9, -2($s0) -/* A9A7A0 80023600 92480180 */ lbu $t0, 0x180($s2) -/* A9A7A4 80023604 01140019 */ multu $t0, $s4 -/* A9A7A8 80023608 00004812 */ mflo $t1 -/* A9A7AC 8002360C 02495021 */ addu $t2, $s2, $t1 -/* A9A7B0 80023610 020A082B */ sltu $at, $s0, $t2 -/* A9A7B4 80023614 1420FFE2 */ bnez $at, .L800235A0 -/* A9A7B8 80023618 00000000 */ nop -.L8002361C: -/* A9A7BC 8002361C 8E6B003C */ lw $t3, 0x3c($s3) -/* A9A7C0 80023620 24010001 */ li $at, 1 -/* A9A7C4 80023624 15610017 */ bne $t3, $at, .L80023684 -/* A9A7C8 80023628 AE2B01C4 */ sw $t3, 0x1c4($s1) -/* A9A7CC 8002362C A22001B2 */ sb $zero, 0x1b2($s1) -/* A9A7D0 80023630 8A6E002E */ lwl $t6, 0x2e($s3) -/* A9A7D4 80023634 9A6E0031 */ lwr $t6, 0x31($s3) -/* A9A7D8 80023638 AA2E01B4 */ swl $t6, 0x1b4($s1) -/* A9A7DC 8002363C BA2E01B7 */ swr $t6, 0x1b7($s1) -/* A9A7E0 80023640 8A6D0032 */ lwl $t5, 0x32($s3) -/* A9A7E4 80023644 9A6D0035 */ lwr $t5, 0x35($s3) -/* A9A7E8 80023648 AA2D01B8 */ swl $t5, 0x1b8($s1) -/* A9A7EC 8002364C BA2D01BB */ swr $t5, 0x1bb($s1) -/* A9A7F0 80023650 8A6E0036 */ lwl $t6, 0x36($s3) -/* A9A7F4 80023654 9A6E0039 */ lwr $t6, 0x39($s3) -/* A9A7F8 80023658 AA2E01BC */ swl $t6, 0x1bc($s1) -/* A9A7FC 8002365C 0C009AC0 */ jal func_80026B00 -/* A9A800 80023660 BA2E01BF */ swr $t6, 0x1bf($s1) -/* A9A804 80023664 0C009AC0 */ jal func_80026B00 -/* A9A808 80023668 00408025 */ move $s0, $v0 -/* A9A80C 8002366C 02002025 */ move $a0, $s0 -/* A9A810 80023670 244507A8 */ addiu $a1, $v0, 0x7a8 -/* A9A814 80023674 0C01E9D9 */ jal Lights_Insert -/* A9A818 80023678 262601B2 */ addiu $a2, $s1, 0x1b2 -/* A9A81C 8002367C 10000002 */ b .L80023688 -/* A9A820 80023680 AE2201C0 */ sw $v0, 0x1c0($s1) -.L80023684: -/* A9A824 80023684 AE2001C0 */ sw $zero, 0x1c0($s1) -.L80023688: -/* A9A828 80023688 8FBF0044 */ lw $ra, 0x44($sp) -.L8002368C: -/* A9A82C 8002368C D7B40018 */ ldc1 $f20, 0x18($sp) -/* A9A830 80023690 D7B60020 */ ldc1 $f22, 0x20($sp) -/* A9A834 80023694 D7B80028 */ ldc1 $f24, 0x28($sp) -/* A9A838 80023698 8FB00030 */ lw $s0, 0x30($sp) -/* A9A83C 8002369C 8FB10034 */ lw $s1, 0x34($sp) -/* A9A840 800236A0 8FB20038 */ lw $s2, 0x38($sp) -/* A9A844 800236A4 8FB3003C */ lw $s3, 0x3c($sp) -/* A9A848 800236A8 8FB40040 */ lw $s4, 0x40($sp) -/* A9A84C 800236AC 03E00008 */ jr $ra -/* A9A850 800236B0 27BD0048 */ addiu $sp, $sp, 0x48 - diff --git a/asm/non_matchings/code/z_eff_shield_particle/func_800236B4.s b/asm/non_matchings/code/z_eff_shield_particle/func_800236B4.s deleted file mode 100644 index fa8efc57ef..0000000000 --- a/asm/non_matchings/code/z_eff_shield_particle/func_800236B4.s +++ /dev/null @@ -1,137 +0,0 @@ -glabel func_800236B4 -/* A9A854 800236B4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A9A858 800236B8 1080001B */ beqz $a0, .L80023728 -/* A9A85C 800236BC AFBF0014 */ sw $ra, 0x14($sp) -/* A9A860 800236C0 8C8E01C4 */ lw $t6, 0x1c4($a0) -/* A9A864 800236C4 24010001 */ li $at, 1 -/* A9A868 800236C8 55C10018 */ bnel $t6, $at, .L8002372C -/* A9A86C 800236CC 8FBF0014 */ lw $ra, 0x14($sp) -/* A9A870 800236D0 0C009AC0 */ jal func_80026B00 -/* A9A874 800236D4 AFA40028 */ sw $a0, 0x28($sp) -/* A9A878 800236D8 8FA70028 */ lw $a3, 0x28($sp) -/* A9A87C 800236DC 8C5807A8 */ lw $t8, 0x7a8($v0) -/* A9A880 800236E0 8CEF01C0 */ lw $t7, 0x1c0($a3) -/* A9A884 800236E4 15F80007 */ bne $t7, $t8, .L80023704 -/* A9A888 800236E8 00000000 */ nop -/* A9A88C 800236EC 0C009AC0 */ jal func_80026B00 -/* A9A890 800236F0 AFA70028 */ sw $a3, 0x28($sp) -/* A9A894 800236F4 8FA70028 */ lw $a3, 0x28($sp) -/* A9A898 800236F8 8CF901C0 */ lw $t9, 0x1c0($a3) -/* A9A89C 800236FC 8F280008 */ lw $t0, 8($t9) -/* A9A8A0 80023700 AC4807A8 */ sw $t0, 0x7a8($v0) -.L80023704: -/* A9A8A4 80023704 0C009AC0 */ jal func_80026B00 -/* A9A8A8 80023708 AFA70028 */ sw $a3, 0x28($sp) -/* A9A8AC 8002370C 0C009AC0 */ jal func_80026B00 -/* A9A8B0 80023710 AFA2001C */ sw $v0, 0x1c($sp) -/* A9A8B4 80023714 8FA70028 */ lw $a3, 0x28($sp) -/* A9A8B8 80023718 8FA4001C */ lw $a0, 0x1c($sp) -/* A9A8BC 8002371C 244507A8 */ addiu $a1, $v0, 0x7a8 -/* A9A8C0 80023720 0C01E9F1 */ jal Lights_Remove -/* A9A8C4 80023724 8CE601C0 */ lw $a2, 0x1c0($a3) -.L80023728: -/* A9A8C8 80023728 8FBF0014 */ lw $ra, 0x14($sp) -.L8002372C: -/* A9A8CC 8002372C 27BD0028 */ addiu $sp, $sp, 0x28 -/* A9A8D0 80023730 03E00008 */ jr $ra -/* A9A8D4 80023734 00000000 */ nop -/* A9A8D8 80023738 14800003 */ bnez $a0, .L80023748 -/* A9A8DC 8002373C 00801025 */ move $v0, $a0 -/* A9A8E0 80023740 03E00008 */ jr $ra -/* A9A8E4 80023744 00001025 */ move $v0, $zero -.L80023748: -/* A9A8E8 80023748 908E0180 */ lbu $t6, 0x180($a0) -/* A9A8EC 8002374C 24050018 */ li $a1, 24 -/* A9A8F0 80023750 00801825 */ move $v1, $a0 -/* A9A8F4 80023754 01C50019 */ multu $t6, $a1 -/* A9A8F8 80023758 00007812 */ mflo $t7 -/* A9A8FC 8002375C 008FC021 */ addu $t8, $a0, $t7 -/* A9A900 80023760 0098082B */ sltu $at, $a0, $t8 -/* A9A904 80023764 50200038 */ beql $at, $zero, .L80023848 -/* A9A908 80023768 8C8A01C4 */ lw $t2, 0x1c4($a0) -/* A9A90C 8002376C 44801000 */ mtc1 $zero, $f2 -/* A9A910 80023770 00000000 */ nop -/* A9A914 80023774 C4640004 */ lwc1 $f4, 4($v1) -.L80023778: -/* A9A918 80023778 C48601A0 */ lwc1 $f6, 0x1a0($a0) -/* A9A91C 8002377C 46062201 */ sub.s $f8, $f4, $f6 -/* A9A920 80023780 E4680004 */ swc1 $f8, 4($v1) -/* A9A924 80023784 C46A0004 */ lwc1 $f10, 4($v1) -/* A9A928 80023788 4602503C */ c.lt.s $f10, $f2 -/* A9A92C 8002378C 00000000 */ nop -/* A9A930 80023790 45020003 */ bc1fl .L800237A0 -/* A9A934 80023794 C460000C */ lwc1 $f0, 0xc($v1) -/* A9A938 80023798 E4620004 */ swc1 $f2, 4($v1) -/* A9A93C 8002379C C460000C */ lwc1 $f0, 0xc($v1) -.L800237A0: -/* A9A940 800237A0 4600103C */ c.lt.s $f2, $f0 -/* A9A944 800237A4 00000000 */ nop -/* A9A948 800237A8 4502000C */ bc1fl .L800237DC -/* A9A94C 800237AC C4640008 */ lwc1 $f4, 8($v1) -/* A9A950 800237B0 C49001A0 */ lwc1 $f16, 0x1a0($a0) -/* A9A954 800237B4 46100481 */ sub.s $f18, $f0, $f16 -/* A9A958 800237B8 E472000C */ swc1 $f18, 0xc($v1) -/* A9A95C 800237BC C460000C */ lwc1 $f0, 0xc($v1) -/* A9A960 800237C0 4602003C */ c.lt.s $f0, $f2 -/* A9A964 800237C4 00000000 */ nop -/* A9A968 800237C8 45020004 */ bc1fl .L800237DC -/* A9A96C 800237CC C4640008 */ lwc1 $f4, 8($v1) -/* A9A970 800237D0 E462000C */ swc1 $f2, 0xc($v1) -/* A9A974 800237D4 C460000C */ lwc1 $f0, 0xc($v1) -/* A9A978 800237D8 C4640008 */ lwc1 $f4, 8($v1) -.L800237DC: -/* A9A97C 800237DC C4660004 */ lwc1 $f6, 4($v1) -/* A9A980 800237E0 C46A0010 */ lwc1 $f10, 0x10($v1) -/* A9A984 800237E4 46001032 */ c.eq.s $f2, $f0 -/* A9A988 800237E8 46062200 */ add.s $f8, $f4, $f6 -/* A9A98C 800237EC 46005400 */ add.s $f16, $f10, $f0 -/* A9A990 800237F0 E4680008 */ swc1 $f8, 8($v1) -/* A9A994 800237F4 4500000B */ bc1f .L80023824 -/* A9A998 800237F8 E4700010 */ swc1 $f16, 0x10($v1) -/* A9A99C 800237FC C4640008 */ lwc1 $f4, 8($v1) -/* A9A9A0 80023800 C4660010 */ lwc1 $f6, 0x10($v1) -/* A9A9A4 80023804 C49201AC */ lwc1 $f18, 0x1ac($a0) -/* A9A9A8 80023808 46062201 */ sub.s $f8, $f4, $f6 -/* A9A9AC 8002380C 4608903C */ c.lt.s $f18, $f8 -/* A9A9B0 80023810 00000000 */ nop -/* A9A9B4 80023814 45020004 */ bc1fl .L80023828 -/* A9A9B8 80023818 90590180 */ lbu $t9, 0x180($v0) -/* A9A9BC 8002381C C46A0000 */ lwc1 $f10, ($v1) -/* A9A9C0 80023820 E46A000C */ swc1 $f10, 0xc($v1) -.L80023824: -/* A9A9C4 80023824 90590180 */ lbu $t9, 0x180($v0) -.L80023828: -/* A9A9C8 80023828 24630018 */ addiu $v1, $v1, 0x18 -/* A9A9CC 8002382C 03250019 */ multu $t9, $a1 -/* A9A9D0 80023830 00004012 */ mflo $t0 -/* A9A9D4 80023834 00484821 */ addu $t1, $v0, $t0 -/* A9A9D8 80023838 0069082B */ sltu $at, $v1, $t1 -/* A9A9DC 8002383C 5420FFCE */ bnezl $at, .L80023778 -/* A9A9E0 80023840 C4640004 */ lwc1 $f4, 4($v1) -/* A9A9E4 80023844 8C8A01C4 */ lw $t2, 0x1c4($a0) -.L80023848: -/* A9A9E8 80023848 24010001 */ li $at, 1 -/* A9A9EC 8002384C 00001025 */ move $v0, $zero -/* A9A9F0 80023850 55410008 */ bnel $t2, $at, .L80023874 -/* A9A9F4 80023854 908D01B1 */ lbu $t5, 0x1b1($a0) -/* A9A9F8 80023858 848B01BE */ lh $t3, 0x1be($a0) -/* A9A9FC 8002385C 05610003 */ bgez $t3, .L8002386C -/* A9AA00 80023860 000B6043 */ sra $t4, $t3, 1 -/* A9AA04 80023864 25610001 */ addiu $at, $t3, 1 -/* A9AA08 80023868 00016043 */ sra $t4, $at, 1 -.L8002386C: -/* A9AA0C 8002386C A48C01BE */ sh $t4, 0x1be($a0) -/* A9AA10 80023870 908D01B1 */ lbu $t5, 0x1b1($a0) -.L80023874: -/* A9AA14 80023874 908F01B0 */ lbu $t7, 0x1b0($a0) -/* A9AA18 80023878 25AE0001 */ addiu $t6, $t5, 1 -/* A9AA1C 8002387C 31D800FF */ andi $t8, $t6, 0xff -/* A9AA20 80023880 01F8082A */ slt $at, $t7, $t8 -/* A9AA24 80023884 10200003 */ beqz $at, .L80023894 -/* A9AA28 80023888 A08E01B1 */ sb $t6, 0x1b1($a0) -/* A9AA2C 8002388C 03E00008 */ jr $ra -/* A9AA30 80023890 24020001 */ li $v0, 1 -.L80023894: -/* A9AA34 80023894 03E00008 */ jr $ra -/* A9AA38 80023898 00000000 */ nop - diff --git a/asm/non_matchings/code/z_eff_shield_particle/func_8002389C.s b/asm/non_matchings/code/z_eff_shield_particle/func_8002389C.s deleted file mode 100644 index 95c07e7582..0000000000 --- a/asm/non_matchings/code/z_eff_shield_particle/func_8002389C.s +++ /dev/null @@ -1,911 +0,0 @@ -glabel func_8002389C -/* A9AA3C 8002389C 27BDFFF8 */ addiu $sp, $sp, -8 -/* A9AA40 800238A0 AFB00004 */ sw $s0, 4($sp) -/* A9AA44 800238A4 908E01B0 */ lbu $t6, 0x1b0($a0) -/* A9AA48 800238A8 00C08025 */ move $s0, $a2 -/* A9AA4C 800238AC 3C014F80 */ li $at, 0x4F800000 # 0.000000 -/* A9AA50 800238B0 448E2000 */ mtc1 $t6, $f4 -/* A9AA54 800238B4 05C10004 */ bgez $t6, .L800238C8 -/* A9AA58 800238B8 468021A0 */ cvt.s.w $f6, $f4 -/* A9AA5C 800238BC 44814000 */ mtc1 $at, $f8 -/* A9AA60 800238C0 00000000 */ nop -/* A9AA64 800238C4 46083180 */ add.s $f6, $f6, $f8 -.L800238C8: -/* A9AA68 800238C8 3C013F00 */ li $at, 0x3F000000 # 0.000000 -/* A9AA6C 800238CC 44815000 */ mtc1 $at, $f10 -/* A9AA70 800238D0 00000000 */ nop -/* A9AA74 800238D4 460A3402 */ mul.s $f16, $f6, $f10 -/* A9AA78 800238D8 4600848D */ trunc.w.s $f18, $f16 -/* A9AA7C 800238DC 44029000 */ mfc1 $v0, $f18 -/* A9AA80 800238E0 00000000 */ nop -/* A9AA84 800238E4 54400013 */ bnezl $v0, .L80023934 -/* A9AA88 800238E8 908901B1 */ lbu $t1, 0x1b1($a0) -/* A9AA8C 800238EC 90980188 */ lbu $t8, 0x188($a0) -/* A9AA90 800238F0 A0B80000 */ sb $t8, ($a1) -/* A9AA94 800238F4 90990189 */ lbu $t9, 0x189($a0) -/* A9AA98 800238F8 A0B90001 */ sb $t9, 1($a1) -/* A9AA9C 800238FC 908A018A */ lbu $t2, 0x18a($a0) -/* A9AAA0 80023900 A0AA0002 */ sb $t2, 2($a1) -/* A9AAA4 80023904 908B018B */ lbu $t3, 0x18b($a0) -/* A9AAA8 80023908 A0AB0003 */ sb $t3, 3($a1) -/* A9AAAC 8002390C 908C018C */ lbu $t4, 0x18c($a0) -/* A9AAB0 80023910 A20C0000 */ sb $t4, ($s0) -/* A9AAB4 80023914 908D018D */ lbu $t5, 0x18d($a0) -/* A9AAB8 80023918 A20D0001 */ sb $t5, 1($s0) -/* A9AABC 8002391C 908E018E */ lbu $t6, 0x18e($a0) -/* A9AAC0 80023920 A20E0002 */ sb $t6, 2($s0) -/* A9AAC4 80023924 908F018F */ lbu $t7, 0x18f($a0) -/* A9AAC8 80023928 10000321 */ b .L800245B0 -/* A9AACC 8002392C A20F0003 */ sb $t7, 3($s0) -/* A9AAD0 80023930 908901B1 */ lbu $t1, 0x1b1($a0) -.L80023934: -/* A9AAD4 80023934 0122082A */ slt $at, $t1, $v0 -/* A9AAD8 80023938 10200191 */ beqz $at, .L80023F80 -/* A9AADC 8002393C 01201825 */ move $v1, $t1 -/* A9AAE0 80023940 44892000 */ mtc1 $t1, $f4 -/* A9AAE4 80023944 44825000 */ mtc1 $v0, $f10 -/* A9AAE8 80023948 05210005 */ bgez $t1, .L80023960 -/* A9AAEC 8002394C 46802220 */ cvt.s.w $f8, $f4 -/* A9AAF0 80023950 3C014F80 */ li $at, 0x4F800000 # 0.000000 -/* A9AAF4 80023954 44813000 */ mtc1 $at, $f6 -/* A9AAF8 80023958 00000000 */ nop -/* A9AAFC 8002395C 46064200 */ add.s $f8, $f8, $f6 -.L80023960: -/* A9AB00 80023960 46805420 */ cvt.s.w $f16, $f10 -/* A9AB04 80023964 90830188 */ lbu $v1, 0x188($a0) -/* A9AB08 80023968 44839000 */ mtc1 $v1, $f18 -/* A9AB0C 8002396C 46104003 */ div.s $f0, $f8, $f16 -/* A9AB10 80023970 04610005 */ bgez $v1, .L80023988 -/* A9AB14 80023974 46809120 */ cvt.s.w $f4, $f18 -/* A9AB18 80023978 3C014F80 */ li $at, 0x4F800000 # 0.000000 -/* A9AB1C 8002397C 44813000 */ mtc1 $at, $f6 -/* A9AB20 80023980 00000000 */ nop -/* A9AB24 80023984 46062100 */ add.s $f4, $f4, $f6 -.L80023988: -/* A9AB28 80023988 90980190 */ lbu $t8, 0x190($a0) -/* A9AB2C 8002398C 240B0001 */ li $t3, 1 -/* A9AB30 80023990 0303C823 */ subu $t9, $t8, $v1 -/* A9AB34 80023994 44995000 */ mtc1 $t9, $f10 -/* A9AB38 80023998 00000000 */ nop -/* A9AB3C 8002399C 46805220 */ cvt.s.w $f8, $f10 -/* A9AB40 800239A0 46004402 */ mul.s $f16, $f8, $f0 -/* A9AB44 800239A4 46102480 */ add.s $f18, $f4, $f16 -/* A9AB48 800239A8 444AF800 */ cfc1 $t2, $31 -/* A9AB4C 800239AC 44CBF800 */ ctc1 $t3, $31 -/* A9AB50 800239B0 00000000 */ nop -/* A9AB54 800239B4 460091A4 */ cvt.w.s $f6, $f18 -/* A9AB58 800239B8 444BF800 */ cfc1 $t3, $31 -/* A9AB5C 800239BC 00000000 */ nop -/* A9AB60 800239C0 316B0078 */ andi $t3, $t3, 0x78 -/* A9AB64 800239C4 11600012 */ beqz $t3, .L80023A10 -/* A9AB68 800239C8 3C014F00 */ li $at, 0x4F000000 # 0.000000 -/* A9AB6C 800239CC 44813000 */ mtc1 $at, $f6 -/* A9AB70 800239D0 240B0001 */ li $t3, 1 -/* A9AB74 800239D4 46069181 */ sub.s $f6, $f18, $f6 -/* A9AB78 800239D8 44CBF800 */ ctc1 $t3, $31 -/* A9AB7C 800239DC 00000000 */ nop -/* A9AB80 800239E0 460031A4 */ cvt.w.s $f6, $f6 -/* A9AB84 800239E4 444BF800 */ cfc1 $t3, $31 -/* A9AB88 800239E8 00000000 */ nop -/* A9AB8C 800239EC 316B0078 */ andi $t3, $t3, 0x78 -/* A9AB90 800239F0 15600005 */ bnez $t3, .L80023A08 -/* A9AB94 800239F4 00000000 */ nop -/* A9AB98 800239F8 440B3000 */ mfc1 $t3, $f6 -/* A9AB9C 800239FC 3C018000 */ lui $at, 0x8000 -/* A9ABA0 80023A00 10000007 */ b .L80023A20 -/* A9ABA4 80023A04 01615825 */ or $t3, $t3, $at -.L80023A08: -/* A9ABA8 80023A08 10000005 */ b .L80023A20 -/* A9ABAC 80023A0C 240BFFFF */ li $t3, -1 -.L80023A10: -/* A9ABB0 80023A10 440B3000 */ mfc1 $t3, $f6 -/* A9ABB4 80023A14 00000000 */ nop -/* A9ABB8 80023A18 0560FFFB */ bltz $t3, .L80023A08 -/* A9ABBC 80023A1C 00000000 */ nop -.L80023A20: -/* A9ABC0 80023A20 A0AB0000 */ sb $t3, ($a1) -/* A9ABC4 80023A24 90860189 */ lbu $a2, 0x189($a0) -/* A9ABC8 80023A28 44CAF800 */ ctc1 $t2, $31 -/* A9ABCC 80023A2C 44865000 */ mtc1 $a2, $f10 -/* A9ABD0 80023A30 04C10005 */ bgez $a2, .L80023A48 -/* A9ABD4 80023A34 46805220 */ cvt.s.w $f8, $f10 -/* A9ABD8 80023A38 3C014F80 */ li $at, 0x4F800000 # 0.000000 -/* A9ABDC 80023A3C 44812000 */ mtc1 $at, $f4 -/* A9ABE0 80023A40 00000000 */ nop -/* A9ABE4 80023A44 46044200 */ add.s $f8, $f8, $f4 -.L80023A48: -/* A9ABE8 80023A48 908C0191 */ lbu $t4, 0x191($a0) -/* A9ABEC 80023A4C 240F0001 */ li $t7, 1 -/* A9ABF0 80023A50 01866823 */ subu $t5, $t4, $a2 -/* A9ABF4 80023A54 448D8000 */ mtc1 $t5, $f16 -/* A9ABF8 80023A58 00000000 */ nop -/* A9ABFC 80023A5C 468084A0 */ cvt.s.w $f18, $f16 -/* A9AC00 80023A60 46009182 */ mul.s $f6, $f18, $f0 -/* A9AC04 80023A64 46064280 */ add.s $f10, $f8, $f6 -/* A9AC08 80023A68 444EF800 */ cfc1 $t6, $31 -/* A9AC0C 80023A6C 44CFF800 */ ctc1 $t7, $31 -/* A9AC10 80023A70 00000000 */ nop -/* A9AC14 80023A74 46005124 */ cvt.w.s $f4, $f10 -/* A9AC18 80023A78 444FF800 */ cfc1 $t7, $31 -/* A9AC1C 80023A7C 00000000 */ nop -/* A9AC20 80023A80 31EF0078 */ andi $t7, $t7, 0x78 -/* A9AC24 80023A84 11E00012 */ beqz $t7, .L80023AD0 -/* A9AC28 80023A88 3C014F00 */ li $at, 0x4F000000 # 0.000000 -/* A9AC2C 80023A8C 44812000 */ mtc1 $at, $f4 -/* A9AC30 80023A90 240F0001 */ li $t7, 1 -/* A9AC34 80023A94 46045101 */ sub.s $f4, $f10, $f4 -/* A9AC38 80023A98 44CFF800 */ ctc1 $t7, $31 -/* A9AC3C 80023A9C 00000000 */ nop -/* A9AC40 80023AA0 46002124 */ cvt.w.s $f4, $f4 -/* A9AC44 80023AA4 444FF800 */ cfc1 $t7, $31 -/* A9AC48 80023AA8 00000000 */ nop -/* A9AC4C 80023AAC 31EF0078 */ andi $t7, $t7, 0x78 -/* A9AC50 80023AB0 15E00005 */ bnez $t7, .L80023AC8 -/* A9AC54 80023AB4 00000000 */ nop -/* A9AC58 80023AB8 440F2000 */ mfc1 $t7, $f4 -/* A9AC5C 80023ABC 3C018000 */ lui $at, 0x8000 -/* A9AC60 80023AC0 10000007 */ b .L80023AE0 -/* A9AC64 80023AC4 01E17825 */ or $t7, $t7, $at -.L80023AC8: -/* A9AC68 80023AC8 10000005 */ b .L80023AE0 -/* A9AC6C 80023ACC 240FFFFF */ li $t7, -1 -.L80023AD0: -/* A9AC70 80023AD0 440F2000 */ mfc1 $t7, $f4 -/* A9AC74 80023AD4 00000000 */ nop -/* A9AC78 80023AD8 05E0FFFB */ bltz $t7, .L80023AC8 -/* A9AC7C 80023ADC 00000000 */ nop -.L80023AE0: -/* A9AC80 80023AE0 A0AF0001 */ sb $t7, 1($a1) -/* A9AC84 80023AE4 9087018A */ lbu $a3, 0x18a($a0) -/* A9AC88 80023AE8 44CEF800 */ ctc1 $t6, $31 -/* A9AC8C 80023AEC 44878000 */ mtc1 $a3, $f16 -/* A9AC90 80023AF0 04E10005 */ bgez $a3, .L80023B08 -/* A9AC94 80023AF4 468084A0 */ cvt.s.w $f18, $f16 -/* A9AC98 80023AF8 3C014F80 */ li $at, 0x4F800000 # 0.000000 -/* A9AC9C 80023AFC 44814000 */ mtc1 $at, $f8 -/* A9ACA0 80023B00 00000000 */ nop -/* A9ACA4 80023B04 46089480 */ add.s $f18, $f18, $f8 -.L80023B08: -/* A9ACA8 80023B08 90980192 */ lbu $t8, 0x192($a0) -/* A9ACAC 80023B0C 240B0001 */ li $t3, 1 -/* A9ACB0 80023B10 0307C823 */ subu $t9, $t8, $a3 -/* A9ACB4 80023B14 44993000 */ mtc1 $t9, $f6 -/* A9ACB8 80023B18 00000000 */ nop -/* A9ACBC 80023B1C 468032A0 */ cvt.s.w $f10, $f6 -/* A9ACC0 80023B20 46005102 */ mul.s $f4, $f10, $f0 -/* A9ACC4 80023B24 46049400 */ add.s $f16, $f18, $f4 -/* A9ACC8 80023B28 444AF800 */ cfc1 $t2, $31 -/* A9ACCC 80023B2C 44CBF800 */ ctc1 $t3, $31 -/* A9ACD0 80023B30 00000000 */ nop -/* A9ACD4 80023B34 46008224 */ cvt.w.s $f8, $f16 -/* A9ACD8 80023B38 444BF800 */ cfc1 $t3, $31 -/* A9ACDC 80023B3C 00000000 */ nop -/* A9ACE0 80023B40 316B0078 */ andi $t3, $t3, 0x78 -/* A9ACE4 80023B44 11600012 */ beqz $t3, .L80023B90 -/* A9ACE8 80023B48 3C014F00 */ li $at, 0x4F000000 # 0.000000 -/* A9ACEC 80023B4C 44814000 */ mtc1 $at, $f8 -/* A9ACF0 80023B50 240B0001 */ li $t3, 1 -/* A9ACF4 80023B54 46088201 */ sub.s $f8, $f16, $f8 -/* A9ACF8 80023B58 44CBF800 */ ctc1 $t3, $31 -/* A9ACFC 80023B5C 00000000 */ nop -/* A9AD00 80023B60 46004224 */ cvt.w.s $f8, $f8 -/* A9AD04 80023B64 444BF800 */ cfc1 $t3, $31 -/* A9AD08 80023B68 00000000 */ nop -/* A9AD0C 80023B6C 316B0078 */ andi $t3, $t3, 0x78 -/* A9AD10 80023B70 15600005 */ bnez $t3, .L80023B88 -/* A9AD14 80023B74 00000000 */ nop -/* A9AD18 80023B78 440B4000 */ mfc1 $t3, $f8 -/* A9AD1C 80023B7C 3C018000 */ li $at, 0x80000000 # 0.000000 -/* A9AD20 80023B80 10000007 */ b .L80023BA0 -/* A9AD24 80023B84 01615825 */ or $t3, $t3, $at -.L80023B88: -/* A9AD28 80023B88 10000005 */ b .L80023BA0 -/* A9AD2C 80023B8C 240BFFFF */ li $t3, -1 -.L80023B90: -/* A9AD30 80023B90 440B4000 */ mfc1 $t3, $f8 -/* A9AD34 80023B94 00000000 */ nop -/* A9AD38 80023B98 0560FFFB */ bltz $t3, .L80023B88 -/* A9AD3C 80023B9C 00000000 */ nop -.L80023BA0: -/* A9AD40 80023BA0 A0AB0002 */ sb $t3, 2($a1) -/* A9AD44 80023BA4 9088018B */ lbu $t0, 0x18b($a0) -/* A9AD48 80023BA8 44CAF800 */ ctc1 $t2, $31 -/* A9AD4C 80023BAC 3C014F80 */ li $at, 0x4F800000 # 0.000000 -/* A9AD50 80023BB0 44883000 */ mtc1 $t0, $f6 -/* A9AD54 80023BB4 05010004 */ bgez $t0, .L80023BC8 -/* A9AD58 80023BB8 468032A0 */ cvt.s.w $f10, $f6 -/* A9AD5C 80023BBC 44819000 */ mtc1 $at, $f18 -/* A9AD60 80023BC0 00000000 */ nop -/* A9AD64 80023BC4 46125280 */ add.s $f10, $f10, $f18 -.L80023BC8: -/* A9AD68 80023BC8 908C0193 */ lbu $t4, 0x193($a0) -/* A9AD6C 80023BCC 240F0001 */ li $t7, 1 -/* A9AD70 80023BD0 3C014F00 */ li $at, 0x4F000000 # 0.000000 -/* A9AD74 80023BD4 01886823 */ subu $t5, $t4, $t0 -/* A9AD78 80023BD8 448D2000 */ mtc1 $t5, $f4 -/* A9AD7C 80023BDC 00000000 */ nop -/* A9AD80 80023BE0 46802420 */ cvt.s.w $f16, $f4 -/* A9AD84 80023BE4 46008202 */ mul.s $f8, $f16, $f0 -/* A9AD88 80023BE8 46085180 */ add.s $f6, $f10, $f8 -/* A9AD8C 80023BEC 444EF800 */ cfc1 $t6, $31 -/* A9AD90 80023BF0 44CFF800 */ ctc1 $t7, $31 -/* A9AD94 80023BF4 00000000 */ nop -/* A9AD98 80023BF8 460034A4 */ cvt.w.s $f18, $f6 -/* A9AD9C 80023BFC 444FF800 */ cfc1 $t7, $31 -/* A9ADA0 80023C00 00000000 */ nop -/* A9ADA4 80023C04 31EF0078 */ andi $t7, $t7, 0x78 -/* A9ADA8 80023C08 51E00013 */ beql $t7, $zero, .L80023C58 -/* A9ADAC 80023C0C 440F9000 */ mfc1 $t7, $f18 -/* A9ADB0 80023C10 44819000 */ mtc1 $at, $f18 -/* A9ADB4 80023C14 240F0001 */ li $t7, 1 -/* A9ADB8 80023C18 46123481 */ sub.s $f18, $f6, $f18 -/* A9ADBC 80023C1C 44CFF800 */ ctc1 $t7, $31 -/* A9ADC0 80023C20 00000000 */ nop -/* A9ADC4 80023C24 460094A4 */ cvt.w.s $f18, $f18 -/* A9ADC8 80023C28 444FF800 */ cfc1 $t7, $31 -/* A9ADCC 80023C2C 00000000 */ nop -/* A9ADD0 80023C30 31EF0078 */ andi $t7, $t7, 0x78 -/* A9ADD4 80023C34 15E00005 */ bnez $t7, .L80023C4C -/* A9ADD8 80023C38 00000000 */ nop -/* A9ADDC 80023C3C 440F9000 */ mfc1 $t7, $f18 -/* A9ADE0 80023C40 3C018000 */ li $at, 0x80000000 # 0.000000 -/* A9ADE4 80023C44 10000007 */ b .L80023C64 -/* A9ADE8 80023C48 01E17825 */ or $t7, $t7, $at -.L80023C4C: -/* A9ADEC 80023C4C 10000005 */ b .L80023C64 -/* A9ADF0 80023C50 240FFFFF */ li $t7, -1 -/* A9ADF4 80023C54 440F9000 */ mfc1 $t7, $f18 -.L80023C58: -/* A9ADF8 80023C58 00000000 */ nop -/* A9ADFC 80023C5C 05E0FFFB */ bltz $t7, .L80023C4C -/* A9AE00 80023C60 00000000 */ nop -.L80023C64: -/* A9AE04 80023C64 A0AF0003 */ sb $t7, 3($a1) -/* A9AE08 80023C68 9082018C */ lbu $v0, 0x18c($a0) -/* A9AE0C 80023C6C 44CEF800 */ ctc1 $t6, $31 -/* A9AE10 80023C70 3C014F80 */ li $at, 0x4F800000 # 0.000000 -/* A9AE14 80023C74 44822000 */ mtc1 $v0, $f4 -/* A9AE18 80023C78 04410004 */ bgez $v0, .L80023C8C -/* A9AE1C 80023C7C 46802420 */ cvt.s.w $f16, $f4 -/* A9AE20 80023C80 44815000 */ mtc1 $at, $f10 -/* A9AE24 80023C84 00000000 */ nop -/* A9AE28 80023C88 460A8400 */ add.s $f16, $f16, $f10 -.L80023C8C: -/* A9AE2C 80023C8C 90980194 */ lbu $t8, 0x194($a0) -/* A9AE30 80023C90 240B0001 */ li $t3, 1 -/* A9AE34 80023C94 3C014F00 */ li $at, 0x4F000000 # 0.000000 -/* A9AE38 80023C98 0302C823 */ subu $t9, $t8, $v0 -/* A9AE3C 80023C9C 44994000 */ mtc1 $t9, $f8 -/* A9AE40 80023CA0 00000000 */ nop -/* A9AE44 80023CA4 468041A0 */ cvt.s.w $f6, $f8 -/* A9AE48 80023CA8 46003482 */ mul.s $f18, $f6, $f0 -/* A9AE4C 80023CAC 46128100 */ add.s $f4, $f16, $f18 -/* A9AE50 80023CB0 444AF800 */ cfc1 $t2, $31 -/* A9AE54 80023CB4 44CBF800 */ ctc1 $t3, $31 -/* A9AE58 80023CB8 00000000 */ nop -/* A9AE5C 80023CBC 460022A4 */ cvt.w.s $f10, $f4 -/* A9AE60 80023CC0 444BF800 */ cfc1 $t3, $31 -/* A9AE64 80023CC4 00000000 */ nop -/* A9AE68 80023CC8 316B0078 */ andi $t3, $t3, 0x78 -/* A9AE6C 80023CCC 51600013 */ beql $t3, $zero, .L80023D1C -/* A9AE70 80023CD0 440B5000 */ mfc1 $t3, $f10 -/* A9AE74 80023CD4 44815000 */ mtc1 $at, $f10 -/* A9AE78 80023CD8 240B0001 */ li $t3, 1 -/* A9AE7C 80023CDC 460A2281 */ sub.s $f10, $f4, $f10 -/* A9AE80 80023CE0 44CBF800 */ ctc1 $t3, $31 -/* A9AE84 80023CE4 00000000 */ nop -/* A9AE88 80023CE8 460052A4 */ cvt.w.s $f10, $f10 -/* A9AE8C 80023CEC 444BF800 */ cfc1 $t3, $31 -/* A9AE90 80023CF0 00000000 */ nop -/* A9AE94 80023CF4 316B0078 */ andi $t3, $t3, 0x78 -/* A9AE98 80023CF8 15600005 */ bnez $t3, .L80023D10 -/* A9AE9C 80023CFC 00000000 */ nop -/* A9AEA0 80023D00 440B5000 */ mfc1 $t3, $f10 -/* A9AEA4 80023D04 3C018000 */ li $at, 0x80000000 # 0.000000 -/* A9AEA8 80023D08 10000007 */ b .L80023D28 -/* A9AEAC 80023D0C 01615825 */ or $t3, $t3, $at -.L80023D10: -/* A9AEB0 80023D10 10000005 */ b .L80023D28 -/* A9AEB4 80023D14 240BFFFF */ li $t3, -1 -/* A9AEB8 80023D18 440B5000 */ mfc1 $t3, $f10 -.L80023D1C: -/* A9AEBC 80023D1C 00000000 */ nop -/* A9AEC0 80023D20 0560FFFB */ bltz $t3, .L80023D10 -/* A9AEC4 80023D24 00000000 */ nop -.L80023D28: -/* A9AEC8 80023D28 A20B0000 */ sb $t3, ($s0) -/* A9AECC 80023D2C 9083018D */ lbu $v1, 0x18d($a0) -/* A9AED0 80023D30 44CAF800 */ ctc1 $t2, $31 -/* A9AED4 80023D34 3C014F80 */ li $at, 0x4F800000 # 0.000000 -/* A9AED8 80023D38 44834000 */ mtc1 $v1, $f8 -/* A9AEDC 80023D3C 04610004 */ bgez $v1, .L80023D50 -/* A9AEE0 80023D40 468041A0 */ cvt.s.w $f6, $f8 -/* A9AEE4 80023D44 44818000 */ mtc1 $at, $f16 -/* A9AEE8 80023D48 00000000 */ nop -/* A9AEEC 80023D4C 46103180 */ add.s $f6, $f6, $f16 -.L80023D50: -/* A9AEF0 80023D50 908C0195 */ lbu $t4, 0x195($a0) -/* A9AEF4 80023D54 240F0001 */ li $t7, 1 -/* A9AEF8 80023D58 3C014F00 */ li $at, 0x4F000000 # 0.000000 -/* A9AEFC 80023D5C 01836823 */ subu $t5, $t4, $v1 -/* A9AF00 80023D60 448D9000 */ mtc1 $t5, $f18 -/* A9AF04 80023D64 00000000 */ nop -/* A9AF08 80023D68 46809120 */ cvt.s.w $f4, $f18 -/* A9AF0C 80023D6C 46002282 */ mul.s $f10, $f4, $f0 -/* A9AF10 80023D70 460A3200 */ add.s $f8, $f6, $f10 -/* A9AF14 80023D74 444EF800 */ cfc1 $t6, $31 -/* A9AF18 80023D78 44CFF800 */ ctc1 $t7, $31 -/* A9AF1C 80023D7C 00000000 */ nop -/* A9AF20 80023D80 46004424 */ cvt.w.s $f16, $f8 -/* A9AF24 80023D84 444FF800 */ cfc1 $t7, $31 -/* A9AF28 80023D88 00000000 */ nop -/* A9AF2C 80023D8C 31EF0078 */ andi $t7, $t7, 0x78 -/* A9AF30 80023D90 51E00013 */ beql $t7, $zero, .L80023DE0 -/* A9AF34 80023D94 440F8000 */ mfc1 $t7, $f16 -/* A9AF38 80023D98 44818000 */ mtc1 $at, $f16 -/* A9AF3C 80023D9C 240F0001 */ li $t7, 1 -/* A9AF40 80023DA0 46104401 */ sub.s $f16, $f8, $f16 -/* A9AF44 80023DA4 44CFF800 */ ctc1 $t7, $31 -/* A9AF48 80023DA8 00000000 */ nop -/* A9AF4C 80023DAC 46008424 */ cvt.w.s $f16, $f16 -/* A9AF50 80023DB0 444FF800 */ cfc1 $t7, $31 -/* A9AF54 80023DB4 00000000 */ nop -/* A9AF58 80023DB8 31EF0078 */ andi $t7, $t7, 0x78 -/* A9AF5C 80023DBC 15E00005 */ bnez $t7, .L80023DD4 -/* A9AF60 80023DC0 00000000 */ nop -/* A9AF64 80023DC4 440F8000 */ mfc1 $t7, $f16 -/* A9AF68 80023DC8 3C018000 */ li $at, 0x80000000 # 0.000000 -/* A9AF6C 80023DCC 10000007 */ b .L80023DEC -/* A9AF70 80023DD0 01E17825 */ or $t7, $t7, $at -.L80023DD4: -/* A9AF74 80023DD4 10000005 */ b .L80023DEC -/* A9AF78 80023DD8 240FFFFF */ li $t7, -1 -/* A9AF7C 80023DDC 440F8000 */ mfc1 $t7, $f16 -.L80023DE0: -/* A9AF80 80023DE0 00000000 */ nop -/* A9AF84 80023DE4 05E0FFFB */ bltz $t7, .L80023DD4 -/* A9AF88 80023DE8 00000000 */ nop -.L80023DEC: -/* A9AF8C 80023DEC A20F0001 */ sb $t7, 1($s0) -/* A9AF90 80023DF0 9085018E */ lbu $a1, 0x18e($a0) -/* A9AF94 80023DF4 44CEF800 */ ctc1 $t6, $31 -/* A9AF98 80023DF8 3C014F80 */ li $at, 0x4F800000 # 0.000000 -/* A9AF9C 80023DFC 44859000 */ mtc1 $a1, $f18 -/* A9AFA0 80023E00 04A10004 */ bgez $a1, .L80023E14 -/* A9AFA4 80023E04 46809120 */ cvt.s.w $f4, $f18 -/* A9AFA8 80023E08 44813000 */ mtc1 $at, $f6 -/* A9AFAC 80023E0C 00000000 */ nop -/* A9AFB0 80023E10 46062100 */ add.s $f4, $f4, $f6 -.L80023E14: -/* A9AFB4 80023E14 90980196 */ lbu $t8, 0x196($a0) -/* A9AFB8 80023E18 240B0001 */ li $t3, 1 -/* A9AFBC 80023E1C 3C014F00 */ li $at, 0x4F000000 # 0.000000 -/* A9AFC0 80023E20 0305C823 */ subu $t9, $t8, $a1 -/* A9AFC4 80023E24 44995000 */ mtc1 $t9, $f10 -/* A9AFC8 80023E28 00000000 */ nop -/* A9AFCC 80023E2C 46805220 */ cvt.s.w $f8, $f10 -/* A9AFD0 80023E30 46004402 */ mul.s $f16, $f8, $f0 -/* A9AFD4 80023E34 46102480 */ add.s $f18, $f4, $f16 -/* A9AFD8 80023E38 444AF800 */ cfc1 $t2, $31 -/* A9AFDC 80023E3C 44CBF800 */ ctc1 $t3, $31 -/* A9AFE0 80023E40 00000000 */ nop -/* A9AFE4 80023E44 460091A4 */ cvt.w.s $f6, $f18 -/* A9AFE8 80023E48 444BF800 */ cfc1 $t3, $31 -/* A9AFEC 80023E4C 00000000 */ nop -/* A9AFF0 80023E50 316B0078 */ andi $t3, $t3, 0x78 -/* A9AFF4 80023E54 51600013 */ beql $t3, $zero, .L80023EA4 -/* A9AFF8 80023E58 440B3000 */ mfc1 $t3, $f6 -/* A9AFFC 80023E5C 44813000 */ mtc1 $at, $f6 -/* A9B000 80023E60 240B0001 */ li $t3, 1 -/* A9B004 80023E64 46069181 */ sub.s $f6, $f18, $f6 -/* A9B008 80023E68 44CBF800 */ ctc1 $t3, $31 -/* A9B00C 80023E6C 00000000 */ nop -/* A9B010 80023E70 460031A4 */ cvt.w.s $f6, $f6 -/* A9B014 80023E74 444BF800 */ cfc1 $t3, $31 -/* A9B018 80023E78 00000000 */ nop -/* A9B01C 80023E7C 316B0078 */ andi $t3, $t3, 0x78 -/* A9B020 80023E80 15600005 */ bnez $t3, .L80023E98 -/* A9B024 80023E84 00000000 */ nop -/* A9B028 80023E88 440B3000 */ mfc1 $t3, $f6 -/* A9B02C 80023E8C 3C018000 */ li $at, 0x80000000 # 0.000000 -/* A9B030 80023E90 10000007 */ b .L80023EB0 -/* A9B034 80023E94 01615825 */ or $t3, $t3, $at -.L80023E98: -/* A9B038 80023E98 10000005 */ b .L80023EB0 -/* A9B03C 80023E9C 240BFFFF */ li $t3, -1 -/* A9B040 80023EA0 440B3000 */ mfc1 $t3, $f6 -.L80023EA4: -/* A9B044 80023EA4 00000000 */ nop -/* A9B048 80023EA8 0560FFFB */ bltz $t3, .L80023E98 -/* A9B04C 80023EAC 00000000 */ nop -.L80023EB0: -/* A9B050 80023EB0 A20B0002 */ sb $t3, 2($s0) -/* A9B054 80023EB4 9086018F */ lbu $a2, 0x18f($a0) -/* A9B058 80023EB8 44CAF800 */ ctc1 $t2, $31 -/* A9B05C 80023EBC 3C014F80 */ li $at, 0x4F800000 # 0.000000 -/* A9B060 80023EC0 44865000 */ mtc1 $a2, $f10 -/* A9B064 80023EC4 04C10004 */ bgez $a2, .L80023ED8 -/* A9B068 80023EC8 46805220 */ cvt.s.w $f8, $f10 -/* A9B06C 80023ECC 44812000 */ mtc1 $at, $f4 -/* A9B070 80023ED0 00000000 */ nop -/* A9B074 80023ED4 46044200 */ add.s $f8, $f8, $f4 -.L80023ED8: -/* A9B078 80023ED8 908C0197 */ lbu $t4, 0x197($a0) -/* A9B07C 80023EDC 240F0001 */ li $t7, 1 -/* A9B080 80023EE0 3C014F00 */ li $at, 0x4F000000 # 0.000000 -/* A9B084 80023EE4 01866823 */ subu $t5, $t4, $a2 -/* A9B088 80023EE8 448D8000 */ mtc1 $t5, $f16 -/* A9B08C 80023EEC 00000000 */ nop -/* A9B090 80023EF0 468084A0 */ cvt.s.w $f18, $f16 -/* A9B094 80023EF4 46009182 */ mul.s $f6, $f18, $f0 -/* A9B098 80023EF8 46064280 */ add.s $f10, $f8, $f6 -/* A9B09C 80023EFC 444EF800 */ cfc1 $t6, $31 -/* A9B0A0 80023F00 44CFF800 */ ctc1 $t7, $31 -/* A9B0A4 80023F04 00000000 */ nop -/* A9B0A8 80023F08 46005124 */ cvt.w.s $f4, $f10 -/* A9B0AC 80023F0C 444FF800 */ cfc1 $t7, $31 -/* A9B0B0 80023F10 00000000 */ nop -/* A9B0B4 80023F14 31EF0078 */ andi $t7, $t7, 0x78 -/* A9B0B8 80023F18 51E00013 */ beql $t7, $zero, .L80023F68 -/* A9B0BC 80023F1C 440F2000 */ mfc1 $t7, $f4 -/* A9B0C0 80023F20 44812000 */ mtc1 $at, $f4 -/* A9B0C4 80023F24 240F0001 */ li $t7, 1 -/* A9B0C8 80023F28 46045101 */ sub.s $f4, $f10, $f4 -/* A9B0CC 80023F2C 44CFF800 */ ctc1 $t7, $31 -/* A9B0D0 80023F30 00000000 */ nop -/* A9B0D4 80023F34 46002124 */ cvt.w.s $f4, $f4 -/* A9B0D8 80023F38 444FF800 */ cfc1 $t7, $31 -/* A9B0DC 80023F3C 00000000 */ nop -/* A9B0E0 80023F40 31EF0078 */ andi $t7, $t7, 0x78 -/* A9B0E4 80023F44 15E00005 */ bnez $t7, .L80023F5C -/* A9B0E8 80023F48 00000000 */ nop -/* A9B0EC 80023F4C 440F2000 */ mfc1 $t7, $f4 -/* A9B0F0 80023F50 3C018000 */ li $at, 0x80000000 # 0.000000 -/* A9B0F4 80023F54 10000007 */ b .L80023F74 -/* A9B0F8 80023F58 01E17825 */ or $t7, $t7, $at -.L80023F5C: -/* A9B0FC 80023F5C 10000005 */ b .L80023F74 -/* A9B100 80023F60 240FFFFF */ li $t7, -1 -/* A9B104 80023F64 440F2000 */ mfc1 $t7, $f4 -.L80023F68: -/* A9B108 80023F68 00000000 */ nop -/* A9B10C 80023F6C 05E0FFFB */ bltz $t7, .L80023F5C -/* A9B110 80023F70 00000000 */ nop -.L80023F74: -/* A9B114 80023F74 44CEF800 */ ctc1 $t6, $31 -/* A9B118 80023F78 1000018D */ b .L800245B0 -/* A9B11C 80023F7C A20F0003 */ sb $t7, 3($s0) -.L80023F80: -/* A9B120 80023F80 0062C023 */ subu $t8, $v1, $v0 -/* A9B124 80023F84 44988000 */ mtc1 $t8, $f16 -/* A9B128 80023F88 44824000 */ mtc1 $v0, $f8 -/* A9B12C 80023F8C 90860190 */ lbu $a2, 0x190($a0) -/* A9B130 80023F90 468084A0 */ cvt.s.w $f18, $f16 -/* A9B134 80023F94 44865000 */ mtc1 $a2, $f10 -/* A9B138 80023F98 468041A0 */ cvt.s.w $f6, $f8 -/* A9B13C 80023F9C 46805120 */ cvt.s.w $f4, $f10 -/* A9B140 80023FA0 04C10005 */ bgez $a2, .L80023FB8 -/* A9B144 80023FA4 46069003 */ div.s $f0, $f18, $f6 -/* A9B148 80023FA8 3C014F80 */ li $at, 0x4F800000 # 0.000000 -/* A9B14C 80023FAC 44818000 */ mtc1 $at, $f16 -/* A9B150 80023FB0 00000000 */ nop -/* A9B154 80023FB4 46102100 */ add.s $f4, $f4, $f16 -.L80023FB8: -/* A9B158 80023FB8 90990198 */ lbu $t9, 0x198($a0) -/* A9B15C 80023FBC 240C0001 */ li $t4, 1 -/* A9B160 80023FC0 03265023 */ subu $t2, $t9, $a2 -/* A9B164 80023FC4 448A4000 */ mtc1 $t2, $f8 -/* A9B168 80023FC8 00000000 */ nop -/* A9B16C 80023FCC 468044A0 */ cvt.s.w $f18, $f8 -/* A9B170 80023FD0 46009182 */ mul.s $f6, $f18, $f0 -/* A9B174 80023FD4 46062280 */ add.s $f10, $f4, $f6 -/* A9B178 80023FD8 444BF800 */ cfc1 $t3, $31 -/* A9B17C 80023FDC 44CCF800 */ ctc1 $t4, $31 -/* A9B180 80023FE0 00000000 */ nop -/* A9B184 80023FE4 46005424 */ cvt.w.s $f16, $f10 -/* A9B188 80023FE8 444CF800 */ cfc1 $t4, $31 -/* A9B18C 80023FEC 00000000 */ nop -/* A9B190 80023FF0 318C0078 */ andi $t4, $t4, 0x78 -/* A9B194 80023FF4 11800012 */ beqz $t4, .L80024040 -/* A9B198 80023FF8 3C014F00 */ li $at, 0x4F000000 # 0.000000 -/* A9B19C 80023FFC 44818000 */ mtc1 $at, $f16 -/* A9B1A0 80024000 240C0001 */ li $t4, 1 -/* A9B1A4 80024004 46105401 */ sub.s $f16, $f10, $f16 -/* A9B1A8 80024008 44CCF800 */ ctc1 $t4, $31 -/* A9B1AC 8002400C 00000000 */ nop -/* A9B1B0 80024010 46008424 */ cvt.w.s $f16, $f16 -/* A9B1B4 80024014 444CF800 */ cfc1 $t4, $31 -/* A9B1B8 80024018 00000000 */ nop -/* A9B1BC 8002401C 318C0078 */ andi $t4, $t4, 0x78 -/* A9B1C0 80024020 15800005 */ bnez $t4, .L80024038 -/* A9B1C4 80024024 00000000 */ nop -/* A9B1C8 80024028 440C8000 */ mfc1 $t4, $f16 -/* A9B1CC 8002402C 3C018000 */ lui $at, 0x8000 -/* A9B1D0 80024030 10000007 */ b .L80024050 -/* A9B1D4 80024034 01816025 */ or $t4, $t4, $at -.L80024038: -/* A9B1D8 80024038 10000005 */ b .L80024050 -/* A9B1DC 8002403C 240CFFFF */ li $t4, -1 -.L80024040: -/* A9B1E0 80024040 440C8000 */ mfc1 $t4, $f16 -/* A9B1E4 80024044 00000000 */ nop -/* A9B1E8 80024048 0580FFFB */ bltz $t4, .L80024038 -/* A9B1EC 8002404C 00000000 */ nop -.L80024050: -/* A9B1F0 80024050 A0AC0000 */ sb $t4, ($a1) -/* A9B1F4 80024054 90870191 */ lbu $a3, 0x191($a0) -/* A9B1F8 80024058 44CBF800 */ ctc1 $t3, $31 -/* A9B1FC 8002405C 44874000 */ mtc1 $a3, $f8 -/* A9B200 80024060 04E10005 */ bgez $a3, .L80024078 -/* A9B204 80024064 468044A0 */ cvt.s.w $f18, $f8 -/* A9B208 80024068 3C014F80 */ li $at, 0x4F800000 # 0.000000 -/* A9B20C 8002406C 44812000 */ mtc1 $at, $f4 -/* A9B210 80024070 00000000 */ nop -/* A9B214 80024074 46049480 */ add.s $f18, $f18, $f4 -.L80024078: -/* A9B218 80024078 908D0199 */ lbu $t5, 0x199($a0) -/* A9B21C 8002407C 24180001 */ li $t8, 1 -/* A9B220 80024080 01A77023 */ subu $t6, $t5, $a3 -/* A9B224 80024084 448E3000 */ mtc1 $t6, $f6 -/* A9B228 80024088 00000000 */ nop -/* A9B22C 8002408C 468032A0 */ cvt.s.w $f10, $f6 -/* A9B230 80024090 46005402 */ mul.s $f16, $f10, $f0 -/* A9B234 80024094 46109200 */ add.s $f8, $f18, $f16 -/* A9B238 80024098 444FF800 */ cfc1 $t7, $31 -/* A9B23C 8002409C 44D8F800 */ ctc1 $t8, $31 -/* A9B240 800240A0 00000000 */ nop -/* A9B244 800240A4 46004124 */ cvt.w.s $f4, $f8 -/* A9B248 800240A8 4458F800 */ cfc1 $t8, $31 -/* A9B24C 800240AC 00000000 */ nop -/* A9B250 800240B0 33180078 */ andi $t8, $t8, 0x78 -/* A9B254 800240B4 13000012 */ beqz $t8, .L80024100 -/* A9B258 800240B8 3C014F00 */ li $at, 0x4F000000 # 0.000000 -/* A9B25C 800240BC 44812000 */ mtc1 $at, $f4 -/* A9B260 800240C0 24180001 */ li $t8, 1 -/* A9B264 800240C4 46044101 */ sub.s $f4, $f8, $f4 -/* A9B268 800240C8 44D8F800 */ ctc1 $t8, $31 -/* A9B26C 800240CC 00000000 */ nop -/* A9B270 800240D0 46002124 */ cvt.w.s $f4, $f4 -/* A9B274 800240D4 4458F800 */ cfc1 $t8, $31 -/* A9B278 800240D8 00000000 */ nop -/* A9B27C 800240DC 33180078 */ andi $t8, $t8, 0x78 -/* A9B280 800240E0 17000005 */ bnez $t8, .L800240F8 -/* A9B284 800240E4 00000000 */ nop -/* A9B288 800240E8 44182000 */ mfc1 $t8, $f4 -/* A9B28C 800240EC 3C018000 */ lui $at, 0x8000 -/* A9B290 800240F0 10000007 */ b .L80024110 -/* A9B294 800240F4 0301C025 */ or $t8, $t8, $at -.L800240F8: -/* A9B298 800240F8 10000005 */ b .L80024110 -/* A9B29C 800240FC 2418FFFF */ li $t8, -1 -.L80024100: -/* A9B2A0 80024100 44182000 */ mfc1 $t8, $f4 -/* A9B2A4 80024104 00000000 */ nop -/* A9B2A8 80024108 0700FFFB */ bltz $t8, .L800240F8 -/* A9B2AC 8002410C 00000000 */ nop -.L80024110: -/* A9B2B0 80024110 A0B80001 */ sb $t8, 1($a1) -/* A9B2B4 80024114 90880192 */ lbu $t0, 0x192($a0) -/* A9B2B8 80024118 44CFF800 */ ctc1 $t7, $31 -/* A9B2BC 8002411C 44883000 */ mtc1 $t0, $f6 -/* A9B2C0 80024120 05010005 */ bgez $t0, .L80024138 -/* A9B2C4 80024124 468032A0 */ cvt.s.w $f10, $f6 -/* A9B2C8 80024128 3C014F80 */ li $at, 0x4F800000 # 0.000000 -/* A9B2CC 8002412C 44819000 */ mtc1 $at, $f18 -/* A9B2D0 80024130 00000000 */ nop -/* A9B2D4 80024134 46125280 */ add.s $f10, $f10, $f18 -.L80024138: -/* A9B2D8 80024138 9099019A */ lbu $t9, 0x19a($a0) -/* A9B2DC 8002413C 240C0001 */ li $t4, 1 -/* A9B2E0 80024140 03285023 */ subu $t2, $t9, $t0 -/* A9B2E4 80024144 448A8000 */ mtc1 $t2, $f16 -/* A9B2E8 80024148 00000000 */ nop -/* A9B2EC 8002414C 46808220 */ cvt.s.w $f8, $f16 -/* A9B2F0 80024150 46004102 */ mul.s $f4, $f8, $f0 -/* A9B2F4 80024154 46045180 */ add.s $f6, $f10, $f4 -/* A9B2F8 80024158 444BF800 */ cfc1 $t3, $31 -/* A9B2FC 8002415C 44CCF800 */ ctc1 $t4, $31 -/* A9B300 80024160 00000000 */ nop -/* A9B304 80024164 460034A4 */ cvt.w.s $f18, $f6 -/* A9B308 80024168 444CF800 */ cfc1 $t4, $31 -/* A9B30C 8002416C 00000000 */ nop -/* A9B310 80024170 318C0078 */ andi $t4, $t4, 0x78 -/* A9B314 80024174 11800012 */ beqz $t4, .L800241C0 -/* A9B318 80024178 3C014F00 */ li $at, 0x4F000000 # 0.000000 -/* A9B31C 8002417C 44819000 */ mtc1 $at, $f18 -/* A9B320 80024180 240C0001 */ li $t4, 1 -/* A9B324 80024184 46123481 */ sub.s $f18, $f6, $f18 -/* A9B328 80024188 44CCF800 */ ctc1 $t4, $31 -/* A9B32C 8002418C 00000000 */ nop -/* A9B330 80024190 460094A4 */ cvt.w.s $f18, $f18 -/* A9B334 80024194 444CF800 */ cfc1 $t4, $31 -/* A9B338 80024198 00000000 */ nop -/* A9B33C 8002419C 318C0078 */ andi $t4, $t4, 0x78 -/* A9B340 800241A0 15800005 */ bnez $t4, .L800241B8 -/* A9B344 800241A4 00000000 */ nop -/* A9B348 800241A8 440C9000 */ mfc1 $t4, $f18 -/* A9B34C 800241AC 3C018000 */ li $at, 0x80000000 # 0.000000 -/* A9B350 800241B0 10000007 */ b .L800241D0 -/* A9B354 800241B4 01816025 */ or $t4, $t4, $at -.L800241B8: -/* A9B358 800241B8 10000005 */ b .L800241D0 -/* A9B35C 800241BC 240CFFFF */ li $t4, -1 -.L800241C0: -/* A9B360 800241C0 440C9000 */ mfc1 $t4, $f18 -/* A9B364 800241C4 00000000 */ nop -/* A9B368 800241C8 0580FFFB */ bltz $t4, .L800241B8 -/* A9B36C 800241CC 00000000 */ nop -.L800241D0: -/* A9B370 800241D0 A0AC0002 */ sb $t4, 2($a1) -/* A9B374 800241D4 90890193 */ lbu $t1, 0x193($a0) -/* A9B378 800241D8 44CBF800 */ ctc1 $t3, $31 -/* A9B37C 800241DC 3C014F80 */ li $at, 0x4F800000 # 0.000000 -/* A9B380 800241E0 44898000 */ mtc1 $t1, $f16 -/* A9B384 800241E4 05210004 */ bgez $t1, .L800241F8 -/* A9B388 800241E8 46808220 */ cvt.s.w $f8, $f16 -/* A9B38C 800241EC 44815000 */ mtc1 $at, $f10 -/* A9B390 800241F0 00000000 */ nop -/* A9B394 800241F4 460A4200 */ add.s $f8, $f8, $f10 -.L800241F8: -/* A9B398 800241F8 908D019B */ lbu $t5, 0x19b($a0) -/* A9B39C 800241FC 24180001 */ li $t8, 1 -/* A9B3A0 80024200 3C014F00 */ li $at, 0x4F000000 # 0.000000 -/* A9B3A4 80024204 01A97023 */ subu $t6, $t5, $t1 -/* A9B3A8 80024208 448E2000 */ mtc1 $t6, $f4 -/* A9B3AC 8002420C 00000000 */ nop -/* A9B3B0 80024210 468021A0 */ cvt.s.w $f6, $f4 -/* A9B3B4 80024214 46003482 */ mul.s $f18, $f6, $f0 -/* A9B3B8 80024218 46124400 */ add.s $f16, $f8, $f18 -/* A9B3BC 8002421C 444FF800 */ cfc1 $t7, $31 -/* A9B3C0 80024220 44D8F800 */ ctc1 $t8, $31 -/* A9B3C4 80024224 00000000 */ nop -/* A9B3C8 80024228 460082A4 */ cvt.w.s $f10, $f16 -/* A9B3CC 8002422C 4458F800 */ cfc1 $t8, $31 -/* A9B3D0 80024230 00000000 */ nop -/* A9B3D4 80024234 33180078 */ andi $t8, $t8, 0x78 -/* A9B3D8 80024238 53000013 */ beql $t8, $zero, .L80024288 -/* A9B3DC 8002423C 44185000 */ mfc1 $t8, $f10 -/* A9B3E0 80024240 44815000 */ mtc1 $at, $f10 -/* A9B3E4 80024244 24180001 */ li $t8, 1 -/* A9B3E8 80024248 460A8281 */ sub.s $f10, $f16, $f10 -/* A9B3EC 8002424C 44D8F800 */ ctc1 $t8, $31 -/* A9B3F0 80024250 00000000 */ nop -/* A9B3F4 80024254 460052A4 */ cvt.w.s $f10, $f10 -/* A9B3F8 80024258 4458F800 */ cfc1 $t8, $31 -/* A9B3FC 8002425C 00000000 */ nop -/* A9B400 80024260 33180078 */ andi $t8, $t8, 0x78 -/* A9B404 80024264 17000005 */ bnez $t8, .L8002427C -/* A9B408 80024268 00000000 */ nop -/* A9B40C 8002426C 44185000 */ mfc1 $t8, $f10 -/* A9B410 80024270 3C018000 */ li $at, 0x80000000 # 0.000000 -/* A9B414 80024274 10000007 */ b .L80024294 -/* A9B418 80024278 0301C025 */ or $t8, $t8, $at -.L8002427C: -/* A9B41C 8002427C 10000005 */ b .L80024294 -/* A9B420 80024280 2418FFFF */ li $t8, -1 -/* A9B424 80024284 44185000 */ mfc1 $t8, $f10 -.L80024288: -/* A9B428 80024288 00000000 */ nop -/* A9B42C 8002428C 0700FFFB */ bltz $t8, .L8002427C -/* A9B430 80024290 00000000 */ nop -.L80024294: -/* A9B434 80024294 A0B80003 */ sb $t8, 3($a1) -/* A9B438 80024298 90820194 */ lbu $v0, 0x194($a0) -/* A9B43C 8002429C 44CFF800 */ ctc1 $t7, $31 -/* A9B440 800242A0 3C014F80 */ li $at, 0x4F800000 # 0.000000 -/* A9B444 800242A4 44822000 */ mtc1 $v0, $f4 -/* A9B448 800242A8 04410004 */ bgez $v0, .L800242BC -/* A9B44C 800242AC 468021A0 */ cvt.s.w $f6, $f4 -/* A9B450 800242B0 44814000 */ mtc1 $at, $f8 -/* A9B454 800242B4 00000000 */ nop -/* A9B458 800242B8 46083180 */ add.s $f6, $f6, $f8 -.L800242BC: -/* A9B45C 800242BC 9099019C */ lbu $t9, 0x19c($a0) -/* A9B460 800242C0 240C0001 */ li $t4, 1 -/* A9B464 800242C4 3C014F00 */ li $at, 0x4F000000 # 0.000000 -/* A9B468 800242C8 03225023 */ subu $t2, $t9, $v0 -/* A9B46C 800242CC 448A9000 */ mtc1 $t2, $f18 -/* A9B470 800242D0 00000000 */ nop -/* A9B474 800242D4 46809420 */ cvt.s.w $f16, $f18 -/* A9B478 800242D8 46008282 */ mul.s $f10, $f16, $f0 -/* A9B47C 800242DC 460A3100 */ add.s $f4, $f6, $f10 -/* A9B480 800242E0 444BF800 */ cfc1 $t3, $31 -/* A9B484 800242E4 44CCF800 */ ctc1 $t4, $31 -/* A9B488 800242E8 00000000 */ nop -/* A9B48C 800242EC 46002224 */ cvt.w.s $f8, $f4 -/* A9B490 800242F0 444CF800 */ cfc1 $t4, $31 -/* A9B494 800242F4 00000000 */ nop -/* A9B498 800242F8 318C0078 */ andi $t4, $t4, 0x78 -/* A9B49C 800242FC 51800013 */ beql $t4, $zero, .L8002434C -/* A9B4A0 80024300 440C4000 */ mfc1 $t4, $f8 -/* A9B4A4 80024304 44814000 */ mtc1 $at, $f8 -/* A9B4A8 80024308 240C0001 */ li $t4, 1 -/* A9B4AC 8002430C 46082201 */ sub.s $f8, $f4, $f8 -/* A9B4B0 80024310 44CCF800 */ ctc1 $t4, $31 -/* A9B4B4 80024314 00000000 */ nop -/* A9B4B8 80024318 46004224 */ cvt.w.s $f8, $f8 -/* A9B4BC 8002431C 444CF800 */ cfc1 $t4, $31 -/* A9B4C0 80024320 00000000 */ nop -/* A9B4C4 80024324 318C0078 */ andi $t4, $t4, 0x78 -/* A9B4C8 80024328 15800005 */ bnez $t4, .L80024340 -/* A9B4CC 8002432C 00000000 */ nop -/* A9B4D0 80024330 440C4000 */ mfc1 $t4, $f8 -/* A9B4D4 80024334 3C018000 */ li $at, 0x80000000 # 0.000000 -/* A9B4D8 80024338 10000007 */ b .L80024358 -/* A9B4DC 8002433C 01816025 */ or $t4, $t4, $at -.L80024340: -/* A9B4E0 80024340 10000005 */ b .L80024358 -/* A9B4E4 80024344 240CFFFF */ li $t4, -1 -/* A9B4E8 80024348 440C4000 */ mfc1 $t4, $f8 -.L8002434C: -/* A9B4EC 8002434C 00000000 */ nop -/* A9B4F0 80024350 0580FFFB */ bltz $t4, .L80024340 -/* A9B4F4 80024354 00000000 */ nop -.L80024358: -/* A9B4F8 80024358 A20C0000 */ sb $t4, ($s0) -/* A9B4FC 8002435C 90830195 */ lbu $v1, 0x195($a0) -/* A9B500 80024360 44CBF800 */ ctc1 $t3, $31 -/* A9B504 80024364 3C014F80 */ li $at, 0x4F800000 # 0.000000 -/* A9B508 80024368 44839000 */ mtc1 $v1, $f18 -/* A9B50C 8002436C 04610004 */ bgez $v1, .L80024380 -/* A9B510 80024370 46809420 */ cvt.s.w $f16, $f18 -/* A9B514 80024374 44813000 */ mtc1 $at, $f6 -/* A9B518 80024378 00000000 */ nop -/* A9B51C 8002437C 46068400 */ add.s $f16, $f16, $f6 -.L80024380: -/* A9B520 80024380 908D019D */ lbu $t5, 0x19d($a0) -/* A9B524 80024384 24180001 */ li $t8, 1 -/* A9B528 80024388 3C014F00 */ li $at, 0x4F000000 # 0.000000 -/* A9B52C 8002438C 01A37023 */ subu $t6, $t5, $v1 -/* A9B530 80024390 448E5000 */ mtc1 $t6, $f10 -/* A9B534 80024394 00000000 */ nop -/* A9B538 80024398 46805120 */ cvt.s.w $f4, $f10 -/* A9B53C 8002439C 46002202 */ mul.s $f8, $f4, $f0 -/* A9B540 800243A0 46088480 */ add.s $f18, $f16, $f8 -/* A9B544 800243A4 444FF800 */ cfc1 $t7, $31 -/* A9B548 800243A8 44D8F800 */ ctc1 $t8, $31 -/* A9B54C 800243AC 00000000 */ nop -/* A9B550 800243B0 460091A4 */ cvt.w.s $f6, $f18 -/* A9B554 800243B4 4458F800 */ cfc1 $t8, $31 -/* A9B558 800243B8 00000000 */ nop -/* A9B55C 800243BC 33180078 */ andi $t8, $t8, 0x78 -/* A9B560 800243C0 53000013 */ beql $t8, $zero, .L80024410 -/* A9B564 800243C4 44183000 */ mfc1 $t8, $f6 -/* A9B568 800243C8 44813000 */ mtc1 $at, $f6 -/* A9B56C 800243CC 24180001 */ li $t8, 1 -/* A9B570 800243D0 46069181 */ sub.s $f6, $f18, $f6 -/* A9B574 800243D4 44D8F800 */ ctc1 $t8, $31 -/* A9B578 800243D8 00000000 */ nop -/* A9B57C 800243DC 460031A4 */ cvt.w.s $f6, $f6 -/* A9B580 800243E0 4458F800 */ cfc1 $t8, $31 -/* A9B584 800243E4 00000000 */ nop -/* A9B588 800243E8 33180078 */ andi $t8, $t8, 0x78 -/* A9B58C 800243EC 17000005 */ bnez $t8, .L80024404 -/* A9B590 800243F0 00000000 */ nop -/* A9B594 800243F4 44183000 */ mfc1 $t8, $f6 -/* A9B598 800243F8 3C018000 */ li $at, 0x80000000 # 0.000000 -/* A9B59C 800243FC 10000007 */ b .L8002441C -/* A9B5A0 80024400 0301C025 */ or $t8, $t8, $at -.L80024404: -/* A9B5A4 80024404 10000005 */ b .L8002441C -/* A9B5A8 80024408 2418FFFF */ li $t8, -1 -/* A9B5AC 8002440C 44183000 */ mfc1 $t8, $f6 -.L80024410: -/* A9B5B0 80024410 00000000 */ nop -/* A9B5B4 80024414 0700FFFB */ bltz $t8, .L80024404 -/* A9B5B8 80024418 00000000 */ nop -.L8002441C: -/* A9B5BC 8002441C A2180001 */ sb $t8, 1($s0) -/* A9B5C0 80024420 90850196 */ lbu $a1, 0x196($a0) -/* A9B5C4 80024424 44CFF800 */ ctc1 $t7, $31 -/* A9B5C8 80024428 3C014F80 */ li $at, 0x4F800000 # 0.000000 -/* A9B5CC 8002442C 44855000 */ mtc1 $a1, $f10 -/* A9B5D0 80024430 04A10004 */ bgez $a1, .L80024444 -/* A9B5D4 80024434 46805120 */ cvt.s.w $f4, $f10 -/* A9B5D8 80024438 44818000 */ mtc1 $at, $f16 -/* A9B5DC 8002443C 00000000 */ nop -/* A9B5E0 80024440 46102100 */ add.s $f4, $f4, $f16 -.L80024444: -/* A9B5E4 80024444 9099019E */ lbu $t9, 0x19e($a0) -/* A9B5E8 80024448 240C0001 */ li $t4, 1 -/* A9B5EC 8002444C 3C014F00 */ li $at, 0x4F000000 # 0.000000 -/* A9B5F0 80024450 03255023 */ subu $t2, $t9, $a1 -/* A9B5F4 80024454 448A4000 */ mtc1 $t2, $f8 -/* A9B5F8 80024458 00000000 */ nop -/* A9B5FC 8002445C 468044A0 */ cvt.s.w $f18, $f8 -/* A9B600 80024460 46009182 */ mul.s $f6, $f18, $f0 -/* A9B604 80024464 46062280 */ add.s $f10, $f4, $f6 -/* A9B608 80024468 444BF800 */ cfc1 $t3, $31 -/* A9B60C 8002446C 44CCF800 */ ctc1 $t4, $31 -/* A9B610 80024470 00000000 */ nop -/* A9B614 80024474 46005424 */ cvt.w.s $f16, $f10 -/* A9B618 80024478 444CF800 */ cfc1 $t4, $31 -/* A9B61C 8002447C 00000000 */ nop -/* A9B620 80024480 318C0078 */ andi $t4, $t4, 0x78 -/* A9B624 80024484 51800013 */ beql $t4, $zero, .L800244D4 -/* A9B628 80024488 440C8000 */ mfc1 $t4, $f16 -/* A9B62C 8002448C 44818000 */ mtc1 $at, $f16 -/* A9B630 80024490 240C0001 */ li $t4, 1 -/* A9B634 80024494 46105401 */ sub.s $f16, $f10, $f16 -/* A9B638 80024498 44CCF800 */ ctc1 $t4, $31 -/* A9B63C 8002449C 00000000 */ nop -/* A9B640 800244A0 46008424 */ cvt.w.s $f16, $f16 -/* A9B644 800244A4 444CF800 */ cfc1 $t4, $31 -/* A9B648 800244A8 00000000 */ nop -/* A9B64C 800244AC 318C0078 */ andi $t4, $t4, 0x78 -/* A9B650 800244B0 15800005 */ bnez $t4, .L800244C8 -/* A9B654 800244B4 00000000 */ nop -/* A9B658 800244B8 440C8000 */ mfc1 $t4, $f16 -/* A9B65C 800244BC 3C018000 */ li $at, 0x80000000 # 0.000000 -/* A9B660 800244C0 10000007 */ b .L800244E0 -/* A9B664 800244C4 01816025 */ or $t4, $t4, $at -.L800244C8: -/* A9B668 800244C8 10000005 */ b .L800244E0 -/* A9B66C 800244CC 240CFFFF */ li $t4, -1 -/* A9B670 800244D0 440C8000 */ mfc1 $t4, $f16 -.L800244D4: -/* A9B674 800244D4 00000000 */ nop -/* A9B678 800244D8 0580FFFB */ bltz $t4, .L800244C8 -/* A9B67C 800244DC 00000000 */ nop -.L800244E0: -/* A9B680 800244E0 A20C0002 */ sb $t4, 2($s0) -/* A9B684 800244E4 90860197 */ lbu $a2, 0x197($a0) -/* A9B688 800244E8 44CBF800 */ ctc1 $t3, $31 -/* A9B68C 800244EC 3C014F80 */ li $at, 0x4F800000 # 0.000000 -/* A9B690 800244F0 44864000 */ mtc1 $a2, $f8 -/* A9B694 800244F4 04C10004 */ bgez $a2, .L80024508 -/* A9B698 800244F8 468044A0 */ cvt.s.w $f18, $f8 -/* A9B69C 800244FC 44812000 */ mtc1 $at, $f4 -/* A9B6A0 80024500 00000000 */ nop -/* A9B6A4 80024504 46049480 */ add.s $f18, $f18, $f4 -.L80024508: -/* A9B6A8 80024508 908D019F */ lbu $t5, 0x19f($a0) -/* A9B6AC 8002450C 24180001 */ li $t8, 1 -/* A9B6B0 80024510 3C014F00 */ li $at, 0x4F000000 # 0.000000 -/* A9B6B4 80024514 01A67023 */ subu $t6, $t5, $a2 -/* A9B6B8 80024518 448E3000 */ mtc1 $t6, $f6 -/* A9B6BC 8002451C 00000000 */ nop -/* A9B6C0 80024520 468032A0 */ cvt.s.w $f10, $f6 -/* A9B6C4 80024524 46005402 */ mul.s $f16, $f10, $f0 -/* A9B6C8 80024528 46109200 */ add.s $f8, $f18, $f16 -/* A9B6CC 8002452C 444FF800 */ cfc1 $t7, $31 -/* A9B6D0 80024530 44D8F800 */ ctc1 $t8, $31 -/* A9B6D4 80024534 00000000 */ nop -/* A9B6D8 80024538 46004124 */ cvt.w.s $f4, $f8 -/* A9B6DC 8002453C 4458F800 */ cfc1 $t8, $31 -/* A9B6E0 80024540 00000000 */ nop -/* A9B6E4 80024544 33180078 */ andi $t8, $t8, 0x78 -/* A9B6E8 80024548 53000013 */ beql $t8, $zero, .L80024598 -/* A9B6EC 8002454C 44182000 */ mfc1 $t8, $f4 -/* A9B6F0 80024550 44812000 */ mtc1 $at, $f4 -/* A9B6F4 80024554 24180001 */ li $t8, 1 -/* A9B6F8 80024558 46044101 */ sub.s $f4, $f8, $f4 -/* A9B6FC 8002455C 44D8F800 */ ctc1 $t8, $31 -/* A9B700 80024560 00000000 */ nop -/* A9B704 80024564 46002124 */ cvt.w.s $f4, $f4 -/* A9B708 80024568 4458F800 */ cfc1 $t8, $31 -/* A9B70C 8002456C 00000000 */ nop -/* A9B710 80024570 33180078 */ andi $t8, $t8, 0x78 -/* A9B714 80024574 17000005 */ bnez $t8, .L8002458C -/* A9B718 80024578 00000000 */ nop -/* A9B71C 8002457C 44182000 */ mfc1 $t8, $f4 -/* A9B720 80024580 3C018000 */ lui $at, 0x8000 -/* A9B724 80024584 10000007 */ b .L800245A4 -/* A9B728 80024588 0301C025 */ or $t8, $t8, $at -.L8002458C: -/* A9B72C 8002458C 10000005 */ b .L800245A4 -/* A9B730 80024590 2418FFFF */ li $t8, -1 -/* A9B734 80024594 44182000 */ mfc1 $t8, $f4 -.L80024598: -/* A9B738 80024598 00000000 */ nop -/* A9B73C 8002459C 0700FFFB */ bltz $t8, .L8002458C -/* A9B740 800245A0 00000000 */ nop -.L800245A4: -/* A9B744 800245A4 44CFF800 */ ctc1 $t7, $31 -/* A9B748 800245A8 A2180003 */ sb $t8, 3($s0) -/* A9B74C 800245AC 00000000 */ nop -.L800245B0: -/* A9B750 800245B0 8FB00004 */ lw $s0, 4($sp) -/* A9B754 800245B4 03E00008 */ jr $ra -/* A9B758 800245B8 27BD0008 */ addiu $sp, $sp, 8 - diff --git a/asm/non_matchings/code/z_eff_shield_particle/func_800245BC.s b/asm/non_matchings/code/z_eff_shield_particle/func_800245BC.s deleted file mode 100644 index 6d0ab5a11a..0000000000 --- a/asm/non_matchings/code/z_eff_shield_particle/func_800245BC.s +++ /dev/null @@ -1,355 +0,0 @@ -.rdata -glabel D_80135498 - .asciz "../z_eff_shield_particle.c" - .balign 4 - -glabel D_801354B4 - .asciz "../z_eff_shield_particle.c" - .balign 4 - -.late_rodata -glabel D_801354D4 - .float 0.02 - -.text -glabel func_800245BC -/* A9B75C 800245BC 27BDFE50 */ addiu $sp, $sp, -0x1b0 -/* A9B760 800245C0 AFB60058 */ sw $s6, 0x58($sp) -/* A9B764 800245C4 AFB50054 */ sw $s5, 0x54($sp) -/* A9B768 800245C8 0080A825 */ move $s5, $a0 -/* A9B76C 800245CC AFBF005C */ sw $ra, 0x5c($sp) -/* A9B770 800245D0 AFB40050 */ sw $s4, 0x50($sp) -/* A9B774 800245D4 0080B025 */ move $s6, $a0 -/* A9B778 800245D8 3C068013 */ lui $a2, %hi(D_80135498) # $a2, 0x8013 -/* A9B77C 800245DC 00A0A025 */ move $s4, $a1 -/* A9B780 800245E0 AFB3004C */ sw $s3, 0x4c($sp) -/* A9B784 800245E4 AFB20048 */ sw $s2, 0x48($sp) -/* A9B788 800245E8 AFB10044 */ sw $s1, 0x44($sp) -/* A9B78C 800245EC AFB00040 */ sw $s0, 0x40($sp) -/* A9B790 800245F0 F7BC0038 */ sdc1 $f28, 0x38($sp) -/* A9B794 800245F4 F7BA0030 */ sdc1 $f26, 0x30($sp) -/* A9B798 800245F8 F7B80028 */ sdc1 $f24, 0x28($sp) -/* A9B79C 800245FC F7B60020 */ sdc1 $f22, 0x20($sp) -/* A9B7A0 80024600 F7B40018 */ sdc1 $f20, 0x18($sp) -/* A9B7A4 80024604 24C65498 */ addiu $a2, %lo(D_80135498) # addiu $a2, $a2, 0x5498 -/* A9B7A8 80024608 27A4018C */ addiu $a0, $sp, 0x18c -/* A9B7AC 8002460C 0C031AB1 */ jal Graph_OpenDisps -/* A9B7B0 80024610 24070110 */ li $a3, 272 -/* A9B7B4 80024614 12A00124 */ beqz $s5, .L80024AA8 -/* A9B7B8 80024618 24050026 */ li $a1, 38 -/* A9B7BC 8002461C 0C024DDD */ jal Gfx_CallSetupDL -/* A9B7C0 80024620 8E8402D0 */ lw $a0, 0x2d0($s4) -/* A9B7C4 80024624 00402025 */ move $a0, $v0 -/* A9B7C8 80024628 AE8202D0 */ sw $v0, 0x2d0($s4) -/* A9B7CC 8002462C 248E0008 */ addiu $t6, $a0, 8 -/* A9B7D0 80024630 AE8E02D0 */ sw $t6, 0x2d0($s4) -/* A9B7D4 80024634 3C0FE300 */ lui $t7, (0xE3000A01 >> 16) # lui $t7, 0xe300 -/* A9B7D8 80024638 35EF0A01 */ ori $t7, (0xE3000A01 & 0xFFFF) # ori $t7, $t7, 0xa01 -/* A9B7DC 8002463C 3C180010 */ lui $t8, 0x10 -/* A9B7E0 80024640 AC580004 */ sw $t8, 4($v0) -/* A9B7E4 80024644 AC4F0000 */ sw $t7, ($v0) -/* A9B7E8 80024648 8E8402D0 */ lw $a0, 0x2d0($s4) -/* A9B7EC 8002464C 3C10E700 */ lui $s0, 0xe700 -/* A9B7F0 80024650 3C09D700 */ lui $t1, (0xD7000002 >> 16) # lui $t1, 0xd700 -/* A9B7F4 80024654 24990008 */ addiu $t9, $a0, 8 -/* A9B7F8 80024658 AE9902D0 */ sw $t9, 0x2d0($s4) -/* A9B7FC 8002465C AC800004 */ sw $zero, 4($a0) -/* A9B800 80024660 AC900000 */ sw $s0, ($a0) -/* A9B804 80024664 8E8402D0 */ lw $a0, 0x2d0($s4) -/* A9B808 80024668 35290002 */ ori $t1, (0xD7000002 & 0xFFFF) # ori $t1, $t1, 2 -/* A9B80C 8002466C 240AFFFF */ li $t2, -1 -/* A9B810 80024670 24880008 */ addiu $t0, $a0, 8 -/* A9B814 80024674 AE8802D0 */ sw $t0, 0x2d0($s4) -/* A9B818 80024678 AC8A0004 */ sw $t2, 4($a0) -/* A9B81C 8002467C AC890000 */ sw $t1, ($a0) -/* A9B820 80024680 8E8402D0 */ lw $a0, 0x2d0($s4) -/* A9B824 80024684 3C0D0404 */ lui $t5, %hi(D_04038FB0) # $t5, 0x404 -/* A9B828 80024688 25AD8FB0 */ addiu $t5, %lo(D_04038FB0) # addiu $t5, $t5, -0x7050 -/* A9B82C 8002468C 248B0008 */ addiu $t3, $a0, 8 -/* A9B830 80024690 AE8B02D0 */ sw $t3, 0x2d0($s4) -/* A9B834 80024694 3C0CFD90 */ lui $t4, 0xfd90 -/* A9B838 80024698 AC8C0000 */ sw $t4, ($a0) -/* A9B83C 8002469C AC8D0004 */ sw $t5, 4($a0) -/* A9B840 800246A0 8E8402D0 */ lw $a0, 0x2d0($s4) -/* A9B844 800246A4 3C180701 */ lui $t8, (0x07014050 >> 16) # lui $t8, 0x701 -/* A9B848 800246A8 37184050 */ ori $t8, (0x07014050 & 0xFFFF) # ori $t8, $t8, 0x4050 -/* A9B84C 800246AC 248E0008 */ addiu $t6, $a0, 8 -/* A9B850 800246B0 AE8E02D0 */ sw $t6, 0x2d0($s4) -/* A9B854 800246B4 3C0FF590 */ lui $t7, 0xf590 -/* A9B858 800246B8 AC8F0000 */ sw $t7, ($a0) -/* A9B85C 800246BC AC980004 */ sw $t8, 4($a0) -/* A9B860 800246C0 8E8402D0 */ lw $a0, 0x2d0($s4) -/* A9B864 800246C4 3C08E600 */ lui $t0, 0xe600 -/* A9B868 800246C8 3C0B071F */ lui $t3, (0x071FF200 >> 16) # lui $t3, 0x71f -/* A9B86C 800246CC 24990008 */ addiu $t9, $a0, 8 -/* A9B870 800246D0 AE9902D0 */ sw $t9, 0x2d0($s4) -/* A9B874 800246D4 AC800004 */ sw $zero, 4($a0) -/* A9B878 800246D8 AC880000 */ sw $t0, ($a0) -/* A9B87C 800246DC 8E8402D0 */ lw $a0, 0x2d0($s4) -/* A9B880 800246E0 356BF200 */ ori $t3, (0x071FF200 & 0xFFFF) # ori $t3, $t3, 0xf200 -/* A9B884 800246E4 3C0AF300 */ lui $t2, 0xf300 -/* A9B888 800246E8 24890008 */ addiu $t1, $a0, 8 -/* A9B88C 800246EC AE8902D0 */ sw $t1, 0x2d0($s4) -/* A9B890 800246F0 AC8B0004 */ sw $t3, 4($a0) -/* A9B894 800246F4 AC8A0000 */ sw $t2, ($a0) -/* A9B898 800246F8 8E8402D0 */ lw $a0, 0x2d0($s4) -/* A9B89C 800246FC 3C0F0001 */ lui $t7, (0x00014050 >> 16) # lui $t7, 1 -/* A9B8A0 80024700 3C0EF588 */ lui $t6, (0xF5880800 >> 16) # lui $t6, 0xf588 -/* A9B8A4 80024704 248C0008 */ addiu $t4, $a0, 8 -/* A9B8A8 80024708 AE8C02D0 */ sw $t4, 0x2d0($s4) -/* A9B8AC 8002470C AC800004 */ sw $zero, 4($a0) -/* A9B8B0 80024710 AC900000 */ sw $s0, ($a0) -/* A9B8B4 80024714 8E8402D0 */ lw $a0, 0x2d0($s4) -/* A9B8B8 80024718 35CE0800 */ ori $t6, (0xF5880800 & 0xFFFF) # ori $t6, $t6, 0x800 -/* A9B8BC 8002471C 35EF4050 */ ori $t7, (0x00014050 & 0xFFFF) # ori $t7, $t7, 0x4050 -/* A9B8C0 80024720 248D0008 */ addiu $t5, $a0, 8 -/* A9B8C4 80024724 AE8D02D0 */ sw $t5, 0x2d0($s4) -/* A9B8C8 80024728 AC8F0004 */ sw $t7, 4($a0) -/* A9B8CC 8002472C AC8E0000 */ sw $t6, ($a0) -/* A9B8D0 80024730 8E8402D0 */ lw $a0, 0x2d0($s4) -/* A9B8D4 80024734 3C080007 */ lui $t0, (0x0007C07C >> 16) # lui $t0, 7 -/* A9B8D8 80024738 3508C07C */ ori $t0, (0x0007C07C & 0xFFFF) # ori $t0, $t0, 0xc07c -/* A9B8DC 8002473C 24980008 */ addiu $t8, $a0, 8 -/* A9B8E0 80024740 AE9802D0 */ sw $t8, 0x2d0($s4) -/* A9B8E4 80024744 3C19F200 */ lui $t9, 0xf200 -/* A9B8E8 80024748 AC990000 */ sw $t9, ($a0) -/* A9B8EC 8002474C AC880004 */ sw $t0, 4($a0) -/* A9B8F0 80024750 8E8402D0 */ lw $a0, 0x2d0($s4) -/* A9B8F4 80024754 3C0AFC30 */ lui $t2, (0xFC30B3FF >> 16) # lui $t2, 0xfc30 -/* A9B8F8 80024758 3C0B5FFE */ lui $t3, (0x5FFEFE38 >> 16) # lui $t3, 0x5ffe -/* A9B8FC 8002475C 24890008 */ addiu $t1, $a0, 8 -/* A9B900 80024760 AE8902D0 */ sw $t1, 0x2d0($s4) -/* A9B904 80024764 356BFE38 */ ori $t3, (0x5FFEFE38 & 0xFFFF) # ori $t3, $t3, 0xfe38 -/* A9B908 80024768 354AB3FF */ ori $t2, (0xFC30B3FF & 0xFFFF) # ori $t2, $t2, 0xb3ff -/* A9B90C 8002476C AC8A0000 */ sw $t2, ($a0) -/* A9B910 80024770 AC8B0004 */ sw $t3, 4($a0) -/* A9B914 80024774 8E8402D0 */ lw $a0, 0x2d0($s4) -/* A9B918 80024778 3C0E0C18 */ lui $t6, (0x0C184B50 >> 16) # lui $t6, 0xc18 -/* A9B91C 8002477C 3C0DE200 */ lui $t5, (0xE200001C >> 16) # lui $t5, 0xe200 -/* A9B920 80024780 248C0008 */ addiu $t4, $a0, 8 -/* A9B924 80024784 AE8C02D0 */ sw $t4, 0x2d0($s4) -/* A9B928 80024788 35AD001C */ ori $t5, (0xE200001C & 0xFFFF) # ori $t5, $t5, 0x1c -/* A9B92C 8002478C 35CE4B50 */ ori $t6, (0x0C184B50 & 0xFFFF) # ori $t6, $t6, 0x4b50 -/* A9B930 80024790 AC8E0004 */ sw $t6, 4($a0) -/* A9B934 80024794 AC8D0000 */ sw $t5, ($a0) -/* A9B938 80024798 8E8402D0 */ lw $a0, 0x2d0($s4) -/* A9B93C 8002479C 3C18D9F0 */ lui $t8, (0xD9F0F9FF >> 16) # lui $t8, 0xd9f0 -/* A9B940 800247A0 3718F9FF */ ori $t8, (0xD9F0F9FF & 0xFFFF) # ori $t8, $t8, 0xf9ff -/* A9B944 800247A4 248F0008 */ addiu $t7, $a0, 8 -/* A9B948 800247A8 AE8F02D0 */ sw $t7, 0x2d0($s4) -/* A9B94C 800247AC AC800004 */ sw $zero, 4($a0) -/* A9B950 800247B0 AC980000 */ sw $t8, ($a0) -/* A9B954 800247B4 8E8402D0 */ lw $a0, 0x2d0($s4) -/* A9B958 800247B8 3C090020 */ lui $t1, (0x00200005 >> 16) # lui $t1, 0x20 -/* A9B95C 800247BC 3C08D9FF */ lui $t0, (0xD9FFFFFF >> 16) # lui $t0, 0xd9ff -/* A9B960 800247C0 24990008 */ addiu $t9, $a0, 8 -/* A9B964 800247C4 AE9902D0 */ sw $t9, 0x2d0($s4) -/* A9B968 800247C8 3508FFFF */ ori $t0, (0xD9FFFFFF & 0xFFFF) # ori $t0, $t0, 0xffff -/* A9B96C 800247CC 35290005 */ ori $t1, (0x00200005 & 0xFFFF) # ori $t1, $t1, 5 -/* A9B970 800247D0 AC890004 */ sw $t1, 4($a0) -/* A9B974 800247D4 AC880000 */ sw $t0, ($a0) -/* A9B978 800247D8 02A02025 */ move $a0, $s5 -/* A9B97C 800247DC 27A501A4 */ addiu $a1, $sp, 0x1a4 -/* A9B980 800247E0 0C008E27 */ jal func_8002389C -/* A9B984 800247E4 27A601A0 */ addiu $a2, $sp, 0x1a0 -/* A9B988 800247E8 8E8402D0 */ lw $a0, 0x2d0($s4) -/* A9B98C 800247EC 3C0BFA00 */ lui $t3, 0xfa00 -/* A9B990 800247F0 02A08825 */ move $s1, $s5 -/* A9B994 800247F4 248A0008 */ addiu $t2, $a0, 8 -/* A9B998 800247F8 AE8A02D0 */ sw $t2, 0x2d0($s4) -/* A9B99C 800247FC AC8B0000 */ sw $t3, ($a0) -/* A9B9A0 80024800 93B801A5 */ lbu $t8, 0x1a5($sp) -/* A9B9A4 80024804 93AD01A4 */ lbu $t5, 0x1a4($sp) -/* A9B9A8 80024808 93AA01A6 */ lbu $t2, 0x1a6($sp) -/* A9B9AC 8002480C 93AF01A7 */ lbu $t7, 0x1a7($sp) -/* A9B9B0 80024810 0018CC00 */ sll $t9, $t8, 0x10 -/* A9B9B4 80024814 000D7600 */ sll $t6, $t5, 0x18 -/* A9B9B8 80024818 01D94025 */ or $t0, $t6, $t9 -/* A9B9BC 8002481C 000A5A00 */ sll $t3, $t2, 8 -/* A9B9C0 80024820 010B6025 */ or $t4, $t0, $t3 -/* A9B9C4 80024824 018FC025 */ or $t8, $t4, $t7 -/* A9B9C8 80024828 AC980004 */ sw $t8, 4($a0) -/* A9B9CC 8002482C 8E8402D0 */ lw $a0, 0x2d0($s4) -/* A9B9D0 80024830 3C19FB00 */ li $t9, 0xFB000000 # 0.000000 -/* A9B9D4 80024834 27B30084 */ addiu $s3, $sp, 0x84 -/* A9B9D8 80024838 248E0008 */ addiu $t6, $a0, 8 -/* A9B9DC 8002483C AE8E02D0 */ sw $t6, 0x2d0($s4) -/* A9B9E0 80024840 AC990000 */ sw $t9, ($a0) -/* A9B9E4 80024844 93AD01A1 */ lbu $t5, 0x1a1($sp) -/* A9B9E8 80024848 93AA01A0 */ lbu $t2, 0x1a0($sp) -/* A9B9EC 8002484C 93AE01A2 */ lbu $t6, 0x1a2($sp) -/* A9B9F0 80024850 93AB01A3 */ lbu $t3, 0x1a3($sp) -/* A9B9F4 80024854 000D6400 */ sll $t4, $t5, 0x10 -/* A9B9F8 80024858 000A4600 */ sll $t0, $t2, 0x18 -/* A9B9FC 8002485C 010C7825 */ or $t7, $t0, $t4 -/* A9BA00 80024860 000ECA00 */ sll $t9, $t6, 8 -/* A9BA04 80024864 01F94825 */ or $t1, $t7, $t9 -/* A9BA08 80024868 012B6825 */ or $t5, $t1, $t3 -/* A9BA0C 8002486C AC8D0004 */ sw $t5, 4($a0) -/* A9BA10 80024870 8E8402D0 */ lw $a0, 0x2d0($s4) -/* A9BA14 80024874 27B200C4 */ addiu $s2, $sp, 0xc4 -/* A9BA18 80024878 24880008 */ addiu $t0, $a0, 8 -/* A9BA1C 8002487C AE8802D0 */ sw $t0, 0x2d0($s4) -/* A9BA20 80024880 AC800004 */ sw $zero, 4($a0) -/* A9BA24 80024884 AC900000 */ sw $s0, ($a0) -/* A9BA28 80024888 92AC0180 */ lbu $t4, 0x180($s5) -/* A9BA2C 8002488C 27B00104 */ addiu $s0, $sp, 0x104 -/* A9BA30 80024890 000CC080 */ sll $t8, $t4, 2 -/* A9BA34 80024894 030CC023 */ subu $t8, $t8, $t4 -/* A9BA38 80024898 0018C0C0 */ sll $t8, $t8, 3 -/* A9BA3C 8002489C 02B87021 */ addu $t6, $s5, $t8 -/* A9BA40 800248A0 02AE082B */ sltu $at, $s5, $t6 -/* A9BA44 800248A4 10200080 */ beqz $at, .L80024AA8 -/* A9BA48 800248A8 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* A9BA4C 800248AC 4481D000 */ mtc1 $at, $f26 -/* A9BA50 800248B0 3C018013 */ lui $at, %hi(D_801354D4) -/* A9BA54 800248B4 4480E000 */ mtc1 $zero, $f28 -/* A9BA58 800248B8 C43854D4 */ lwc1 $f24, %lo(D_801354D4)($at) -/* A9BA5C 800248BC C6200008 */ lwc1 $f0, 8($s1) -.L800248C0: -/* A9BA60 800248C0 C6220010 */ lwc1 $f2, 0x10($s1) -/* A9BA64 800248C4 3C013F00 */ li $at, 0x3F000000 # 0.000000 -/* A9BA68 800248C8 44813000 */ mtc1 $at, $f6 -/* A9BA6C 800248CC 46020100 */ add.s $f4, $f0, $f2 -/* A9BA70 800248D0 3C013C80 */ li $at, 0x3C800000 # 0.000000 -/* A9BA74 800248D4 44819000 */ mtc1 $at, $f18 -/* A9BA78 800248D8 46020381 */ sub.s $f14, $f0, $f2 -/* A9BA7C 800248DC 46062202 */ mul.s $f8, $f4, $f6 -/* A9BA80 800248E0 00000000 */ nop -/* A9BA84 800248E4 46127102 */ mul.s $f4, $f14, $f18 -/* A9BA88 800248E8 4600428D */ trunc.w.s $f10, $f8 -/* A9BA8C 800248EC 46182183 */ div.s $f6, $f4, $f24 -/* A9BA90 800248F0 44195000 */ mfc1 $t9, $f10 -/* A9BA94 800248F4 00000000 */ nop -/* A9BA98 800248F8 00195400 */ sll $t2, $t9, 0x10 -/* A9BA9C 800248FC 000A4C03 */ sra $t1, $t2, 0x10 -/* A9BAA0 80024900 44898000 */ mtc1 $t1, $f16 -/* A9BAA4 80024904 00000000 */ nop -/* A9BAA8 80024908 468085A0 */ cvt.s.w $f22, $f16 -/* A9BAAC 8002490C 4600320D */ trunc.w.s $f8, $f6 -/* A9BAB0 80024910 440D4000 */ mfc1 $t5, $f8 -/* A9BAB4 80024914 00000000 */ nop -/* A9BAB8 80024918 000D4400 */ sll $t0, $t5, 0x10 -/* A9BABC 8002491C 00086403 */ sra $t4, $t0, 0x10 -/* A9BAC0 80024920 448C5000 */ mtc1 $t4, $f10 -/* A9BAC4 80024924 00000000 */ nop -/* A9BAC8 80024928 46805520 */ cvt.s.w $f20, $f10 -/* A9BACC 8002492C 461AA03C */ c.lt.s $f20, $f26 -/* A9BAD0 80024930 00000000 */ nop -/* A9BAD4 80024934 45000002 */ bc1f .L80024940 -/* A9BAD8 80024938 00000000 */ nop -/* A9BADC 8002493C 4600D506 */ mov.s $f20, $f26 -.L80024940: -/* A9BAE0 80024940 86B80182 */ lh $t8, 0x182($s5) -/* A9BAE4 80024944 86AE0184 */ lh $t6, 0x184($s5) -/* A9BAE8 80024948 86AF0186 */ lh $t7, 0x186($s5) -/* A9BAEC 8002494C 44988000 */ mtc1 $t8, $f16 -/* A9BAF0 80024950 448E9000 */ mtc1 $t6, $f18 -/* A9BAF4 80024954 448F2000 */ mtc1 $t7, $f4 -/* A9BAF8 80024958 46808420 */ cvt.s.w $f16, $f16 -/* A9BAFC 8002495C 02402025 */ move $a0, $s2 -/* A9BB00 80024960 468094A0 */ cvt.s.w $f18, $f18 -/* A9BB04 80024964 44058000 */ mfc1 $a1, $f16 -/* A9BB08 80024968 46802120 */ cvt.s.w $f4, $f4 -/* A9BB0C 8002496C 44069000 */ mfc1 $a2, $f18 -/* A9BB10 80024970 44072000 */ mfc1 $a3, $f4 -/* A9BB14 80024974 0C029E89 */ jal func_800A7A24 -/* A9BB18 80024978 00000000 */ nop -/* A9BB1C 8002497C 02002025 */ move $a0, $s0 -/* A9BB20 80024980 00002825 */ move $a1, $zero -/* A9BB24 80024984 86260014 */ lh $a2, 0x14($s1) -/* A9BB28 80024988 0C029DC1 */ jal func_800A7704 -/* A9BB2C 8002498C 00003825 */ move $a3, $zero -/* A9BB30 80024990 02402025 */ move $a0, $s2 -/* A9BB34 80024994 02002825 */ move $a1, $s0 -/* A9BB38 80024998 0C029BE8 */ jal func_800A6FA0 -/* A9BB3C 8002499C 02603025 */ move $a2, $s3 -/* A9BB40 800249A0 02002025 */ move $a0, $s0 -/* A9BB44 800249A4 00002825 */ move $a1, $zero -/* A9BB48 800249A8 00003025 */ move $a2, $zero -/* A9BB4C 800249AC 0C029DC1 */ jal func_800A7704 -/* A9BB50 800249B0 86270016 */ lh $a3, 0x16($s1) -/* A9BB54 800249B4 02602025 */ move $a0, $s3 -/* A9BB58 800249B8 02002825 */ move $a1, $s0 -/* A9BB5C 800249BC 0C029BE8 */ jal func_800A6FA0 -/* A9BB60 800249C0 02403025 */ move $a2, $s2 -/* A9BB64 800249C4 4405B000 */ mfc1 $a1, $f22 -/* A9BB68 800249C8 4406E000 */ mfc1 $a2, $f28 -/* A9BB6C 800249CC 4407E000 */ mfc1 $a3, $f28 -/* A9BB70 800249D0 0C029E89 */ jal func_800A7A24 -/* A9BB74 800249D4 02002025 */ move $a0, $s0 -/* A9BB78 800249D8 02402025 */ move $a0, $s2 -/* A9BB7C 800249DC 02002825 */ move $a1, $s0 -/* A9BB80 800249E0 0C029BE8 */ jal func_800A6FA0 -/* A9BB84 800249E4 02603025 */ move $a2, $s3 -/* A9BB88 800249E8 4618A182 */ mul.s $f6, $f20, $f24 -/* A9BB8C 800249EC 4406C000 */ mfc1 $a2, $f24 -/* A9BB90 800249F0 4407C000 */ mfc1 $a3, $f24 -/* A9BB94 800249F4 02002025 */ move $a0, $s0 -/* A9BB98 800249F8 44053000 */ mfc1 $a1, $f6 -/* A9BB9C 800249FC 0C029DA9 */ jal func_800A76A4 -/* A9BBA0 80024A00 00000000 */ nop -/* A9BBA4 80024A04 02602025 */ move $a0, $s3 -/* A9BBA8 80024A08 02002825 */ move $a1, $s0 -/* A9BBAC 80024A0C 0C029BE8 */ jal func_800A6FA0 -/* A9BBB0 80024A10 02403025 */ move $a2, $s2 -/* A9BBB4 80024A14 02802025 */ move $a0, $s4 -/* A9BBB8 80024A18 0C029F9C */ jal func_800A7E70 -/* A9BBBC 80024A1C 02402825 */ move $a1, $s2 -/* A9BBC0 80024A20 10400021 */ beqz $v0, .L80024AA8 -/* A9BBC4 80024A24 3C058011 */ lui $a1, %hi(D_80115810) # $a1, 0x8011 -/* A9BBC8 80024A28 8E8402D0 */ lw $a0, 0x2d0($s4) -/* A9BBCC 80024A2C 3C0ADA38 */ lui $t2, (0xDA380003 >> 16) # lui $t2, 0xda38 -/* A9BBD0 80024A30 354A0003 */ ori $t2, (0xDA380003 & 0xFFFF) # ori $t2, $t2, 3 -/* A9BBD4 80024A34 24990008 */ addiu $t9, $a0, 8 -/* A9BBD8 80024A38 AE9902D0 */ sw $t9, 0x2d0($s4) -/* A9BBDC 80024A3C AC820004 */ sw $v0, 4($a0) -/* A9BBE0 80024A40 AC8A0000 */ sw $t2, ($a0) -/* A9BBE4 80024A44 8E8402D0 */ lw $a0, 0x2d0($s4) -/* A9BBE8 80024A48 3C0B0100 */ lui $t3, (0x01004008 >> 16) # lui $t3, 0x100 -/* A9BBEC 80024A4C 24A55810 */ addiu $a1, %lo(D_80115810) # addiu $a1, $a1, 0x5810 -/* A9BBF0 80024A50 24890008 */ addiu $t1, $a0, 8 -/* A9BBF4 80024A54 AE8902D0 */ sw $t1, 0x2d0($s4) -/* A9BBF8 80024A58 356B4008 */ ori $t3, (0x01004008 & 0xFFFF) # ori $t3, $t3, 0x4008 -/* A9BBFC 80024A5C AC8B0000 */ sw $t3, ($a0) -/* A9BC00 80024A60 AC850004 */ sw $a1, 4($a0) -/* A9BC04 80024A64 8E8402D0 */ lw $a0, 0x2d0($s4) -/* A9BC08 80024A68 3C080600 */ lui $t0, (0x06000204 >> 16) # lui $t0, 0x600 -/* A9BC0C 80024A6C 35080204 */ ori $t0, (0x06000204 & 0xFFFF) # ori $t0, $t0, 0x204 -/* A9BC10 80024A70 248D0008 */ addiu $t5, $a0, 8 -/* A9BC14 80024A74 AE8D02D0 */ sw $t5, 0x2d0($s4) -/* A9BC18 80024A78 240C0602 */ li $t4, 1538 -/* A9BC1C 80024A7C AC8C0004 */ sw $t4, 4($a0) -/* A9BC20 80024A80 AC880000 */ sw $t0, ($a0) -/* A9BC24 80024A84 92D80180 */ lbu $t8, 0x180($s6) -/* A9BC28 80024A88 26310018 */ addiu $s1, $s1, 0x18 -/* A9BC2C 80024A8C 00187080 */ sll $t6, $t8, 2 -/* A9BC30 80024A90 01D87023 */ subu $t6, $t6, $t8 -/* A9BC34 80024A94 000E70C0 */ sll $t6, $t6, 3 -/* A9BC38 80024A98 02CE7821 */ addu $t7, $s6, $t6 -/* A9BC3C 80024A9C 022F082B */ sltu $at, $s1, $t7 -/* A9BC40 80024AA0 5420FF87 */ bnezl $at, .L800248C0 -/* A9BC44 80024AA4 C6200008 */ lwc1 $f0, 8($s1) -.L80024AA8: -/* A9BC48 80024AA8 3C068013 */ lui $a2, %hi(D_801354B4) # $a2, 0x8013 -/* A9BC4C 80024AAC 24C654B4 */ addiu $a2, %lo(D_801354B4) # addiu $a2, $a2, 0x54b4 -/* A9BC50 80024AB0 27A4018C */ addiu $a0, $sp, 0x18c -/* A9BC54 80024AB4 02802825 */ move $a1, $s4 -/* A9BC58 80024AB8 0C031AD5 */ jal Graph_CloseDisps -/* A9BC5C 80024ABC 24070167 */ li $a3, 359 -/* A9BC60 80024AC0 8FBF005C */ lw $ra, 0x5c($sp) -/* A9BC64 80024AC4 D7B40018 */ ldc1 $f20, 0x18($sp) -/* A9BC68 80024AC8 D7B60020 */ ldc1 $f22, 0x20($sp) -/* A9BC6C 80024ACC D7B80028 */ ldc1 $f24, 0x28($sp) -/* A9BC70 80024AD0 D7BA0030 */ ldc1 $f26, 0x30($sp) -/* A9BC74 80024AD4 D7BC0038 */ ldc1 $f28, 0x38($sp) -/* A9BC78 80024AD8 8FB00040 */ lw $s0, 0x40($sp) -/* A9BC7C 80024ADC 8FB10044 */ lw $s1, 0x44($sp) -/* A9BC80 80024AE0 8FB20048 */ lw $s2, 0x48($sp) -/* A9BC84 80024AE4 8FB3004C */ lw $s3, 0x4c($sp) -/* A9BC88 80024AE8 8FB40050 */ lw $s4, 0x50($sp) -/* A9BC8C 80024AEC 8FB50054 */ lw $s5, 0x54($sp) -/* A9BC90 80024AF0 8FB60058 */ lw $s6, 0x58($sp) -/* A9BC94 80024AF4 03E00008 */ jr $ra -/* A9BC98 80024AF8 27BD01B0 */ addiu $sp, $sp, 0x1b0 - diff --git a/asm/non_matchings/code/z_eff_spark/func_80025000.s b/asm/non_matchings/code/z_eff_spark/EffectSpark_Draw.s similarity index 99% rename from asm/non_matchings/code/z_eff_spark/func_80025000.s rename to asm/non_matchings/code/z_eff_spark/EffectSpark_Draw.s index 3bd1194e3f..1f819cafba 100644 --- a/asm/non_matchings/code/z_eff_spark/func_80025000.s +++ b/asm/non_matchings/code/z_eff_spark/EffectSpark_Draw.s @@ -13,7 +13,7 @@ glabel D_80135594 .balign 4 .text -glabel func_80025000 +glabel EffectSpark_Draw /* A9C1A0 80025000 27BDFE18 */ addiu $sp, $sp, -0x1e8 /* A9C1A4 80025004 AFBF0034 */ sw $ra, 0x34($sp) /* A9C1A8 80025008 AFB70030 */ sw $s7, 0x30($sp) @@ -26,7 +26,7 @@ glabel func_80025000 /* A9C1C4 80025024 AFB2001C */ sw $s2, 0x1c($sp) /* A9C1C8 80025028 AFB10018 */ sw $s1, 0x18($sp) /* A9C1CC 8002502C AFB00014 */ sw $s0, 0x14($sp) -/* A9C1D0 80025030 0C009AC0 */ jal func_80026B00 +/* A9C1D0 80025030 0C009AC0 */ jal Effect_GetGlobalCtx /* A9C1D4 80025034 AFA401E0 */ sw $a0, 0x1e0($sp) /* A9C1D8 80025038 3C068013 */ lui $a2, %hi(D_80135548) # $a2, 0x8013 /* A9C1DC 8002503C 00409825 */ move $s3, $v0 diff --git a/asm/non_matchings/code/z_eff_spark/func_80024B00.s b/asm/non_matchings/code/z_eff_spark/func_80024B00.s deleted file mode 100644 index 0aa6634577..0000000000 --- a/asm/non_matchings/code/z_eff_spark/func_80024B00.s +++ /dev/null @@ -1,295 +0,0 @@ -.rdata -glabel D_801354E0 - .asciz "spark():u_div,v_div 0では困る。\n" - # EUC-JP: 0では困る。| 0 is not good. - .balign 4 - -glabel D_80135504 - .asciz "table_sizeオーバー\n" - # EUC-JP: オーバー | over- - .balign 4 - -.late_rodata -glabel D_801355A8 - .float 0.008 - -glabel D_801355AC - .float 65534 - -glabel D_801355B0 - .float 15000 - -glabel D_801355B4 - .float 30000 - -.text -glabel func_80024B00 -/* A9BCA0 80024B00 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* A9BCA4 80024B04 AFB50058 */ sw $s5, 0x58($sp) -/* A9BCA8 80024B08 AFB10048 */ sw $s1, 0x48($sp) -/* A9BCAC 80024B0C 00808825 */ move $s1, $a0 -/* A9BCB0 80024B10 AFBF005C */ sw $ra, 0x5c($sp) -/* A9BCB4 80024B14 AFB40054 */ sw $s4, 0x54($sp) -/* A9BCB8 80024B18 AFB30050 */ sw $s3, 0x50($sp) -/* A9BCBC 80024B1C AFB2004C */ sw $s2, 0x4c($sp) -/* A9BCC0 80024B20 AFB00044 */ sw $s0, 0x44($sp) -/* A9BCC4 80024B24 F7BE0038 */ sdc1 $f30, 0x38($sp) -/* A9BCC8 80024B28 F7BC0030 */ sdc1 $f28, 0x30($sp) -/* A9BCCC 80024B2C F7BA0028 */ sdc1 $f26, 0x28($sp) -/* A9BCD0 80024B30 F7B80020 */ sdc1 $f24, 0x20($sp) -/* A9BCD4 80024B34 F7B60018 */ sdc1 $f22, 0x18($sp) -/* A9BCD8 80024B38 F7B40010 */ sdc1 $f20, 0x10($sp) -/* A9BCDC 80024B3C 108000E4 */ beqz $a0, .L80024ED0 -/* A9BCE0 80024B40 0080A825 */ move $s5, $a0 -/* A9BCE4 80024B44 50A000E3 */ beql $a1, $zero, .L80024ED4 -/* A9BCE8 80024B48 8FBF005C */ lw $ra, 0x5c($sp) -/* A9BCEC 80024B4C 8CAE0494 */ lw $t6, 0x494($a1) -/* A9BCF0 80024B50 3C048013 */ lui $a0, %hi(D_801354E0) # $a0, 0x8013 -/* A9BCF4 80024B54 11C00004 */ beqz $t6, .L80024B68 -/* A9BCF8 80024B58 00000000 */ nop -/* A9BCFC 80024B5C 8CAF0498 */ lw $t7, 0x498($a1) -/* A9BD00 80024B60 55E00006 */ bnezl $t7, .L80024B7C -/* A9BD04 80024B64 88B90000 */ lwl $t9, ($a1) -.L80024B68: -/* A9BD08 80024B68 0C00084C */ jal osSyncPrintf -/* A9BD0C 80024B6C 248454E0 */ addiu $a0, %lo(D_801354E0) # addiu $a0, $a0, 0x54e0 -/* A9BD10 80024B70 100000D8 */ b .L80024ED4 -/* A9BD14 80024B74 8FBF005C */ lw $ra, 0x5c($sp) -/* A9BD18 80024B78 88B90000 */ lwl $t9, ($a1) -.L80024B7C: -/* A9BD1C 80024B7C 98B90003 */ lwr $t9, 3($a1) -/* A9BD20 80024B80 3C048013 */ lui $a0, %hi(D_80135504) # $a0, 0x8013 -/* A9BD24 80024B84 AA390000 */ swl $t9, ($s1) -/* A9BD28 80024B88 BA390003 */ swr $t9, 3($s1) -/* A9BD2C 80024B8C 94B90004 */ lhu $t9, 4($a1) -/* A9BD30 80024B90 A6390004 */ sh $t9, 4($s1) -/* A9BD34 80024B94 C4A4048C */ lwc1 $f4, 0x48c($a1) -/* A9BD38 80024B98 E624048C */ swc1 $f4, 0x48c($s1) -/* A9BD3C 80024B9C C4A60490 */ lwc1 $f6, 0x490($a1) -/* A9BD40 80024BA0 E6260490 */ swc1 $f6, 0x490($s1) -/* A9BD44 80024BA4 8CA80494 */ lw $t0, 0x494($a1) -/* A9BD48 80024BA8 AE280494 */ sw $t0, 0x494($s1) -/* A9BD4C 80024BAC 8CA90498 */ lw $t1, 0x498($a1) -/* A9BD50 80024BB0 AE290498 */ sw $t1, 0x498($s1) -/* A9BD54 80024BB4 90AA049C */ lbu $t2, 0x49c($a1) -/* A9BD58 80024BB8 A22A049C */ sb $t2, 0x49c($s1) -/* A9BD5C 80024BBC 90AB049D */ lbu $t3, 0x49d($a1) -/* A9BD60 80024BC0 A22B049D */ sb $t3, 0x49d($s1) -/* A9BD64 80024BC4 90AC049E */ lbu $t4, 0x49e($a1) -/* A9BD68 80024BC8 A22C049E */ sb $t4, 0x49e($s1) -/* A9BD6C 80024BCC 90AD049F */ lbu $t5, 0x49f($a1) -/* A9BD70 80024BD0 A22D049F */ sb $t5, 0x49f($s1) -/* A9BD74 80024BD4 90AE04A0 */ lbu $t6, 0x4a0($a1) -/* A9BD78 80024BD8 A22E04A0 */ sb $t6, 0x4a0($s1) -/* A9BD7C 80024BDC 90AF04A1 */ lbu $t7, 0x4a1($a1) -/* A9BD80 80024BE0 A22F04A1 */ sb $t7, 0x4a1($s1) -/* A9BD84 80024BE4 90B804A2 */ lbu $t8, 0x4a2($a1) -/* A9BD88 80024BE8 A23804A2 */ sb $t8, 0x4a2($s1) -/* A9BD8C 80024BEC 90B904A3 */ lbu $t9, 0x4a3($a1) -/* A9BD90 80024BF0 A23904A3 */ sb $t9, 0x4a3($s1) -/* A9BD94 80024BF4 90A804A4 */ lbu $t0, 0x4a4($a1) -/* A9BD98 80024BF8 A22804A4 */ sb $t0, 0x4a4($s1) -/* A9BD9C 80024BFC 90A904A5 */ lbu $t1, 0x4a5($a1) -/* A9BDA0 80024C00 A22904A5 */ sb $t1, 0x4a5($s1) -/* A9BDA4 80024C04 90AA04A6 */ lbu $t2, 0x4a6($a1) -/* A9BDA8 80024C08 A22A04A6 */ sb $t2, 0x4a6($s1) -/* A9BDAC 80024C0C 90AB04A7 */ lbu $t3, 0x4a7($a1) -/* A9BDB0 80024C10 A22B04A7 */ sb $t3, 0x4a7($s1) -/* A9BDB4 80024C14 90AC04A8 */ lbu $t4, 0x4a8($a1) -/* A9BDB8 80024C18 A22C04A8 */ sb $t4, 0x4a8($s1) -/* A9BDBC 80024C1C 90AD04A9 */ lbu $t5, 0x4a9($a1) -/* A9BDC0 80024C20 A22D04A9 */ sb $t5, 0x4a9($s1) -/* A9BDC4 80024C24 90AE04AA */ lbu $t6, 0x4aa($a1) -/* A9BDC8 80024C28 A22E04AA */ sb $t6, 0x4aa($s1) -/* A9BDCC 80024C2C 90AF04AB */ lbu $t7, 0x4ab($a1) -/* A9BDD0 80024C30 A22F04AB */ sb $t7, 0x4ab($s1) -/* A9BDD4 80024C34 90B804AC */ lbu $t8, 0x4ac($a1) -/* A9BDD8 80024C38 A23804AC */ sb $t8, 0x4ac($s1) -/* A9BDDC 80024C3C 90B904AD */ lbu $t9, 0x4ad($a1) -/* A9BDE0 80024C40 A23904AD */ sb $t9, 0x4ad($s1) -/* A9BDE4 80024C44 90A804AE */ lbu $t0, 0x4ae($a1) -/* A9BDE8 80024C48 A22804AE */ sb $t0, 0x4ae($s1) -/* A9BDEC 80024C4C 90A904AF */ lbu $t1, 0x4af($a1) -/* A9BDF0 80024C50 A22904AF */ sb $t1, 0x4af($s1) -/* A9BDF4 80024C54 90AA04B0 */ lbu $t2, 0x4b0($a1) -/* A9BDF8 80024C58 A22A04B0 */ sb $t2, 0x4b0($s1) -/* A9BDFC 80024C5C 90AB04B1 */ lbu $t3, 0x4b1($a1) -/* A9BE00 80024C60 A22B04B1 */ sb $t3, 0x4b1($s1) -/* A9BE04 80024C64 90AC04B2 */ lbu $t4, 0x4b2($a1) -/* A9BE08 80024C68 A22C04B2 */ sb $t4, 0x4b2($s1) -/* A9BE0C 80024C6C 90AD04B3 */ lbu $t5, 0x4b3($a1) -/* A9BE10 80024C70 A22D04B3 */ sb $t5, 0x4b3($s1) -/* A9BE14 80024C74 90AE04B4 */ lbu $t6, 0x4b4($a1) -/* A9BE18 80024C78 8E2D0494 */ lw $t5, 0x494($s1) -/* A9BE1C 80024C7C A22E04B4 */ sb $t6, 0x4b4($s1) -/* A9BE20 80024C80 90AF04B5 */ lbu $t7, 0x4b5($a1) -/* A9BE24 80024C84 8E2E0498 */ lw $t6, 0x498($s1) -/* A9BE28 80024C88 A22F04B5 */ sb $t7, 0x4b5($s1) -/* A9BE2C 80024C8C 90B804B6 */ lbu $t8, 0x4b6($a1) -/* A9BE30 80024C90 01AE0019 */ multu $t5, $t6 -/* A9BE34 80024C94 A23804B6 */ sb $t8, 0x4b6($s1) -/* A9BE38 80024C98 90B904B7 */ lbu $t9, 0x4b7($a1) -/* A9BE3C 80024C9C A23904B7 */ sb $t9, 0x4b7($s1) -/* A9BE40 80024CA0 90A804B8 */ lbu $t0, 0x4b8($a1) -/* A9BE44 80024CA4 A22804B8 */ sb $t0, 0x4b8($s1) -/* A9BE48 80024CA8 90A904B9 */ lbu $t1, 0x4b9($a1) -/* A9BE4C 80024CAC 00001012 */ mflo $v0 -/* A9BE50 80024CB0 24420002 */ addiu $v0, $v0, 2 -/* A9BE54 80024CB4 A22904B9 */ sb $t1, 0x4b9($s1) -/* A9BE58 80024CB8 90AA04BA */ lbu $t2, 0x4ba($a1) -/* A9BE5C 80024CBC 28410021 */ slti $at, $v0, 0x21 -/* A9BE60 80024CC0 A22A04BA */ sb $t2, 0x4ba($s1) -/* A9BE64 80024CC4 90AB04BB */ lbu $t3, 0x4bb($a1) -/* A9BE68 80024CC8 A22B04BB */ sb $t3, 0x4bb($s1) -/* A9BE6C 80024CCC 8CAC04C0 */ lw $t4, 0x4c0($a1) -/* A9BE70 80024CD0 AE220008 */ sw $v0, 8($s1) -/* A9BE74 80024CD4 14200005 */ bnez $at, .L80024CEC -/* A9BE78 80024CD8 AE2C04C0 */ sw $t4, 0x4c0($s1) -/* A9BE7C 80024CDC 0C00084C */ jal osSyncPrintf -/* A9BE80 80024CE0 24845504 */ addiu $a0, %lo(D_80135504) # addiu $a0, $a0, 0x5504 -/* A9BE84 80024CE4 1000007B */ b .L80024ED4 -/* A9BE88 80024CE8 8FBF005C */ lw $ra, 0x5c($sp) -.L80024CEC: -/* A9BE8C 80024CEC 8E2F0008 */ lw $t7, 8($s1) -/* A9BE90 80024CF0 00009825 */ move $s3, $zero -/* A9BE94 80024CF4 02209025 */ move $s2, $s1 -/* A9BE98 80024CF8 19E00074 */ blez $t7, .L80024ECC -/* A9BE9C 80024CFC 3C018013 */ lui $at, %hi(D_801355A8) -/* A9BEA0 80024D00 C43E55A8 */ lwc1 $f30, %lo(D_801355A8)($at) -/* A9BEA4 80024D04 3C018013 */ lui $at, %hi(D_801355AC) -/* A9BEA8 80024D08 C43A55AC */ lwc1 $f26, %lo(D_801355AC)($at) -/* A9BEAC 80024D0C 3C018013 */ lui $at, %hi(D_801355B0) -/* A9BEB0 80024D10 C43855B0 */ lwc1 $f24, %lo(D_801355B0)($at) -/* A9BEB4 80024D14 3C018013 */ lui $at, %hi(D_801355B4) -/* A9BEB8 80024D18 C43655B4 */ lwc1 $f22, %lo(D_801355B4)($at) -/* A9BEBC 80024D1C 3C013F00 */ li $at, 0x3F000000 # 0.000000 -/* A9BEC0 80024D20 4481A000 */ mtc1 $at, $f20 -/* A9BEC4 80024D24 4480E000 */ mtc1 $zero, $f28 -/* A9BEC8 80024D28 2630000C */ addiu $s0, $s1, 0xc -/* A9BECC 80024D2C 86380000 */ lh $t8, ($s1) -.L80024D30: -/* A9BED0 80024D30 0200A025 */ move $s4, $s0 -/* A9BED4 80024D34 44984000 */ mtc1 $t8, $f8 -/* A9BED8 80024D38 00000000 */ nop -/* A9BEDC 80024D3C 468042A0 */ cvt.s.w $f10, $f8 -/* A9BEE0 80024D40 E64A0018 */ swc1 $f10, 0x18($s2) -/* A9BEE4 80024D44 86390002 */ lh $t9, 2($s1) -/* A9BEE8 80024D48 44999000 */ mtc1 $t9, $f18 -/* A9BEEC 80024D4C 00000000 */ nop -/* A9BEF0 80024D50 46809120 */ cvt.s.w $f4, $f18 -/* A9BEF4 80024D54 E644001C */ swc1 $f4, 0x1c($s2) -/* A9BEF8 80024D58 86280004 */ lh $t0, 4($s1) -/* A9BEFC 80024D5C 44883000 */ mtc1 $t0, $f6 -/* A9BF00 80024D60 00000000 */ nop -/* A9BF04 80024D64 46803220 */ cvt.s.w $f8, $f6 -/* A9BF08 80024D68 0C03F66B */ jal Math_Rand_ZeroOne -/* A9BF0C 80024D6C E6480020 */ swc1 $f8, 0x20($s2) -/* A9BF10 80024D70 46140281 */ sub.s $f10, $f0, $f20 -/* A9BF14 80024D74 0C03F66B */ jal Math_Rand_ZeroOne -/* A9BF18 80024D78 E60A0000 */ swc1 $f10, ($s0) -/* A9BF1C 80024D7C 46140481 */ sub.s $f18, $f0, $f20 -/* A9BF20 80024D80 0C03F66B */ jal Math_Rand_ZeroOne -/* A9BF24 80024D84 E6120004 */ swc1 $f18, 4($s0) -/* A9BF28 80024D88 C60C0000 */ lwc1 $f12, ($s0) -/* A9BF2C 80024D8C C60E0004 */ lwc1 $f14, 4($s0) -/* A9BF30 80024D90 46140081 */ sub.s $f2, $f0, $f20 -/* A9BF34 80024D94 460C6102 */ mul.s $f4, $f12, $f12 -/* A9BF38 80024D98 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* A9BF3C 80024D9C 460E7182 */ mul.s $f6, $f14, $f14 -/* A9BF40 80024DA0 E6020008 */ swc1 $f2, 8($s0) -/* A9BF44 80024DA4 46021282 */ mul.s $f10, $f2, $f2 -/* A9BF48 80024DA8 46062200 */ add.s $f8, $f4, $f6 -/* A9BF4C 80024DAC 460A4000 */ add.s $f0, $f8, $f10 -/* A9BF50 80024DB0 46000404 */ sqrt.s $f16, $f0 -/* A9BF54 80024DB4 46008005 */ abs.s $f0, $f16 -/* A9BF58 80024DB8 461E003C */ c.lt.s $f0, $f30 -/* A9BF5C 80024DBC 00000000 */ nop -/* A9BF60 80024DC0 45030015 */ bc1tl .L80024E18 -/* A9BF64 80024DC4 E61C0008 */ swc1 $f28, 8($s0) -/* A9BF68 80024DC8 44819000 */ mtc1 $at, $f18 -/* A9BF6C 80024DCC C624048C */ lwc1 $f4, 0x48c($s1) -/* A9BF70 80024DD0 46109003 */ div.s $f0, $f18, $f16 -/* A9BF74 80024DD4 46002182 */ mul.s $f6, $f4, $f0 -/* A9BF78 80024DD8 00000000 */ nop -/* A9BF7C 80024DDC 46066202 */ mul.s $f8, $f12, $f6 -/* A9BF80 80024DE0 C6060008 */ lwc1 $f6, 8($s0) -/* A9BF84 80024DE4 E6080000 */ swc1 $f8, ($s0) -/* A9BF88 80024DE8 C62A048C */ lwc1 $f10, 0x48c($s1) -/* A9BF8C 80024DEC 46005482 */ mul.s $f18, $f10, $f0 -/* A9BF90 80024DF0 00000000 */ nop -/* A9BF94 80024DF4 46127102 */ mul.s $f4, $f14, $f18 -/* A9BF98 80024DF8 E6040004 */ swc1 $f4, 4($s0) -/* A9BF9C 80024DFC C628048C */ lwc1 $f8, 0x48c($s1) -/* A9BFA0 80024E00 46004282 */ mul.s $f10, $f8, $f0 -/* A9BFA4 80024E04 00000000 */ nop -/* A9BFA8 80024E08 460A3482 */ mul.s $f18, $f6, $f10 -/* A9BFAC 80024E0C 10000005 */ b .L80024E24 -/* A9BFB0 80024E10 E6120008 */ swc1 $f18, 8($s0) -/* A9BFB4 80024E14 E61C0008 */ swc1 $f28, 8($s0) -.L80024E18: -/* A9BFB8 80024E18 E61C0000 */ swc1 $f28, ($s0) -/* A9BFBC 80024E1C C624048C */ lwc1 $f4, 0x48c($s1) -/* A9BFC0 80024E20 E6040004 */ swc1 $f4, 4($s0) -.L80024E24: -/* A9BFC4 80024E24 0C03F66B */ jal Math_Rand_ZeroOne -/* A9BFC8 80024E28 00000000 */ nop -/* A9BFCC 80024E2C 46180202 */ mul.s $f8, $f0, $f24 -/* A9BFD0 80024E30 4608B181 */ sub.s $f6, $f22, $f8 -/* A9BFD4 80024E34 4600328D */ trunc.w.s $f10, $f6 -/* A9BFD8 80024E38 440A5000 */ mfc1 $t2, $f10 -/* A9BFDC 80024E3C 0C03F66B */ jal Math_Rand_ZeroOne -/* A9BFE0 80024E40 A60A0018 */ sh $t2, 0x18($s0) -/* A9BFE4 80024E44 46180482 */ mul.s $f18, $f0, $f24 -/* A9BFE8 80024E48 4612B101 */ sub.s $f4, $f22, $f18 -/* A9BFEC 80024E4C 4600220D */ trunc.w.s $f8, $f4 -/* A9BFF0 80024E50 440C4000 */ mfc1 $t4, $f8 -/* A9BFF4 80024E54 0C03F66B */ jal Math_Rand_ZeroOne -/* A9BFF8 80024E58 A60C001A */ sh $t4, 0x1a($s0) -/* A9BFFC 80024E5C 46180182 */ mul.s $f6, $f0, $f24 -/* A9C000 80024E60 4606B281 */ sub.s $f10, $f22, $f6 -/* A9C004 80024E64 4600548D */ trunc.w.s $f18, $f10 -/* A9C008 80024E68 440E9000 */ mfc1 $t6, $f18 -/* A9C00C 80024E6C 0C03F66B */ jal Math_Rand_ZeroOne -/* A9C010 80024E70 A60E001C */ sh $t6, 0x1c($s0) -/* A9C014 80024E74 461A0102 */ mul.s $f4, $f0, $f26 -/* A9C018 80024E78 4600220D */ trunc.w.s $f8, $f4 -/* A9C01C 80024E7C 44184000 */ mfc1 $t8, $f8 -/* A9C020 80024E80 0C03F66B */ jal Math_Rand_ZeroOne -/* A9C024 80024E84 A618001E */ sh $t8, 0x1e($s0) -/* A9C028 80024E88 461A0182 */ mul.s $f6, $f0, $f26 -/* A9C02C 80024E8C 4600328D */ trunc.w.s $f10, $f6 -/* A9C030 80024E90 44085000 */ mfc1 $t0, $f10 -/* A9C034 80024E94 0C03F66B */ jal Math_Rand_ZeroOne -/* A9C038 80024E98 A6080020 */ sh $t0, 0x20($s0) -/* A9C03C 80024E9C 461A0482 */ mul.s $f18, $f0, $f26 -/* A9C040 80024EA0 26730001 */ addiu $s3, $s3, 1 -/* A9C044 80024EA4 26520024 */ addiu $s2, $s2, 0x24 -/* A9C048 80024EA8 26100024 */ addiu $s0, $s0, 0x24 -/* A9C04C 80024EAC 4600910D */ trunc.w.s $f4, $f18 -/* A9C050 80024EB0 440A2000 */ mfc1 $t2, $f4 -/* A9C054 80024EB4 00000000 */ nop -/* A9C058 80024EB8 A68A0022 */ sh $t2, 0x22($s4) -/* A9C05C 80024EBC 8EAB0008 */ lw $t3, 8($s5) -/* A9C060 80024EC0 026B082A */ slt $at, $s3, $t3 -/* A9C064 80024EC4 5420FF9A */ bnezl $at, .L80024D30 -/* A9C068 80024EC8 86380000 */ lh $t8, ($s1) -.L80024ECC: -/* A9C06C 80024ECC AE2004BC */ sw $zero, 0x4bc($s1) -.L80024ED0: -/* A9C070 80024ED0 8FBF005C */ lw $ra, 0x5c($sp) -.L80024ED4: -/* A9C074 80024ED4 D7B40010 */ ldc1 $f20, 0x10($sp) -/* A9C078 80024ED8 D7B60018 */ ldc1 $f22, 0x18($sp) -/* A9C07C 80024EDC D7B80020 */ ldc1 $f24, 0x20($sp) -/* A9C080 80024EE0 D7BA0028 */ ldc1 $f26, 0x28($sp) -/* A9C084 80024EE4 D7BC0030 */ ldc1 $f28, 0x30($sp) -/* A9C088 80024EE8 D7BE0038 */ ldc1 $f30, 0x38($sp) -/* A9C08C 80024EEC 8FB00044 */ lw $s0, 0x44($sp) -/* A9C090 80024EF0 8FB10048 */ lw $s1, 0x48($sp) -/* A9C094 80024EF4 8FB2004C */ lw $s2, 0x4c($sp) -/* A9C098 80024EF8 8FB30050 */ lw $s3, 0x50($sp) -/* A9C09C 80024EFC 8FB40054 */ lw $s4, 0x54($sp) -/* A9C0A0 80024F00 8FB50058 */ lw $s5, 0x58($sp) -/* A9C0A4 80024F04 03E00008 */ jr $ra -/* A9C0A8 80024F08 27BD0060 */ addiu $sp, $sp, 0x60 - diff --git a/asm/non_matchings/code/z_eff_spark/func_80024F14.s b/asm/non_matchings/code/z_eff_spark/func_80024F14.s deleted file mode 100644 index 71f44d8958..0000000000 --- a/asm/non_matchings/code/z_eff_spark/func_80024F14.s +++ /dev/null @@ -1,71 +0,0 @@ -.rdata -glabel D_80135518 - .asciz "EffectSparkInfo_proc():Spark Pointer is NULL\n" - .balign 4 - -.text -glabel func_80024F14 -/* A9C0B4 80024F14 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A9C0B8 80024F18 AFBF0014 */ sw $ra, 0x14($sp) -/* A9C0BC 80024F1C 14800006 */ bnez $a0, .L80024F38 -/* A9C0C0 80024F20 00802825 */ move $a1, $a0 -/* A9C0C4 80024F24 3C048013 */ lui $a0, %hi(D_80135518) # $a0, 0x8013 -/* A9C0C8 80024F28 24845518 */ addiu $a0, %lo(D_80135518) # addiu $a0, $a0, 0x5518 -/* A9C0CC 80024F2C 0C00084C */ jal osSyncPrintf -/* A9C0D0 80024F30 AFA50018 */ sw $a1, 0x18($sp) -/* A9C0D4 80024F34 8FA50018 */ lw $a1, 0x18($sp) -.L80024F38: -/* A9C0D8 80024F38 8CAE0008 */ lw $t6, 8($a1) -/* A9C0DC 80024F3C 00001825 */ move $v1, $zero -/* A9C0E0 80024F40 00A01025 */ move $v0, $a1 -/* A9C0E4 80024F44 59C00023 */ blezl $t6, .L80024FD4 -/* A9C0E8 80024F48 8CAF04BC */ lw $t7, 0x4bc($a1) -/* A9C0EC 80024F4C C4440018 */ lwc1 $f4, 0x18($v0) -.L80024F50: -/* A9C0F0 80024F50 C446000C */ lwc1 $f6, 0xc($v0) -/* A9C0F4 80024F54 C4400010 */ lwc1 $f0, 0x10($v0) -/* A9C0F8 80024F58 C44A001C */ lwc1 $f10, 0x1c($v0) -/* A9C0FC 80024F5C 46062200 */ add.s $f8, $f4, $f6 -/* A9C100 80024F60 C4440014 */ lwc1 $f4, 0x14($v0) -/* A9C104 80024F64 C4520020 */ lwc1 $f18, 0x20($v0) -/* A9C108 80024F68 46005400 */ add.s $f16, $f10, $f0 -/* A9C10C 80024F6C E4480018 */ swc1 $f8, 0x18($v0) -/* A9C110 80024F70 844F002A */ lh $t7, 0x2a($v0) -/* A9C114 80024F74 46049180 */ add.s $f6, $f18, $f4 -/* A9C118 80024F78 E450001C */ swc1 $f16, 0x1c($v0) -/* A9C11C 80024F7C 84580024 */ lh $t8, 0x24($v0) -/* A9C120 80024F80 8448002C */ lh $t0, 0x2c($v0) -/* A9C124 80024F84 E4460020 */ swc1 $f6, 0x20($v0) -/* A9C128 80024F88 C4A80490 */ lwc1 $f8, 0x490($a1) -/* A9C12C 80024F8C 84490026 */ lh $t1, 0x26($v0) -/* A9C130 80024F90 844B002E */ lh $t3, 0x2e($v0) -/* A9C134 80024F94 46080280 */ add.s $f10, $f0, $f8 -/* A9C138 80024F98 844C0028 */ lh $t4, 0x28($v0) -/* A9C13C 80024F9C 01F8C821 */ addu $t9, $t7, $t8 -/* A9C140 80024FA0 01095021 */ addu $t2, $t0, $t1 -/* A9C144 80024FA4 016C6821 */ addu $t5, $t3, $t4 -/* A9C148 80024FA8 E44A0010 */ swc1 $f10, 0x10($v0) -/* A9C14C 80024FAC A459002A */ sh $t9, 0x2a($v0) -/* A9C150 80024FB0 A44A002C */ sh $t2, 0x2c($v0) -/* A9C154 80024FB4 A44D002E */ sh $t5, 0x2e($v0) -/* A9C158 80024FB8 8CAE0008 */ lw $t6, 8($a1) -/* A9C15C 80024FBC 24630001 */ addiu $v1, $v1, 1 -/* A9C160 80024FC0 24420024 */ addiu $v0, $v0, 0x24 -/* A9C164 80024FC4 006E082A */ slt $at, $v1, $t6 -/* A9C168 80024FC8 5420FFE1 */ bnezl $at, .L80024F50 -/* A9C16C 80024FCC C4440018 */ lwc1 $f4, 0x18($v0) -/* A9C170 80024FD0 8CAF04BC */ lw $t7, 0x4bc($a1) -.L80024FD4: -/* A9C174 80024FD4 8CB904C0 */ lw $t9, 0x4c0($a1) -/* A9C178 80024FD8 00001025 */ move $v0, $zero -/* A9C17C 80024FDC 25F80001 */ addiu $t8, $t7, 1 -/* A9C180 80024FE0 ACB804BC */ sw $t8, 0x4bc($a1) -/* A9C184 80024FE4 0338082A */ slt $at, $t9, $t8 -/* A9C188 80024FE8 10200003 */ beqz $at, .L80024FF8 -/* A9C18C 80024FEC 8FBF0014 */ lw $ra, 0x14($sp) -/* A9C190 80024FF0 10000001 */ b .L80024FF8 -/* A9C194 80024FF4 24020001 */ li $v0, 1 -.L80024FF8: -/* A9C198 80024FF8 03E00008 */ jr $ra -/* A9C19C 80024FFC 27BD0018 */ addiu $sp, $sp, 0x18 - diff --git a/asm/non_matchings/code/z_eff_ss_dead/func_80026230.s b/asm/non_matchings/code/z_eff_ss_dead/func_80026230.s deleted file mode 100644 index 410591f2fb..0000000000 --- a/asm/non_matchings/code/z_eff_ss_dead/func_80026230.s +++ /dev/null @@ -1,140 +0,0 @@ -.rdata -glabel D_801355C0 - .asciz "../z_eff_ss_dead.c" - .balign 4 - -glabel D_801355D4 - .asciz "../z_eff_ss_dead.c" - .balign 4 - -.late_rodata -glabel D_801356B0 - .float 3000 - -.text -glabel func_80026230 -/* A9D3D0 80026230 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* A9D3D4 80026234 AFB00018 */ sw $s0, 0x18($sp) -/* A9D3D8 80026238 00A08025 */ move $s0, $a1 -/* A9D3DC 8002623C AFBF001C */ sw $ra, 0x1c($sp) -/* A9D3E0 80026240 AFA40058 */ sw $a0, 0x58($sp) -/* A9D3E4 80026244 AFA60060 */ sw $a2, 0x60($sp) -/* A9D3E8 80026248 AFA70064 */ sw $a3, 0x64($sp) -/* A9D3EC 8002624C 8C850000 */ lw $a1, ($a0) -/* A9D3F0 80026250 3C068013 */ lui $a2, %hi(D_801355C0) # $a2, 0x8013 -/* A9D3F4 80026254 24C655C0 */ addiu $a2, %lo(D_801355C0) # addiu $a2, $a2, 0x55c0 -/* A9D3F8 80026258 27A40038 */ addiu $a0, $sp, 0x38 -/* A9D3FC 8002625C 24070071 */ li $a3, 113 -/* A9D400 80026260 0C031AB1 */ jal Graph_OpenDisps -/* A9D404 80026264 AFA50048 */ sw $a1, 0x48($sp) -/* A9D408 80026268 87B80066 */ lh $t8, 0x66($sp) -/* A9D40C 8002626C 34198000 */ li $t9, 32768 -/* A9D410 80026270 87A90062 */ lh $t1, 0x62($sp) -/* A9D414 80026274 0338001A */ div $zero, $t9, $t8 -/* A9D418 80026278 00004012 */ mflo $t0 -/* A9D41C 8002627C 8FAF0048 */ lw $t7, 0x48($sp) -/* A9D420 80026280 00000000 */ nop -/* A9D424 80026284 01090019 */ multu $t0, $t1 -/* A9D428 80026288 8DE502C0 */ lw $a1, 0x2c0($t7) -/* A9D42C 8002628C 17000002 */ bnez $t8, .L80026298 -/* A9D430 80026290 00000000 */ nop -/* A9D434 80026294 0007000D */ break 7 -.L80026298: -/* A9D438 80026298 2401FFFF */ li $at, -1 -/* A9D43C 8002629C 17010004 */ bne $t8, $at, .L800262B0 -/* A9D440 800262A0 3C018000 */ li $at, 0x80000000 # 0.000000 -/* A9D444 800262A4 17210002 */ bne $t9, $at, .L800262B0 -/* A9D448 800262A8 00000000 */ nop -/* A9D44C 800262AC 0006000D */ break 6 -.L800262B0: -/* A9D450 800262B0 00002012 */ mflo $a0 -/* A9D454 800262B4 00042400 */ sll $a0, $a0, 0x10 -/* A9D458 800262B8 00042403 */ sra $a0, $a0, 0x10 -/* A9D45C 800262BC 0C01DE0D */ jal Math_Coss -/* A9D460 800262C0 AFA50050 */ sw $a1, 0x50($sp) -/* A9D464 800262C4 44802000 */ mtc1 $zero, $f4 -/* A9D468 800262C8 8FA50050 */ lw $a1, 0x50($sp) -/* A9D46C 800262CC 3C0AE700 */ lui $t2, 0xe700 -/* A9D470 800262D0 4600203E */ c.le.s $f4, $f0 -/* A9D474 800262D4 00A01025 */ move $v0, $a1 -/* A9D478 800262D8 3C0DF800 */ lui $t5, 0xf800 -/* A9D47C 800262DC 3C018013 */ lui $at, %hi(D_801356B0) -/* A9D480 800262E0 45000003 */ bc1f .L800262F0 -/* A9D484 800262E4 24A50008 */ addiu $a1, $a1, 8 -/* A9D488 800262E8 10000002 */ b .L800262F4 -/* A9D48C 800262EC 46000086 */ mov.s $f2, $f0 -.L800262F0: -/* A9D490 800262F0 46000087 */ neg.s $f2, $f0 -.L800262F4: -/* A9D494 800262F4 AC4A0000 */ sw $t2, ($v0) -/* A9D498 800262F8 16000008 */ bnez $s0, .L8002631C -/* A9D49C 800262FC AC400004 */ sw $zero, 4($v0) -/* A9D4A0 80026300 00A01025 */ move $v0, $a1 -/* A9D4A4 80026304 3C0BF800 */ lui $t3, 0xf800 -/* A9D4A8 80026308 3C0CFF00 */ lui $t4, 0xff00 -/* A9D4AC 8002630C AC4C0004 */ sw $t4, 4($v0) -/* A9D4B0 80026310 AC4B0000 */ sw $t3, ($v0) -/* A9D4B4 80026314 1000000F */ b .L80026354 -/* A9D4B8 80026318 24A50008 */ addiu $a1, $a1, 8 -.L8002631C: -/* A9D4BC 8002631C 00A01025 */ move $v0, $a1 -/* A9D4C0 80026320 AC4D0000 */ sw $t5, ($v0) -/* A9D4C4 80026324 92080001 */ lbu $t0, 1($s0) -/* A9D4C8 80026328 920F0000 */ lbu $t7, ($s0) -/* A9D4CC 8002632C 920C0002 */ lbu $t4, 2($s0) -/* A9D4D0 80026330 92180003 */ lbu $t8, 3($s0) -/* A9D4D4 80026334 00084C00 */ sll $t1, $t0, 0x10 -/* A9D4D8 80026338 000FCE00 */ sll $t9, $t7, 0x18 -/* A9D4DC 8002633C 03295025 */ or $t2, $t9, $t1 -/* A9D4E0 80026340 000C6A00 */ sll $t5, $t4, 8 -/* A9D4E4 80026344 014D7025 */ or $t6, $t2, $t5 -/* A9D4E8 80026348 01D84025 */ or $t0, $t6, $t8 -/* A9D4EC 8002634C AC480004 */ sw $t0, 4($v0) -/* A9D4F0 80026350 24A50008 */ addiu $a1, $a1, 8 -.L80026354: -/* A9D4F4 80026354 00A01025 */ move $v0, $a1 -/* A9D4F8 80026358 3C19DB08 */ lui $t9, 0xdb08 -/* A9D4FC 8002635C AC590000 */ sw $t9, ($v0) -/* A9D500 80026360 C42656B0 */ lwc1 $f6, %lo(D_801356B0)($at) -/* A9D504 80026364 3C0F0001 */ lui $t7, (0x0001F400 >> 16) # lui $t7, 1 -/* A9D508 80026368 35EFF400 */ ori $t7, (0x0001F400 & 0xFFFF) # ori $t7, $t7, 0xf400 -/* A9D50C 8002636C 46061202 */ mul.s $f8, $f2, $f6 -/* A9D510 80026370 24A50008 */ addiu $a1, $a1, 8 -/* A9D514 80026374 3C068013 */ lui $a2, %hi(D_801355D4) # $a2, 0x8013 -/* A9D518 80026378 24C655D4 */ addiu $a2, %lo(D_801355D4) # addiu $a2, $a2, 0x55d4 -/* A9D51C 8002637C 27A40038 */ addiu $a0, $sp, 0x38 -/* A9D520 80026380 24070081 */ li $a3, 129 -/* A9D524 80026384 4600428D */ trunc.w.s $f10, $f8 -/* A9D528 80026388 440B5000 */ mfc1 $t3, $f10 -/* A9D52C 8002638C 00000000 */ nop -/* A9D530 80026390 000B6400 */ sll $t4, $t3, 0x10 -/* A9D534 80026394 000C5403 */ sra $t2, $t4, 0x10 -/* A9D538 80026398 254D05DC */ addiu $t5, $t2, 0x5dc -/* A9D53C 8002639C 01ED001A */ div $zero, $t7, $t5 -/* A9D540 800263A0 00001812 */ mflo $v1 -/* A9D544 800263A4 3063FFFF */ andi $v1, $v1, 0xffff -/* A9D548 800263A8 00037400 */ sll $t6, $v1, 0x10 -/* A9D54C 800263AC 01C3C025 */ or $t8, $t6, $v1 -/* A9D550 800263B0 AC580004 */ sw $t8, 4($v0) -/* A9D554 800263B4 8FA80048 */ lw $t0, 0x48($sp) -/* A9D558 800263B8 15A00002 */ bnez $t5, .L800263C4 -/* A9D55C 800263BC 00000000 */ nop -/* A9D560 800263C0 0007000D */ break 7 -.L800263C4: -/* A9D564 800263C4 2401FFFF */ li $at, -1 -/* A9D568 800263C8 15A10004 */ bne $t5, $at, .L800263DC -/* A9D56C 800263CC 3C018000 */ lui $at, 0x8000 -/* A9D570 800263D0 15E10002 */ bne $t7, $at, .L800263DC -/* A9D574 800263D4 00000000 */ nop -/* A9D578 800263D8 0006000D */ break 6 -.L800263DC: -/* A9D57C 800263DC AD0502C0 */ sw $a1, 0x2c0($t0) -/* A9D580 800263E0 8FB90058 */ lw $t9, 0x58($sp) -/* A9D584 800263E4 0C031AD5 */ jal Graph_CloseDisps -/* A9D588 800263E8 8F250000 */ lw $a1, ($t9) -/* A9D58C 800263EC 8FBF001C */ lw $ra, 0x1c($sp) -/* A9D590 800263F0 8FB00018 */ lw $s0, 0x18($sp) -/* A9D594 800263F4 27BD0058 */ addiu $sp, $sp, 0x58 -/* A9D598 800263F8 03E00008 */ jr $ra -/* A9D59C 800263FC 00000000 */ nop - diff --git a/asm/non_matchings/code/z_eff_ss_dead/func_80026400.s b/asm/non_matchings/code/z_eff_ss_dead/func_80026400.s deleted file mode 100644 index f1e7733a61..0000000000 --- a/asm/non_matchings/code/z_eff_ss_dead/func_80026400.s +++ /dev/null @@ -1,152 +0,0 @@ -.rdata -glabel D_801355E8 - .asciz "../z_eff_ss_dead.c" - .balign 4 - -glabel D_801355FC - .asciz "../z_eff_ss_dead.c" - .balign 4 - -.text -glabel func_80026400 -/* A9D5A0 80026400 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A9D5A4 80026404 AFA7005C */ sw $a3, 0x5c($sp) -/* A9D5A8 80026408 87AE005E */ lh $t6, 0x5e($sp) -/* A9D5AC 8002640C AFBF0014 */ sw $ra, 0x14($sp) -/* A9D5B0 80026410 AFA40050 */ sw $a0, 0x50($sp) -/* A9D5B4 80026414 AFA50054 */ sw $a1, 0x54($sp) -/* A9D5B8 80026418 11C00077 */ beqz $t6, .L800265F8 -/* A9D5BC 8002641C AFA60058 */ sw $a2, 0x58($sp) -/* A9D5C0 80026420 8C850000 */ lw $a1, ($a0) -/* A9D5C4 80026424 3C068013 */ lui $a2, %hi(D_801355E8) # $a2, 0x8013 -/* A9D5C8 80026428 24C655E8 */ addiu $a2, %lo(D_801355E8) # addiu $a2, $a2, 0x55e8 -/* A9D5CC 8002642C 27A40034 */ addiu $a0, $sp, 0x34 -/* A9D5D0 80026430 2407008D */ li $a3, 141 -/* A9D5D4 80026434 0C031AB1 */ jal Graph_OpenDisps -/* A9D5D8 80026438 AFA50044 */ sw $a1, 0x44($sp) -/* A9D5DC 8002643C 87B8005E */ lh $t8, 0x5e($sp) -/* A9D5E0 80026440 24194000 */ li $t9, 16384 -/* A9D5E4 80026444 87A9005A */ lh $t1, 0x5a($sp) -/* A9D5E8 80026448 0338001A */ div $zero, $t9, $t8 -/* A9D5EC 8002644C 00004012 */ mflo $t0 -/* A9D5F0 80026450 8FA50054 */ lw $a1, 0x54($sp) -/* A9D5F4 80026454 17000002 */ bnez $t8, .L80026460 -/* A9D5F8 80026458 00000000 */ nop -/* A9D5FC 8002645C 0007000D */ break 7 -.L80026460: -/* A9D600 80026460 2401FFFF */ li $at, -1 -/* A9D604 80026464 17010004 */ bne $t8, $at, .L80026478 -/* A9D608 80026468 3C018000 */ lui $at, 0x8000 -/* A9D60C 8002646C 17210002 */ bne $t9, $at, .L80026478 -/* A9D610 80026470 00000000 */ nop -/* A9D614 80026474 0006000D */ break 6 -.L80026478: -/* A9D618 80026478 01090019 */ multu $t0, $t1 -/* A9D61C 8002647C 00002012 */ mflo $a0 -/* A9D620 80026480 00042400 */ sll $a0, $a0, 0x10 -/* A9D624 80026484 0C01DE0D */ jal Math_Coss -/* A9D628 80026488 00042403 */ sra $a0, $a0, 0x10 -/* A9D62C 8002648C 8FA60044 */ lw $a2, 0x44($sp) -/* A9D630 80026490 8FA50054 */ lw $a1, 0x54($sp) -/* A9D634 80026494 3C0AE700 */ lui $t2, 0xe700 -/* A9D638 80026498 8CC302C0 */ lw $v1, 0x2c0($a2) -/* A9D63C 8002649C 3C0BF800 */ li $t3, 0xF8000000 # 0.000000 -/* A9D640 800264A0 44801000 */ mtc1 $zero, $f2 -/* A9D644 800264A4 00601025 */ move $v0, $v1 -/* A9D648 800264A8 AC4A0000 */ sw $t2, ($v0) -/* A9D64C 800264AC AC400004 */ sw $zero, 4($v0) -/* A9D650 800264B0 24630008 */ addiu $v1, $v1, 8 -/* A9D654 800264B4 00601025 */ move $v0, $v1 -/* A9D658 800264B8 AC4B0000 */ sw $t3, ($v0) -/* A9D65C 800264BC 90AD0000 */ lbu $t5, ($a1) -/* A9D660 800264C0 90B90001 */ lbu $t9, 1($a1) -/* A9D664 800264C4 90AA0002 */ lbu $t2, 2($a1) -/* A9D668 800264C8 000D7600 */ sll $t6, $t5, 0x18 -/* A9D66C 800264CC 90AD0003 */ lbu $t5, 3($a1) -/* A9D670 800264D0 0019C400 */ sll $t8, $t9, 0x10 -/* A9D674 800264D4 01D84025 */ or $t0, $t6, $t8 -/* A9D678 800264D8 000A5A00 */ sll $t3, $t2, 8 -/* A9D67C 800264DC 4600103E */ c.le.s $f2, $f0 -/* A9D680 800264E0 010B6025 */ or $t4, $t0, $t3 -/* A9D684 800264E4 01A07825 */ move $t7, $t5 -/* A9D688 800264E8 018FC825 */ or $t9, $t4, $t7 -/* A9D68C 800264EC AC590004 */ sw $t9, 4($v0) -/* A9D690 800264F0 24630008 */ addiu $v1, $v1, 8 -/* A9D694 800264F4 00601025 */ move $v0, $v1 -/* A9D698 800264F8 3C0EDB08 */ lui $t6, 0xdb08 -/* A9D69C 800264FC AC4E0000 */ sw $t6, ($v0) -/* A9D6A0 80026500 45000003 */ bc1f .L80026510 -/* A9D6A4 80026504 24630008 */ addiu $v1, $v1, 8 -/* A9D6A8 80026508 10000002 */ b .L80026514 -/* A9D6AC 8002650C 46000306 */ mov.s $f12, $f0 -.L80026510: -/* A9D6B0 80026510 46000307 */ neg.s $f12, $f0 -.L80026514: -/* A9D6B4 80026514 4600103E */ c.le.s $f2, $f0 -/* A9D6B8 80026518 3C01452F */ li $at, 0x452F0000 # 0.000000 -/* A9D6BC 8002651C 45020004 */ bc1fl .L80026530 -/* A9D6C0 80026520 46000087 */ neg.s $f2, $f0 -/* A9D6C4 80026524 10000002 */ b .L80026530 -/* A9D6C8 80026528 46000086 */ mov.s $f2, $f0 -/* A9D6CC 8002652C 46000087 */ neg.s $f2, $f0 -.L80026530: -/* A9D6D0 80026530 44810000 */ mtc1 $at, $f0 -/* A9D6D4 80026534 3C040001 */ lui $a0, (0x0001F400 >> 16) # lui $a0, 1 -/* A9D6D8 80026538 3484F400 */ ori $a0, (0x0001F400 & 0xFFFF) # ori $a0, $a0, 0xf400 -/* A9D6DC 8002653C 46001102 */ mul.s $f4, $f2, $f0 -/* A9D6E0 80026540 24070099 */ li $a3, 153 -/* A9D6E4 80026544 460C0202 */ mul.s $f8, $f0, $f12 -/* A9D6E8 80026548 4600218D */ trunc.w.s $f6, $f4 -/* A9D6EC 8002654C 4600428D */ trunc.w.s $f10, $f8 -/* A9D6F0 80026550 44093000 */ mfc1 $t1, $f6 -/* A9D6F4 80026554 00000000 */ nop -/* A9D6F8 80026558 00095400 */ sll $t2, $t1, 0x10 -/* A9D6FC 8002655C 000A4403 */ sra $t0, $t2, 0x10 -/* A9D700 80026560 250B06A4 */ addiu $t3, $t0, 0x6a4 -/* A9D704 80026564 008B001A */ div $zero, $a0, $t3 -/* A9D708 80026568 44195000 */ mfc1 $t9, $f10 -/* A9D70C 8002656C 00006812 */ mflo $t5 -/* A9D710 80026570 31ACFFFF */ andi $t4, $t5, 0xffff -/* A9D714 80026574 00197400 */ sll $t6, $t9, 0x10 -/* A9D718 80026578 000EC403 */ sra $t8, $t6, 0x10 -/* A9D71C 8002657C 270906A4 */ addiu $t1, $t8, 0x6a4 -/* A9D720 80026580 0089001A */ div $zero, $a0, $t1 -/* A9D724 80026584 15600002 */ bnez $t3, .L80026590 -/* A9D728 80026588 00000000 */ nop -/* A9D72C 8002658C 0007000D */ break 7 -.L80026590: -/* A9D730 80026590 2401FFFF */ li $at, -1 -/* A9D734 80026594 15610004 */ bne $t3, $at, .L800265A8 -/* A9D738 80026598 3C018000 */ lui $at, 0x8000 -/* A9D73C 8002659C 14810002 */ bne $a0, $at, .L800265A8 -/* A9D740 800265A0 00000000 */ nop -/* A9D744 800265A4 0006000D */ break 6 -.L800265A8: -/* A9D748 800265A8 00004012 */ mflo $t0 -/* A9D74C 800265AC 00085C00 */ sll $t3, $t0, 0x10 -/* A9D750 800265B0 018B6825 */ or $t5, $t4, $t3 -/* A9D754 800265B4 AC4D0004 */ sw $t5, 4($v0) -/* A9D758 800265B8 ACC302C0 */ sw $v1, 0x2c0($a2) -/* A9D75C 800265BC 8FAF0050 */ lw $t7, 0x50($sp) -/* A9D760 800265C0 15200002 */ bnez $t1, .L800265CC -/* A9D764 800265C4 00000000 */ nop -/* A9D768 800265C8 0007000D */ break 7 -.L800265CC: -/* A9D76C 800265CC 2401FFFF */ li $at, -1 -/* A9D770 800265D0 15210004 */ bne $t1, $at, .L800265E4 -/* A9D774 800265D4 3C018000 */ lui $at, 0x8000 -/* A9D778 800265D8 14810002 */ bne $a0, $at, .L800265E4 -/* A9D77C 800265DC 00000000 */ nop -/* A9D780 800265E0 0006000D */ break 6 -.L800265E4: -/* A9D784 800265E4 3C068013 */ lui $a2, %hi(D_801355FC) # $a2, 0x8013 -/* A9D788 800265E8 24C655FC */ addiu $a2, %lo(D_801355FC) # addiu $a2, $a2, 0x55fc -/* A9D78C 800265EC 27A40034 */ addiu $a0, $sp, 0x34 -/* A9D790 800265F0 0C031AD5 */ jal Graph_CloseDisps -/* A9D794 800265F4 8DE50000 */ lw $a1, ($t7) -.L800265F8: -/* A9D798 800265F8 8FBF0014 */ lw $ra, 0x14($sp) -/* A9D79C 800265FC 27BD0050 */ addiu $sp, $sp, 0x50 -/* A9D7A0 80026600 03E00008 */ jr $ra -/* A9D7A4 80026604 00000000 */ nop - diff --git a/asm/non_matchings/code/z_eff_ss_dead/func_80026608.s b/asm/non_matchings/code/z_eff_ss_dead/func_80026608.s deleted file mode 100644 index 7ebe64c007..0000000000 --- a/asm/non_matchings/code/z_eff_ss_dead/func_80026608.s +++ /dev/null @@ -1,46 +0,0 @@ -.rdata -glabel D_80135610 - .asciz "../z_eff_ss_dead.c" - .balign 4 - -glabel D_80135624 - .asciz "../z_eff_ss_dead.c" - .balign 4 - -.text -glabel func_80026608 -/* A9D7A8 80026608 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A9D7AC 8002660C AFBF0014 */ sw $ra, 0x14($sp) -/* A9D7B0 80026610 AFA40038 */ sw $a0, 0x38($sp) -/* A9D7B4 80026614 8C850000 */ lw $a1, ($a0) -/* A9D7B8 80026618 3C068013 */ lui $a2, %hi(D_80135610) # $a2, 0x8013 -/* A9D7BC 8002661C 24C65610 */ addiu $a2, %lo(D_80135610) # addiu $a2, $a2, 0x5610 -/* A9D7C0 80026620 27A40020 */ addiu $a0, $sp, 0x20 -/* A9D7C4 80026624 2407009F */ li $a3, 159 -/* A9D7C8 80026628 0C031AB1 */ jal Graph_OpenDisps -/* A9D7CC 8002662C AFA50030 */ sw $a1, 0x30($sp) -/* A9D7D0 80026630 8FA80030 */ lw $t0, 0x30($sp) -/* A9D7D4 80026634 3C18E700 */ lui $t8, 0xe700 -/* A9D7D8 80026638 8D0302C0 */ lw $v1, 0x2c0($t0) -/* A9D7DC 8002663C 246F0008 */ addiu $t7, $v1, 8 -/* A9D7E0 80026640 AD0F02C0 */ sw $t7, 0x2c0($t0) -/* A9D7E4 80026644 AC600004 */ sw $zero, 4($v1) -/* A9D7E8 80026648 AC780000 */ sw $t8, ($v1) -/* A9D7EC 8002664C 8D0502C0 */ lw $a1, 0x2c0($t0) -/* A9D7F0 80026650 8FA40038 */ lw $a0, 0x38($sp) -/* A9D7F4 80026654 0C02F228 */ jal func_800BC8A0 -/* A9D7F8 80026658 AFA80030 */ sw $t0, 0x30($sp) -/* A9D7FC 8002665C 8FA80030 */ lw $t0, 0x30($sp) -/* A9D800 80026660 3C068013 */ lui $a2, %hi(D_80135624) # $a2, 0x8013 -/* A9D804 80026664 24C65624 */ addiu $a2, %lo(D_80135624) # addiu $a2, $a2, 0x5624 -/* A9D808 80026668 AD0202C0 */ sw $v0, 0x2c0($t0) -/* A9D80C 8002666C 8FB90038 */ lw $t9, 0x38($sp) -/* A9D810 80026670 27A40020 */ addiu $a0, $sp, 0x20 -/* A9D814 80026674 240700A4 */ li $a3, 164 -/* A9D818 80026678 0C031AD5 */ jal Graph_CloseDisps -/* A9D81C 8002667C 8F250000 */ lw $a1, ($t9) -/* A9D820 80026680 8FBF0014 */ lw $ra, 0x14($sp) -/* A9D824 80026684 27BD0038 */ addiu $sp, $sp, 0x38 -/* A9D828 80026688 03E00008 */ jr $ra -/* A9D82C 8002668C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_eff_ss_dead/func_80026690.s b/asm/non_matchings/code/z_eff_ss_dead/func_80026690.s deleted file mode 100644 index 2049610f47..0000000000 --- a/asm/non_matchings/code/z_eff_ss_dead/func_80026690.s +++ /dev/null @@ -1,140 +0,0 @@ -.rdata -glabel D_80135638 - .asciz "../z_eff_ss_dead.c" - .balign 4 - -glabel D_8013564C - .asciz "../z_eff_ss_dead.c" - .balign 4 - -.late_rodata -glabel D_801356B4 - .float 3000 - -.text -glabel func_80026690 -/* A9D830 80026690 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* A9D834 80026694 AFB00018 */ sw $s0, 0x18($sp) -/* A9D838 80026698 00A08025 */ move $s0, $a1 -/* A9D83C 8002669C AFBF001C */ sw $ra, 0x1c($sp) -/* A9D840 800266A0 AFA40058 */ sw $a0, 0x58($sp) -/* A9D844 800266A4 AFA60060 */ sw $a2, 0x60($sp) -/* A9D848 800266A8 AFA70064 */ sw $a3, 0x64($sp) -/* A9D84C 800266AC 8C850000 */ lw $a1, ($a0) -/* A9D850 800266B0 3C068013 */ lui $a2, %hi(D_80135638) # $a2, 0x8013 -/* A9D854 800266B4 24C65638 */ addiu $a2, %lo(D_80135638) # addiu $a2, $a2, 0x5638 -/* A9D858 800266B8 27A40038 */ addiu $a0, $sp, 0x38 -/* A9D85C 800266BC 240700B2 */ li $a3, 178 -/* A9D860 800266C0 0C031AB1 */ jal Graph_OpenDisps -/* A9D864 800266C4 AFA50048 */ sw $a1, 0x48($sp) -/* A9D868 800266C8 87B80066 */ lh $t8, 0x66($sp) -/* A9D86C 800266CC 34198000 */ li $t9, 32768 -/* A9D870 800266D0 87A90062 */ lh $t1, 0x62($sp) -/* A9D874 800266D4 0338001A */ div $zero, $t9, $t8 -/* A9D878 800266D8 00004012 */ mflo $t0 -/* A9D87C 800266DC 8FAF0048 */ lw $t7, 0x48($sp) -/* A9D880 800266E0 00000000 */ nop -/* A9D884 800266E4 01090019 */ multu $t0, $t1 -/* A9D888 800266E8 8DE502D0 */ lw $a1, 0x2d0($t7) -/* A9D88C 800266EC 17000002 */ bnez $t8, .L800266F8 -/* A9D890 800266F0 00000000 */ nop -/* A9D894 800266F4 0007000D */ break 7 -.L800266F8: -/* A9D898 800266F8 2401FFFF */ li $at, -1 -/* A9D89C 800266FC 17010004 */ bne $t8, $at, .L80026710 -/* A9D8A0 80026700 3C018000 */ li $at, 0x80000000 # 0.000000 -/* A9D8A4 80026704 17210002 */ bne $t9, $at, .L80026710 -/* A9D8A8 80026708 00000000 */ nop -/* A9D8AC 8002670C 0006000D */ break 6 -.L80026710: -/* A9D8B0 80026710 00002012 */ mflo $a0 -/* A9D8B4 80026714 00042400 */ sll $a0, $a0, 0x10 -/* A9D8B8 80026718 00042403 */ sra $a0, $a0, 0x10 -/* A9D8BC 8002671C 0C01DE0D */ jal Math_Coss -/* A9D8C0 80026720 AFA50050 */ sw $a1, 0x50($sp) -/* A9D8C4 80026724 44802000 */ mtc1 $zero, $f4 -/* A9D8C8 80026728 8FA50050 */ lw $a1, 0x50($sp) -/* A9D8CC 8002672C 3C0AE700 */ lui $t2, 0xe700 -/* A9D8D0 80026730 4600203E */ c.le.s $f4, $f0 -/* A9D8D4 80026734 00A01025 */ move $v0, $a1 -/* A9D8D8 80026738 3C0DF800 */ lui $t5, 0xf800 -/* A9D8DC 8002673C 3C018013 */ lui $at, %hi(D_801356B4) -/* A9D8E0 80026740 45000003 */ bc1f .L80026750 -/* A9D8E4 80026744 24A50008 */ addiu $a1, $a1, 8 -/* A9D8E8 80026748 10000002 */ b .L80026754 -/* A9D8EC 8002674C 46000086 */ mov.s $f2, $f0 -.L80026750: -/* A9D8F0 80026750 46000087 */ neg.s $f2, $f0 -.L80026754: -/* A9D8F4 80026754 AC4A0000 */ sw $t2, ($v0) -/* A9D8F8 80026758 16000008 */ bnez $s0, .L8002677C -/* A9D8FC 8002675C AC400004 */ sw $zero, 4($v0) -/* A9D900 80026760 00A01025 */ move $v0, $a1 -/* A9D904 80026764 3C0BF800 */ lui $t3, 0xf800 -/* A9D908 80026768 3C0CFF00 */ lui $t4, 0xff00 -/* A9D90C 8002676C AC4C0004 */ sw $t4, 4($v0) -/* A9D910 80026770 AC4B0000 */ sw $t3, ($v0) -/* A9D914 80026774 1000000F */ b .L800267B4 -/* A9D918 80026778 24A50008 */ addiu $a1, $a1, 8 -.L8002677C: -/* A9D91C 8002677C 00A01025 */ move $v0, $a1 -/* A9D920 80026780 AC4D0000 */ sw $t5, ($v0) -/* A9D924 80026784 92080001 */ lbu $t0, 1($s0) -/* A9D928 80026788 920F0000 */ lbu $t7, ($s0) -/* A9D92C 8002678C 920C0002 */ lbu $t4, 2($s0) -/* A9D930 80026790 92180003 */ lbu $t8, 3($s0) -/* A9D934 80026794 00084C00 */ sll $t1, $t0, 0x10 -/* A9D938 80026798 000FCE00 */ sll $t9, $t7, 0x18 -/* A9D93C 8002679C 03295025 */ or $t2, $t9, $t1 -/* A9D940 800267A0 000C6A00 */ sll $t5, $t4, 8 -/* A9D944 800267A4 014D7025 */ or $t6, $t2, $t5 -/* A9D948 800267A8 01D84025 */ or $t0, $t6, $t8 -/* A9D94C 800267AC AC480004 */ sw $t0, 4($v0) -/* A9D950 800267B0 24A50008 */ addiu $a1, $a1, 8 -.L800267B4: -/* A9D954 800267B4 00A01025 */ move $v0, $a1 -/* A9D958 800267B8 3C19DB08 */ lui $t9, 0xdb08 -/* A9D95C 800267BC AC590000 */ sw $t9, ($v0) -/* A9D960 800267C0 C42656B4 */ lwc1 $f6, %lo(D_801356B4)($at) -/* A9D964 800267C4 3C0F0001 */ lui $t7, (0x0001F400 >> 16) # lui $t7, 1 -/* A9D968 800267C8 35EFF400 */ ori $t7, (0x0001F400 & 0xFFFF) # ori $t7, $t7, 0xf400 -/* A9D96C 800267CC 46061202 */ mul.s $f8, $f2, $f6 -/* A9D970 800267D0 24A50008 */ addiu $a1, $a1, 8 -/* A9D974 800267D4 3C068013 */ lui $a2, %hi(D_8013564C) # $a2, 0x8013 -/* A9D978 800267D8 24C6564C */ addiu $a2, %lo(D_8013564C) # addiu $a2, $a2, 0x564c -/* A9D97C 800267DC 27A40038 */ addiu $a0, $sp, 0x38 -/* A9D980 800267E0 240700C2 */ li $a3, 194 -/* A9D984 800267E4 4600428D */ trunc.w.s $f10, $f8 -/* A9D988 800267E8 440B5000 */ mfc1 $t3, $f10 -/* A9D98C 800267EC 00000000 */ nop -/* A9D990 800267F0 000B6400 */ sll $t4, $t3, 0x10 -/* A9D994 800267F4 000C5403 */ sra $t2, $t4, 0x10 -/* A9D998 800267F8 254D05DC */ addiu $t5, $t2, 0x5dc -/* A9D99C 800267FC 01ED001A */ div $zero, $t7, $t5 -/* A9D9A0 80026800 00001812 */ mflo $v1 -/* A9D9A4 80026804 3063FFFF */ andi $v1, $v1, 0xffff -/* A9D9A8 80026808 00037400 */ sll $t6, $v1, 0x10 -/* A9D9AC 8002680C 01C3C025 */ or $t8, $t6, $v1 -/* A9D9B0 80026810 AC580004 */ sw $t8, 4($v0) -/* A9D9B4 80026814 8FA80048 */ lw $t0, 0x48($sp) -/* A9D9B8 80026818 15A00002 */ bnez $t5, .L80026824 -/* A9D9BC 8002681C 00000000 */ nop -/* A9D9C0 80026820 0007000D */ break 7 -.L80026824: -/* A9D9C4 80026824 2401FFFF */ li $at, -1 -/* A9D9C8 80026828 15A10004 */ bne $t5, $at, .L8002683C -/* A9D9CC 8002682C 3C018000 */ lui $at, 0x8000 -/* A9D9D0 80026830 15E10002 */ bne $t7, $at, .L8002683C -/* A9D9D4 80026834 00000000 */ nop -/* A9D9D8 80026838 0006000D */ break 6 -.L8002683C: -/* A9D9DC 8002683C AD0502D0 */ sw $a1, 0x2d0($t0) -/* A9D9E0 80026840 8FB90058 */ lw $t9, 0x58($sp) -/* A9D9E4 80026844 0C031AD5 */ jal Graph_CloseDisps -/* A9D9E8 80026848 8F250000 */ lw $a1, ($t9) -/* A9D9EC 8002684C 8FBF001C */ lw $ra, 0x1c($sp) -/* A9D9F0 80026850 8FB00018 */ lw $s0, 0x18($sp) -/* A9D9F4 80026854 27BD0058 */ addiu $sp, $sp, 0x58 -/* A9D9F8 80026858 03E00008 */ jr $ra -/* A9D9FC 8002685C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_eff_ss_dead/func_80026860.s b/asm/non_matchings/code/z_eff_ss_dead/func_80026860.s deleted file mode 100644 index bfc2d7fec4..0000000000 --- a/asm/non_matchings/code/z_eff_ss_dead/func_80026860.s +++ /dev/null @@ -1,152 +0,0 @@ -.rdata -glabel D_80135660 - .asciz "../z_eff_ss_dead.c" - .balign 4 - -glabel D_80135674 - .asciz "../z_eff_ss_dead.c" - .balign 4 - -.text -glabel func_80026860 -/* A9DA00 80026860 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A9DA04 80026864 AFBF0014 */ sw $ra, 0x14($sp) -/* A9DA08 80026868 AFA40050 */ sw $a0, 0x50($sp) -/* A9DA0C 8002686C AFA50054 */ sw $a1, 0x54($sp) -/* A9DA10 80026870 AFA60058 */ sw $a2, 0x58($sp) -/* A9DA14 80026874 AFA7005C */ sw $a3, 0x5c($sp) -/* A9DA18 80026878 8C850000 */ lw $a1, ($a0) -/* A9DA1C 8002687C 3C068013 */ lui $a2, %hi(D_80135660) # $a2, 0x8013 -/* A9DA20 80026880 24C65660 */ addiu $a2, %lo(D_80135660) # addiu $a2, $a2, 0x5660 -/* A9DA24 80026884 27A40034 */ addiu $a0, $sp, 0x34 -/* A9DA28 80026888 240700C9 */ li $a3, 201 -/* A9DA2C 8002688C 0C031AB1 */ jal Graph_OpenDisps -/* A9DA30 80026890 AFA50044 */ sw $a1, 0x44($sp) -/* A9DA34 80026894 87B8005E */ lh $t8, 0x5e($sp) -/* A9DA38 80026898 24194000 */ li $t9, 16384 -/* A9DA3C 8002689C 87A9005A */ lh $t1, 0x5a($sp) -/* A9DA40 800268A0 0338001A */ div $zero, $t9, $t8 -/* A9DA44 800268A4 00004012 */ mflo $t0 -/* A9DA48 800268A8 8FAF0044 */ lw $t7, 0x44($sp) -/* A9DA4C 800268AC 8FA50054 */ lw $a1, 0x54($sp) -/* A9DA50 800268B0 01090019 */ multu $t0, $t1 -/* A9DA54 800268B4 8DE302D0 */ lw $v1, 0x2d0($t7) -/* A9DA58 800268B8 17000002 */ bnez $t8, .L800268C4 -/* A9DA5C 800268BC 00000000 */ nop -/* A9DA60 800268C0 0007000D */ break 7 -.L800268C4: -/* A9DA64 800268C4 2401FFFF */ li $at, -1 -/* A9DA68 800268C8 17010004 */ bne $t8, $at, .L800268DC -/* A9DA6C 800268CC 3C018000 */ lui $at, 0x8000 -/* A9DA70 800268D0 17210002 */ bne $t9, $at, .L800268DC -/* A9DA74 800268D4 00000000 */ nop -/* A9DA78 800268D8 0006000D */ break 6 -.L800268DC: -/* A9DA7C 800268DC 00002012 */ mflo $a0 -/* A9DA80 800268E0 00042400 */ sll $a0, $a0, 0x10 -/* A9DA84 800268E4 00042403 */ sra $a0, $a0, 0x10 -/* A9DA88 800268E8 0C01DE0D */ jal Math_Coss -/* A9DA8C 800268EC AFA30048 */ sw $v1, 0x48($sp) -/* A9DA90 800268F0 8FA30048 */ lw $v1, 0x48($sp) -/* A9DA94 800268F4 8FA50054 */ lw $a1, 0x54($sp) -/* A9DA98 800268F8 3C0AE700 */ lui $t2, 0xe700 -/* A9DA9C 800268FC 00601025 */ move $v0, $v1 -/* A9DAA0 80026900 AC4A0000 */ sw $t2, ($v0) -/* A9DAA4 80026904 AC400004 */ sw $zero, 4($v0) -/* A9DAA8 80026908 24630008 */ addiu $v1, $v1, 8 -/* A9DAAC 8002690C 00601025 */ move $v0, $v1 -/* A9DAB0 80026910 3C0BF800 */ li $t3, 0xF8000000 # 0.000000 -/* A9DAB4 80026914 AC4B0000 */ sw $t3, ($v0) -/* A9DAB8 80026918 90AD0000 */ lbu $t5, ($a1) -/* A9DABC 8002691C 90B90001 */ lbu $t9, 1($a1) -/* A9DAC0 80026920 90AA0002 */ lbu $t2, 2($a1) -/* A9DAC4 80026924 000D7600 */ sll $t6, $t5, 0x18 -/* A9DAC8 80026928 44801000 */ mtc1 $zero, $f2 -/* A9DACC 8002692C 90AD0003 */ lbu $t5, 3($a1) -/* A9DAD0 80026930 0019C400 */ sll $t8, $t9, 0x10 -/* A9DAD4 80026934 01D84025 */ or $t0, $t6, $t8 -/* A9DAD8 80026938 000A5A00 */ sll $t3, $t2, 8 -/* A9DADC 8002693C 4600103E */ c.le.s $f2, $f0 -/* A9DAE0 80026940 010B6025 */ or $t4, $t0, $t3 -/* A9DAE4 80026944 01A07825 */ move $t7, $t5 -/* A9DAE8 80026948 018FC825 */ or $t9, $t4, $t7 -/* A9DAEC 8002694C AC590004 */ sw $t9, 4($v0) -/* A9DAF0 80026950 24630008 */ addiu $v1, $v1, 8 -/* A9DAF4 80026954 00601025 */ move $v0, $v1 -/* A9DAF8 80026958 3C0EDB08 */ lui $t6, 0xdb08 -/* A9DAFC 8002695C AC4E0000 */ sw $t6, ($v0) -/* A9DB00 80026960 45000003 */ bc1f .L80026970 -/* A9DB04 80026964 24630008 */ addiu $v1, $v1, 8 -/* A9DB08 80026968 10000002 */ b .L80026974 -/* A9DB0C 8002696C 46000306 */ mov.s $f12, $f0 -.L80026970: -/* A9DB10 80026970 46000307 */ neg.s $f12, $f0 -.L80026974: -/* A9DB14 80026974 4600103E */ c.le.s $f2, $f0 -/* A9DB18 80026978 3C01452F */ li $at, 0x452F0000 # 0.000000 -/* A9DB1C 8002697C 45020004 */ bc1fl .L80026990 -/* A9DB20 80026980 46000087 */ neg.s $f2, $f0 -/* A9DB24 80026984 10000002 */ b .L80026990 -/* A9DB28 80026988 46000086 */ mov.s $f2, $f0 -/* A9DB2C 8002698C 46000087 */ neg.s $f2, $f0 -.L80026990: -/* A9DB30 80026990 44810000 */ mtc1 $at, $f0 -/* A9DB34 80026994 3C040001 */ lui $a0, (0x0001F400 >> 16) # lui $a0, 1 -/* A9DB38 80026998 3484F400 */ ori $a0, (0x0001F400 & 0xFFFF) # ori $a0, $a0, 0xf400 -/* A9DB3C 8002699C 46001102 */ mul.s $f4, $f2, $f0 -/* A9DB40 800269A0 3C068013 */ lui $a2, %hi(D_80135674) # $a2, 0x8013 -/* A9DB44 800269A4 24C65674 */ addiu $a2, %lo(D_80135674) # addiu $a2, $a2, 0x5674 -/* A9DB48 800269A8 460C0202 */ mul.s $f8, $f0, $f12 -/* A9DB4C 800269AC 240700D4 */ li $a3, 212 -/* A9DB50 800269B0 4600218D */ trunc.w.s $f6, $f4 -/* A9DB54 800269B4 4600428D */ trunc.w.s $f10, $f8 -/* A9DB58 800269B8 44093000 */ mfc1 $t1, $f6 -/* A9DB5C 800269BC 00000000 */ nop -/* A9DB60 800269C0 00095400 */ sll $t2, $t1, 0x10 -/* A9DB64 800269C4 000A4403 */ sra $t0, $t2, 0x10 -/* A9DB68 800269C8 250B06A4 */ addiu $t3, $t0, 0x6a4 -/* A9DB6C 800269CC 008B001A */ div $zero, $a0, $t3 -/* A9DB70 800269D0 44195000 */ mfc1 $t9, $f10 -/* A9DB74 800269D4 00006812 */ mflo $t5 -/* A9DB78 800269D8 31ACFFFF */ andi $t4, $t5, 0xffff -/* A9DB7C 800269DC 00197400 */ sll $t6, $t9, 0x10 -/* A9DB80 800269E0 000EC403 */ sra $t8, $t6, 0x10 -/* A9DB84 800269E4 270906A4 */ addiu $t1, $t8, 0x6a4 -/* A9DB88 800269E8 0089001A */ div $zero, $a0, $t1 -/* A9DB8C 800269EC 15600002 */ bnez $t3, .L800269F8 -/* A9DB90 800269F0 00000000 */ nop -/* A9DB94 800269F4 0007000D */ break 7 -.L800269F8: -/* A9DB98 800269F8 2401FFFF */ li $at, -1 -/* A9DB9C 800269FC 15610004 */ bne $t3, $at, .L80026A10 -/* A9DBA0 80026A00 3C018000 */ lui $at, 0x8000 -/* A9DBA4 80026A04 14810002 */ bne $a0, $at, .L80026A10 -/* A9DBA8 80026A08 00000000 */ nop -/* A9DBAC 80026A0C 0006000D */ break 6 -.L80026A10: -/* A9DBB0 80026A10 00004012 */ mflo $t0 -/* A9DBB4 80026A14 00085C00 */ sll $t3, $t0, 0x10 -/* A9DBB8 80026A18 018B6825 */ or $t5, $t4, $t3 -/* A9DBBC 80026A1C AC4D0004 */ sw $t5, 4($v0) -/* A9DBC0 80026A20 8FAF0044 */ lw $t7, 0x44($sp) -/* A9DBC4 80026A24 15200002 */ bnez $t1, .L80026A30 -/* A9DBC8 80026A28 00000000 */ nop -/* A9DBCC 80026A2C 0007000D */ break 7 -.L80026A30: -/* A9DBD0 80026A30 2401FFFF */ li $at, -1 -/* A9DBD4 80026A34 15210004 */ bne $t1, $at, .L80026A48 -/* A9DBD8 80026A38 3C018000 */ lui $at, 0x8000 -/* A9DBDC 80026A3C 14810002 */ bne $a0, $at, .L80026A48 -/* A9DBE0 80026A40 00000000 */ nop -/* A9DBE4 80026A44 0006000D */ break 6 -.L80026A48: -/* A9DBE8 80026A48 ADE302D0 */ sw $v1, 0x2d0($t7) -/* A9DBEC 80026A4C 8FB90050 */ lw $t9, 0x50($sp) -/* A9DBF0 80026A50 27A40034 */ addiu $a0, $sp, 0x34 -/* A9DBF4 80026A54 0C031AD5 */ jal Graph_CloseDisps -/* A9DBF8 80026A58 8F250000 */ lw $a1, ($t9) -/* A9DBFC 80026A5C 8FBF0014 */ lw $ra, 0x14($sp) -/* A9DC00 80026A60 27BD0050 */ addiu $sp, $sp, 0x50 -/* A9DC04 80026A64 03E00008 */ jr $ra -/* A9DC08 80026A68 00000000 */ nop - diff --git a/asm/non_matchings/code/z_eff_ss_dead/func_80026A6C.s b/asm/non_matchings/code/z_eff_ss_dead/func_80026A6C.s deleted file mode 100644 index bb885f1628..0000000000 --- a/asm/non_matchings/code/z_eff_ss_dead/func_80026A6C.s +++ /dev/null @@ -1,45 +0,0 @@ -.rdata -glabel D_80135688 - .asciz "../z_eff_ss_dead.c" - .balign 4 - -glabel D_8013569C - .asciz "../z_eff_ss_dead.c" - .balign 4 - -.text -glabel func_80026A6C -/* A9DC0C 80026A6C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A9DC10 80026A70 AFBF0014 */ sw $ra, 0x14($sp) -/* A9DC14 80026A74 AFA40038 */ sw $a0, 0x38($sp) -/* A9DC18 80026A78 8C850000 */ lw $a1, ($a0) -/* A9DC1C 80026A7C 3C068013 */ lui $a2, %hi(D_80135688) # $a2, 0x8013 -/* A9DC20 80026A80 24C65688 */ addiu $a2, %lo(D_80135688) # addiu $a2, $a2, 0x5688 -/* A9DC24 80026A84 27A40020 */ addiu $a0, $sp, 0x20 -/* A9DC28 80026A88 240700D9 */ li $a3, 217 -/* A9DC2C 80026A8C 0C031AB1 */ jal Graph_OpenDisps -/* A9DC30 80026A90 AFA50030 */ sw $a1, 0x30($sp) -/* A9DC34 80026A94 8FA80030 */ lw $t0, 0x30($sp) -/* A9DC38 80026A98 3C18E700 */ lui $t8, 0xe700 -/* A9DC3C 80026A9C 8D0302D0 */ lw $v1, 0x2d0($t0) -/* A9DC40 80026AA0 246F0008 */ addiu $t7, $v1, 8 -/* A9DC44 80026AA4 AD0F02D0 */ sw $t7, 0x2d0($t0) -/* A9DC48 80026AA8 AC600004 */ sw $zero, 4($v1) -/* A9DC4C 80026AAC AC780000 */ sw $t8, ($v1) -/* A9DC50 80026AB0 8D0502D0 */ lw $a1, 0x2d0($t0) -/* A9DC54 80026AB4 8FA40038 */ lw $a0, 0x38($sp) -/* A9DC58 80026AB8 0C02F228 */ jal func_800BC8A0 -/* A9DC5C 80026ABC AFA80030 */ sw $t0, 0x30($sp) -/* A9DC60 80026AC0 8FA80030 */ lw $t0, 0x30($sp) -/* A9DC64 80026AC4 3C068013 */ lui $a2, %hi(D_8013569C) # $a2, 0x8013 -/* A9DC68 80026AC8 24C6569C */ addiu $a2, %lo(D_8013569C) # addiu $a2, $a2, 0x569c -/* A9DC6C 80026ACC AD0202D0 */ sw $v0, 0x2d0($t0) -/* A9DC70 80026AD0 8FB90038 */ lw $t9, 0x38($sp) -/* A9DC74 80026AD4 27A40020 */ addiu $a0, $sp, 0x20 -/* A9DC78 80026AD8 240700DE */ li $a3, 222 -/* A9DC7C 80026ADC 0C031AD5 */ jal Graph_CloseDisps -/* A9DC80 80026AE0 8F250000 */ lw $a1, ($t9) -/* A9DC84 80026AE4 8FBF0014 */ lw $ra, 0x14($sp) -/* A9DC88 80026AE8 27BD0038 */ addiu $sp, $sp, 0x38 -/* A9DC8C 80026AEC 03E00008 */ jr $ra -/* A9DC90 80026AF0 00000000 */ nop diff --git a/asm/non_matchings/code/z_effect/Effect_Add.s b/asm/non_matchings/code/z_effect/Effect_Add.s deleted file mode 100644 index e50a7e6685..0000000000 --- a/asm/non_matchings/code/z_effect/Effect_Add.s +++ /dev/null @@ -1,131 +0,0 @@ -.rdata -glabel D_801356C0 - .asciz "EffectAdd():確保できません。注意してください。Type%d\n" - # EUC-JP: 確保できません。注意してください。 | I cannot secure it. be careful. - .balign 4 - -glabel D_801356F8 - .asciz "エフェクト追加せずに終了します。\n" - # EUC-JP: エフェクト追加せずに終了します。 | Exit without adding effects. - .balign 4 - -.text -glabel Effect_Add -/* A9DE74 80026CD4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A9DE78 80026CD8 AFBF0014 */ sw $ra, 0x14($sp) -/* A9DE7C 80026CDC AFA5002C */ sw $a1, 0x2c($sp) -/* A9DE80 80026CE0 AFA70034 */ sw $a3, 0x34($sp) -/* A9DE84 80026CE4 AFA0001C */ sw $zero, 0x1c($sp) -/* A9DE88 80026CE8 240E001F */ li $t6, 31 -/* A9DE8C 80026CEC ACAE0000 */ sw $t6, ($a1) -/* A9DE90 80026CF0 AFA00018 */ sw $zero, 0x18($sp) -/* A9DE94 80026CF4 0C03034A */ jal func_800C0D28 -/* A9DE98 80026CF8 AFA60030 */ sw $a2, 0x30($sp) -/* A9DE9C 80026CFC 24030001 */ li $v1, 1 -/* A9DEA0 80026D00 8FA60030 */ lw $a2, 0x30($sp) -/* A9DEA4 80026D04 8FA7001C */ lw $a3, 0x1c($sp) -/* A9DEA8 80026D08 8FA80018 */ lw $t0, 0x18($sp) -/* A9DEAC 80026D0C 10430055 */ beq $v0, $v1, .L80026E64 -/* A9DEB0 80026D10 8FA9002C */ lw $t1, 0x2c($sp) -/* A9DEB4 80026D14 10C00009 */ beqz $a2, .L80026D3C -/* A9DEB8 80026D18 00002825 */ move $a1, $zero -/* A9DEBC 80026D1C 10C30018 */ beq $a2, $v1, .L80026D80 -/* A9DEC0 80026D20 24010002 */ li $at, 2 -/* A9DEC4 80026D24 10C10016 */ beq $a2, $at, .L80026D80 -/* A9DEC8 80026D28 24040003 */ li $a0, 3 -/* A9DECC 80026D2C 10C40025 */ beq $a2, $a0, .L80026DC4 -/* A9DED0 80026D30 00001025 */ move $v0, $zero -/* A9DED4 80026D34 10000030 */ b .L80026DF8 -/* A9DED8 80026D38 00000000 */ nop -.L80026D3C: -/* A9DEDC 80026D3C 3C038015 */ lui $v1, %hi(D_80157DA0) # $v1, 0x8015 -/* A9DEE0 80026D40 24637DA0 */ addiu $v1, %lo(D_80157DA0) # addiu $v1, $v1, 0x7da0 -/* A9DEE4 80026D44 00001025 */ move $v0, $zero -/* A9DEE8 80026D48 24040003 */ li $a0, 3 -.L80026D4C: -/* A9DEEC 80026D4C 90780004 */ lbu $t8, 4($v1) -/* A9DEF0 80026D50 57000007 */ bnezl $t8, .L80026D70 -/* A9DEF4 80026D54 24420001 */ addiu $v0, $v0, 1 -/* A9DEF8 80026D58 24050001 */ li $a1, 1 -/* A9DEFC 80026D5C AD220000 */ sw $v0, ($t1) -/* A9DF00 80026D60 24670008 */ addiu $a3, $v1, 8 -/* A9DF04 80026D64 10000024 */ b .L80026DF8 -/* A9DF08 80026D68 24680004 */ addiu $t0, $v1, 4 -/* A9DF0C 80026D6C 24420001 */ addiu $v0, $v0, 1 -.L80026D70: -/* A9DF10 80026D70 1444FFF6 */ bne $v0, $a0, .L80026D4C -/* A9DF14 80026D74 246304C8 */ addiu $v1, $v1, 0x4c8 -/* A9DF18 80026D78 1000001F */ b .L80026DF8 -/* A9DF1C 80026D7C 00000000 */ nop -.L80026D80: -/* A9DF20 80026D80 3C038015 */ lui $v1, %hi(D_80157DA0) # $v1, 0x8015 -/* A9DF24 80026D84 24637DA0 */ addiu $v1, %lo(D_80157DA0) # addiu $v1, $v1, 0x7da0 -/* A9DF28 80026D88 00001025 */ move $v0, $zero -/* A9DF2C 80026D8C 24040019 */ li $a0, 25 -.L80026D90: -/* A9DF30 80026D90 90790E5C */ lbu $t9, 0xe5c($v1) -/* A9DF34 80026D94 17200006 */ bnez $t9, .L80026DB0 -/* A9DF38 80026D98 244A0003 */ addiu $t2, $v0, 3 -/* A9DF3C 80026D9C 24050001 */ li $a1, 1 -/* A9DF40 80026DA0 AD2A0000 */ sw $t2, ($t1) -/* A9DF44 80026DA4 24670E60 */ addiu $a3, $v1, 0xe60 -/* A9DF48 80026DA8 10000013 */ b .L80026DF8 -/* A9DF4C 80026DAC 24680E5C */ addiu $t0, $v1, 0xe5c -.L80026DB0: -/* A9DF50 80026DB0 24420001 */ addiu $v0, $v0, 1 -/* A9DF54 80026DB4 1444FFF6 */ bne $v0, $a0, .L80026D90 -/* A9DF58 80026DB8 246301B0 */ addiu $v1, $v1, 0x1b0 -/* A9DF5C 80026DBC 1000000E */ b .L80026DF8 -/* A9DF60 80026DC0 00000000 */ nop -.L80026DC4: -/* A9DF64 80026DC4 3C038015 */ lui $v1, %hi(D_80157DA0) # $v1, 0x8015 -/* A9DF68 80026DC8 24637DA0 */ addiu $v1, %lo(D_80157DA0) # addiu $v1, $v1, 0x7da0 -.L80026DCC: -/* A9DF6C 80026DCC 906B388C */ lbu $t3, 0x388c($v1) -/* A9DF70 80026DD0 15600006 */ bnez $t3, .L80026DEC -/* A9DF74 80026DD4 244C001C */ addiu $t4, $v0, 0x1c -/* A9DF78 80026DD8 24050001 */ li $a1, 1 -/* A9DF7C 80026DDC AD2C0000 */ sw $t4, ($t1) -/* A9DF80 80026DE0 24673890 */ addiu $a3, $v1, 0x3890 -/* A9DF84 80026DE4 10000004 */ b .L80026DF8 -/* A9DF88 80026DE8 2468388C */ addiu $t0, $v1, 0x388c -.L80026DEC: -/* A9DF8C 80026DEC 24420001 */ addiu $v0, $v0, 1 -/* A9DF90 80026DF0 1444FFF6 */ bne $v0, $a0, .L80026DCC -/* A9DF94 80026DF4 246301CC */ addiu $v1, $v1, 0x1cc -.L80026DF8: -/* A9DF98 80026DF8 14A0000A */ bnez $a1, .L80026E24 -/* A9DF9C 80026DFC 00066880 */ sll $t5, $a2, 2 -/* A9DFA0 80026E00 3C048013 */ lui $a0, %hi(D_801356C0) # $a0, 0x8013 -/* A9DFA4 80026E04 248456C0 */ addiu $a0, %lo(D_801356C0) # addiu $a0, $a0, 0x56c0 -/* A9DFA8 80026E08 0C00084C */ jal osSyncPrintf -/* A9DFAC 80026E0C 00C02825 */ move $a1, $a2 -/* A9DFB0 80026E10 3C048013 */ lui $a0, %hi(D_801356F8) # $a0, 0x8013 -/* A9DFB4 80026E14 0C00084C */ jal osSyncPrintf -/* A9DFB8 80026E18 248456F8 */ addiu $a0, %lo(D_801356F8) # addiu $a0, $a0, 0x56f8 -/* A9DFBC 80026E1C 10000012 */ b .L80026E68 -/* A9DFC0 80026E20 8FBF0014 */ lw $ra, 0x14($sp) -.L80026E24: -/* A9DFC4 80026E24 01A66821 */ addu $t5, $t5, $a2 -/* A9DFC8 80026E28 000D6880 */ sll $t5, $t5, 2 -/* A9DFCC 80026E2C 3C198011 */ lui $t9, %hi(D_80115864) -/* A9DFD0 80026E30 032DC821 */ addu $t9, $t9, $t5 -/* A9DFD4 80026E34 8F395864 */ lw $t9, %lo(D_80115864)($t9) -/* A9DFD8 80026E38 00E02025 */ move $a0, $a3 -/* A9DFDC 80026E3C 8FA5003C */ lw $a1, 0x3c($sp) -/* A9DFE0 80026E40 0320F809 */ jalr $t9 -/* A9DFE4 80026E44 AFA80018 */ sw $t0, 0x18($sp) -/* A9DFE8 80026E48 8FA80018 */ lw $t0, 0x18($sp) -/* A9DFEC 80026E4C 93AE0037 */ lbu $t6, 0x37($sp) -/* A9DFF0 80026E50 24180001 */ li $t8, 1 -/* A9DFF4 80026E54 A10E0002 */ sb $t6, 2($t0) -/* A9DFF8 80026E58 93AF003B */ lbu $t7, 0x3b($sp) -/* A9DFFC 80026E5C A1180000 */ sb $t8, ($t0) -/* A9E000 80026E60 A10F0001 */ sb $t7, 1($t0) -.L80026E64: -/* A9E004 80026E64 8FBF0014 */ lw $ra, 0x14($sp) -.L80026E68: -/* A9E008 80026E68 27BD0028 */ addiu $sp, $sp, 0x28 -/* A9E00C 80026E6C 03E00008 */ jr $ra -/* A9E010 80026E70 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect/func_80026B0C.s b/asm/non_matchings/code/z_effect/func_80026B0C.s deleted file mode 100644 index 5c1d9e0e66..0000000000 --- a/asm/non_matchings/code/z_effect/func_80026B0C.s +++ /dev/null @@ -1,84 +0,0 @@ -glabel func_80026B0C -/* A9DCAC 80026B0C 2401001F */ li $at, 31 -/* A9DCB0 80026B10 54810004 */ bnel $a0, $at, .L80026B24 -/* A9DCB4 80026B14 28810003 */ slti $at, $a0, 3 -/* A9DCB8 80026B18 03E00008 */ jr $ra -/* A9DCBC 80026B1C 00001025 */ move $v0, $zero - -/* A9DCC0 80026B20 28810003 */ slti $at, $a0, 3 -.L80026B24: -/* A9DCC4 80026B24 10200012 */ beqz $at, .L80026B70 -/* A9DCC8 80026B28 00047080 */ sll $t6, $a0, 2 -/* A9DCCC 80026B2C 01C47021 */ addu $t6, $t6, $a0 -/* A9DCD0 80026B30 000E7080 */ sll $t6, $t6, 2 -/* A9DCD4 80026B34 01C47023 */ subu $t6, $t6, $a0 -/* A9DCD8 80026B38 000E70C0 */ sll $t6, $t6, 3 -/* A9DCDC 80026B3C 01C47021 */ addu $t6, $t6, $a0 -/* A9DCE0 80026B40 3C0F8015 */ lui $t7, %hi(D_80157DA0) # $t7, 0x8015 -/* A9DCE4 80026B44 25EF7DA0 */ addiu $t7, %lo(D_80157DA0) # addiu $t7, $t7, 0x7da0 -/* A9DCE8 80026B48 000E70C0 */ sll $t6, $t6, 3 -/* A9DCEC 80026B4C 01CF1821 */ addu $v1, $t6, $t7 -/* A9DCF0 80026B50 90780004 */ lbu $t8, 4($v1) -/* A9DCF4 80026B54 24010001 */ li $at, 1 -/* A9DCF8 80026B58 17010003 */ bne $t8, $at, .L80026B68 -/* A9DCFC 80026B5C 00000000 */ nop -/* A9DD00 80026B60 03E00008 */ jr $ra -/* A9DD04 80026B64 24620008 */ addiu $v0, $v1, 8 - -.L80026B68: -/* A9DD08 80026B68 03E00008 */ jr $ra -/* A9DD0C 80026B6C 00001025 */ move $v0, $zero - -.L80026B70: -/* A9DD10 80026B70 2484FFFD */ addiu $a0, $a0, -3 -/* A9DD14 80026B74 28810019 */ slti $at, $a0, 0x19 -/* A9DD18 80026B78 10200010 */ beqz $at, .L80026BBC -/* A9DD1C 80026B7C 0004C8C0 */ sll $t9, $a0, 3 -/* A9DD20 80026B80 0324C823 */ subu $t9, $t9, $a0 -/* A9DD24 80026B84 0019C880 */ sll $t9, $t9, 2 -/* A9DD28 80026B88 0324C823 */ subu $t9, $t9, $a0 -/* A9DD2C 80026B8C 3C088015 */ lui $t0, %hi(D_80157DA0) # $t0, 0x8015 -/* A9DD30 80026B90 25087DA0 */ addiu $t0, %lo(D_80157DA0) # addiu $t0, $t0, 0x7da0 -/* A9DD34 80026B94 0019C900 */ sll $t9, $t9, 4 -/* A9DD38 80026B98 03281821 */ addu $v1, $t9, $t0 -/* A9DD3C 80026B9C 90690E5C */ lbu $t1, 0xe5c($v1) -/* A9DD40 80026BA0 24010001 */ li $at, 1 -/* A9DD44 80026BA4 15210003 */ bne $t1, $at, .L80026BB4 -/* A9DD48 80026BA8 00000000 */ nop -/* A9DD4C 80026BAC 03E00008 */ jr $ra -/* A9DD50 80026BB0 24620E60 */ addiu $v0, $v1, 0xe60 - -.L80026BB4: -/* A9DD54 80026BB4 03E00008 */ jr $ra -/* A9DD58 80026BB8 00001025 */ move $v0, $zero - -.L80026BBC: -/* A9DD5C 80026BBC 2484FFE7 */ addiu $a0, $a0, -0x19 -/* A9DD60 80026BC0 28810003 */ slti $at, $a0, 3 -/* A9DD64 80026BC4 10200013 */ beqz $at, .L80026C14 -/* A9DD68 80026BC8 00001025 */ move $v0, $zero -/* A9DD6C 80026BCC 000450C0 */ sll $t2, $a0, 3 -/* A9DD70 80026BD0 01445023 */ subu $t2, $t2, $a0 -/* A9DD74 80026BD4 000A5080 */ sll $t2, $t2, 2 -/* A9DD78 80026BD8 01445021 */ addu $t2, $t2, $a0 -/* A9DD7C 80026BDC 000A5080 */ sll $t2, $t2, 2 -/* A9DD80 80026BE0 01445023 */ subu $t2, $t2, $a0 -/* A9DD84 80026BE4 3C0B8015 */ lui $t3, %hi(D_80157DA0) # $t3, 0x8015 -/* A9DD88 80026BE8 256B7DA0 */ addiu $t3, %lo(D_80157DA0) # addiu $t3, $t3, 0x7da0 -/* A9DD8C 80026BEC 000A5080 */ sll $t2, $t2, 2 -/* A9DD90 80026BF0 014B1821 */ addu $v1, $t2, $t3 -/* A9DD94 80026BF4 906C388C */ lbu $t4, 0x388c($v1) -/* A9DD98 80026BF8 24010001 */ li $at, 1 -/* A9DD9C 80026BFC 15810003 */ bne $t4, $at, .L80026C0C -/* A9DDA0 80026C00 00000000 */ nop -/* A9DDA4 80026C04 03E00008 */ jr $ra -/* A9DDA8 80026C08 24623890 */ addiu $v0, $v1, 0x3890 - -.L80026C0C: -/* A9DDAC 80026C0C 03E00008 */ jr $ra -/* A9DDB0 80026C10 00001025 */ move $v0, $zero - -.L80026C14: -/* A9DDB4 80026C14 03E00008 */ jr $ra -/* A9DDB8 80026C18 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect/func_80026C2C.s b/asm/non_matchings/code/z_effect/func_80026C2C.s deleted file mode 100644 index f7efd596f1..0000000000 --- a/asm/non_matchings/code/z_effect/func_80026C2C.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_80026C2C -/* A9DDCC 80026C2C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A9DDD0 80026C30 AFB10018 */ sw $s1, 0x18($sp) -/* A9DDD4 80026C34 AFB00014 */ sw $s0, 0x14($sp) -/* A9DDD8 80026C38 3C108015 */ lui $s0, %hi(D_80157DA4) # $s0, 0x8015 -/* A9DDDC 80026C3C 3C118016 */ lui $s1, %hi(D_80158BFC) # $s1, 0x8016 -/* A9DDE0 80026C40 AFBF001C */ sw $ra, 0x1c($sp) -/* A9DDE4 80026C44 AFA40020 */ sw $a0, 0x20($sp) -/* A9DDE8 80026C48 26318BFC */ addiu $s1, %lo(D_80158BFC) # addiu $s1, $s1, -0x7404 -/* A9DDEC 80026C4C 26107DA4 */ addiu $s0, %lo(D_80157DA4) # addiu $s0, $s0, 0x7da4 -.L80026C50: -/* A9DDF0 80026C50 0C009B07 */ jal func_80026C1C -/* A9DDF4 80026C54 02002025 */ move $a0, $s0 -/* A9DDF8 80026C58 261004C8 */ addiu $s0, $s0, 0x4c8 -/* A9DDFC 80026C5C 0211082B */ sltu $at, $s0, $s1 -/* A9DE00 80026C60 1420FFFB */ bnez $at, .L80026C50 -/* A9DE04 80026C64 00000000 */ nop -/* A9DE08 80026C68 3C108016 */ lui $s0, %hi(D_80158BFC) # $s0, 0x8016 -/* A9DE0C 80026C6C 3C118016 */ lui $s1, %hi(D_8015B62C) # $s1, 0x8016 -/* A9DE10 80026C70 2631B62C */ addiu $s1, %lo(D_8015B62C) # addiu $s1, $s1, -0x49d4 -/* A9DE14 80026C74 26108BFC */ addiu $s0, %lo(D_80158BFC) # addiu $s0, $s0, -0x7404 -.L80026C78: -/* A9DE18 80026C78 0C009B07 */ jal func_80026C1C -/* A9DE1C 80026C7C 02002025 */ move $a0, $s0 -/* A9DE20 80026C80 261001B0 */ addiu $s0, $s0, 0x1b0 -/* A9DE24 80026C84 0211082B */ sltu $at, $s0, $s1 -/* A9DE28 80026C88 1420FFFB */ bnez $at, .L80026C78 -/* A9DE2C 80026C8C 00000000 */ nop -/* A9DE30 80026C90 3C108016 */ lui $s0, %hi(D_80158BFC) # $s0, 0x8016 -/* A9DE34 80026C94 3C118016 */ lui $s1, %hi(D_8015910C) # $s1, 0x8016 -/* A9DE38 80026C98 2631910C */ addiu $s1, %lo(D_8015910C) # addiu $s1, $s1, -0x6ef4 -/* A9DE3C 80026C9C 26108BFC */ addiu $s0, %lo(D_80158BFC) # addiu $s0, $s0, -0x7404 -.L80026CA0: -/* A9DE40 80026CA0 0C009B07 */ jal func_80026C1C -/* A9DE44 80026CA4 02002025 */ move $a0, $s0 -/* A9DE48 80026CA8 261001B0 */ addiu $s0, $s0, 0x1b0 -/* A9DE4C 80026CAC 1611FFFC */ bne $s0, $s1, .L80026CA0 -/* A9DE50 80026CB0 00000000 */ nop -/* A9DE54 80026CB4 8FBF001C */ lw $ra, 0x1c($sp) -/* A9DE58 80026CB8 8FAE0020 */ lw $t6, 0x20($sp) -/* A9DE5C 80026CBC 3C018015 */ lui $at, %hi(D_80157DA0) -/* A9DE60 80026CC0 8FB00014 */ lw $s0, 0x14($sp) -/* A9DE64 80026CC4 8FB10018 */ lw $s1, 0x18($sp) -/* A9DE68 80026CC8 27BD0020 */ addiu $sp, $sp, 0x20 -/* A9DE6C 80026CCC 03E00008 */ jr $ra -/* A9DE70 80026CD0 AC2E7DA0 */ sw $t6, %lo(D_80157DA0)($at) - diff --git a/asm/non_matchings/code/z_effect/func_80026E74.s b/asm/non_matchings/code/z_effect/func_80026E74.s deleted file mode 100644 index 1edbbf9efa..0000000000 --- a/asm/non_matchings/code/z_effect/func_80026E74.s +++ /dev/null @@ -1,71 +0,0 @@ -glabel func_80026E74 -/* A9E014 80026E74 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A9E018 80026E78 AFB30020 */ sw $s3, 0x20($sp) -/* A9E01C 80026E7C AFB2001C */ sw $s2, 0x1c($sp) -/* A9E020 80026E80 AFB00014 */ sw $s0, 0x14($sp) -/* A9E024 80026E84 AFB10018 */ sw $s1, 0x18($sp) -/* A9E028 80026E88 3C108015 */ lui $s0, %hi(D_80157DA0) # $s0, 0x8015 -/* A9E02C 80026E8C 3C128016 */ lui $s2, %hi(D_80158BF8) # $s2, 0x8016 -/* A9E030 80026E90 3C138011 */ lui $s3, %hi(D_80115860) # $s3, 0x8011 -/* A9E034 80026E94 00808825 */ move $s1, $a0 -/* A9E038 80026E98 AFBF0024 */ sw $ra, 0x24($sp) -/* A9E03C 80026E9C 26735860 */ addiu $s3, %lo(D_80115860) # addiu $s3, $s3, 0x5860 -/* A9E040 80026EA0 26528BF8 */ addiu $s2, %lo(D_80158BF8) # addiu $s2, $s2, -0x7408 -/* A9E044 80026EA4 26107DA0 */ addiu $s0, %lo(D_80157DA0) # addiu $s0, $s0, 0x7da0 -/* A9E048 80026EA8 920E0004 */ lbu $t6, 4($s0) -.L80026EAC: -/* A9E04C 80026EAC 51C00007 */ beql $t6, $zero, .L80026ECC -/* A9E050 80026EB0 261004C8 */ addiu $s0, $s0, 0x4c8 -/* A9E054 80026EB4 8E790010 */ lw $t9, 0x10($s3) -/* A9E058 80026EB8 26040008 */ addiu $a0, $s0, 8 -/* A9E05C 80026EBC 02202825 */ move $a1, $s1 -/* A9E060 80026EC0 0320F809 */ jalr $t9 -/* A9E064 80026EC4 00000000 */ nop -/* A9E068 80026EC8 261004C8 */ addiu $s0, $s0, 0x4c8 -.L80026ECC: -/* A9E06C 80026ECC 0212082B */ sltu $at, $s0, $s2 -/* A9E070 80026ED0 5420FFF6 */ bnezl $at, .L80026EAC -/* A9E074 80026ED4 920E0004 */ lbu $t6, 4($s0) -/* A9E078 80026ED8 3C108015 */ lui $s0, %hi(D_80157DA0) # $s0, 0x8015 -/* A9E07C 80026EDC 3C128016 */ lui $s2, %hi(D_8015A7D0) # $s2, 0x8016 -/* A9E080 80026EE0 2652A7D0 */ addiu $s2, %lo(D_8015A7D0) # addiu $s2, $s2, -0x5830 -/* A9E084 80026EE4 26107DA0 */ addiu $s0, %lo(D_80157DA0) # addiu $s0, $s0, 0x7da0 -/* A9E088 80026EE8 920F0E5C */ lbu $t7, 0xe5c($s0) -.L80026EEC: -/* A9E08C 80026EEC 51E00007 */ beql $t7, $zero, .L80026F0C -/* A9E090 80026EF0 261001B0 */ addiu $s0, $s0, 0x1b0 -/* A9E094 80026EF4 8E790024 */ lw $t9, 0x24($s3) -/* A9E098 80026EF8 26040E60 */ addiu $a0, $s0, 0xe60 -/* A9E09C 80026EFC 02202825 */ move $a1, $s1 -/* A9E0A0 80026F00 0320F809 */ jalr $t9 -/* A9E0A4 80026F04 00000000 */ nop -/* A9E0A8 80026F08 261001B0 */ addiu $s0, $s0, 0x1b0 -.L80026F0C: -/* A9E0AC 80026F0C 0212082B */ sltu $at, $s0, $s2 -/* A9E0B0 80026F10 5420FFF6 */ bnezl $at, .L80026EEC -/* A9E0B4 80026F14 920F0E5C */ lbu $t7, 0xe5c($s0) -/* A9E0B8 80026F18 3C108015 */ lui $s0, %hi(D_80157DA0) # $s0, 0x8015 -/* A9E0BC 80026F1C 3C128016 */ lui $s2, %hi(D_80158304) # $s2, 0x8016 -/* A9E0C0 80026F20 26528304 */ addiu $s2, %lo(D_80158304) # addiu $s2, $s2, -0x7cfc -/* A9E0C4 80026F24 26107DA0 */ addiu $s0, %lo(D_80157DA0) # addiu $s0, $s0, 0x7da0 -/* A9E0C8 80026F28 9218388C */ lbu $t8, 0x388c($s0) -.L80026F2C: -/* A9E0CC 80026F2C 53000007 */ beql $t8, $zero, .L80026F4C -/* A9E0D0 80026F30 261001CC */ addiu $s0, $s0, 0x1cc -/* A9E0D4 80026F34 8E79004C */ lw $t9, 0x4c($s3) -/* A9E0D8 80026F38 26043890 */ addiu $a0, $s0, 0x3890 -/* A9E0DC 80026F3C 02202825 */ move $a1, $s1 -/* A9E0E0 80026F40 0320F809 */ jalr $t9 -/* A9E0E4 80026F44 00000000 */ nop -/* A9E0E8 80026F48 261001CC */ addiu $s0, $s0, 0x1cc -.L80026F4C: -/* A9E0EC 80026F4C 5612FFF7 */ bnel $s0, $s2, .L80026F2C -/* A9E0F0 80026F50 9218388C */ lbu $t8, 0x388c($s0) -/* A9E0F4 80026F54 8FBF0024 */ lw $ra, 0x24($sp) -/* A9E0F8 80026F58 8FB00014 */ lw $s0, 0x14($sp) -/* A9E0FC 80026F5C 8FB10018 */ lw $s1, 0x18($sp) -/* A9E100 80026F60 8FB2001C */ lw $s2, 0x1c($sp) -/* A9E104 80026F64 8FB30020 */ lw $s3, 0x20($sp) -/* A9E108 80026F68 03E00008 */ jr $ra -/* A9E10C 80026F6C 27BD0028 */ addiu $sp, $sp, 0x28 - diff --git a/asm/non_matchings/code/z_effect/func_80026F70.s b/asm/non_matchings/code/z_effect/func_80026F70.s deleted file mode 100644 index 5c1e547f76..0000000000 --- a/asm/non_matchings/code/z_effect/func_80026F70.s +++ /dev/null @@ -1,86 +0,0 @@ -glabel func_80026F70 -/* A9E110 80026F70 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* A9E114 80026F74 AFB30020 */ sw $s3, 0x20($sp) -/* A9E118 80026F78 AFB10018 */ sw $s1, 0x18($sp) -/* A9E11C 80026F7C AFB40024 */ sw $s4, 0x24($sp) -/* A9E120 80026F80 AFB2001C */ sw $s2, 0x1c($sp) -/* A9E124 80026F84 AFB00014 */ sw $s0, 0x14($sp) -/* A9E128 80026F88 3C118015 */ lui $s1, %hi(D_80157DA0) # $s1, 0x8015 -/* A9E12C 80026F8C 3C138011 */ lui $s3, %hi(D_80115860) # $s3, 0x8011 -/* A9E130 80026F90 00809025 */ move $s2, $a0 -/* A9E134 80026F94 AFBF002C */ sw $ra, 0x2c($sp) -/* A9E138 80026F98 AFB50028 */ sw $s5, 0x28($sp) -/* A9E13C 80026F9C 26735860 */ addiu $s3, %lo(D_80115860) # addiu $s3, $s3, 0x5860 -/* A9E140 80026FA0 26317DA0 */ addiu $s1, %lo(D_80157DA0) # addiu $s1, $s1, 0x7da0 -/* A9E144 80026FA4 00008025 */ move $s0, $zero -/* A9E148 80026FA8 24140001 */ li $s4, 1 -.L80026FAC: -/* A9E14C 80026FAC 922E0004 */ lbu $t6, 4($s1) -/* A9E150 80026FB0 51C0000A */ beql $t6, $zero, .L80026FDC -/* A9E154 80026FB4 26100001 */ addiu $s0, $s0, 1 -/* A9E158 80026FB8 8E79000C */ lw $t9, 0xc($s3) -/* A9E15C 80026FBC 26240008 */ addiu $a0, $s1, 8 -/* A9E160 80026FC0 0320F809 */ jalr $t9 -/* A9E164 80026FC4 00000000 */ nop -/* A9E168 80026FC8 14540003 */ bne $v0, $s4, .L80026FD8 -/* A9E16C 80026FCC 02402025 */ move $a0, $s2 -/* A9E170 80026FD0 0C009C27 */ jal func_8002709C -/* A9E174 80026FD4 02002825 */ move $a1, $s0 -.L80026FD8: -/* A9E178 80026FD8 26100001 */ addiu $s0, $s0, 1 -.L80026FDC: -/* A9E17C 80026FDC 2A010003 */ slti $at, $s0, 3 -/* A9E180 80026FE0 1420FFF2 */ bnez $at, .L80026FAC -/* A9E184 80026FE4 263104C8 */ addiu $s1, $s1, 0x4c8 -/* A9E188 80026FE8 3C118015 */ lui $s1, %hi(D_80157DA0) # $s1, 0x8015 -/* A9E18C 80026FEC 26317DA0 */ addiu $s1, %lo(D_80157DA0) # addiu $s1, $s1, 0x7da0 -/* A9E190 80026FF0 00008025 */ move $s0, $zero -.L80026FF4: -/* A9E194 80026FF4 922F0E5C */ lbu $t7, 0xe5c($s1) -/* A9E198 80026FF8 51E0000A */ beql $t7, $zero, .L80027024 -/* A9E19C 80026FFC 26100001 */ addiu $s0, $s0, 1 -/* A9E1A0 80027000 8E790020 */ lw $t9, 0x20($s3) -/* A9E1A4 80027004 26240E60 */ addiu $a0, $s1, 0xe60 -/* A9E1A8 80027008 0320F809 */ jalr $t9 -/* A9E1AC 8002700C 00000000 */ nop -/* A9E1B0 80027010 14540003 */ bne $v0, $s4, .L80027020 -/* A9E1B4 80027014 02402025 */ move $a0, $s2 -/* A9E1B8 80027018 0C009C27 */ jal func_8002709C -/* A9E1BC 8002701C 26050003 */ addiu $a1, $s0, 3 -.L80027020: -/* A9E1C0 80027020 26100001 */ addiu $s0, $s0, 1 -.L80027024: -/* A9E1C4 80027024 2A010019 */ slti $at, $s0, 0x19 -/* A9E1C8 80027028 1420FFF2 */ bnez $at, .L80026FF4 -/* A9E1CC 8002702C 263101B0 */ addiu $s1, $s1, 0x1b0 -/* A9E1D0 80027030 3C118015 */ lui $s1, %hi(D_80157DA0) # $s1, 0x8015 -/* A9E1D4 80027034 26317DA0 */ addiu $s1, %lo(D_80157DA0) # addiu $s1, $s1, 0x7da0 -/* A9E1D8 80027038 00008025 */ move $s0, $zero -/* A9E1DC 8002703C 24150003 */ li $s5, 3 -.L80027040: -/* A9E1E0 80027040 9238388C */ lbu $t8, 0x388c($s1) -/* A9E1E4 80027044 5300000A */ beql $t8, $zero, .L80027070 -/* A9E1E8 80027048 26100001 */ addiu $s0, $s0, 1 -/* A9E1EC 8002704C 8E790048 */ lw $t9, 0x48($s3) -/* A9E1F0 80027050 26243890 */ addiu $a0, $s1, 0x3890 -/* A9E1F4 80027054 0320F809 */ jalr $t9 -/* A9E1F8 80027058 00000000 */ nop -/* A9E1FC 8002705C 14540003 */ bne $v0, $s4, .L8002706C -/* A9E200 80027060 02402025 */ move $a0, $s2 -/* A9E204 80027064 0C009C27 */ jal func_8002709C -/* A9E208 80027068 2605001C */ addiu $a1, $s0, 0x1c -.L8002706C: -/* A9E20C 8002706C 26100001 */ addiu $s0, $s0, 1 -.L80027070: -/* A9E210 80027070 1615FFF3 */ bne $s0, $s5, .L80027040 -/* A9E214 80027074 263101CC */ addiu $s1, $s1, 0x1cc -/* A9E218 80027078 8FBF002C */ lw $ra, 0x2c($sp) -/* A9E21C 8002707C 8FB00014 */ lw $s0, 0x14($sp) -/* A9E220 80027080 8FB10018 */ lw $s1, 0x18($sp) -/* A9E224 80027084 8FB2001C */ lw $s2, 0x1c($sp) -/* A9E228 80027088 8FB30020 */ lw $s3, 0x20($sp) -/* A9E22C 8002708C 8FB40024 */ lw $s4, 0x24($sp) -/* A9E230 80027090 8FB50028 */ lw $s5, 0x28($sp) -/* A9E234 80027094 03E00008 */ jr $ra -/* A9E238 80027098 27BD0030 */ addiu $sp, $sp, 0x30 - diff --git a/asm/non_matchings/code/z_effect/func_8002709C.s b/asm/non_matchings/code/z_effect/func_8002709C.s deleted file mode 100644 index cf38aece33..0000000000 --- a/asm/non_matchings/code/z_effect/func_8002709C.s +++ /dev/null @@ -1,73 +0,0 @@ -glabel func_8002709C -/* A9E23C 8002709C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A9E240 800270A0 2401001F */ li $at, 31 -/* A9E244 800270A4 AFBF0014 */ sw $ra, 0x14($sp) -/* A9E248 800270A8 10A1003B */ beq $a1, $at, .L80027198 -/* A9E24C 800270AC AFA40018 */ sw $a0, 0x18($sp) -/* A9E250 800270B0 28A10003 */ slti $at, $a1, 3 -/* A9E254 800270B4 10200012 */ beqz $at, .L80027100 -/* A9E258 800270B8 00057080 */ sll $t6, $a1, 2 -/* A9E25C 800270BC 01C57021 */ addu $t6, $t6, $a1 -/* A9E260 800270C0 000E7080 */ sll $t6, $t6, 2 -/* A9E264 800270C4 01C57023 */ subu $t6, $t6, $a1 -/* A9E268 800270C8 000E70C0 */ sll $t6, $t6, 3 -/* A9E26C 800270CC 01C57021 */ addu $t6, $t6, $a1 -/* A9E270 800270D0 3C0F8015 */ lui $t7, %hi(D_80157DA0) # $t7, 0x8015 -/* A9E274 800270D4 25EF7DA0 */ addiu $t7, %lo(D_80157DA0) # addiu $t7, $t7, 0x7da0 -/* A9E278 800270D8 000E70C0 */ sll $t6, $t6, 3 -/* A9E27C 800270DC 01CF1021 */ addu $v0, $t6, $t7 -/* A9E280 800270E0 A0400004 */ sb $zero, 4($v0) -/* A9E284 800270E4 3C198011 */ lui $t9, %hi(D_80115868) # $t9, 0x8011 -/* A9E288 800270E8 8F395868 */ lw $t9, %lo(D_80115868)($t9) -/* A9E28C 800270EC 24440008 */ addiu $a0, $v0, 8 -/* A9E290 800270F0 0320F809 */ jalr $t9 -/* A9E294 800270F4 00000000 */ nop -/* A9E298 800270F8 10000028 */ b .L8002719C -/* A9E29C 800270FC 8FBF0014 */ lw $ra, 0x14($sp) -.L80027100: -/* A9E2A0 80027100 24A5FFFD */ addiu $a1, $a1, -3 -/* A9E2A4 80027104 28A10019 */ slti $at, $a1, 0x19 -/* A9E2A8 80027108 10200010 */ beqz $at, .L8002714C -/* A9E2AC 8002710C 0005C0C0 */ sll $t8, $a1, 3 -/* A9E2B0 80027110 0305C023 */ subu $t8, $t8, $a1 -/* A9E2B4 80027114 0018C080 */ sll $t8, $t8, 2 -/* A9E2B8 80027118 0305C023 */ subu $t8, $t8, $a1 -/* A9E2BC 8002711C 3C088015 */ lui $t0, %hi(D_80157DA0) # $t0, 0x8015 -/* A9E2C0 80027120 25087DA0 */ addiu $t0, %lo(D_80157DA0) # addiu $t0, $t0, 0x7da0 -/* A9E2C4 80027124 0018C100 */ sll $t8, $t8, 4 -/* A9E2C8 80027128 03081021 */ addu $v0, $t8, $t0 -/* A9E2CC 8002712C A0400E5C */ sb $zero, 0xe5c($v0) -/* A9E2D0 80027130 3C198011 */ lui $t9, %hi(D_8011587C) # $t9, 0x8011 -/* A9E2D4 80027134 8F39587C */ lw $t9, %lo(D_8011587C)($t9) -/* A9E2D8 80027138 24440E60 */ addiu $a0, $v0, 0xe60 -/* A9E2DC 8002713C 0320F809 */ jalr $t9 -/* A9E2E0 80027140 00000000 */ nop -/* A9E2E4 80027144 10000015 */ b .L8002719C -/* A9E2E8 80027148 8FBF0014 */ lw $ra, 0x14($sp) -.L8002714C: -/* A9E2EC 8002714C 24A5FFE7 */ addiu $a1, $a1, -0x19 -/* A9E2F0 80027150 28A10003 */ slti $at, $a1, 3 -/* A9E2F4 80027154 10200010 */ beqz $at, .L80027198 -/* A9E2F8 80027158 000548C0 */ sll $t1, $a1, 3 -/* A9E2FC 8002715C 01254823 */ subu $t1, $t1, $a1 -/* A9E300 80027160 00094880 */ sll $t1, $t1, 2 -/* A9E304 80027164 01254821 */ addu $t1, $t1, $a1 -/* A9E308 80027168 00094880 */ sll $t1, $t1, 2 -/* A9E30C 8002716C 01254823 */ subu $t1, $t1, $a1 -/* A9E310 80027170 3C0A8015 */ lui $t2, %hi(D_80157DA0) # $t2, 0x8015 -/* A9E314 80027174 254A7DA0 */ addiu $t2, %lo(D_80157DA0) # addiu $t2, $t2, 0x7da0 -/* A9E318 80027178 00094880 */ sll $t1, $t1, 2 -/* A9E31C 8002717C 012A1021 */ addu $v0, $t1, $t2 -/* A9E320 80027180 A040388C */ sb $zero, 0x388c($v0) -/* A9E324 80027184 3C198011 */ lui $t9, %hi(D_801158A4) # $t9, 0x8011 -/* A9E328 80027188 8F3958A4 */ lw $t9, %lo(D_801158A4)($t9) -/* A9E32C 8002718C 24443890 */ addiu $a0, $v0, 0x3890 -/* A9E330 80027190 0320F809 */ jalr $t9 -/* A9E334 80027194 00000000 */ nop -.L80027198: -/* A9E338 80027198 8FBF0014 */ lw $ra, 0x14($sp) -.L8002719C: -/* A9E33C 8002719C 27BD0018 */ addiu $sp, $sp, 0x18 -/* A9E340 800271A0 03E00008 */ jr $ra -/* A9E344 800271A4 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect/func_800271A8.s b/asm/non_matchings/code/z_effect/func_800271A8.s deleted file mode 100644 index f31a076a46..0000000000 --- a/asm/non_matchings/code/z_effect/func_800271A8.s +++ /dev/null @@ -1,83 +0,0 @@ -.rdata -glabel D_8013571C - .asciz "エフェクト総て解放\n" - # EUC-JP: エフェクト総て解 | Release all effects - .balign 4 - -glabel D_80135730 - .asciz "エフェクト総て解放 終了\n" - # EUC-JP: エフェクト総て解放 終了 | Release all effects? - .balign 4 - -.text -glabel func_800271A8 -/* A9E348 800271A8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A9E34C 800271AC AFA40028 */ sw $a0, 0x28($sp) -/* A9E350 800271B0 AFBF0024 */ sw $ra, 0x24($sp) -/* A9E354 800271B4 3C048013 */ lui $a0, %hi(D_8013571C) # $a0, 0x8013 -/* A9E358 800271B8 AFB30020 */ sw $s3, 0x20($sp) -/* A9E35C 800271BC AFB2001C */ sw $s2, 0x1c($sp) -/* A9E360 800271C0 AFB10018 */ sw $s1, 0x18($sp) -/* A9E364 800271C4 AFB00014 */ sw $s0, 0x14($sp) -/* A9E368 800271C8 0C00084C */ jal osSyncPrintf -/* A9E36C 800271CC 2484571C */ addiu $a0, %lo(D_8013571C) # addiu $a0, $a0, 0x571c -/* A9E370 800271D0 3C118015 */ lui $s1, %hi(D_80157DA0) # $s1, 0x8015 -/* A9E374 800271D4 3C108015 */ lui $s0, %hi(D_80157DA8) # $s0, 0x8015 -/* A9E378 800271D8 3C138016 */ lui $s3, %hi(D_80158C00) # $s3, 0x8016 -/* A9E37C 800271DC 3C128011 */ lui $s2, %hi(D_80115860) # $s2, 0x8011 -/* A9E380 800271E0 26525860 */ addiu $s2, %lo(D_80115860) # addiu $s2, $s2, 0x5860 -/* A9E384 800271E4 26738C00 */ addiu $s3, %lo(D_80158C00) # addiu $s3, $s3, -0x7400 -/* A9E388 800271E8 26107DA8 */ addiu $s0, %lo(D_80157DA8) # addiu $s0, $s0, 0x7da8 -/* A9E38C 800271EC 26317DA0 */ addiu $s1, %lo(D_80157DA0) # addiu $s1, $s1, 0x7da0 -.L800271F0: -/* A9E390 800271F0 8E590008 */ lw $t9, 8($s2) -/* A9E394 800271F4 A2200004 */ sb $zero, 4($s1) -/* A9E398 800271F8 02002025 */ move $a0, $s0 -/* A9E39C 800271FC 0320F809 */ jalr $t9 -/* A9E3A0 80027200 00000000 */ nop -/* A9E3A4 80027204 261004C8 */ addiu $s0, $s0, 0x4c8 -/* A9E3A8 80027208 0213082B */ sltu $at, $s0, $s3 -/* A9E3AC 8002720C 1420FFF8 */ bnez $at, .L800271F0 -/* A9E3B0 80027210 263104C8 */ addiu $s1, $s1, 0x4c8 -/* A9E3B4 80027214 3C118015 */ lui $s1, %hi(D_80157DA0) # $s1, 0x8015 -/* A9E3B8 80027218 3C108016 */ lui $s0, %hi(D_80158C00) # $s0, 0x8016 -/* A9E3BC 8002721C 3C138016 */ lui $s3, %hi(D_8015B630) # $s3, 0x8016 -/* A9E3C0 80027220 2673B630 */ addiu $s3, %lo(D_8015B630) # addiu $s3, $s3, -0x49d0 -/* A9E3C4 80027224 26108C00 */ addiu $s0, %lo(D_80158C00) # addiu $s0, $s0, -0x7400 -/* A9E3C8 80027228 26317DA0 */ addiu $s1, %lo(D_80157DA0) # addiu $s1, $s1, 0x7da0 -.L8002722C: -/* A9E3CC 8002722C 8E59001C */ lw $t9, 0x1c($s2) -/* A9E3D0 80027230 A2200E5C */ sb $zero, 0xe5c($s1) -/* A9E3D4 80027234 02002025 */ move $a0, $s0 -/* A9E3D8 80027238 0320F809 */ jalr $t9 -/* A9E3DC 8002723C 00000000 */ nop -/* A9E3E0 80027240 261001B0 */ addiu $s0, $s0, 0x1b0 -/* A9E3E4 80027244 0213082B */ sltu $at, $s0, $s3 -/* A9E3E8 80027248 1420FFF8 */ bnez $at, .L8002722C -/* A9E3EC 8002724C 263101B0 */ addiu $s1, $s1, 0x1b0 -/* A9E3F0 80027250 3C118015 */ lui $s1, %hi(D_80157DA0) # $s1, 0x8015 -/* A9E3F4 80027254 3C108016 */ lui $s0, %hi(D_8015B630) # $s0, 0x8016 -/* A9E3F8 80027258 3C138016 */ lui $s3, %hi(D_8015BB94) # $s3, 0x8016 -/* A9E3FC 8002725C 2673BB94 */ addiu $s3, %lo(D_8015BB94) # addiu $s3, $s3, -0x446c -/* A9E400 80027260 2610B630 */ addiu $s0, %lo(D_8015B630) # addiu $s0, $s0, -0x49d0 -/* A9E404 80027264 26317DA0 */ addiu $s1, %lo(D_80157DA0) # addiu $s1, $s1, 0x7da0 -.L80027268: -/* A9E408 80027268 8E590044 */ lw $t9, 0x44($s2) -/* A9E40C 8002726C A220388C */ sb $zero, 0x388c($s1) -/* A9E410 80027270 02002025 */ move $a0, $s0 -/* A9E414 80027274 0320F809 */ jalr $t9 -/* A9E418 80027278 00000000 */ nop -/* A9E41C 8002727C 261001CC */ addiu $s0, $s0, 0x1cc -/* A9E420 80027280 1613FFF9 */ bne $s0, $s3, .L80027268 -/* A9E424 80027284 263101CC */ addiu $s1, $s1, 0x1cc -/* A9E428 80027288 3C048013 */ lui $a0, %hi(D_80135730) # $a0, 0x8013 -/* A9E42C 8002728C 0C00084C */ jal osSyncPrintf -/* A9E430 80027290 24845730 */ addiu $a0, %lo(D_80135730) # addiu $a0, $a0, 0x5730 -/* A9E434 80027294 8FBF0024 */ lw $ra, 0x24($sp) -/* A9E438 80027298 8FB00014 */ lw $s0, 0x14($sp) -/* A9E43C 8002729C 8FB10018 */ lw $s1, 0x18($sp) -/* A9E440 800272A0 8FB2001C */ lw $s2, 0x1c($sp) -/* A9E444 800272A4 8FB30020 */ lw $s3, 0x20($sp) -/* A9E448 800272A8 03E00008 */ jr $ra -/* A9E44C 800272AC 27BD0028 */ addiu $sp, $sp, 0x28 - diff --git a/asm/non_matchings/code/z_effect_soft_sprite/func_800272B0.s b/asm/non_matchings/code/z_effect_soft_sprite/func_800272B0.s deleted file mode 100644 index 75a5ee1c64..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite/func_800272B0.s +++ /dev/null @@ -1,113 +0,0 @@ -.rdata -glabel D_80135750 - .asciz "effect index %3d:size=%6dbyte romsize=%6dbyte\n" - .balign 4 - -glabel D_80135780 - .asciz "../z_effect_soft_sprite.c" - .balign 4 - -glabel D_8013579C - .asciz "EffectSS2Info.data_table != NULL" - .balign 4 - -glabel D_801357C0 - .asciz "../z_effect_soft_sprite.c" - .balign 4 - -.text -glabel func_800272B0 -/* A9E450 800272B0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A9E454 800272B4 AFB2001C */ sw $s2, 0x1c($sp) -/* A9E458 800272B8 AFB10018 */ sw $s1, 0x18($sp) -/* A9E45C 800272BC AFB30020 */ sw $s3, 0x20($sp) -/* A9E460 800272C0 AFB00014 */ sw $s0, 0x14($sp) -/* A9E464 800272C4 3C118011 */ lui $s1, %hi(sParticleOverlayTable) # $s1, 0x8011 -/* A9E468 800272C8 3C128013 */ lui $s2, %hi(D_80135750) # $s2, 0x8013 -/* A9E46C 800272CC AFBF0024 */ sw $ra, 0x24($sp) -/* A9E470 800272D0 AFA40028 */ sw $a0, 0x28($sp) -/* A9E474 800272D4 AFA5002C */ sw $a1, 0x2c($sp) -/* A9E478 800272D8 26525750 */ addiu $s2, %lo(D_80135750) # addiu $s2, $s2, 0x5750 -/* A9E47C 800272DC 263159B0 */ addiu $s1, %lo(sParticleOverlayTable) # addiu $s1, $s1, 0x59b0 -/* A9E480 800272E0 00008025 */ move $s0, $zero -/* A9E484 800272E4 24130025 */ li $s3, 37 -.L800272E8: -/* A9E488 800272E8 8E2E000C */ lw $t6, 0xc($s1) -/* A9E48C 800272EC 8E2F0008 */ lw $t7, 8($s1) -/* A9E490 800272F0 8E380004 */ lw $t8, 4($s1) -/* A9E494 800272F4 8E390000 */ lw $t9, ($s1) -/* A9E498 800272F8 02402025 */ move $a0, $s2 -/* A9E49C 800272FC 02002825 */ move $a1, $s0 -/* A9E4A0 80027300 01CF3023 */ subu $a2, $t6, $t7 -/* A9E4A4 80027304 0C00084C */ jal osSyncPrintf -/* A9E4A8 80027308 03193823 */ subu $a3, $t8, $t9 -/* A9E4AC 8002730C 26100001 */ addiu $s0, $s0, 1 -/* A9E4B0 80027310 1613FFF5 */ bne $s0, $s3, .L800272E8 -/* A9E4B4 80027314 2631001C */ addiu $s1, $s1, 0x1c -/* A9E4B8 80027318 8FA8002C */ lw $t0, 0x2c($sp) -/* A9E4BC 8002731C 24120060 */ li $s2, 96 -/* A9E4C0 80027320 3C068013 */ lui $a2, %hi(D_80135780) # $a2, 0x8013 -/* A9E4C4 80027324 01120019 */ multu $t0, $s2 -/* A9E4C8 80027328 24C65780 */ addiu $a2, %lo(D_80135780) # addiu $a2, $a2, 0x5780 -/* A9E4CC 8002732C 8FA40028 */ lw $a0, 0x28($sp) -/* A9E4D0 80027330 24070121 */ li $a3, 289 -/* A9E4D4 80027334 00002812 */ mflo $a1 -/* A9E4D8 80027338 0C031521 */ jal GameState_AllocEnd -/* A9E4DC 8002733C 00000000 */ nop -/* A9E4E0 80027340 3C118011 */ lui $s1, %hi(EffectSS2Info) # $s1, 0x8011 -/* A9E4E4 80027344 263158B0 */ addiu $s1, %lo(EffectSS2Info) # addiu $s1, $s1, 0x58b0 -/* A9E4E8 80027348 AE220000 */ sw $v0, ($s1) -/* A9E4EC 8002734C 14400008 */ bnez $v0, .L80027370 -/* A9E4F0 80027350 00401825 */ move $v1, $v0 -/* A9E4F4 80027354 3C048013 */ lui $a0, %hi(D_8013579C) # $a0, 0x8013 -/* A9E4F8 80027358 3C058013 */ lui $a1, %hi(D_801357C0) # $a1, 0x8013 -/* A9E4FC 8002735C 24A557C0 */ addiu $a1, %lo(D_801357C0) # addiu $a1, $a1, 0x57c0 -/* A9E500 80027360 2484579C */ addiu $a0, %lo(D_8013579C) # addiu $a0, $a0, 0x579c -/* A9E504 80027364 0C0007FC */ jal __assert -/* A9E508 80027368 24060122 */ li $a2, 290 -/* A9E50C 8002736C 8E230000 */ lw $v1, ($s1) -.L80027370: -/* A9E510 80027370 8FA9002C */ lw $t1, 0x2c($sp) -/* A9E514 80027374 AE200004 */ sw $zero, 4($s1) -/* A9E518 80027378 00608025 */ move $s0, $v1 -/* A9E51C 8002737C 01320019 */ multu $t1, $s2 -/* A9E520 80027380 AE290008 */ sw $t1, 8($s1) -/* A9E524 80027384 00005812 */ mflo $t3 -/* A9E528 80027388 01636021 */ addu $t4, $t3, $v1 -/* A9E52C 8002738C 006C082B */ sltu $at, $v1, $t4 -/* A9E530 80027390 1020000C */ beqz $at, .L800273C4 -/* A9E534 80027394 00000000 */ nop -.L80027398: -/* A9E538 80027398 0C009D4F */ jal Effect_SS_ResetEntry -/* A9E53C 8002739C 02002025 */ move $a0, $s0 -/* A9E540 800273A0 8E2D0008 */ lw $t5, 8($s1) -/* A9E544 800273A4 8E2F0000 */ lw $t7, ($s1) -/* A9E548 800273A8 26100060 */ addiu $s0, $s0, 0x60 -/* A9E54C 800273AC 01B20019 */ multu $t5, $s2 -/* A9E550 800273B0 00007012 */ mflo $t6 -/* A9E554 800273B4 01CFC021 */ addu $t8, $t6, $t7 -/* A9E558 800273B8 0218082B */ sltu $at, $s0, $t8 -/* A9E55C 800273BC 1420FFF6 */ bnez $at, .L80027398 -/* A9E560 800273C0 00000000 */ nop -.L800273C4: -/* A9E564 800273C4 3C018011 */ lui $at, %hi(D_801159C0) # $at, 0x8011 -/* A9E568 800273C8 3C028011 */ lui $v0, %hi(D_801159CC) # $v0, 0x8011 -/* A9E56C 800273CC 244259CC */ addiu $v0, %lo(D_801159CC) # addiu $v0, $v0, 0x59cc -/* A9E570 800273D0 AC2059C0 */ sw $zero, %lo(D_801159C0)($at) -/* A9E574 800273D4 24100001 */ li $s0, 1 -.L800273D8: -/* A9E578 800273D8 26100004 */ addiu $s0, $s0, 4 -/* A9E57C 800273DC AC40002C */ sw $zero, 0x2c($v0) -/* A9E580 800273E0 AC400048 */ sw $zero, 0x48($v0) -/* A9E584 800273E4 AC400064 */ sw $zero, 0x64($v0) -/* A9E588 800273E8 24420070 */ addiu $v0, $v0, 0x70 -/* A9E58C 800273EC 1613FFFA */ bne $s0, $s3, .L800273D8 -/* A9E590 800273F0 AC40FFA0 */ sw $zero, -0x60($v0) -/* A9E594 800273F4 8FBF0024 */ lw $ra, 0x24($sp) -/* A9E598 800273F8 8FB00014 */ lw $s0, 0x14($sp) -/* A9E59C 800273FC 8FB10018 */ lw $s1, 0x18($sp) -/* A9E5A0 80027400 8FB2001C */ lw $s2, 0x1c($sp) -/* A9E5A4 80027404 8FB30020 */ lw $s3, 0x20($sp) -/* A9E5A8 80027408 03E00008 */ jr $ra -/* A9E5AC 8002740C 27BD0028 */ addiu $sp, $sp, 0x28 - diff --git a/asm/non_matchings/code/z_effect_soft_sprite/func_800275D0.s b/asm/non_matchings/code/z_effect_soft_sprite/func_800275D0.s deleted file mode 100644 index 25d67e9482..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite/func_800275D0.s +++ /dev/null @@ -1,97 +0,0 @@ -.rdata -glabel D_801357DC - .asciz "../z_effect_soft_sprite.c" - .balign 4 - -.text -glabel func_800275D0 -/* A9E770 800275D0 3C068011 */ lui $a2, %hi(EffectSS2Info) # $a2, 0x8011 -/* A9E774 800275D4 24C658B0 */ addiu $a2, %lo(EffectSS2Info) # addiu $a2, $a2, 0x58b0 -/* A9E778 800275D8 8CC20004 */ lw $v0, 4($a2) -/* A9E77C 800275DC 8CC30008 */ lw $v1, 8($a2) -/* A9E780 800275E0 27BDFFF8 */ addiu $sp, $sp, -8 -/* A9E784 800275E4 AFB00004 */ sw $s0, 4($sp) -/* A9E788 800275E8 0043082A */ slt $at, $v0, $v1 -/* A9E78C 800275EC 00808025 */ move $s0, $a0 -/* A9E790 800275F0 14200003 */ bnez $at, .L80027600 -/* A9E794 800275F4 AFA5000C */ sw $a1, 0xc($sp) -/* A9E798 800275F8 ACC00004 */ sw $zero, 4($a2) -/* A9E79C 800275FC 00001025 */ move $v0, $zero -.L80027600: -/* A9E7A0 80027600 3C068011 */ lui $a2, %hi(EffectSS2Info) # $a2, 0x8011 -/* A9E7A4 80027604 8CC658B0 */ lw $a2, %lo(EffectSS2Info)($a2) -/* A9E7A8 80027608 00027080 */ sll $t6, $v0, 2 -/* A9E7AC 8002760C 01C27023 */ subu $t6, $t6, $v0 -/* A9E7B0 80027610 000E7140 */ sll $t6, $t6, 5 -/* A9E7B4 80027614 00402025 */ move $a0, $v0 -/* A9E7B8 80027618 00002825 */ move $a1, $zero -/* A9E7BC 8002761C 2408FFFF */ li $t0, -1 -/* A9E7C0 80027620 00CE3821 */ addu $a3, $a2, $t6 -.L80027624: -/* A9E7C4 80027624 84EF005C */ lh $t7, 0x5c($a3) -/* A9E7C8 80027628 550F0004 */ bnel $t0, $t7, .L8002763C -/* A9E7CC 8002762C 24840001 */ addiu $a0, $a0, 1 -/* A9E7D0 80027630 1000000C */ b .L80027664 -/* A9E7D4 80027634 24050001 */ li $a1, 1 -/* A9E7D8 80027638 24840001 */ addiu $a0, $a0, 1 -.L8002763C: -/* A9E7DC 8002763C 0083082A */ slt $at, $a0, $v1 -/* A9E7E0 80027640 14200002 */ bnez $at, .L8002764C -/* A9E7E4 80027644 00000000 */ nop -/* A9E7E8 80027648 00002025 */ move $a0, $zero -.L8002764C: -/* A9E7EC 8002764C 10820005 */ beq $a0, $v0, .L80027664 -/* A9E7F0 80027650 0004C080 */ sll $t8, $a0, 2 -/* A9E7F4 80027654 0304C023 */ subu $t8, $t8, $a0 -/* A9E7F8 80027658 0018C140 */ sll $t8, $t8, 5 -/* A9E7FC 8002765C 1000FFF1 */ b .L80027624 -/* A9E800 80027660 00D83821 */ addu $a3, $a2, $t8 -.L80027664: -/* A9E804 80027664 24010001 */ li $at, 1 -/* A9E808 80027668 14A10005 */ bne $a1, $at, .L80027680 -/* A9E80C 8002766C 00024880 */ sll $t1, $v0, 2 -/* A9E810 80027670 8FB9000C */ lw $t9, 0xc($sp) -/* A9E814 80027674 00001025 */ move $v0, $zero -/* A9E818 80027678 1000001F */ b .L800276F8 -/* A9E81C 8002767C AF240000 */ sw $a0, ($t9) -.L80027680: -/* A9E820 80027680 01224823 */ subu $t1, $t1, $v0 -/* A9E824 80027684 00094940 */ sll $t1, $t1, 5 -/* A9E828 80027688 00402025 */ move $a0, $v0 -/* A9E82C 8002768C 00C93821 */ addu $a3, $a2, $t1 -.L80027690: -/* A9E830 80027690 90E5005E */ lbu $a1, 0x5e($a3) -/* A9E834 80027694 00B0082A */ slt $at, $a1, $s0 -/* A9E838 80027698 54200008 */ bnezl $at, .L800276BC -/* A9E83C 8002769C 24840001 */ addiu $a0, $a0, 1 -/* A9E840 800276A0 56050013 */ bnel $s0, $a1, .L800276F0 -/* A9E844 800276A4 8FAD000C */ lw $t5, 0xc($sp) -/* A9E848 800276A8 94EA005A */ lhu $t2, 0x5a($a3) -/* A9E84C 800276AC 314B0001 */ andi $t3, $t2, 1 -/* A9E850 800276B0 5160000F */ beql $t3, $zero, .L800276F0 -/* A9E854 800276B4 8FAD000C */ lw $t5, 0xc($sp) -/* A9E858 800276B8 24840001 */ addiu $a0, $a0, 1 -.L800276BC: -/* A9E85C 800276BC 0083082A */ slt $at, $a0, $v1 -/* A9E860 800276C0 14200002 */ bnez $at, .L800276CC -/* A9E864 800276C4 00000000 */ nop -/* A9E868 800276C8 00002025 */ move $a0, $zero -.L800276CC: -/* A9E86C 800276CC 14820003 */ bne $a0, $v0, .L800276DC -/* A9E870 800276D0 00046080 */ sll $t4, $a0, 2 -/* A9E874 800276D4 10000008 */ b .L800276F8 -/* A9E878 800276D8 24020001 */ li $v0, 1 -.L800276DC: -/* A9E87C 800276DC 01846023 */ subu $t4, $t4, $a0 -/* A9E880 800276E0 000C6140 */ sll $t4, $t4, 5 -/* A9E884 800276E4 1000FFEA */ b .L80027690 -/* A9E888 800276E8 00CC3821 */ addu $a3, $a2, $t4 -/* A9E88C 800276EC 8FAD000C */ lw $t5, 0xc($sp) -.L800276F0: -/* A9E890 800276F0 00001025 */ move $v0, $zero -/* A9E894 800276F4 ADA40000 */ sw $a0, ($t5) -.L800276F8: -/* A9E898 800276F8 8FB00004 */ lw $s0, 4($sp) -/* A9E89C 800276FC 03E00008 */ jr $ra -/* A9E8A0 80027700 27BD0008 */ addiu $sp, $sp, 8 - diff --git a/asm/non_matchings/code/z_effect_soft_sprite/func_80027704.s b/asm/non_matchings/code/z_effect_soft_sprite/func_80027704.s deleted file mode 100644 index cd9c2e2d7e..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite/func_80027704.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_80027704 -/* A9E8A4 80027704 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A9E8A8 80027708 AFBF0014 */ sw $ra, 0x14($sp) -/* A9E8AC 8002770C 0C03034A */ jal func_800C0D28 -/* A9E8B0 80027710 AFA50024 */ sw $a1, 0x24($sp) -/* A9E8B4 80027714 24010001 */ li $at, 1 -/* A9E8B8 80027718 1041001B */ beq $v0, $at, .L80027788 -/* A9E8BC 8002771C 8FAE0024 */ lw $t6, 0x24($sp) -/* A9E8C0 80027720 91C4005E */ lbu $a0, 0x5e($t6) -/* A9E8C4 80027724 0C009D74 */ jal func_800275D0 -/* A9E8C8 80027728 27A5001C */ addiu $a1, $sp, 0x1c -/* A9E8CC 8002772C 14400016 */ bnez $v0, .L80027788 -/* A9E8D0 80027730 8FAF001C */ lw $t7, 0x1c($sp) -/* A9E8D4 80027734 8FA8001C */ lw $t0, 0x1c($sp) -/* A9E8D8 80027738 3C028011 */ lui $v0, %hi(EffectSS2Info) # $v0, 0x8011 -/* A9E8DC 8002773C 244258B0 */ addiu $v0, %lo(EffectSS2Info) # addiu $v0, $v0, 0x58b0 -/* A9E8E0 80027740 8C590000 */ lw $t9, ($v0) -/* A9E8E4 80027744 8FAB0024 */ lw $t3, 0x24($sp) -/* A9E8E8 80027748 00084880 */ sll $t1, $t0, 2 -/* A9E8EC 8002774C 01284823 */ subu $t1, $t1, $t0 -/* A9E8F0 80027750 25F80001 */ addiu $t8, $t7, 1 -/* A9E8F4 80027754 00094940 */ sll $t1, $t1, 5 -/* A9E8F8 80027758 AC580004 */ sw $t8, 4($v0) -/* A9E8FC 8002775C 03295021 */ addu $t2, $t9, $t1 -/* A9E900 80027760 256E0060 */ addiu $t6, $t3, 0x60 -.L80027764: -/* A9E904 80027764 8D6D0000 */ lw $t5, ($t3) -/* A9E908 80027768 256B000C */ addiu $t3, $t3, 0xc -/* A9E90C 8002776C 254A000C */ addiu $t2, $t2, 0xc -/* A9E910 80027770 AD4DFFF4 */ sw $t5, -0xc($t2) -/* A9E914 80027774 8D6CFFF8 */ lw $t4, -8($t3) -/* A9E918 80027778 AD4CFFF8 */ sw $t4, -8($t2) -/* A9E91C 8002777C 8D6DFFFC */ lw $t5, -4($t3) -/* A9E920 80027780 156EFFF8 */ bne $t3, $t6, .L80027764 -/* A9E924 80027784 AD4DFFFC */ sw $t5, -4($t2) -.L80027788: -/* A9E928 80027788 8FBF0014 */ lw $ra, 0x14($sp) -/* A9E92C 8002778C 27BD0020 */ addiu $sp, $sp, 0x20 -/* A9E930 80027790 03E00008 */ jr $ra -/* A9E934 80027794 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite/func_80027798.s b/asm/non_matchings/code/z_effect_soft_sprite/func_80027798.s deleted file mode 100644 index 3ddc6546aa..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite/func_80027798.s +++ /dev/null @@ -1,243 +0,0 @@ -.rdata -glabel D_801357F8 - .asciz "type < EFFECT_SS2_TYPE_LAST_LABEL" - .balign 4 - -glabel D_8013581C - .asciz "../z_effect_soft_sprite.c" - .balign 4 - -glabel D_80135838 - .asciz "EffectSoftSprite2_makeEffect():オーバーレイではありません。\n" - # EUC-JP: オーバーレイではありません。| Not an overlay - .balign 4 - -glabel D_80135878 - .asciz "../z_effect_soft_sprite.c" - .balign 4 - -glabel D_80135894 - .asciz "\x1b[31m" - .balign 4 - -glabel D_8013589C - .asciz "EffectSoftSprite2_makeEffect():zelda_malloc_r()により,%dbyteのメモリ確保ができま\nせん。そのため、プログラムのロードも\n出来ません。ただいま危険な状態です！\nもちろん,エフェクトも出ません。\n" - # EUC-JP: により,%dbyteのメモリ確保ができま せん。そのため、プログラムのロードも 出来ません。ただいま危険な状態です！ もちろん,エフェクトも出ません。 | , The memory of% dbyte cannot be secured. Therefore, the program cannot be loaded. I'm in danger right now! Of course, there are no effects. - .balign 4 - -glabel D_80135958 - .asciz "\x1b[m" - .balign 4 - -glabel D_8013595C - .asciz "\x1b[32m" - .balign 4 - -glabel D_80135964 - .asciz "EFFECT SS OVL:SegRom %08x %08x, Seg %08x %08x, RamStart %08x, type: %d\n" - .balign 4 - -glabel D_801359AC - .asciz "\x1b[m" - .balign 4 - -glabel D_801359B0 - .asciz "EffectSoftSprite2_makeEffect():すでにエフェクトはロード済みで\nすが,コンストラクターがNULLなので追加をやめます。\n直してください。（メモリーの無駄) %08x %d\n" - # EUC-JP: すでにエフェクトはロード済みで すが,コンストラクターがNULLなので追加をやめます。 直してください。（メモリーの無駄) | The effects have already been loaded, but we stop adding them because the constructor is NULL. please fix this. (Waste of memory) - .balign 4 - -glabel D_80135A4C - .asciz "\x1b[32m" - .balign 4 - -glabel D_80135A54 - .asciz "EffectSoftSprite2_makeEffect():何らかの理由でコンストラクト失敗。コンストラクターがエラーを返しました。エフェクトの追加を中止します。\n" - # EUC-JP: 何らかの理由でコンストラクト失敗。コンストラクターがエラーを返しました。エフェクトの追加を中止します | Construct failed for some reason. The constructor returned an error. Stop adding effects - .balign 4 - -glabel D_80135ADC - .asciz "\x1b[m" - .balign 4 - -.text -glabel func_80027798 -/* A9E938 80027798 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* A9E93C 8002779C 28A10025 */ slti $at, $a1, 0x25 -/* A9E940 800277A0 AFBF0024 */ sw $ra, 0x24($sp) -/* A9E944 800277A4 AFA40048 */ sw $a0, 0x48($sp) -/* A9E948 800277A8 AFA5004C */ sw $a1, 0x4c($sp) -/* A9E94C 800277AC AFA60050 */ sw $a2, 0x50($sp) -/* A9E950 800277B0 14200007 */ bnez $at, .L800277D0 -/* A9E954 800277B4 AFA70054 */ sw $a3, 0x54($sp) -/* A9E958 800277B8 3C048013 */ lui $a0, %hi(D_801357F8) # $a0, 0x8013 -/* A9E95C 800277BC 3C058013 */ lui $a1, %hi(D_8013581C) # $a1, 0x8013 -/* A9E960 800277C0 24A5581C */ addiu $a1, %lo(D_8013581C) # addiu $a1, $a1, 0x581c -/* A9E964 800277C4 248457F8 */ addiu $a0, %lo(D_801357F8) # addiu $a0, $a0, 0x57f8 -/* A9E968 800277C8 0C0007FC */ jal __assert -/* A9E96C 800277CC 2406022C */ li $a2, 556 -.L800277D0: -/* A9E970 800277D0 8FA40050 */ lw $a0, 0x50($sp) -/* A9E974 800277D4 0C009D74 */ jal func_800275D0 -/* A9E978 800277D8 27A50044 */ addiu $a1, $sp, 0x44 -/* A9E97C 800277DC 14400094 */ bnez $v0, .L80027A30 -/* A9E980 800277E0 8FAF0044 */ lw $t7, 0x44($sp) -/* A9E984 800277E4 8FB9004C */ lw $t9, 0x4c($sp) -/* A9E988 800277E8 3C098011 */ lui $t1, %hi(sParticleOverlayTable) # $t1, 0x8011 -/* A9E98C 800277EC 25F80001 */ addiu $t8, $t7, 1 -/* A9E990 800277F0 001940C0 */ sll $t0, $t9, 3 -/* A9E994 800277F4 01194023 */ subu $t0, $t0, $t9 -/* A9E998 800277F8 3C018011 */ lui $at, %hi(D_801158B4) # $at, 0x8011 -/* A9E99C 800277FC 00084080 */ sll $t0, $t0, 2 -/* A9E9A0 80027800 252959B0 */ addiu $t1, %lo(sParticleOverlayTable) # addiu $t1, $t1, 0x59b0 -/* A9E9A4 80027804 AC3858B4 */ sw $t8, %lo(D_801158B4)($at) -/* A9E9A8 80027808 01091821 */ addu $v1, $t0, $t1 -/* A9E9AC 8002780C 8C620008 */ lw $v0, 8($v1) -/* A9E9B0 80027810 8C6A000C */ lw $t2, 0xc($v1) -/* A9E9B4 80027814 14400009 */ bnez $v0, .L8002783C -/* A9E9B8 80027818 01422023 */ subu $a0, $t2, $v0 -/* A9E9BC 8002781C 3C048013 */ lui $a0, %hi(D_80135838) # $a0, 0x8013 -/* A9E9C0 80027820 24845838 */ addiu $a0, %lo(D_80135838) # addiu $a0, $a0, 0x5838 -/* A9E9C4 80027824 0C00084C */ jal osSyncPrintf -/* A9E9C8 80027828 AFA30030 */ sw $v1, 0x30($sp) -/* A9E9CC 8002782C 8FA30030 */ lw $v1, 0x30($sp) -/* A9E9D0 80027830 8C6B0014 */ lw $t3, 0x14($v1) -/* A9E9D4 80027834 1000003E */ b .L80027930 -/* A9E9D8 80027838 AFAB0038 */ sw $t3, 0x38($sp) -.L8002783C: -/* A9E9DC 8002783C 8C6C0010 */ lw $t4, 0x10($v1) -/* A9E9E0 80027840 3C058013 */ lui $a1, %hi(D_80135878) # $a1, 0x8013 -/* A9E9E4 80027844 24A55878 */ addiu $a1, %lo(D_80135878) # addiu $a1, $a1, 0x5878 -/* A9E9E8 80027848 1580002F */ bnez $t4, .L80027908 -/* A9E9EC 8002784C 24060249 */ li $a2, 585 -/* A9E9F0 80027850 AFA30030 */ sw $v1, 0x30($sp) -/* A9E9F4 80027854 0C01EBE3 */ jal ZeldaArena_MallocRDebug -/* A9E9F8 80027858 AFA40040 */ sw $a0, 0x40($sp) -/* A9E9FC 8002785C 8FA30030 */ lw $v1, 0x30($sp) -/* A9EA00 80027860 3C048013 */ lui $a0, %hi(D_80135894) # $a0, 0x8013 -/* A9EA04 80027864 1440000C */ bnez $v0, .L80027898 -/* A9EA08 80027868 AC620010 */ sw $v0, 0x10($v1) -/* A9EA0C 8002786C 0C00084C */ jal osSyncPrintf -/* A9EA10 80027870 24845894 */ addiu $a0, %lo(D_80135894) # addiu $a0, $a0, 0x5894 -/* A9EA14 80027874 3C048013 */ lui $a0, %hi(D_8013589C) # $a0, 0x8013 -/* A9EA18 80027878 2484589C */ addiu $a0, %lo(D_8013589C) # addiu $a0, $a0, 0x589c -/* A9EA1C 8002787C 0C00084C */ jal osSyncPrintf -/* A9EA20 80027880 8FA50040 */ lw $a1, 0x40($sp) -/* A9EA24 80027884 3C048013 */ lui $a0, %hi(D_80135958) # $a0, 0x8013 -/* A9EA28 80027888 0C00084C */ jal osSyncPrintf -/* A9EA2C 8002788C 24845958 */ addiu $a0, %lo(D_80135958) # addiu $a0, $a0, 0x5958 -/* A9EA30 80027890 10000068 */ b .L80027A34 -/* A9EA34 80027894 8FBF0024 */ lw $ra, 0x24($sp) -.L80027898: -/* A9EA38 80027898 8C6D0010 */ lw $t5, 0x10($v1) -/* A9EA3C 8002789C 8C640000 */ lw $a0, ($v1) -/* A9EA40 800278A0 8C650004 */ lw $a1, 4($v1) -/* A9EA44 800278A4 8C660008 */ lw $a2, 8($v1) -/* A9EA48 800278A8 8C67000C */ lw $a3, 0xc($v1) -/* A9EA4C 800278AC AFA30030 */ sw $v1, 0x30($sp) -/* A9EA50 800278B0 0C03F188 */ jal Overlay_Load -/* A9EA54 800278B4 AFAD0010 */ sw $t5, 0x10($sp) -/* A9EA58 800278B8 3C048013 */ lui $a0, %hi(D_8013595C) # $a0, 0x8013 -/* A9EA5C 800278BC 0C00084C */ jal osSyncPrintf -/* A9EA60 800278C0 2484595C */ addiu $a0, %lo(D_8013595C) # addiu $a0, $a0, 0x595c -/* A9EA64 800278C4 8FA30030 */ lw $v1, 0x30($sp) -/* A9EA68 800278C8 8FB8004C */ lw $t8, 0x4c($sp) -/* A9EA6C 800278CC 3C048013 */ lui $a0, %hi(D_80135964) # $a0, 0x8013 -/* A9EA70 800278D0 8C6E000C */ lw $t6, 0xc($v1) -/* A9EA74 800278D4 8C650000 */ lw $a1, ($v1) -/* A9EA78 800278D8 8C660004 */ lw $a2, 4($v1) -/* A9EA7C 800278DC 8C670008 */ lw $a3, 8($v1) -/* A9EA80 800278E0 AFAE0010 */ sw $t6, 0x10($sp) -/* A9EA84 800278E4 8C6F0010 */ lw $t7, 0x10($v1) -/* A9EA88 800278E8 24845964 */ addiu $a0, %lo(D_80135964) # addiu $a0, $a0, 0x5964 -/* A9EA8C 800278EC AFB80018 */ sw $t8, 0x18($sp) -/* A9EA90 800278F0 0C00084C */ jal osSyncPrintf -/* A9EA94 800278F4 AFAF0014 */ sw $t7, 0x14($sp) -/* A9EA98 800278F8 3C048013 */ lui $a0, %hi(D_801359AC) # $a0, 0x8013 -/* A9EA9C 800278FC 0C00084C */ jal osSyncPrintf -/* A9EAA0 80027900 248459AC */ addiu $a0, %lo(D_801359AC) # addiu $a0, $a0, 0x59ac -/* A9EAA4 80027904 8FA30030 */ lw $v1, 0x30($sp) -.L80027908: -/* A9EAA8 80027908 8C640014 */ lw $a0, 0x14($v1) -/* A9EAAC 8002790C 00001025 */ move $v0, $zero -/* A9EAB0 80027910 10800006 */ beqz $a0, .L8002792C -/* A9EAB4 80027914 00000000 */ nop -/* A9EAB8 80027918 8C790008 */ lw $t9, 8($v1) -/* A9EABC 8002791C 8C680010 */ lw $t0, 0x10($v1) -/* A9EAC0 80027920 03284823 */ subu $t1, $t9, $t0 -/* A9EAC4 80027924 10000001 */ b .L8002792C -/* A9EAC8 80027928 00891023 */ subu $v0, $a0, $t1 -.L8002792C: -/* A9EACC 8002792C AFA20038 */ sw $v0, 0x38($sp) -.L80027930: -/* A9EAD0 80027930 8FAA0038 */ lw $t2, 0x38($sp) -/* A9EAD4 80027934 8FAC0044 */ lw $t4, 0x44($sp) -/* A9EAD8 80027938 3C048013 */ lui $a0, %hi(D_801359B0) # $a0, 0x8013 -/* A9EADC 8002793C 8D4B0004 */ lw $t3, 4($t2) -/* A9EAE0 80027940 000C6880 */ sll $t5, $t4, 2 -/* A9EAE4 80027944 3C0E8011 */ lui $t6, %hi(EffectSS2Info) # $t6, 0x8011 -/* A9EAE8 80027948 15600007 */ bnez $t3, .L80027968 -/* A9EAEC 8002794C 01AC6823 */ subu $t5, $t5, $t4 -/* A9EAF0 80027950 248459B0 */ addiu $a0, %lo(D_801359B0) # addiu $a0, $a0, 0x59b0 -/* A9EAF4 80027954 01402825 */ move $a1, $t2 -/* A9EAF8 80027958 0C00084C */ jal osSyncPrintf -/* A9EAFC 8002795C 8FA6004C */ lw $a2, 0x4c($sp) -/* A9EB00 80027960 10000034 */ b .L80027A34 -/* A9EB04 80027964 8FBF0024 */ lw $ra, 0x24($sp) -.L80027968: -/* A9EB08 80027968 8DCE58B0 */ lw $t6, %lo(EffectSS2Info)($t6) -/* A9EB0C 8002796C 000D6940 */ sll $t5, $t5, 5 -/* A9EB10 80027970 0C009D38 */ jal Effect_SS_Delete -/* A9EB14 80027974 01AE2021 */ addu $a0, $t5, $t6 -/* A9EB18 80027978 8FB90044 */ lw $t9, 0x44($sp) -/* A9EB1C 8002797C 24020060 */ li $v0, 96 -/* A9EB20 80027980 3C038011 */ lui $v1, %hi(EffectSS2Info) # $v1, 0x8011 -/* A9EB24 80027984 03220019 */ multu $t9, $v0 -/* A9EB28 80027988 246358B0 */ addiu $v1, %lo(EffectSS2Info) # addiu $v1, $v1, 0x58b0 -/* A9EB2C 8002798C 8C780000 */ lw $t8, ($v1) -/* A9EB30 80027990 8FAF004C */ lw $t7, 0x4c($sp) -/* A9EB34 80027994 00004012 */ mflo $t0 -/* A9EB38 80027998 03084821 */ addu $t1, $t8, $t0 -/* A9EB3C 8002799C A12F005F */ sb $t7, 0x5f($t1) -/* A9EB40 800279A0 8FAC0044 */ lw $t4, 0x44($sp) -/* A9EB44 800279A4 8C6A0000 */ lw $t2, ($v1) -/* A9EB48 800279A8 8FAB0050 */ lw $t3, 0x50($sp) -/* A9EB4C 800279AC 01820019 */ multu $t4, $v0 -/* A9EB50 800279B0 00006812 */ mflo $t5 -/* A9EB54 800279B4 014D7021 */ addu $t6, $t2, $t5 -/* A9EB58 800279B8 A1CB005E */ sb $t3, 0x5e($t6) -/* A9EB5C 800279BC 8FA50044 */ lw $a1, 0x44($sp) -/* A9EB60 800279C0 8FAF0038 */ lw $t7, 0x38($sp) -/* A9EB64 800279C4 8C680000 */ lw $t0, ($v1) -/* A9EB68 800279C8 00A20019 */ multu $a1, $v0 -/* A9EB6C 800279CC 8DF90004 */ lw $t9, 4($t7) -/* A9EB70 800279D0 8FA70054 */ lw $a3, 0x54($sp) -/* A9EB74 800279D4 8FA40048 */ lw $a0, 0x48($sp) -/* A9EB78 800279D8 0000C012 */ mflo $t8 -/* A9EB7C 800279DC 03083021 */ addu $a2, $t8, $t0 -/* A9EB80 800279E0 0320F809 */ jalr $t9 -/* A9EB84 800279E4 00000000 */ nop -/* A9EB88 800279E8 14400011 */ bnez $v0, .L80027A30 -/* A9EB8C 800279EC 3C048013 */ lui $a0, %hi(D_80135A4C) # $a0, 0x8013 -/* A9EB90 800279F0 0C00084C */ jal osSyncPrintf -/* A9EB94 800279F4 24845A4C */ addiu $a0, %lo(D_80135A4C) # addiu $a0, $a0, 0x5a4c -/* A9EB98 800279F8 3C048013 */ lui $a0, %hi(D_80135A54) # $a0, 0x8013 -/* A9EB9C 800279FC 0C00084C */ jal osSyncPrintf -/* A9EBA0 80027A00 24845A54 */ addiu $a0, %lo(D_80135A54) # addiu $a0, $a0, 0x5a54 -/* A9EBA4 80027A04 3C048013 */ lui $a0, %hi(D_80135ADC) # $a0, 0x8013 -/* A9EBA8 80027A08 0C00084C */ jal osSyncPrintf -/* A9EBAC 80027A0C 24845ADC */ addiu $a0, %lo(D_80135ADC) # addiu $a0, $a0, 0x5adc -/* A9EBB0 80027A10 8FA90044 */ lw $t1, 0x44($sp) -/* A9EBB4 80027A14 3C0A8011 */ lui $t2, %hi(EffectSS2Info) # $t2, 0x8011 -/* A9EBB8 80027A18 8D4A58B0 */ lw $t2, %lo(EffectSS2Info)($t2) -/* A9EBBC 80027A1C 00096080 */ sll $t4, $t1, 2 -/* A9EBC0 80027A20 01896023 */ subu $t4, $t4, $t1 -/* A9EBC4 80027A24 000C6140 */ sll $t4, $t4, 5 -/* A9EBC8 80027A28 0C009D4F */ jal Effect_SS_ResetEntry -/* A9EBCC 80027A2C 018A2021 */ addu $a0, $t4, $t2 -.L80027A30: -/* A9EBD0 80027A30 8FBF0024 */ lw $ra, 0x24($sp) -.L80027A34: -/* A9EBD4 80027A34 27BD0048 */ addiu $sp, $sp, 0x48 -/* A9EBD8 80027A38 03E00008 */ jr $ra -/* A9EBDC 80027A3C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_effect_soft_sprite/func_80027BDC.s b/asm/non_matchings/code/z_effect_soft_sprite/func_80027BDC.s deleted file mode 100644 index 56e97a76df..0000000000 --- a/asm/non_matchings/code/z_effect_soft_sprite/func_80027BDC.s +++ /dev/null @@ -1,158 +0,0 @@ -.rdata -glabel D_80135AE0 - .asciz "\x1b[31m" - .balign 4 - -glabel D_80135AE8 - .asciz "EffectSoftSprite2_disp():位置が領域外のため 削除します。エフェクトラベルNo.%d:プログラムの方で対応をお願いします。ここです ==> pos(%f, %f, %f)で、ラベルはz_effect_soft_sprite_dlftbls.declにあります。\n" - # EUC-JP: 位置が領域外のため 削除します。エフェクトラベルNo.%d:プログラムの方で対応をお願いします。ここです ==> pos(%f, %f, %f)で、ラベルはz_effect_soft_sprite_dlftbls.declにあります。| Since the position is outside the area, delete it. Effect label No.% d: Please respond by the program. Here is ==> pos (% f,% f,% f) and the label is in z_effect_soft_sprite_dlftbls.decl. - .balign 4 - -glabel D_80135BB4 - .asciz "\x1b[32m" - .balign 4 - -glabel D_80135BBC - .asciz "もし、posを別のことに使っている場合相談に応じます。\n" - # EUC-JP: もし、posを別のことに使っている場合相談に応じます。| If you use pos for another thing, we will consult. - .balign 4 - -glabel D_80135BF4 - .asciz "\x1b[m" - .balign 4 - -.text -glabel func_80027BDC -/* A9ED7C 80027BDC 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* A9ED80 80027BE0 AFB30044 */ sw $s3, 0x44($sp) -/* A9ED84 80027BE4 00809825 */ move $s3, $a0 -/* A9ED88 80027BE8 AFBF005C */ sw $ra, 0x5c($sp) -/* A9ED8C 80027BEC AFBE0058 */ sw $fp, 0x58($sp) -/* A9ED90 80027BF0 AFB70054 */ sw $s7, 0x54($sp) -/* A9ED94 80027BF4 AFB60050 */ sw $s6, 0x50($sp) -/* A9ED98 80027BF8 AFB5004C */ sw $s5, 0x4c($sp) -/* A9ED9C 80027BFC AFB40048 */ sw $s4, 0x48($sp) -/* A9EDA0 80027C00 AFB20040 */ sw $s2, 0x40($sp) -/* A9EDA4 80027C04 AFB1003C */ sw $s1, 0x3c($sp) -/* A9EDA8 80027C08 AFB00038 */ sw $s0, 0x38($sp) -/* A9EDAC 80027C0C F7B60030 */ sdc1 $f22, 0x30($sp) -/* A9EDB0 80027C10 F7B40028 */ sdc1 $f20, 0x28($sp) -/* A9EDB4 80027C14 8E650000 */ lw $a1, ($s3) -/* A9EDB8 80027C18 0C01E9B1 */ jal Lights_CreateMapper -/* A9EDBC 80027C1C 248407A8 */ addiu $a0, $a0, 0x7a8 -/* A9EDC0 80027C20 00408025 */ move $s0, $v0 -/* A9EDC4 80027C24 00402025 */ move $a0, $v0 -/* A9EDC8 80027C28 8E6507A8 */ lw $a1, 0x7a8($s3) -/* A9EDCC 80027C2C 0C01E91D */ jal func_8007A474 -/* A9EDD0 80027C30 00003025 */ move $a2, $zero -/* A9EDD4 80027C34 02002025 */ move $a0, $s0 -/* A9EDD8 80027C38 0C01E7BF */ jal func_80079EFC -/* A9EDDC 80027C3C 8E650000 */ lw $a1, ($s3) -/* A9EDE0 80027C40 3C128011 */ lui $s2, %hi(EffectSS2Info) # $s2, 0x8011 -/* A9EDE4 80027C44 265258B0 */ addiu $s2, %lo(EffectSS2Info) # addiu $s2, $s2, 0x58b0 -/* A9EDE8 80027C48 8E430008 */ lw $v1, 8($s2) -/* A9EDEC 80027C4C 00008825 */ move $s1, $zero -/* A9EDF0 80027C50 00008025 */ move $s0, $zero -/* A9EDF4 80027C54 18600051 */ blez $v1, .L80027D9C -/* A9EDF8 80027C58 3C01C6FA */ li $at, 0xC6FA0000 # 0.000000 -/* A9EDFC 80027C5C 4481B000 */ mtc1 $at, $f22 -/* A9EE00 80027C60 3C0146FA */ lui $at, 0x46fa -/* A9EE04 80027C64 3C1E8013 */ lui $fp, %hi(D_80135BF4) # $fp, 0x8013 -/* A9EE08 80027C68 3C178013 */ lui $s7, %hi(D_80135BBC) # $s7, 0x8013 -/* A9EE0C 80027C6C 3C168013 */ lui $s6, %hi(D_80135BB4) # $s6, 0x8013 -/* A9EE10 80027C70 3C158013 */ lui $s5, %hi(D_80135AE8) # $s5, 0x8013 -/* A9EE14 80027C74 3C148013 */ lui $s4, %hi(D_80135AE0) -/* A9EE18 80027C78 4481A000 */ mtc1 $at, $f20 -/* A9EE1C 80027C7C 26945AE0 */ addiu $s4, %lo(D_80135AE0) -/* A9EE20 80027C80 26B55AE8 */ addiu $s5, %lo(D_80135AE8) # addiu $s5, $s5, 0x5ae8 -/* A9EE24 80027C84 26D65BB4 */ addiu $s6, %lo(D_80135BB4) # addiu $s6, $s6, 0x5bb4 -/* A9EE28 80027C88 26F75BBC */ addiu $s7, %lo(D_80135BBC) # addiu $s7, $s7, 0x5bbc -/* A9EE2C 80027C8C 27DE5BF4 */ addiu $fp, %lo(D_80135BF4) # addiu $fp, $fp, 0x5bf4 -.L80027C90: -/* A9EE30 80027C90 8E4E0000 */ lw $t6, ($s2) -/* A9EE34 80027C94 01D01021 */ addu $v0, $t6, $s0 -/* A9EE38 80027C98 844F005C */ lh $t7, 0x5c($v0) -/* A9EE3C 80027C9C 05E2003C */ bltzl $t7, .L80027D90 -/* A9EE40 80027CA0 26310001 */ addiu $s1, $s1, 1 -/* A9EE44 80027CA4 C4400000 */ lwc1 $f0, ($v0) -/* A9EE48 80027CA8 4600A03C */ c.lt.s $f20, $f0 -/* A9EE4C 80027CAC 00000000 */ nop -/* A9EE50 80027CB0 45010017 */ bc1t .L80027D10 -/* A9EE54 80027CB4 00000000 */ nop -/* A9EE58 80027CB8 4616003C */ c.lt.s $f0, $f22 -/* A9EE5C 80027CBC 00000000 */ nop -/* A9EE60 80027CC0 45010013 */ bc1t .L80027D10 -/* A9EE64 80027CC4 00000000 */ nop -/* A9EE68 80027CC8 C4400004 */ lwc1 $f0, 4($v0) -/* A9EE6C 80027CCC 4600A03C */ c.lt.s $f20, $f0 -/* A9EE70 80027CD0 00000000 */ nop -/* A9EE74 80027CD4 4501000E */ bc1t .L80027D10 -/* A9EE78 80027CD8 00000000 */ nop -/* A9EE7C 80027CDC 4616003C */ c.lt.s $f0, $f22 -/* A9EE80 80027CE0 00000000 */ nop -/* A9EE84 80027CE4 4501000A */ bc1t .L80027D10 -/* A9EE88 80027CE8 00000000 */ nop -/* A9EE8C 80027CEC C4400008 */ lwc1 $f0, 8($v0) -/* A9EE90 80027CF0 4600A03C */ c.lt.s $f20, $f0 -/* A9EE94 80027CF4 00000000 */ nop -/* A9EE98 80027CF8 45010005 */ bc1t .L80027D10 -/* A9EE9C 80027CFC 00000000 */ nop -/* A9EEA0 80027D00 4616003C */ c.lt.s $f0, $f22 -/* A9EEA4 80027D04 02602025 */ move $a0, $s3 -/* A9EEA8 80027D08 4500001D */ bc1f .L80027D80 -/* A9EEAC 80027D0C 00000000 */ nop -.L80027D10: -/* A9EEB0 80027D10 0C00084C */ jal osSyncPrintf -/* A9EEB4 80027D14 02802025 */ move $a0, $s4 -/* A9EEB8 80027D18 8E580000 */ lw $t8, ($s2) -/* A9EEBC 80027D1C 02A02025 */ move $a0, $s5 -/* A9EEC0 80027D20 03101021 */ addu $v0, $t8, $s0 -/* A9EEC4 80027D24 C4480004 */ lwc1 $f8, 4($v0) -/* A9EEC8 80027D28 C4440000 */ lwc1 $f4, ($v0) -/* A9EECC 80027D2C 9045005F */ lbu $a1, 0x5f($v0) -/* A9EED0 80027D30 460042A1 */ cvt.d.s $f10, $f8 -/* A9EED4 80027D34 460021A1 */ cvt.d.s $f6, $f4 -/* A9EED8 80027D38 F7AA0010 */ sdc1 $f10, 0x10($sp) -/* A9EEDC 80027D3C C4500008 */ lwc1 $f16, 8($v0) -/* A9EEE0 80027D40 44073000 */ mfc1 $a3, $f6 -/* A9EEE4 80027D44 44063800 */ mfc1 $a2, $f7 -/* A9EEE8 80027D48 460084A1 */ cvt.d.s $f18, $f16 -/* A9EEEC 80027D4C 0C00084C */ jal osSyncPrintf -/* A9EEF0 80027D50 F7B20018 */ sdc1 $f18, 0x18($sp) -/* A9EEF4 80027D54 0C00084C */ jal osSyncPrintf -/* A9EEF8 80027D58 02C02025 */ move $a0, $s6 -/* A9EEFC 80027D5C 0C00084C */ jal osSyncPrintf -/* A9EF00 80027D60 02E02025 */ move $a0, $s7 -/* A9EF04 80027D64 0C00084C */ jal osSyncPrintf -/* A9EF08 80027D68 03C02025 */ move $a0, $fp -/* A9EF0C 80027D6C 8E590000 */ lw $t9, ($s2) -/* A9EF10 80027D70 0C009D38 */ jal Effect_SS_Delete -/* A9EF14 80027D74 02192021 */ addu $a0, $s0, $t9 -/* A9EF18 80027D78 10000004 */ b .L80027D8C -/* A9EF1C 80027D7C 8E430008 */ lw $v1, 8($s2) -.L80027D80: -/* A9EF20 80027D80 0C009EE6 */ jal Effect_SS_DrawParticle -/* A9EF24 80027D84 02202825 */ move $a1, $s1 -/* A9EF28 80027D88 8E430008 */ lw $v1, 8($s2) -.L80027D8C: -/* A9EF2C 80027D8C 26310001 */ addiu $s1, $s1, 1 -.L80027D90: -/* A9EF30 80027D90 0223082A */ slt $at, $s1, $v1 -/* A9EF34 80027D94 1420FFBE */ bnez $at, .L80027C90 -/* A9EF38 80027D98 26100060 */ addiu $s0, $s0, 0x60 -.L80027D9C: -/* A9EF3C 80027D9C 8FBF005C */ lw $ra, 0x5c($sp) -/* A9EF40 80027DA0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* A9EF44 80027DA4 D7B60030 */ ldc1 $f22, 0x30($sp) -/* A9EF48 80027DA8 8FB00038 */ lw $s0, 0x38($sp) -/* A9EF4C 80027DAC 8FB1003C */ lw $s1, 0x3c($sp) -/* A9EF50 80027DB0 8FB20040 */ lw $s2, 0x40($sp) -/* A9EF54 80027DB4 8FB30044 */ lw $s3, 0x44($sp) -/* A9EF58 80027DB8 8FB40048 */ lw $s4, 0x48($sp) -/* A9EF5C 80027DBC 8FB5004C */ lw $s5, 0x4c($sp) -/* A9EF60 80027DC0 8FB60050 */ lw $s6, 0x50($sp) -/* A9EF64 80027DC4 8FB70054 */ lw $s7, 0x54($sp) -/* A9EF68 80027DC8 8FBE0058 */ lw $fp, 0x58($sp) -/* A9EF6C 80027DCC 03E00008 */ jr $ra -/* A9EF70 80027DD0 27BD0060 */ addiu $sp, $sp, 0x60 - diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800281E8.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800281E8.s index 26c84c8b00..a884248d97 100644 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800281E8.s +++ b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800281E8.s @@ -38,7 +38,7 @@ glabel func_800281E8 /* A9F418 80028278 A7AD0044 */ sh $t5, 0x44($sp) /* A9F41C 8002827C A7AE0046 */ sh $t6, 0x46($sp) /* A9F420 80028280 A7AF0048 */ sh $t7, 0x48($sp) -/* A9F424 80028284 0C009DE6 */ jal func_80027798 +/* A9F424 80028284 0C009DE6 */ jal EffectSs_Spawn /* A9F428 80028288 A3B8004C */ sb $t8, 0x4c($sp) /* A9F42C 8002828C 8FBF0014 */ lw $ra, 0x14($sp) /* A9F430 80028290 27BD0050 */ addiu $sp, $sp, 0x50 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 index ac16a79e6b..11afa6c5e8 100644 --- 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 @@ -72,7 +72,7 @@ glabel func_80028BB0 /* 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 func_80027798 +/* 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 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 index 4e60b57702..a4704a98af 100644 --- 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 @@ -47,7 +47,7 @@ glabel func_80028CEC /* 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 func_80027798 +/* 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 diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028DC4.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028DC4.s index 192fd0ccfa..999b39b25c 100644 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028DC4.s +++ b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028DC4.s @@ -15,7 +15,7 @@ glabel func_80028DC4 /* A9FF98 80028DF8 8FA40040 */ lw $a0, 0x40($sp) /* A9FF9C 80028DFC 24050002 */ li $a1, 2 /* A9FFA0 80028E00 24060080 */ li $a2, 128 -/* A9FFA4 80028E04 0C009DE6 */ jal func_80027798 +/* A9FFA4 80028E04 0C009DE6 */ jal EffectSs_Spawn /* A9FFA8 80028E08 27A7001C */ addiu $a3, $sp, 0x1c /* A9FFAC 80028E0C 8FBF0014 */ lw $ra, 0x14($sp) /* A9FFB0 80028E10 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028E1C.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028E1C.s index 09dd43f7b5..1a99852da9 100644 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028E1C.s +++ b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028E1C.s @@ -19,7 +19,7 @@ glabel func_80028E1C /* AA0000 80028E60 8FA40048 */ lw $a0, 0x48($sp) /* AA0004 80028E64 24050003 */ li $a1, 3 /* AA0008 80028E68 2406000A */ li $a2, 10 -/* AA000C 80028E6C 0C009DE6 */ jal func_80027798 +/* AA000C 80028E6C 0C009DE6 */ jal EffectSs_Spawn /* AA0010 80028E70 27A7001C */ addiu $a3, $sp, 0x1c /* AA0014 80028E74 8FBF0014 */ lw $ra, 0x14($sp) /* AA0018 80028E78 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028E84.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028E84.s index 00385da42b..f796a075f6 100644 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028E84.s +++ b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028E84.s @@ -21,7 +21,7 @@ glabel func_80028E84 /* AA0070 80028ED0 2406000A */ li $a2, 10 /* AA0074 80028ED4 27A7001C */ addiu $a3, $sp, 0x1c /* AA0078 80028ED8 A7AE0040 */ sh $t6, 0x40($sp) -/* AA007C 80028EDC 0C009DE6 */ jal func_80027798 +/* AA007C 80028EDC 0C009DE6 */ jal EffectSs_Spawn /* AA0080 80028EE0 A7AF0042 */ sh $t7, 0x42($sp) /* AA0084 80028EE4 8FBF0014 */ lw $ra, 0x14($sp) /* AA0088 80028EE8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028EF4.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028EF4.s index 07586f3d69..44f5caca66 100644 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028EF4.s +++ b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028EF4.s @@ -29,7 +29,7 @@ glabel func_80028EF4 /* AA0100 80028F60 A7AE0048 */ sh $t6, 0x48($sp) /* AA0104 80028F64 A7AF004A */ sh $t7, 0x4a($sp) /* AA0108 80028F68 A7B8004C */ sh $t8, 0x4c($sp) -/* AA010C 80028F6C 0C009DE6 */ jal func_80027798 +/* AA010C 80028F6C 0C009DE6 */ jal EffectSs_Spawn /* AA0110 80028F70 A7B9004E */ sh $t9, 0x4e($sp) /* AA0114 80028F74 8FBF0014 */ lw $ra, 0x14($sp) /* AA0118 80028F78 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029060.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029060.s index 6549f4086a..6410e3fa4e 100644 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029060.s +++ b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029060.s @@ -29,7 +29,7 @@ glabel func_80029060 /* AA026C 800290CC 27A70018 */ addiu $a3, $sp, 0x18 /* AA0270 800290D0 AFAE0018 */ sw $t6, 0x18($sp) /* AA0274 800290D4 A7AF0048 */ sh $t7, 0x48($sp) -/* AA0278 800290D8 0C009DE6 */ jal func_80027798 +/* AA0278 800290D8 0C009DE6 */ jal EffectSs_Spawn /* AA027C 800290DC A7B8004A */ sh $t8, 0x4a($sp) /* AA0280 800290E0 8FBF0014 */ lw $ra, 0x14($sp) /* AA0284 800290E4 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800290F0.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800290F0.s index 8efe1a1444..94f363d9db 100644 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800290F0.s +++ b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800290F0.s @@ -30,7 +30,7 @@ glabel func_800290F0 /* AA0300 80029160 27A70018 */ addiu $a3, $sp, 0x18 /* AA0304 80029164 AFAE0018 */ sw $t6, 0x18($sp) /* AA0308 80029168 A7AF0048 */ sh $t7, 0x48($sp) -/* AA030C 8002916C 0C009DE6 */ jal func_80027798 +/* AA030C 8002916C 0C009DE6 */ jal EffectSs_Spawn /* AA0310 80029170 A7B8004A */ sh $t8, 0x4a($sp) /* AA0314 80029174 8FBF0014 */ lw $ra, 0x14($sp) /* AA0318 80029178 27BD0050 */ addiu $sp, $sp, 0x50 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 index 65ed63efd2..ab1ae61a40 100644 --- 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 @@ -25,7 +25,7 @@ glabel func_80029320 /* 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 func_80027798 +/* 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 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 index 7e9d0d44d3..97d8fedbdb 100644 --- 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 @@ -17,7 +17,7 @@ glabel func_800293E4 /* 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 func_80027798 +/* 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 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 index 6645c8ac51..b42e8f8b4c 100644 --- 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 @@ -15,7 +15,7 @@ glabel func_80029444 /* 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 func_80027798 +/* 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 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 index d2d1264ff5..9b0f37ff84 100644 --- 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 @@ -32,7 +32,7 @@ glabel func_8002949C .L80029510: /* AA06B0 80029510 8FA40030 */ lw $a0, 0x30($sp) /* AA06B4 80029514 24060080 */ li $a2, 128 -/* AA06B8 80029518 0C009DE6 */ jal func_80027798 +/* 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 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 index 65917c979c..075913b8c3 100644 --- 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 @@ -7,7 +7,7 @@ glabel func_80029530 /* AA06E4 80029544 8FA40028 */ lw $a0, 0x28($sp) /* AA06E8 80029548 2405000B */ li $a1, 11 /* AA06EC 8002954C 24060080 */ li $a2, 128 -/* AA06F0 80029550 0C009DE6 */ jal func_80027798 +/* 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 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 index 167cfef1db..7ace1802c6 100644 --- 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 @@ -7,7 +7,7 @@ glabel func_80029568 /* AA071C 8002957C 8FA40028 */ lw $a0, 0x28($sp) /* AA0720 80029580 2405000C */ li $a1, 12 /* AA0724 80029584 24060080 */ li $a2, 128 -/* AA0728 80029588 0C009DE6 */ jal func_80027798 +/* 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 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 index e746f2524c..2b67d562cc 100644 --- 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 @@ -23,7 +23,7 @@ glabel func_800295A0 /* 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 func_80027798 +/* 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 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 index 31cd975a39..00b86977c0 100644 --- 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 @@ -24,7 +24,7 @@ glabel func_80029618 /* 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 func_80027798 +/* 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 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 index 1d4c07aab8..d804fe737b 100644 --- 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 @@ -29,7 +29,7 @@ glabel func_80029694 /* 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 func_80027798 +/* 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 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 index 8934ebbc03..ce2ed37161 100644 --- 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 @@ -25,7 +25,7 @@ glabel func_80029724 /* 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 func_80027798 +/* 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 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 index 54aca0f90c..56539bd226 100644 --- 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 @@ -13,7 +13,7 @@ glabel func_800298EC /* AA0AB8 80029918 24050010 */ li $a1, 16 /* AA0ABC 8002991C ACF80008 */ sw $t8, 8($a3) /* AA0AC0 80029920 87B90032 */ lh $t9, 0x32($sp) -/* AA0AC4 80029924 0C009DE6 */ jal func_80027798 +/* 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 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 index 39ef42a037..0da30733b3 100644 --- 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 @@ -21,7 +21,7 @@ glabel func_8002993C /* 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 func_80027798 +/* 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 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 index 06aa758e97..d132276f33 100644 --- 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 @@ -17,7 +17,7 @@ glabel func_80029B30 /* AA0D0C 80029B6C 24050012 */ li $a1, 18 /* AA0D10 80029B70 24060080 */ li $a2, 128 /* AA0D14 80029B74 27A70018 */ addiu $a3, $sp, 0x18 -/* AA0D18 80029B78 0C009DE6 */ jal func_80027798 +/* 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 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 index 62b8029171..8adfe8ebe8 100644 --- 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 @@ -21,7 +21,7 @@ glabel func_80029B90 /* 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 func_80027798 +/* 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 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 index 3c6bbb1122..a5be71efc5 100644 --- 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 @@ -13,7 +13,7 @@ glabel func_80029C00 /* AA0DCC 80029C2C 24050014 */ li $a1, 20 /* AA0DD0 80029C30 ACF80008 */ sw $t8, 8($a3) /* AA0DD4 80029C34 8FB90030 */ lw $t9, 0x30($sp) -/* AA0DD8 80029C38 0C009DE6 */ jal func_80027798 +/* 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 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 index 7687f190a4..28c42d18e9 100644 --- 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 @@ -14,7 +14,7 @@ glabel func_80029C50 /* AA0E20 80029C80 8FA40030 */ lw $a0, 0x30($sp) /* AA0E24 80029C84 24050015 */ li $a1, 21 /* AA0E28 80029C88 24060080 */ li $a2, 128 -/* AA0E2C 80029C8C 0C009DE6 */ jal func_80027798 +/* 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 diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029CF0.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029CF0.s index 40cb925781..c003a1cfda 100644 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029CF0.s +++ b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029CF0.s @@ -20,7 +20,7 @@ glabel func_80029CF0 /* AA0ED8 80029D38 24060080 */ li $a2, 128 /* AA0EDC 80029D3C 27A70018 */ addiu $a3, $sp, 0x18 /* AA0EE0 80029D40 A7AE003C */ sh $t6, 0x3c($sp) -/* AA0EE4 80029D44 0C009DE6 */ jal func_80027798 +/* AA0EE4 80029D44 0C009DE6 */ jal EffectSs_Spawn /* AA0EE8 80029D48 A3AF003E */ sb $t7, 0x3e($sp) /* AA0EEC 80029D4C 8FBF0014 */ lw $ra, 0x14($sp) /* AA0EF0 80029D50 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029D5C.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029D5C.s index ca7859c42d..712cf996b6 100644 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029D5C.s +++ b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029D5C.s @@ -17,7 +17,7 @@ glabel func_80029D5C /* AA0F38 80029D98 24060080 */ li $a2, 128 /* AA0F3C 80029D9C 27A70018 */ addiu $a3, $sp, 0x18 /* AA0F40 80029DA0 A7AF003C */ sh $t7, 0x3c($sp) -/* AA0F44 80029DA4 0C009DE6 */ jal func_80027798 +/* AA0F44 80029DA4 0C009DE6 */ jal EffectSs_Spawn /* AA0F48 80029DA8 A3B8003E */ sb $t8, 0x3e($sp) /* AA0F4C 80029DAC 8FBF0014 */ lw $ra, 0x14($sp) /* AA0F50 80029DB0 27BD0048 */ addiu $sp, $sp, 0x48 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 index f7205f88b8..b16edf2896 100644 --- 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 @@ -19,7 +19,7 @@ glabel func_80029DBC /* AA0FA0 80029E00 24060080 */ li $a2, 128 /* AA0FA4 80029E04 27A70018 */ addiu $a3, $sp, 0x18 /* AA0FA8 80029E08 A7AE003C */ sh $t6, 0x3c($sp) -/* AA0FAC 80029E0C 0C009DE6 */ jal func_80027798 +/* 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 diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029E24.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029E24.s index 3e0ee2c7a5..2a87599ac1 100644 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029E24.s +++ b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029E24.s @@ -19,7 +19,7 @@ glabel func_80029E24 /* AA1008 80029E68 24060080 */ li $a2, 128 /* AA100C 80029E6C 27A7001C */ addiu $a3, $sp, 0x1c /* AA1010 80029E70 A7AE0040 */ sh $t6, 0x40($sp) -/* AA1014 80029E74 0C009DE6 */ jal func_80027798 +/* AA1014 80029E74 0C009DE6 */ jal EffectSs_Spawn /* AA1018 80029E78 AFAF0044 */ sw $t7, 0x44($sp) /* AA101C 80029E7C 8FBF0014 */ lw $ra, 0x14($sp) /* AA1020 80029E80 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/Effect_SpawnFragment.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029E8C.s similarity index 96% rename from asm/non_matchings/code/z_effect_soft_sprite_old_init/Effect_SpawnFragment.s rename to asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029E8C.s index ca963eb2d7..ea8e2231db 100644 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/Effect_SpawnFragment.s +++ b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029E8C.s @@ -1,4 +1,4 @@ -glabel Effect_SpawnFragment +glabel func_80029E8C /* AA102C 80029E8C 27BDFFA8 */ addiu $sp, $sp, -0x58 /* AA1030 80029E90 AFBF0014 */ sw $ra, 0x14($sp) /* AA1034 80029E94 AFA40058 */ sw $a0, 0x58($sp) @@ -39,7 +39,7 @@ glabel Effect_SpawnFragment /* 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 func_80027798 +/* 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 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 index 507f209b04..b0bd9b705e 100644 --- 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 @@ -19,7 +19,7 @@ glabel func_80029F44 /* AA1128 80029F88 24060080 */ li $a2, 128 /* AA112C 80029F8C 27A7001C */ addiu $a3, $sp, 0x1c /* AA1130 80029F90 E7A40028 */ swc1 $f4, 0x28($sp) -/* AA1134 80029F94 0C009DE6 */ jal func_80027798 +/* 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 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 index 06a215d432..346a0f9f60 100644 --- 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 @@ -33,7 +33,7 @@ glabel func_8002A140 /* AA1358 8002A1B8 8FA40058 */ lw $a0, 0x58($sp) /* AA135C 8002A1BC 2405001B */ li $a1, 27 /* AA1360 8002A1C0 24060050 */ li $a2, 80 -/* AA1364 8002A1C4 0C009DE6 */ jal func_80027798 +/* 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 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 index 2ca0e85fd6..a4f987040a 100644 --- 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 @@ -44,7 +44,7 @@ glabel func_8002A1DC /* AA1420 8002A280 8FA40058 */ lw $a0, 0x58($sp) /* AA1424 8002A284 2405001B */ li $a1, 27 /* AA1428 8002A288 24060050 */ li $a2, 80 -/* AA142C 8002A28C 0C009DE6 */ jal func_80027798 +/* 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 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 index 3df3bc74c8..3042d55209 100644 --- 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 @@ -27,7 +27,7 @@ glabel func_8002A2A4 /* AA14A8 8002A308 24060080 */ li $a2, 128 /* AA14AC 8002A30C 27A7001C */ addiu $a3, $sp, 0x1c /* AA14B0 8002A310 E7A4002C */ swc1 $f4, 0x2c($sp) -/* AA14B4 8002A314 0C009DE6 */ jal func_80027798 +/* 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 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 index 5e542a3cdd..38a1c1fa30 100644 --- 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 @@ -31,7 +31,7 @@ glabel func_8002A32C /* 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 func_80027798 +/* 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 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 index f51a1db9ee..c578472b06 100644 --- 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 @@ -24,7 +24,7 @@ glabel func_8002A4D4 /* AA16C8 8002A528 8FA40030 */ lw $a0, 0x30($sp) /* AA16CC 8002A52C 2405001D */ li $a1, 29 /* AA16D0 8002A530 24060080 */ li $a2, 128 -/* AA16D4 8002A534 0C009DE6 */ jal func_80027798 +/* 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 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 index 6f2896badf..ae04eef4d3 100644 --- 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 @@ -36,7 +36,7 @@ glabel func_8002A54C /* AA1770 8002A5D0 8FA40030 */ lw $a0, 0x30($sp) /* AA1774 8002A5D4 2405001D */ li $a1, 29 /* AA1778 8002A5D8 24060080 */ li $a2, 128 -/* AA177C 8002A5DC 0C009DE6 */ jal func_80027798 +/* 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 diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A5F4.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A5F4.s index 70cd28acc4..c69183fa44 100644 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A5F4.s +++ b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A5F4.s @@ -19,7 +19,7 @@ glabel func_8002A5F4 /* AA17D8 8002A638 24060064 */ li $a2, 100 /* AA17DC 8002A63C 27A70018 */ addiu $a3, $sp, 0x18 /* AA17E0 8002A640 A7AE003C */ sh $t6, 0x3c($sp) -/* AA17E4 8002A644 0C009DE6 */ jal func_80027798 +/* AA17E4 8002A644 0C009DE6 */ jal EffectSs_Spawn /* AA17E8 8002A648 A7AF003E */ sh $t7, 0x3e($sp) /* AA17EC 8002A64C 8FBF0014 */ lw $ra, 0x14($sp) /* AA17F0 8002A650 27BD0040 */ addiu $sp, $sp, 0x40 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 index fdab384004..24c57be3f1 100644 --- 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 @@ -16,7 +16,7 @@ glabel func_8002A65C /* 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 func_80027798 +/* 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 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 index ec38c6da24..d35c85501b 100644 --- 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 @@ -39,7 +39,7 @@ glabel func_8002A6B8 /* 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 func_80027798 +/* 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 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 index 1febf32795..18e445dd79 100644 --- 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 @@ -38,7 +38,7 @@ glabel func_8002A770 /* 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 func_80027798 +/* 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 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 index d4383b9603..3c1d969153 100644 --- 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 @@ -21,7 +21,7 @@ glabel func_8002A824 /* 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 func_80027798 +/* 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 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 index 4512a80756..19581f87c6 100644 --- 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 @@ -23,7 +23,7 @@ glabel func_8002A894 /* 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 func_80027798 +/* 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 diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A95C.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A95C.s index ef9de29083..14c9274ad4 100644 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A95C.s +++ b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A95C.s @@ -24,7 +24,7 @@ glabel func_8002A95C /* AA1B54 8002A9B4 8FA40048 */ lw $a0, 0x48($sp) /* AA1B58 8002A9B8 24050023 */ li $a1, 35 /* AA1B5C 8002A9BC 24060064 */ li $a2, 100 -/* AA1B60 8002A9C0 0C009DE6 */ jal func_80027798 +/* AA1B60 8002A9C0 0C009DE6 */ jal EffectSs_Spawn /* AA1B64 8002A9C4 27A70018 */ addiu $a3, $sp, 0x18 /* AA1B68 8002A9C8 10000007 */ b .L8002A9E8 /* AA1B6C 8002A9CC 8FBF0014 */ lw $ra, 0x14($sp) @@ -32,7 +32,7 @@ glabel func_8002A95C /* AA1B70 8002A9D0 8FA40048 */ lw $a0, 0x48($sp) /* AA1B74 8002A9D4 24050023 */ li $a1, 35 /* AA1B78 8002A9D8 2406007F */ li $a2, 127 -/* AA1B7C 8002A9DC 0C009DE6 */ jal func_80027798 +/* AA1B7C 8002A9DC 0C009DE6 */ jal EffectSs_Spawn /* AA1B80 8002A9E0 27A70018 */ addiu $a3, $sp, 0x18 /* AA1B84 8002A9E4 8FBF0014 */ lw $ra, 0x14($sp) .L8002A9E8: 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 index 659695502b..f5ab92186e 100644 --- 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 @@ -17,7 +17,7 @@ glabel func_8002AA44 /* AA1C20 8002AA80 24050024 */ li $a1, 36 /* AA1C24 8002AA84 24060080 */ li $a2, 128 /* AA1C28 8002AA88 27A70018 */ addiu $a3, $sp, 0x18 -/* AA1C2C 8002AA8C 0C009DE6 */ jal func_80027798 +/* 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 diff --git a/asm/non_matchings/code/z_play/Gameplay_Init.s b/asm/non_matchings/code/z_play/Gameplay_Init.s index 36fcb2b0da..345e8a2f90 100644 --- a/asm/non_matchings/code/z_play/Gameplay_Init.s +++ b/asm/non_matchings/code/z_play/Gameplay_Init.s @@ -126,10 +126,10 @@ glabel Gameplay_Init /* B33D54 800BCBB4 02202025 */ move $a0, $s1 /* B33D58 800BCBB8 0C01AE80 */ jal func_8006BA00 /* B33D5C 800BCBBC 02202025 */ move $a0, $s1 -/* B33D60 800BCBC0 0C009B0B */ jal func_80026C2C +/* B33D60 800BCBC0 0C009B0B */ jal Effect_InitContext /* B33D64 800BCBC4 02202025 */ move $a0, $s1 /* B33D68 800BCBC8 02202025 */ move $a0, $s1 -/* B33D6C 800BCBCC 0C009CAC */ jal func_800272B0 +/* B33D6C 800BCBCC 0C009CAC */ jal EffectSs_InitInfo /* B33D70 800BCBD0 24050055 */ li $a1, 85 /* B33D74 800BCBD4 3C010001 */ lui $at, (0x00011E60 >> 16) # lui $at, 1 /* B33D78 800BCBD8 34211E60 */ ori $at, (0x00011E60 & 0xFFFF) # ori $at, $at, 0x1e60 diff --git a/asm/non_matchings/code/z_play/Gameplay_Update.s b/asm/non_matchings/code/z_play/Gameplay_Update.s index 70202ed4c9..f43b45d4e5 100644 --- a/asm/non_matchings/code/z_play/Gameplay_Update.s +++ b/asm/non_matchings/code/z_play/Gameplay_Update.s @@ -1707,7 +1707,7 @@ glabel L800BE148 /* B357E4 800BE644 0C00084C */ jal osSyncPrintf /* B357E8 800BE648 24050001 */ li $a1, 1 .L800BE64C: -/* B357EC 800BE64C 0C009BDC */ jal func_80026F70 +/* B357EC 800BE64C 0C009BDC */ jal Effect_UpdateAll /* B357F0 800BE650 02002025 */ move $a0, $s0 /* B357F4 800BE654 3C0C8016 */ lui $t4, %hi(gGameInfo) # $t4, 0x8016 /* B357F8 800BE658 8D8CFA90 */ lw $t4, %lo(gGameInfo)($t4) @@ -1723,7 +1723,7 @@ glabel L800BE148 /* B35820 800BE680 0C00084C */ jal osSyncPrintf /* B35824 800BE684 24050001 */ li $a1, 1 .L800BE688: -/* B35828 800BE688 0C009EB8 */ jal Effect_SS_UpdateAllParticles +/* B35828 800BE688 0C009EB8 */ jal EffectSs_UpdateAll /* B3582C 800BE68C 02002025 */ move $a0, $s0 /* B35830 800BE690 3C0E8016 */ lui $t6, %hi(gGameInfo) # $t6, 0x8016 /* B35834 800BE694 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) diff --git a/asm/non_matchings/code/z_player_lib/func_800906D4.s b/asm/non_matchings/code/z_player_lib/func_800906D4.s index 59622ca6fc..480a4ed6e6 100644 --- a/asm/non_matchings/code/z_player_lib/func_800906D4.s +++ b/asm/non_matchings/code/z_player_lib/func_800906D4.s @@ -30,11 +30,11 @@ glabel func_800906D4 /* B078E4 80090744 000FC240 */ sll $t8, $t7, 9 /* B078E8 80090748 07020008 */ bltzl $t8, .L8009076C /* B078EC 8009074C 82190843 */ lb $t9, 0x843($s0) -/* B078F0 80090750 0C009AC3 */ jal func_80026B0C +/* B078F0 80090750 0C009AC3 */ jal Effect_GetByIndex /* B078F4 80090754 8E040670 */ lw $a0, 0x670($s0) /* B078F8 80090758 00402025 */ move $a0, $v0 /* B078FC 8009075C 260508B8 */ addiu $a1, $s0, 0x8b8 -/* B07900 80090760 0C007F7C */ jal func_8001FDF0 +/* B07900 80090760 0C007F7C */ jal EffectBlure_AddVertex /* B07904 80090764 260608C4 */ addiu $a2, $s0, 0x8c4 /* B07908 80090768 82190843 */ lb $t9, 0x843($s0) .L8009076C: diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/BgHakaSgami_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/BgHakaSgami_Destroy.s index bc12d69be3..28593ddff7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/BgHakaSgami_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/BgHakaSgami_Destroy.s @@ -5,11 +5,11 @@ glabel BgHakaSgami_Destroy /* 002B0 8087E790 AFBF0014 */ sw $ra, 0x0014($sp) /* 002B4 8087E794 AFA5001C */ sw $a1, 0x001C($sp) /* 002B8 8087E798 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 002BC 8087E79C 0C009C27 */ jal func_8002709C +/* 002BC 8087E79C 0C009C27 */ jal Effect_Delete /* 002C0 8087E7A0 8DC50154 */ lw $a1, 0x0154($t6) ## 00000154 /* 002C4 8087E7A4 8FAF0018 */ lw $t7, 0x0018($sp) /* 002C8 8087E7A8 8FA4001C */ lw $a0, 0x001C($sp) -/* 002CC 8087E7AC 0C009C27 */ jal func_8002709C +/* 002CC 8087E7AC 0C009C27 */ jal Effect_Delete /* 002D0 8087E7B0 8DE50158 */ lw $a1, 0x0158($t7) ## 00000158 /* 002D4 8087E7B4 8FA50018 */ lw $a1, 0x0018($sp) /* 002D8 8087E7B8 8FA4001C */ lw $a0, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/func_8087E858.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/func_8087E858.s index 0ccc2254db..761d02b27d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/func_8087E858.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/func_8087E858.s @@ -275,11 +275,11 @@ glabel func_8087E858 /* 0076C 8087EC4C 46168482 */ mul.s $f18, $f16, $f22 /* 00770 8087EC50 46123201 */ sub.s $f8, $f6, $f18 /* 00774 8087EC54 E7A800A0 */ swc1 $f8, 0x00A0($sp) -/* 00778 8087EC58 0C009AC3 */ jal func_80026B0C +/* 00778 8087EC58 0C009AC3 */ jal Effect_GetByIndex /* 0077C 8087EC5C 8E040154 */ lw $a0, 0x0154($s0) ## 00000154 /* 00780 8087EC60 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 /* 00784 8087EC64 02E02825 */ or $a1, $s7, $zero ## $a1 = FFFFFFD4 -/* 00788 8087EC68 0C007F7C */ jal func_8001FDF0 +/* 00788 8087EC68 0C007F7C */ jal EffectBlure_AddVertex /* 0078C 8087EC6C 03C03025 */ or $a2, $s8, $zero ## $a2 = FFFFFFE0 /* 00790 8087EC70 27A2008C */ addiu $v0, $sp, 0x008C ## $v0 = FFFFFFD4 /* 00794 8087EC74 27A300A4 */ addiu $v1, $sp, 0x00A4 ## $v1 = FFFFFFEC @@ -311,11 +311,11 @@ glabel func_8087E858 /* 007F4 8087ECD4 4612A482 */ mul.s $f18, $f20, $f18 /* 007F8 8087ECD8 46109401 */ sub.s $f16, $f18, $f16 /* 007FC 8087ECDC E450FFFC */ swc1 $f16, -0x0004($v0) ## FFFFFFE8 -/* 00800 8087ECE0 0C009AC3 */ jal func_80026B0C +/* 00800 8087ECE0 0C009AC3 */ jal Effect_GetByIndex /* 00804 8087ECE4 8E040158 */ lw $a0, 0x0158($s0) ## 00000158 /* 00808 8087ECE8 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 /* 0080C 8087ECEC 02E02825 */ or $a1, $s7, $zero ## $a1 = FFFFFFD4 -/* 00810 8087ECF0 0C007F7C */ jal func_8001FDF0 +/* 00810 8087ECF0 0C007F7C */ jal EffectBlure_AddVertex /* 00814 8087ECF4 03C03025 */ or $a2, $s8, $zero ## $a2 = FFFFFFE0 /* 00818 8087ECF8 8FA400BC */ lw $a0, 0x00BC($sp) .L8087ECFC: 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 94bd9602c5..76f2d75dd2 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 Effect_SpawnFragment +/* 005EC 8088A60C 0C00A7A3 */ jal func_80029E8C /* 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 1bdf99a7d8..48eb571b84 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 Effect_SpawnFragment +/* 00880 8088A8A0 0C00A7A3 */ jal func_80029E8C /* 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 f0029ba937..ada0770a42 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 Effect_SpawnFragment +/* 00B0C 8088AB2C 0C00A7A3 */ jal func_80029E8C /* 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_Jya_Bombchuiwa/func_808945B4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_808945B4.s index 0cf8a29c5d..11e0f50cba 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 Effect_SpawnFragment +/* 00318 808947B8 0C00A7A3 */ jal func_80029E8C /* 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_Bombiwa/func_8089539C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombiwa/func_8089539C.s index 2e0f422c26..0592e0f398 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombiwa/func_8089539C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombiwa/func_8089539C.s @@ -138,7 +138,7 @@ glabel func_8089539C /* 003D4 80895574 AFA00020 */ sw $zero, 0x0020($sp) /* 003D8 80895578 AFB10024 */ sw $s1, 0x0024($sp) /* 003DC 8089557C AFB80028 */ sw $t8, 0x0028($sp) -/* 003E0 80895580 0C00A7A3 */ jal Effect_SpawnFragment +/* 003E0 80895580 0C00A7A3 */ jal func_80029E8C /* 003E4 80895584 AFBE003C */ sw $s8, 0x003C($sp) /* 003E8 80895588 26520001 */ addiu $s2, $s2, 0x0001 ## $s2 = 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 e72b5522bd..05b9da219b 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 Effect_SpawnFragment +/* 001BC 8089827C 0C00A7A3 */ jal func_80029E8C /* 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 91b3bab16c..ebe394bf44 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 Effect_SpawnFragment +/* 0046C 80898D0C 0C00A7A3 */ jal func_80029E8C /* 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 6a47bf2e5e..9578e09a0d 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 Effect_SpawnFragment +/* 008B8 80899158 0C00A7A3 */ jal func_80029E8C /* 008BC 8089915C AFA90030 */ sw $t1, 0x0030($sp) /* 008C0 80899160 0C03F66B */ jal Math_Rand_ZeroOne diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089A1DC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089A1DC.s index 5c090d9190..4de4c88b06 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089A1DC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089A1DC.s @@ -107,7 +107,7 @@ glabel func_8089A1DC /* 00224 8089A354 AFA30014 */ sw $v1, 0x0014($sp) /* 00228 8089A358 AFB90018 */ sw $t9, 0x0018($sp) /* 0022C 8089A35C AFAD0030 */ sw $t5, 0x0030($sp) -/* 00230 8089A360 0C00A7A3 */ jal Effect_SpawnFragment +/* 00230 8089A360 0C00A7A3 */ jal func_80029E8C /* 00234 8089A364 AFA90024 */ sw $t1, 0x0024($sp) /* 00238 8089A368 0C03F66B */ jal Math_Rand_ZeroOne diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Bakudankabe/func_808B0324.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Bakudankabe/func_808B0324.s index eabdce8518..411518e4dd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Bakudankabe/func_808B0324.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Bakudankabe/func_808B0324.s @@ -149,7 +149,7 @@ glabel func_808B0324 /* 0024C 808B051C AFB8001C */ sw $t8, 0x001C($sp) /* 00250 808B0520 AFA00020 */ sw $zero, 0x0020($sp) /* 00254 808B0524 AFB30024 */ sw $s3, 0x0024($sp) -/* 00258 808B0528 0C00A7A3 */ jal Effect_SpawnFragment +/* 00258 808B0528 0C00A7A3 */ jal func_80029E8C /* 0025C 808B052C AFB7003C */ sw $s7, 0x003C($sp) /* 00260 808B0530 26520001 */ addiu $s2, $s2, 0x0001 ## $s2 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Bakudankabe/func_808B2218.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Bakudankabe/func_808B2218.s index a3958a3b90..052f8f90b2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Bakudankabe/func_808B2218.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Bakudankabe/func_808B2218.s @@ -143,7 +143,7 @@ glabel func_808B2218 /* 00284 808B2404 AFB8001C */ sw $t8, 0x001C($sp) /* 00288 808B2408 AFA00020 */ sw $zero, 0x0020($sp) /* 0028C 808B240C AFB30024 */ sw $s3, 0x0024($sp) -/* 00290 808B2410 0C00A7A3 */ jal Effect_SpawnFragment +/* 00290 808B2410 0C00A7A3 */ jal func_80029E8C /* 00294 808B2414 AFB7003C */ sw $s7, 0x003C($sp) /* 00298 808B2418 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B53A8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B53A8.s index 02070e1112..7cb26d6a81 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B53A8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/func_808B53A8.s @@ -148,7 +148,7 @@ glabel func_808B53A8 /* 00988 808B55B8 02403825 */ or $a3, $s2, $zero ## $a3 = 00000024 /* 0098C 808B55BC 00021400 */ sll $v0, $v0, 16 /* 00990 808B55C0 00021403 */ sra $v0, $v0, 16 -/* 00994 808B55C4 0C00A7A3 */ jal Effect_SpawnFragment +/* 00994 808B55C4 0C00A7A3 */ jal func_80029E8C /* 00998 808B55C8 AFA20024 */ sw $v0, 0x0024($sp) /* 0099C 808B55CC 26100004 */ addiu $s0, $s0, 0x0004 ## $s0 = 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Bakudankabe/func_808B6BC0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Bakudankabe/func_808B6BC0.s index bcc6cbc12c..f4b36589c7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Bakudankabe/func_808B6BC0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Bakudankabe/func_808B6BC0.s @@ -154,7 +154,7 @@ glabel func_808B6BC0 /* 00210 808B6DD0 AFB8001C */ sw $t8, 0x001C($sp) /* 00214 808B6DD4 AFA00020 */ sw $zero, 0x0020($sp) /* 00218 808B6DD8 AFB30024 */ sw $s3, 0x0024($sp) -/* 0021C 808B6DDC 0C00A7A3 */ jal Effect_SpawnFragment +/* 0021C 808B6DDC 0C00A7A3 */ jal func_80029E8C /* 00220 808B6DE0 AFB6003C */ sw $s6, 0x003C($sp) /* 00224 808B6DE4 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 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 e94c2e92e6..efc75c65c1 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 Effect_SpawnFragment +/* 00518 80978E48 0C00A7A3 */ jal func_80029E8C /* 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 69ac04e0c5..b63f00f4f9 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 Effect_SpawnFragment +/* 00650 8097DCC0 0C00A7A3 */ jal func_80029E8C /* 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 3a91819b02..d1aceac9f0 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 Effect_SpawnFragment +/* 00898 8097DF08 0C00A7A3 */ jal func_80029E8C /* 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 8d186e0490..ff7622b0fb 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 Effect_SpawnFragment +/* 00B00 8097E170 0C00A7A3 */ jal func_80029E8C /* 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 73c6c78cb6..3f06cfec58 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 Effect_SpawnFragment +/* 00D78 8097E3E8 0C00A7A3 */ jal func_80029E8C /* 00D7C 8097E3EC AFA80024 */ sw $t0, 0x0024($sp) /* 00D80 8097E3F0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Destroy.s index eb697bb989..1b393a3c96 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Destroy.s @@ -9,7 +9,7 @@ glabel EnArrow_Destroy /* 00248 809B3B68 29C10006 */ slti $at, $t6, 0x0006 /* 0024C 809B3B6C 50200004 */ beql $at, $zero, .L809B3B80 /* 00250 809B3B70 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00254 809B3B74 0C009C27 */ jal func_8002709C +/* 00254 809B3B74 0C009C27 */ jal Effect_Delete /* 00258 809B3B78 8E050228 */ lw $a1, 0x0228($s0) ## 00000228 /* 0025C 809B3B7C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C .L809B3B80: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B4800.s b/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B4800.s index 2067e27b26..4a100da78f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B4800.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B4800.s @@ -80,11 +80,11 @@ glabel func_809B4800 .L809B4934: /* 01014 809B4934 50600008 */ beql $v1, $zero, .L809B4958 /* 01018 809B4938 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0101C 809B493C 0C009AC3 */ jal func_80026B0C +/* 0101C 809B493C 0C009AC3 */ jal Effect_GetByIndex /* 01020 809B4940 8E040228 */ lw $a0, 0x0228($s0) ## 00000228 /* 01024 809B4944 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 /* 01028 809B4948 27A50044 */ addiu $a1, $sp, 0x0044 ## $a1 = FFFFFFF4 -/* 0102C 809B494C 0C007F7C */ jal func_8001FDF0 +/* 0102C 809B494C 0C007F7C */ jal EffectBlure_AddVertex /* 01030 809B4950 27A60038 */ addiu $a2, $sp, 0x0038 ## $a2 = FFFFFFE8 .L809B4954: /* 01034 809B4954 8FBF0024 */ lw $ra, 0x0024($sp) 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 fb88e3797d..9cb936579b 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 @@ -332,11 +332,11 @@ glabel EnBb_Draw /* 03718 809BB9F8 920E00AF */ lbu $t6, 0x00AF($s0) ## 000000AF /* 0371C 809BB9FC 51C0000A */ beql $t6, $zero, .L809BBA28 /* 03720 809BBA00 8E190250 */ lw $t9, 0x0250($s0) ## 00000250 -/* 03724 809BBA04 0C009AC3 */ jal func_80026B0C +/* 03724 809BBA04 0C009AC3 */ jal Effect_GetByIndex /* 03728 809BBA08 8E0402A4 */ lw $a0, 0x02A4($s0) ## 000002A4 /* 0372C 809BBA0C 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 /* 03730 809BBA10 27A5009C */ addiu $a1, $sp, 0x009C ## $a1 = FFFFFFD4 -/* 03734 809BBA14 0C007F7C */ jal func_8001FDF0 +/* 03734 809BBA14 0C007F7C */ jal EffectBlure_AddVertex /* 03738 809BBA18 27A60090 */ addiu $a2, $sp, 0x0090 ## $a2 = FFFFFFC8 /* 0373C 809BBA1C 1000000A */ beq $zero, $zero, .L809BBA48 /* 03740 809BBA20 8FB800CC */ lw $t8, 0x00CC($sp) @@ -346,9 +346,9 @@ glabel EnBb_Draw /* 03748 809BBA28 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 /* 0374C 809BBA2C 53210006 */ beql $t9, $at, .L809BBA48 /* 03750 809BBA30 8FB800CC */ lw $t8, 0x00CC($sp) -/* 03754 809BBA34 0C009AC3 */ jal func_80026B0C +/* 03754 809BBA34 0C009AC3 */ jal Effect_GetByIndex /* 03758 809BBA38 8E0402A4 */ lw $a0, 0x02A4($s0) ## 000002A4 -/* 0375C 809BBA3C 0C008048 */ jal func_80020120 +/* 0375C 809BBA3C 0C008048 */ jal EffectBlure_AddSpace /* 03760 809BBA40 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 .L809BBA44: /* 03764 809BBA44 8FB800CC */ lw $t8, 0x00CC($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/EnBomChu_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/EnBomChu_Destroy.s index 57f8fed498..e7c3cf64ee 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/EnBomChu_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/EnBomChu_Destroy.s @@ -5,11 +5,11 @@ glabel EnBomChu_Destroy /* 001A8 809C59D8 AFBF0014 */ sw $ra, 0x0014($sp) /* 001AC 809C59DC AFA5001C */ sw $a1, 0x001C($sp) /* 001B0 809C59E0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 001B4 809C59E4 0C009C27 */ jal func_8002709C +/* 001B4 809C59E4 0C009C27 */ jal Effect_Delete /* 001B8 809C59E8 8DC5017C */ lw $a1, 0x017C($t6) ## 0000017C /* 001BC 809C59EC 8FAF0018 */ lw $t7, 0x0018($sp) /* 001C0 809C59F0 8FA4001C */ lw $a0, 0x001C($sp) -/* 001C4 809C59F4 0C009C27 */ jal func_8002709C +/* 001C4 809C59F4 0C009C27 */ jal Effect_Delete /* 001C8 809C59F8 8DE50180 */ lw $a1, 0x0180($t7) ## 00000180 /* 001CC 809C59FC 8FA50018 */ lw $a1, 0x0018($sp) /* 001D0 809C5A00 8FA4001C */ lw $a0, 0x001C($sp) 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 79f7266d16..649d9ebcaf 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 @@ -160,22 +160,22 @@ glabel EnBomChu_Update /* 00FF0 809C6820 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00FF4 809C6824 0C271927 */ jal func_809C649C /* 00FF8 809C6828 27A60048 */ addiu $a2, $sp, 0x0048 ## $a2 = FFFFFFD0 -/* 00FFC 809C682C 0C009AC3 */ jal func_80026B0C +/* 00FFC 809C682C 0C009AC3 */ jal Effect_GetByIndex /* 01000 809C6830 8E04017C */ lw $a0, 0x017C($s0) ## 0000017C /* 01004 809C6834 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 /* 01008 809C6838 27A50054 */ addiu $a1, $sp, 0x0054 ## $a1 = FFFFFFDC -/* 0100C 809C683C 0C007F7C */ jal func_8001FDF0 +/* 0100C 809C683C 0C007F7C */ jal EffectBlure_AddVertex /* 01010 809C6840 27A60048 */ addiu $a2, $sp, 0x0048 ## $a2 = FFFFFFD0 /* 01014 809C6844 3C05809C */ lui $a1, %hi(D_809C6D94) ## $a1 = 809C0000 /* 01018 809C6848 24A56D94 */ addiu $a1, $a1, %lo(D_809C6D94) ## $a1 = 809C6D94 /* 0101C 809C684C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01020 809C6850 0C271927 */ jal func_809C649C /* 01024 809C6854 27A60048 */ addiu $a2, $sp, 0x0048 ## $a2 = FFFFFFD0 -/* 01028 809C6858 0C009AC3 */ jal func_80026B0C +/* 01028 809C6858 0C009AC3 */ jal Effect_GetByIndex /* 0102C 809C685C 8E040180 */ lw $a0, 0x0180($s0) ## 00000180 /* 01030 809C6860 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 /* 01034 809C6864 27A50054 */ addiu $a1, $sp, 0x0054 ## $a1 = FFFFFFDC -/* 01038 809C6868 0C007F7C */ jal func_8001FDF0 +/* 01038 809C6868 0C007F7C */ jal EffectBlure_AddVertex /* 0103C 809C686C 27A60048 */ addiu $a2, $sp, 0x0048 ## $a2 = FFFFFFD0 /* 01040 809C6870 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 /* 01044 809C6874 27AD0040 */ addiu $t5, $sp, 0x0040 ## $t5 = FFFFFFC8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/EnDodongo_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/EnDodongo_Destroy.s index 0b39fe342c..ff87e38bfe 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/EnDodongo_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/EnDodongo_Destroy.s @@ -5,7 +5,7 @@ glabel EnDodongo_Destroy /* 00728 809F8978 AFBF0014 */ sw $ra, 0x0014($sp) /* 0072C 809F897C AFA5001C */ sw $a1, 0x001C($sp) /* 00730 809F8980 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00734 809F8984 0C009C27 */ jal func_8002709C +/* 00734 809F8984 0C009C27 */ jal Effect_Delete /* 00738 809F8988 8DC503D0 */ lw $a1, 0x03D0($t6) ## 000003D0 /* 0073C 809F898C 8FA50018 */ lw $a1, 0x0018($sp) /* 00740 809F8990 8FA4001C */ lw $a0, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809FA14C.s b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809FA14C.s index f1e0fefa58..3480a83f9c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809FA14C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809FA14C.s @@ -252,11 +252,11 @@ glabel L809FA40C /* 021EC 809FA43C 02202825 */ or $a1, $s1, $zero ## $a1 = FFFFFF60 /* 021F0 809FA440 0C0346BD */ jal Matrix_MultVec3f /* 021F4 809FA444 27A40170 */ addiu $a0, $sp, 0x0170 ## $a0 = FFFFFFE8 -/* 021F8 809FA448 0C009AC3 */ jal func_80026B0C +/* 021F8 809FA448 0C009AC3 */ jal Effect_GetByIndex /* 021FC 809FA44C 8EC403D0 */ lw $a0, 0x03D0($s6) ## 000003D0 /* 02200 809FA450 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 /* 02204 809FA454 02002825 */ or $a1, $s0, $zero ## $a1 = FFFFFF6C -/* 02208 809FA458 0C007F7C */ jal func_8001FDF0 +/* 02208 809FA458 0C007F7C */ jal EffectBlure_AddVertex /* 0220C 809FA45C 02203025 */ or $a2, $s1, $zero ## $a2 = FFFFFF60 /* 02210 809FA460 10000017 */ beq $zero, $zero, .L809FA4C0 /* 02214 809FA464 86CF0312 */ lh $t7, 0x0312($s6) ## 00000312 @@ -266,9 +266,9 @@ glabel L809FA40C /* 02220 809FA470 86CC030C */ lh $t4, 0x030C($s6) ## 0000030C /* 02224 809FA474 51800012 */ beql $t4, $zero, .L809FA4C0 /* 02228 809FA478 86CF0312 */ lh $t7, 0x0312($s6) ## 00000312 -/* 0222C 809FA47C 0C009AC3 */ jal func_80026B0C +/* 0222C 809FA47C 0C009AC3 */ jal Effect_GetByIndex /* 02230 809FA480 8EC403D0 */ lw $a0, 0x03D0($s6) ## 000003D0 -/* 02234 809FA484 0C008048 */ jal func_80020120 +/* 02234 809FA484 0C008048 */ jal EffectBlure_AddSpace /* 02238 809FA488 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 /* 0223C 809FA48C 1000000C */ beq $zero, $zero, .L809FA4C0 /* 02240 809FA490 86CF0312 */ lh $t7, 0x0312($s6) ## 00000312 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 a71f1ecccd..3b98a7a523 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 Effect_SpawnFragment +/* 00E6C 80A22D2C 0C00A7A3 */ jal func_80029E8C /* 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_GeldB/EnGeldB_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Destroy.s index 6510d33433..5eb2317a8e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Destroy.s @@ -6,7 +6,7 @@ glabel EnGeldB_Destroy /* 00238 80A35548 AFA5001C */ sw $a1, 0x001C($sp) /* 0023C 80A3554C 8FAE0018 */ lw $t6, 0x0018($sp) /* 00240 80A35550 8FA4001C */ lw $a0, 0x001C($sp) -/* 00244 80A35554 0C009C27 */ jal func_8002709C +/* 00244 80A35554 0C009C27 */ jal Effect_Delete /* 00248 80A35558 8DC5031C */ lw $a1, 0x031C($t6) ## 0000031C /* 0024C 80A3555C 8FA50018 */ lw $a1, 0x0018($sp) /* 00250 80A35560 8FA4001C */ lw $a0, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A39824.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A39824.s index 0bef92db2a..2de909ae34 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A39824.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A39824.s @@ -84,20 +84,20 @@ glabel func_80A39824 /* 045F0 80A39900 10610007 */ beq $v1, $at, .L80A39920 /* 045F4 80A39904 00000000 */ nop .L80A39908: -/* 045F8 80A39908 0C009AC3 */ jal func_80026B0C +/* 045F8 80A39908 0C009AC3 */ jal Effect_GetByIndex /* 045FC 80A3990C 8E04031C */ lw $a0, 0x031C($s0) ## 0000031C -/* 04600 80A39910 0C008048 */ jal func_80020120 +/* 04600 80A39910 0C008048 */ jal EffectBlure_AddSpace /* 04604 80A39914 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 /* 04608 80A39918 10000015 */ beq $zero, $zero, .L80A39970 /* 0460C 80A3991C A6000310 */ sh $zero, 0x0310($s0) ## 00000310 .L80A39920: /* 04610 80A39920 58400014 */ blezl $v0, .L80A39974 /* 04614 80A39924 8FA2006C */ lw $v0, 0x006C($sp) -/* 04618 80A39928 0C009AC3 */ jal func_80026B0C +/* 04618 80A39928 0C009AC3 */ jal Effect_GetByIndex /* 0461C 80A3992C 8E04031C */ lw $a0, 0x031C($s0) ## 0000031C /* 04620 80A39930 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 /* 04624 80A39934 27A5005C */ addiu $a1, $sp, 0x005C ## $a1 = FFFFFFF4 -/* 04628 80A39938 0C007F7C */ jal func_8001FDF0 +/* 04628 80A39938 0C007F7C */ jal EffectBlure_AddVertex /* 0462C 80A3993C 27A60050 */ addiu $a2, $sp, 0x0050 ## $a2 = FFFFFFE8 /* 04630 80A39940 1000000C */ beq $zero, $zero, .L80A39974 /* 04634 80A39944 8FA2006C */ lw $v0, 0x006C($sp) 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 index a62888e124..421ce7f41e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D0FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4D0FC.s @@ -162,7 +162,7 @@ glabel func_80A4D0FC /* 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 Effect_SpawnFragment +/* 01698 80A4D338 0C00A7A3 */ jal func_80029E8C /* 0169C 80A4D33C AFAC0024 */ sw $t4, 0x0024($sp) /* 016A0 80A4D340 26524E20 */ addiu $s2, $s2, 0x4E20 ## $s2 = 00004E20 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76330.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76330.s index b08760c79d..0227a54926 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76330.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76330.s @@ -144,20 +144,20 @@ glabel func_80A76330 /* 021D4 80A764E4 828202FE */ lb $v0, 0x02FE($s4) ## 000002FE /* 021D8 80A764E8 18400009 */ blez $v0, .L80A76510 /* 021DC 80A764EC 00000000 */ nop -/* 021E0 80A764F0 0C009AC3 */ jal func_80026B0C +/* 021E0 80A764F0 0C009AC3 */ jal Effect_GetByIndex /* 021E4 80A764F4 8E8404C4 */ lw $a0, 0x04C4($s4) ## 000004C4 /* 021E8 80A764F8 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 /* 021EC 80A764FC 02002825 */ or $a1, $s0, $zero ## $a1 = FFFFFFF4 -/* 021F0 80A76500 0C007F7C */ jal func_8001FDF0 +/* 021F0 80A76500 0C007F7C */ jal EffectBlure_AddVertex /* 021F4 80A76504 02203025 */ or $a2, $s1, $zero ## $a2 = FFFFFFE8 /* 021F8 80A76508 1000000A */ beq $zero, $zero, .L80A76534 /* 021FC 80A7650C 929902F8 */ lbu $t9, 0x02F8($s4) ## 000002F8 .L80A76510: /* 02200 80A76510 54400008 */ bnel $v0, $zero, .L80A76534 /* 02204 80A76514 929902F8 */ lbu $t9, 0x02F8($s4) ## 000002F8 -/* 02208 80A76518 0C009AC3 */ jal func_80026B0C +/* 02208 80A76518 0C009AC3 */ jal Effect_GetByIndex /* 0220C 80A7651C 8E8404C4 */ lw $a0, 0x04C4($s4) ## 000004C4 -/* 02210 80A76520 0C008048 */ jal func_80020120 +/* 02210 80A76520 0C008048 */ jal EffectBlure_AddSpace /* 02214 80A76524 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 /* 02218 80A76528 2418FFFF */ addiu $t8, $zero, 0xFFFF ## $t8 = FFFFFFFF /* 0221C 80A7652C A29802FE */ sb $t8, 0x02FE($s4) ## 000002FE 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 b69b67e604..4c7dc461ce 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 Effect_SpawnFragment +/* 0036C 80A7E7CC 0C00A7A3 */ jal func_80029E8C /* 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 545c9b07f4..948c116eae 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 Effect_SpawnFragment +/* 00654 80A7EAB4 0C00A7A3 */ jal func_80029E8C /* 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_Kusa/func_80A9B21C.s b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9B21C.s index 832d6b30fb..6ed4281210 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 Effect_SpawnFragment +/* 00424 80A9B3C4 0C00A7A3 */ jal func_80029E8C /* 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 Effect_SpawnFragment +/* 00570 80A9B510 0C00A7A3 */ jal func_80029E8C /* 00574 80A9B514 00000000 */ nop /* 00578 80A9B518 3C0A80AA */ lui $t2, %hi(D_80A9C26C) ## $t2 = 80AA0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/EnSsh_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/EnSsh_Destroy.s index 788f665dc7..2023b2fd96 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/EnSsh_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/EnSsh_Destroy.s @@ -9,7 +9,7 @@ glabel EnSsh_Destroy /* 01694 80B03904 AFB1001C */ sw $s1, 0x001C($sp) /* 01698 80B03908 AFB00018 */ sw $s0, 0x0018($sp) /* 0169C 80B0390C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 016A0 80B03910 0C009C27 */ jal func_8002709C +/* 016A0 80B03910 0C009C27 */ jal Effect_Delete /* 016A4 80B03914 8E650538 */ lw $a1, 0x0538($s3) ## 00000538 /* 016A8 80B03918 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 /* 016AC 80B0391C 267102FC */ addiu $s1, $s3, 0x02FC ## $s1 = 000002FC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02490.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02490.s index ac12d12911..770d6b1953 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02490.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02490.s @@ -54,11 +54,11 @@ glabel func_80B02490 /* 002F0 80B02560 27A50028 */ addiu $a1, $sp, 0x0028 ## $a1 = FFFFFFD0 /* 002F4 80B02564 0C034221 */ jal Matrix_Pull /* 002F8 80B02568 00000000 */ nop -/* 002FC 80B0256C 0C009AC3 */ jal func_80026B0C +/* 002FC 80B0256C 0C009AC3 */ jal Effect_GetByIndex /* 00300 80B02570 8E040538 */ lw $a0, 0x0538($s0) ## 00000538 /* 00304 80B02574 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 /* 00308 80B02578 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFDC -/* 0030C 80B0257C 0C007F7C */ jal func_8001FDF0 +/* 0030C 80B0257C 0C007F7C */ jal EffectBlure_AddVertex /* 00310 80B02580 27A60028 */ addiu $a2, $sp, 0x0028 ## $a2 = FFFFFFD0 /* 00314 80B02584 8FBF001C */ lw $ra, 0x001C($sp) /* 00318 80B02588 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02598.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02598.s index d88973e000..ef2c78bc33 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02598.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02598.s @@ -1,9 +1,9 @@ glabel func_80B02598 /* 00328 80B02598 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 0032C 80B0259C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00330 80B025A0 0C009AC3 */ jal func_80026B0C +/* 00330 80B025A0 0C009AC3 */ jal Effect_GetByIndex /* 00334 80B025A4 8C840538 */ lw $a0, 0x0538($a0) ## 00000538 -/* 00338 80B025A8 0C008048 */ jal func_80020120 +/* 00338 80B025A8 0C008048 */ jal EffectBlure_AddSpace /* 0033C 80B025AC 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 /* 00340 80B025B0 8FBF0014 */ lw $ra, 0x0014($sp) /* 00344 80B025B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/EnSt_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_St/EnSt_Destroy.s index 03869e844f..e70e757f21 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/EnSt_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/EnSt_Destroy.s @@ -9,7 +9,7 @@ glabel EnSt_Destroy /* 01BBC 80B0644C AFB1001C */ sw $s1, 0x001C($sp) /* 01BC0 80B06450 AFB00018 */ sw $s0, 0x0018($sp) /* 01BC4 80B06454 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01BC8 80B06458 0C009C27 */ jal func_8002709C +/* 01BC8 80B06458 0C009C27 */ jal Effect_Delete /* 01BCC 80B0645C 8E650404 */ lw $a1, 0x0404($s3) ## 00000404 /* 01BD0 80B06460 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 /* 01BD4 80B06464 26710194 */ addiu $s1, $s3, 0x0194 ## $s1 = 00000194 diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B04E44.s b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B04E44.s index 6b362ac654..88a1e83d4e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B04E44.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B04E44.s @@ -54,11 +54,11 @@ glabel func_80B04E44 /* 00684 80B04F14 27A50028 */ addiu $a1, $sp, 0x0028 ## $a1 = FFFFFFD0 /* 00688 80B04F18 0C034221 */ jal Matrix_Pull /* 0068C 80B04F1C 00000000 */ nop -/* 00690 80B04F20 0C009AC3 */ jal func_80026B0C +/* 00690 80B04F20 0C009AC3 */ jal Effect_GetByIndex /* 00694 80B04F24 8E040404 */ lw $a0, 0x0404($s0) ## 00000404 /* 00698 80B04F28 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 /* 0069C 80B04F2C 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFDC -/* 006A0 80B04F30 0C007F7C */ jal func_8001FDF0 +/* 006A0 80B04F30 0C007F7C */ jal EffectBlure_AddVertex /* 006A4 80B04F34 27A60028 */ addiu $a2, $sp, 0x0028 ## $a2 = FFFFFFD0 /* 006A8 80B04F38 8FBF001C */ lw $ra, 0x001C($sp) /* 006AC 80B04F3C 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B04F4C.s b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B04F4C.s index 5d1647bcf6..c9f1a395b2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B04F4C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B04F4C.s @@ -1,9 +1,9 @@ glabel func_80B04F4C /* 006BC 80B04F4C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 006C0 80B04F50 AFBF0014 */ sw $ra, 0x0014($sp) -/* 006C4 80B04F54 0C009AC3 */ jal func_80026B0C +/* 006C4 80B04F54 0C009AC3 */ jal Effect_GetByIndex /* 006C8 80B04F58 8C840404 */ lw $a0, 0x0404($a0) ## 00000404 -/* 006CC 80B04F5C 0C008048 */ jal func_80020120 +/* 006CC 80B04F5C 0C008048 */ jal EffectBlure_AddSpace /* 006D0 80B04F60 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 /* 006D4 80B04F64 8FBF0014 */ lw $ra, 0x0014($sp) /* 006D8 80B04F68 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Destroy.s index 91ac0f763c..31f3cd7c4d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Destroy.s @@ -24,7 +24,7 @@ glabel EnTest_Destroy .L8085F8F4: /* 002A4 8085F8F4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 .L8085F8F8: -/* 002A8 8085F8F8 0C009C27 */ jal func_8002709C +/* 002A8 8085F8F8 0C009C27 */ jal Effect_Delete /* 002AC 8085F8FC 8E05080C */ lw $a1, 0x080C($s0) ## 0000080C /* 002B0 8085F900 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 002B4 8085F904 0C0170EB */ jal Collider_DestroyCylinder diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862DBC.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862DBC.s index 33fc8fbf25..b1b949c107 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862DBC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862DBC.s @@ -17,9 +17,9 @@ glabel func_80862DBC /* 037A4 80862DF4 A6000014 */ sh $zero, 0x0014($s0) ## 00000014 /* 037A8 80862DF8 05E20008 */ bltzl $t7, .L80862E1C /* 037AC 80862DFC 8E190004 */ lw $t9, 0x0004($s0) ## 00000004 -/* 037B0 80862E00 0C009AC3 */ jal func_80026B0C +/* 037B0 80862E00 0C009AC3 */ jal Effect_GetByIndex /* 037B4 80862E04 8E04080C */ lw $a0, 0x080C($s0) ## 0000080C -/* 037B8 80862E08 0C008048 */ jal func_80020120 +/* 037B8 80862E08 0C008048 */ jal EffectBlure_AddSpace /* 037BC 80862E0C 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 /* 037C0 80862E10 2418FFFF */ addiu $t8, $zero, 0xFFFF ## $t8 = FFFFFFFF /* 037C4 80862E14 A2180808 */ sb $t8, 0x0808($s0) ## 00000808 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863CC4.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863CC4.s index 2b0f1600f0..a706e40551 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863CC4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863CC4.s @@ -124,20 +124,20 @@ glabel func_80863CC4 /* 04784 80863DD4 11800009 */ beq $t4, $zero, .L80863DFC /* 04788 80863DD8 00000000 */ nop .L80863DDC: -/* 0478C 80863DDC 0C009AC3 */ jal func_80026B0C +/* 0478C 80863DDC 0C009AC3 */ jal Effect_GetByIndex /* 04790 80863DE0 8E04080C */ lw $a0, 0x080C($s0) ## 0000080C /* 04794 80863DE4 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 /* 04798 80863DE8 27A50070 */ addiu $a1, $sp, 0x0070 ## $a1 = FFFFFFF0 -/* 0479C 80863DEC 0C007F7C */ jal func_8001FDF0 +/* 0479C 80863DEC 0C007F7C */ jal EffectBlure_AddVertex /* 047A0 80863DF0 27A60064 */ addiu $a2, $sp, 0x0064 ## $a2 = FFFFFFE4 /* 047A4 80863DF4 10000051 */ beq $zero, $zero, .L80863F3C /* 047A8 80863DF8 861907E0 */ lh $t9, 0x07E0($s0) ## 000007E0 .L80863DFC: /* 047AC 80863DFC 0442004F */ bltzl $v0, .L80863F3C /* 047B0 80863E00 861907E0 */ lh $t9, 0x07E0($s0) ## 000007E0 -/* 047B4 80863E04 0C009AC3 */ jal func_80026B0C +/* 047B4 80863E04 0C009AC3 */ jal Effect_GetByIndex /* 047B8 80863E08 8E04080C */ lw $a0, 0x080C($s0) ## 0000080C -/* 047BC 80863E0C 0C008048 */ jal func_80020120 +/* 047BC 80863E0C 0C008048 */ jal EffectBlure_AddSpace /* 047C0 80863E10 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 /* 047C4 80863E14 240DFFFF */ addiu $t5, $zero, 0xFFFF ## $t5 = FFFFFFFF /* 047C8 80863E18 10000047 */ beq $zero, $zero, .L80863F38 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Destroy.s index 854b3ef207..4973467597 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Destroy.s @@ -6,7 +6,7 @@ glabel EnTorch2_Destroy /* 001B8 80B1DB38 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 001BC 80B1DB3C AFBF001C */ sw $ra, 0x001C($sp) /* 001C0 80B1DB40 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 001C4 80B1DB44 0C009C27 */ jal func_8002709C +/* 001C4 80B1DB44 0C009C27 */ jal Effect_Delete /* 001C8 80B1DB48 8E050670 */ lw $a1, 0x0670($s0) ## 00000670 /* 001CC 80B1DB4C 0C03D6D6 */ jal func_800F5B58 /* 001D0 80B1DB50 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_SpawnFragments.s b/asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_SpawnFragments.s index bcde693bd0..af9d649169 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_SpawnFragments.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_SpawnFragments.s @@ -141,7 +141,7 @@ glabel EnTuboTrap_SpawnFragments /* 00304 80B25BF4 AFA00020 */ sw $zero, 0x0020($sp) /* 00308 80B25BF8 AFA00028 */ sw $zero, 0x0028($sp) /* 0030C 80B25BFC AFB6003C */ sw $s6, 0x003C($sp) -/* 00310 80B25C00 0C00A7A3 */ jal Effect_SpawnFragment +/* 00310 80B25C00 0C00A7A3 */ jal func_80029E8C /* 00314 80B25C04 AFA80024 */ sw $t0, 0x0024($sp) /* 00318 80B25C08 26524E20 */ addiu $s2, $s2, 0x4E20 ## $s2 = 00004E20 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_SpawnWaterFragments.s b/asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_SpawnWaterFragments.s index 109aedfdb8..51879a106c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_SpawnWaterFragments.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_SpawnWaterFragments.s @@ -149,7 +149,7 @@ glabel EnTuboTrap_SpawnWaterFragments /* 005A8 80B25E98 AFA00020 */ sw $zero, 0x0020($sp) /* 005AC 80B25E9C AFA00028 */ sw $zero, 0x0028($sp) /* 005B0 80B25EA0 AFB7003C */ sw $s7, 0x003C($sp) -/* 005B4 80B25EA4 0C00A7A3 */ jal Effect_SpawnFragment +/* 005B4 80B25EA4 0C00A7A3 */ jal func_80029E8C /* 005B8 80B25EA8 AFAB0024 */ sw $t3, 0x0024($sp) /* 005BC 80B25EAC 26524E20 */ addiu $s2, $s2, 0x4E20 ## $s2 = 00004E20 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Destroy.s index c11a8fe282..9049e06d7e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Destroy.s @@ -27,7 +27,7 @@ glabel EnZf_Destroy .L80B44670: /* 00620 80B44670 8FA4002C */ lw $a0, 0x002C($sp) .L80B44674: -/* 00624 80B44674 0C009C27 */ jal func_8002709C +/* 00624 80B44674 0C009C27 */ jal Effect_Delete /* 00628 80B44678 8E050414 */ lw $a1, 0x0414($s0) ## 00000414 /* 0062C 80B4467C 8FA4002C */ lw $a0, 0x002C($sp) /* 00630 80B44680 0C0170EB */ jal Collider_DestroyCylinder diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46AE0.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46AE0.s index 6b1a8e575b..b881c6b300 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46AE0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46AE0.s @@ -32,9 +32,9 @@ glabel func_80B46AE0 /* 02ADC 80B46B2C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 02AE0 80B46B30 50400088 */ beql $v0, $zero, .L80B46D54 /* 02AE4 80B46B34 8FBF001C */ lw $ra, 0x001C($sp) -/* 02AE8 80B46B38 0C009AC3 */ jal func_80026B0C +/* 02AE8 80B46B38 0C009AC3 */ jal Effect_GetByIndex /* 02AEC 80B46B3C 8E040414 */ lw $a0, 0x0414($s0) ## 00000414 -/* 02AF0 80B46B40 0C008048 */ jal func_80020120 +/* 02AF0 80B46B40 0C008048 */ jal EffectBlure_AddSpace /* 02AF4 80B46B44 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 /* 02AF8 80B46B48 8608001C */ lh $t0, 0x001C($s0) ## 0000001C /* 02AFC 80B46B4C 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B49688.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B49688.s index 18d73f6f38..78d3818b14 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B49688.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B49688.s @@ -102,9 +102,9 @@ glabel func_80B49688 /* 05718 80B49768 00000000 */ nop /* 0571C 80B4976C 45020008 */ bc1fl .L80B49790 /* 05720 80B49770 44813000 */ mtc1 $at, $f6 ## $f6 = 20.00 -/* 05724 80B49774 0C009AC3 */ jal func_80026B0C +/* 05724 80B49774 0C009AC3 */ jal Effect_GetByIndex /* 05728 80B49778 8E040414 */ lw $a0, 0x0414($s0) ## 00000414 -/* 0572C 80B4977C 0C008048 */ jal func_80020120 +/* 0572C 80B4977C 0C008048 */ jal EffectBlure_AddSpace /* 05730 80B49780 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 /* 05734 80B49784 1000001A */ beq $zero, $zero, .L80B497F0 /* 05738 80B49788 8FA20064 */ lw $v0, 0x0064($sp) @@ -115,11 +115,11 @@ glabel func_80B49688 /* 05748 80B49798 00000000 */ nop /* 0574C 80B4979C 45020014 */ bc1fl .L80B497F0 /* 05750 80B497A0 8FA20064 */ lw $v0, 0x0064($sp) -/* 05754 80B497A4 0C009AC3 */ jal func_80026B0C +/* 05754 80B497A4 0C009AC3 */ jal Effect_GetByIndex /* 05758 80B497A8 8E040414 */ lw $a0, 0x0414($s0) ## 00000414 /* 0575C 80B497AC 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 /* 05760 80B497B0 27A50054 */ addiu $a1, $sp, 0x0054 ## $a1 = FFFFFFF4 -/* 05764 80B497B4 0C007F7C */ jal func_8001FDF0 +/* 05764 80B497B4 0C007F7C */ jal EffectBlure_AddVertex /* 05768 80B497B8 27A60048 */ addiu $a2, $sp, 0x0048 ## $a2 = FFFFFFE8 /* 0576C 80B497BC 1000000C */ beq $zero, $zero, .L80B497F0 /* 05770 80B497C0 8FA20064 */ lw $v0, 0x0064($sp) 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 2ff943d788..cf7d4dafb4 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 Effect_SpawnFragment +/* 00ABC 80B8F53C 0C00A7A3 */ jal func_80029E8C /* 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 56713b838d..6d7b812020 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 Effect_SpawnFragment +/* 003C0 80B93350 0C00A7A3 */ jal func_80029E8C /* 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_Kibako/func_80B94E38.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/func_80B94E38.s index 4f5ad9570e..3a040ab732 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 Effect_SpawnFragment +/* 00388 80B95028 0C00A7A3 */ jal func_80029E8C /* 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 bfde98cc3e..7288abb3ef 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 @@ -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 Effect_SpawnFragment +/* 00630 80B952D0 0C00A7A3 */ jal func_80029E8C /* 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 8de44fb5d1..b08674e470 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 Effect_SpawnFragment +/* 00244 80B95C14 0C00A7A3 */ jal func_80029E8C /* 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 10d074de63..c3a324c181 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 Effect_SpawnFragment +/* 00244 80B96314 0C00A7A3 */ jal func_80029E8C /* 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 0cb4949f2b..f26703eb7d 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 Effect_SpawnFragment +/* 004A0 80BA1200 0C00A7A3 */ jal func_80029E8C /* 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 597efb2007..65e9d5d575 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 @@ -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 Effect_SpawnFragment +/* 00768 80BA14C8 0C00A7A3 */ jal func_80029E8C /* 0076C 80BA14CC AFAB003C */ sw $t3, 0x003C($sp) /* 00770 80BA14D0 26314E20 */ addiu $s1, $s1, 0x4E20 ## $s1 = 00004E20 diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/OceffStorm_DefaultAction.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/OceffStorm_DefaultAction.s deleted file mode 100644 index fca6599ca9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/OceffStorm_DefaultAction.s +++ /dev/null @@ -1,142 +0,0 @@ -.late_rodata -glabel D_80BA8C84 - .float 0.4 - -glabel D_80BA8C88 - .float 0.3 - -glabel D_80BA8C8C - .float 0.4 - -glabel D_80BA8C90 - .float 0.01 - -.text -glabel OceffStorm_DefaultAction -/* 00120 80BA7200 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00124 80BA7204 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00128 80BA7208 AFA5001C */ sw $a1, 0x001C($sp) -/* 0012C 80BA720C 9486014C */ lhu $a2, 0x014C($a0) ## 0000014C -/* 00130 80BA7210 28C10014 */ slti $at, $a2, 0x0014 -/* 00134 80BA7214 10200010 */ beq $at, $zero, .L80BA7258 -/* 00138 80BA7218 00C01025 */ or $v0, $a2, $zero ## $v0 = 00000000 -/* 0013C 80BA721C 44862000 */ mtc1 $a2, $f4 ## $f4 = 0.00 -/* 00140 80BA7220 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 00144 80BA7224 04C10004 */ bgez $a2, .L80BA7238 -/* 00148 80BA7228 468021A0 */ cvt.s.w $f6, $f4 -/* 0014C 80BA722C 44814000 */ mtc1 $at, $f8 ## $f8 = 4294967296.00 -/* 00150 80BA7230 00000000 */ nop -/* 00154 80BA7234 46083180 */ add.s $f6, $f6, $f8 -.L80BA7238: -/* 00158 80BA7238 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 0015C 80BA723C 44815000 */ mtc1 $at, $f10 ## $f10 = 5.00 -/* 00160 80BA7240 00000000 */ nop -/* 00164 80BA7244 460A3402 */ mul.s $f16, $f6, $f10 -/* 00168 80BA7248 4600848D */ trunc.w.s $f18, $f16 -/* 0016C 80BA724C 440F9000 */ mfc1 $t7, $f18 -/* 00170 80BA7250 10000012 */ beq $zero, $zero, .L80BA729C -/* 00174 80BA7254 A08F014E */ sb $t7, 0x014E($a0) ## 0000014E -.L80BA7258: -/* 00178 80BA7258 28410051 */ slti $at, $v0, 0x0051 -/* 0017C 80BA725C 1420000B */ bne $at, $zero, .L80BA728C -/* 00180 80BA7260 24180064 */ addiu $t8, $zero, 0x0064 ## $t8 = 00000064 -/* 00184 80BA7264 0302C823 */ subu $t9, $t8, $v0 -/* 00188 80BA7268 44992000 */ mtc1 $t9, $f4 ## $f4 = 0.00 -/* 0018C 80BA726C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 00190 80BA7270 44813000 */ mtc1 $at, $f6 ## $f6 = 5.00 -/* 00194 80BA7274 46802220 */ cvt.s.w $f8, $f4 -/* 00198 80BA7278 46064282 */ mul.s $f10, $f8, $f6 -/* 0019C 80BA727C 4600540D */ trunc.w.s $f16, $f10 -/* 001A0 80BA7280 44098000 */ mfc1 $t1, $f16 -/* 001A4 80BA7284 10000005 */ beq $zero, $zero, .L80BA729C -/* 001A8 80BA7288 A089014E */ sb $t1, 0x014E($a0) ## 0000014E -.L80BA728C: -/* 001AC 80BA728C 9486014C */ lhu $a2, 0x014C($a0) ## 0000014C -/* 001B0 80BA7290 240A0064 */ addiu $t2, $zero, 0x0064 ## $t2 = 00000064 -/* 001B4 80BA7294 A08A014E */ sb $t2, 0x014E($a0) ## 0000014E -/* 001B8 80BA7298 00C01025 */ or $v0, $a2, $zero ## $v0 = 00000000 -.L80BA729C: -/* 001BC 80BA729C 2841000A */ slti $at, $v0, 0x000A -/* 001C0 80BA72A0 14200003 */ bne $at, $zero, .L80BA72B0 -/* 001C4 80BA72A4 2841005A */ slti $at, $v0, 0x005A -/* 001C8 80BA72A8 54200006 */ bnel $at, $zero, .L80BA72C4 -/* 001CC 80BA72AC 28410042 */ slti $at, $v0, 0x0042 -.L80BA72B0: -/* 001D0 80BA72B0 9486014C */ lhu $a2, 0x014C($a0) ## 0000014C -/* 001D4 80BA72B4 A080014F */ sb $zero, 0x014F($a0) ## 0000014F -/* 001D8 80BA72B8 10000024 */ beq $zero, $zero, .L80BA734C -/* 001DC 80BA72BC 00C01025 */ or $v0, $a2, $zero ## $v0 = 00000000 -/* 001E0 80BA72C0 28410042 */ slti $at, $v0, 0x0042 -.L80BA72C4: -/* 001E4 80BA72C4 50200011 */ beql $at, $zero, .L80BA730C -/* 001E8 80BA72C8 28410042 */ slti $at, $v0, 0x0042 -/* 001EC 80BA72CC 9082014F */ lbu $v0, 0x014F($a0) ## 0000014F -/* 001F0 80BA72D0 284100C9 */ slti $at, $v0, 0x00C9 -/* 001F4 80BA72D4 10200002 */ beq $at, $zero, .L80BA72E0 -/* 001F8 80BA72D8 244B000A */ addiu $t3, $v0, 0x000A ## $t3 = 0000000A -/* 001FC 80BA72DC A08B014F */ sb $t3, 0x014F($a0) ## 0000014F -.L80BA72E0: -/* 00200 80BA72E0 3C0180BB */ lui $at, %hi(D_80BA8C84) ## $at = 80BB0000 -/* 00204 80BA72E4 C4208C84 */ lwc1 $f0, %lo(D_80BA8C84)($at) -/* 00208 80BA72E8 3C0180BB */ lui $at, %hi(D_80BA8C88) ## $at = 80BB0000 -/* 0020C 80BA72EC 9486014C */ lhu $a2, 0x014C($a0) ## 0000014C -/* 00210 80BA72F0 E4800058 */ swc1 $f0, 0x0058($a0) ## 00000058 -/* 00214 80BA72F4 E4800050 */ swc1 $f0, 0x0050($a0) ## 00000050 -/* 00218 80BA72F8 C4328C88 */ lwc1 $f18, %lo(D_80BA8C88)($at) -/* 0021C 80BA72FC 00C01025 */ or $v0, $a2, $zero ## $v0 = 00000000 -/* 00220 80BA7300 10000012 */ beq $zero, $zero, .L80BA734C -/* 00224 80BA7304 E4920054 */ swc1 $f18, 0x0054($a0) ## 00000054 -/* 00228 80BA7308 28410042 */ slti $at, $v0, 0x0042 -.L80BA730C: -/* 0022C 80BA730C 14200008 */ bne $at, $zero, .L80BA7330 -/* 00230 80BA7310 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF -/* 00234 80BA7314 00026023 */ subu $t4, $zero, $v0 -/* 00238 80BA7318 000C6880 */ sll $t5, $t4, 2 -/* 0023C 80BA731C 01AC6821 */ addu $t5, $t5, $t4 -/* 00240 80BA7320 000D6840 */ sll $t5, $t5, 1 -/* 00244 80BA7324 25AE0384 */ addiu $t6, $t5, 0x0384 ## $t6 = 00000384 -/* 00248 80BA7328 10000008 */ beq $zero, $zero, .L80BA734C -/* 0024C 80BA732C A08E014F */ sb $t6, 0x014F($a0) ## 0000014F -.L80BA7330: -/* 00250 80BA7330 3C0180BB */ lui $at, %hi(D_80BA8C8C) ## $at = 80BB0000 -/* 00254 80BA7334 C4208C8C */ lwc1 $f0, %lo(D_80BA8C8C)($at) -/* 00258 80BA7338 9486014C */ lhu $a2, 0x014C($a0) ## 0000014C -/* 0025C 80BA733C A08F014F */ sb $t7, 0x014F($a0) ## 0000014F -/* 00260 80BA7340 E4800058 */ swc1 $f0, 0x0058($a0) ## 00000058 -/* 00264 80BA7344 E4800050 */ swc1 $f0, 0x0050($a0) ## 00000050 -/* 00268 80BA7348 00C01025 */ or $v0, $a2, $zero ## $v0 = 00000000 -.L80BA734C: -/* 0026C 80BA734C 2841003D */ slti $at, $v0, 0x003D -/* 00270 80BA7350 54200012 */ bnel $at, $zero, .L80BA739C -/* 00274 80BA7354 28410064 */ slti $at, $v0, 0x0064 -/* 00278 80BA7358 84830150 */ lh $v1, 0x0150($a0) ## 00000150 -/* 0027C 80BA735C 3C0180BB */ lui $at, %hi(D_80BA8C90) ## $at = 80BB0000 -/* 00280 80BA7360 C4268C90 */ lwc1 $f6, %lo(D_80BA8C90)($at) -/* 00284 80BA7364 44832000 */ mtc1 $v1, $f4 ## $f4 = 0.00 -/* 00288 80BA7368 C4900028 */ lwc1 $f16, 0x0028($a0) ## 00000028 -/* 0028C 80BA736C 84850152 */ lh $a1, 0x0152($a0) ## 00000152 -/* 00290 80BA7370 46802220 */ cvt.s.w $f8, $f4 -/* 00294 80BA7374 9486014C */ lhu $a2, 0x014C($a0) ## 0000014C -/* 00298 80BA7378 0065C021 */ addu $t8, $v1, $a1 -/* 0029C 80BA737C 24B9000A */ addiu $t9, $a1, 0x000A ## $t9 = 0000000A -/* 002A0 80BA7380 A4980150 */ sh $t8, 0x0150($a0) ## 00000150 -/* 002A4 80BA7384 A4990152 */ sh $t9, 0x0152($a0) ## 00000152 -/* 002A8 80BA7388 46064282 */ mul.s $f10, $f8, $f6 -/* 002AC 80BA738C 00C01025 */ or $v0, $a2, $zero ## $v0 = 00000000 -/* 002B0 80BA7390 460A8480 */ add.s $f18, $f16, $f10 -/* 002B4 80BA7394 E4920028 */ swc1 $f18, 0x0028($a0) ## 00000028 -/* 002B8 80BA7398 28410064 */ slti $at, $v0, 0x0064 -.L80BA739C: -/* 002BC 80BA739C 10200003 */ beq $at, $zero, .L80BA73AC -/* 002C0 80BA73A0 24C80001 */ addiu $t0, $a2, 0x0001 ## $t0 = 00000001 -/* 002C4 80BA73A4 10000003 */ beq $zero, $zero, .L80BA73B4 -/* 002C8 80BA73A8 A488014C */ sh $t0, 0x014C($a0) ## 0000014C -.L80BA73AC: -/* 002CC 80BA73AC 0C00B55C */ jal Actor_Kill - -/* 002D0 80BA73B0 00000000 */ nop -.L80BA73B4: -/* 002D4 80BA73B4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 002D8 80BA73B8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 002DC 80BA73BC 03E00008 */ jr $ra -/* 002E0 80BA73C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084AB54.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084AB54.s index faf7a8be4a..491089b4a6 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084AB54.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084AB54.s @@ -6,7 +6,7 @@ glabel func_8084AB54 /* 18954 8084AB64 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 18958 8084AB68 AFBF001C */ sw $ra, 0x001C($sp) /* 1895C 8084AB6C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 18960 8084AB70 0C009C27 */ jal func_8002709C +/* 18960 8084AB70 0C009C27 */ jal Effect_Delete /* 18964 8084AB74 8E050670 */ lw $a1, 0x0670($s0) ## 00000670 /* 18968 8084AB78 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 1896C 8084AB7C 0C0170EB */ jal Collider_DestroyCylinder 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 index 57ac8bf410..aa9858c667 100644 --- 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 @@ -5,7 +5,7 @@ glabel func_809AAFD4 /* 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 Effect_SS_Delete +/* 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 @@ -35,7 +35,7 @@ glabel func_809AAFD4 /* 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 func_80027704 +/* 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 diff --git a/data/z_eff_shield_particle.data.s b/data/flg_set.bss.s similarity index 72% rename from data/z_eff_shield_particle.data.s rename to data/flg_set.bss.s index da5b251261..0d8eb3c7fc 100644 --- a/data/z_eff_shield_particle.data.s +++ b/data/flg_set.bss.s @@ -5,7 +5,7 @@ .set noreorder # don't insert nops after branches .set gp=64 # allow use of 64-bit general purposee registers -.section .data +.section .bss -glabel D_80115810 - .incbin "baserom.z64", 0xB8C9B0, 0x50 +glabel D_8015BB90 + .space 0x10 diff --git a/data/overlays/actors/z_en_floormas.data.s b/data/overlays/actors/z_en_floormas.data.s deleted file mode 100644 index 7914aa611e..0000000000 --- a/data/overlays/actors/z_en_floormas.data.s +++ /dev/null @@ -1,32 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .data - -glabel En_Floormas_InitVars - .word 0x008E0500, 0x00000405, 0x000B0000, 0x00000314 -.word EnFloormas_Init -.word EnFloormas_Destroy -.word EnFloormas_Update -.word EnFloormas_Draw -glabel D_80A1A470 - .word 0x00110939, 0x10010000, 0x00000000, 0xFFCFFFFF, 0x04100000, 0xFFCFFFFF, 0x00000000, 0x09050100, 0x00190028, 0x00000000, 0x00000000 -glabel D_80A1A49C - .word 0x0400001E, 0x00289600 -glabel D_80A1A4A4 - .word 0x10020102, 0x10020210, 0x01020424, 0x02440402, 0x02240044, 0x00000104, 0x02020804, 0x00000400 -glabel D_80A1A4C4 - .word 0x89170031, 0xB04C157C, 0x386CFC18 -glabel D_80A1A4D0 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80A1A4DC - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80A1A4E8 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80A1A4F4 - .word 0x00FF0000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_en_floormas.reloc.s b/data/overlays/actors/z_en_floormas.reloc.s deleted file mode 100644 index 75a4d74762..0000000000 --- a/data/overlays/actors/z_en_floormas.reloc.s +++ /dev/null @@ -1,11 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata -glabel D_80A1A5D0 - -.incbin "baserom/ovl_En_Floormas", 0x30C0, 0x000003D0 diff --git a/data/overlays/actors/z_en_heishi3.reloc.s b/data/overlays/actors/z_en_heishi3.reloc.s deleted file mode 100644 index 122c4f1f56..0000000000 --- a/data/overlays/actors/z_en_heishi3.reloc.s +++ /dev/null @@ -1,11 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata -glabel D_80A56020 - -.incbin "baserom/ovl_En_Heishi3", 0x9E0, 0x000000B0 diff --git a/data/overlays/effects/z_eff_ss_blast.data.s b/data/overlays/effects/z_eff_ss_blast.data.s index 69536c1b1c..e0fdf6a4e2 100644 --- a/data/overlays/effects/z_eff_ss_blast.data.s +++ b/data/overlays/effects/z_eff_ss_blast.data.s @@ -7,6 +7,7 @@ .section .data +glabel Effect_Ss_Blast_InitVars .word 0x00000004 .word func_8099EDB0 .word 0x00000000, 0x00000000 diff --git a/data/overlays/effects/z_eff_ss_bomb.data.s b/data/overlays/effects/z_eff_ss_bomb.data.s index 637f22151b..8b15ef69f9 100644 --- a/data/overlays/effects/z_eff_ss_bomb.data.s +++ b/data/overlays/effects/z_eff_ss_bomb.data.s @@ -7,6 +7,7 @@ .section .data +glabel Effect_Ss_Bomb_InitVars .word 0x00000002 .word func_8099F1B0 glabel D_8099F588 diff --git a/data/overlays/effects/z_eff_ss_bomb2.data.s b/data/overlays/effects/z_eff_ss_bomb2.data.s index c57e007ea7..e57eb341e1 100644 --- a/data/overlays/effects/z_eff_ss_bomb2.data.s +++ b/data/overlays/effects/z_eff_ss_bomb2.data.s @@ -7,6 +7,7 @@ .section .data +glabel Effect_Ss_Bomb2_InitVars .word 0x00000003 .word func_8099F650 glabel D_8099FED8 diff --git a/data/overlays/effects/z_eff_ss_bubble.data.s b/data/overlays/effects/z_eff_ss_bubble.data.s index e6b2520bc1..5677463f4a 100644 --- a/data/overlays/effects/z_eff_ss_bubble.data.s +++ b/data/overlays/effects/z_eff_ss_bubble.data.s @@ -7,6 +7,7 @@ .section .data +glabel Effect_Ss_Bubble_InitVars .word 0x00000007 .word func_809A0040 .word 0x00000000, 0x00000000 diff --git a/data/overlays/effects/z_eff_ss_d_fire.data.s b/data/overlays/effects/z_eff_ss_d_fire.data.s index 3324538582..fa6e584abe 100644 --- a/data/overlays/effects/z_eff_ss_d_fire.data.s +++ b/data/overlays/effects/z_eff_ss_d_fire.data.s @@ -7,6 +7,7 @@ .section .data +glabel Effect_Ss_D_Fire_InitVars .word 0x00000006 .word func_809A0550 glabel D_809A09F8 diff --git a/data/overlays/effects/z_eff_ss_dead_db.data.s b/data/overlays/effects/z_eff_ss_dead_db.data.s index 5f039fa80d..1f675a54e9 100644 --- a/data/overlays/effects/z_eff_ss_dead_db.data.s +++ b/data/overlays/effects/z_eff_ss_dead_db.data.s @@ -7,6 +7,7 @@ .section .data +glabel Effect_Ss_Dead_Db_InitVars .word 0x00000020 .word func_809A0AA0 glabel D_809A0F28 diff --git a/data/overlays/effects/z_eff_ss_dead_dd.data.s b/data/overlays/effects/z_eff_ss_dead_dd.data.s index bd0df6f7b0..f6213a1b5a 100644 --- a/data/overlays/effects/z_eff_ss_dead_dd.data.s +++ b/data/overlays/effects/z_eff_ss_dead_dd.data.s @@ -7,6 +7,7 @@ .section .data +glabel Effect_Ss_Dead_Dd_InitVars .word 0x00000021 .word func_809A0FE0 .word 0x00000000, 0x00000000 diff --git a/data/overlays/effects/z_eff_ss_dead_ds.data.s b/data/overlays/effects/z_eff_ss_dead_ds.data.s index c72f60c57c..8fcc353930 100644 --- a/data/overlays/effects/z_eff_ss_dead_ds.data.s +++ b/data/overlays/effects/z_eff_ss_dead_ds.data.s @@ -7,6 +7,7 @@ .section .data +glabel Effect_Ss_Dead_Ds_InitVars .word 0x00000022 .word func_809A1610 .word 0x00000000, 0x00000000 diff --git a/data/overlays/effects/z_eff_ss_dead_sound.data.s b/data/overlays/effects/z_eff_ss_dead_sound.data.s index 3e90732879..a26237c46f 100644 --- a/data/overlays/effects/z_eff_ss_dead_sound.data.s +++ b/data/overlays/effects/z_eff_ss_dead_sound.data.s @@ -7,6 +7,7 @@ .section .data +glabel Effect_Ss_Dead_Sound_InitVars .word 0x00000023 .word func_809A1B30 .word 0x00000000, 0x00000000 diff --git a/data/overlays/effects/z_eff_ss_dt_bubble.data.s b/data/overlays/effects/z_eff_ss_dt_bubble.data.s index d6b9620d5d..77f0c860e1 100644 --- a/data/overlays/effects/z_eff_ss_dt_bubble.data.s +++ b/data/overlays/effects/z_eff_ss_dt_bubble.data.s @@ -10,6 +10,8 @@ glabel D_809A2200 .word 0xFFFF64FF, 0x96FFFFFF, 0x64FFFFFF glabel D_809A220C - .word 0xAA0000FF, 0x006400FF, 0x0000FFFF, 0x0000000E + .word 0xAA0000FF, 0x006400FF, 0x0000FFFF +glabel Effect_Ss_Dt_Bubble_InitVars +.word 0x0000000E .word func_809A1CB0 diff --git a/data/overlays/effects/z_eff_ss_dust.data.s b/data/overlays/effects/z_eff_ss_dust.data.s index 9720e917ae..8d51302985 100644 --- a/data/overlays/effects/z_eff_ss_dust.data.s +++ b/data/overlays/effects/z_eff_ss_dust.data.s @@ -7,6 +7,7 @@ .section .data +glabel Effect_Ss_Dust_InitVars .word 0x00000000 .word func_809A22D0 glabel D_809A2A48 diff --git a/data/overlays/effects/z_eff_ss_en_fire.data.s b/data/overlays/effects/z_eff_ss_en_fire.data.s index 4c078a0c93..0d4dcc72c4 100644 --- a/data/overlays/effects/z_eff_ss_en_fire.data.s +++ b/data/overlays/effects/z_eff_ss_en_fire.data.s @@ -7,6 +7,7 @@ .section .data +glabel Effect_Ss_En_Fire_InitVars .word 0x0000001D .word func_809A2B60 glabel D_809A3248 diff --git a/data/overlays/effects/z_eff_ss_en_ice.data.s b/data/overlays/effects/z_eff_ss_en_ice.data.s index e7cab36cc6..6262da6b29 100644 --- a/data/overlays/effects/z_eff_ss_en_ice.data.s +++ b/data/overlays/effects/z_eff_ss_en_ice.data.s @@ -7,6 +7,7 @@ .section .data +glabel Effect_Ss_En_Ice_InitVars .word 0x0000001B .word func_809A3330 glabel D_809A3B88 diff --git a/data/overlays/effects/z_eff_ss_extra.data.s b/data/overlays/effects/z_eff_ss_extra.data.s index 4697ae10ac..221de5c80f 100644 --- a/data/overlays/effects/z_eff_ss_extra.data.s +++ b/data/overlays/effects/z_eff_ss_extra.data.s @@ -8,7 +8,9 @@ .section .data glabel D_809A4060 - .word 0x001E003C, 0x00640000, 0x0000001E + .word 0x001E003C, 0x00640000 +glabel Effect_Ss_Extra_InitVars +.word 0x0000001E .word func_809A3CC0 glabel D_809A4070 .word 0x06000000, 0x06000480, 0x06000900, 0x00000000 diff --git a/data/overlays/effects/z_eff_ss_fcircle.data.s b/data/overlays/effects/z_eff_ss_fcircle.data.s index aef515d83c..4118b10002 100644 --- a/data/overlays/effects/z_eff_ss_fcircle.data.s +++ b/data/overlays/effects/z_eff_ss_fcircle.data.s @@ -7,6 +7,7 @@ .section .data +glabel Effect_Ss_Fcircle_InitVars .word 0x0000001F .word func_809A4120 .word 0x00000000, 0x00000000 diff --git a/data/overlays/effects/z_eff_ss_fhg_flash.data.s b/data/overlays/effects/z_eff_ss_fhg_flash.data.s index ae3774f6d9..4ec6c5452a 100644 --- a/data/overlays/effects/z_eff_ss_fhg_flash.data.s +++ b/data/overlays/effects/z_eff_ss_fhg_flash.data.s @@ -7,6 +7,7 @@ .section .data +glabel Effect_Ss_Fhg_Flash_InitVars .word 0x00000016 .word func_809A4660 glabel D_809A5088 diff --git a/data/overlays/effects/z_eff_ss_fire_tail.data.s b/data/overlays/effects/z_eff_ss_fire_tail.data.s index 97d2653f6c..8007467c54 100644 --- a/data/overlays/effects/z_eff_ss_fire_tail.data.s +++ b/data/overlays/effects/z_eff_ss_fire_tail.data.s @@ -7,6 +7,7 @@ .section .data +glabel Effect_Ss_Fire_Tail_InitVars .word 0x0000001C .word func_809A5740 .word 0x00000000, 0x00000000 diff --git a/data/overlays/effects/z_eff_ss_g_fire.data.s b/data/overlays/effects/z_eff_ss_g_fire.data.s index 73c31b659b..1707e6616c 100644 --- a/data/overlays/effects/z_eff_ss_g_fire.data.s +++ b/data/overlays/effects/z_eff_ss_g_fire.data.s @@ -7,6 +7,7 @@ .section .data +glabel Effect_Ss_G_Fire_InitVars .word 0x0000000C .word func_809A5ED0 glabel D_809A60D8 diff --git a/data/overlays/effects/z_eff_ss_g_magma.data.s b/data/overlays/effects/z_eff_ss_g_magma.data.s index fa21e6f1dc..ff86c635f3 100644 --- a/data/overlays/effects/z_eff_ss_g_magma.data.s +++ b/data/overlays/effects/z_eff_ss_g_magma.data.s @@ -7,6 +7,7 @@ .section .data +glabel Effect_Ss_G_Magma_InitVars .word 0x0000000B .word func_809A6150 glabel D_809A6328 diff --git a/data/overlays/effects/z_eff_ss_g_magma2.data.s b/data/overlays/effects/z_eff_ss_g_magma2.data.s index e825e936e0..47067cd553 100644 --- a/data/overlays/effects/z_eff_ss_g_magma2.data.s +++ b/data/overlays/effects/z_eff_ss_g_magma2.data.s @@ -8,7 +8,9 @@ .section .data glabel D_809A6860 - .word 0x0602E4E0, 0x0602E8E0, 0x0602ECE0, 0x0602F0E0, 0x0602F4E0, 0x0602F8E0, 0x0602FCE0, 0x060300E0, 0x060304E0, 0x060308E0, 0x060308E0, 0x060308E0, 0x060308E0, 0x00000013 + .word 0x0602E4E0, 0x0602E8E0, 0x0602ECE0, 0x0602F0E0, 0x0602F4E0, 0x0602F8E0, 0x0602FCE0, 0x060300E0, 0x060304E0, 0x060308E0, 0x060308E0, 0x060308E0, 0x060308E0 +glabel Effect_Ss_G_Magma2_InitVars +.word 0x00000013 .word func_809A63A0 glabel D_809A689C .word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/data/overlays/effects/z_eff_ss_g_ripple.data.s b/data/overlays/effects/z_eff_ss_g_ripple.data.s index ca10ad1ec0..8e97d19f1b 100644 --- a/data/overlays/effects/z_eff_ss_g_ripple.data.s +++ b/data/overlays/effects/z_eff_ss_g_ripple.data.s @@ -7,6 +7,7 @@ .section .data +glabel Effect_Ss_G_Ripple_InitVars .word 0x00000009 .word func_809A6960 glabel D_809A6E88 diff --git a/data/overlays/effects/z_eff_ss_g_spk.data.s b/data/overlays/effects/z_eff_ss_g_spk.data.s index 2cefac2932..3d43bde520 100644 --- a/data/overlays/effects/z_eff_ss_g_spk.data.s +++ b/data/overlays/effects/z_eff_ss_g_spk.data.s @@ -7,6 +7,7 @@ .section .data +glabel Effect_Ss_G_Spk_InitVars .word 0x00000005 .word func_809A6F30 glabel D_809A7498 diff --git a/data/overlays/effects/z_eff_ss_g_splash.data.s b/data/overlays/effects/z_eff_ss_g_splash.data.s index 40b995ecaf..9813e35c29 100644 --- a/data/overlays/effects/z_eff_ss_g_splash.data.s +++ b/data/overlays/effects/z_eff_ss_g_splash.data.s @@ -7,6 +7,7 @@ .section .data +glabel Effect_Ss_G_Splash_InitVars .word 0x0000000A .word func_809A7540 glabel D_809A7948 diff --git a/data/overlays/effects/z_eff_ss_hahen.data.s b/data/overlays/effects/z_eff_ss_hahen.data.s index b5f88e7602..59ee50a7ac 100644 --- a/data/overlays/effects/z_eff_ss_hahen.data.s +++ b/data/overlays/effects/z_eff_ss_hahen.data.s @@ -7,6 +7,7 @@ .section .data +glabel Effect_Ss_Hahen_InitVars .word 0x0000000F .word func_809A7A60 .word 0x00000000, 0x00000000 diff --git a/data/overlays/effects/z_eff_ss_hitmark.data.s b/data/overlays/effects/z_eff_ss_hitmark.data.s index f0bdae7bc7..2507fc920f 100644 --- a/data/overlays/effects/z_eff_ss_hitmark.data.s +++ b/data/overlays/effects/z_eff_ss_hitmark.data.s @@ -10,7 +10,9 @@ 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, 0x00000015 + .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 func_809A8150 .word 0x00000000, 0x00000000 diff --git a/data/overlays/effects/z_eff_ss_ice_piece.data.s b/data/overlays/effects/z_eff_ss_ice_piece.data.s index e52dbaf52a..3d09ff0421 100644 --- a/data/overlays/effects/z_eff_ss_ice_piece.data.s +++ b/data/overlays/effects/z_eff_ss_ice_piece.data.s @@ -7,6 +7,7 @@ .section .data +glabel Effect_Ss_Ice_Piece_InitVars .word 0x0000001A .word func_809A8700 .word 0x00000000, 0x00000000 diff --git a/data/overlays/effects/z_eff_ss_ice_smoke.data.s b/data/overlays/effects/z_eff_ss_ice_smoke.data.s index d22cbfc833..29eb737b04 100644 --- a/data/overlays/effects/z_eff_ss_ice_smoke.data.s +++ b/data/overlays/effects/z_eff_ss_ice_smoke.data.s @@ -7,6 +7,7 @@ .section .data +glabel Effect_Ss_Ice_Smoke_InitVars .word 0x00000024 .word func_809A8BF0 .word 0x00000000, 0x00000000 diff --git a/data/overlays/effects/z_eff_ss_k_fire.data.s b/data/overlays/effects/z_eff_ss_k_fire.data.s index 377d1e5f53..d9552621e9 100644 --- a/data/overlays/effects/z_eff_ss_k_fire.data.s +++ b/data/overlays/effects/z_eff_ss_k_fire.data.s @@ -7,6 +7,7 @@ .section .data +glabel Effect_Ss_K_Fire_InitVars .word 0x00000017 .word func_809A91B0 .word 0x00000000, 0x00000000 diff --git a/data/overlays/effects/z_eff_ss_kakera.data.s b/data/overlays/effects/z_eff_ss_kakera.data.s index cb858305c3..a2f114bdda 100644 --- a/data/overlays/effects/z_eff_ss_kakera.data.s +++ b/data/overlays/effects/z_eff_ss_kakera.data.s @@ -7,6 +7,7 @@ .section .data +glabel Effect_Ss_Kakera_InitVars .word 0x00000019 .word func_809A9680 glabel D_809AA528 diff --git a/data/overlays/effects/z_eff_ss_kirakira.data.s b/data/overlays/effects/z_eff_ss_kirakira.data.s index f678cf3096..7492b1de28 100644 --- a/data/overlays/effects/z_eff_ss_kirakira.data.s +++ b/data/overlays/effects/z_eff_ss_kirakira.data.s @@ -7,6 +7,7 @@ .section .data +glabel Effect_Ss_KiraKira_InitVars .word 0x00000001 .word func_809AA810 .word 0x00000000, 0x00000000 diff --git a/data/overlays/effects/z_eff_ss_lightning.data.s b/data/overlays/effects/z_eff_ss_lightning.data.s index f6c7119c82..7d418b4ec9 100644 --- a/data/overlays/effects/z_eff_ss_lightning.data.s +++ b/data/overlays/effects/z_eff_ss_lightning.data.s @@ -7,6 +7,7 @@ .section .data +glabel Effect_Ss_Lightning_InitVars .word 0x0000000D .word func_809AAEF0 glabel D_809AB538 diff --git a/data/overlays/effects/z_eff_ss_sibuki.data.s b/data/overlays/effects/z_eff_ss_sibuki.data.s index 3029c2abd8..6ee021cb3f 100644 --- a/data/overlays/effects/z_eff_ss_sibuki.data.s +++ b/data/overlays/effects/z_eff_ss_sibuki.data.s @@ -7,6 +7,7 @@ .section .data +glabel Effect_Ss_Sibuki_InitVars .word 0x00000011 .word func_809AB630 .word 0x00000000, 0x00000000 diff --git a/data/overlays/effects/z_eff_ss_sibuki2.data.s b/data/overlays/effects/z_eff_ss_sibuki2.data.s index 8bce205cc3..165eac4aef 100644 --- a/data/overlays/effects/z_eff_ss_sibuki2.data.s +++ b/data/overlays/effects/z_eff_ss_sibuki2.data.s @@ -7,6 +7,7 @@ .section .data +glabel Effect_Ss_Sibuki2_InitVars .word 0x00000012 .word func_809ABD60 glabel D_809AC068 diff --git a/data/overlays/effects/z_eff_ss_solder_srch_ball.data.s b/data/overlays/effects/z_eff_ss_solder_srch_ball.data.s index 7caf7a0412..0d7b858daf 100644 --- a/data/overlays/effects/z_eff_ss_solder_srch_ball.data.s +++ b/data/overlays/effects/z_eff_ss_solder_srch_ball.data.s @@ -7,6 +7,7 @@ .section .data +glabel Effect_Ss_Solder_Srch_Ball_InitVars .word 0x00000018 .word func_809AC130 .word 0x00000000, 0x00000000 diff --git a/data/overlays/effects/z_eff_ss_stick.data.s b/data/overlays/effects/z_eff_ss_stick.data.s index fa69d358ac..6edf7c6952 100644 --- a/data/overlays/effects/z_eff_ss_stick.data.s +++ b/data/overlays/effects/z_eff_ss_stick.data.s @@ -7,6 +7,7 @@ .section .data +glabel Effect_Ss_Stick_InitVars .word 0x00000010 .word func_809AC2D0 glabel D_809AC628 diff --git a/data/overlays/effects/z_eff_ss_stone1.data.s b/data/overlays/effects/z_eff_ss_stone1.data.s index 520a9b2d28..40c52437a7 100644 --- a/data/overlays/effects/z_eff_ss_stone1.data.s +++ b/data/overlays/effects/z_eff_ss_stone1.data.s @@ -7,6 +7,7 @@ .section .data +glabel Effect_Ss_Stone1_InitVars .word 0x00000014 .word func_809AC700 glabel D_809ACA08 diff --git a/data/z_eff_blure.data.s b/data/z_eff_blure.data.s deleted file mode 100644 index 8daaa08085..0000000000 --- a/data/z_eff_blure.data.s +++ /dev/null @@ -1,41 +0,0 @@ -.include "macro.inc" - -# assembler directives -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers - -.section .data - -glabel D_80115760 - .incbin "baserom.z64", 0xB8C900, 0x10 - -glabel D_80115770 - .incbin "baserom.z64", 0xB8C910, 0x10 - -glabel D_80115780 - .incbin "baserom.z64", 0xB8C920, 0xC - -glabel D_8011578C - .incbin "baserom.z64", 0xB8C92C, 0x10 - -glabel D_8011579C - .incbin "baserom.z64", 0xB8C93C, 0x10 - -glabel D_801157AC - .incbin "baserom.z64", 0xB8C94C, 0x10 - -glabel D_801157BC - .incbin "baserom.z64", 0xB8C95C, 0x10 - -glabel D_801157CC - .incbin "baserom.z64", 0xB8C96C, 0x10 - -glabel D_801157DC - .incbin "baserom.z64", 0xB8C97C, 0x10 - -glabel D_801157EC - .incbin "baserom.z64", 0xB8C98C, 0x10 - -glabel D_801157FC - .incbin "baserom.z64", 0xB8C99C, 0x14 diff --git a/data/z_effect.bss.s b/data/z_effect.bss.s deleted file mode 100644 index 6be77044e8..0000000000 --- a/data/z_effect.bss.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 purposee registers - -.section .bss - -glabel D_80157DA0 - .space 0x4 - -glabel D_80157DA4 - .space 0x4 - -glabel D_80157DA8 - .space 0x55C - -glabel D_80158304 - .space 0x8F4 - -glabel D_80158BF8 - .space 0x4 - -glabel D_80158BFC - .space 0x4 - -glabel D_80158C00 - .space 0x50C - -glabel D_8015910C - .space 0x16C4 - -glabel D_8015A7D0 - .space 0xE5C - -glabel D_8015B62C - .space 0x4 - -glabel D_8015B630 - .space 0x560 - -glabel D_8015BB90 - .space 0x4 - -glabel D_8015BB94 - .space 0xC diff --git a/data/z_effect.data.s b/data/z_effect.data.s deleted file mode 100644 index b7592f0743..0000000000 --- a/data/z_effect.data.s +++ /dev/null @@ -1,23 +0,0 @@ -.include "macro.inc" - -# assembler directives -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers - -.section .data - -glabel D_80115860 - .incbin "baserom.z64", 0xB8CA00, 0x4 - -glabel D_80115864 - .incbin "baserom.z64", 0xB8CA04, 0x4 - -glabel D_80115868 - .incbin "baserom.z64", 0xB8CA08, 0x14 - -glabel D_8011587C - .incbin "baserom.z64", 0xB8CA1C, 0x28 - -glabel D_801158A4 - .incbin "baserom.z64", 0xB8CA44, 0xC diff --git a/data/z_effect_soft_sprite.data.s b/data/z_effect_soft_sprite_old_init.data.s similarity index 81% rename from data/z_effect_soft_sprite.data.s rename to data/z_effect_soft_sprite_old_init.data.s index 43fa9133b5..93fc257715 100644 --- a/data/z_effect_soft_sprite.data.s +++ b/data/z_effect_soft_sprite_old_init.data.s @@ -7,15 +7,6 @@ .section .data -glabel EffectSS2Info - .incbin "baserom.z64", 0xB8CA50, 0x4 - -glabel D_801158B4 - .incbin "baserom.z64", 0xB8CA54, 0x4 - -glabel D_801158B8 - .incbin "baserom.z64", 0xB8CA58, 0x8 - glabel D_801158C0 .incbin "baserom.z64", 0xB8CA60, 0xC @@ -88,11 +79,4 @@ glabel D_801159A9 glabel D_801159AA .incbin "baserom.z64", 0xB8CB4A, 0x6 -glabel sParticleOverlayTable - .incbin "baserom.z64", 0xB8CB50, 0x10 -glabel D_801159C0 - .incbin "baserom.z64", 0xB8CB60, 0xC - -glabel D_801159CC - .incbin "baserom.z64", 0xB8CB6C, 0x3F4 diff --git a/include/color.h b/include/color.h index d18fb9844a..c809ed17d5 100644 --- a/include/color.h +++ b/include/color.h @@ -15,6 +15,11 @@ typedef union { u32 rgba; } Color_RGBA8; +// Variant without u32 union +typedef struct { + u8 r, g, b, a; +} Color_RGBA8_n; + typedef struct { f32 r, g, b, a; } Color_RGBAf; diff --git a/include/functions.h b/include/functions.h index 0c96486687..aa35d73e54 100644 --- a/include/functions.h +++ b/include/functions.h @@ -161,80 +161,130 @@ void __osSetWatchLo(u32); Actor* Item_DropCollectible(GlobalContext* globalCtx, Vec3f* spawnPos, s16 params); Actor* Item_DropCollectible2(GlobalContext* globalCtx, Vec3f* spawnPos, s16 params); void Item_DropCollectibleRandom(GlobalContext* globalCtx, Actor* fromActor, Vec3f* spawnPos, s16 params); -// ? func_8001FDF0(?); -// ? func_80020184(?); -// ? func_800208E0(?); -// ? func_80020A50(?); -// ? func_80020F60(?); -// ? func_80020FC0(?); -// ? func_800214D0(?); -// ? func_80021F00(?); -// ? func_800224F4(?); -// ? func_80022A10(?); -// ? func_8002389C(?); -void func_80024F0C(UNK_TYPE); +void EffectBlure_AddVertex(EffectBlure* this, Vec3f* p1, Vec3f* p2); +void EffectBlure_AddSpace(EffectBlure* this); +void EffectBlure_Init1(void* thisx, void* initParamsx); +void EffectBlure_Init2(void* thisx, void* initParamsx); +void EffectBlure_Destroy(void* thisx); +s32 EffectBlure_Update(void* thisx); +void EffectBlure_Draw(void* thisx, GraphicsContext* gfxCtx); +void EffectShieldParticle_Init(void* thisx, void* initParamsx); +void EffectShieldParticle_Destroy(void* thisx); +s32 EffectShieldParticle_Update(void* thisx); +void EffectShieldParticle_Draw(void* thisx, GraphicsContext* gfxCtx); +void EffectSpark_Init(void* thisx, void* initParamsx); +void EffectSpark_Destroy(void* thisx); +s32 EffectSpark_Update(void* thisx); +void EffectSpark_Draw(void* thisx, GraphicsContext* gfxCtx); void func_80026230(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 arg3); -void func_80026400(GlobalContext*, Color_RGBA8*, u8, s16); -void func_80026608(GlobalContext*); +void func_80026400(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 arg3); +void func_80026608(GlobalContext* globalCtx); void func_80026690(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 arg3); -void func_80026860(GlobalContext*, Color_RGBA8*, u8, s16); +void func_80026860(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 arg3); void func_80026A6C(GlobalContext* globalCtx); -GlobalContext* func_80026B00(void); -// ? func_80026B0C(?); -// ? func_80026C1C(?); -// ? func_80026C2C(?); -void Effect_Add(GlobalContext* globalCtx, s32* idp, s32 type, u8 arg3, u8 arg4, void* initParams); -// ? func_80026E74(?); -// ? func_80026F70(?); -// ? func_8002709C(?); -// ? func_800271A8(?); -// ? func_800272B0(?); -// ? func_80027410(?); Effect_SS_Clear -// ? func_800274E0(?); Effect_SS_Delete -void Effect_SS_ResetEntry(LoadedParticleEntry* particle); -// ? func_800275D0(?); -// ? func_80027798(?); -// ? func_80027A40(?); -// ? func_80027AE0(?); -// ? func_80027B98(?); -// ? func_80027BDC(?); -// ? func_80027E34(?); -// ? func_80027E84(?); +GlobalContext* Effect_GetGlobalCtx(void); +void* Effect_GetByIndex(s32 index); +void Effect_InitContext(GlobalContext* globalCtx); +void Effect_Add(GlobalContext* globalCtx, s32* pIndex, s32 type, u8 arg3, u8 arg4, void* initParams); +void Effect_DrawAll(GraphicsContext* gfxCtx); +void Effect_UpdateAll(GlobalContext* globalCtx); +void Effect_Delete(GlobalContext* globalCtx, s32 index); +void Effect_DeleteAll(GlobalContext* globalCtx); +void EffectSs_InitInfo(GlobalContext* globalCtx, s32 tableSize); +void EffectSs_ClearAll(GlobalContext* globalCtx); +void EffectSs_Delete(EffectSs* effectSs); +void EffectSs_Reset(EffectSs* effectSs); +void EffectSs_Insert(GlobalContext* globalCtx, EffectSs* effectSs); +void EffectSs_Spawn(GlobalContext* globalCtx, s32 type, s32 priority, void* initParams); +void EffectSs_UpdateAll(GlobalContext* globalCtx); +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(?); // ? func_800281E8(?); // ? func_8002829C(?); // ? func_80028304(?); +// ? func_8002836C(?); +// ? func_800283D4(?); +// ? func_8002843C(?); +// ? func_800284A4(?); +// ? func_80028510(?); // ? func_8002857C(?); +// ? func_800285EC(?); // ? func_8002865C(?); void func_800286CC(GlobalContext*, Vec3f*, Vec3f*, Vec3f*, s16, s16); // ? func_8002873C(?); // ? func_800287AC(?); +// ? func_8002881C(?); +// ? func_80028858(?); // ? func_80028894(?); +// ? func_80028990(?); +// ? func_80028A54(?); +// ? func_80028B18(?); void func_80028B74(GlobalContext*, Vec3f*, UNK_PTR, UNK_PTR, Color_RGB8*, Color_RGB8*); // ? func_80028BB0(?); +// ? func_80028CEC(?); +// ? func_80028DC4(?); +// ? func_80028E1C(?); +// ? func_80028E84(?); // ? func_80028EF4(?); +// ? func_80028F84(?); // ? func_80028FD8(?); +// ? func_80029024(?); // ? func_80029060(?); -void Effect_SpawnFragment(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 objNumber, u32 dList); +// ? func_800290F0(?); +// ? func_80029184(?); +// ? func_800291D8(?); // ? func_800292DC(?); // ? func_80029320(?); +// ? func_800293A0(?); +// ? func_800293E4(?); // ? func_80029444(?); +// ? func_8002949C(?); +// ? func_80029530(?); // ? func_80029568(?); +// ? func_800295A0(?); +// ? func_80029618(?); +// ? func_80029694(?); // ? func_80029724(?); +// ? func_800297A4(?); +// ? func_800298EC(?); // ? 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(?); +// ? func_80029CF0(?); +// ? func_80029D5C(?); +// ? func_80029DBC(?); +// ? func_80029E24(?); +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, u32 dList); // ? func_80029F44(?); +// ? func_80029FAC(?); +// ? func_8002A140(?); +// ? func_8002A1DC(?); +// ? func_8002A2A4(?); // ? func_8002A32C(?); // ? func_8002A3C4(?); +// ? func_8002A484(?); +// ? func_8002A4D4(?); +// ? func_8002A5F4(?); 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(?); // ? func_8002A95C(?); // ? func_8002A9F4(?); +// ? func_8002AA44(?); // ? func_8002AAB0(?); void Overlay_LoadGameState(GameStateOverlay* overlayEntry); void Overlay_FreeGameState(GameStateOverlay* overlayEntry); @@ -930,7 +980,7 @@ void Lights_SetAmbientColor(LightingContext* lightCtx, u8 red, u8 green, u8 blue LightMapper* Lights_CreateMapper(LightingContext* lightCtx, GraphicsContext* gfxCtx); void Lights_ClearHead(GlobalContext* globalCtx, LightingContext* lightCtx); void Lights_RemoveAll(GlobalContext* globalCtx, LightingContext* lightCtx); -z_Light* Lights_Insert(GlobalContext* globalCtx, LightingContext* lightCtx, LightInfo* info); +z_Light* Lights_Insert(GlobalContext* globalCtx, LightingContext* lightCtx, void* info); void Lights_Remove(GlobalContext* globalCtx, LightingContext* lightCtx, z_Light* light); LightMapper* func_8007A960(GraphicsContext* gfxCtx, u8 red, u8 green, u8 blue); // ? func_8007A9B4(?); @@ -1238,20 +1288,20 @@ void func_800A6888(GlobalContext*, PSkinAwb*); // ? func_800A6AC4(?); // ? func_800A6E10(?); void func_800A6EF4(MtxF* mf, Vec3f* src, Vec3f* dest); -// ? func_800A6FA0(?); +void func_800A6FA0(MtxF* mf1, MtxF* mf2, MtxF* dest); // ? func_800A72FC(?); // ? func_800A730C(?); // ? func_800A735C(?); // ? func_800A73E0(?); void func_800A76A4(MtxF* dest, f32 x, f32 y, f32 z); -// ? func_800A7704(?); +void func_800A7704(MtxF* dest, s16 x, s16 y, s16 z); // ? func_800A7894(?); void func_800A7A24(MtxF* dest, f32 x, f32 y, f32 z); // ? func_800A7B04(?); // ? func_800A7B84(?); // ? func_800A7C60(?); -// ? func_800A7E70(?); -// ? func_800A7EC0(?); +Mtx* func_800A7E70(GraphicsContext* gfxCtx, MtxF* src); +void func_800A7EC0(MtxF* dest, s16 arg1, f32 x, f32 y, f32 z); // ? func_800A81A0(?); // ? func_800A82C8(?); // ? func_800A9A9C(?); @@ -1597,7 +1647,8 @@ void SpeedMeter_InitImpl(SpeedMeter* this, u32 arg1, u32 y); void SpeedMeter_Init(SpeedMeter* this); void SpeedMeter_Destroy(SpeedMeter* this); void SpeedMeter_DrawTimeEntries(SpeedMeter* this, GraphicsContext* gfxCtx); -void SpeedMeter_InitAllocEntry(SpeedMeterAllocEntry* entry, u32 maxval, u32 val, u16 backColor, u16 foreColor, u32 ulx, u32 lrx, u32 uly, u32 lry); +void SpeedMeter_InitAllocEntry(SpeedMeterAllocEntry* entry, u32 maxval, u32 val, u16 backColor, u16 foreColor, u32 ulx, + u32 lrx, u32 uly, u32 lry); void SpeedMeter_DrawAllocEntry(SpeedMeterAllocEntry* this, GraphicsContext* gfxCtx); void SpeedMeter_DrawAllocEntries(SpeedMeter* meter, GraphicsContext* gfxCtx, GameState* state); void SysCfb_Init(s32 n64dd); diff --git a/include/initvars.h b/include/initvars.h index a78e302cb9..4489b2bb2b 100644 --- a/include/initvars.h +++ b/include/initvars.h @@ -1,6 +1,43 @@ #ifndef _INITVARS_H_ #define _INITVARS_H_ +extern EffectSsInit Effect_Ss_Dust_InitVars; +extern EffectSsInit Effect_Ss_KiraKira_InitVars; +extern EffectSsInit Effect_Ss_Bomb_InitVars; +extern EffectSsInit Effect_Ss_Bomb2_InitVars; +extern EffectSsInit Effect_Ss_Blast_InitVars; +extern EffectSsInit Effect_Ss_G_Spk_InitVars; +extern EffectSsInit Effect_Ss_D_Fire_InitVars; +extern EffectSsInit Effect_Ss_Bubble_InitVars; +extern EffectSsInit Effect_Ss_G_Ripple_InitVars; +extern EffectSsInit Effect_Ss_G_Splash_InitVars; +extern EffectSsInit Effect_Ss_G_Magma_InitVars; +extern EffectSsInit Effect_Ss_G_Fire_InitVars; +extern EffectSsInit Effect_Ss_Lightning_InitVars; +extern EffectSsInit Effect_Ss_Dt_Bubble_InitVars; +extern EffectSsInit Effect_Ss_Hahen_InitVars; +extern EffectSsInit Effect_Ss_Stick_InitVars; +extern EffectSsInit Effect_Ss_Sibuki_InitVars; +extern EffectSsInit Effect_Ss_Sibuki2_InitVars; +extern EffectSsInit Effect_Ss_G_Magma2_InitVars; +extern EffectSsInit Effect_Ss_Stone1_InitVars; +extern EffectSsInit Effect_Ss_HitMark_InitVars; +extern EffectSsInit Effect_Ss_Fhg_Flash_InitVars; +extern EffectSsInit Effect_Ss_K_Fire_InitVars; +extern EffectSsInit Effect_Ss_Solder_Srch_Ball_InitVars; +extern EffectSsInit Effect_Ss_Kakera_InitVars; +extern EffectSsInit Effect_Ss_Ice_Piece_InitVars; +extern EffectSsInit Effect_Ss_En_Ice_InitVars; +extern EffectSsInit Effect_Ss_Fire_Tail_InitVars; +extern EffectSsInit Effect_Ss_En_Fire_InitVars; +extern EffectSsInit Effect_Ss_Extra_InitVars; +extern EffectSsInit Effect_Ss_Fcircle_InitVars; +extern EffectSsInit Effect_Ss_Dead_Db_InitVars; +extern EffectSsInit Effect_Ss_Dead_Dd_InitVars; +extern EffectSsInit Effect_Ss_Dead_Ds_InitVars; +extern EffectSsInit Effect_Ss_Dead_Sound_InitVars; +extern EffectSsInit Effect_Ss_Ice_Smoke_InitVars; + extern ActorInit Player_InitVars; extern ActorInit En_Test_InitVars; extern ActorInit En_GirlA_InitVars; diff --git a/include/macros.h b/include/macros.h index c92ff3cf6d..480a7de6a2 100644 --- a/include/macros.h +++ b/include/macros.h @@ -67,7 +67,9 @@ * `cbnz` blue component of color vertex, or z component of normal vertex * `a` alpha */ -#define VTX(x,y,z,s,t,crnx,cgny,cbnz,a) { { { x, y, z }, 0, { s, t }, { crnx, cgny, cbnz, a }, }, } +#define VTX(x,y,z,s,t,crnx,cgny,cbnz,a) { { { x, y, z }, 0, { s, t }, { crnx, cgny, cbnz, a } } } + +#define VTX_T(x,y,z,s,t,cr,cg,cb,a) { { x, y, z }, 0, { s, t }, { cr, cg, cb, a } } #define VIEWPORT_INIT(viewport, by, rx, ty, lx) \ viewport.bottomY = by; \ diff --git a/include/segment_symbols.h b/include/segment_symbols.h index 8b5ae8eb82..f4a72a8d60 100644 --- a/include/segment_symbols.h +++ b/include/segment_symbols.h @@ -63,6 +63,43 @@ DECLARE_OVERLAY_SEGMENT(kaleido_scope) DECLARE_OVERLAY_SEGMENT(player_actor) DECLARE_OVERLAY_SEGMENT(map_mark_data) +DECLARE_OVERLAY_SEGMENT(Effect_Ss_Dust) +DECLARE_OVERLAY_SEGMENT(Effect_Ss_KiraKira) +DECLARE_OVERLAY_SEGMENT(Effect_Ss_Bomb) +DECLARE_OVERLAY_SEGMENT(Effect_Ss_Bomb2) +DECLARE_OVERLAY_SEGMENT(Effect_Ss_Blast) +DECLARE_OVERLAY_SEGMENT(Effect_Ss_G_Spk) +DECLARE_OVERLAY_SEGMENT(Effect_Ss_D_Fire) +DECLARE_OVERLAY_SEGMENT(Effect_Ss_Bubble) +DECLARE_OVERLAY_SEGMENT(Effect_Ss_G_Ripple) +DECLARE_OVERLAY_SEGMENT(Effect_Ss_G_Splash) +DECLARE_OVERLAY_SEGMENT(Effect_Ss_G_Magma) +DECLARE_OVERLAY_SEGMENT(Effect_Ss_G_Fire) +DECLARE_OVERLAY_SEGMENT(Effect_Ss_Lightning) +DECLARE_OVERLAY_SEGMENT(Effect_Ss_Dt_Bubble) +DECLARE_OVERLAY_SEGMENT(Effect_Ss_Hahen) +DECLARE_OVERLAY_SEGMENT(Effect_Ss_Stick) +DECLARE_OVERLAY_SEGMENT(Effect_Ss_Sibuki) +DECLARE_OVERLAY_SEGMENT(Effect_Ss_Sibuki2) +DECLARE_OVERLAY_SEGMENT(Effect_Ss_G_Magma2) +DECLARE_OVERLAY_SEGMENT(Effect_Ss_Stone1) +DECLARE_OVERLAY_SEGMENT(Effect_Ss_HitMark) +DECLARE_OVERLAY_SEGMENT(Effect_Ss_Fhg_Flash) +DECLARE_OVERLAY_SEGMENT(Effect_Ss_K_Fire) +DECLARE_OVERLAY_SEGMENT(Effect_Ss_Solder_Srch_Ball) +DECLARE_OVERLAY_SEGMENT(Effect_Ss_Kakera) +DECLARE_OVERLAY_SEGMENT(Effect_Ss_Ice_Piece) +DECLARE_OVERLAY_SEGMENT(Effect_Ss_En_Ice) +DECLARE_OVERLAY_SEGMENT(Effect_Ss_Fire_Tail) +DECLARE_OVERLAY_SEGMENT(Effect_Ss_En_Fire) +DECLARE_OVERLAY_SEGMENT(Effect_Ss_Extra) +DECLARE_OVERLAY_SEGMENT(Effect_Ss_Fcircle) +DECLARE_OVERLAY_SEGMENT(Effect_Ss_Dead_Db) +DECLARE_OVERLAY_SEGMENT(Effect_Ss_Dead_Dd) +DECLARE_OVERLAY_SEGMENT(Effect_Ss_Dead_Ds) +DECLARE_OVERLAY_SEGMENT(Effect_Ss_Dead_Sound) +DECLARE_OVERLAY_SEGMENT(Effect_Ss_Ice_Smoke) + DECLARE_OVERLAY_SEGMENT(En_Test) DECLARE_OVERLAY_SEGMENT(En_GirlA) DECLARE_OVERLAY_SEGMENT(En_Part) diff --git a/include/ultra64/gbi.h b/include/ultra64/gbi.h index a10033e67a..5035079109 100644 --- a/include/ultra64/gbi.h +++ b/include/ultra64/gbi.h @@ -2762,12 +2762,12 @@ _DW({ \ #else /* F3DEX_GBI_2 */ #define gSPSetGeometryMode(pkt, word) \ -{ \ +_DW({ \ Gfx *_g = (Gfx *)(pkt); \ \ _g->words.w0 = _SHIFTL(G_SETGEOMETRYMODE, 24, 8); \ _g->words.w1 = (unsigned int)(word); \ -} +}) #define gsSPSetGeometryMode(word) \ { \ @@ -2775,12 +2775,12 @@ _DW({ \ } #define gSPClearGeometryMode(pkt, word) \ -{ \ +_DW({ \ Gfx *_g = (Gfx *)(pkt); \ \ _g->words.w0 = _SHIFTL(G_CLEARGEOMETRYMODE, 24, 8); \ _g->words.w1 = (unsigned int)(word); \ -} +}) #define gsSPClearGeometryMode(word) \ { \ diff --git a/include/variables.h b/include/variables.h index e16fec19c0..20c84d0987 100644 --- a/include/variables.h +++ b/include/variables.h @@ -35,7 +35,7 @@ extern u32 D_03012B20; //extern ? D_04002280; //extern ? D_04003238; extern u32 D_04004298; -//extern ? D_04006020; +extern u8 D_04006020[]; extern Gfx D_0400C820[]; extern u32 D_0400CB70; extern u32 D_04010130; @@ -46,7 +46,7 @@ extern u32 D_0401E370; //extern ? D_0402CF30; //extern ? D_04037730; //extern ? D_04038F00; -//extern ? D_04038FB0; +extern u8 D_04038FB0[]; extern u32 D_0403B030; extern u32 D_0403BBA0; extern u32 D_0403BCD8; @@ -153,14 +153,6 @@ extern u8 D_80114930[]; //extern ? D_801157DC; //extern ? D_801157EC; //extern ? D_801157FC; -//extern ? D_80115810; -//extern ? D_80115860; -//extern ? D_80115868; -//extern ? D_8011587C; -//extern ? D_801158A4; -extern EffectTableInfo EffectSS2Info; // 801158B0 -//extern ? D_801158B4; -//extern u32 D_801158B8; //extern ? D_801158C0; //extern ? D_801158CC; //extern ? D_801158D0; @@ -184,15 +176,14 @@ extern EffectTableInfo EffectSS2Info; // 801158B0 //extern ? D_801159A8; //extern ? D_801159A9; //extern ? D_801159AA; -//extern ? D_801159C0; -//extern ? D_801159CC; +extern EffectSsOverlay gEffectSsOverlayTable[37]; //extern ? D_80115DC0; //extern ? D_80115F68; //extern ? D_80115F6C; //extern ? D_80115F70; extern Gfx D_80116280[]; extern ActorOverlay gActorOverlayTable[471]; // original name: "actor_dlftbls" 801162A0 -extern s32 gMaxProfile; +extern s32 gMaxActorId; // original name: "MaxProfile" //extern ? D_80119E2C; //extern ? D_80119E52; //extern ? D_80119E54; @@ -850,8 +841,6 @@ extern s32 gSystemArenaLogSeverity; extern s32 D_80134D20; //extern ? D_80135130; //extern ? D_80135158; -extern char D_80135180[]; -extern char D_80135194[]; //extern ? D_801351A8; //extern ? D_801351BC; //extern ? D_801351F8; @@ -906,7 +895,6 @@ extern char D_80135194[]; //extern ? D_80135780; //extern ? D_8013579C; //extern ? D_801357C0; -extern char D_801357DC[]; //extern ? D_801357F8; //extern ? D_8013581C; //extern ? D_80135838; @@ -3297,19 +3285,7 @@ extern char D_80146238[]; extern u8 D_80155F50[]; extern u8 D_80157580[]; extern u8 D_80157D30[]; -extern GlobalContext* D_80157DA0; -//extern ? D_80157DA4; -//extern ? D_80157DA8; -//extern ? D_80158304; -//extern ? D_80158BF8; -//extern ? D_80158BFC; -//extern ? D_80158C00; -//extern ? D_8015910C; -//extern ? D_8015A7D0; -//extern ? D_8015B62C; -//extern ? D_8015B630; //extern ? D_8015BB90; -//extern ? D_8015BB94; //extern ? D_8015BC30; //extern ? D_8015BC3C; //extern ? D_8015BC48; diff --git a/include/z64.h b/include/z64.h index dde6e85e2d..b1eb8a8880 100644 --- a/include/z64.h +++ b/include/z64.h @@ -1113,24 +1113,6 @@ typedef enum { DPM_ENEMY = 2 } DynaPolyMoveFlag; -typedef struct LoadedParticleEntry { - /* 0x0000 */ Vec3f position; - /* 0x000C */ Vec3f velocity; - /* 0x0018 */ Vec3f acceleration; - /* 0x0024 */ void(*update)(GlobalContext*, s32, struct LoadedParticleEntry*); - /* 0x0028 */ void(*draw)(GlobalContext*, s32, struct LoadedParticleEntry*); - /* 0x002C */ f32 unk_2C; // Probaly a Vec3f - /* 0x0030 */ f32 unk_30; - /* 0x0034 */ f32 unk_34; - /* 0x0038 */ u32 unk_38; - /* 0x003C */ u32 unk_3C; - /* 0x0042 */ u16 unk_40[13]; - /* 0x005A */ u16 flags; // bit 0: set if this entry is not considered free on a priority tie bit 1: ? bit 2: ? - /* 0x005C */ s16 life; // -1 means this entry is free - /* 0x005E */ u8 priority; // Lower value means higher priority - /* 0x005F */ u8 type; -} LoadedParticleEntry; // size = 0x60 - // Some animation related structure typedef struct { /* 0x00 */ AnimationHeader* animation; @@ -1161,27 +1143,6 @@ typedef struct { /* 0x24 */ char unk_24[0x4]; } struct_80034A14_arg1; -typedef struct { - /* 0x00 */ u32 unk_00; - /* 0x04 */ u32(*init)(GlobalContext*, u32, LoadedParticleEntry*, void*); -} ParticleOverlayInfo; - -typedef struct { - /* 0x00 */ u32 vromStart; - /* 0x04 */ u32 vromEnd; - /* 0x0C */ void* vramStart; - /* 0x08 */ void* vramEnd; - /* 0x10 */ void* loadedRamAddr; - /* 0x14 */ ParticleOverlayInfo* overlayInfo; - /* 0x18 */ u32 unk_18; // Always 0x01000000? -} ParticleOverlay; - -typedef struct { - /* 0x00 */ LoadedParticleEntry* data_table; // Name from debug assert - /* 0x04 */ s32 searchIndex; - /* 0x08 */ s32 size; -} EffectTableInfo; - typedef struct { /* 0x00 */ s8 scene; /* 0x01 */ s8 spawn; diff --git a/include/z64actor.h b/include/z64actor.h index d328b6433c..c912a26c51 100644 --- a/include/z64actor.h +++ b/include/z64actor.h @@ -4,7 +4,6 @@ #include #include -#define ACTOR_DLF_MAX 471 #define ACTOR_NUMBER_MAX 200 #define INVISIBLE_ACTOR_MAX 20 #define AM_FIELD_SIZE 0x27A0 @@ -770,7 +769,8 @@ typedef enum { /* 0x01D3 */ ACTOR_EN_ZL4, /* 0x01D4 */ ACTOR_EN_MM2, /* 0x01D5 */ ACTOR_BG_JYA_BLOCK, - /* 0x01D6 */ ACTOR_OBJ_WARP2BLOCK + /* 0x01D6 */ ACTOR_OBJ_WARP2BLOCK, + /* 0x01D7 */ ACTOR_ID_MAX // originally "ACTOR_DLF_MAX" } ActorID; #endif diff --git a/include/z64effect.h b/include/z64effect.h index 2c158cdae1..9383aa97d4 100644 --- a/include/z64effect.h +++ b/include/z64effect.h @@ -1,56 +1,273 @@ #ifndef _Z64EFFECT_H_ #define _Z64EFFECT_H_ + #include +struct GraphicsContext; +struct GlobalContext; + +/* Effects */ + +#define SPARK_COUNT 3 +#define BLURE_COUNT 25 +#define SHIELD_PARTICLE_COUNT 3 + +#define TOTAL_EFFECT_COUNT SPARK_COUNT + BLURE_COUNT + SHIELD_PARTICLE_COUNT + +typedef struct { + /* 0x00 */ u8 active; + /* 0x01 */ u8 unk_01; + /* 0x02 */ u8 unk_02; +} EffectStatus; // size = 0x03 + typedef struct { /* 0x00 */ Vec3f velocity; /* 0x0C */ Vec3f position; - /* 0x18 */ Vec3s unk_18; - /* 0x1E */ Vec3s unk_1E; -} EffSparkParticle; // size = 0x24 + /* 0x18 */ Vec3s unkVelocity; + /* 0x1E */ Vec3s unkPosition; +} EffectSparkElement; // size = 0x24 typedef struct { /* 0x000 */ Vec3s position; - /* 0x008 */ s32 numParticles; // Will be calculated as particleFactor1 * particleFactor2 + 2 - /* 0x00C */ EffSparkParticle particles[32]; - /* 0x48C */ f32 velocity; + /* 0x008 */ s32 numElements; // "table_size"; calculated as uDiv * vDiv + 2 + /* 0x00C */ EffectSparkElement elements[32]; + /* 0x48C */ f32 speed; /* 0x490 */ f32 gravity; - /* 0x494 */ u32 particleFactor1; - /* 0x498 */ u32 particleFactor2; - /* 0x49C */ Color_RGBA8 colorStart[4]; - /* 0x4AC */ Color_RGBA8 colorEnd[4]; - /* 0x4BC */ s32 age; + /* 0x494 */ u32 uDiv; // "u_div" + /* 0x498 */ u32 vDiv; // "v_div" + /* 0x49C */ Color_RGBA8_n colorStart[4]; + /* 0x4AC */ Color_RGBA8_n colorEnd[4]; + /* 0x4BC */ s32 timer; /* 0x4C0 */ s32 duration; -} EffSparkParams; // size = 0x4C4 - -// gz has trail related structs but they seem to be different in dbg -typedef struct { - /* 0x0000 */ char unk_00[0x184]; - /* 0x0184 */ Color_RGBA8 p1Start; - /* 0x0188 */ Color_RGBA8 p2Start; - /* 0x018C */ Color_RGBA8 p1End; - /* 0x0190 */ Color_RGBA8 p2End; - /* 0x0194 */ u32 unk_194; // these are proably bytes - /* 0x0198 */ u32 unk_198; - /* 0x019C */ u32 unk_19C; - /* 0x01A0 */ -} TrailEffect; // size = unk +} EffectSparkInit; // size = 0x4C4 typedef struct { - /* 0x00 */ u8 numParticles; + /* 0x000 */ Vec3s position; + /* 0x008 */ s32 numElements; // "table_size"; calculated as uDiv * vDiv + 2 + /* 0x00C */ EffectSparkElement elements[32]; + /* 0x48C */ f32 speed; + /* 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]; + /* 0x4BC */ s32 timer; + /* 0x4C0 */ s32 duration; +} EffectSpark; // size = 0x4C4 + +typedef struct { + /* 0x00 */ s32 state; + /* 0x04 */ s32 timer; + /* 0x08 */ Vec3s p1; + /* 0x0E */ Vec3s p2; + /* 0x14 */ u16 flags; +} EffectBlureElement; // size = 0x18 + +typedef struct { + /* 0x000 */ char unk_00[0x184]; + /* 0x184 */ Color_RGBA8_n p1StartColor; + /* 0x188 */ Color_RGBA8_n p2StartColor; + /* 0x18C */ Color_RGBA8_n p1EndColor; + /* 0x190 */ Color_RGBA8_n p2EndColor; + /* 0x194 */ s32 elemDuration; + /* 0x198 */ s32 unkFlag; + /* 0x19C */ s32 calcMode; +} EffectBlureInit1; // size = 0x1A0 + +typedef struct { + /* 0x00 */ s32 calcMode; + /* 0x04 */ u16 flags; + /* 0x06 */ s16 addAngleChange; + /* 0x08 */ Color_RGBA8_n p1StartColor; + /* 0x0C */ Color_RGBA8_n p2StartColor; + /* 0x10 */ Color_RGBA8_n p1EndColor; + /* 0x14 */ Color_RGBA8_n p2EndColor; + /* 0x18 */ u8 elemDuration; + /* 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 +} EffectBlureInit2; // size = 0x24 + +typedef struct { + /* 0x000 */ EffectBlureElement elements[16]; + /* 0x180 */ s32 calcMode; + /* 0x184 */ f32 mode4Param; + /* 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; + /* 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 +} EffectBlure; // size = 0x1AC + +typedef struct { + /* 0x00 */ f32 initialSpeed; + /* 0x04 */ f32 endXChange; + /* 0x08 */ f32 endX; + /* 0x0C */ f32 startXChange; + /* 0x10 */ f32 startX; + /* 0x14 */ s16 yaw; + /* 0x16 */ s16 pitch; +} EffectShieldParticleElement; // size = 0x18 + +typedef struct { + /* 0x00 */ u8 numElements; /* 0x02 */ Vec3s position; - /* 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 acceleration; + /* 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; + /* 0x20 */ f32 deceleration; /* 0x24 */ f32 maxInitialSpeed; /* 0x28 */ f32 lengthCutoff; /* 0x2C */ u8 duration; /* 0x2E */ LightInfoPositionalParams lightParams; - /* 0x3C */ s32 hasLight; -} EffShieldParticleInit; // size = 0x40 + /* 0x3C */ s32 lightDecay; // halves light radius every frame when set to 1 +} EffectShieldParticleInit; // size = 0x40 + +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; + /* 0x1A0 */ f32 deceleration; + /* 0x1A4 */ char unk_1A4[0x04]; + /* 0x1A8 */ f32 maxInitialSpeed; + /* 0x1AC */ f32 lengthCutoff; + /* 0x1B0 */ u8 duration; + /* 0x1B1 */ u8 timer; + /* 0x1B2 */ LightInfoPositional lightInfo; + /* 0x1C0 */ z_Light* light; + /* 0x1C4 */ s32 lightDecay; // halves light radius every frame when set to 1 +} EffectShieldParticle; // size = 0x1C8 + +typedef struct { + /* 0x0000 */ struct GlobalContext* globalCtx; + struct { + EffectStatus status; + EffectSpark effect; + } /* 0x0004 */ sparks[SPARK_COUNT]; + struct { + EffectStatus status; + EffectBlure effect; + } /* 0x0E5C */ blures[BLURE_COUNT]; + struct { + EffectStatus status; + EffectShieldParticle effect; + } /* 0x388C */ shieldParticles[SHIELD_PARTICLE_COUNT]; +} EffectContext; // size = 0x3DF0 + +typedef struct { + /* 0x00 */ u32 size; + /* 0x04 */ void (*init)(void* effect, void* initParms); + /* 0x08 */ void (*destroy)(void* effect); + /* 0x0C */ s32 (*update)(void* effect); + /* 0x10 */ void (*draw)(void* effect, struct GraphicsContext* gfxCtx); +} EffectInfo; // size = 0x14 + +typedef enum { + /* 0x00 */ EFFECT_SPARK, + /* 0x01 */ EFFECT_BLURE1, + /* 0x02 */ EFFECT_BLURE2, + /* 0x03 */ EFFECT_SHIELD_PARTICLE +} EffectType; + +/* Effect Soft Sprites */ + +struct EffectSs; + +typedef struct { + /* 0x00 */ u32 type; + /* 0x04 */ u32 (*init)(struct GlobalContext* globalCtx, u32 index, struct EffectSs* effectSs, void* initParams); +} EffectSsInit; // size = 0x08 + +typedef struct { + /* 0x00 */ u32 vromStart; + /* 0x04 */ u32 vromEnd; + /* 0x08 */ void* vramStart; + /* 0x0C */ void* vramEnd; + /* 0x10 */ void* loadedRamAddr; + /* 0x14 */ EffectSsInit* initInfo; + /* 0x18 */ u8 unk_18; +} EffectSsOverlay; // size = 0x1C + +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 */ u32 unk_38; + /* 0x3C */ u32 unk_3C; + /* 0x40 */ s16 regs[13]; // specific per effect + /* 0x5A */ u16 flags; + /* 0x5C */ s16 life; // -1 means this entry is free + /* 0x5E */ u8 priority; // Lower value means higher priority + /* 0x5F */ u8 type; +} EffectSs; // size = 0x60 + +typedef struct { + /* 0x00 */ EffectSs* table; // "data_table" + /* 0x04 */ s32 searchStartIndex; + /* 0x08 */ s32 tableSize; +} EffectSsInfo; // size = 0x0C + +typedef enum { + /* 0x00 */ EFFECT_SS_DUST, + /* 0x01 */ EFFECT_SS_KIRAKIRA, + /* 0x02 */ EFFECT_SS_BOMB, + /* 0x03 */ EFFECT_SS_BOMB2, + /* 0x04 */ EFFECT_SS_BLAST, + /* 0x05 */ EFFECT_SS_G_SPK, + /* 0x06 */ EFFECT_SS_D_FIRE, + /* 0x07 */ EFFECT_SS_BUBBLE, + /* 0x08 */ EFFECT_SS_UNSET, + /* 0x09 */ EFFECT_SS_G_RIPPLE, + /* 0x0A */ EFFECT_SS_G_SPLASH, + /* 0x0B */ EFFECT_SS_G_MAGMA, + /* 0x0C */ EFFECT_SS_G_FIRE, + /* 0x0D */ EFFECT_SS_LIGHTNING, + /* 0x0E */ EFFECT_SS_DT_BUBBLE, + /* 0x0F */ EFFECT_SS_HAHEN, + /* 0x10 */ EFFECT_SS_STICK, + /* 0x11 */ EFFECT_SS_SIBUKI, + /* 0x12 */ EFFECT_SS_SIBUKI2, + /* 0x13 */ EFFECT_SS_G_MAGMA2, + /* 0x14 */ EFFECT_SS_STONE1, + /* 0x15 */ EFFECT_SS_HITMARK, + /* 0x16 */ EFFECT_SS_FHG_FLASH, + /* 0x17 */ EFFECT_SS_K_FIRE, + /* 0x18 */ EFFECT_SS_SOLDER_SRCH_BALL, + /* 0x19 */ EFFECT_SS_KAKERA, + /* 0x1A */ EFFECT_SS_ICE_PIECE, + /* 0x1B */ EFFECT_SS_EN_ICE, + /* 0x1C */ EFFECT_SS_FIRE_TAIL, + /* 0x1D */ EFFECT_SS_EN_FIRE, + /* 0x1E */ EFFECT_SS_EXTRA, + /* 0x1F */ EFFECT_SS_FCIRCLE, + /* 0x20 */ EFFECT_SS_DEAD_DB, + /* 0x21 */ EFFECT_SS_DEAD_DD, + /* 0x22 */ EFFECT_SS_DEAD_DS, + /* 0x23 */ EFFECT_SS_DEAD_SOUND, + /* 0x24 */ EFFECT_SS_ICE_SMOKE, + /* 0x25 */ EFFECT_SS_TYPE_MAX // originally "EFFECT_SS2_TYPE_LAST_LABEL" +} EffectSsType; #endif diff --git a/spec b/spec index f02634cfcf..a1931f1394 100644 --- a/spec +++ b/spec @@ -276,19 +276,17 @@ beginseg include "build/data/z_en_item00.data.o" include "build/data/z_en_item00.bss.o" include "build/src/code/z_eff_blure.o" - include "build/data/z_eff_blure.data.o" include "build/src/code/z_eff_shield_particle.o" - include "build/data/z_eff_shield_particle.data.o" include "build/src/code/z_eff_spark.o" include "build/src/code/z_eff_ss_dead.o" include "build/src/code/z_effect.o" - include "build/data/z_effect.data.o" - include "build/data/z_effect.bss.o" include "build/src/code/z_effect_soft_sprite.o" - include "build/data/z_effect_soft_sprite.data.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/data/flg_set.data.o" + include "build/data/flg_set.bss.o" include "build/src/code/z_DLF.o" include "build/src/code/z_actor.o" include "build/src/code/z_actor_dlftbls.o" diff --git a/src/code/code_800FD970.c b/src/code/code_800FD970.c index b99281774e..f5b61740ce 100644 --- a/src/code/code_800FD970.c +++ b/src/code/code_800FD970.c @@ -22,8 +22,8 @@ void Math_Rand_Seed(u32 seed) { } /** - * Returns a pseudo-random floating-point number between 0.0f and 1.0f, by generating - * the next integer and masking it to an IEEE-754 compliant floating-point number + * Returns a pseudo-random floating-point number between 0.0f and 1.0f, by generating + * the next integer and masking it to an IEEE-754 compliant floating-point number * between 1.0f and 2.0f, returning the result subtract 1.0f. */ f32 Math_Rand_ZeroOne() { diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 97cd22c7ce..5ac02fefc3 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -1795,7 +1795,7 @@ void func_8002FA60(GlobalContext* globalCtx) { Lights_InitType0PositionalLight(&D_8015BC00, lightPos.x, lightPos.y, lightPos.z, 0xFF, 0xFF, 0xFF, -1); - D_8015BC10 = Lights_Insert(globalCtx, &globalCtx->lightCtx, (LightInfo*)&D_8015BC00); + D_8015BC10 = Lights_Insert(globalCtx, &globalCtx->lightCtx, &D_8015BC00); D_8015BC14 = 0; D_8015BC18 = 0.0f; } @@ -2038,7 +2038,7 @@ void Actor_UpdateAll(GlobalContext* globalCtx, ActorContext* actorCtx) { if (0) { // This assert is optimized out but it exists due to its presence in rodata - if (gMaxProfile != ACTOR_DLF_MAX) { + if (gMaxActorId != ACTOR_ID_MAX) { __assert("MaxProfile == ACTOR_DLF_MAX", "../z_actor.c", UNK_LINE); } } @@ -2459,11 +2459,11 @@ void func_800315AC(GlobalContext* globalCtx, ActorContext* actorCtx) { } if ((HREG(64) != 1) || (HREG(73) != 0)) { - func_80026E74(globalCtx->state.gfxCtx); + Effect_DrawAll(globalCtx->state.gfxCtx); } if ((HREG(64) != 1) || (HREG(74) != 0)) { - func_80027BDC(globalCtx); + EffectSs_DrawAll(globalCtx); } if ((HREG(64) != 1) || (HREG(72) != 0)) { @@ -2683,7 +2683,7 @@ Actor* Actor_Spawn(ActorContext* actorCtx, GlobalContext* globalCtx, s16 actorId overlayEntry = &gActorOverlayTable[actorId]; - if (actorId >= ACTOR_DLF_MAX) { + if (actorId >= ACTOR_ID_MAX) { __assert("profile < ACTOR_DLF_MAX", "../z_actor.c", 6883); } @@ -3134,7 +3134,7 @@ void func_80032E24(struct_80032E24* arg0, s32 arg1, GlobalContext* globalCtx) { } void func_80032F54(struct_80032E24* arg0, s32 arg1, s32 arg2, s32 arg3, u32 arg4, s32* arg5, s16 arg6) { - GlobalContext* globalCtx = func_80026B00(); + GlobalContext* globalCtx = Effect_GetGlobalCtx(); if ((globalCtx->actorCtx.unk_00 == 0) && (arg0->unk_10 > 0)) { if ((arg1 >= arg2) && (arg3 >= arg1) && (*arg5 != 0)) { diff --git a/src/code/z_actor_dlftbls.c b/src/code/z_actor_dlftbls.c index 29a18cf994..42a153113a 100644 --- a/src/code/z_actor_dlftbls.c +++ b/src/code/z_actor_dlftbls.c @@ -488,7 +488,7 @@ ActorOverlay gActorOverlayTable[] = { ACTOR_OVERLAY(Obj_Warp2block, ALLOCTYPE_NORMAL), }; -s32 gMaxProfile = 0; +s32 gMaxActorId = 0; static FaultClient sFaultClient; @@ -496,10 +496,10 @@ void ActorOverlayTable_LogPrint(void) { ActorOverlay* overlayEntry; u32 i; - osSyncPrintf("actor_dlftbls %u\n", gMaxProfile); + osSyncPrintf("actor_dlftbls %u\n", gMaxActorId); osSyncPrintf("RomStart RomEnd SegStart SegEnd allocp profile segname\n"); - for (i = 0, overlayEntry = &gActorOverlayTable[0]; i < gMaxProfile; i++, overlayEntry++) { + for (i = 0, overlayEntry = &gActorOverlayTable[0]; i < gMaxActorId; i++, overlayEntry++) { osSyncPrintf("%08x %08x %08x %08x %08x %08x %s\n", overlayEntry->vromStart, overlayEntry->vromEnd, overlayEntry->vramStart, overlayEntry->vramEnd, overlayEntry->loadedRamAddr, &overlayEntry->initInfo->id, overlayEntry->name != NULL ? overlayEntry->name : "?"); @@ -513,10 +513,10 @@ void ActorOverlayTable_FaultPrint(void* arg0, void* arg1) { FaultDrawer_SetCharPad(-2, 0); - FaultDrawer_Printf("actor_dlftbls %u\n", gMaxProfile); + FaultDrawer_Printf("actor_dlftbls %u\n", gMaxActorId); FaultDrawer_Printf("No. RamStart- RamEnd cn Name\n"); - for (i = 0, overlayEntry = &gActorOverlayTable[0]; i < gMaxProfile; i++, overlayEntry++) { + for (i = 0, overlayEntry = &gActorOverlayTable[0]; i < gMaxActorId; i++, overlayEntry++) { overlaySize = (u32)overlayEntry->vramEnd - (u32)overlayEntry->vramStart; if (overlayEntry->loadedRamAddr != NULL) { FaultDrawer_Printf("%3d %08x-%08x %3d %s\n", i, overlayEntry->loadedRamAddr, @@ -527,11 +527,11 @@ void ActorOverlayTable_FaultPrint(void* arg0, void* arg1) { } void ActorOverlayTable_Init(void) { - gMaxProfile = ACTOR_DLF_MAX; + gMaxActorId = ACTOR_ID_MAX; Fault_AddClient(&sFaultClient, ActorOverlayTable_FaultPrint, NULL, NULL); } void ActorOverlayTable_Cleanup(void) { Fault_RemoveClient(&sFaultClient); - gMaxProfile = 0; + gMaxActorId = 0; } diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c index a8bd723a4b..9a49c3f285 100644 --- a/src/code/z_collision_check.c +++ b/src/code/z_collision_check.c @@ -1232,17 +1232,17 @@ void func_8005DF9C(GlobalContext* globalCtx, Collider* collider, Vec3f* v) { } #ifdef NON_MATCHING -// Blue EffSpark -//.bss problems +// Blue EffectSpark +// .bss problems void func_8005DFAC(GlobalContext* globalCtx, Collider* collider, Vec3f* v) { + static EffectSparkInit D_8015D8A0; s32 sp24; - static EffSparkParams D_8015D8A0; D_8015D8A0.position.x = (s32)v->x; D_8015D8A0.position.y = (s32)v->y; D_8015D8A0.position.z = (s32)v->z; - D_8015D8A0.particleFactor1 = 5; - D_8015D8A0.particleFactor2 = 5; + D_8015D8A0.uDiv = 5; + D_8015D8A0.vDiv = 5; D_8015D8A0.colorStart[0].r = 0x0A; D_8015D8A0.colorStart[0].g = 0x0A; D_8015D8A0.colorStart[0].b = 0xC8; @@ -1275,11 +1275,12 @@ void func_8005DFAC(GlobalContext* globalCtx, Collider* collider, Vec3f* v) { D_8015D8A0.colorEnd[3].g = 0x00; D_8015D8A0.colorEnd[3].b = 0x40; D_8015D8A0.colorEnd[3].a = 0x00; - D_8015D8A0.age = 0; + D_8015D8A0.timer = 0; D_8015D8A0.duration = 16; - D_8015D8A0.velocity = 8.0f; + D_8015D8A0.speed = 8.0f; D_8015D8A0.gravity = -1.0f; - Effect_Add(globalCtx, &sp24, 0, 0, 1, &D_8015D8A0); + + Effect_Add(globalCtx, &sp24, EFFECT_SPARK, 0, 1, &D_8015D8A0); } #else void func_8005DFAC(GlobalContext* globalCtx, Collider* collider, Vec3f* v); @@ -1287,17 +1288,17 @@ void func_8005DFAC(GlobalContext* globalCtx, Collider* collider, Vec3f* v); #endif // NON_MATCHING #ifdef NON_MATCHING -// Green EffSpark -//.bss problems +// Green EffectSpark +// .bss problems void func_8005E10C(GlobalContext* globalCtx, Collider* collider, Vec3f* v) { + static EffectSparkInit D_8015DD68; s32 sp24; - static EffSparkParams D_8015DD68; - // D_8015DD68 + D_8015DD68.position.x = (s32)v->x; D_8015DD68.position.y = (s32)v->y; D_8015DD68.position.z = (s32)v->z; - D_8015DD68.particleFactor1 = 5; - D_8015DD68.particleFactor2 = 5; + D_8015DD68.uDiv = 5; + D_8015DD68.vDiv = 5; D_8015DD68.colorStart[0].r = 0x0A; D_8015DD68.colorStart[0].g = 0xC8; D_8015DD68.colorStart[0].b = 0x0A; @@ -1330,11 +1331,12 @@ void func_8005E10C(GlobalContext* globalCtx, Collider* collider, Vec3f* v) { D_8015DD68.colorEnd[3].g = 0x40; D_8015DD68.colorEnd[3].b = 0x00; D_8015DD68.colorEnd[3].a = 0x00; - D_8015DD68.age = 0; + D_8015DD68.timer = 0; D_8015DD68.duration = 16; - D_8015DD68.velocity = 8.0f; + D_8015DD68.speed = 8.0f; D_8015DD68.gravity = -1.0f; - Effect_Add(globalCtx, &sp24, 0, 0, 1, &D_8015DD68); + + Effect_Add(globalCtx, &sp24, EFFECT_SPARK, 0, 1, &D_8015DD68); } #else void func_8005E10C(GlobalContext* globalCtx, Collider* collider, Vec3f* v); @@ -2936,17 +2938,17 @@ void func_800628A4(s32 arg0, ColliderJntSph* collider) { #endif // NON_MATCHING #ifdef NON_MATCHING -// Purple EffSpark -//.bss section problems +// Purple EffectSpark +// .bss section problems void func_80062A28(GlobalContext* globalCtx, Vec3f* v) { + static EffectSparkInit D_8015CF10; s32 sp24; - static EffSparkParams D_8015CF10; D_8015CF10.position.x = (s32)v->x; D_8015CF10.position.y = (s32)v->y; D_8015CF10.position.z = (s32)v->z; - D_8015CF10.particleFactor1 = 5; - D_8015CF10.particleFactor2 = 5; + D_8015CF10.uDiv = 5; + D_8015CF10.vDiv = 5; D_8015CF10.colorStart[0].r = 0x80; D_8015CF10.colorStart[0].g = 0x00; D_8015CF10.colorStart[0].b = 0x40; @@ -2979,28 +2981,29 @@ void func_80062A28(GlobalContext* globalCtx, Vec3f* v) { D_8015CF10.colorEnd[3].g = 0x00; D_8015CF10.colorEnd[3].b = 0x40; D_8015CF10.colorEnd[3].a = 0x00; - D_8015CF10.age = 0; + D_8015CF10.timer = 0; D_8015CF10.duration = 16; - D_8015CF10.velocity = 8.0f; + D_8015CF10.speed = 8.0f; D_8015CF10.gravity = -1.0f; - Effect_Add(globalCtx, &sp24, 0, 0, 1, &D_8015CF10); + + Effect_Add(globalCtx, &sp24, EFFECT_SPARK, 0, 1, &D_8015CF10); } #else #pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_80062A28.s") #endif // NON_MATCHING #ifdef NON_MATCHING -// White EffSpark (Bubbles?) -//.bss section problems +// White EffectSpark (Bubbles?) +// .bss section problems void func_80062B80(GlobalContext* globalCtx, Vec3f* v) { + static EffectSparkInit D_8015D3D8; s32 sp24; - static EffSparkParams D_8015D3D8; D_8015D3D8.position.x = (s32)v->x; D_8015D3D8.position.y = (s32)v->y; D_8015D3D8.position.z = (s32)v->z; - D_8015D3D8.particleFactor1 = 5; - D_8015D3D8.particleFactor2 = 5; + D_8015D3D8.uDiv = 5; + D_8015D3D8.vDiv = 5; D_8015D3D8.colorStart[0].r = 0xFF; D_8015D3D8.colorStart[0].g = 0xFF; D_8015D3D8.colorStart[0].b = 0xFF; @@ -3033,27 +3036,27 @@ void func_80062B80(GlobalContext* globalCtx, Vec3f* v) { D_8015D3D8.colorEnd[3].g = 0x00; D_8015D3D8.colorEnd[3].b = 0x00; D_8015D3D8.colorEnd[3].a = 0x00; - D_8015D3D8.age = 0; + D_8015D3D8.timer = 0; D_8015D3D8.duration = 16; - D_8015D3D8.velocity = 8.0f; + D_8015D3D8.speed = 8.0f; D_8015D3D8.gravity = -1.0f; - Effect_Add(globalCtx, &sp24, 0, 0, 1, &D_8015D3D8); + + Effect_Add(globalCtx, &sp24, EFFECT_SPARK, 0, 1, &D_8015D3D8); } #else #pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_80062B80.s") #endif // NON_MATCHING void func_80062CD4(GlobalContext* globalCtx, Vec3f* v) { - s32 sp24; - static EffShieldParticleInit init = { + static EffectShieldParticleInit init = { 16, - { 0, 0, 0 }, - { { 0x00, 0xC8, 0xFF, 0xFF } }, - { { 0xFF, 0xFF, 0xFF, 0xFF } }, - { { 0xFF, 0xFF, 0x80, 0xFF } }, - { { 0xFF, 0xFF, 0x00, 0xFF } }, - { { 0xFF, 0x40, 0x00, 0xC8 } }, - { { 0xFF, 0x00, 0x00, 0xFF } }, + { 0.0f, 0.0f, 0.0f }, + { 0x00, 0xC8, 0xFF, 0xFF }, + { 0xFF, 0xFF, 0xFF, 0xFF }, + { 0xFF, 0xFF, 0x80, 0xFF }, + { 0xFF, 0xFF, 0x00, 0xFF }, + { 0xFF, 0x40, 0x00, 0xC8 }, + { 0xFF, 0x00, 0x00, 0xFF }, 2.1f, 35.0f, 30.0f, @@ -3061,6 +3064,7 @@ void func_80062CD4(GlobalContext* globalCtx, Vec3f* v) { { 0, 0, 0, 0x00, 0x80, 0xFF, 0x00, 300 }, 1, }; + s32 sp24; init.position.x = (s32)v->x; init.position.y = (s32)v->y; @@ -3068,7 +3072,8 @@ void func_80062CD4(GlobalContext* globalCtx, Vec3f* v) { init.lightParams.posX = init.position.x; init.lightParams.posY = init.position.y; init.lightParams.posZ = init.position.z; - Effect_Add(globalCtx, &sp24, 3, 0, 1, &init); + + Effect_Add(globalCtx, &sp24, EFFECT_SHIELD_PARTICLE, 0, 1, &init); } void func_80062D60(GlobalContext* globalCtx, Vec3f* v) { @@ -3086,16 +3091,15 @@ void func_80062DF4(GlobalContext* globalCtx, Vec3f* v) { } void func_80062E14(GlobalContext* globalCtx, Vec3f* v, Vec3f* arg2) { - s32 sp24; - static EffShieldParticleInit init = { + static EffectShieldParticleInit init = { 16, - { 0, 0, 0 }, - { { 0x00, 0xC8, 0xFF, 0xFF } }, - { { 0xFF, 0xFF, 0xFF, 0xFF } }, - { { 0xFF, 0xFF, 0x80, 0xFF } }, - { { 0xFF, 0xFF, 0x00, 0xFF } }, - { { 0xFF, 0x40, 0x00, 0xC8 } }, - { { 0xFF, 0x00, 0x00, 0xFF } }, + { 0.0f, 0.0f, 0.0f }, + { 0x00, 0xC8, 0xFF, 0xFF }, + { 0xFF, 0xFF, 0xFF, 0xFF }, + { 0xFF, 0xFF, 0x80, 0xFF }, + { 0xFF, 0xFF, 0x00, 0xFF }, + { 0xFF, 0x40, 0x00, 0xC8 }, + { 0xFF, 0x00, 0x00, 0xFF }, 2.1f, 35.0f, 30.0f, @@ -3103,6 +3107,7 @@ void func_80062E14(GlobalContext* globalCtx, Vec3f* v, Vec3f* arg2) { { 0, 0, 0, 0x00, 0x80, 0xFF, 0x00, 300 }, 0, }; + s32 sp24; init.position.x = (s32)v->x; init.position.y = (s32)v->y; @@ -3111,7 +3116,7 @@ void func_80062E14(GlobalContext* globalCtx, Vec3f* v, Vec3f* arg2) { init.lightParams.posY = init.position.y; init.lightParams.posZ = init.position.z; - Effect_Add(globalCtx, &sp24, 3, 0, 1, &init); + Effect_Add(globalCtx, &sp24, EFFECT_SHIELD_PARTICLE, 0, 1, &init); Audio_PlaySoundGeneral(NA_SE_IT_REFLECTION_WOOD, arg2, 4, &D_801333E0, &D_801333E0, &D_801333E8); } diff --git a/src/code/z_eff_blure.c b/src/code/z_eff_blure.c index 21f2bc75a2..8ec1d6da31 100644 --- a/src/code/z_eff_blure.c +++ b/src/code/z_eff_blure.c @@ -1,30 +1,1115 @@ #include #include -#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_blure/func_8001FDF0.s") +void EffectBlure_AddVertex(EffectBlure* this, Vec3f* p1, Vec3f* p2) { + EffectBlureElement* elem; + s32 numElements; + Vec3f sp16C; + Vec3f sp160; + Vec3f sp154; + f32 scale; + MtxF sp110; + MtxF spD0; + MtxF sp90; + MtxF sp50; + Vec3f sp44; + Vec3f sp38; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_blure/func_80020184.s") + if (this != NULL) { + numElements = this->numElements; + if (numElements >= 16) { + // Translates to: "Blure vertex addition processing: Table over %d" + osSyncPrintf("ブラ─頂点追加処理:テーブルオーバー %d\n", numElements); + return; + } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_blure/func_800208E0.s") + elem = &this->elements[numElements]; + elem->state = 1; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_blure/func_80020A50.s") + if (!(this->flags & 2)) { + elem->p1.x = p1->x; + elem->p1.y = p1->y; + elem->p1.z = p1->z; + elem->p2.x = p2->x; + elem->p2.y = p2->y; + elem->p2.z = p2->z; + } else { + sp16C.x = ((f32)(elem - 1)->p2.x + (f32)(elem - 1)->p1.x) * 0.5f; + sp16C.y = ((f32)(elem - 1)->p2.y + (f32)(elem - 1)->p1.y) * 0.5f; + sp16C.z = ((f32)(elem - 1)->p2.z + (f32)(elem - 1)->p1.z) * 0.5f; + sp160.x = (p1->x + p2->x) * 0.5f; + sp160.y = (p1->y + p2->y) * 0.5f; + sp160.z = (p1->z + p2->z) * 0.5f; -void func_80020F60(u32 unused, GraphicsContext* gfxCtx) { + Math_Vec3f_Diff(&sp160, &sp16C, &sp154); + scale = Math3D_Vec3fMagnitude(&sp154); + if (!(fabsf(scale) < 0.008f)) { + scale = 1.0f / scale; + Math_Vec3f_Scale(&sp154, scale); + + func_800A7A24(&sp110, sp160.x, sp160.y, sp160.z); + func_800A7EC0(&spD0, this->addAngle, sp154.x, sp154.y, sp154.z); + func_800A6FA0(&sp110, &spD0, &sp90); + func_800A7A24(&sp110, -sp160.x, -sp160.y, -sp160.z); + func_800A6FA0(&sp90, &sp110, &sp50); + func_800A6EF4(&sp50, p1, &sp38); + func_800A6EF4(&sp50, p2, &sp44); + + elem->p1.x = sp38.x; + elem->p1.y = sp38.y; + elem->p1.z = sp38.z; + elem->p2.x = sp44.x; + elem->p2.y = sp44.y; + elem->p2.z = sp44.z; + } + } + + elem->timer = 1; + this->numElements++; + } +} + +void EffectBlure_AddSpace(EffectBlure* this) { + EffectBlureElement* elem; + s32 numElements; + + if (this != NULL) { + numElements = this->numElements; + if (numElements >= 16) { + // Translates to: "Blure space addition processing: Table over %d" + osSyncPrintf("ブラ─空白追加処理:テーブルオーバー %d\n", numElements); + return; + } + + elem = &this->elements[numElements]; + elem->state = 0; + elem->timer = 1; + + this->numElements++; + } +} + +void EffectBlure_InitElements(EffectBlure* this) { + EffectBlureElement* elem; + s32 i; + + this->numElements = 0; + + for (i = 0; i < 16; i++) { + elem = &this->elements[i]; + + elem->state = 2; + elem->p1.x = 0; + elem->p1.y = 0; + elem->p1.z = 0; + elem->p2.x = 0; + elem->p2.y = 0; + elem->p2.z = 0; + elem->timer = 0; + elem->flags = 0; + } +} + +void EffectBlure_Init1(void* thisx, void* initParamsx) { + EffectBlure* this = (EffectBlure*)thisx; + EffectBlureInit1* initParams = (EffectBlureInit1*)initParamsx; + + if ((this != NULL) && (initParams != NULL)) { + EffectBlure_InitElements(this); + this->p1StartColor.r = initParams->p1StartColor.r; + this->p2StartColor.r = initParams->p2StartColor.r; + this->p1EndColor.r = initParams->p1EndColor.r; + this->p2EndColor.r = initParams->p2EndColor.r; + this->p1StartColor.g = initParams->p1StartColor.g; + this->p2StartColor.g = initParams->p2StartColor.g; + this->p1EndColor.g = initParams->p1EndColor.g; + this->p2EndColor.g = initParams->p2EndColor.g; + this->p1StartColor.b = initParams->p1StartColor.b; + this->p2StartColor.b = initParams->p2StartColor.b; + this->p1EndColor.b = initParams->p1EndColor.b; + this->p2EndColor.b = initParams->p2EndColor.b; + this->p1StartColor.a = initParams->p1StartColor.a; + this->p2StartColor.a = initParams->p2StartColor.a; + this->p1EndColor.a = initParams->p1EndColor.a; + this->p2EndColor.a = initParams->p2EndColor.a; + this->elemDuration = initParams->elemDuration; + this->unkFlag = initParams->unkFlag; + this->calcMode = initParams->calcMode; + this->flags = 0; + this->addAngleChange = 0; + this->addAngle = 0; + this->drawMode = 0; + this->altPrimColor.r = 0x00; + this->altPrimColor.g = 0x00; + this->altPrimColor.b = 0x00; + this->altPrimColor.a = 0x00; + this->altEnvColor.r = 0x00; + this->altEnvColor.g = 0x00; + this->altEnvColor.b = 0x00; + this->altEnvColor.a = 0x00; + this->mode4Param = 1.0f; + } +} + +void EffectBlure_Init2(void* thisx, void* initParamsx) { + EffectBlure* this = (EffectBlure*)thisx; + EffectBlureInit2* initParams = (EffectBlureInit2*)initParamsx; + + if ((this != NULL) && (initParams != NULL)) { + EffectBlure_InitElements(this); + this->p1StartColor.r = initParams->p1StartColor.r; + this->p2StartColor.r = initParams->p2StartColor.r; + this->p1EndColor.r = initParams->p1EndColor.r; + this->p2EndColor.r = initParams->p2EndColor.r; + this->p1StartColor.g = initParams->p1StartColor.g; + this->p2StartColor.g = initParams->p2StartColor.g; + this->p1EndColor.g = initParams->p1EndColor.g; + this->p2EndColor.g = initParams->p2EndColor.g; + this->p1StartColor.b = initParams->p1StartColor.b; + this->p2StartColor.b = initParams->p2StartColor.b; + this->p1EndColor.b = initParams->p1EndColor.b; + this->p2EndColor.b = initParams->p2EndColor.b; + this->p1StartColor.a = initParams->p1StartColor.a; + this->p2StartColor.a = initParams->p2StartColor.a; + this->p1EndColor.a = initParams->p1EndColor.a; + this->p2EndColor.a = initParams->p2EndColor.a; + this->elemDuration = initParams->elemDuration; + this->unkFlag = initParams->unkFlag; + this->calcMode = initParams->calcMode; + this->flags = initParams->flags; + this->drawMode = initParams->drawMode; + this->addAngleChange = initParams->addAngleChange; + this->addAngle = 0; + this->mode4Param = initParams->mode4Param; + this->altPrimColor = initParams->altPrimColor; + this->altEnvColor = initParams->altEnvColor; + } +} + +void EffectBlure_Destroy(void* thisx) { +} + +#ifdef NON_MATCHING +// single register swap (saved vs temp register) +s32 EffectBlure_Update(void* thisx) { + EffectBlure* this = (EffectBlure*)thisx; + s32 i; + + if (this == NULL) { + return 0; + } + + if (this->numElements == 0) { + return 0; + } + + while (true) { + if (this->elements[0].state != 0) { + break; + } + + for (i = 0; i < 15; i++) { + this->elements[i] = this->elements[i + 1]; + } + + this->elements[i].state = 2; + this->elements[i].p1.x = 0; + this->elements[i].p1.y = 0; + this->elements[i].p1.z = 0; + this->elements[i].p2.x = 0; + this->elements[i].p2.y = 0; + this->elements[i].p2.z = 0; + this->elements[i].flags = 0; + this->elements[i].timer = 0; + + this->numElements--; + if (this->numElements <= 0) { + this->numElements = 0; + return 0; + } + } + + if (this->elements[0].state == 2) { + return 0; + } + + for (i = 0; i < this->numElements; i++) { + this->elements[i].timer++; + } + + if (this->elemDuration < this->elements[0].timer) { + for (i = 0; i < 15; i++) { + this->elements[i] = this->elements[i + 1]; + } + + this->elements[i].state = 2; + this->elements[i].p1.x = 0; + this->elements[i].p1.y = 0; + this->elements[i].p1.z = 0; + this->elements[i].p2.x = 0; + this->elements[i].p2.y = 0; + this->elements[i].p2.z = 0; + this->elements[i].flags = 0; + this->elements[i].timer = 0; + + this->numElements--; + if (this->numElements <= 0) { + this->numElements = 0; + return 0; + } + return 0; + } + + this->addAngle += this->addAngleChange; + return 0; +} +#else +#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_blure/EffectBlure_Update.s") +#endif + +void EffectBlure_UpdateFlags(EffectBlureElement* elem) { + Vec3f sp64; + Vec3f sp58; + Vec3f sp4C; + Vec3f sp40; + + if (((elem - 1)->state == 0) || ((elem + 1)->state == 0)) { + elem->flags &= ~3; + elem->flags |= 2; + } else { + EffectBlureElement* prev = elem - 1; + EffectBlureElement* next = elem + 1; + f32 sp34; + f32 sp30; + f32 sp2C; + + if (1) {} // Necessary to match + + Math_Vec3s_DiffToVec3f(&sp64, &elem->p1, &prev->p1); + Math_Vec3s_DiffToVec3f(&sp58, &elem->p2, &prev->p2); + Math_Vec3s_DiffToVec3f(&sp4C, &next->p1, &elem->p1); + Math_Vec3s_DiffToVec3f(&sp40, &next->p2, &elem->p2); + + if (func_800CB010(&sp64, &sp4C, &sp34) || func_800CB010(&sp58, &sp40, &sp30) || + func_800CB010(&sp4C, &sp40, &sp2C)) { + elem->flags &= ~3; + elem->flags |= 0; + } else if ((sp34 <= -0.5f) || (sp30 <= -0.5f) || (sp2C <= 0.7071f)) { + elem->flags &= ~3; + elem->flags |= 0; + } else { + elem->flags &= ~3; + elem->flags |= 1; + } + } +} + +#ifdef NON_MATCHING +// regalloc and saved register usage differences +void EffectBlure_GetComputedValues(EffectBlure* this, s32 index, f32 ratio, Vec3s* vec1, Vec3s* vec2, + Color_RGBA8* color1, Color_RGBA8* color2) { + Vec3s sp30; + EffectBlureElement* elem; + f32 mode4Param; + + elem = &this->elements[index]; + + switch (this->calcMode) { + case 1: + vec1->x = func_80027E34(elem->p1.x, elem->p2.x, ratio); + vec1->y = func_80027E34(elem->p1.y, elem->p2.y, ratio); + vec1->z = func_80027E34(elem->p1.z, elem->p2.z, ratio); + vec2->x = elem->p2.x; + vec2->y = elem->p2.y; + vec2->z = elem->p2.z; + break; + + case 2: + vec1->x = elem->p1.x; + vec1->y = elem->p1.y; + vec1->z = elem->p1.z; + vec2->x = func_80027E34(elem->p2.x, elem->p1.x, ratio); + vec2->y = func_80027E34(elem->p2.y, elem->p1.y, ratio); + vec2->z = func_80027E34(elem->p2.z, elem->p1.z, ratio); + break; + + case 3: + ratio = ratio * 0.5f; + vec1->x = func_80027E34(elem->p1.x, elem->p2.x, ratio); + vec1->y = func_80027E34(elem->p1.y, elem->p2.y, ratio); + vec1->z = func_80027E34(elem->p1.z, elem->p2.z, ratio); + vec2->x = func_80027E34(elem->p2.x, elem->p1.x, ratio); + vec2->y = func_80027E34(elem->p2.y, elem->p1.y, ratio); + vec2->z = func_80027E34(elem->p2.z, elem->p1.z, ratio); + ratio = ratio + ratio; + break; + + case 4: + sp30.x = elem->p1.x - elem->p2.x; + sp30.y = elem->p1.y - elem->p2.y; + sp30.z = elem->p1.z - elem->p2.z; + mode4Param = this->mode4Param; + + vec1->x = (sp30.x * 0.5f * (mode4Param - 1.0f) * ratio) + elem->p1.x; + vec1->y = (sp30.y * 0.5f * (mode4Param - 1.0f) * ratio) + elem->p1.y; + vec1->z = (sp30.z * 0.5f * (mode4Param - 1.0f) * ratio) + elem->p1.z; + vec2->x = -(sp30.x * 0.5f * (mode4Param - 1.0f) * ratio) + elem->p2.x; + vec2->y = -(sp30.y * 0.5f * (mode4Param - 1.0f) * ratio) + elem->p2.y; + vec2->z = -(sp30.z * 0.5f * (mode4Param - 1.0f) * ratio) + elem->p2.z; + break; + + case 0: + default: + vec1->x = elem->p1.x; + vec1->y = elem->p1.y; + vec1->z = elem->p1.z; + vec2->x = elem->p2.x; + vec2->y = elem->p2.y; + vec2->z = elem->p2.z; + break; + } + + sp30 = sp30; // Optimized out but seems necessary to match stack usage + + if (this->flags & 0x10) { + color1->a = 0xFF; + color1->b = 0xFF; + color1->g = 0xFF; + color1->r = 0xFF; + color2->r = 0xFF; + color2->g = 0xFF; + color2->b = 0xFF; + color2->a = 0xFF; + } else { + color1->r = func_80027E84(this->p1StartColor.r, this->p1EndColor.r, ratio); + color1->g = func_80027E84(this->p1StartColor.g, this->p1EndColor.g, ratio); + color1->b = func_80027E84(this->p1StartColor.b, this->p1EndColor.b, ratio); + color1->a = func_80027E84(this->p1StartColor.a, this->p1EndColor.a, ratio); + color2->r = func_80027E84(this->p2StartColor.r, this->p2EndColor.r, ratio); + color2->g = func_80027E84(this->p2StartColor.g, this->p2EndColor.g, ratio); + color2->b = func_80027E84(this->p2StartColor.b, this->p2EndColor.b, ratio); + color2->a = func_80027E84(this->p2StartColor.a, this->p2EndColor.a, ratio); + } +} +#else +void EffectBlure_GetComputedValues(EffectBlure* this, s32 index, f32 ratio, Vec3s* vec1, Vec3s* vec2, + Color_RGBA8* color1, Color_RGBA8* color2); +#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_blure/EffectBlure_GetComputedValues.s") +#endif + +void EffectBlure_SetupSmooth(EffectBlure* this, GraphicsContext* gfxCtx) { Gfx* dispRefs[5]; - Graph_OpenDisps(dispRefs, gfxCtx, D_80135180, 809); + Graph_OpenDisps(dispRefs, gfxCtx, "../z_eff_blure.c", 809); gfxCtx->polyXlu.p = Gfx_CallSetupDL(gfxCtx->polyXlu.p, 0x26); - Graph_CloseDisps(dispRefs, gfxCtx, D_80135194, 813); + Graph_CloseDisps(dispRefs, gfxCtx, "../z_eff_blure.c", 813); } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_blure/func_80020FC0.s") +// original name: "SQ_NoInterpolate_disp" +void EffectBlure_DrawElemNoInterpolation(EffectBlure* this, EffectBlureElement* elem, s32 index, + GraphicsContext* gfxCtx) { + static Vtx_t baseVtx = VTX_T(0, 0, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF); + Vtx_t* vtx; + Vec3s sp8C; + Vec3s sp84; + f32 ratio; + Color_RGBA8 sp7C; + Color_RGBA8 sp78; + Vec3f sp6C; + Vec3f sp60; + Vec3f sp54; + Gfx* dispRefs[5]; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_blure/func_800214D0.s") + Graph_OpenDisps(dispRefs, gfxCtx, "../z_eff_blure.c", 838); -#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_blure/func_80021F00.s") + Math_Vec3s_ToVec3f(&sp6C, &this->elements[0].p2); -#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_blure/func_800224F4.s") + vtx = Graph_Alloc(gfxCtx, sizeof(Vtx_t[4])); + if (vtx == NULL) { + // Translates to: "Vertices cannot be secured." + osSyncPrintf("z_eff_blure.c::SQ_NoInterpolate_disp() 頂点確保できず。\n"); + } else { + vtx[0] = baseVtx; + vtx[1] = baseVtx; + vtx[2] = baseVtx; + vtx[3] = baseVtx; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_blure/func_80022A10.s") + ratio = (f32)elem->timer / (f32)this->elemDuration; + EffectBlure_GetComputedValues(this, index, ratio, &sp8C, &sp84, &sp7C, &sp78); + + sp60.x = sp84.x; + sp60.y = sp84.y; + sp60.z = sp84.z; + Math_Vec3f_Diff(&sp60, &sp6C, &sp54); + Math_Vec3f_Scale(&sp54, 10.0f); + vtx[0].ob[0] = sp54.x; + vtx[0].ob[1] = sp54.y; + vtx[0].ob[2] = sp54.z; + vtx[0].cn[0] = sp78.r; + vtx[0].cn[1] = sp78.g; + vtx[0].cn[2] = sp78.b; + vtx[0].cn[3] = sp78.a; + + if (1) {} // Necessary to match + + sp60.x = sp8C.x; + sp60.y = sp8C.y; + sp60.z = sp8C.z; + Math_Vec3f_Diff(&sp60, &sp6C, &sp54); + Math_Vec3f_Scale(&sp54, 10.0f); + vtx[1].ob[0] = sp54.x; + vtx[1].ob[1] = sp54.y; + vtx[1].ob[2] = sp54.z; + vtx[1].cn[0] = sp7C.r; + vtx[1].cn[1] = sp7C.g; + vtx[1].cn[2] = sp7C.b; + vtx[1].cn[3] = sp7C.a; + + ratio = (f32)(elem + 1)->timer / (f32)this->elemDuration; + EffectBlure_GetComputedValues(this, index + 1, ratio, &sp8C, &sp84, &sp7C, &sp78); + + sp60.x = sp8C.x; + sp60.y = sp8C.y; + sp60.z = sp8C.z; + Math_Vec3f_Diff(&sp60, &sp6C, &sp54); + Math_Vec3f_Scale(&sp54, 10.0f); + vtx[2].ob[0] = sp54.x; + vtx[2].ob[1] = sp54.y; + vtx[2].ob[2] = sp54.z; + vtx[2].cn[0] = sp7C.r; + vtx[2].cn[1] = sp7C.g; + vtx[2].cn[2] = sp7C.b; + vtx[2].cn[3] = sp7C.a; + + if (1) {} // Necessary to match + + sp60.x = sp84.x; + sp60.y = sp84.y; + sp60.z = sp84.z; + Math_Vec3f_Diff(&sp60, &sp6C, &sp54); + Math_Vec3f_Scale(&sp54, 10.0f); + vtx[3].ob[0] = sp54.x; + vtx[3].ob[1] = sp54.y; + vtx[3].ob[2] = sp54.z; + vtx[3].cn[0] = sp78.r; + vtx[3].cn[1] = sp78.g; + vtx[3].cn[2] = sp78.b; + vtx[3].cn[3] = sp78.a; + + gSPVertex(gfxCtx->polyXlu.p++, vtx, 4, 0); + gSP2Triangles(gfxCtx->polyXlu.p++, 0, 1, 2, 0, 0, 2, 3, 0); + } + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_eff_blure.c", 932); +} + +// original name: "SQ_HermiteInterpolate_disp" +#ifdef NON_MATCHING +void EffectBlure_DrawElemHermiteInterpolation(EffectBlure* this, EffectBlureElement* elem, s32 index, + GraphicsContext* gfxCtx) { + static Vtx_t baseVtx = VTX_T(0, 0, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF); + Vtx_t* vtx; + Vec3s sp1EC; + Vec3s sp1E4; + f32 ratio; + Color_RGBA8 sp1DC; + Color_RGBA8 sp1D8; + Vec3f sp1CC; + Vec3f sp1C0; + Vec3f sp1B4; + Vec3f sp1A8; + Color_RGBA8 sp1A4; + Color_RGBA8 sp1A0; + Color_RGBA8 sp19C; + Color_RGBA8 sp198; + Vec3f sp18C; + Vec3f sp180; + Vec3f sp174; + Vec3f sp168; + Vec3f sp158; + Vec3f sp14C; + Color_RGBA8 sp148; + Color_RGBA8 sp144; + Vec3f sp138; + Gfx* dispRefs[5]; + Vec3f sp118; + Vec3f sp10C; + Vec3f sp100; + Vec3f spF4; + s32 j1; + s32 j2; + Vec3f spE0; + s32 i; + + Graph_OpenDisps(dispRefs, gfxCtx, "../z_eff_blure.c", 971); + + Math_Vec3s_ToVec3f(&sp138, &this->elements[0].p2); + + ratio = (f32)elem->timer / (f32)this->elemDuration; + EffectBlure_GetComputedValues(this, index, ratio, &sp1EC, &sp1E4, &sp1A4, &sp1A0); + Math_Vec3s_ToVec3f(&sp1CC, &sp1EC); + Math_Vec3s_ToVec3f(&sp1C0, &sp1E4); + + ratio = (f32)(elem + 1)->timer / (f32)this->elemDuration; + EffectBlure_GetComputedValues(this, index + 1, ratio, &sp1EC, &sp1E4, &sp19C, &sp198); + Math_Vec3s_ToVec3f(&sp18C, &sp1EC); + Math_Vec3s_ToVec3f(&sp180, &sp1E4); + + if ((elem->flags & 3) == 2) { + Math_Vec3f_Diff(&sp18C, &sp1CC, &sp1B4); + Math_Vec3f_Diff(&sp180, &sp1C0, &sp1A8); + } else { + if (index - 1 < 0) { + __assert("index - 1 >= 0", "../z_eff_blure.c", 1005); + } + + ratio = (f32)(elem - 1)->timer / (f32)this->elemDuration; + EffectBlure_GetComputedValues(this, index - 1, ratio, &sp1EC, &sp1E4, &sp1DC, &sp1D8); + Math_Vec3s_ToVec3f(&sp118, &sp1EC); + Math_Vec3s_ToVec3f(&sp10C, &sp1E4); + Math_Vec3f_Diff(&sp18C, &sp118, &sp1B4); + Math_Vec3f_Diff(&sp180, &sp10C, &sp1A8); + } + + Math_Vec3f_Scale(&sp1B4, 0.5f); + Math_Vec3f_Scale(&sp1A8, 0.5f); + + if (((elem + 1)->flags & 3) == 2) { + Math_Vec3f_Diff(&sp18C, &sp1CC, &sp174); + Math_Vec3f_Diff(&sp180, &sp1C0, &sp168); + } else { + if (index + 2 >= this->numElements) { + __assert("index + 2 < this2->now_edge_num", "../z_eff_blure.c", 1032); + } + + ratio = (f32)(elem + 2)->timer / (f32)this->elemDuration; + EffectBlure_GetComputedValues(this, index + 2, ratio, &sp1EC, &sp1E4, &sp1DC, &sp1D8); + Math_Vec3s_ToVec3f(&sp100, &sp1EC); + Math_Vec3s_ToVec3f(&spF4, &sp1E4); + Math_Vec3f_Diff(&sp100, &sp1CC, &sp174); + Math_Vec3f_Diff(&spF4, &sp1C0, &sp168); + } + + Math_Vec3f_Scale(&sp174, 0.5f); + Math_Vec3f_Scale(&sp168, 0.5f); + + vtx = Graph_Alloc(gfxCtx, sizeof(Vtx_t[16])); + if (vtx == NULL) { + // Translates to: "Vertices cannot be secured." + osSyncPrintf("z_eff_blure.c::SQ_HermiteInterpolate_disp() 頂点確保できず。\n"); + } else { + Math_Vec3f_Diff(&sp1CC, &sp138, &sp158); + Math_Vec3f_Scale(&sp158, 10.0f); + Math_Vec3f_Diff(&sp1C0, &sp138, &sp14C); + Math_Vec3f_Scale(&sp14C, 10.0f); + + Color_RGBA8_Copy(&sp148, &sp1A4); + Color_RGBA8_Copy(&sp144, &sp1A0); + + vtx[0] = baseVtx; + vtx[1] = baseVtx; + + vtx[0].ob[0] = Math_nearbyintf(sp158.x); + vtx[0].ob[1] = Math_nearbyintf(sp158.y); + vtx[0].ob[2] = Math_nearbyintf(sp158.z); + vtx[0].cn[0] = sp148.r; + vtx[0].cn[1] = sp148.g; + vtx[0].cn[2] = sp148.b; + vtx[0].cn[3] = sp148.a; + vtx[1].ob[0] = Math_nearbyintf(sp14C.x); + vtx[1].ob[1] = Math_nearbyintf(sp14C.y); + vtx[1].ob[2] = Math_nearbyintf(sp14C.z); + vtx[1].cn[0] = sp144.r; + vtx[1].cn[1] = sp144.g; + vtx[1].cn[2] = sp144.b; + vtx[1].cn[3] = sp144.a; + + for (i = 1, j1 = 2, j2 = 3; i < 8; i++, j1 += 2, j2 += 2) { + f32 temp_f28 = i / 7.0f; // t + f32 temp_f0 = temp_f28 * temp_f28; // t^2 + f32 temp_f2 = temp_f0 * temp_f28; // t^3 + f32 temp_f14 = temp_f0 * 3.0f; // 3t^2 + f32 temp_f12 = temp_f2 + temp_f2; // 2t^3 + f32 temp_f26 = temp_f14 - temp_f12; // 3t^2 - 2t^3 + f32 temp_f24 = temp_f12 - temp_f14 + 1.0f; // 2t^3 - 3t^2 + 1 + f32 temp_f22 = temp_f2 - (temp_f0 + temp_f0) + temp_f28; // t^3 - 2t^2 + t + f32 temp_f20 = temp_f2 - temp_f0; // t^3 - t^2 + + // p = (2t^3 - 3t^2 + 1)p0 + (3t^2 - 2t^3)p1 + (t^3 - 2t^2 + t)m0 + (t^3 - t^2)m1 + spE0.x = (temp_f24 * sp1CC.x) + (temp_f26 * sp18C.x) + (temp_f22 * sp1B4.x) + (temp_f20 * sp174.x); + spE0.y = (temp_f24 * sp1CC.y) + (temp_f26 * sp18C.y) + (temp_f22 * sp1B4.y) + (temp_f20 * sp174.y); + spE0.z = (temp_f24 * sp1CC.z) + (temp_f26 * sp18C.z) + (temp_f22 * sp1B4.z) + (temp_f20 * sp174.z); + Math_Vec3f_Diff(&spE0, &sp138, &sp158); + Math_Vec3f_Scale(&sp158, 10.0f); + + spE0.x = (temp_f24 * sp1C0.x) + (temp_f26 * sp180.x) + (temp_f22 * sp1A8.x) + (temp_f20 * sp168.x); + spE0.y = (temp_f24 * sp1C0.y) + (temp_f26 * sp180.y) + (temp_f22 * sp1A8.y) + (temp_f20 * sp168.y); + spE0.z = (temp_f24 * sp1C0.z) + (temp_f26 * sp180.z) + (temp_f22 * sp1A8.z) + (temp_f20 * sp168.z); + Math_Vec3f_Diff(&spE0, &sp138, &sp14C); + Math_Vec3f_Scale(&sp14C, 10.0f); + + vtx[j1] = baseVtx; + vtx[j2] = baseVtx; + + vtx[j1].ob[0] = Math_nearbyintf(sp158.x); + vtx[j1].ob[1] = Math_nearbyintf(sp158.y); + vtx[j1].ob[2] = Math_nearbyintf(sp158.z); + vtx[j1].cn[0] = func_80027E84(sp1A4.r, sp19C.r, temp_f28); + vtx[j1].cn[1] = func_80027E84(sp1A4.g, sp19C.g, temp_f28); + vtx[j1].cn[2] = func_80027E84(sp1A4.b, sp19C.b, temp_f28); + vtx[j1].cn[3] = func_80027E84(sp1A4.a, sp19C.a, temp_f28); + + vtx[j2].ob[0] = Math_nearbyintf(sp14C.x); + vtx[j2].ob[1] = Math_nearbyintf(sp14C.y); + vtx[j2].ob[2] = Math_nearbyintf(sp14C.z); + vtx[j2].cn[0] = func_80027E84(sp1A0.r, sp198.r, temp_f28); + vtx[j2].cn[1] = func_80027E84(sp1A0.g, sp198.g, temp_f28); + vtx[j2].cn[2] = func_80027E84(sp1A0.b, sp198.b, temp_f28); + vtx[j2].cn[3] = func_80027E84(sp1A0.a, sp198.a, temp_f28); + } + + gSPVertex(gfxCtx->polyXlu.p++, vtx, 16, 0); + gSP2Triangles(gfxCtx->polyXlu.p++, 0, 1, 3, 0, 0, 3, 2, 0); + gSP2Triangles(gfxCtx->polyXlu.p++, 2, 3, 5, 0, 2, 5, 4, 0); + gSP2Triangles(gfxCtx->polyXlu.p++, 4, 5, 7, 0, 4, 7, 6, 0); + gSP2Triangles(gfxCtx->polyXlu.p++, 6, 7, 9, 0, 6, 9, 8, 0); + gSP2Triangles(gfxCtx->polyXlu.p++, 8, 9, 11, 0, 8, 11, 10, 0); + gSP2Triangles(gfxCtx->polyXlu.p++, 10, 11, 13, 0, 10, 13, 12, 0); + gSP2Triangles(gfxCtx->polyXlu.p++, 12, 13, 15, 0, 12, 15, 14, 0); + } + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_eff_blure.c", 1184); +} +#else +Vtx D_80115770 = VTX(0, 0, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF); +#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_blure/EffectBlure_DrawElemHermiteInterpolation.s") +#endif + +#ifdef NON_MATCHING +// missing extra load instructions and saved register/stack usage differences +void EffectBlure_DrawSmooth(EffectBlure* this, GraphicsContext* gfxCtx) { + EffectBlureElement* elem; + s32 i; + MtxF spDC; + MtxF sp9C; + MtxF sp5C; + Mtx* mtx; + Gfx* dispRefs[5]; + + Graph_OpenDisps(dispRefs, gfxCtx, "../z_eff_blure.c", 1201); + + if (this->numElements < 2) { + return; + } + + this->elements[0].flags &= ~3; + this->elements[0].flags |= 2; + + for (elem = &this->elements[1]; elem < &this->elements[this->numElements - 1]; elem++) { + EffectBlure_UpdateFlags(elem); + } + + this->elements[this->numElements - 1].flags &= ~3; + this->elements[this->numElements - 1].flags |= 2; + + EffectBlure_SetupSmooth(this, gfxCtx); + func_800A7A24(&spDC, this->elements[0].p2.x, this->elements[0].p2.y, this->elements[0].p2.z); + func_800A76A4(&sp9C, 0.1f, 0.1f, 0.1f); + func_800A6FA0(&spDC, &sp9C, &sp5C); + + mtx = func_800A7E70(gfxCtx, &sp5C); + if (mtx == NULL) { + return; + } + + gSPMatrix(gfxCtx->polyXlu.p++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + + for (i = 0, elem = &this->elements[0]; elem < &this->elements[this->numElements - 1]; elem++, i++) { + if ((elem->state == 0) || ((elem + 1)->state == 0)) { + continue; + } + + if ((((elem->flags & 3) == 0) && (((elem + 1)->flags & 3) == 0)) || + (((elem->flags & 3) == 2) && (((elem + 1)->flags & 3) == 0)) || + (((elem->flags & 3) == 0) && (((elem + 1)->flags & 3) == 2)) || + (((elem->flags & 3) == 2) && (((elem + 1)->flags & 3) == 2))) { + EffectBlure_DrawElemNoInterpolation(this, elem, i, gfxCtx); + } else { + EffectBlure_DrawElemHermiteInterpolation(this, elem, i, gfxCtx); + } + } + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_eff_blure.c", 1263); +} +#else +#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_blure/EffectBlure_DrawSmooth.s") +#endif + +// EffectBlure_SetupSimple +void EffectBlure_SetupSimple(GraphicsContext* gfxCtx, EffectBlure* this, Vtx_t* vtx) { + Gfx* dispRefs[5]; + + Graph_OpenDisps(dispRefs, gfxCtx, "../z_eff_blure.c", 1280); + + gfxCtx->polyXlu.p = Gfx_CallSetupDL(gfxCtx->polyXlu.p, 0x26); + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_eff_blure.c", 1285); +} + +void EffectBlure_SetupSimpleAlt(GraphicsContext* gfxCtx, EffectBlure* this, Vtx_t* vtx) { + Gfx* dispRefs[5]; + + Graph_OpenDisps(dispRefs, gfxCtx, "../z_eff_blure.c", 1294); + + gDPPipeSync(gfxCtx->polyXlu.p++); + gfxCtx->polyXlu.p = Gfx_CallSetupDL(gfxCtx->polyXlu.p, 0x26); + + gDPSetCycleType(gfxCtx->polyXlu.p++, G_CYC_2CYCLE); + gDPSetTextureLUT(gfxCtx->polyXlu.p++, G_TT_NONE); + gSPTexture(gfxCtx->polyXlu.p++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON); + + gDPLoadTextureBlock(gfxCtx->polyXlu.p++, D_04006020, G_IM_FMT_I, G_IM_SIZ_8b, 64, 32, 0, G_TX_NOMIRROR | G_TX_CLAMP, + G_TX_NOMIRROR | G_TX_WRAP, 6, 5, G_TX_NOLOD, G_TX_NOLOD); + + gDPSetCombineLERP(gfxCtx->polyXlu.p++, TEXEL0, PRIMITIVE, PRIM_LOD_FRAC, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE, + ENVIRONMENT, COMBINED, ENVIRONMENT, 0, 0, 0, COMBINED); + gDPSetRenderMode(gfxCtx->polyXlu.p++, G_RM_PASS, G_RM_ZB_CLD_SURF2); + gSPClearGeometryMode(gfxCtx->polyXlu.p++, G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR); + gSPSetGeometryMode(gfxCtx->polyXlu.p++, G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH); + gDPPipeSync(gfxCtx->polyXlu.p++); + + gDPSetEnvColor(gfxCtx->polyXlu.p++, this->altEnvColor.r, this->altEnvColor.g, this->altEnvColor.b, + this->altEnvColor.a); + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_eff_blure.c", 1329); +} + +void (*sSetupHandlers[])(GraphicsContext* gfxCtx, EffectBlure* this, Vtx_t* vtx) = { + EffectBlure_SetupSimple, + EffectBlure_SetupSimpleAlt, +}; + +s32 D_80115788 = 0; // unused + +// original name: "EffectBlureInfo2_disp_makeDisplayList" +void EffectBlure_DrawSimpleVertices(GraphicsContext* gfxCtx, EffectBlure* this, Vtx_t* vtx) { + f32 alphaRatio; + Gfx* dispRefs[5]; + f32 scale; + Vec3f sp1B0; + Vec3f sp1A4; + Vec3f sp198; + Mtx* mtx; + MtxF sp154; + MtxF sp114; + MtxF spD4; + MtxF sp94; + s32 i; + s32 j; + + Graph_OpenDisps(dispRefs, gfxCtx, "../z_eff_blure.c", 1356); + + sSetupHandlers[this->drawMode](gfxCtx, this, vtx); + gDPPipeSync(gfxCtx->polyXlu.p++); + + j = 0; + + for (i = 0; i < this->numElements - 1; i++) { + if (this->drawMode == 1) { + alphaRatio = (f32)this->elements[i].timer / (f32)this->elemDuration; + gDPSetPrimColor(gfxCtx->polyXlu.p++, 0x00, 0x80, this->altPrimColor.r, this->altPrimColor.g, + this->altPrimColor.b, this->altPrimColor.a * (1.0f - alphaRatio)); + gDPPipeSync(gfxCtx->polyXlu.p++); + } + + if (1) {} // Necessary to match + + gSPVertex(gfxCtx->polyXlu.p++, &vtx[j], 4, 0); + gSP2Triangles(gfxCtx->polyXlu.p++, 0, 1, 3, 0, 0, 3, 2, 0); + + if (this->flags & 4) { + sp1B0.x = ((f32)vtx[4 * i + 0].ob[0] + (f32)vtx[4 * i + 1].ob[0]) * 0.5f; + sp1B0.y = ((f32)vtx[4 * i + 0].ob[1] + (f32)vtx[4 * i + 1].ob[1]) * 0.5f; + sp1B0.z = ((f32)vtx[4 * i + 0].ob[2] + (f32)vtx[4 * i + 1].ob[2]) * 0.5f; + sp1A4.x = ((f32)vtx[4 * i + 2].ob[0] + (f32)vtx[4 * i + 3].ob[0]) * 0.5f; + sp1A4.y = ((f32)vtx[4 * i + 2].ob[1] + (f32)vtx[4 * i + 3].ob[1]) * 0.5f; + sp1A4.z = ((f32)vtx[4 * i + 2].ob[2] + (f32)vtx[4 * i + 3].ob[2]) * 0.5f; + + Math_Vec3f_Diff(&sp1A4, &sp1B0, &sp198); + scale = sqrtf(SQ(sp198.x) + SQ(sp198.y) + SQ(sp198.z)); + + if (fabsf(scale) > 0.0005f) { + scale = 1.0f / scale; + Math_Vec3f_Scale(&sp198, scale); + + func_800A7A24(&sp154, sp1B0.x, sp1B0.y, sp1B0.z); + func_800A7EC0(&sp114, 0x3FFF, sp198.x, sp198.y, sp198.z); + func_800A6FA0(&sp154, &sp114, &spD4); + func_800A7A24(&sp154, -sp1B0.x, -sp1B0.y, -sp1B0.z); + func_800A6FA0(&spD4, &sp154, &sp94); + + mtx = func_800A7E70(gfxCtx, &sp94); + if (mtx == NULL) { + // Translates to: "Forced termination because a matrix cannot be taken" + osSyncPrintf("EffectBlureInfo2_disp_makeDisplayList()マトリックス取れないので,強制終了\n"); + break; + } + + gSPMatrix(gfxCtx->polyXlu.p++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPVertex(gfxCtx->polyXlu.p++, &vtx[j], 4, 0); + gSP2Triangles(gfxCtx->polyXlu.p++, 0, 1, 3, 0, 0, 3, 2, 0); + gSPMatrix(gfxCtx->polyXlu.p++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + } + } + + j += 4; + } + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_eff_blure.c", 1452); +} + +Vtx_t D_8011578C[] = { + VTX_T(0, 0, 0, 0, 1024, 0xFF, 0xFF, 0xFF, 0xFF), + VTX_T(0, 0, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF), + VTX_T(0, 0, 0, 2048, 1024, 0xFF, 0xFF, 0xFF, 0xFF), + VTX_T(0, 0, 0, 2048, 0, 0xFF, 0xFF, 0xFF, 0xFF), +}; + +Vtx_t D_801157CC[] = { + VTX_T(0, 0, 0, 2048, 1024, 0xFF, 0xFF, 0xFF, 0xFF), + VTX_T(0, 0, 0, 2048, 0, 0xFF, 0xFF, 0xFF, 0xFF), + VTX_T(0, 0, 0, 2048, 1024, 0xFF, 0xFF, 0xFF, 0xFF), + VTX_T(0, 0, 0, 2048, 0, 0xFF, 0xFF, 0xFF, 0xFF), +}; + +#ifdef NON_MATCHING +void EffectBlure_DrawSimple(EffectBlure* this, GraphicsContext* gfxCtx) { + Vtx_t* vtx; + Vtx_t* vtxIter; + EffectBlureElement* elem; + s32 vtxCount; + s32 i; + s32 j1; + s32 j2; + s32 j3; + Vec3s sp74; + Vec3s sp6C; + f32 ratio; + Color_RGBA8 sp64; + Color_RGBA8 sp60; + + vtxCount = this->numElements * 4; + + if (this->numElements >= 2) { + vtx = Graph_Alloc(gfxCtx, vtxCount * sizeof(Vtx_t)); + if (vtx == NULL) { + // Translates to: "Vertices cannot be secured. Forced termination" + osSyncPrintf("ブラ─表示:頂点確保できず。強制終了\n"); + return; + } + + vtxIter = vtx; + vtxIter[0] = D_8011578C[0]; + vtxIter[1] = D_8011578C[1]; + vtxIter[2] = D_8011578C[2]; + vtxIter[3] = D_8011578C[3]; + vtxIter = vtx + 4; + + if (this->numElements >= 2) { + for (elem = &this->elements[1]; elem < &this->elements[this->numElements - 2]; elem++) { + vtxIter[0] = D_801157CC[0]; + vtxIter[1] = D_801157CC[1]; + vtxIter[2] = D_801157CC[2]; + vtxIter[3] = D_801157CC[3]; + vtxIter += 4; + } + } + + j1 = -2; + j2 = -1; + for (i = 0; i < this->numElements; i++) { + elem = &this->elements[i]; + + ratio = (f32)elem->timer / (f32)this->elemDuration; + EffectBlure_GetComputedValues(this, i, ratio, &sp74, &sp6C, &sp64, &sp60); + + if (j1 >= 0) { + vtx[j1].ob[0] = sp74.x; + vtx[j1].ob[1] = sp74.y; + vtx[j1].ob[2] = sp74.z; + vtx[j1].cn[0] = sp64.r; + vtx[j1].cn[1] = sp64.g; + vtx[j1].cn[2] = sp64.b; + vtx[j1].cn[3] = sp64.a; + } + + j3 = j2; + if (j3 >= 0) { + vtx[j3].ob[0] = sp6C.x; + vtx[j3].ob[1] = sp6C.y; + vtx[j3].ob[2] = sp6C.z; + vtx[j3].cn[0] = sp60.r; + vtx[j3].cn[1] = sp60.g; + vtx[j3].cn[2] = sp60.b; + vtx[j3].cn[3] = sp60.a; + } + + j3++; + if (vtxCount >= j3) { + vtx[j3].ob[0] = sp74.x; + vtx[j3].ob[1] = sp74.y; + vtx[j3].ob[2] = sp74.z; + vtx[j3].cn[0] = sp64.r; + vtx[j3].cn[1] = sp64.g; + vtx[j3].cn[2] = sp64.b; + vtx[j3].cn[3] = sp64.a; + } + + j3++; + if (vtxCount >= j3) { + vtx[j3].ob[0] = sp6C.x; + vtx[j3].ob[1] = sp6C.y; + vtx[j3].ob[2] = sp6C.z; + vtx[j3].cn[0] = sp60.r; + vtx[j3].cn[1] = sp60.g; + vtx[j3].cn[2] = sp60.b; + vtx[j3].cn[3] = sp60.a; + } + + j1 += 4; + j2 += 4; + } + + EffectBlure_DrawSimpleVertices(gfxCtx, this, vtx); + } +} +#else +#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_blure/EffectBlure_DrawSimple.s") +#endif + +void EffectBlure_Draw(void* thisx, GraphicsContext* gfxCtx) { + EffectBlure* this = (EffectBlure*)thisx; + Vtx_t* vtx; + EffectBlureElement* elem; + s32 i; + s32 j; + s32 phi_t2; + Gfx* sp74[5]; + f32 ratio; + + Graph_OpenDisps(sp74, gfxCtx, "../z_eff_blure.c", 1596); + + gSPMatrix(gfxCtx->polyXlu.p++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + + if (this->numElements != 0) { + if (this->flags == 0) { + func_800942F0(gfxCtx); + gDPPipeSync(gfxCtx->polyXlu.p++); + + vtx = Graph_Alloc(gfxCtx, sizeof(Vtx_t[32])); + if (vtx == NULL) { + // Translates to: "Blure display: Vertex table could not be secured" + osSyncPrintf("ブラ─表示:頂点テーブル確保できず\n"); + } else { + j = 0; + for (i = 0; i < this->numElements; i++) { + elem = &this->elements[i]; + + if (elem->state == 1) { + ratio = (f32)elem->timer / (f32)this->elemDuration; + + switch (this->calcMode) { + case 1: + vtx[j].ob[0] = func_80027E34(elem->p1.x, elem->p2.x, ratio); + vtx[j].ob[1] = func_80027E34(elem->p1.y, elem->p2.y, ratio); + vtx[j].ob[2] = func_80027E34(elem->p1.z, elem->p2.z, ratio); + vtx[j + 1].ob[0] = elem->p2.x; + vtx[j + 1].ob[1] = elem->p2.y; + vtx[j + 1].ob[2] = elem->p2.z; + break; + case 2: + vtx[j].ob[0] = elem->p1.x; + vtx[j].ob[1] = elem->p1.y; + vtx[j].ob[2] = elem->p1.z; + vtx[j + 1].ob[0] = func_80027E34(elem->p2.x, elem->p1.x, ratio); + vtx[j + 1].ob[1] = func_80027E34(elem->p2.y, elem->p1.y, ratio); + vtx[j + 1].ob[2] = func_80027E34(elem->p2.z, elem->p1.z, ratio); + break; + case 3: + ratio = ratio * 0.5f; + vtx[j].ob[0] = func_80027E34(elem->p1.x, elem->p2.x, ratio); + vtx[j].ob[1] = func_80027E34(elem->p1.y, elem->p2.y, ratio); + vtx[j].ob[2] = func_80027E34(elem->p1.z, elem->p2.z, ratio); + vtx[j + 1].ob[0] = func_80027E34(elem->p2.x, elem->p1.x, ratio); + vtx[j + 1].ob[1] = func_80027E34(elem->p2.y, elem->p1.y, ratio); + vtx[j + 1].ob[2] = func_80027E34(elem->p2.z, elem->p1.z, ratio); + ratio = ratio + ratio; + break; + case 0: + default: + vtx[j].ob[0] = elem->p1.x; + vtx[j].ob[1] = elem->p1.y; + vtx[j].ob[2] = elem->p1.z; + vtx[j + 1].ob[0] = elem->p2.x; + vtx[j + 1].ob[1] = elem->p2.y; + vtx[j + 1].ob[2] = elem->p2.z; + break; + } + + vtx[j].flag = 0; + vtx[j].tc[0] = 0; + vtx[j].tc[1] = 0; + vtx[j].cn[0] = func_80027E84(this->p1StartColor.r, this->p1EndColor.r, ratio); + vtx[j].cn[1] = func_80027E84(this->p1StartColor.g, this->p1EndColor.g, ratio); + vtx[j].cn[2] = func_80027E84(this->p1StartColor.b, this->p1EndColor.b, ratio); + vtx[j].cn[3] = func_80027E84(this->p1StartColor.a, this->p1EndColor.a, ratio); + j++; + + vtx[j].flag = 0; + vtx[j].tc[0] = 0; + vtx[j].tc[1] = 0; + vtx[j].cn[0] = func_80027E84(this->p2StartColor.r, this->p2EndColor.r, ratio); + vtx[j].cn[1] = func_80027E84(this->p2StartColor.g, this->p2EndColor.g, ratio); + vtx[j].cn[2] = func_80027E84(this->p2StartColor.b, this->p2EndColor.b, ratio); + vtx[j].cn[3] = func_80027E84(this->p2StartColor.a, this->p2EndColor.a, ratio); + j++; + } + } + + j = 0; + + gSPVertex(gfxCtx->polyXlu.p++, vtx, 32, 0); + + phi_t2 = 0; + for (i = 0; i < this->numElements; i++) { + elem = &this->elements[i]; + + if (elem->state == 0) { + phi_t2 = 0; + } else { + if (phi_t2 == 0) { + phi_t2 = 1; + } else { + gSP1Quadrangle(gfxCtx->polyXlu.p++, j - 2, j - 1, j + 1, j, 0); + + if (1) {} // Necessary to match + + if (this->unkFlag == 1) { + phi_t2 = 0; + } + } + j += 2; + } + } + } + } else if (this->drawMode < 2) { + EffectBlure_DrawSimple(this, gfxCtx); + } else { + EffectBlure_DrawSmooth(this, gfxCtx); + } + } + + Graph_CloseDisps(sp74, gfxCtx, "../z_eff_blure.c", 1823); +} diff --git a/src/code/z_eff_shield_particle.c b/src/code/z_eff_shield_particle.c index d3f2591f82..b3be66f795 100644 --- a/src/code/z_eff_shield_particle.c +++ b/src/code/z_eff_shield_particle.c @@ -1,10 +1,228 @@ #include #include +#include -#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_shield_particle/func_80023450.s") +static Vtx sVertices[5] = { + VTX(-32, -32, 0, 0, 1024, 0xFF, 0xFF, 0xFF, 0xFF), + VTX(32, 32, 0, 1024, 0, 0xFF, 0xFF, 0xFF, 0xFF), + VTX(-32, 32, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF), + VTX(32, -32, 0, 1024, 1024, 0xFF, 0xFF, 0xFF, 0xFF), +}; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_shield_particle/func_800236B4.s") +// original name: "EffectShieldParticle_ct" +void EffectShieldParticle_Init(void* thisx, void* initParamsx) { + EffectShieldParticle* this = (EffectShieldParticle*)thisx; + EffectShieldParticleInit* initParams = (EffectShieldParticleInit*)initParamsx; + EffectShieldParticleElement* elem; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_shield_particle/func_8002389C.s") + if ((this != NULL) && (initParams != NULL)) { + this->numElements = initParams->numElements; + if (this->numElements > ARRAY_COUNT(this->elements)) { + osSyncPrintf(VT_FGCOL(RED)); + osSyncPrintf("EffectShieldParticle_ct():パーティクル数がオーバしてます。\n"); + osSyncPrintf(VT_RST); + return; + } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_shield_particle/func_800245BC.s") + this->position = initParams->position; + this->primColorStart = initParams->primColorStart; + this->envColorStart = initParams->envColorStart; + this->primColorMid = initParams->primColorMid; + this->envColorMid = initParams->envColorMid; + this->primColorEnd = initParams->primColorEnd; + this->envColorEnd = initParams->envColorEnd; + this->deceleration = initParams->deceleration; + this->maxInitialSpeed = initParams->maxInitialSpeed; + this->lengthCutoff = initParams->lengthCutoff; + this->duration = initParams->duration; + this->timer = 0; + + for (elem = &this->elements[0]; elem < &this->elements[this->numElements]; elem++) { + elem->initialSpeed = + (Math_Rand_ZeroOne() * (this->maxInitialSpeed * 0.5f)) + (this->maxInitialSpeed * 0.5f); + elem->endX = 0.0f; + elem->startXChange = 0.0f; + elem->startX = 0.0f; + elem->endXChange = elem->initialSpeed; + elem->yaw = Math_Rand_ZeroOne() * 65534.0f; + elem->pitch = Math_Rand_ZeroOne() * 65534.0f; + } + + this->lightDecay = initParams->lightDecay; + if (this->lightDecay == true) { + this->lightInfo.type = 0; + this->lightInfo.params = initParams->lightParams; + this->light = Lights_Insert(Effect_GetGlobalCtx(), &Effect_GetGlobalCtx()->lightCtx, &this->lightInfo); + } else { + this->light = NULL; + } + } +} + +void EffectShieldParticle_Destroy(void* thisx) { + EffectShieldParticle* this = (EffectShieldParticle*)thisx; + + if ((this != NULL) && (this->lightDecay == true)) { + if (this->light == Effect_GetGlobalCtx()->lightCtx.lightsHead) { + Effect_GetGlobalCtx()->lightCtx.lightsHead = this->light->next; + } + Lights_Remove(Effect_GetGlobalCtx(), &Effect_GetGlobalCtx()->lightCtx, this->light); + } +} + +s32 EffectShieldParticle_Update(void* thisx) { + EffectShieldParticle* this = (EffectShieldParticle*)thisx; + EffectShieldParticleElement* elem; + + if (this == NULL) { + return 0; + } + + for (elem = &this->elements[0]; elem < &this->elements[this->numElements]; elem++) { + elem->endXChange -= this->deceleration; + if (elem->endXChange < 0.0f) { + elem->endXChange = 0.0f; + } + + if (elem->startXChange > 0.0f) { + elem->startXChange -= this->deceleration; + if (elem->startXChange < 0.0f) { + elem->startXChange = 0.0f; + } + } + + elem->endX += elem->endXChange; + elem->startX += elem->startXChange; + + if ((elem->startXChange == 0.0f) && (this->lengthCutoff < (elem->endX - elem->startX))) { + elem->startXChange = elem->initialSpeed; + } + } + + if (this->lightDecay == true) { + this->lightInfo.params.radius /= 2; + } + + this->timer++; + + if (this->duration < this->timer) { + return 1; + } + + return 0; +} + +void EffectShieldParticle_GetColors(EffectShieldParticle* this, Color_RGBA8_n* primColor, Color_RGBA8_n* envColor) { + s32 halfDuration; + f32 ratio; + + halfDuration = this->duration * 0.5f; + if (halfDuration == 0) { + primColor->r = this->primColorStart.r; + primColor->g = this->primColorStart.g; + primColor->b = this->primColorStart.b; + primColor->a = this->primColorStart.a; + envColor->r = this->envColorStart.r; + envColor->g = this->envColorStart.g; + envColor->b = this->envColorStart.b; + envColor->a = this->envColorStart.a; + } else if (this->timer < halfDuration) { + ratio = this->timer / (f32)halfDuration; + primColor->r = this->primColorStart.r + (this->primColorMid.r - this->primColorStart.r) * ratio; + primColor->g = this->primColorStart.g + (this->primColorMid.g - this->primColorStart.g) * ratio; + primColor->b = this->primColorStart.b + (this->primColorMid.b - this->primColorStart.b) * ratio; + primColor->a = this->primColorStart.a + (this->primColorMid.a - this->primColorStart.a) * ratio; + envColor->r = this->envColorStart.r + (this->envColorMid.r - this->envColorStart.r) * ratio; + envColor->g = this->envColorStart.g + (this->envColorMid.g - this->envColorStart.g) * ratio; + envColor->b = this->envColorStart.b + (this->envColorMid.b - this->envColorStart.b) * ratio; + envColor->a = this->envColorStart.a + (this->envColorMid.a - this->envColorStart.a) * ratio; + } else { + ratio = (this->timer - halfDuration) / (f32)halfDuration; + primColor->r = this->primColorMid.r + (this->primColorEnd.r - this->primColorMid.r) * ratio; + primColor->g = this->primColorMid.g + (this->primColorEnd.g - this->primColorMid.g) * ratio; + primColor->b = this->primColorMid.b + (this->primColorEnd.b - this->primColorMid.b) * ratio; + primColor->a = this->primColorMid.a + (this->primColorEnd.a - this->primColorMid.a) * ratio; + envColor->r = this->envColorMid.r + (this->envColorEnd.r - this->envColorMid.r) * ratio; + envColor->g = this->envColorMid.g + (this->envColorEnd.g - this->envColorMid.g) * ratio; + envColor->b = this->envColorMid.b + (this->envColorEnd.b - this->envColorMid.b) * ratio; + envColor->a = this->envColorMid.a + (this->envColorEnd.a - this->envColorMid.a) * ratio; + } +} + +void EffectShieldParticle_Draw(void* thisx, GraphicsContext* gfxCtx) { + EffectShieldParticle* this = (EffectShieldParticle*)thisx; + EffectShieldParticleElement* elem; + Color_RGBA8_n primColor; + Color_RGBA8_n envColor; + Gfx* dispRefs[5]; + Mtx* mtx; + + Graph_OpenDisps(dispRefs, gfxCtx, "../z_eff_shield_particle.c", 272); + + if (this != NULL) { + gfxCtx->polyXlu.p = Gfx_CallSetupDL(gfxCtx->polyXlu.p, 0x26); + + gDPSetCycleType(gfxCtx->polyXlu.p++, G_CYC_2CYCLE); + gDPPipeSync(gfxCtx->polyXlu.p++); + gSPTexture(gfxCtx->polyXlu.p++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON); + + gDPLoadTextureBlock(gfxCtx->polyXlu.p++, D_04038FB0, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, + G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD); + + if (1) {} // Both necessary to match + if (1) {} + + gDPSetCombineLERP(gfxCtx->polyXlu.p++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, PRIMITIVE, 0, TEXEL0, 0, 0, + 0, 0, COMBINED, 0, 0, 0, COMBINED); + gDPSetRenderMode(gfxCtx->polyXlu.p++, G_RM_PASS, G_RM_ZB_CLD_SURF2); + gSPClearGeometryMode(gfxCtx->polyXlu.p++, + G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR); + gSPSetGeometryMode(gfxCtx->polyXlu.p++, G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH); + + if (1) {} // Also necessary to match + + EffectShieldParticle_GetColors(this, &primColor, &envColor); + + gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, primColor.r, primColor.g, primColor.b, primColor.a); + gDPSetEnvColor(gfxCtx->polyXlu.p++, envColor.r, envColor.g, envColor.b, envColor.a); + gDPPipeSync(gfxCtx->polyXlu.p++); + + for (elem = &this->elements[0]; elem < &this->elements[this->numElements]; elem++) { + MtxF sp104; + MtxF spC4; + MtxF sp84; + f32 temp1; + f32 temp2; + f32 temp3; + + temp1 = (s16)((elem->endX + elem->startX) * 0.5f); + + temp2 = elem->endX - elem->startX; + temp3 = (s16)((temp2 * (1.0f / 64.0f)) / 0.02f); + if (temp3 < 1.0f) { + temp3 = 1.0f; + } + + func_800A7A24(&spC4, this->position.x, this->position.y, this->position.z); + func_800A7704(&sp104, 0, elem->yaw, 0); + func_800A6FA0(&spC4, &sp104, &sp84); + func_800A7704(&sp104, 0, 0, elem->pitch); + func_800A6FA0(&sp84, &sp104, &spC4); + func_800A7A24(&sp104, temp1, 0.0f, 0.0f); + func_800A6FA0(&spC4, &sp104, &sp84); + func_800A76A4(&sp104, temp3 * 0.02f, 0.02f, 0.02f); + func_800A6FA0(&sp84, &sp104, &spC4); + + mtx = func_800A7E70(gfxCtx, &spC4); + if (mtx == NULL) { + break; + } + + gSPMatrix(gfxCtx->polyXlu.p++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPVertex(gfxCtx->polyXlu.p++, sVertices, 4, 0); + gSP2Triangles(gfxCtx->polyXlu.p++, 0, 1, 2, 0, 0, 3, 1, 0); + } + } + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_eff_shield_particle.c", 359); +} diff --git a/src/code/z_eff_spark.c b/src/code/z_eff_spark.c index 5f7c2a65f5..08d1238937 100644 --- a/src/code/z_eff_spark.c +++ b/src/code/z_eff_spark.c @@ -1,11 +1,289 @@ #include #include -#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_spark/func_80024B00.s") +// original name: "spark" +void EffectSpark_Init(void* thisx, void* initParamsx) { + EffectSpark* this = (EffectSpark*)thisx; + EffectSparkInit* initParams = (EffectSparkInit*)initParamsx; + EffectSparkElement* elem; + f32 velocityNorm; + s32 i; -void func_80024F0C(UNK_TYPE arg0) { + if ((this != NULL) && (initParams != NULL)) { + if ((initParams->uDiv == 0) || (initParams->vDiv == 0)) { + // Translates to: "u_div,v_div 0 is not good." + osSyncPrintf("spark():u_div,v_div 0では困る。\n"); + return; + } + + this->position = initParams->position; + this->speed = initParams->speed; + this->gravity = initParams->gravity; + this->uDiv = initParams->uDiv; + this->vDiv = initParams->vDiv; + this->colorStart[0].r = initParams->colorStart[0].r; + this->colorStart[0].g = initParams->colorStart[0].g; + this->colorStart[0].b = initParams->colorStart[0].b; + this->colorStart[0].a = initParams->colorStart[0].a; + this->colorStart[1].r = initParams->colorStart[1].r; + this->colorStart[1].g = initParams->colorStart[1].g; + this->colorStart[1].b = initParams->colorStart[1].b; + this->colorStart[1].a = initParams->colorStart[1].a; + this->colorStart[2].r = initParams->colorStart[2].r; + this->colorStart[2].g = initParams->colorStart[2].g; + this->colorStart[2].b = initParams->colorStart[2].b; + this->colorStart[2].a = initParams->colorStart[2].a; + this->colorStart[3].r = initParams->colorStart[3].r; + this->colorStart[3].g = initParams->colorStart[3].g; + this->colorStart[3].b = initParams->colorStart[3].b; + this->colorStart[3].a = initParams->colorStart[3].a; + this->colorEnd[0].r = initParams->colorEnd[0].r; + this->colorEnd[0].g = initParams->colorEnd[0].g; + this->colorEnd[0].b = initParams->colorEnd[0].b; + this->colorEnd[0].a = initParams->colorEnd[0].a; + this->colorEnd[1].r = initParams->colorEnd[1].r; + this->colorEnd[1].g = initParams->colorEnd[1].g; + this->colorEnd[1].b = initParams->colorEnd[1].b; + this->colorEnd[1].a = initParams->colorEnd[1].a; + this->colorEnd[2].r = initParams->colorEnd[2].r; + this->colorEnd[2].g = initParams->colorEnd[2].g; + this->colorEnd[2].b = initParams->colorEnd[2].b; + this->colorEnd[2].a = initParams->colorEnd[2].a; + this->colorEnd[3].r = initParams->colorEnd[3].r; + this->colorEnd[3].g = initParams->colorEnd[3].g; + this->colorEnd[3].b = initParams->colorEnd[3].b; + this->colorEnd[3].a = initParams->colorEnd[3].a; + this->duration = initParams->duration; + + this->numElements = (this->uDiv * this->vDiv) + 2; + if (this->numElements > ARRAY_COUNT(this->elements)) { + osSyncPrintf("table_sizeオーバー\n"); // "over table_size" + return; + } + + for (i = 0; i < this->numElements; i++) { + elem = &this->elements[i]; + + elem->position.x = this->position.x; + elem->position.y = this->position.y; + elem->position.z = this->position.z; + elem->velocity.x = Math_Rand_ZeroOne() - 0.5f; + elem->velocity.y = Math_Rand_ZeroOne() - 0.5f; + elem->velocity.z = Math_Rand_ZeroOne() - 0.5f; + + velocityNorm = sqrtf(SQ(elem->velocity.x) + SQ(elem->velocity.y) + SQ(elem->velocity.z)); + + if (!(fabsf(velocityNorm) < 0.008f)) { + elem->velocity.x *= this->speed * (1.0f / velocityNorm); + elem->velocity.y *= this->speed * (1.0f / velocityNorm); + elem->velocity.z *= this->speed * (1.0f / velocityNorm); + } else { + elem->velocity.x = elem->velocity.z = 0.0f; + elem->velocity.y = this->speed; + } + + elem->unkVelocity.x = 30000.0f - Math_Rand_ZeroOne() * 15000.0f; + elem->unkVelocity.y = 30000.0f - Math_Rand_ZeroOne() * 15000.0f; + elem->unkVelocity.z = 30000.0f - Math_Rand_ZeroOne() * 15000.0f; + elem->unkPosition.x = Math_Rand_ZeroOne() * 65534.0f; + elem->unkPosition.y = Math_Rand_ZeroOne() * 65534.0f; + elem->unkPosition.z = Math_Rand_ZeroOne() * 65534.0f; + } + + this->timer = 0; + } } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_spark/func_80024F14.s") +void EffectSpark_Destroy(void* thisx) { +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_spark/func_80025000.s") +// original name: "EffectSparkInfo_proc" +s32 EffectSpark_Update(void* thisx) { + EffectSpark* this = (EffectSpark*)thisx; + EffectSparkElement* elem; + s32 i; + + if (this == NULL) { + osSyncPrintf("EffectSparkInfo_proc():Spark Pointer is NULL\n"); + } + + for (i = 0; i < this->numElements; i++) { + elem = &this->elements[i]; + + elem->position.x += elem->velocity.x; + elem->position.y += elem->velocity.y; + elem->position.z += elem->velocity.z; + elem->velocity.y += this->gravity; + elem->unkPosition.x += elem->unkVelocity.x; + elem->unkPosition.y += elem->unkVelocity.y; + elem->unkPosition.z += elem->unkVelocity.z; + } + + this->timer++; + + if (this->duration < this->timer) { + return 1; + } else { + return 0; + } +} + +// original name: "EffectSparkInfo_disp" +#ifdef NON_MATCHING +// minor ordering and saved register usage differences +void EffectSpark_Draw(void* thisx, GraphicsContext* gfxCtx) { + Vtx* vertices; + EffectSpark* this = (EffectSpark*)thisx; // sp1E0 + EffectSparkElement* elem; + GlobalContext* globalCtx; + f32 ratio; + u8 sp1D3; + u8 sp1D2; + u8 sp1D1; + u8 sp1D0; + u8 sp1CF; + u8 sp1CE; + u8 sp1CD; + u8 sp1CC; + u8 sp1CB; + u8 sp1CA; + u8 sp1C9; + u8 sp1C8; + u8 sp1C7; + u8 sp1C6; + u8 sp1C5; + u8 sp1C4; + s32 i; + s32 j; + Gfx* dispRefs[4]; // sp1AC + + globalCtx = Effect_GetGlobalCtx(); + Graph_OpenDisps(dispRefs, gfxCtx, "../z_eff_spark.c", 293); + + if (this != NULL) { + gSPMatrix(gfxCtx->polyXlu.p++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + + gfxCtx->polyXlu.p = Gfx_CallSetupDL(gfxCtx->polyXlu.p, 0x26); + gDPSetCycleType(gfxCtx->polyXlu.p++, G_CYC_2CYCLE); + gDPPipeSync(gfxCtx->polyXlu.p++); + + gSPTexture(gfxCtx->polyXlu.p++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON); + gDPLoadTextureBlock(gfxCtx->polyXlu.p++, D_04038FB0, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, + G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD); + + gDPSetCombineMode(gfxCtx->polyXlu.p++, G_CC_SHADEDECALA, G_CC_PASS2); + gDPSetRenderMode(gfxCtx->polyXlu.p++, G_RM_PASS, G_RM_ZB_CLD_SURF2); + gSPClearGeometryMode(gfxCtx->polyXlu.p++, + G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR); + gSPSetGeometryMode(gfxCtx->polyXlu.p++, G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH); + gDPPipeSync(gfxCtx->polyXlu.p++); + + vertices = Graph_Alloc(gfxCtx, this->numElements * sizeof(Vtx[4])); + if (vertices == NULL) { + // Translates to: "Memory Allocation Failure graph_malloc" + osSyncPrintf("EffectSparkInfo_disp():メモリー確保失敗 graph_malloc\n"); + return; + } + + j = 0; + + ratio = (f32)this->timer / (f32)this->duration; + sp1D3 = this->colorStart[0].r + ((f32)this->colorEnd[0].r - (f32)this->colorStart[0].r) * ratio; + sp1D2 = this->colorStart[0].g + ((f32)this->colorEnd[0].g - (f32)this->colorStart[0].g) * ratio; + sp1D1 = this->colorStart[0].b + ((f32)this->colorEnd[0].b - (f32)this->colorStart[0].b) * ratio; + sp1D0 = this->colorStart[0].a + ((f32)this->colorEnd[0].a - (f32)this->colorStart[0].a) * ratio; + sp1CF = this->colorStart[1].r + ((f32)this->colorEnd[1].r - (f32)this->colorStart[1].r) * ratio; + sp1CE = this->colorStart[1].g + ((f32)this->colorEnd[1].g - (f32)this->colorStart[1].g) * ratio; + sp1CD = this->colorStart[1].b + ((f32)this->colorEnd[1].b - (f32)this->colorStart[1].b) * ratio; + sp1CC = this->colorStart[1].a + ((f32)this->colorEnd[1].a - (f32)this->colorStart[1].a) * ratio; + sp1CB = this->colorStart[2].r + ((f32)this->colorEnd[2].r - (f32)this->colorStart[2].r) * ratio; + sp1CA = this->colorStart[2].g + ((f32)this->colorEnd[2].g - (f32)this->colorStart[2].g) * ratio; + sp1C9 = this->colorStart[2].b + ((f32)this->colorEnd[2].b - (f32)this->colorStart[2].b) * ratio; + sp1C8 = this->colorStart[2].a + ((f32)this->colorEnd[2].a - (f32)this->colorStart[2].a) * ratio; + sp1C7 = this->colorStart[3].r + ((f32)this->colorEnd[3].r - (f32)this->colorStart[3].r) * ratio; + sp1C6 = this->colorStart[3].g + ((f32)this->colorEnd[3].g - (f32)this->colorStart[3].g) * ratio; + sp1C5 = this->colorStart[3].b + ((f32)this->colorEnd[3].b - (f32)this->colorStart[3].b) * ratio; + sp1C4 = this->colorStart[3].a + ((f32)this->colorEnd[3].a - (f32)this->colorStart[3].a) * ratio; + + for (i = 0; i < this->numElements; i++) { + MtxF sp12C; + MtxF spEC; + MtxF spAC; + MtxF sp6C; + Mtx* mtx; + f32 temp; + + elem = &this->elements[i]; + + func_800A7A24(&spEC, elem->position.x, elem->position.y, elem->position.z); + temp = ((Math_Rand_ZeroOne() * 2.5f) + 1.5f) * 0.015625f; + func_800A76A4(&spAC, temp, temp, 1.0f); + func_800A6FA0(&spEC, &globalCtx->mf_11DA0, &sp6C); + func_800A6FA0(&sp6C, &spAC, &sp12C); + + vertices[j].v.ob[0] = -32; + vertices[j].v.ob[1] = -32; + vertices[j].v.ob[2] = 0; + vertices[j].v.cn[0] = sp1D3; + vertices[j].v.cn[1] = sp1D2; + vertices[j].v.cn[2] = sp1D1; + vertices[j].v.cn[3] = sp1D0; + vertices[j].v.tc[0] = 0; + vertices[j].v.tc[1] = 1024; + vertices[j].v.flag = 0; + + vertices[j + 1].v.ob[0] = 32; + vertices[j + 1].v.ob[1] = 32; + vertices[j + 1].v.ob[2] = 0; + vertices[j + 1].v.cn[0] = sp1CF; + vertices[j + 1].v.cn[1] = sp1CE; + vertices[j + 1].v.cn[2] = sp1CD; + vertices[j + 1].v.cn[3] = sp1CC; + vertices[j + 1].v.tc[0] = 1024; + vertices[j + 1].v.tc[1] = 0; + vertices[j + 1].v.flag = 0; + + vertices[j + 2].v.ob[0] = -32; + vertices[j + 2].v.ob[1] = 32; + vertices[j + 2].v.ob[2] = 0; + vertices[j + 2].v.cn[0] = sp1CB; + vertices[j + 2].v.cn[1] = sp1CA; + vertices[j + 2].v.cn[2] = sp1C9; + vertices[j + 2].v.cn[3] = sp1C8; + vertices[j + 2].v.tc[0] = 0; + vertices[j + 2].v.tc[1] = 0; + vertices[j + 2].v.flag = 0; + + vertices[j + 3].v.ob[0] = 32; + vertices[j + 3].v.ob[1] = -32; + vertices[j + 3].v.ob[2] = 0; + vertices[j + 3].v.cn[0] = sp1C7; + vertices[j + 3].v.cn[1] = sp1C6; + vertices[j + 3].v.cn[2] = sp1C5; + vertices[j + 3].v.cn[3] = sp1C4; + vertices[j + 3].v.tc[0] = 1024; + vertices[j + 3].v.tc[1] = 1024; + vertices[j + 3].v.flag = 0; + + j += 4; + + if (this) {} + + mtx = func_800A7E70(gfxCtx, &sp12C); + if (mtx == NULL) { + break; + } + + gSPMatrix(gfxCtx->polyXlu.p++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPVertex(gfxCtx->polyXlu.p++, &vertices[4 * i], 4, 0); + gSP2Triangles(gfxCtx->polyXlu.p++, 2, 0, 3, 0, 2, 3, 1, 0); + } + + gDPPipeSync(gfxCtx->polyXlu.p++); + } + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_eff_spark.c", 498); +} +#else +#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_spark/EffectSpark_Draw.s") +#endif diff --git a/src/code/z_eff_ss_dead.c b/src/code/z_eff_ss_dead.c index f203e81e4e..05e60bdcd7 100644 --- a/src/code/z_eff_ss_dead.c +++ b/src/code/z_eff_ss_dead.c @@ -1,14 +1,140 @@ #include #include -#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_ss_dead/func_80026230.s") +void func_80026230(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 arg3) { + f32 cos; + Gfx* displayListHead; + f32 absCos; + GraphicsContext* gfxCtx; + Gfx* dispRefs[4]; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_ss_dead/func_80026400.s") + gfxCtx = globalCtx->state.gfxCtx; + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_eff_ss_dead.c", 113); -#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_ss_dead/func_80026608.s") + displayListHead = gfxCtx->polyOpa.p; + cos = Math_Coss((0x8000 / arg3) * arg2); + absCos = ABS(cos); -#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_ss_dead/func_80026690.s") + gDPPipeSync(displayListHead++); -#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_ss_dead/func_80026860.s") + if (color == NULL) { + gDPSetFogColor(displayListHead++, 0xFF, 0x00, 0x00, 0x00); + } else { + gDPSetFogColor(displayListHead++, color->r, color->g, color->b, color->a); + } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_ss_dead/func_80026A6C.s") + gSPFogPosition(displayListHead++, 0, (s16)(absCos * 3000.0f) + 1500); + + gfxCtx->polyOpa.p = displayListHead; + + if (1) {} // Necessary to match + + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_eff_ss_dead.c", 129); +} + +void func_80026400(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 arg3) { + Gfx* displayListHead; + f32 cos; + GraphicsContext* gfxCtx; + Gfx* dispRefs[4]; + + if (arg3 != 0) { + gfxCtx = globalCtx->state.gfxCtx; + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_eff_ss_dead.c", 141); + + cos = Math_Coss((0x4000 / arg3) * arg2); + displayListHead = gfxCtx->polyOpa.p; + + gDPPipeSync(displayListHead++); + gDPSetFogColor(displayListHead++, color->r, color->g, color->b, color->a); + gSPFogPosition(displayListHead++, 0, (s16)(2800.0f * ABS(cos)) + 1700); + + gfxCtx->polyOpa.p = displayListHead; + + if (1) {} // Necessary to match + + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_eff_ss_dead.c", 153); + } +} + +void func_80026608(GlobalContext* globalCtx) { + s32 pad; + GraphicsContext* gfxCtx; + Gfx* dispRefs[4]; + + gfxCtx = globalCtx->state.gfxCtx; + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_eff_ss_dead.c", 159); + + gDPPipeSync(gfxCtx->polyOpa.p++); + gfxCtx->polyOpa.p = func_800BC8A0(globalCtx, gfxCtx->polyOpa.p); + + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_eff_ss_dead.c", 164); +} + +void func_80026690(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 arg3) { + f32 cos; + Gfx* displayListHead; + f32 absCos; + GraphicsContext* gfxCtx; + Gfx* dispRefs[4]; + + gfxCtx = globalCtx->state.gfxCtx; + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_eff_ss_dead.c", 178); + + displayListHead = gfxCtx->polyXlu.p; + cos = Math_Coss((0x8000 / arg3) * arg2); + absCos = ABS(cos); + + gDPPipeSync(displayListHead++); + + if (color == NULL) { + gDPSetFogColor(displayListHead++, 0xFF, 0x00, 0x00, 0x00); + } else { + gDPSetFogColor(displayListHead++, color->r, color->g, color->b, color->a); + } + + gSPFogPosition(displayListHead++, 0, (s16)(absCos * 3000.0f) + 1500); + + gfxCtx->polyXlu.p = displayListHead; + + if (1) {} // Necessary to match + + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_eff_ss_dead.c", 194); +} + +void func_80026860(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 arg3) { + f32 cos; + Gfx* displayListHead; + GraphicsContext* gfxCtx; + Gfx* dispRefs[4]; + + gfxCtx = globalCtx->state.gfxCtx; + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_eff_ss_dead.c", 201); + + displayListHead = gfxCtx->polyXlu.p; + cos = Math_Coss((0x4000 / arg3) * arg2); + + gDPPipeSync(displayListHead++); + gDPSetFogColor(displayListHead++, color->r, color->g, color->b, color->a); + gSPFogPosition(displayListHead++, 0, (s16)(2800.0f * ABS(cos)) + 1700); + + gfxCtx->polyXlu.p = displayListHead; + + if (1) {} // Necessary to match + + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_eff_ss_dead.c", 212); +} + +void func_80026A6C(GlobalContext* globalCtx) { + s32 pad; + GraphicsContext* gfxCtx; + Gfx* dispRefs[4]; + + gfxCtx = globalCtx->state.gfxCtx; + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_eff_ss_dead.c", 217); + + gDPPipeSync(gfxCtx->polyXlu.p++); + gfxCtx->polyXlu.p = func_800BC8A0(globalCtx, gfxCtx->polyXlu.p); + + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_eff_ss_dead.c", 222); +} diff --git a/src/code/z_effect.c b/src/code/z_effect.c index dfe367d13c..a1077c13af 100644 --- a/src/code/z_effect.c +++ b/src/code/z_effect.c @@ -1,26 +1,264 @@ #include #include -GlobalContext* func_80026B00(void) { - return D_80157DA0; +EffectContext sEffectContext; + +EffectInfo sEffectInfoTable[] = { + { + sizeof(EffectSpark), + EffectSpark_Init, + EffectSpark_Destroy, + EffectSpark_Update, + EffectSpark_Draw, + }, + { + sizeof(EffectBlure), + EffectBlure_Init1, + EffectBlure_Destroy, + EffectBlure_Update, + EffectBlure_Draw, + }, + { + sizeof(EffectBlure), + EffectBlure_Init2, + EffectBlure_Destroy, + EffectBlure_Update, + EffectBlure_Draw, + }, + { + sizeof(EffectShieldParticle), + EffectShieldParticle_Init, + EffectShieldParticle_Destroy, + EffectShieldParticle_Update, + EffectShieldParticle_Draw, + }, +}; + +GlobalContext* Effect_GetGlobalCtx(void) { + return sEffectContext.globalCtx; } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect/func_80026B0C.s") +void* Effect_GetByIndex(s32 index) { + if (index == TOTAL_EFFECT_COUNT) { + return NULL; + } -void func_80026C1C(u8* arg0) { - arg0[0] = 0; - arg0[1] = 0; - arg0[2] = 0; + if (index < SPARK_COUNT) { + if (sEffectContext.sparks[index].status.active == true) { + return &sEffectContext.sparks[index].effect; + } else { + return NULL; + } + } + + index -= SPARK_COUNT; + if (index < BLURE_COUNT) { + if (sEffectContext.blures[index].status.active == true) { + return &sEffectContext.blures[index].effect; + } else { + return NULL; + } + } + + index -= BLURE_COUNT; + if (index < SHIELD_PARTICLE_COUNT) { + if (sEffectContext.shieldParticles[index].status.active == true) { + return &sEffectContext.shieldParticles[index].effect; + } else { + return NULL; + } + } + + return NULL; } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect/func_80026C2C.s") +void Effect_InitStatus(EffectStatus* status) { + status->active = false; + status->unk_01 = 0; + status->unk_02 = 0; +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect/Effect_Add.s") +void Effect_InitContext(GlobalContext* globalCtx) { + s32 i; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect/func_80026E74.s") + for (i = 0; i < SPARK_COUNT; i++) { + Effect_InitStatus(&sEffectContext.sparks[i].status); + } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect/func_80026F70.s") + for (i = 0; i < BLURE_COUNT; i++) { + Effect_InitStatus(&sEffectContext.blures[i].status); + } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect/func_8002709C.s") + for (i = 0; i < SHIELD_PARTICLE_COUNT; i++) { + //! @bug This is supposed to initialize shieldParticles, not blures again + Effect_InitStatus(&sEffectContext.blures[i].status); + } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect/func_800271A8.s") + sEffectContext.globalCtx = globalCtx; +} + +void Effect_Add(GlobalContext* globalCtx, s32* pIndex, s32 type, u8 arg3, u8 arg4, void* initParams) { + s32 i; + u32 slotFound; + void* effect; + EffectStatus* status; + + effect = NULL; + status = NULL; + *pIndex = TOTAL_EFFECT_COUNT; + + if (func_800C0D28(globalCtx) != 1) { + slotFound = false; + switch (type) { + case EFFECT_SPARK: + for (i = 0; i < SPARK_COUNT; i++) { + if (sEffectContext.sparks[i].status.active == false) { + slotFound = true; + *pIndex = i; + effect = &sEffectContext.sparks[i].effect; + status = &sEffectContext.sparks[i].status; + break; + } + } + break; + case EFFECT_BLURE1: + case EFFECT_BLURE2: + for (i = 0; i < BLURE_COUNT; i++) { + if (sEffectContext.blures[i].status.active == false) { + slotFound = true; + *pIndex = i + SPARK_COUNT; + effect = &sEffectContext.blures[i].effect; + status = &sEffectContext.blures[i].status; + break; + } + } + break; + case EFFECT_SHIELD_PARTICLE: + for (i = 0; i < SHIELD_PARTICLE_COUNT; i++) { + if (sEffectContext.shieldParticles[i].status.active == false) { + slotFound = true; + *pIndex = i + SPARK_COUNT + BLURE_COUNT; + effect = &sEffectContext.shieldParticles[i].effect; + status = &sEffectContext.shieldParticles[i].status; + break; + } + } + break; + } + + if (!slotFound) { + // Translates to: "EffectAdd(): I cannot secure it. Be careful. Type %d" + osSyncPrintf("EffectAdd():確保できません。注意してください。Type%d\n", type); + // Translates to: "Exit without adding the effect." + osSyncPrintf("エフェクト追加せずに終了します。\n"); + } else { + sEffectInfoTable[type].init(effect, initParams); + status->unk_02 = arg3; + status->unk_01 = arg4; + status->active = true; + } + } +} + +void Effect_DrawAll(GraphicsContext* gfxCtx) { + s32 i; + + for (i = 0; i < SPARK_COUNT; i++) { + if (sEffectContext.sparks[i].status.active) { + sEffectInfoTable[EFFECT_SPARK].draw(&sEffectContext.sparks[i].effect, gfxCtx); + } + } + + for (i = 0; i < BLURE_COUNT; i++) { + do { + if (1) {} // Necessary to match + if (sEffectContext.blures[i].status.active) { + sEffectInfoTable[EFFECT_BLURE1].draw(&sEffectContext.blures[i].effect, gfxCtx); + } + } while (0); // Necessary to match + } + + for (i = 0; i < SHIELD_PARTICLE_COUNT; i++) { + if (sEffectContext.shieldParticles[i].status.active) { + if (gfxCtx) {} // Necessary to match + sEffectInfoTable[EFFECT_SHIELD_PARTICLE].draw(&sEffectContext.shieldParticles[i].effect, gfxCtx); + } + } +} + +void Effect_UpdateAll(GlobalContext* globalCtx) { + s32 i; + + for (i = 0; i < SPARK_COUNT; i++) { + if (sEffectContext.sparks[i].status.active) { + if (sEffectInfoTable[EFFECT_SPARK].update(&sEffectContext.sparks[i].effect) == 1) { + Effect_Delete(globalCtx, i); + } + } + } + + for (i = 0; i < BLURE_COUNT; i++) { + if (sEffectContext.blures[i].status.active) { + if (sEffectInfoTable[EFFECT_BLURE1].update(&sEffectContext.blures[i].effect) == 1) { + Effect_Delete(globalCtx, i + SPARK_COUNT); + } + } + } + + for (i = 0; i < SHIELD_PARTICLE_COUNT; i++) { + if (sEffectContext.shieldParticles[i].status.active) { + if (sEffectInfoTable[EFFECT_SHIELD_PARTICLE].update(&sEffectContext.shieldParticles[i].effect) == 1) { + Effect_Delete(globalCtx, i + SPARK_COUNT + BLURE_COUNT); + } + } + } +} + +void Effect_Delete(GlobalContext* globalCtx, s32 index) { + if (index == TOTAL_EFFECT_COUNT) { + return; + } + + if (index < SPARK_COUNT) { + sEffectContext.sparks[index].status.active = false; + sEffectInfoTable[EFFECT_SPARK].destroy(&sEffectContext.sparks[index].effect); + return; + } + + index -= SPARK_COUNT; + if (index < BLURE_COUNT) { + sEffectContext.blures[index].status.active = false; + sEffectInfoTable[EFFECT_BLURE1].destroy(&sEffectContext.blures[index].effect); + return; + } + + index -= BLURE_COUNT; + if (index < SHIELD_PARTICLE_COUNT) { + sEffectContext.shieldParticles[index].status.active = false; + sEffectInfoTable[EFFECT_SHIELD_PARTICLE].destroy(&sEffectContext.shieldParticles[index].effect); + return; + } +} + +void Effect_DeleteAll(GlobalContext* globalCtx) { + s32 i; + + osSyncPrintf("エフェクト総て解放\n"); // "All effect release" + + for (i = 0; i < SPARK_COUNT; i++) { + sEffectContext.sparks[i].status.active = false; + sEffectInfoTable[EFFECT_SPARK].destroy(&sEffectContext.sparks[i].effect); + } + + for (i = 0; i < BLURE_COUNT; i++) { + sEffectContext.blures[i].status.active = false; + sEffectInfoTable[EFFECT_BLURE1].destroy(&sEffectContext.blures[i].effect); + } + + for (i = 0; i < SHIELD_PARTICLE_COUNT; i++) { + sEffectContext.shieldParticles[i].status.active = false; + sEffectInfoTable[EFFECT_SHIELD_PARTICLE].destroy(&sEffectContext.shieldParticles[i].effect); + } + + osSyncPrintf("エフェクト総て解放 終了\n"); // "All effects release End" +} diff --git a/src/code/z_effect_soft_sprite.c b/src/code/z_effect_soft_sprite.c index c5c9a7864c..bc9afa4763 100644 --- a/src/code/z_effect_soft_sprite.c +++ b/src/code/z_effect_soft_sprite.c @@ -1,139 +1,343 @@ #include #include +#include -extern ParticleOverlay sParticleOverlayTable[37]; +EffectSsInfo sEffectSsInfo = { 0 }; // "EffectSS2Info" -void Effect_SS_Delete(LoadedParticleEntry* particle); - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite/func_800272B0.s") - -void Effect_SS_Clear(GlobalContext* globalCtx) { +void EffectSs_InitInfo(GlobalContext* globalCtx, s32 tableSize) { u32 i; - LoadedParticleEntry* iter; - ParticleOverlay* iter2; + EffectSs* effectSs; + EffectSsOverlay* overlay; + + for (i = 0; i < ARRAY_COUNT(gEffectSsOverlayTable); i++) { + overlay = &gEffectSsOverlayTable[i]; + osSyncPrintf("effect index %3d:size=%6dbyte romsize=%6dbyte\n", i, + (u32)overlay->vramEnd - (u32)overlay->vramStart, overlay->vromEnd - overlay->vromStart); + } + + sEffectSsInfo.table = + GameState_AllocEnd(&globalCtx->state, tableSize * sizeof(EffectSs), "../z_effect_soft_sprite.c", 289); + if (sEffectSsInfo.table == NULL) { + __assert("EffectSS2Info.data_table != NULL", "../z_effect_soft_sprite.c", 290); + } + + sEffectSsInfo.searchStartIndex = 0; + sEffectSsInfo.tableSize = tableSize; + + for (effectSs = &sEffectSsInfo.table[0]; effectSs < &sEffectSsInfo.table[sEffectSsInfo.tableSize]; effectSs++) { + EffectSs_Reset(effectSs); + } + + overlay = &gEffectSsOverlayTable[0]; + for (i = 0; i < ARRAY_COUNT(gEffectSsOverlayTable); i++) { + overlay->loadedRamAddr = NULL; + overlay++; + } +} + +void EffectSs_ClearAll(GlobalContext* globalCtx) { + u32 i; + EffectSs* effectSs; + EffectSsOverlay* overlay; void* addr; - EffectSS2Info.data_table = NULL; - EffectSS2Info.searchIndex = 0; - EffectSS2Info.size = 0; + sEffectSsInfo.table = NULL; + sEffectSsInfo.searchStartIndex = 0; + sEffectSsInfo.tableSize = 0; - for (iter = EffectSS2Info.data_table; iter < EffectSS2Info.data_table + EffectSS2Info.size; iter++) { - Effect_SS_Delete(iter); + // This code doesn't actually work, since table was just set to NULL and tableSize to 0 + for (effectSs = &sEffectSsInfo.table[0]; effectSs < &sEffectSsInfo.table[sEffectSsInfo.tableSize]; effectSs++) { + EffectSs_Delete(effectSs); } - // Free memory from loaded particle overlays - iter2 = &sParticleOverlayTable[0]; - for (i = 0; i < ARRAY_COUNT(sParticleOverlayTable); i++) { - addr = iter2->loadedRamAddr; + overlay = &gEffectSsOverlayTable[0]; + for (i = 0; i < ARRAY_COUNT(gEffectSsOverlayTable); i++) { + addr = overlay->loadedRamAddr; if (addr != NULL) { - ZeldaArena_FreeDebug(addr, D_801357DC, 337); + ZeldaArena_FreeDebug(addr, "../z_effect_soft_sprite.c", 337); } - (iter2++)->loadedRamAddr = NULL; + overlay->loadedRamAddr = NULL; + overlay++; } } -void Effect_SS_Delete(LoadedParticleEntry* particle) { - if (particle->flags & 2) { - func_800F89E8(&particle->position); +void EffectSs_Delete(EffectSs* effectSs) { + if (effectSs->flags & 2) { + func_800F89E8(&effectSs->pos); } - if (particle->flags & 4) { - func_800F89E8(&particle->unk_2C); + if (effectSs->flags & 4) { + func_800F89E8(&effectSs->unk_2C); } - Effect_SS_ResetEntry(particle); + EffectSs_Reset(effectSs); } -void Effect_SS_ResetEntry(LoadedParticleEntry* particle) { +void EffectSs_Reset(EffectSs* effectSs) { u32 i; - particle->type = 0x25; - particle->acceleration.z = 0; - particle->acceleration.y = 0; - particle->acceleration.x = 0; - particle->velocity.z = 0; - particle->velocity.y = 0; - particle->velocity.x = 0; - particle->unk_34 = 0; - particle->unk_30 = 0; - particle->unk_2C = 0; - particle->position.z = 0; - particle->position.y = 0; - particle->position.x = 0; - particle->life = -1; - particle->flags = 0; - particle->priority = 128; - particle->draw = NULL; - particle->update = NULL; - particle->unk_38 = 0; - particle->unk_3C = 0; + 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->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->unk_38 = 0; + effectSs->unk_3C = 0; - for (i = 0; i != 13; i++) { - particle->unk_40[i] = 0; + for (i = 0; i < ARRAY_COUNT(effectSs->regs); i++) { + effectSs->regs[i] = 0; } } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite/func_800275D0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite/func_80027704.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite/func_80027798.s") - -void Effect_SS_UpdateParticle(GlobalContext* globalCtx, s32 index) { - LoadedParticleEntry* particle = &EffectSS2Info.data_table[index]; - - if (particle->update != NULL) { - particle->velocity.x += particle->acceleration.x; - particle->velocity.y += particle->acceleration.y; - particle->velocity.z += particle->acceleration.z; - - particle->position.x += particle->velocity.x; - particle->position.y += particle->velocity.y; - particle->position.z += particle->velocity.z; - - particle->update(globalCtx, index, particle); - } -} - -void Effect_SS_UpdateAllParticles(GlobalContext* globalCtx) { +s32 EffectSs_FindSlot(s32 priority, s32* pIndex) { + s32 foundFree; s32 i; - for (i = 0; i < EffectSS2Info.size; i++) { - if (EffectSS2Info.data_table[i].life > -1) { - EffectSS2Info.data_table[i].life--; + if (sEffectSsInfo.searchStartIndex >= sEffectSsInfo.tableSize) { + sEffectSsInfo.searchStartIndex = 0; + } - if (EffectSS2Info.data_table[i].life < 0) { - Effect_SS_Delete(&EffectSS2Info.data_table[i]); + // Search for a free slot + i = sEffectSsInfo.searchStartIndex; + foundFree = false; + while (true) { + if (sEffectSsInfo.table[i].life == -1) { + foundFree = true; + break; + } + + i++; + + if (i >= sEffectSsInfo.tableSize) { + i = 0; // Loop around the whole table + } + + // After a full loop, break out + if (i == sEffectSsInfo.searchStartIndex) { + break; + } + } + + if (foundFree == true) { + *pIndex = i; + return 0; + } + + // If all slots are in use, search for a slot with a lower priority + // Note that a lower priority is representend by a higher value + i = sEffectSsInfo.searchStartIndex; + while (true) { + // Equal priority should only be considered "lower" if flag 0 is set + if ((priority <= sEffectSsInfo.table[i].priority) && + !((priority == sEffectSsInfo.table[i].priority) && (sEffectSsInfo.table[i].flags & 1))) { + break; + } + + i++; + + if (i >= sEffectSsInfo.tableSize) { + i = 0; // Loop around the whole table + } + + // After a full loop, return 1 to indicate that we failed to find a suitable slot + if (i == sEffectSsInfo.searchStartIndex) { + return 1; + } + } + + *pIndex = i; + return 0; +} + +void EffectSs_Insert(GlobalContext* globalCtx, EffectSs* effectSs) { + s32 index; + + if (func_800C0D28(globalCtx) != 1) { + if (EffectSs_FindSlot(effectSs->priority, &index) == 0) { + sEffectSsInfo.searchStartIndex = index + 1; + sEffectSsInfo.table[index] = *effectSs; + } + } +} + +// original name: "EffectSoftSprite2_makeEffect" +void EffectSs_Spawn(GlobalContext* globalCtx, s32 type, s32 priority, void* initParams) { + s32 index; + u32 overlaySize; + EffectSsOverlay* overlayEntry; + EffectSsInit* initInfo; + + overlayEntry = &gEffectSsOverlayTable[type]; + + if (type >= EFFECT_SS_TYPE_MAX) { + __assert("type < EFFECT_SS2_TYPE_LAST_LABEL", "../z_effect_soft_sprite.c", 556); + } + + if (EffectSs_FindSlot(priority, &index) != 0) { + // Abort because we couldn't find a suitable slot to add this effect in + return; + } + + sEffectSsInfo.searchStartIndex = index + 1; + overlaySize = (u32)overlayEntry->vramEnd - (u32)overlayEntry->vramStart; + + if (overlayEntry->vramStart == NULL) { + // Translates to: "Not an overlay" + osSyncPrintf("EffectSoftSprite2_makeEffect():オーバーレイではありません。\n"); + initInfo = overlayEntry->initInfo; + } else { + if (overlayEntry->loadedRamAddr == NULL) { + overlayEntry->loadedRamAddr = ZeldaArena_MallocRDebug(overlaySize, "../z_effect_soft_sprite.c", 585); + + if (overlayEntry->loadedRamAddr == NULL) { + osSyncPrintf(VT_FGCOL(RED)); + // Translates to: "The memory of %d byte cannot be secured. Therefore, the program cannot be loaded. + // What a dangerous situation! Naturally, effects will not produced either." + osSyncPrintf("EffectSoftSprite2_makeEffect():zelda_malloc_r()により,%" + "dbyteのメモリ確保ができま\nせん。そのため、プログラムのロードも\n出来ません。ただいま危険" + "な状態です！\nもちろん,エフェクトも出ません。\n", + overlaySize); + osSyncPrintf(VT_RST); + return; + } + + Overlay_Load(overlayEntry->vromStart, overlayEntry->vromEnd, overlayEntry->vramStart, overlayEntry->vramEnd, + overlayEntry->loadedRamAddr); + + osSyncPrintf(VT_FGCOL(GREEN)); + osSyncPrintf("EFFECT SS OVL:SegRom %08x %08x, Seg %08x %08x, RamStart %08x, type: %d\n", + overlayEntry->vromStart, overlayEntry->vromEnd, overlayEntry->vramStart, overlayEntry->vramEnd, + overlayEntry->loadedRamAddr, type); + osSyncPrintf(VT_RST); + } + + initInfo = (void*)(u32)((overlayEntry->initInfo != NULL) + ? (void*)((u32)overlayEntry->initInfo - + (s32)((u32)overlayEntry->vramStart - (u32)overlayEntry->loadedRamAddr)) + : NULL); + } + + if (initInfo->init == NULL) { + // Translates to: "Effects have already been loaded, but the constructor is NULL so the addition will not occur. + // Please fix this. (Waste of memory) %08x %d" + osSyncPrintf("EffectSoftSprite2_makeEffect():すでにエフェクトはロード済みで\nすが," + "コンストラクターがNULLなので追加をやめます。\n直してください。（メモリーの無駄) %08x %d\n", + initInfo, type); + return; + } + + // Delete the previous effect in the slot, in case the slot wasn't free + EffectSs_Delete(&sEffectSsInfo.table[index]); + + sEffectSsInfo.table[index].type = type; + sEffectSsInfo.table[index].priority = priority; + + if (initInfo->init(globalCtx, index, &sEffectSsInfo.table[index], initParams) == 0) { + osSyncPrintf(VT_FGCOL(GREEN)); + // Translates to: "Construction failed for some reason. The constructor returned an error. + // Ceasing effect addition." + osSyncPrintf("EffectSoftSprite2_makeEffect():" + "何らかの理由でコンストラクト失敗。コンストラクターがエラーを返しました。エフェクトの追加を中" + "止します。\n"); + osSyncPrintf(VT_RST); + EffectSs_Reset(&sEffectSsInfo.table[index]); + } +} + +void EffectSs_Update(GlobalContext* globalCtx, s32 index) { + EffectSs* effectSs = &sEffectSsInfo.table[index]; + + if (effectSs->update != NULL) { + effectSs->velocity.x += effectSs->accel.x; + effectSs->velocity.y += effectSs->accel.y; + effectSs->velocity.z += effectSs->accel.z; + + effectSs->pos.x += effectSs->velocity.x; + effectSs->pos.y += effectSs->velocity.y; + effectSs->pos.z += effectSs->velocity.z; + + effectSs->update(globalCtx, index, effectSs); + } +} + +void EffectSs_UpdateAll(GlobalContext* globalCtx) { + s32 i; + + for (i = 0; i < sEffectSsInfo.tableSize; i++) { + if (sEffectSsInfo.table[i].life > -1) { + sEffectSsInfo.table[i].life--; + + if (sEffectSsInfo.table[i].life < 0) { + EffectSs_Delete(&sEffectSsInfo.table[i]); } } - if (EffectSS2Info.data_table[i].life > -1) { - Effect_SS_UpdateParticle(globalCtx, i); + if (sEffectSsInfo.table[i].life > -1) { + EffectSs_Update(globalCtx, i); } } } -void Effect_SS_DrawParticle(GlobalContext* globalCtx, s32 index) { - LoadedParticleEntry* particle = &EffectSS2Info.data_table[index]; +void EffectSs_Draw(GlobalContext* globalCtx, s32 index) { + EffectSs* effectSs = &sEffectSsInfo.table[index]; - if (particle->draw != NULL) { - particle->draw(globalCtx, index, particle); + if (effectSs->draw != NULL) { + effectSs->draw(globalCtx, index, effectSs); } } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite/func_80027BDC.s") +// original name: "EffectSoftSprite2_disp" +void EffectSs_DrawAll(GlobalContext* globalCtx) { + LightMapper* lightMapper; + s32 i; + + lightMapper = Lights_CreateMapper(&globalCtx->lightCtx, globalCtx->state.gfxCtx); + func_8007A474(lightMapper, globalCtx->lightCtx.lightsHead, 0); + func_80079EFC(lightMapper, globalCtx->state.gfxCtx); + + for (i = 0; i < sEffectSsInfo.tableSize; i++) { + if (sEffectSsInfo.table[i].life > -1) { + if ((sEffectSsInfo.table[i].pos.x > 32000.0f) || (sEffectSsInfo.table[i].pos.x < -32000.0f) || + (sEffectSsInfo.table[i].pos.y > 32000.0f) || (sEffectSsInfo.table[i].pos.y < -32000.0f) || + (sEffectSsInfo.table[i].pos.z > 32000.0f) || (sEffectSsInfo.table[i].pos.z < -32000.0f)) { + osSyncPrintf(VT_FGCOL(RED)); + // Translates to: "Since the position is outside the area, delete it. + // Effect label No. %d: Please respond by the program. + // Here is ==> pos (%f, %f, %f) and the label is in z_effect_soft_sprite_dlftbls.decl." + osSyncPrintf("EffectSoftSprite2_disp():位置が領域外のため " + "削除します。エフェクトラベルNo.%d:プログラムの方で対応をお願いします。ここです ==> " + "pos(%f, %f, %f)で、ラベルはz_effect_soft_sprite_dlftbls.declにあります。\n", + sEffectSsInfo.table[i].type, sEffectSsInfo.table[i].pos.x, sEffectSsInfo.table[i].pos.y, + sEffectSsInfo.table[i].pos.z); + osSyncPrintf(VT_FGCOL(GREEN)); + // Translates to: "If you are using pos for something else, consult me." + osSyncPrintf("もし、posを別のことに使っている場合相談に応じます。\n"); + osSyncPrintf(VT_RST); + + EffectSs_Delete(&sEffectSsInfo.table[i]); + } else { + EffectSs_Draw(globalCtx, i); + } + } + } +} s16 func_80027DD4(s16 arg0, s16 arg1, s32 arg2) { - s16 ret = !arg2 ? arg1 : (arg0 + (s32)((f32)(arg1 - arg0) / arg2)); + s16 ret = (arg2 == 0) ? arg1 : (arg0 + (s32)((arg1 - arg0) / (f32)arg2)); return ret; } -s16 func_80027E34(s16 a0, s16 a1, f32 a2) { - return (a1 - a0) * a2 + a0; +s16 func_80027E34(s16 arg0, s16 arg1, f32 arg2) { + return (arg1 - arg0) * arg2 + arg0; } -u8 func_80027E84(u8 a0, u8 a1, f32 a2) { - return a2 * ((f32)a1 - (f32)a0) + a0; +u8 func_80027E84(u8 arg0, u8 arg1, f32 arg2) { + return arg2 * ((f32)arg1 - (f32)arg0) + arg0; } diff --git a/src/code/z_effect_soft_sprite_dlftbls.c b/src/code/z_effect_soft_sprite_dlftbls.c new file mode 100644 index 0000000000..8ecba2e1b5 --- /dev/null +++ b/src/code/z_effect_soft_sprite_dlftbls.c @@ -0,0 +1,55 @@ +#include +#include +#include + +#define EFFECT_SS_OVERLAY(name) \ + { \ + (u32) _ovl_##name##SegmentRomStart, (u32)_ovl_##name##SegmentRomEnd, _ovl_##name##SegmentStart, \ + _ovl_##name##SegmentEnd, NULL, &name##_InitVars, 1, \ + } + +#define EFFECT_SS_OVERLAY_INTERNAL(name) \ + { 0, 0, NULL, NULL, NULL, &name##_InitVars, 1 } + +#define EFFECT_SS_OVERLAY_UNSET \ + { 0 } + +EffectSsOverlay gEffectSsOverlayTable[] = { + EFFECT_SS_OVERLAY(Effect_Ss_Dust), + EFFECT_SS_OVERLAY(Effect_Ss_KiraKira), + EFFECT_SS_OVERLAY(Effect_Ss_Bomb), + EFFECT_SS_OVERLAY(Effect_Ss_Bomb2), + EFFECT_SS_OVERLAY(Effect_Ss_Blast), + EFFECT_SS_OVERLAY(Effect_Ss_G_Spk), + EFFECT_SS_OVERLAY(Effect_Ss_D_Fire), + EFFECT_SS_OVERLAY(Effect_Ss_Bubble), + EFFECT_SS_OVERLAY_UNSET, + EFFECT_SS_OVERLAY(Effect_Ss_G_Ripple), + EFFECT_SS_OVERLAY(Effect_Ss_G_Splash), + EFFECT_SS_OVERLAY(Effect_Ss_G_Magma), + EFFECT_SS_OVERLAY(Effect_Ss_G_Fire), + EFFECT_SS_OVERLAY(Effect_Ss_Lightning), + EFFECT_SS_OVERLAY(Effect_Ss_Dt_Bubble), + EFFECT_SS_OVERLAY(Effect_Ss_Hahen), + EFFECT_SS_OVERLAY(Effect_Ss_Stick), + EFFECT_SS_OVERLAY(Effect_Ss_Sibuki), + EFFECT_SS_OVERLAY(Effect_Ss_Sibuki2), + EFFECT_SS_OVERLAY(Effect_Ss_G_Magma2), + EFFECT_SS_OVERLAY(Effect_Ss_Stone1), + EFFECT_SS_OVERLAY(Effect_Ss_HitMark), + EFFECT_SS_OVERLAY(Effect_Ss_Fhg_Flash), + EFFECT_SS_OVERLAY(Effect_Ss_K_Fire), + EFFECT_SS_OVERLAY(Effect_Ss_Solder_Srch_Ball), + EFFECT_SS_OVERLAY(Effect_Ss_Kakera), + EFFECT_SS_OVERLAY(Effect_Ss_Ice_Piece), + EFFECT_SS_OVERLAY(Effect_Ss_En_Ice), + EFFECT_SS_OVERLAY(Effect_Ss_Fire_Tail), + EFFECT_SS_OVERLAY(Effect_Ss_En_Fire), + EFFECT_SS_OVERLAY(Effect_Ss_Extra), + EFFECT_SS_OVERLAY(Effect_Ss_Fcircle), + EFFECT_SS_OVERLAY(Effect_Ss_Dead_Db), + EFFECT_SS_OVERLAY(Effect_Ss_Dead_Dd), + EFFECT_SS_OVERLAY(Effect_Ss_Dead_Ds), + EFFECT_SS_OVERLAY(Effect_Ss_Dead_Sound), + EFFECT_SS_OVERLAY(Effect_Ss_Ice_Smoke), +}; diff --git a/src/code/z_effect_soft_sprite_old_init.c b/src/code/z_effect_soft_sprite_old_init.c index 847e25e2fa..ee55590391 100644 --- a/src/code/z_effect_soft_sprite_old_init.c +++ b/src/code/z_effect_soft_sprite_old_init.c @@ -1,8 +1,11 @@ #include #include +// Draw utility for some G effects #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80027F80.s") +// EffectSsDust Spawn Functions + #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800281E8.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002829C.s") @@ -41,6 +44,8 @@ #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028A54.s") +// EffectSsKiraKira Spawn Functions + #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028B18.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028B74.s") @@ -49,12 +54,18 @@ #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028CEC.s") +// EffectSsBomb Spawn Functions + #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028DC4.s") +// EffectSsBomb2 Spawn Functions + #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028E1C.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028E84.s") +// EffectSsBlast Spawn Functions + #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028EF4.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028F84.s") @@ -63,6 +74,8 @@ #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029024.s") +// EffectSsGSpk Spawn Functions + #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029060.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800290F0.s") @@ -73,94 +86,154 @@ #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800292DC.s") +// EffectSsDFire Spawn Functions + #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029320.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800293A0.s") +// EffectSsBubble Spawn Functions + #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800293E4.s") +// EffectSsGRipple Spawn Functions + #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029444.s") +// EffectSsGSplash Spawn Functions + #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002949C.s") +// EffectSsGMagma Spawn Functions + #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029530.s") +// EffectSsGFire Spawn Functions + #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029568.s") +// EffectSsLightning Spawn Functions + #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800295A0.s") +// EffectSsDtBubble Spawn Functions + #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029618.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029694.s") +// EffectSsHahen Spawn Functions + #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029724.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800297A4.s") +// EffectSsStick Spawn Functions + #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800298EC.s") +// EffectSsSibuki Spawn Functions + #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002993C.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800299AC.s") +// EffectSsSibuki2 Spawn Functions + #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029B30.s") +// EffectSsGMagma2 Spawn Functions + #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029B90.s") +// EffectSsStone1 Spawn Functions + #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029C00.s") +// EffectSsHitMark Spawn Functions + #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029C50.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029CA4.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029CC8.s") +// EffectSsFhgFlash Spawn Functions + #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029CF0.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029D5C.s") +// EffectSsKFire Spawn Functions + #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029DBC.s") +// EffectSsSolderSrchBall Spawn Functions + #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029E24.s") -#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/Effect_SpawnFragment.s") +// EffectSsKakera Spawn Functions + +#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029E8C.s") + +// EffectSsIcePiece Spawn Functions #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029F44.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029FAC.s") +// EffectSsEnIce Spawn Functions + #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A140.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A1DC.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A2A4.s") +// EffectSsFireTail Spawn Functions + #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A32C.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A3C4.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A484.s") +// EffectSsEnFire Spawn Functions + #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A4D4.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A54C.s") +// EffectSsExtra Spawn Functions + #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A5F4.s") +// EffectSsFCircle Spawn Functions + #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A65C.s") +// EffectSsDeadBb Spawn Functions + #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A6B8.s") +// EffectSsDeadDd Spawn Functions + #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A770.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A824.s") +// EffectSsDeadDs Spawn Functions + #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A894.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A90C.s") +// EffectSsDeadSound Spawn Functions + #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A95C.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A9F4.s") +// EffectSsIceSmoke Spawn Functions + #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002AA44.s") diff --git a/src/code/z_lights.c b/src/code/z_lights.c index 46e61fa250..1bca397c57 100644 --- a/src/code/z_lights.c +++ b/src/code/z_lights.c @@ -151,7 +151,7 @@ void Lights_RemoveAll(GlobalContext* globalCtx, LightingContext* lightCtx) { } } -z_Light* Lights_Insert(GlobalContext* globalCtx, LightingContext* lightCtx, LightInfo* info) { +z_Light* Lights_Insert(GlobalContext* globalCtx, LightingContext* lightCtx, void* info) { z_Light* light; light = Lights_FindFreeSlot(); diff --git a/src/code/z_play.c b/src/code/z_play.c index 1ee3e00b42..c99b2cd305 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -157,8 +157,8 @@ void Gameplay_Destroy(GlobalContext* globalCtx) { R_PAUSE_MENU_MODE = 0; func_800C0F08(&globalCtx->preRenderCtx); - func_800271A8(globalCtx); - Effect_SS_Clear(globalCtx); + Effect_DeleteAll(globalCtx); + EffectSs_ClearAll(globalCtx); CollisionCheck_DestroyContext(globalCtx, &globalCtx->colChkCtx); if (gTrnsnUnkState == 3) { @@ -240,8 +240,8 @@ void Gameplay_Init(GlobalContext* globalCtx) { func_80110F68(globalCtx); func_80110450(globalCtx); func_8006BA00(globalCtx); - func_80026C2C(globalCtx); - func_800272B0(globalCtx, 0x55); + Effect_InitContext(globalCtx); + EffectSs_InitInfo(globalCtx, 0x55); func_8005D3BC(globalCtx, &globalCtx->colChkCtx); SkelAnime_AnimationCtxReset(&globalCtx->animationCtx); func_8006450C(globalCtx, &globalCtx->csCtx); @@ -891,13 +891,13 @@ void Gameplay_Update(GlobalContext* globalCtx) { LOG_NUM("1", 1, "../z_play.c", 3651); } - func_80026F70(globalCtx); + Effect_UpdateAll(globalCtx); if (1 && HREG(63)) { LOG_NUM("1", 1, "../z_play.c", 3657); } - Effect_SS_UpdateAllParticles(globalCtx); + EffectSs_UpdateAll(globalCtx); if (1 && HREG(63)) { LOG_NUM("1", 1, "../z_play.c", 3662); diff --git a/src/overlays/actors/ovl_En_Boom/z_en_boom.c b/src/overlays/actors/ovl_En_Boom/z_en_boom.c index bb46806d71..3eba0ba5d1 100644 --- a/src/overlays/actors/ovl_En_Boom/z_en_boom.c +++ b/src/overlays/actors/ovl_En_Boom/z_en_boom.c @@ -40,8 +40,8 @@ static InitChainEntry initChain[] = { ICHAIN_VEC3S(shape.rot, 0, ICHAIN_STOP), }; -static Vec3f mtxSrc1 = { -960.0f, 0.0f, 0.0f }; -static Vec3f mtxSrc2 = { 960.0f, 0.0f, 0.0f }; +static Vec3f mult1 = { -960.0f, 0.0f, 0.0f }; +static Vec3f mult2 = { 960.0f, 0.0f, 0.0f }; extern D_0400C808; @@ -51,37 +51,37 @@ void EnBoom_SetupAction(EnBoom* this, EnBoomActionFunc actionFunc) { void EnBoom_Init(Actor* thisx, GlobalContext* globalCtx) { EnBoom* this = THIS; - TrailEffect trail; + EffectBlureInit1 trail; this->actor.room = -1; Actor_ProcessInitChain(&this->actor, initChain); - trail.p1Start.r = 0xFF; - trail.p1Start.g = 0xFF; - trail.p1Start.b = 0x64; - trail.p1Start.a = 0xFF; + trail.p1StartColor.r = 0xFF; + trail.p1StartColor.g = 0xFF; + trail.p1StartColor.b = 0x64; + trail.p1StartColor.a = 0xFF; - trail.p2Start.r = 0xFF; - trail.p2Start.g = 0xFF; - trail.p2Start.b = 0x64; - trail.p2Start.a = 0x40; + trail.p2StartColor.r = 0xFF; + trail.p2StartColor.g = 0xFF; + trail.p2StartColor.b = 0x64; + trail.p2StartColor.a = 0x40; - trail.p1End.r = 0xFF; - trail.p1End.g = 0xFF; - trail.p1End.b = 0x64; - trail.p1End.a = 0x00; + trail.p1EndColor.r = 0xFF; + trail.p1EndColor.g = 0xFF; + trail.p1EndColor.b = 0x64; + trail.p1EndColor.a = 0x00; - trail.p2End.r = 0xFF; - trail.p2End.g = 0xFF; - trail.p2End.b = 0x64; - trail.p2End.a = 0x00; + trail.p2EndColor.r = 0xFF; + trail.p2EndColor.g = 0xFF; + trail.p2EndColor.b = 0x64; + trail.p2EndColor.a = 0x00; - trail.unk_194 = 0x00000008; - trail.unk_198 = 0x00000000; - trail.unk_19C = 0x00000000; + trail.elemDuration = 8; + trail.unkFlag = 0; + trail.calcMode = 0; - Effect_Add(globalCtx, &this->effect, 1, 0, 0, &trail); + Effect_Add(globalCtx, &this->effectIndex, EFFECT_BLURE1, 0, 0, &trail); Collider_InitQuad(globalCtx, &this->collider); Collider_SetQuad(globalCtx, &this->collider, this, &col); @@ -92,7 +92,7 @@ void EnBoom_Init(Actor* thisx, GlobalContext* globalCtx) { void EnBoom_Destroy(Actor* thisx, GlobalContext* globalCtx) { EnBoom* this = THIS; - func_8002709C(globalCtx, this->effect); + Effect_Delete(globalCtx, this->effectIndex); Collider_DestroyQuad(globalCtx, &this->collider); } @@ -241,8 +241,8 @@ void EnBoom_Update(Actor* thisx, GlobalContext* globalCtx) { void EnBoom_Draw(Actor* thisx, GlobalContext* globalCtx) { EnBoom* this = THIS; - Vec3f mtxDest1; - Vec3f mtxDest2; + Vec3f vec1; + Vec3f vec2; GraphicsContext* gfxCtx; Gfx* dispRefs[4]; @@ -251,11 +251,11 @@ void EnBoom_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_RotateY(this->actor.posRot.rot.y * 0.0000958738f, MTXMODE_APPLY); Matrix_RotateZ(0.7669904f, MTXMODE_APPLY); Matrix_RotateX(this->actor.posRot.rot.x * 0.0000958738f, MTXMODE_APPLY); - Matrix_MultVec3f(&mtxSrc1, &mtxDest1); - Matrix_MultVec3f(&mtxSrc2, &mtxDest2); + Matrix_MultVec3f(&mult1, &vec1); + Matrix_MultVec3f(&mult2, &vec2); - if (func_80090480(globalCtx, &this->collider, &this->unk_1DC, &mtxDest1, &mtxDest2) != 0) { - func_8001FDF0(func_80026B0C(this->effect), &mtxDest1, &mtxDest2); + if (func_80090480(globalCtx, &this->collider, &this->unk_1DC, &vec1, &vec2) != 0) { + EffectBlure_AddVertex(Effect_GetByIndex(this->effectIndex), &vec1, &vec2); } func_80093D18(globalCtx->state.gfxCtx); diff --git a/src/overlays/actors/ovl_En_Boom/z_en_boom.h b/src/overlays/actors/ovl_En_Boom/z_en_boom.h index 6057ff8267..c78a16d2a1 100644 --- a/src/overlays/actors/ovl_En_Boom/z_en_boom.h +++ b/src/overlays/actors/ovl_En_Boom/z_en_boom.h @@ -15,7 +15,7 @@ typedef struct EnBoom { /* 0x01D0 */ Actor* grabbed; // actor grabbed by the boomerang /* 0x01D4 */ u8 returnTimer; // returns to Link when 0 /* 0x01D5 */ u8 activeTimer; // increments once every update - /* 0x01D8 */ u32 effect; // set by Effect_Add + /* 0x01D8 */ u32 effectIndex; // set by Effect_Add /* 0x01DC */ u32 unk_1DC[0x7]; /* 0x01F8 */ EnBoomActionFunc actionFunc; } EnBoom; // size = 0x01FC 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 6ee2f371ac..0d05056111 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 @@ -110,8 +110,8 @@ void EnTuboTrap_SpawnFragments(EnTuboTrap* this, GlobalContext* globalCtx) { temp = 32; } - Effect_SpawnFragment(globalCtx, &spC8, &spBC, actorPos, -240, temp, 10, 10, 0, - (Math_Rand_ZeroOne() * 65.0f) + 15.0f, 0, 32, 60, -1, 3, addr); + func_80029E8C(globalCtx, &spC8, &spBC, actorPos, -240, temp, 10, 10, 0, (Math_Rand_ZeroOne() * 65.0f) + 15.0f, + 0, 32, 60, -1, 3, addr); } func_80033480(globalCtx, actorPos, 30.0f, 4, 20, 50, 0); @@ -164,8 +164,8 @@ void EnTuboTrap_SpawnWaterFragments(EnTuboTrap* this, GlobalContext* globalCtx) temp = 32; } - Effect_SpawnFragment(globalCtx, &spC8, &spBC, actorPos, -180, temp, 30, 30, 0, - (Math_Rand_ZeroOne() * 65.0f) + 15.0f, 0, 32, 70, -1, 3, addr); + func_80029E8C(globalCtx, &spC8, &spBC, actorPos, -180, temp, 30, 30, 0, (Math_Rand_ZeroOne() * 65.0f) + 15.0f, + 0, 32, 70, -1, 3, addr); } } #else 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 ebba09ec95..3dfc270c8c 100644 --- a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c +++ b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c @@ -103,8 +103,8 @@ void ObjBombiwa_Break(ObjBombiwa* this, GlobalContext* globalCtx) { temp_s3.z = (Math_Rand_ZeroOne() - 0.5f) * 15.0f; scale = effectScales[i]; u0 = (scale >= 11) ? 37 : 33; - Effect_SpawnFragment(globalCtx, &temp_s2, &temp_s3, &temp_s2, -400, u0, 10, 2, 0, scale, 1, 0, 80, -1, - OBJECT_BOMBIWA, dlist); + func_80029E8C(globalCtx, &temp_s2, &temp_s3, &temp_s2, -400, u0, 10, 2, 0, scale, 1, 0, 80, -1, 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 4cae01486a..4d1cdd234a 100644 --- a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c +++ b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c @@ -103,8 +103,8 @@ void ObjComb_Break(ObjComb* this, GlobalContext* globalCtx) { } else { u0 = 32; } - Effect_SpawnFragment(globalCtx, &posSum, &pos2, &posSum, gravityInfluence, u0, rotSpeed, 4, 0, scale, 0, 0, 80, - -1, 2, dlist); + func_80029E8C(globalCtx, &posSum, &pos2, &posSum, gravityInfluence, u0, rotSpeed, 4, 0, scale, 0, 0, 80, -1, 2, + dlist); } posSum.x = this->actor.posRot.pos.x; diff --git a/tools/overlayhelpers/batchdisasm/batchdisasm.py b/tools/overlayhelpers/batchdisasm/batchdisasm.py deleted file mode 100644 index 5f9a1b5f6b..0000000000 --- a/tools/overlayhelpers/batchdisasm/batchdisasm.py +++ /dev/null @@ -1,17 +0,0 @@ -import os - -overlayListFile = open("overlays.cfg") -overlayListLines = overlayListFile.readlines() - -for line in overlayListLines: - overlayName = line.split(' ')[0] - overlayVRAM = int(line.split(' ')[1], 16) - - #print(overlayName) - - overlaySize = os.path.getsize("../../../baserom/" + overlayName) - - execStr = "./mipsdisasm -o output/%s.s ../../../baserom/%s 0x%x:0x%x -v -p" % (overlayName, overlayName, overlayVRAM, overlayVRAM + overlaySize) - - print(execStr) - os.system(execStr) diff --git a/tools/overlayhelpers/batchdisasm/fixsymbols.py b/tools/overlayhelpers/batchdisasm/fixsymbols.py deleted file mode 100644 index 2f94dfc213..0000000000 --- a/tools/overlayhelpers/batchdisasm/fixsymbols.py +++ /dev/null @@ -1,133 +0,0 @@ -import os -import struct - -def Main(): - symbolFile = open("symbols.txt") - symbolList = symbolFile.readlines() - symbolFile.close() - - asmFiles = os.listdir("output") - - for fileName in asmFiles: - print("Processing " + fileName) - asmFile = open("output/" + fileName) - asmText = asmFile.read() - - for symbolLine in symbolList: - asmText = asmText.replace(symbolLine.split(' ')[0], symbolLine.split(' ')[1]) - - asmText = ".include \"macro.inc\"\n\n" + asmText - asmText = FixIncBin(fileName, asmText) - asmText = FixMove(asmText) - asmText = FixInvalidOpcodes(asmText) - - outputFile = open("output2/" + fileName, "w+") - outputFile.write(asmText) - outputFile.close() - - asmFile.close() - -def FixInvalidOpcodes(asmText): - asmLines = asmText.split('\n') - - i = 0 - while i < len(asmLines): - asmLine = asmLines[i] - - if (asmLine.find("Because of invalid n64 opcode") != -1): - nextLine = asmLines[i + 1] - - if (nextLine.find("/*") != -1): - asmLines.insert(i + 1, "/*" + nextLine.split("/*")[1]) - asmLines[i + 1] = nextLine.split("*/")[0] + "*/ .word 0x" + nextLine.split(" ")[3] - - i += 1 - - output = "" - - for i in range(len(asmLines)): - output += asmLines[i] + "\n" - - return output - -def FixMove(asmText): - asmLines = asmText.split('\n') - - i = 0 - while i < len(asmLines): - asmLine = asmLines[i] - - if (asmLine.find(" move $") != -1 and asmLine.split("/*")[1].split(" ")[3].endswith("21")): - registers = asmLine.split("move")[1] - - asmLines[i] = asmLine.split("*/")[0] + "*/ addu %s, $zero" % (registers) - - i += 1 - - output = "" - - for i in range(len(asmLines)): - output += asmLines[i] + "\n" - - return output - -def FixIncBin(fileName, asmText): - asmLines = asmText.split('\n') - - ovlFile = open("../../../baserom/" + fileName.split('.s')[0], "rb") - ovlData = bytearray(ovlFile.read()) - ovlFile.close() - - headerOffset = struct.unpack_from(">I", ovlData, offset = len(ovlData) - 4)[0] - headerAddress = len(ovlData) - headerOffset - dataSectionAddress = struct.unpack_from(">I", ovlData, offset = headerAddress + 4)[0] - #print(dataSectionAddress) - - fixLineIndex = -1 - fixLineAddress = 0 - fixLineFileAddress = 0 - - i = 0 - while i < len(asmLines): - asmLine = asmLines[i] - if ((asmLine.startswith("D_") and asmLine.endswith(":")) or (i == len(asmLines) - 1 and fixLineIndex != -1)): - if (fixLineIndex == -1): - if (asmLines[i + 1].startswith(".")): - i += 1 - - if (asmLines[i + 1].split(" ")[3].startswith("27BD") == False): - fixLineFileAddress = int(asmLines[i + 1].split(" ")[1], 16) - - if (fixLineFileAddress < dataSectionAddress): - i += 1 - continue - - fixLineAddress = int(asmLine.split("D_")[1].split(":")[0], 16) - fixLineIndex = i + 1 - else: - if (i == len(asmLines) - 1): - ovlSize = os.path.getsize("../../../baserom/" + fileName.split('.s')[0]) - dataSize = ovlSize - fixLineFileAddress - - asmLines[fixLineIndex] = ".incbin \"baserom/%s\", 0x%X, 0x%X" % (fileName.split('.s')[0], fixLineFileAddress, dataSize) - del asmLines[fixLineIndex + 1 : i] - else: - currentAddress = int(asmLine.split("D_")[1].split(":")[0], 16) - dataSize = currentAddress - fixLineAddress - del asmLines[fixLineIndex : i - 1] - asmLines[fixLineIndex] = ".incbin \"baserom/%s\", 0x%X, 0x%X" % (fileName.split('.s')[0], fixLineFileAddress, dataSize) - - i -= (i - fixLineIndex) - - fixLineIndex = -1 - - i += 1 - - output = "" - - for i in range(len(asmLines)): - output += asmLines[i] + "\n" - - return output - -Main() \ No newline at end of file diff --git a/tools/overlayhelpers/batchdisasm/genlist.py b/tools/overlayhelpers/batchdisasm/genlist.py deleted file mode 100644 index 5b1f41ed74..0000000000 --- a/tools/overlayhelpers/batchdisasm/genlist.py +++ /dev/null @@ -1,13 +0,0 @@ -outFile = open("output.cfg", "w+") -inFile = open("../../../docs/notes/out.csv") -lines = inFile.readlines() - - -for line in lines: - name = line.split(',')[1] - vramAddress = line.split(',')[2] - - if (name.startswith("ovl_")): - outFile.write(name + " " + vramAddress) - -outFile.close() \ No newline at end of file diff --git a/tools/overlayhelpers/batchdisasm/mipsdisasm b/tools/overlayhelpers/batchdisasm/mipsdisasm deleted file mode 100644 index 72befdbcee..0000000000 Binary files a/tools/overlayhelpers/batchdisasm/mipsdisasm and /dev/null differ diff --git a/tools/overlayhelpers/batchdisasm/overlays.cfg b/tools/overlayhelpers/batchdisasm/overlays.cfg deleted file mode 100644 index 609ed77f58..0000000000 --- a/tools/overlayhelpers/batchdisasm/overlays.cfg +++ /dev/null @@ -1,469 +0,0 @@ -ovl_title 80800000 -ovl_select 80800B90 -ovl_opening 80803BF0 -ovl_file_choose 80803D40 -ovl_kaleido_scope 80813820 -ovl_player_actor 80832210 -ovl_map_mark_data 80858B70 -ovl_En_Test 8085F650 -ovl_Arms_Hook 80864F00 -ovl_Arrow_Fire 80865D10 -ovl_Arrow_Ice 80867CD0 -ovl_Arrow_Light 80869CB0 -ovl_Bg_Bdan_Objects 8086BCA0 -ovl_Bg_Bdan_Switch 8086D010 -ovl_Bg_Bom_Guard 8086E550 -ovl_Bg_Bombwall 8086E7D0 -ovl_Bg_Bowl_Wall 8086F160 -ovl_Bg_Breakwall 8086FBE0 -ovl_Bg_Ddan_Jd 80870AB0 -ovl_Bg_Ddan_Kd 808710F0 -ovl_Bg_Dodoago 80871A00 -ovl_Bg_Dy_Yoseizo 80872830 -ovl_Bg_Ganon_Otyuka 80875920 -ovl_Bg_Gate_Shutter 80878160 -ovl_Bg_Gjyo_Bridge 808786C0 -ovl_Bg_Gnd_Darkmeiro 80878C30 -ovl_Bg_Gnd_Firemeiro 808794C0 -ovl_Bg_Gnd_Iceblock 80879AA0 -ovl_Bg_Gnd_Nisekabe 8087AC50 -ovl_Bg_Gnd_Soulmeiro 8087ADC0 -ovl_Bg_Haka 8087B6B0 -ovl_Bg_Haka_Gate 8087BDF0 -ovl_Bg_Haka_Huta 8087CFC0 -ovl_Bg_Haka_Megane 8087DA40 -ovl_Bg_Haka_MeganeBG 8087DE30 -ovl_Bg_Haka_Sgami 8087E4E0 -ovl_Bg_Haka_Ship 8087F100 -ovl_Bg_Haka_Trap 8087FCA0 -ovl_Bg_Haka_Tubo 80881250 -ovl_Bg_Haka_Water 80881D00 -ovl_Bg_Haka_Zou 808825C0 -ovl_Bg_Heavy_Block 80883790 -ovl_Bg_Hidan_Curtain 808851A0 -ovl_Bg_Hidan_Dalm 80885E20 -ovl_Bg_Hidan_Firewall 80886660 -ovl_Bg_Hidan_Fslift 80886E40 -ovl_Bg_Hidan_Fwbig 808872F0 -ovl_Bg_Hidan_Hamstep 80888040 -ovl_Bg_Hidan_Hrock 80889130 -ovl_Bg_Hidan_Kousi 80889960 -ovl_Bg_Hidan_Kowarerukabe 8088A020 -ovl_Bg_Hidan_Rock 8088B080 -ovl_Bg_Hidan_Rsekizou 8088C200 -ovl_Bg_Hidan_Sekizou 8088CEC0 -ovl_Bg_Hidan_Sima 8088E3D0 -ovl_Bg_Hidan_Syoku 8088F3C0 -ovl_Bg_Ice_Objects 8088F810 -ovl_Bg_Ice_Shelter 80890740 -ovl_Bg_Ice_Shutter 80891AC0 -ovl_Bg_Ice_Turara 80891F20 -ovl_Bg_Ingate 80892740 -ovl_Bg_Jya_1flift 80892B60 -ovl_Bg_Jya_Amishutter 808932C0 -ovl_Bg_Jya_Bigmirror 808936E0 -ovl_Bg_Jya_Block 808941A0 -ovl_Bg_Jya_Bombchuiwa 808944A0 -ovl_Bg_Jya_Bombiwa 808951A0 -ovl_Bg_Jya_Cobra 808958F0 -ovl_Bg_Jya_Goroiwa 80897970 -ovl_Bg_Jya_Haheniron 808980C0 -ovl_Bg_Jya_Ironobj 808988A0 -ovl_Bg_Jya_Kanaami 80899740 -ovl_Bg_Jya_Lift 80899BA0 -ovl_Bg_Jya_Megami 8089A130 -ovl_Bg_Jya_Zurerukabe 8089B440 -ovl_Bg_Menkuri_Eye 8089BC70 -ovl_Bg_Menkuri_Kaiten 8089C1B0 -ovl_Bg_Menkuri_Nisekabe 8089C330 -ovl_Bg_Mizu_Bwall 8089C480 -ovl_Bg_Mizu_Movebg 8089DC30 -ovl_Bg_Mizu_Shutter 8089EE50 -ovl_Bg_Mizu_Uzu 8089F6E0 -ovl_Bg_Mizu_Water 8089F8B0 -ovl_Bg_Mjin 808A0780 -ovl_Bg_Mori_Bigst 808A0BC0 -ovl_Bg_Mori_Elevator 808A1800 -ovl_Bg_Mori_Hashigo 808A2560 -ovl_Bg_Mori_Hashira4 808A3060 -ovl_Bg_Mori_Hineri 808A37D0 -ovl_Bg_Mori_Idomizu 808A4640 -ovl_Bg_Mori_Kaitenkabe 808A4DC0 -ovl_Bg_Mori_Rakkatenjo 808A5570 -ovl_Bg_Po_Event 808A6210 -ovl_Bg_Po_Syokudai 808A80B0 -ovl_Bg_Pushbox 808A8AE0 -ovl_Bg_Relay_Objects 808A8E50 -ovl_Bg_Spot00_Break 808A95E0 -ovl_Bg_Spot00_Hanebasi 808A9780 -ovl_Bg_Spot01_Fusya 808AA9C0 -ovl_Bg_Spot01_Idohashira 808AACE0 -ovl_Bg_Spot01_Idomizu 808ABAE0 -ovl_Bg_Spot01_Idosoko 808ABE80 -ovl_Bg_Spot01_Objects2 808AC140 -ovl_Bg_Spot02_Objects 808AC660 -ovl_Bg_Spot03_Taki 808ADAE0 -ovl_Bg_Spot05_Soko 808AE470 -ovl_Bg_Spot06_Objects 808AE780 -ovl_Bg_Spot07_Taki 808AFC30 -ovl_Bg_Spot08_Bakudankabe 808B02D0 -ovl_Bg_Spot08_Iceblock 808B0960 -ovl_Bg_Spot09_Obj 808B1AE0 -ovl_Bg_Spot11_Bakudankabe 808B2180 -ovl_Bg_Spot11_Oasis 808B27F0 -ovl_Bg_Spot12_Gate 808B2F90 -ovl_Bg_Spot12_Saku 808B3420 -ovl_Bg_Spot15_Rrbox 808B3960 -ovl_Bg_Spot15_Saku 808B4850 -ovl_Bg_Spot16_Bombstone 808B4C30 -ovl_Bg_Spot16_Doughnut 808B6440 -ovl_Bg_Spot17_Bakudankabe 808B6BC0 -ovl_Bg_Spot17_Funen 808B7400 -ovl_Bg_Spot18_Basket 808B7710 -ovl_Bg_Spot18_Futa 808B8780 -ovl_Bg_Spot18_Obj 808B8910 -ovl_Bg_Spot18_Shutter 808B93D0 -ovl_Bg_Sst_Floor 808B9910 -ovl_Bg_Toki_Hikari 808B9F00 -ovl_Bg_Toki_Swd 808BAE40 -ovl_Bg_Treemouth 808BC500 -ovl_Bg_Umajump 808BDBE0 -ovl_Bg_Vb_Sima 808BDD60 -ovl_Bg_Ydan_Hasi 808BE500 -ovl_Bg_Ydan_Maruta 808BED40 -ovl_Bg_Ydan_Sp 808BF410 -ovl_Bg_Zg 808C0C20 -ovl_Boss_Dodongo 808C1190 -ovl_Boss_Fd 808CADC0 -ovl_Boss_Fd2 808D2670 -ovl_Boss_Ganon 808D6870 -ovl_Boss_Ganon2 808FCF40 -ovl_Boss_Ganondrof 80910640 -ovl_Boss_Goma 80915A10 -ovl_Boss_Mo 8091BB00 -ovl_Boss_Sst 8092C5D0 -ovl_Boss_Tw 80938CD0 -ovl_Boss_Va 8094F2C0 -ovl_Demo_6K 80966950 -ovl_Demo_Du 80969AD0 -ovl_Demo_Ec 8096D4B0 -ovl_Demo_Effect 80970F50 -ovl_Demo_Ext 80977390 -ovl_Demo_Geff 80977E40 -ovl_Demo_Gj 80978930 -ovl_Demo_Go 8097C870 -ovl_Demo_Gt 8097D670 -ovl_Demo_Ik 80983300 -ovl_Demo_Im 80984BE0 -ovl_Demo_Kankyo 80988E80 -ovl_Demo_Kekkai 8098CFD0 -ovl_Demo_Sa 8098E460 -ovl_Demo_Shd 80991230 -ovl_Demo_Tre_Lgt 809936C0 -ovl_Door_Ana 80993EF0 -ovl_Door_Gerudo 809945E0 -ovl_Door_Killer 80994C50 -ovl_Door_Shutter 809962A0 -ovl_Door_Toki 80998620 -ovl_Door_Warp1 80998780 -ovl_Efc_Erupc 8099CCB0 -ovl_Eff_Dust 8099D8D0 -ovl_Effect_Ss_Blast 8099EDB0 -ovl_Effect_Ss_Bomb 8099F1B0 -ovl_Effect_Ss_Bomb2 8099F650 -ovl_Effect_Ss_Bubble 809A0040 -ovl_Effect_Ss_D_Fire 809A0550 -ovl_Effect_Ss_Dead_Db 809A0AA0 -ovl_Effect_Ss_Dead_Dd 809A0FE0 -ovl_Effect_Ss_Dead_Ds 809A1610 -ovl_Effect_Ss_Dead_Sound 809A1B30 -ovl_Effect_Ss_Dt_Bubble 809A1CB0 -ovl_Effect_Ss_Dust 809A22D0 -ovl_Effect_Ss_En_Fire 809A2B60 -ovl_Effect_Ss_En_Ice 809A3330 -ovl_Effect_Ss_Extra 809A3CC0 -ovl_Effect_Ss_Fcircle 809A4120 -ovl_Effect_Ss_Fhg_Flash 809A4660 -ovl_Effect_Ss_Fire_Tail 809A5740 -ovl_Effect_Ss_G_Fire 809A5ED0 -ovl_Effect_Ss_G_Magma 809A6150 -ovl_Effect_Ss_G_Magma2 809A63A0 -ovl_Effect_Ss_G_Ripple 809A6960 -ovl_Effect_Ss_G_Spk 809A6F30 -ovl_Effect_Ss_G_Splash 809A7540 -ovl_Effect_Ss_Hahen 809A79F0 -ovl_Effect_Ss_HitMark 809A8150 -ovl_Effect_Ss_Ice_Piece 809A8700 -ovl_Effect_Ss_Ice_Smoke 809A8BF0 -ovl_Effect_Ss_K_Fire 809A91B0 -ovl_Effect_Ss_Kakera 809A9680 -ovl_Effect_Ss_KiraKira 809AA810 -ovl_Effect_Ss_Lightning 809AAEF0 -ovl_Effect_Ss_Sibuki 809AB630 -ovl_Effect_Ss_Sibuki2 809ABD60 -ovl_Effect_Ss_Solder_Srch_Ball 809AC130 -ovl_Effect_Ss_Stick 809AC2D0 -ovl_Effect_Ss_Stone1 809AC700 -ovl_Elf_Msg 809ACB20 -ovl_Elf_Msg2 809AD700 -ovl_En_Am 809ADF20 -ovl_En_Ani 809B0370 -ovl_En_Anubice 809B1120 -ovl_En_Anubice_Fire 809B25A0 -ovl_En_Anubice_Tag 809B3400 -ovl_En_Arow_Trap 809B37D0 -ovl_En_Arrow 809B3920 -ovl_En_Attack_Niw 809B5100 -ovl_En_Ba 809B6350 -ovl_En_Bb 809B82E0 -ovl_En_Bdfire 809BC030 -ovl_En_Bigokuta 809BCC60 -ovl_En_Bili 809BF8A0 -ovl_En_Bird 809C1BB0 -ovl_En_Blkobj 809C2060 -ovl_En_Bom 809C26D0 -ovl_En_Bom_Bowl_Man 809C3630 -ovl_En_Bom_Bowl_Pit 809C4E40 -ovl_En_Bom_Chu 809C5830 -ovl_En_Bombf 809C6F60 -ovl_En_Boom 809C8480 -ovl_En_Box 809C8DC0 -ovl_En_Brob 809CAB10 -ovl_En_Bubble 809CBC00 -ovl_En_Butte 809CD070 -ovl_En_Bw 809CE6E0 -ovl_En_Bx 809D1AE0 -ovl_En_Changer 809D2690 -ovl_En_Clear_Tag 809D35B0 -ovl_En_Cow 809DEE00 -ovl_En_Crow 809E0240 -ovl_En_Cs 809E18B0 -ovl_En_Daiku 809E2B30 -ovl_En_Daiku_Kakariko 809E4320 -ovl_En_Dekubaba 809E57D0 -ovl_En_Dekunuts 809E9560 -ovl_En_Dh 809EAD40 -ovl_En_Dha 809EC880 -ovl_En_Diving_Game 809ED870 -ovl_En_Dns 809EF350 -ovl_En_Dnt_Demo 809F08E0 -ovl_En_Dnt_Jiji 809F1AE0 -ovl_En_Dnt_Nomal 809F32C0 -ovl_En_Dodojr 809F63C0 -ovl_En_Dodongo 809F8250 -ovl_En_Dog 809FAFD0 -ovl_En_Door 809FC1D0 -ovl_En_Ds 809FD030 -ovl_En_Du 809FDC30 -ovl_En_Dy_Extra 809FF6F0 -ovl_En_Eg 809FFD90 -ovl_En_Eiyer 809FFFA0 -ovl_En_Elf 80A01C30 -ovl_En_Encount1 80A06720 -ovl_En_Encount2 80A07990 -ovl_En_Ex_Item 80A08EA0 -ovl_En_Ex_Ruppy 80A0A410 -ovl_En_Fd 80A0B6C0 -ovl_En_Fd_Fire 80A0E4B0 -ovl_En_Fhg_Fire 80A0F260 -ovl_En_Fire_Rock 80A11C20 -ovl_En_Firefly 80A13070 -ovl_En_Fish 80A15280 -ovl_En_Floormas 80A17510 -ovl_En_Fr 80A1A9A0 -ovl_En_Fu 80A1D810 -ovl_En_Fw 80A1E5A0 -ovl_En_Fz 80A1FDC0 -ovl_En_G_Switch 80A21EC0 -ovl_En_Ganon_Mant 80A23D60 -ovl_En_Ganon_Organ 80A28000 -ovl_En_Gb 80A2F180 -ovl_En_Ge1 80A30970 -ovl_En_Ge2 80A32BD0 -ovl_En_Ge3 80A34620 -ovl_En_GeldB 80A35310 -ovl_En_GirlA 80A3A750 -ovl_En_Gm 80A3D6E0 -ovl_En_Go 80A3E570 -ovl_En_Go2 80A42D30 -ovl_En_Goma 80A48EC0 -ovl_En_Goroiwa 80A4BCA0 -ovl_En_Gs 80A4E320 -ovl_En_Guest 80A50220 -ovl_En_Hata 80A50D50 -ovl_En_Heishi1 80A512D0 -ovl_En_Heishi2 80A52EA0 -ovl_En_Heishi3 80A55640 -ovl_En_Heishi4 80A560D0 -ovl_En_Hintnuts 80A57200 -ovl_En_Holl 80A58C10 -ovl_En_Honotrap 80A59C30 -ovl_En_Horse 80A5B2F0 -ovl_En_Horse_Game_Check 80A67550 -ovl_En_Horse_Ganon 80A68660 -ovl_En_Horse_Link_Child 80A693D0 -ovl_En_Horse_Normal 80A6B250 -ovl_En_Horse_Zelda 80A6D8D0 -ovl_En_Hs 80A6E3A0 -ovl_En_Hs2 80A6EFA0 -ovl_En_Hy 80A6F5B0 -ovl_En_Ice_Hono 80A72FF0 -ovl_En_Ik 80A74310 -ovl_En_In 80A78FB0 -ovl_En_Insect 80A7BE20 -ovl_En_Ishi 80A7E460 -ovl_En_It 80A87680 -ovl_En_Jj 80A87800 -ovl_En_Js 80A88E10 -ovl_En_Jsjutan 80A897A0 -ovl_En_Kakasi 80A8F170 -ovl_En_Kakasi2 80A90010 -ovl_En_Kakasi3 80A90D20 -ovl_En_Kanban 80A91FA0 -ovl_En_Karebaba 80A95350 -ovl_En_Ko 80A96DB0 -ovl_En_Kusa 80A9AFA0 -ovl_En_Kz 80A9C550 -ovl_En_Light 80A9DB40 -ovl_En_Lightbox 80A9E9D0 -ovl_En_M_Fire1 80A9EE40 -ovl_En_M_Thunder 80A9EFE0 -ovl_En_Ma1 80AA0690 -ovl_En_Ma2 80AA19A0 -ovl_En_Ma3 80AA2AA0 -ovl_En_Mag 80AA3B00 -ovl_En_Mb 80AA6050 -ovl_En_Md 80AAA250 -ovl_En_Mk 80AAC900 -ovl_En_Mm 80AAD770 -ovl_En_Mm2 80AAEE50 -ovl_En_Ms 80AAFD20 -ovl_En_Mu 80AB0420 -ovl_En_Nb 80AB0D90 -ovl_En_Niw 80AB5780 -ovl_En_Niw_Girl 80AB8F80 -ovl_En_Niw_Lady 80AB9C40 -ovl_En_Nutsball 80ABBA50 -ovl_En_Nwc 80ABC0E0 -ovl_En_Ny 80ABCBB0 -ovl_En_OE2 80ABE6A0 -ovl_En_Okarina_Effect 80ABE760 -ovl_En_Okarina_Tag 80ABED20 -ovl_En_Okuta 80AC0660 -ovl_En_Ossan 80AC2CA0 -ovl_En_Owl 80AC9F20 -ovl_En_Part 80ACDDD0 -ovl_En_Peehat 80ACF4A0 -ovl_En_Po_Desert 80AD2CB0 -ovl_En_Po_Field 80AD3B00 -ovl_En_Po_Relay 80AD7740 -ovl_En_Po_Sisters 80AD8F90 -ovl_En_Poh 80ADDD50 -ovl_En_Pu_box 80AE20C0 -ovl_En_Rd 80AE2400 -ovl_En_Reeba 80AE4CD0 -ovl_En_River_Sound 80AE6930 -ovl_En_Rl 80AE72B0 -ovl_En_Rr 80AE8440 -ovl_En_Ru1 80AEAC10 -ovl_En_Ru2 80AF2550 -ovl_En_Sa 80AF5560 -ovl_En_Sb 80AF77F0 -ovl_En_Scene_Change 80AF8C70 -ovl_En_Sda 80AF8E20 -ovl_En_Shopnuts 80AFA720 -ovl_En_Si 80AFB690 -ovl_En_Siofuki 80AFBB80 -ovl_En_Skb 80AFC9A0 -ovl_En_Skj 80AFE2B0 -ovl_En_Skjneedle 80B01EB0 -ovl_En_Ssh 80B02270 -ovl_En_St 80B04890 -ovl_En_Sth 80B07540 -ovl_En_Stream 80B0B7A0 -ovl_En_Sw 80B0BDB0 -ovl_En_Syateki_Itm 80B0F6B0 -ovl_En_Syateki_Man 80B10870 -ovl_En_Syateki_Niw 80B118F0 -ovl_En_Ta 80B13AA0 -ovl_En_Takara_Man 80B17560 -ovl_En_Tana 80B17F30 -ovl_En_Tg 80B18360 -ovl_En_Tite 80B18A80 -ovl_En_Tk 80B1B900 -ovl_En_Torch 80B1D890 -ovl_En_Torch2 80B1D980 -ovl_En_Toryo 80B20170 -ovl_En_Tp 80B20DE0 -ovl_En_Tr 80B22CF0 -ovl_En_Trap 80B24660 -ovl_En_Tubo_Trap 80B258F0 -ovl_En_Vali 80B266B0 -ovl_En_Vase 80B28EB0 -ovl_En_Vb_Ball 80B28FA0 -ovl_En_Viewer 80B2A200 -ovl_En_Vm 80B2D460 -ovl_En_Wall_Tubo 80B2EDF0 -ovl_En_Wallmas 80B2F520 -ovl_En_Weather_Tag 80B31020 -ovl_En_Weiyer 80B32290 -ovl_En_Wf 80B33CB0 -ovl_En_Wonder_Item 80B38060 -ovl_En_Wonder_Talk 80B390F0 -ovl_En_Wonder_Talk2 80B39ED0 -ovl_En_Wood02 80B3AF70 -ovl_En_Xc 80B3C1E0 -ovl_En_Yabusame_Mark 80B42DC0 -ovl_En_Yukabyun 80B439C0 -ovl_En_Zf 80B44050 -ovl_En_Zl1 80B4AB40 -ovl_En_Zl2 80B4E990 -ovl_En_Zl3 80B533B0 -ovl_En_Zl4 80B5B7B0 -ovl_En_Zo 80B60220 -ovl_En_fHG 80B629C0 -ovl_End_Title 80B65720 -ovl_Fishing 80B699A0 -ovl_Item_B_Heart 80B85150 -ovl_Item_Etcetera 80B855F0 -ovl_Item_Inbox 80B85FE0 -ovl_Item_Ocarina 80B86130 -ovl_Item_Shield 80B86920 -ovl_Magic_Dark 80B873D0 -ovl_Magic_Fire 80B88D70 -ovl_Magic_Wind 80B8B100 -ovl_Mir_Ray 80B8D050 -ovl_Obj_Bean 80B8EA80 -ovl_Obj_Blockstop 80B91460 -ovl_Obj_Bombiwa 80B915F0 -ovl_Obj_Comb 80B91B60 -ovl_Obj_Dekujr 80B92420 -ovl_Obj_Elevator 80B92B00 -ovl_Obj_Hamishi 80B92F90 -ovl_Obj_Hana 80B93860 -ovl_Obj_Hsblock 80B93B60 -ovl_Obj_Ice_Poly 80B94260 -ovl_Obj_Kibako 80B94CA0 -ovl_Obj_Kibako2 80B959D0 -ovl_Obj_Lift 80B960D0 -ovl_Obj_Lightswitch 80B96BA0 -ovl_Obj_Makekinsuta 80B98270 -ovl_Obj_Makeoshihiki 80B98510 -ovl_Obj_Mure 80B98AA0 -ovl_Obj_Mure2 80B99F40 -ovl_Obj_Mure3 80B9A9D0 -ovl_Obj_Oshihiki 80B9B180 -ovl_Obj_Roomtimer 80B9CFD0 -ovl_Obj_Switch 80B9D210 -ovl_Obj_Syokudai 80B9F2B0 -ovl_Obj_Timeblock 80B9FFA0 -ovl_Obj_Tsubo 80BA0D60 -ovl_Obj_Warp2block 80BA1DF0 -ovl_Object_Kankyo 80BA2AA0 -ovl_Oceff_Spot 80BA6070 -ovl_Oceff_Storm 80BA70E0 -ovl_Oceff_Wipe 80BA8D90 -ovl_Oceff_Wipe2 80BA9BB0 -ovl_Oceff_Wipe3 80BAB3F0 -ovl_Oceff_Wipe4 80BACC10 -ovl_Shot_Sun 80BADCC0 \ No newline at end of file diff --git a/tools/overlayhelpers/batchdisasm/overlays_old.cfg b/tools/overlayhelpers/batchdisasm/overlays_old.cfg deleted file mode 100644 index 560ac9a78d..0000000000 --- a/tools/overlayhelpers/batchdisasm/overlays_old.cfg +++ /dev/null @@ -1 +0,0 @@ -ovl_Bg_Ingate 80892740 \ No newline at end of file diff --git a/tools/overlayhelpers/batchdisasm/symbols.txt b/tools/overlayhelpers/batchdisasm/symbols.txt deleted file mode 100644 index 517aea5d76..0000000000 --- a/tools/overlayhelpers/batchdisasm/symbols.txt +++ /dev/null @@ -1,204 +0,0 @@ -func_80001AA0 DmaMgr_SendRequest1 -func_80001FF0 __assert -func_80002130 osSyncPrintf -func_80002E10 LogUtils_LogThreadId -func_80004450 bzero -func_800061D0 osCreateMesgQueue -func_8001F548 Item_DropCollectible -func_8001F77C Item_DropCollectible2 -func_8001F940 Item_DropCollectibleRandom -func_80026CD4 Effect_Add -func_800274E0 Effect_SS_Delete -func_80029E8C Effect_SpawnFragment -func_8002B1E0 ActorShape_Init -func_8002B5EC ActorShadow_DrawFunc_Circle -func_8002B614 ActorShadow_DrawFunc_WhiteCircle -func_8002B644 ActorShadow_DrawFunc_Squiggly -func_8002B8C4 ActorShadow_DrawFunc_Teardrop -func_8002CB40 Flags_GetSwitch -func_8002CB74 Flags_SetSwitch -func_8002CBB4 Flags_UnsetSwitch -func_8002CBF8 Flags_GetUnknown -func_8002CC2C Flags_SetUnknown -func_8002CC6C Flags_UnsetUnknown -func_8002CCB0 Flags_GetTreasure -func_8002CCC4 Flags_SetTreasure -func_8002CCDC Flags_GetClear -func_8002CCF0 Flags_SetClear -func_8002CD08 Flags_UnsetClear -func_8002CD24 Flags_GetTempClear -func_8002CD38 Flags_SetTempClear -func_8002CD50 Flags_UnsetTempClear -func_8002CD6C Flags_GetCollectible -func_8002CDA0 Flags_SetCollectible -func_8002CE00 TitleCard_InitBossName -func_8002CE40 TitleCard_InitPlaceName -func_8002D570 Actor_Kill -func_8002D5B8 Actor_SetHeight -func_8002D62C Actor_SetScale -func_8002D644 Actor_SetObjectDependency -func_8002D8E0 Actor_MoveForward -func_8002DC74 Actor_HeightDiff -func_8002F828 Audio_PlayActorSound2 -func_80031F50 Actor_Spawn -func_80032458 Actor_SpawnAttached -func_80032C3C Actor_Find -func_80033748 Actor_ChangeType -func_80033940 Actor_SetTextWithPrefix -func_80033EF8 Math_Rand_ZeroFloat -func_80033F20 Math_Rand_CenteredFloat -func_80035260 Gfx_DrawDListOpa -func_80035324 Gfx_DrawDListXlu -func_800353F4 Actor_FindNearby -func_80035628 Actor_ApplyDamage -func_80035B4C Flags_GetEventChkInf -func_80035B74 Flags_SetEventChkInf -func_8003EA74 DynaPolyInfo_RegisterActor -func_8003EB84 DynaPolyInfo_GetActor -func_8003ED58 DynaPolyInfo_Free -func_80041880 DynaPolyInfo_Alloc -func_80043480 DynaPolyInfo_SetActorMove -func_8005AFD4 Camera_SetCameraData -func_8005B200 CollisionBtlTbl_Get -func_8005C364 ActorCollider_AllocCylinder -func_8005C3AC ActorCollider_FreeCylinder -func_8005C4AC ActorCollider_InitCylinder -func_8005D79C Actor_CollisionCheck_SetAT -func_8005D9F4 Actor_CollisionCheck_SetAC -func_8005DC4C Actor_CollisionCheck_SetOT -func_800626DC ActorCollider_Cylinder_Update -func_80063E9C DebugDisplay_AddObject -func_800693D8 Cutscene_SetSegment -func_80069420 MemCopy -func_8006BAD8 Audio_PlaySoundAtPosition -func_800777E0 Lib_MemSet -func_80077834 Math_Coss -func_80077870 Math_Sins -func_800778AC Math_ApproxUpdateScaledS -func_8007797C Math_ApproxS -func_80077A00 Math_ApproxF -func_80077D90 Math_Rand_S16Offset -func_80077DDC Math_Rand_S16OffsetStride -func_80077E40 Math_Vec3f_Copy -func_80077E5C Math_Vec3s_ToVec3f -func_80077E9C Math_Vec3f_Sum -func_80077ED0 Math_Vec3f_Diff -func_80077F04 Math_Vec3s_DiffToVec3f -func_80077F5C Math_Vec3f_Scale -func_80077F90 Math_Vec3f_DistXYZ -func_80077FD0 Math_Vec3f_DistXYZAndStoreDiff -func_80078028 Math_Vec3f_DistXZ -func_80078068 Math_Vec3f_Yaw -func_8007809C Math_Vec3f_Pitch -func_800780DC Actor_ProcessInitChain -func_80078310 Math_SmoothScaleMaxMinF -func_8007841C Math_SmoothScaleMaxF -func_8007848C Math_SmoothDownscaleMaxF -func_8007869C Math_SmoothScaleMaxMinS -func_800787BC Math_SmoothScaleMaxS -func_80078860 Color_RGBA8_Copy -func_80079CB4 Health_IsCritical -func_80079D8C Lights_InitType0PositionalLight -func_80079DF0 Lights_InitType2PositionalLight -func_80079E58 Lights_SetPositionalLightColorAndRadius -func_8007A6C4 Lights_CreateMapper -func_8007A6FC Lights_ClearHead -func_8007A708 Lights_RemoveAll -func_8007A764 Lights_Insert -func_8007A7C4 Lights_Remove -func_8009812C Object_GetIndex -func_80098188 Object_IsLoaded -func_800A15C8 SkelAnime_Draw -func_800A2000 SkelAnime_GetFrameCount -func_800A457C SkelAnime_Init -func_800A49FC SkelAnime_FrameUpdateMatrix -func_800A51A0 SkelAnime_ChangeAnim -func_800C5484 GameState_AllocEnd -func_800C69CC Graph_Alloc -func_800D0664 atan2s -func_800D07D4 atan2f -func_800D3F20 Fault_SleepImpl -func_800D3F90 Fault_ClientProcessThread -func_800D4004 Fault_ProcessClientContext -func_800D4188 Fault_ProcessClient -func_800D41DC Fault_AddClient -func_800D42C0 Fault_RemoveClient -func_800D43B8 Fault_AddAddrConvClient -func_800D4490 Fault_RemoveAddrConvClient -func_800D4588 Fault_ConvertAddress -func_800D463C Fault_Sleep -func_800D4678 Fault_PadCallback -func_800D46B4 Fault_UpdatePadImpl -func_800D4700 Fault_WaitForInputImpl -func_800D484C Fault_WaitForInput -func_800D4898 Fault_DrawRec -func_800D48F8 Fault_FillScreenBlack -func_800D494C Fault_FillScreenRed -func_800D49A0 Fault_DrawCornerRec -func_800D49F4 Fault_PrintFReg -func_800D4AA0 Fault_LogFReg -func_800D4B50 Fault_PrintFPCR -func_800D4BF4 Fault_LogFPCR -func_800D4C8C Fault_PrintThreadContext -func_800D4FA8 Fault_LogThreadContext -func_800D52A4 Fault_FindFaultedThread -func_800D532C Fault_Wait5Seconds -func_800d53BC Fault_WaitForButtonCombo -func_800D5688 Fault_DrawMemDumpPage -func_800D57F4 Fault_DrawMemDump -func_800D5B88 Fault_DrawStackTrace -func_800D5D08 Fault_LogStackTrace -func_800D5E78 Fault_ResumeThread -func_800D5EF4 Fault_CommitFB -func_800D5FB4 Fault_ProcessClients -func_800D6094 Fault_UpdatePad -func_800D60D0 Fault_ThreadEntry -func_800D6430 Fault_SetFB -func_800D6484 Fault_Start -func_800D65B8 Fault_HangupFaultClient -func_800D66B4 Fault_AddHungupAndCrashImpl -func_800D670C Fault_AddHungupAndCrash -func_800D6770 FaultDrawer_SetOsSyncPrintfEnabled -func_800D6780 FaultDrawer_DrawRecImpl -func_800D689C FaultDrawer_DrawChar -func_800D6A0C FaultDrawer_ColorToPrintColor -func_800D6ABC FaultDrawer_UpdatePrintColor -func_800D6B5C FaultDrawer_SetForeColor -func_800D6BA4 FaultDrawer_SetBackColor -func_800D6BEC FaultDrawer_SetFontColor -func_800D6C34 FaultDrawer_SetCharPad -func_800D6C44 FaultDrawer_SetCursor -func_800D6D5C FaultDrawer_FillScreen -func_800D6DEC FaultDrawer_FormatStringFunc -func_800D6FF8 FaultDrawer_VPrintf -func_800D7048 FaultDrawer_Printf -func_800D7098 FaultDrawer_DrawText -func_800D70E8 FaultDrawer_SetDrawerFB -func_800D7114 FaultDrawer_SetInputCallback -func_800D7124 FaultDrawer_WritebackFBDCache -func_800D7180 FaultDrawer_SetDefault -func_800F738C Audio_PlaySoundGeneral -func_800FA00C Audio_SetBGM -func_800FAF60 GfxPrint_InitDlist -func_800FB3AC GfxPrint_SetColor -func_800FB3F8 GfxPrint_SetPosPx -func_800FB41C GfxPrint_SetPos -func_800FB444 GfxPrint_SetBasePosPx -func_800FB458 GfxPrint_PrintCharImpl -func_800FB8EC GfxPrint_PrintChar -func_800FBAAC GfxPrint_PrintStringWithSize -func_800FBB08 GfxPrint_PrintString -func_800FBB60 GfxPrint_Callback -func_800FBB8C GfxPrint_Ctor -func_800FBC14 GfxPrint_Dtor -func_800FBC1C GfxPrint_Open -func_800FBC64 GfxPrint_Close -func_800FBC94 GfxPrint_VPrintf -func_800FBCB4 GfxPrint_Printf -func_800FD9AC Math_Rand_ZeroOne -func_80100290 sinf -func_80104610 cosf -func_80104780 coss - -D_8015E660 gSaveContext -D_8015FA90 gGameInfo