From c1d0cb9cea8b0fe97c71aaa470d50255924859e2 Mon Sep 17 00:00:00 2001 From: Tashi <65480653+tashi-lp@users.noreply.github.com> Date: Tue, 9 Mar 2021 21:18:32 -0700 Subject: [PATCH] Matched chill_out functions (#199) * matched functions in chill_out * ran coverage.py * removed redundant temp variables --- src/battle/star/chill_out_7900D0.c | 80 +++++++++++++++++-- .../chill_out_7900D0/func_802A1000_7900D0.s | 47 ----------- .../chill_out_7900D0/func_802A10AC_79017C.s | 52 ------------ .../chill_out_7900D0/func_802A116C_79023C.s | 47 ----------- .../chill_out_7900D0/func_802A137C_79044C.s | 44 ---------- .../chill_out_7900D0/func_802A1414_7904E4.s | 39 --------- .../chill_out_7900D0/func_802A153C_79060C.s | 68 ---------------- 7 files changed, 74 insertions(+), 303 deletions(-) delete mode 100644 ver/us/asm/nonmatchings/battle/star/chill_out_7900D0/func_802A1000_7900D0.s delete mode 100644 ver/us/asm/nonmatchings/battle/star/chill_out_7900D0/func_802A10AC_79017C.s delete mode 100644 ver/us/asm/nonmatchings/battle/star/chill_out_7900D0/func_802A116C_79023C.s delete mode 100644 ver/us/asm/nonmatchings/battle/star/chill_out_7900D0/func_802A137C_79044C.s delete mode 100644 ver/us/asm/nonmatchings/battle/star/chill_out_7900D0/func_802A1414_7904E4.s delete mode 100644 ver/us/asm/nonmatchings/battle/star/chill_out_7900D0/func_802A153C_79060C.s diff --git a/src/battle/star/chill_out_7900D0.c b/src/battle/star/chill_out_7900D0.c index e12f1d6c53..c070f35273 100644 --- a/src/battle/star/chill_out_7900D0.c +++ b/src/battle/star/chill_out_7900D0.c @@ -2,20 +2,75 @@ extern s32 D_802A2CC0; -INCLUDE_ASM(s32, "battle/star/chill_out_7900D0", func_802A1000_7900D0); +ApiStatus func_802A1000_7900D0(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 a = get_variable(script, *args++); + s32 b = get_variable(script, *args++); + s32 c = get_variable(script, *args++); -INCLUDE_ASM(s32, "battle/star/chill_out_7900D0", func_802A10AC_79017C); + func_8006FEF0(0, a, b, c, 40.0f); + return ApiStatus_DONE2; +} -INCLUDE_ASM(s32, "battle/star/chill_out_7900D0", func_802A116C_79023C); +ApiStatus func_802A10AC_79017C(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 a = get_variable(script, *args++); + s32 b = get_variable(script, *args++); + s32 c = get_variable(script, *args++); + + func_80070550(5, a, b, c, 50.0f, 50.0f, 40, 30); + return ApiStatus_DONE2; +} + +ApiStatus func_802A116C_79023C(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 a = get_variable(script, *args++); + s32 b = get_variable(script, *args++); + s32 c = get_variable(script, *args++); + + func_8006FEF0(0, a, b, c, 30.0f); + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "battle/star/chill_out_7900D0", func_802A1218_7902E8); #define NAMESPACE battle_star_chill_out #include "common/FadeBackgroundToBlack.inc.c" -INCLUDE_ASM(s32, "battle/star/chill_out_7900D0", func_802A137C_79044C); +ApiStatus func_802A137C_79044C(ScriptInstance* script, s32 isInitialCall) { + if (isInitialCall) { + func_8011D82C(1); + *D_801512F0 = 1; + set_background_color_blend(0, 0, 0, 0); + script->functionTemp[0].s = 0; + } -INCLUDE_ASM(s32, "battle/star/chill_out_7900D0", func_802A1414_7904E4); + set_background_color_blend(0, 0, 0, script->functionTemp[0].s); + script->functionTemp[0].s += 10; + + if (script->functionTemp[0].s >= 230) { + set_background_color_blend(0, 0, 0, 230); + return ApiStatus_DONE2; + } + + return ApiStatus_BLOCK; +} + +ApiStatus func_802A1414_7904E4(ScriptInstance* script, s32 isInitialCall) { + if (isInitialCall) { + script->functionTemp[0].s = 20; + } + + set_background_color_blend(0, 0, 0, script->functionTemp[0].s * 10); + script->functionTemp[0].s -= 1; + + if (script->functionTemp[0].s == 0) { + set_background_color_blend(0, 0, 0, 0); + return ApiStatus_DONE2; + } + + return ApiStatus_BLOCK; +} INCLUDE_ASM(s32, "battle/star/chill_out_7900D0", func_802A1494_790564); @@ -37,7 +92,20 @@ s32 func_802A1528_7905F8(ActorPart* actorPart) { return 2; } -INCLUDE_ASM(s32, "battle/star/chill_out_7900D0", func_802A153C_79060C); +ApiStatus func_802A153C_79060C(ScriptInstance* script, s32 isInitialCall) { + f32 a = rand_int(200) - 25; + f32 b = rand_int(120) + 7; + f32 c = rand_int(50) - 25; + + func_80072230(2, a, b, c, 2.0f, 20); + + a = rand_int(200) - 25; + b = rand_int(120) + 7; + c = rand_int(50) - 25; + + func_8006FEF0(4, a, b, c, 40.0f); + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "battle/star/chill_out_7900D0", func_802A163C_79070C); diff --git a/ver/us/asm/nonmatchings/battle/star/chill_out_7900D0/func_802A1000_7900D0.s b/ver/us/asm/nonmatchings/battle/star/chill_out_7900D0/func_802A1000_7900D0.s deleted file mode 100644 index 2bd9e4d7d0..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/chill_out_7900D0/func_802A1000_7900D0.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_7900D0 -/* 7900D0 802A1000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 7900D4 802A1004 AFB1001C */ sw $s1, 0x1c($sp) -/* 7900D8 802A1008 0080882D */ daddu $s1, $a0, $zero -/* 7900DC 802A100C AFBF0024 */ sw $ra, 0x24($sp) -/* 7900E0 802A1010 AFB20020 */ sw $s2, 0x20($sp) -/* 7900E4 802A1014 AFB00018 */ sw $s0, 0x18($sp) -/* 7900E8 802A1018 8E30000C */ lw $s0, 0xc($s1) -/* 7900EC 802A101C 8E050000 */ lw $a1, ($s0) -/* 7900F0 802A1020 0C0B1EAF */ jal get_variable -/* 7900F4 802A1024 26100004 */ addiu $s0, $s0, 4 -/* 7900F8 802A1028 8E050000 */ lw $a1, ($s0) -/* 7900FC 802A102C 26100004 */ addiu $s0, $s0, 4 -/* 790100 802A1030 0220202D */ daddu $a0, $s1, $zero -/* 790104 802A1034 0C0B1EAF */ jal get_variable -/* 790108 802A1038 0040902D */ daddu $s2, $v0, $zero -/* 79010C 802A103C 0220202D */ daddu $a0, $s1, $zero -/* 790110 802A1040 8E050000 */ lw $a1, ($s0) -/* 790114 802A1044 0C0B1EAF */ jal get_variable -/* 790118 802A1048 0040802D */ daddu $s0, $v0, $zero -/* 79011C 802A104C 44921000 */ mtc1 $s2, $f2 -/* 790120 802A1050 00000000 */ nop -/* 790124 802A1054 468010A0 */ cvt.s.w $f2, $f2 -/* 790128 802A1058 44051000 */ mfc1 $a1, $f2 -/* 79012C 802A105C 44901000 */ mtc1 $s0, $f2 -/* 790130 802A1060 00000000 */ nop -/* 790134 802A1064 468010A0 */ cvt.s.w $f2, $f2 -/* 790138 802A1068 44061000 */ mfc1 $a2, $f2 -/* 79013C 802A106C 44821000 */ mtc1 $v0, $f2 -/* 790140 802A1070 00000000 */ nop -/* 790144 802A1074 468010A0 */ cvt.s.w $f2, $f2 -/* 790148 802A1078 3C014220 */ lui $at, 0x4220 -/* 79014C 802A107C 44810000 */ mtc1 $at, $f0 -/* 790150 802A1080 44071000 */ mfc1 $a3, $f2 -/* 790154 802A1084 0000202D */ daddu $a0, $zero, $zero -/* 790158 802A1088 0C01BFBC */ jal func_8006FEF0 -/* 79015C 802A108C E7A00010 */ swc1 $f0, 0x10($sp) -/* 790160 802A1090 8FBF0024 */ lw $ra, 0x24($sp) -/* 790164 802A1094 8FB20020 */ lw $s2, 0x20($sp) -/* 790168 802A1098 8FB1001C */ lw $s1, 0x1c($sp) -/* 79016C 802A109C 8FB00018 */ lw $s0, 0x18($sp) -/* 790170 802A10A0 24020002 */ addiu $v0, $zero, 2 -/* 790174 802A10A4 03E00008 */ jr $ra -/* 790178 802A10A8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/battle/star/chill_out_7900D0/func_802A10AC_79017C.s b/ver/us/asm/nonmatchings/battle/star/chill_out_7900D0/func_802A10AC_79017C.s deleted file mode 100644 index dd970cc23b..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/chill_out_7900D0/func_802A10AC_79017C.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A10AC_79017C -/* 79017C 802A10AC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 790180 802A10B0 AFB10024 */ sw $s1, 0x24($sp) -/* 790184 802A10B4 0080882D */ daddu $s1, $a0, $zero -/* 790188 802A10B8 AFBF002C */ sw $ra, 0x2c($sp) -/* 79018C 802A10BC AFB20028 */ sw $s2, 0x28($sp) -/* 790190 802A10C0 AFB00020 */ sw $s0, 0x20($sp) -/* 790194 802A10C4 8E30000C */ lw $s0, 0xc($s1) -/* 790198 802A10C8 8E050000 */ lw $a1, ($s0) -/* 79019C 802A10CC 0C0B1EAF */ jal get_variable -/* 7901A0 802A10D0 26100004 */ addiu $s0, $s0, 4 -/* 7901A4 802A10D4 8E050000 */ lw $a1, ($s0) -/* 7901A8 802A10D8 26100004 */ addiu $s0, $s0, 4 -/* 7901AC 802A10DC 0220202D */ daddu $a0, $s1, $zero -/* 7901B0 802A10E0 0C0B1EAF */ jal get_variable -/* 7901B4 802A10E4 0040902D */ daddu $s2, $v0, $zero -/* 7901B8 802A10E8 0220202D */ daddu $a0, $s1, $zero -/* 7901BC 802A10EC 8E050000 */ lw $a1, ($s0) -/* 7901C0 802A10F0 0C0B1EAF */ jal get_variable -/* 7901C4 802A10F4 0040802D */ daddu $s0, $v0, $zero -/* 7901C8 802A10F8 24040005 */ addiu $a0, $zero, 5 -/* 7901CC 802A10FC 44921000 */ mtc1 $s2, $f2 -/* 7901D0 802A1100 00000000 */ nop -/* 7901D4 802A1104 468010A0 */ cvt.s.w $f2, $f2 -/* 7901D8 802A1108 44051000 */ mfc1 $a1, $f2 -/* 7901DC 802A110C 44901000 */ mtc1 $s0, $f2 -/* 7901E0 802A1110 00000000 */ nop -/* 7901E4 802A1114 468010A0 */ cvt.s.w $f2, $f2 -/* 7901E8 802A1118 44061000 */ mfc1 $a2, $f2 -/* 7901EC 802A111C 44821000 */ mtc1 $v0, $f2 -/* 7901F0 802A1120 00000000 */ nop -/* 7901F4 802A1124 468010A0 */ cvt.s.w $f2, $f2 -/* 7901F8 802A1128 3C014248 */ lui $at, 0x4248 -/* 7901FC 802A112C 44810000 */ mtc1 $at, $f0 -/* 790200 802A1130 44071000 */ mfc1 $a3, $f2 -/* 790204 802A1134 24030028 */ addiu $v1, $zero, 0x28 -/* 790208 802A1138 AFA30018 */ sw $v1, 0x18($sp) -/* 79020C 802A113C 2403001E */ addiu $v1, $zero, 0x1e -/* 790210 802A1140 AFA3001C */ sw $v1, 0x1c($sp) -/* 790214 802A1144 E7A00010 */ swc1 $f0, 0x10($sp) -/* 790218 802A1148 0C01C154 */ jal func_80070550 -/* 79021C 802A114C E7A00014 */ swc1 $f0, 0x14($sp) -/* 790220 802A1150 8FBF002C */ lw $ra, 0x2c($sp) -/* 790224 802A1154 8FB20028 */ lw $s2, 0x28($sp) -/* 790228 802A1158 8FB10024 */ lw $s1, 0x24($sp) -/* 79022C 802A115C 8FB00020 */ lw $s0, 0x20($sp) -/* 790230 802A1160 24020002 */ addiu $v0, $zero, 2 -/* 790234 802A1164 03E00008 */ jr $ra -/* 790238 802A1168 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/battle/star/chill_out_7900D0/func_802A116C_79023C.s b/ver/us/asm/nonmatchings/battle/star/chill_out_7900D0/func_802A116C_79023C.s deleted file mode 100644 index 166b5eea14..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/chill_out_7900D0/func_802A116C_79023C.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A116C_79023C -/* 79023C 802A116C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 790240 802A1170 AFB1001C */ sw $s1, 0x1c($sp) -/* 790244 802A1174 0080882D */ daddu $s1, $a0, $zero -/* 790248 802A1178 AFBF0024 */ sw $ra, 0x24($sp) -/* 79024C 802A117C AFB20020 */ sw $s2, 0x20($sp) -/* 790250 802A1180 AFB00018 */ sw $s0, 0x18($sp) -/* 790254 802A1184 8E30000C */ lw $s0, 0xc($s1) -/* 790258 802A1188 8E050000 */ lw $a1, ($s0) -/* 79025C 802A118C 0C0B1EAF */ jal get_variable -/* 790260 802A1190 26100004 */ addiu $s0, $s0, 4 -/* 790264 802A1194 8E050000 */ lw $a1, ($s0) -/* 790268 802A1198 26100004 */ addiu $s0, $s0, 4 -/* 79026C 802A119C 0220202D */ daddu $a0, $s1, $zero -/* 790270 802A11A0 0C0B1EAF */ jal get_variable -/* 790274 802A11A4 0040902D */ daddu $s2, $v0, $zero -/* 790278 802A11A8 0220202D */ daddu $a0, $s1, $zero -/* 79027C 802A11AC 8E050000 */ lw $a1, ($s0) -/* 790280 802A11B0 0C0B1EAF */ jal get_variable -/* 790284 802A11B4 0040802D */ daddu $s0, $v0, $zero -/* 790288 802A11B8 44921000 */ mtc1 $s2, $f2 -/* 79028C 802A11BC 00000000 */ nop -/* 790290 802A11C0 468010A0 */ cvt.s.w $f2, $f2 -/* 790294 802A11C4 44051000 */ mfc1 $a1, $f2 -/* 790298 802A11C8 44901000 */ mtc1 $s0, $f2 -/* 79029C 802A11CC 00000000 */ nop -/* 7902A0 802A11D0 468010A0 */ cvt.s.w $f2, $f2 -/* 7902A4 802A11D4 44061000 */ mfc1 $a2, $f2 -/* 7902A8 802A11D8 44821000 */ mtc1 $v0, $f2 -/* 7902AC 802A11DC 00000000 */ nop -/* 7902B0 802A11E0 468010A0 */ cvt.s.w $f2, $f2 -/* 7902B4 802A11E4 3C0141F0 */ lui $at, 0x41f0 -/* 7902B8 802A11E8 44810000 */ mtc1 $at, $f0 -/* 7902BC 802A11EC 44071000 */ mfc1 $a3, $f2 -/* 7902C0 802A11F0 0000202D */ daddu $a0, $zero, $zero -/* 7902C4 802A11F4 0C01BFBC */ jal func_8006FEF0 -/* 7902C8 802A11F8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 7902CC 802A11FC 8FBF0024 */ lw $ra, 0x24($sp) -/* 7902D0 802A1200 8FB20020 */ lw $s2, 0x20($sp) -/* 7902D4 802A1204 8FB1001C */ lw $s1, 0x1c($sp) -/* 7902D8 802A1208 8FB00018 */ lw $s0, 0x18($sp) -/* 7902DC 802A120C 24020002 */ addiu $v0, $zero, 2 -/* 7902E0 802A1210 03E00008 */ jr $ra -/* 7902E4 802A1214 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/battle/star/chill_out_7900D0/func_802A137C_79044C.s b/ver/us/asm/nonmatchings/battle/star/chill_out_7900D0/func_802A137C_79044C.s deleted file mode 100644 index 193156efda..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/chill_out_7900D0/func_802A137C_79044C.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A137C_79044C -/* 79044C 802A137C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 790450 802A1380 AFB00010 */ sw $s0, 0x10($sp) -/* 790454 802A1384 0080802D */ daddu $s0, $a0, $zero -/* 790458 802A1388 10A0000D */ beqz $a1, .L802A13C0 -/* 79045C 802A138C AFBF0014 */ sw $ra, 0x14($sp) -/* 790460 802A1390 0C04760B */ jal func_8011D82C -/* 790464 802A1394 24040001 */ addiu $a0, $zero, 1 -/* 790468 802A1398 0000202D */ daddu $a0, $zero, $zero -/* 79046C 802A139C 0080282D */ daddu $a1, $a0, $zero -/* 790470 802A13A0 0080302D */ daddu $a2, $a0, $zero -/* 790474 802A13A4 0080382D */ daddu $a3, $a0, $zero -/* 790478 802A13A8 3C038015 */ lui $v1, %hi(D_801512F0) -/* 79047C 802A13AC 8C6312F0 */ lw $v1, %lo(D_801512F0)($v1) -/* 790480 802A13B0 24020001 */ addiu $v0, $zero, 1 -/* 790484 802A13B4 0C046F97 */ jal set_background_color_blend -/* 790488 802A13B8 A0620000 */ sb $v0, ($v1) -/* 79048C 802A13BC AE000070 */ sw $zero, 0x70($s0) -.L802A13C0: -/* 790490 802A13C0 0000202D */ daddu $a0, $zero, $zero -/* 790494 802A13C4 0080282D */ daddu $a1, $a0, $zero -/* 790498 802A13C8 92070073 */ lbu $a3, 0x73($s0) -/* 79049C 802A13CC 0C046F97 */ jal set_background_color_blend -/* 7904A0 802A13D0 0080302D */ daddu $a2, $a0, $zero -/* 7904A4 802A13D4 8E020070 */ lw $v0, 0x70($s0) -/* 7904A8 802A13D8 2442000A */ addiu $v0, $v0, 0xa -/* 7904AC 802A13DC AE020070 */ sw $v0, 0x70($s0) -/* 7904B0 802A13E0 284200E6 */ slti $v0, $v0, 0xe6 -/* 7904B4 802A13E4 14400007 */ bnez $v0, .L802A1404 -/* 7904B8 802A13E8 0000102D */ daddu $v0, $zero, $zero -/* 7904BC 802A13EC 0000202D */ daddu $a0, $zero, $zero -/* 7904C0 802A13F0 0080282D */ daddu $a1, $a0, $zero -/* 7904C4 802A13F4 0080302D */ daddu $a2, $a0, $zero -/* 7904C8 802A13F8 0C046F97 */ jal set_background_color_blend -/* 7904CC 802A13FC 240700E6 */ addiu $a3, $zero, 0xe6 -/* 7904D0 802A1400 24020002 */ addiu $v0, $zero, 2 -.L802A1404: -/* 7904D4 802A1404 8FBF0014 */ lw $ra, 0x14($sp) -/* 7904D8 802A1408 8FB00010 */ lw $s0, 0x10($sp) -/* 7904DC 802A140C 03E00008 */ jr $ra -/* 7904E0 802A1410 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/star/chill_out_7900D0/func_802A1414_7904E4.s b/ver/us/asm/nonmatchings/battle/star/chill_out_7900D0/func_802A1414_7904E4.s deleted file mode 100644 index 90c76bef9a..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/chill_out_7900D0/func_802A1414_7904E4.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1414_7904E4 -/* 7904E4 802A1414 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7904E8 802A1418 AFB00010 */ sw $s0, 0x10($sp) -/* 7904EC 802A141C 0080802D */ daddu $s0, $a0, $zero -/* 7904F0 802A1420 10A00003 */ beqz $a1, .L802A1430 -/* 7904F4 802A1424 AFBF0014 */ sw $ra, 0x14($sp) -/* 7904F8 802A1428 24020014 */ addiu $v0, $zero, 0x14 -/* 7904FC 802A142C AE020070 */ sw $v0, 0x70($s0) -.L802A1430: -/* 790500 802A1430 0000202D */ daddu $a0, $zero, $zero -/* 790504 802A1434 0080282D */ daddu $a1, $a0, $zero -/* 790508 802A1438 8E020070 */ lw $v0, 0x70($s0) -/* 79050C 802A143C 0080302D */ daddu $a2, $a0, $zero -/* 790510 802A1440 00023880 */ sll $a3, $v0, 2 -/* 790514 802A1444 00E23821 */ addu $a3, $a3, $v0 -/* 790518 802A1448 00073840 */ sll $a3, $a3, 1 -/* 79051C 802A144C 0C046F97 */ jal set_background_color_blend -/* 790520 802A1450 30E700FE */ andi $a3, $a3, 0xfe -/* 790524 802A1454 8E020070 */ lw $v0, 0x70($s0) -/* 790528 802A1458 2442FFFF */ addiu $v0, $v0, -1 -/* 79052C 802A145C 10400003 */ beqz $v0, .L802A146C -/* 790530 802A1460 AE020070 */ sw $v0, 0x70($s0) -/* 790534 802A1464 080A8521 */ j .L802A1484 -/* 790538 802A1468 0000102D */ daddu $v0, $zero, $zero -.L802A146C: -/* 79053C 802A146C 0000202D */ daddu $a0, $zero, $zero -/* 790540 802A1470 0080282D */ daddu $a1, $a0, $zero -/* 790544 802A1474 0080302D */ daddu $a2, $a0, $zero -/* 790548 802A1478 0C046F97 */ jal set_background_color_blend -/* 79054C 802A147C 0080382D */ daddu $a3, $a0, $zero -/* 790550 802A1480 24020002 */ addiu $v0, $zero, 2 -.L802A1484: -/* 790554 802A1484 8FBF0014 */ lw $ra, 0x14($sp) -/* 790558 802A1488 8FB00010 */ lw $s0, 0x10($sp) -/* 79055C 802A148C 03E00008 */ jr $ra -/* 790560 802A1490 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/star/chill_out_7900D0/func_802A153C_79060C.s b/ver/us/asm/nonmatchings/battle/star/chill_out_7900D0/func_802A153C_79060C.s deleted file mode 100644 index a7adcd814c..0000000000 --- a/ver/us/asm/nonmatchings/battle/star/chill_out_7900D0/func_802A153C_79060C.s +++ /dev/null @@ -1,68 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A153C_79060C -/* 79060C 802A153C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 790610 802A1540 AFBF0018 */ sw $ra, 0x18($sp) -/* 790614 802A1544 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 790618 802A1548 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 79061C 802A154C 0C00A67F */ jal rand_int -/* 790620 802A1550 240400C8 */ addiu $a0, $zero, 0xc8 -/* 790624 802A1554 2442FFE7 */ addiu $v0, $v0, -0x19 -/* 790628 802A1558 4482B000 */ mtc1 $v0, $f22 -/* 79062C 802A155C 00000000 */ nop -/* 790630 802A1560 4680B5A0 */ cvt.s.w $f22, $f22 -/* 790634 802A1564 0C00A67F */ jal rand_int -/* 790638 802A1568 24040078 */ addiu $a0, $zero, 0x78 -/* 79063C 802A156C 24420007 */ addiu $v0, $v0, 7 -/* 790640 802A1570 4482A000 */ mtc1 $v0, $f20 -/* 790644 802A1574 00000000 */ nop -/* 790648 802A1578 4680A520 */ cvt.s.w $f20, $f20 -/* 79064C 802A157C 0C00A67F */ jal rand_int -/* 790650 802A1580 24040032 */ addiu $a0, $zero, 0x32 -/* 790654 802A1584 24040002 */ addiu $a0, $zero, 2 -/* 790658 802A1588 2442FFE7 */ addiu $v0, $v0, -0x19 -/* 79065C 802A158C 44821000 */ mtc1 $v0, $f2 -/* 790660 802A1590 00000000 */ nop -/* 790664 802A1594 468010A0 */ cvt.s.w $f2, $f2 -/* 790668 802A1598 44071000 */ mfc1 $a3, $f2 -/* 79066C 802A159C 4405B000 */ mfc1 $a1, $f22 -/* 790670 802A15A0 4406A000 */ mfc1 $a2, $f20 -/* 790674 802A15A4 3C014000 */ lui $at, 0x4000 -/* 790678 802A15A8 44810000 */ mtc1 $at, $f0 -/* 79067C 802A15AC 24020014 */ addiu $v0, $zero, 0x14 -/* 790680 802A15B0 AFA20014 */ sw $v0, 0x14($sp) -/* 790684 802A15B4 0C01C88C */ jal func_80072230 -/* 790688 802A15B8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 79068C 802A15BC 0C00A67F */ jal rand_int -/* 790690 802A15C0 240400C8 */ addiu $a0, $zero, 0xc8 -/* 790694 802A15C4 2442FFE7 */ addiu $v0, $v0, -0x19 -/* 790698 802A15C8 4482B000 */ mtc1 $v0, $f22 -/* 79069C 802A15CC 00000000 */ nop -/* 7906A0 802A15D0 4680B5A0 */ cvt.s.w $f22, $f22 -/* 7906A4 802A15D4 0C00A67F */ jal rand_int -/* 7906A8 802A15D8 24040078 */ addiu $a0, $zero, 0x78 -/* 7906AC 802A15DC 24420007 */ addiu $v0, $v0, 7 -/* 7906B0 802A15E0 4482A000 */ mtc1 $v0, $f20 -/* 7906B4 802A15E4 00000000 */ nop -/* 7906B8 802A15E8 4680A520 */ cvt.s.w $f20, $f20 -/* 7906BC 802A15EC 0C00A67F */ jal rand_int -/* 7906C0 802A15F0 24040032 */ addiu $a0, $zero, 0x32 -/* 7906C4 802A15F4 2442FFE7 */ addiu $v0, $v0, -0x19 -/* 7906C8 802A15F8 44821000 */ mtc1 $v0, $f2 -/* 7906CC 802A15FC 00000000 */ nop -/* 7906D0 802A1600 468010A0 */ cvt.s.w $f2, $f2 -/* 7906D4 802A1604 4405B000 */ mfc1 $a1, $f22 -/* 7906D8 802A1608 4406A000 */ mfc1 $a2, $f20 -/* 7906DC 802A160C 3C014220 */ lui $at, 0x4220 -/* 7906E0 802A1610 44810000 */ mtc1 $at, $f0 -/* 7906E4 802A1614 44071000 */ mfc1 $a3, $f2 -/* 7906E8 802A1618 24040004 */ addiu $a0, $zero, 4 -/* 7906EC 802A161C 0C01BFBC */ jal func_8006FEF0 -/* 7906F0 802A1620 E7A00010 */ swc1 $f0, 0x10($sp) -/* 7906F4 802A1624 8FBF0018 */ lw $ra, 0x18($sp) -/* 7906F8 802A1628 D7B60028 */ ldc1 $f22, 0x28($sp) -/* 7906FC 802A162C D7B40020 */ ldc1 $f20, 0x20($sp) -/* 790700 802A1630 24020002 */ addiu $v0, $zero, 2 -/* 790704 802A1634 03E00008 */ jr $ra -/* 790708 802A1638 27BD0030 */ addiu $sp, $sp, 0x30